1 /*
2  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3  * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4  * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
5  *
6  * Permission to use, copy, modify, and distribute this software for any
7  * purpose with or without fee is hereby granted, provided that the above
8  * copyright notice and this permission notice appear in all copies.
9  *
10  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17  */
18 
19 #include <sys/queue.h>
20 #include <sys/types.h>
21 #include <sys/stat.h>
22 #include <sys/wait.h>
23 
24 #include <err.h>
25 #include <errno.h>
26 #include <fcntl.h>
27 #include <limits.h>
28 #include <locale.h>
29 #include <ctype.h>
30 #include <sha1.h>
31 #include <signal.h>
32 #include <stdio.h>
33 #include <stdlib.h>
34 #include <string.h>
35 #include <unistd.h>
36 #include <libgen.h>
37 #include <time.h>
38 #include <paths.h>
39 #include <regex.h>
40 #include <getopt.h>
41 #include <util.h>
42 
43 #include "got_version.h"
44 #include "got_error.h"
45 #include "got_object.h"
46 #include "got_reference.h"
47 #include "got_repository.h"
48 #include "got_path.h"
49 #include "got_cancel.h"
50 #include "got_worktree.h"
51 #include "got_diff.h"
52 #include "got_commit_graph.h"
53 #include "got_fetch.h"
54 #include "got_send.h"
55 #include "got_blame.h"
56 #include "got_privsep.h"
57 #include "got_opentemp.h"
58 #include "got_gotconfig.h"
59 #include "got_dial.h"
60 #include "got_patch.h"
61 
62 #ifndef nitems
63 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
64 #endif
65 
66 static volatile sig_atomic_t sigint_received;
67 static volatile sig_atomic_t sigpipe_received;
68 
69 static void
70 catch_sigint(int signo)
71 {
72 	sigint_received = 1;
73 }
74 
75 static void
76 catch_sigpipe(int signo)
77 {
78 	sigpipe_received = 1;
79 }
80 
81 
82 struct got_cmd {
83 	const char	*cmd_name;
84 	const struct got_error *(*cmd_main)(int, char *[]);
85 	void		(*cmd_usage)(void);
86 	const char	*cmd_alias;
87 };
88 
89 __dead static void	usage(int, int);
90 __dead static void	usage_init(void);
91 __dead static void	usage_import(void);
92 __dead static void	usage_clone(void);
93 __dead static void	usage_fetch(void);
94 __dead static void	usage_checkout(void);
95 __dead static void	usage_update(void);
96 __dead static void	usage_log(void);
97 __dead static void	usage_diff(void);
98 __dead static void	usage_blame(void);
99 __dead static void	usage_tree(void);
100 __dead static void	usage_status(void);
101 __dead static void	usage_ref(void);
102 __dead static void	usage_branch(void);
103 __dead static void	usage_tag(void);
104 __dead static void	usage_add(void);
105 __dead static void	usage_remove(void);
106 __dead static void	usage_patch(void);
107 __dead static void	usage_revert(void);
108 __dead static void	usage_commit(void);
109 __dead static void	usage_send(void);
110 __dead static void	usage_cherrypick(void);
111 __dead static void	usage_backout(void);
112 __dead static void	usage_rebase(void);
113 __dead static void	usage_histedit(void);
114 __dead static void	usage_integrate(void);
115 __dead static void	usage_merge(void);
116 __dead static void	usage_stage(void);
117 __dead static void	usage_unstage(void);
118 __dead static void	usage_cat(void);
119 __dead static void	usage_info(void);
120 
121 static const struct got_error*		cmd_init(int, char *[]);
122 static const struct got_error*		cmd_import(int, char *[]);
123 static const struct got_error*		cmd_clone(int, char *[]);
124 static const struct got_error*		cmd_fetch(int, char *[]);
125 static const struct got_error*		cmd_checkout(int, char *[]);
126 static const struct got_error*		cmd_update(int, char *[]);
127 static const struct got_error*		cmd_log(int, char *[]);
128 static const struct got_error*		cmd_diff(int, char *[]);
129 static const struct got_error*		cmd_blame(int, char *[]);
130 static const struct got_error*		cmd_tree(int, char *[]);
131 static const struct got_error*		cmd_status(int, char *[]);
132 static const struct got_error*		cmd_ref(int, char *[]);
133 static const struct got_error*		cmd_branch(int, char *[]);
134 static const struct got_error*		cmd_tag(int, char *[]);
135 static const struct got_error*		cmd_add(int, char *[]);
136 static const struct got_error*		cmd_remove(int, char *[]);
137 static const struct got_error*		cmd_patch(int, char *[]);
138 static const struct got_error*		cmd_revert(int, char *[]);
139 static const struct got_error*		cmd_commit(int, char *[]);
140 static const struct got_error*		cmd_send(int, char *[]);
141 static const struct got_error*		cmd_cherrypick(int, char *[]);
142 static const struct got_error*		cmd_backout(int, char *[]);
143 static const struct got_error*		cmd_rebase(int, char *[]);
144 static const struct got_error*		cmd_histedit(int, char *[]);
145 static const struct got_error*		cmd_integrate(int, char *[]);
146 static const struct got_error*		cmd_merge(int, char *[]);
147 static const struct got_error*		cmd_stage(int, char *[]);
148 static const struct got_error*		cmd_unstage(int, char *[]);
149 static const struct got_error*		cmd_cat(int, char *[]);
150 static const struct got_error*		cmd_info(int, char *[]);
151 
152 static const struct got_cmd got_commands[] = {
153 	{ "init",	cmd_init,	usage_init,	"" },
154 	{ "import",	cmd_import,	usage_import,	"im" },
155 	{ "clone",	cmd_clone,	usage_clone,	"cl" },
156 	{ "fetch",	cmd_fetch,	usage_fetch,	"fe" },
157 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
158 	{ "update",	cmd_update,	usage_update,	"up" },
159 	{ "log",	cmd_log,	usage_log,	"" },
160 	{ "diff",	cmd_diff,	usage_diff,	"di" },
161 	{ "blame",	cmd_blame,	usage_blame,	"bl" },
162 	{ "tree",	cmd_tree,	usage_tree,	"tr" },
163 	{ "status",	cmd_status,	usage_status,	"st" },
164 	{ "ref",	cmd_ref,	usage_ref,	"" },
165 	{ "branch",	cmd_branch,	usage_branch,	"br" },
166 	{ "tag",	cmd_tag,	usage_tag,	"" },
167 	{ "add",	cmd_add,	usage_add,	"" },
168 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
169 	{ "patch",	cmd_patch,	usage_patch,	"pa" },
170 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
171 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
172 	{ "send",	cmd_send,	usage_send,	"se" },
173 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
174 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
175 	{ "rebase",	cmd_rebase,	usage_rebase,	"rb" },
176 	{ "histedit",	cmd_histedit,	usage_histedit,	"he" },
177 	{ "integrate",  cmd_integrate,  usage_integrate,"ig" },
178 	{ "merge",	cmd_merge,	usage_merge,	"mg" },
179 	{ "stage",	cmd_stage,	usage_stage,	"sg" },
180 	{ "unstage",	cmd_unstage,	usage_unstage,	"ug" },
181 	{ "cat",	cmd_cat,	usage_cat,	"" },
182 	{ "info",	cmd_info,	usage_info,	"" },
183 };
184 
185 static void
186 list_commands(FILE *fp)
187 {
188 	size_t i;
189 
190 	fprintf(fp, "commands:");
191 	for (i = 0; i < nitems(got_commands); i++) {
192 		const struct got_cmd *cmd = &got_commands[i];
193 		fprintf(fp, " %s", cmd->cmd_name);
194 	}
195 	fputc('\n', fp);
196 }
197 
198 __dead static void
199 option_conflict(char a, char b)
200 {
201 	errx(1, "-%c and -%c options are mutually exclusive", a, b);
202 }
203 
204 int
205 main(int argc, char *argv[])
206 {
207 	const struct got_cmd *cmd;
208 	size_t i;
209 	int ch;
210 	int hflag = 0, Vflag = 0;
211 	static const struct option longopts[] = {
212 	    { "version", no_argument, NULL, 'V' },
213 	    { NULL, 0, NULL, 0 }
214 	};
215 
216 	setlocale(LC_CTYPE, "");
217 
218 	while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
219 		switch (ch) {
220 		case 'h':
221 			hflag = 1;
222 			break;
223 		case 'V':
224 			Vflag = 1;
225 			break;
226 		default:
227 			usage(hflag, 1);
228 			/* NOTREACHED */
229 		}
230 	}
231 
232 	argc -= optind;
233 	argv += optind;
234 	optind = 1;
235 	optreset = 1;
236 
237 	if (Vflag) {
238 		got_version_print_str();
239 		return 0;
240 	}
241 
242 	if (argc <= 0)
243 		usage(hflag, hflag ? 0 : 1);
244 
245 	signal(SIGINT, catch_sigint);
246 	signal(SIGPIPE, catch_sigpipe);
247 
248 	for (i = 0; i < nitems(got_commands); i++) {
249 		const struct got_error *error;
250 
251 		cmd = &got_commands[i];
252 
253 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
254 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
255 			continue;
256 
257 		if (hflag)
258 			cmd->cmd_usage();
259 
260 		error = cmd->cmd_main(argc, argv);
261 		if (error && error->code != GOT_ERR_CANCELLED &&
262 		    error->code != GOT_ERR_PRIVSEP_EXIT &&
263 		    !(sigpipe_received &&
264 		      error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
265 		    !(sigint_received &&
266 		      error->code == GOT_ERR_ERRNO && errno == EINTR)) {
267 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
268 			return 1;
269 		}
270 
271 		return 0;
272 	}
273 
274 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
275 	list_commands(stderr);
276 	return 1;
277 }
278 
279 __dead static void
280 usage(int hflag, int status)
281 {
282 	FILE *fp = (status == 0) ? stdout : stderr;
283 
284 	fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
285 	    getprogname());
286 	if (hflag)
287 		list_commands(fp);
288 	exit(status);
289 }
290 
291 static const struct got_error *
292 get_editor(char **abspath)
293 {
294 	const struct got_error *err = NULL;
295 	const char *editor;
296 
297 	*abspath = NULL;
298 
299 	editor = getenv("VISUAL");
300 	if (editor == NULL)
301 		editor = getenv("EDITOR");
302 
303 	if (editor) {
304 		err = got_path_find_prog(abspath, editor);
305 		if (err)
306 			return err;
307 	}
308 
309 	if (*abspath == NULL) {
310 		*abspath = strdup("/bin/ed");
311 		if (*abspath == NULL)
312 			return got_error_from_errno("strdup");
313 	}
314 
315 	return NULL;
316 }
317 
318 static const struct got_error *
319 apply_unveil(const char *repo_path, int repo_read_only,
320     const char *worktree_path)
321 {
322 	const struct got_error *err;
323 
324 #ifdef PROFILE
325 	if (unveil("gmon.out", "rwc") != 0)
326 		return got_error_from_errno2("unveil", "gmon.out");
327 #endif
328 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
329 		return got_error_from_errno2("unveil", repo_path);
330 
331 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
332 		return got_error_from_errno2("unveil", worktree_path);
333 
334 	if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
335 		return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
336 
337 	err = got_privsep_unveil_exec_helpers();
338 	if (err != NULL)
339 		return err;
340 
341 	if (unveil(NULL, NULL) != 0)
342 		return got_error_from_errno("unveil");
343 
344 	return NULL;
345 }
346 
347 __dead static void
348 usage_init(void)
349 {
350 	fprintf(stderr, "usage: %s init repository-path\n", getprogname());
351 	exit(1);
352 }
353 
354 static const struct got_error *
355 cmd_init(int argc, char *argv[])
356 {
357 	const struct got_error *error = NULL;
358 	char *repo_path = NULL;
359 	int ch;
360 
361 	while ((ch = getopt(argc, argv, "")) != -1) {
362 		switch (ch) {
363 		default:
364 			usage_init();
365 			/* NOTREACHED */
366 		}
367 	}
368 
369 	argc -= optind;
370 	argv += optind;
371 
372 #ifndef PROFILE
373 	if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
374 		err(1, "pledge");
375 #endif
376 	if (argc != 1)
377 		usage_init();
378 
379 	repo_path = strdup(argv[0]);
380 	if (repo_path == NULL)
381 		return got_error_from_errno("strdup");
382 
383 	got_path_strip_trailing_slashes(repo_path);
384 
385 	error = got_path_mkdir(repo_path);
386 	if (error &&
387 	    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
388 		goto done;
389 
390 	error = apply_unveil(repo_path, 0, NULL);
391 	if (error)
392 		goto done;
393 
394 	error = got_repo_init(repo_path);
395 done:
396 	free(repo_path);
397 	return error;
398 }
399 
400 __dead static void
401 usage_import(void)
402 {
403 	fprintf(stderr, "usage: %s import [-b branch] [-m message] "
404 	    "[-r repository-path] [-I pattern] path\n", getprogname());
405 	exit(1);
406 }
407 
408 static int
409 spawn_editor(const char *editor, const char *file)
410 {
411 	pid_t pid;
412 	sig_t sighup, sigint, sigquit;
413 	int st = -1;
414 
415 	sighup = signal(SIGHUP, SIG_IGN);
416 	sigint = signal(SIGINT, SIG_IGN);
417 	sigquit = signal(SIGQUIT, SIG_IGN);
418 
419 	switch (pid = fork()) {
420 	case -1:
421 		goto doneediting;
422 	case 0:
423 		execl(editor, editor, file, (char *)NULL);
424 		_exit(127);
425 	}
426 
427 	while (waitpid(pid, &st, 0) == -1)
428 		if (errno != EINTR)
429 			break;
430 
431 doneediting:
432 	(void)signal(SIGHUP, sighup);
433 	(void)signal(SIGINT, sigint);
434 	(void)signal(SIGQUIT, sigquit);
435 
436 	if (!WIFEXITED(st)) {
437 		errno = EINTR;
438 		return -1;
439 	}
440 
441 	return WEXITSTATUS(st);
442 }
443 
444 static const struct got_error *
445 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
446     const char *initial_content, size_t initial_content_len,
447     int require_modification)
448 {
449 	const struct got_error *err = NULL;
450 	char *line = NULL;
451 	size_t linesize = 0;
452 	ssize_t linelen;
453 	struct stat st, st2;
454 	FILE *fp = NULL;
455 	size_t len, logmsg_len;
456 	char *initial_content_stripped = NULL, *buf = NULL, *s;
457 
458 	*logmsg = NULL;
459 
460 	if (stat(logmsg_path, &st) == -1)
461 		return got_error_from_errno2("stat", logmsg_path);
462 
463 	if (spawn_editor(editor, logmsg_path) == -1)
464 		return got_error_from_errno("failed spawning editor");
465 
466 	if (stat(logmsg_path, &st2) == -1)
467 		return got_error_from_errno("stat");
468 
469 	if (require_modification &&
470 	    st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
471 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
472 		    "no changes made to commit message, aborting");
473 
474 	/*
475 	 * Set up a stripped version of the initial content without comments
476 	 * and blank lines. We need this in order to check if the message
477 	 * has in fact been edited.
478 	 */
479 	initial_content_stripped = malloc(initial_content_len + 1);
480 	if (initial_content_stripped == NULL)
481 		return got_error_from_errno("malloc");
482 	initial_content_stripped[0] = '\0';
483 
484 	buf = strdup(initial_content);
485 	if (buf == NULL) {
486 		err = got_error_from_errno("strdup");
487 		goto done;
488 	}
489 	s = buf;
490 	len = 0;
491 	while ((line = strsep(&s, "\n")) != NULL) {
492 		if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
493 			continue; /* remove comments and leading empty lines */
494 		len = strlcat(initial_content_stripped, line,
495 		    initial_content_len + 1);
496 		if (len >= initial_content_len + 1) {
497 			err = got_error(GOT_ERR_NO_SPACE);
498 			goto done;
499 		}
500 	}
501 	while (len > 0 && initial_content_stripped[len - 1] == '\n') {
502 		initial_content_stripped[len - 1] = '\0';
503 		len--;
504 	}
505 
506 	logmsg_len = st2.st_size;
507 	*logmsg = malloc(logmsg_len + 1);
508 	if (*logmsg == NULL)
509 		return got_error_from_errno("malloc");
510 	(*logmsg)[0] = '\0';
511 
512 	fp = fopen(logmsg_path, "re");
513 	if (fp == NULL) {
514 		err = got_error_from_errno("fopen");
515 		goto done;
516 	}
517 
518 	len = 0;
519 	while ((linelen = getline(&line, &linesize, fp)) != -1) {
520 		if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
521 			continue; /* remove comments and leading empty lines */
522 		len = strlcat(*logmsg, line, logmsg_len + 1);
523 		if (len >= logmsg_len + 1) {
524 			err = got_error(GOT_ERR_NO_SPACE);
525 			goto done;
526 		}
527 	}
528 	free(line);
529 	if (ferror(fp)) {
530 		err = got_ferror(fp, GOT_ERR_IO);
531 		goto done;
532 	}
533 	while (len > 0 && (*logmsg)[len - 1] == '\n') {
534 		(*logmsg)[len - 1] = '\0';
535 		len--;
536 	}
537 
538 	if (len == 0) {
539 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
540 		    "commit message cannot be empty, aborting");
541 		goto done;
542 	}
543 	if (require_modification &&
544 	    strcmp(*logmsg, initial_content_stripped) == 0)
545 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
546 		    "no changes made to commit message, aborting");
547 done:
548 	free(initial_content_stripped);
549 	free(buf);
550 	if (fp && fclose(fp) == EOF && err == NULL)
551 		err = got_error_from_errno("fclose");
552 	if (err) {
553 		free(*logmsg);
554 		*logmsg = NULL;
555 	}
556 	return err;
557 }
558 
559 static const struct got_error *
560 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
561     const char *path_dir, const char *branch_name)
562 {
563 	char *initial_content = NULL;
564 	const struct got_error *err = NULL;
565 	int initial_content_len;
566 	int fd = -1;
567 
568 	initial_content_len = asprintf(&initial_content,
569 	    "\n# %s to be imported to branch %s\n", path_dir,
570 	    branch_name);
571 	if (initial_content_len == -1)
572 		return got_error_from_errno("asprintf");
573 
574 	err = got_opentemp_named_fd(logmsg_path, &fd,
575 	    GOT_TMPDIR_STR "/got-importmsg");
576 	if (err)
577 		goto done;
578 
579 	if (write(fd, initial_content, initial_content_len) == -1) {
580 		err = got_error_from_errno2("write", *logmsg_path);
581 		goto done;
582 	}
583 
584 	err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
585 	    initial_content_len, 1);
586 done:
587 	if (fd != -1 && close(fd) == -1 && err == NULL)
588 		err = got_error_from_errno2("close", *logmsg_path);
589 	free(initial_content);
590 	if (err) {
591 		free(*logmsg_path);
592 		*logmsg_path = NULL;
593 	}
594 	return err;
595 }
596 
597 static const struct got_error *
598 import_progress(void *arg, const char *path)
599 {
600 	printf("A  %s\n", path);
601 	return NULL;
602 }
603 
604 static int
605 valid_author(const char *author)
606 {
607 	/*
608 	 * Really dumb email address check; we're only doing this to
609 	 * avoid git's object parser breaking on commits we create.
610 	 */
611 	while (*author && *author != '<')
612 		author++;
613 	if (*author != '<')
614 		return 0;
615 	while (*author && *author != '@')
616 		author++;
617 	if (*author != '@')
618 		return 0;
619 	while (*author && *author != '>')
620 		author++;
621 	return *author == '>';
622 }
623 
624 static const struct got_error *
625 get_author(char **author, struct got_repository *repo,
626     struct got_worktree *worktree)
627 {
628 	const struct got_error *err = NULL;
629 	const char *got_author = NULL, *name, *email;
630 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
631 
632 	*author = NULL;
633 
634 	if (worktree)
635 		worktree_conf = got_worktree_get_gotconfig(worktree);
636 	repo_conf = got_repo_get_gotconfig(repo);
637 
638 	/*
639 	 * Priority of potential author information sources, from most
640 	 * significant to least significant:
641 	 * 1) work tree's .got/got.conf file
642 	 * 2) repository's got.conf file
643 	 * 3) repository's git config file
644 	 * 4) environment variables
645 	 * 5) global git config files (in user's home directory or /etc)
646 	 */
647 
648 	if (worktree_conf)
649 		got_author = got_gotconfig_get_author(worktree_conf);
650 	if (got_author == NULL)
651 		got_author = got_gotconfig_get_author(repo_conf);
652 	if (got_author == NULL) {
653 		name = got_repo_get_gitconfig_author_name(repo);
654 		email = got_repo_get_gitconfig_author_email(repo);
655 		if (name && email) {
656 			if (asprintf(author, "%s <%s>", name, email) == -1)
657 				return got_error_from_errno("asprintf");
658 			return NULL;
659 		}
660 
661 		got_author = getenv("GOT_AUTHOR");
662 		if (got_author == NULL) {
663 			name = got_repo_get_global_gitconfig_author_name(repo);
664 			email = got_repo_get_global_gitconfig_author_email(
665 			    repo);
666 			if (name && email) {
667 				if (asprintf(author, "%s <%s>", name, email)
668 				    == -1)
669 					return got_error_from_errno("asprintf");
670 				return NULL;
671 			}
672 			/* TODO: Look up user in password database? */
673 			return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
674 		}
675 	}
676 
677 	*author = strdup(got_author);
678 	if (*author == NULL)
679 		return got_error_from_errno("strdup");
680 
681 	if (!valid_author(*author)) {
682 		err = got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", *author);
683 		free(*author);
684 		*author = NULL;
685 	}
686 	return err;
687 }
688 
689 static const struct got_error *
690 get_gitconfig_path(char **gitconfig_path)
691 {
692 	const char *homedir = getenv("HOME");
693 
694 	*gitconfig_path = NULL;
695 	if (homedir) {
696 		if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
697 			return got_error_from_errno("asprintf");
698 
699 	}
700 	return NULL;
701 }
702 
703 static const struct got_error *
704 cmd_import(int argc, char *argv[])
705 {
706 	const struct got_error *error = NULL;
707 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
708 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
709 	const char *branch_name = "main";
710 	char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
711 	struct got_repository *repo = NULL;
712 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
713 	struct got_object_id *new_commit_id = NULL;
714 	int ch;
715 	struct got_pathlist_head ignores;
716 	struct got_pathlist_entry *pe;
717 	int preserve_logmsg = 0;
718 	int *pack_fds = NULL;
719 
720 	TAILQ_INIT(&ignores);
721 
722 	while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
723 		switch (ch) {
724 		case 'b':
725 			branch_name = optarg;
726 			break;
727 		case 'm':
728 			logmsg = strdup(optarg);
729 			if (logmsg == NULL) {
730 				error = got_error_from_errno("strdup");
731 				goto done;
732 			}
733 			break;
734 		case 'r':
735 			repo_path = realpath(optarg, NULL);
736 			if (repo_path == NULL) {
737 				error = got_error_from_errno2("realpath",
738 				    optarg);
739 				goto done;
740 			}
741 			break;
742 		case 'I':
743 			if (optarg[0] == '\0')
744 				break;
745 			error = got_pathlist_insert(&pe, &ignores, optarg,
746 			    NULL);
747 			if (error)
748 				goto done;
749 			break;
750 		default:
751 			usage_import();
752 			/* NOTREACHED */
753 		}
754 	}
755 
756 	argc -= optind;
757 	argv += optind;
758 
759 #ifndef PROFILE
760 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
761 	    "unveil",
762 	    NULL) == -1)
763 		err(1, "pledge");
764 #endif
765 	if (argc != 1)
766 		usage_import();
767 
768 	if (repo_path == NULL) {
769 		repo_path = getcwd(NULL, 0);
770 		if (repo_path == NULL)
771 			return got_error_from_errno("getcwd");
772 	}
773 	got_path_strip_trailing_slashes(repo_path);
774 	error = get_gitconfig_path(&gitconfig_path);
775 	if (error)
776 		goto done;
777 	error = got_repo_pack_fds_open(&pack_fds);
778 	if (error != NULL)
779 		goto done;
780 	error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
781 	if (error)
782 		goto done;
783 
784 	error = get_author(&author, repo, NULL);
785 	if (error)
786 		return error;
787 
788 	/*
789 	 * Don't let the user create a branch name with a leading '-'.
790 	 * While technically a valid reference name, this case is usually
791 	 * an unintended typo.
792 	 */
793 	if (branch_name[0] == '-')
794 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
795 
796 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
797 		error = got_error_from_errno("asprintf");
798 		goto done;
799 	}
800 
801 	error = got_ref_open(&branch_ref, repo, refname, 0);
802 	if (error) {
803 		if (error->code != GOT_ERR_NOT_REF)
804 			goto done;
805 	} else {
806 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
807 		    "import target branch already exists");
808 		goto done;
809 	}
810 
811 	path_dir = realpath(argv[0], NULL);
812 	if (path_dir == NULL) {
813 		error = got_error_from_errno2("realpath", argv[0]);
814 		goto done;
815 	}
816 	got_path_strip_trailing_slashes(path_dir);
817 
818 	/*
819 	 * unveil(2) traverses exec(2); if an editor is used we have
820 	 * to apply unveil after the log message has been written.
821 	 */
822 	if (logmsg == NULL || strlen(logmsg) == 0) {
823 		error = get_editor(&editor);
824 		if (error)
825 			goto done;
826 		free(logmsg);
827 		error = collect_import_msg(&logmsg, &logmsg_path, editor,
828 		    path_dir, refname);
829 		if (error) {
830 			if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
831 			    logmsg_path != NULL)
832 				preserve_logmsg = 1;
833 			goto done;
834 		}
835 	}
836 
837 	if (unveil(path_dir, "r") != 0) {
838 		error = got_error_from_errno2("unveil", path_dir);
839 		if (logmsg_path)
840 			preserve_logmsg = 1;
841 		goto done;
842 	}
843 
844 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
845 	if (error) {
846 		if (logmsg_path)
847 			preserve_logmsg = 1;
848 		goto done;
849 	}
850 
851 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
852 	    author, &ignores, repo, import_progress, NULL);
853 	if (error) {
854 		if (logmsg_path)
855 			preserve_logmsg = 1;
856 		goto done;
857 	}
858 
859 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
860 	if (error) {
861 		if (logmsg_path)
862 			preserve_logmsg = 1;
863 		goto done;
864 	}
865 
866 	error = got_ref_write(branch_ref, repo);
867 	if (error) {
868 		if (logmsg_path)
869 			preserve_logmsg = 1;
870 		goto done;
871 	}
872 
873 	error = got_object_id_str(&id_str, new_commit_id);
874 	if (error) {
875 		if (logmsg_path)
876 			preserve_logmsg = 1;
877 		goto done;
878 	}
879 
880 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
881 	if (error) {
882 		if (error->code != GOT_ERR_NOT_REF) {
883 			if (logmsg_path)
884 				preserve_logmsg = 1;
885 			goto done;
886 		}
887 
888 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
889 		    branch_ref);
890 		if (error) {
891 			if (logmsg_path)
892 				preserve_logmsg = 1;
893 			goto done;
894 		}
895 
896 		error = got_ref_write(head_ref, repo);
897 		if (error) {
898 			if (logmsg_path)
899 				preserve_logmsg = 1;
900 			goto done;
901 		}
902 	}
903 
904 	printf("Created branch %s with commit %s\n",
905 	    got_ref_get_name(branch_ref), id_str);
906 done:
907 	if (pack_fds) {
908 		const struct got_error *pack_err =
909 		    got_repo_pack_fds_close(pack_fds);
910 		if (error == NULL)
911 			error = pack_err;
912 	}
913 	if (preserve_logmsg) {
914 		fprintf(stderr, "%s: log message preserved in %s\n",
915 		    getprogname(), logmsg_path);
916 	} else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
917 		error = got_error_from_errno2("unlink", logmsg_path);
918 	free(logmsg);
919 	free(logmsg_path);
920 	free(repo_path);
921 	free(editor);
922 	free(refname);
923 	free(new_commit_id);
924 	free(id_str);
925 	free(author);
926 	free(gitconfig_path);
927 	if (branch_ref)
928 		got_ref_close(branch_ref);
929 	if (head_ref)
930 		got_ref_close(head_ref);
931 	return error;
932 }
933 
934 __dead static void
935 usage_clone(void)
936 {
937 	fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
938 	    "[-R reference] repository-url [directory]\n", getprogname());
939 	exit(1);
940 }
941 
942 struct got_fetch_progress_arg {
943 	char last_scaled_size[FMT_SCALED_STRSIZE];
944 	int last_p_indexed;
945 	int last_p_resolved;
946 	int verbosity;
947 
948 	struct got_repository *repo;
949 
950 	int create_configs;
951 	int configs_created;
952 	struct {
953 		struct got_pathlist_head *symrefs;
954 		struct got_pathlist_head *wanted_branches;
955 		struct got_pathlist_head *wanted_refs;
956 		const char *proto;
957 		const char *host;
958 		const char *port;
959 		const char *remote_repo_path;
960 		const char *git_url;
961 		int fetch_all_branches;
962 		int mirror_references;
963 	} config_info;
964 };
965 
966 /* XXX forward declaration */
967 static const struct got_error *
968 create_config_files(const char *proto, const char *host, const char *port,
969     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
970     int mirror_references, struct got_pathlist_head *symrefs,
971     struct got_pathlist_head *wanted_branches,
972     struct got_pathlist_head *wanted_refs, struct got_repository *repo);
973 
974 static const struct got_error *
975 fetch_progress(void *arg, const char *message, off_t packfile_size,
976     int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
977 {
978 	const struct got_error *err = NULL;
979 	struct got_fetch_progress_arg *a = arg;
980 	char scaled_size[FMT_SCALED_STRSIZE];
981 	int p_indexed, p_resolved;
982 	int print_size = 0, print_indexed = 0, print_resolved = 0;
983 
984 	/*
985 	 * In order to allow a failed clone to be resumed with 'got fetch'
986 	 * we try to create configuration files as soon as possible.
987 	 * Once the server has sent information about its default branch
988 	 * we have all required information.
989 	 */
990 	if (a->create_configs && !a->configs_created &&
991 	    !TAILQ_EMPTY(a->config_info.symrefs)) {
992 		err = create_config_files(a->config_info.proto,
993 		    a->config_info.host, a->config_info.port,
994 		    a->config_info.remote_repo_path,
995 		    a->config_info.git_url,
996 		    a->config_info.fetch_all_branches,
997 		    a->config_info.mirror_references,
998 		    a->config_info.symrefs,
999 		    a->config_info.wanted_branches,
1000 		    a->config_info.wanted_refs, a->repo);
1001 		if (err)
1002 			return err;
1003 		a->configs_created = 1;
1004 	}
1005 
1006 	if (a->verbosity < 0)
1007 		return NULL;
1008 
1009 	if (message && message[0] != '\0') {
1010 		printf("\rserver: %s", message);
1011 		fflush(stdout);
1012 		return NULL;
1013 	}
1014 
1015 	if (packfile_size > 0 || nobj_indexed > 0) {
1016 		if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1017 		    (a->last_scaled_size[0] == '\0' ||
1018 		    strcmp(scaled_size, a->last_scaled_size)) != 0) {
1019 			print_size = 1;
1020 			if (strlcpy(a->last_scaled_size, scaled_size,
1021 			    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1022 				return got_error(GOT_ERR_NO_SPACE);
1023 		}
1024 		if (nobj_indexed > 0) {
1025 			p_indexed = (nobj_indexed * 100) / nobj_total;
1026 			if (p_indexed != a->last_p_indexed) {
1027 				a->last_p_indexed = p_indexed;
1028 				print_indexed = 1;
1029 				print_size = 1;
1030 			}
1031 		}
1032 		if (nobj_resolved > 0) {
1033 			p_resolved = (nobj_resolved * 100) /
1034 			    (nobj_total - nobj_loose);
1035 			if (p_resolved != a->last_p_resolved) {
1036 				a->last_p_resolved = p_resolved;
1037 				print_resolved = 1;
1038 				print_indexed = 1;
1039 				print_size = 1;
1040 			}
1041 		}
1042 
1043 	}
1044 	if (print_size || print_indexed || print_resolved)
1045 		printf("\r");
1046 	if (print_size)
1047 		printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1048 	if (print_indexed)
1049 		printf("; indexing %d%%", p_indexed);
1050 	if (print_resolved)
1051 		printf("; resolving deltas %d%%", p_resolved);
1052 	if (print_size || print_indexed || print_resolved)
1053 		fflush(stdout);
1054 
1055 	return NULL;
1056 }
1057 
1058 static const struct got_error *
1059 create_symref(const char *refname, struct got_reference *target_ref,
1060     int verbosity, struct got_repository *repo)
1061 {
1062 	const struct got_error *err;
1063 	struct got_reference *head_symref;
1064 
1065 	err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1066 	if (err)
1067 		return err;
1068 
1069 	err = got_ref_write(head_symref, repo);
1070 	if (err == NULL && verbosity > 0) {
1071 		printf("Created reference %s: %s\n", GOT_REF_HEAD,
1072 		    got_ref_get_name(target_ref));
1073 	}
1074 	got_ref_close(head_symref);
1075 	return err;
1076 }
1077 
1078 static const struct got_error *
1079 list_remote_refs(struct got_pathlist_head *symrefs,
1080     struct got_pathlist_head *refs)
1081 {
1082 	const struct got_error *err;
1083 	struct got_pathlist_entry *pe;
1084 
1085 	TAILQ_FOREACH(pe, symrefs, entry) {
1086 		const char *refname = pe->path;
1087 		const char *targetref = pe->data;
1088 
1089 		printf("%s: %s\n", refname, targetref);
1090 	}
1091 
1092 	TAILQ_FOREACH(pe, refs, entry) {
1093 		const char *refname = pe->path;
1094 		struct got_object_id *id = pe->data;
1095 		char *id_str;
1096 
1097 		err = got_object_id_str(&id_str, id);
1098 		if (err)
1099 			return err;
1100 		printf("%s: %s\n", refname, id_str);
1101 		free(id_str);
1102 	}
1103 
1104 	return NULL;
1105 }
1106 
1107 static const struct got_error *
1108 create_ref(const char *refname, struct got_object_id *id,
1109     int verbosity, struct got_repository *repo)
1110 {
1111 	const struct got_error *err = NULL;
1112 	struct got_reference *ref;
1113 	char *id_str;
1114 
1115 	err = got_object_id_str(&id_str, id);
1116 	if (err)
1117 		return err;
1118 
1119 	err = got_ref_alloc(&ref, refname, id);
1120 	if (err)
1121 		goto done;
1122 
1123 	err = got_ref_write(ref, repo);
1124 	got_ref_close(ref);
1125 
1126 	if (err == NULL && verbosity >= 0)
1127 		printf("Created reference %s: %s\n", refname, id_str);
1128 done:
1129 	free(id_str);
1130 	return err;
1131 }
1132 
1133 static int
1134 match_wanted_ref(const char *refname, const char *wanted_ref)
1135 {
1136 	if (strncmp(refname, "refs/", 5) != 0)
1137 		return 0;
1138 	refname += 5;
1139 
1140 	/*
1141 	 * Prevent fetching of references that won't make any
1142 	 * sense outside of the remote repository's context.
1143 	 */
1144 	if (strncmp(refname, "got/", 4) == 0)
1145 		return 0;
1146 	if (strncmp(refname, "remotes/", 8) == 0)
1147 		return 0;
1148 
1149 	if (strncmp(wanted_ref, "refs/", 5) == 0)
1150 		wanted_ref += 5;
1151 
1152 	/* Allow prefix match. */
1153 	if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1154 		return 1;
1155 
1156 	/* Allow exact match. */
1157 	return (strcmp(refname, wanted_ref) == 0);
1158 }
1159 
1160 static int
1161 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1162 {
1163 	struct got_pathlist_entry *pe;
1164 
1165 	TAILQ_FOREACH(pe, wanted_refs, entry) {
1166 		if (match_wanted_ref(refname, pe->path))
1167 			return 1;
1168 	}
1169 
1170 	return 0;
1171 }
1172 
1173 static const struct got_error *
1174 create_wanted_ref(const char *refname, struct got_object_id *id,
1175     const char *remote_repo_name, int verbosity, struct got_repository *repo)
1176 {
1177 	const struct got_error *err;
1178 	char *remote_refname;
1179 
1180 	if (strncmp("refs/", refname, 5) == 0)
1181 		refname += 5;
1182 
1183 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1184 	    remote_repo_name, refname) == -1)
1185 		return got_error_from_errno("asprintf");
1186 
1187 	err = create_ref(remote_refname, id, verbosity, repo);
1188 	free(remote_refname);
1189 	return err;
1190 }
1191 
1192 static const struct got_error *
1193 create_gotconfig(const char *proto, const char *host, const char *port,
1194     const char *remote_repo_path, const char *default_branch,
1195     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1196     struct got_pathlist_head *wanted_refs, int mirror_references,
1197     struct got_repository *repo)
1198 {
1199 	const struct got_error *err = NULL;
1200 	char *gotconfig_path = NULL;
1201 	char *gotconfig = NULL;
1202 	FILE *gotconfig_file = NULL;
1203 	const char *branchname = NULL;
1204 	char *branches = NULL, *refs = NULL;
1205 	ssize_t n;
1206 
1207 	if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1208 		struct got_pathlist_entry *pe;
1209 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1210 			char *s;
1211 			branchname = pe->path;
1212 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1213 				branchname += 11;
1214 			if (asprintf(&s, "%s\"%s\" ",
1215 			    branches ? branches : "", branchname) == -1) {
1216 				err = got_error_from_errno("asprintf");
1217 				goto done;
1218 			}
1219 			free(branches);
1220 			branches = s;
1221 		}
1222 	} else if (!fetch_all_branches && default_branch) {
1223 		branchname = default_branch;
1224 		if (strncmp(branchname, "refs/heads/", 11) == 0)
1225 			branchname += 11;
1226 		if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1227 			err = got_error_from_errno("asprintf");
1228 			goto done;
1229 		}
1230 	}
1231 	if (!TAILQ_EMPTY(wanted_refs)) {
1232 		struct got_pathlist_entry *pe;
1233 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1234 			char *s;
1235 			const char *refname = pe->path;
1236 			if (strncmp(refname, "refs/", 5) == 0)
1237 				branchname += 5;
1238 			if (asprintf(&s, "%s\"%s\" ",
1239 			    refs ? refs : "", refname) == -1) {
1240 				err = got_error_from_errno("asprintf");
1241 				goto done;
1242 			}
1243 			free(refs);
1244 			refs = s;
1245 		}
1246 	}
1247 
1248 	/* Create got.conf(5). */
1249 	gotconfig_path = got_repo_get_path_gotconfig(repo);
1250 	if (gotconfig_path == NULL) {
1251 		err = got_error_from_errno("got_repo_get_path_gotconfig");
1252 		goto done;
1253 	}
1254 	gotconfig_file = fopen(gotconfig_path, "ae");
1255 	if (gotconfig_file == NULL) {
1256 		err = got_error_from_errno2("fopen", gotconfig_path);
1257 		goto done;
1258 	}
1259 	if (asprintf(&gotconfig,
1260 	    "remote \"%s\" {\n"
1261 	    "\tserver %s\n"
1262 	    "\tprotocol %s\n"
1263 	    "%s%s%s"
1264 	    "\trepository \"%s\"\n"
1265 	    "%s%s%s"
1266 	    "%s%s%s"
1267 	    "%s"
1268 	    "%s"
1269 	    "}\n",
1270 	    GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1271 	    port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1272 	    remote_repo_path, branches ? "\tbranch { " : "",
1273 	    branches ? branches : "", branches ? "}\n" : "", 
1274 	    refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "", 
1275 	    mirror_references ? "\tmirror-references yes\n" : "",
1276 	    fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1277 		err = got_error_from_errno("asprintf");
1278 		goto done;
1279 	}
1280 	n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1281 	if (n != strlen(gotconfig)) {
1282 		err = got_ferror(gotconfig_file, GOT_ERR_IO);
1283 		goto done;
1284 	}
1285 
1286 done:
1287 	if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1288 		err = got_error_from_errno2("fclose", gotconfig_path);
1289 	free(gotconfig_path);
1290 	free(branches);
1291 	return err;
1292 }
1293 
1294 static const struct got_error *
1295 create_gitconfig(const char *git_url, const char *default_branch,
1296     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1297     struct got_pathlist_head *wanted_refs, int mirror_references,
1298     struct got_repository *repo)
1299 {
1300 	const struct got_error *err = NULL;
1301 	char *gitconfig_path = NULL;
1302 	char *gitconfig = NULL;
1303 	FILE *gitconfig_file = NULL;
1304 	char *branches = NULL, *refs = NULL;
1305 	const char *branchname;
1306 	ssize_t n;
1307 
1308 	/* Create a config file Git can understand. */
1309 	gitconfig_path = got_repo_get_path_gitconfig(repo);
1310 	if (gitconfig_path == NULL) {
1311 		err = got_error_from_errno("got_repo_get_path_gitconfig");
1312 		goto done;
1313 	}
1314 	gitconfig_file = fopen(gitconfig_path, "ae");
1315 	if (gitconfig_file == NULL) {
1316 		err = got_error_from_errno2("fopen", gitconfig_path);
1317 		goto done;
1318 	}
1319 	if (fetch_all_branches) {
1320 		if (mirror_references) {
1321 			if (asprintf(&branches,
1322 			    "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1323 				err = got_error_from_errno("asprintf");
1324 				goto done;
1325 			}
1326 		} else if (asprintf(&branches,
1327 		    "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1328 		    GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1329 			err = got_error_from_errno("asprintf");
1330 			goto done;
1331 		}
1332 	} else if (!TAILQ_EMPTY(wanted_branches)) {
1333 		struct got_pathlist_entry *pe;
1334 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1335 			char *s;
1336 			branchname = pe->path;
1337 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1338 				branchname += 11;
1339 			if (mirror_references) {
1340 				if (asprintf(&s,
1341 				    "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1342 				    branches ? branches : "",
1343 				    branchname, branchname) == -1) {
1344 					err = got_error_from_errno("asprintf");
1345 					goto done;
1346 				}
1347 			} else if (asprintf(&s,
1348 			    "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1349 			    branches ? branches : "",
1350 			    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1351 			    branchname) == -1) {
1352 				err = got_error_from_errno("asprintf");
1353 				goto done;
1354 			}
1355 			free(branches);
1356 			branches = s;
1357 		}
1358 	} else {
1359 		/*
1360 		 * If the server specified a default branch, use just that one.
1361 		 * Otherwise fall back to fetching all branches on next fetch.
1362 		 */
1363 		if (default_branch) {
1364 			branchname = default_branch;
1365 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1366 				branchname += 11;
1367 		} else
1368 			branchname = "*"; /* fall back to all branches */
1369 		if (mirror_references) {
1370 			if (asprintf(&branches,
1371 			    "\tfetch = refs/heads/%s:refs/heads/%s\n",
1372 			    branchname, branchname) == -1) {
1373 				err = got_error_from_errno("asprintf");
1374 				goto done;
1375 			}
1376 		} else if (asprintf(&branches,
1377 		    "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1378 		    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1379 		    branchname) == -1) {
1380 			err = got_error_from_errno("asprintf");
1381 			goto done;
1382 		}
1383 	}
1384 	if (!TAILQ_EMPTY(wanted_refs)) {
1385 		struct got_pathlist_entry *pe;
1386 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1387 			char *s;
1388 			const char *refname = pe->path;
1389 			if (strncmp(refname, "refs/", 5) == 0)
1390 				refname += 5;
1391 			if (mirror_references) {
1392 				if (asprintf(&s,
1393 				    "%s\tfetch = refs/%s:refs/%s\n",
1394 				    refs ? refs : "", refname, refname) == -1) {
1395 					err = got_error_from_errno("asprintf");
1396 					goto done;
1397 				}
1398 			} else if (asprintf(&s,
1399 			    "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1400 			    refs ? refs : "",
1401 			    refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1402 			    refname) == -1) {
1403 				err = got_error_from_errno("asprintf");
1404 				goto done;
1405 			}
1406 			free(refs);
1407 			refs = s;
1408 		}
1409 	}
1410 
1411 	if (asprintf(&gitconfig,
1412 	    "[remote \"%s\"]\n"
1413 	    "\turl = %s\n"
1414 	    "%s"
1415 	    "%s"
1416 	    "\tfetch = refs/tags/*:refs/tags/*\n",
1417 	    GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1418 	    refs ? refs : "") == -1) {
1419 		err = got_error_from_errno("asprintf");
1420 		goto done;
1421 	}
1422 	n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1423 	if (n != strlen(gitconfig)) {
1424 		err = got_ferror(gitconfig_file, GOT_ERR_IO);
1425 		goto done;
1426 	}
1427 done:
1428 	if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1429 		err = got_error_from_errno2("fclose", gitconfig_path);
1430 	free(gitconfig_path);
1431 	free(branches);
1432 	return err;
1433 }
1434 
1435 static const struct got_error *
1436 create_config_files(const char *proto, const char *host, const char *port,
1437     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1438     int mirror_references, struct got_pathlist_head *symrefs,
1439     struct got_pathlist_head *wanted_branches,
1440     struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1441 {
1442 	const struct got_error *err = NULL;
1443 	const char *default_branch = NULL;
1444 	struct got_pathlist_entry *pe;
1445 
1446 	/*
1447 	 * If we asked for a set of wanted branches then use the first
1448 	 * one of those.
1449 	 */
1450 	if (!TAILQ_EMPTY(wanted_branches)) {
1451 		pe = TAILQ_FIRST(wanted_branches);
1452 		default_branch = pe->path;
1453 	} else {
1454 		/* First HEAD ref listed by server is the default branch. */
1455 		TAILQ_FOREACH(pe, symrefs, entry) {
1456 			const char *refname = pe->path;
1457 			const char *target = pe->data;
1458 
1459 			if (strcmp(refname, GOT_REF_HEAD) != 0)
1460 				continue;
1461 
1462 			default_branch = target;
1463 			break;
1464 		}
1465 	}
1466 
1467 	/* Create got.conf(5). */
1468 	err = create_gotconfig(proto, host, port, remote_repo_path,
1469 	    default_branch, fetch_all_branches, wanted_branches,
1470 	    wanted_refs, mirror_references, repo);
1471 	if (err)
1472 		return err;
1473 
1474 	/* Create a config file Git can understand. */
1475 	return create_gitconfig(git_url, default_branch, fetch_all_branches,
1476 	    wanted_branches, wanted_refs, mirror_references, repo);
1477 }
1478 
1479 static const struct got_error *
1480 cmd_clone(int argc, char *argv[])
1481 {
1482 	const struct got_error *error = NULL;
1483 	const char *uri, *dirname;
1484 	char *proto, *host, *port, *repo_name, *server_path;
1485 	char *default_destdir = NULL, *id_str = NULL;
1486 	const char *repo_path;
1487 	struct got_repository *repo = NULL;
1488 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1489 	struct got_pathlist_entry *pe;
1490 	struct got_object_id *pack_hash = NULL;
1491 	int ch, fetchfd = -1, fetchstatus;
1492 	pid_t fetchpid = -1;
1493 	struct got_fetch_progress_arg fpa;
1494 	char *git_url = NULL;
1495 	int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1496 	int list_refs_only = 0;
1497 	int *pack_fds = NULL;
1498 
1499 	TAILQ_INIT(&refs);
1500 	TAILQ_INIT(&symrefs);
1501 	TAILQ_INIT(&wanted_branches);
1502 	TAILQ_INIT(&wanted_refs);
1503 
1504 	while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1505 		switch (ch) {
1506 		case 'a':
1507 			fetch_all_branches = 1;
1508 			break;
1509 		case 'b':
1510 			error = got_pathlist_append(&wanted_branches,
1511 			    optarg, NULL);
1512 			if (error)
1513 				return error;
1514 			break;
1515 		case 'l':
1516 			list_refs_only = 1;
1517 			break;
1518 		case 'm':
1519 			mirror_references = 1;
1520 			break;
1521 		case 'v':
1522 			if (verbosity < 0)
1523 				verbosity = 0;
1524 			else if (verbosity < 3)
1525 				verbosity++;
1526 			break;
1527 		case 'q':
1528 			verbosity = -1;
1529 			break;
1530 		case 'R':
1531 			error = got_pathlist_append(&wanted_refs,
1532 			    optarg, NULL);
1533 			if (error)
1534 				return error;
1535 			break;
1536 		default:
1537 			usage_clone();
1538 			break;
1539 		}
1540 	}
1541 	argc -= optind;
1542 	argv += optind;
1543 
1544 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1545 		option_conflict('a', 'b');
1546 	if (list_refs_only) {
1547 		if (!TAILQ_EMPTY(&wanted_branches))
1548 			option_conflict('l', 'b');
1549 		if (fetch_all_branches)
1550 			option_conflict('l', 'a');
1551 		if (mirror_references)
1552 			option_conflict('l', 'm');
1553 		if (!TAILQ_EMPTY(&wanted_refs))
1554 			option_conflict('l', 'R');
1555 	}
1556 
1557 	uri = argv[0];
1558 
1559 	if (argc == 1)
1560 		dirname = NULL;
1561 	else if (argc == 2)
1562 		dirname = argv[1];
1563 	else
1564 		usage_clone();
1565 
1566 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1567 	    &repo_name, uri);
1568 	if (error)
1569 		goto done;
1570 
1571 	if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1572 	    host, port ? ":" : "", port ? port : "",
1573 	    server_path[0] != '/' ? "/" : "", server_path) == -1) {
1574 		error = got_error_from_errno("asprintf");
1575 		goto done;
1576 	}
1577 
1578 	if (strcmp(proto, "git") == 0) {
1579 #ifndef PROFILE
1580 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1581 		    "sendfd dns inet unveil", NULL) == -1)
1582 			err(1, "pledge");
1583 #endif
1584 	} else if (strcmp(proto, "git+ssh") == 0 ||
1585 	    strcmp(proto, "ssh") == 0) {
1586 #ifndef PROFILE
1587 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1588 		    "sendfd unveil", NULL) == -1)
1589 			err(1, "pledge");
1590 #endif
1591 	} else if (strcmp(proto, "http") == 0 ||
1592 	    strcmp(proto, "git+http") == 0) {
1593 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1594 		goto done;
1595 	} else {
1596 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1597 		goto done;
1598 	}
1599 	if (dirname == NULL) {
1600 		if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1601 			error = got_error_from_errno("asprintf");
1602 			goto done;
1603 		}
1604 		repo_path = default_destdir;
1605 	} else
1606 		repo_path = dirname;
1607 
1608 	if (!list_refs_only) {
1609 		error = got_path_mkdir(repo_path);
1610 		if (error &&
1611 		    (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1612 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1613 			goto done;
1614 		if (!got_path_dir_is_empty(repo_path)) {
1615 			error = got_error_path(repo_path,
1616 			    GOT_ERR_DIR_NOT_EMPTY);
1617 			goto done;
1618 		}
1619 	}
1620 
1621 	error = got_dial_apply_unveil(proto);
1622 	if (error)
1623 		goto done;
1624 
1625 	error = apply_unveil(repo_path, 0, NULL);
1626 	if (error)
1627 		goto done;
1628 
1629 	if (verbosity >= 0)
1630 		printf("Connecting to %s%s%s\n", host,
1631 		    port ? ":" : "", port ? port : "");
1632 
1633 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1634 	    server_path, verbosity);
1635 	if (error)
1636 		goto done;
1637 
1638 	if (!list_refs_only) {
1639 		error = got_repo_init(repo_path);
1640 		if (error)
1641 			goto done;
1642 		error = got_repo_pack_fds_open(&pack_fds);
1643 		if (error != NULL)
1644 			goto done;
1645 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1646 		if (error)
1647 			goto done;
1648 	}
1649 
1650 	fpa.last_scaled_size[0] = '\0';
1651 	fpa.last_p_indexed = -1;
1652 	fpa.last_p_resolved = -1;
1653 	fpa.verbosity = verbosity;
1654 	fpa.create_configs = 1;
1655 	fpa.configs_created = 0;
1656 	fpa.repo = repo;
1657 	fpa.config_info.symrefs = &symrefs;
1658 	fpa.config_info.wanted_branches = &wanted_branches;
1659 	fpa.config_info.wanted_refs = &wanted_refs;
1660 	fpa.config_info.proto = proto;
1661 	fpa.config_info.host = host;
1662 	fpa.config_info.port = port;
1663 	fpa.config_info.remote_repo_path = server_path;
1664 	fpa.config_info.git_url = git_url;
1665 	fpa.config_info.fetch_all_branches = fetch_all_branches;
1666 	fpa.config_info.mirror_references = mirror_references;
1667 	error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1668 	    GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1669 	    fetch_all_branches, &wanted_branches, &wanted_refs,
1670 	    list_refs_only, verbosity, fetchfd, repo,
1671 	    fetch_progress, &fpa);
1672 	if (error)
1673 		goto done;
1674 
1675 	if (list_refs_only) {
1676 		error = list_remote_refs(&symrefs, &refs);
1677 		goto done;
1678 	}
1679 
1680 	if (pack_hash == NULL) {
1681 		error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1682 		    "server sent an empty pack file");
1683 		goto done;
1684 	}
1685 	error = got_object_id_str(&id_str, pack_hash);
1686 	if (error)
1687 		goto done;
1688 	if (verbosity >= 0)
1689 		printf("\nFetched %s.pack\n", id_str);
1690 	free(id_str);
1691 
1692 	/* Set up references provided with the pack file. */
1693 	TAILQ_FOREACH(pe, &refs, entry) {
1694 		const char *refname = pe->path;
1695 		struct got_object_id *id = pe->data;
1696 		char *remote_refname;
1697 
1698 		if (is_wanted_ref(&wanted_refs, refname) &&
1699 		    !mirror_references) {
1700 			error = create_wanted_ref(refname, id,
1701 			    GOT_FETCH_DEFAULT_REMOTE_NAME,
1702 			    verbosity - 1, repo);
1703 			if (error)
1704 				goto done;
1705 			continue;
1706 		}
1707 
1708 		error = create_ref(refname, id, verbosity - 1, repo);
1709 		if (error)
1710 			goto done;
1711 
1712 		if (mirror_references)
1713 			continue;
1714 
1715 		if (strncmp("refs/heads/", refname, 11) != 0)
1716 			continue;
1717 
1718 		if (asprintf(&remote_refname,
1719 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1720 		    refname + 11) == -1) {
1721 			error = got_error_from_errno("asprintf");
1722 			goto done;
1723 		}
1724 		error = create_ref(remote_refname, id, verbosity - 1, repo);
1725 		free(remote_refname);
1726 		if (error)
1727 			goto done;
1728 	}
1729 
1730 	/* Set the HEAD reference if the server provided one. */
1731 	TAILQ_FOREACH(pe, &symrefs, entry) {
1732 		struct got_reference *target_ref;
1733 		const char *refname = pe->path;
1734 		const char *target = pe->data;
1735 		char *remote_refname = NULL, *remote_target = NULL;
1736 
1737 		if (strcmp(refname, GOT_REF_HEAD) != 0)
1738 			continue;
1739 
1740 		error = got_ref_open(&target_ref, repo, target, 0);
1741 		if (error) {
1742 			if (error->code == GOT_ERR_NOT_REF) {
1743 				error = NULL;
1744 				continue;
1745 			}
1746 			goto done;
1747 		}
1748 
1749 		error = create_symref(refname, target_ref, verbosity, repo);
1750 		got_ref_close(target_ref);
1751 		if (error)
1752 			goto done;
1753 
1754 		if (mirror_references)
1755 			continue;
1756 
1757 		if (strncmp("refs/heads/", target, 11) != 0)
1758 			continue;
1759 
1760 		if (asprintf(&remote_refname,
1761 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1762 		    refname) == -1) {
1763 			error = got_error_from_errno("asprintf");
1764 			goto done;
1765 		}
1766 		if (asprintf(&remote_target,
1767 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1768 		    target + 11) == -1) {
1769 			error = got_error_from_errno("asprintf");
1770 			free(remote_refname);
1771 			goto done;
1772 		}
1773 		error = got_ref_open(&target_ref, repo, remote_target, 0);
1774 		if (error) {
1775 			free(remote_refname);
1776 			free(remote_target);
1777 			if (error->code == GOT_ERR_NOT_REF) {
1778 				error = NULL;
1779 				continue;
1780 			}
1781 			goto done;
1782 		}
1783 		error = create_symref(remote_refname, target_ref,
1784 		    verbosity - 1, repo);
1785 		free(remote_refname);
1786 		free(remote_target);
1787 		got_ref_close(target_ref);
1788 		if (error)
1789 			goto done;
1790 	}
1791 	if (pe == NULL) {
1792 		/*
1793 		 * We failed to set the HEAD reference. If we asked for
1794 		 * a set of wanted branches use the first of one of those
1795 		 * which could be fetched instead.
1796 		 */
1797 		TAILQ_FOREACH(pe, &wanted_branches, entry) {
1798 			const char *target = pe->path;
1799 			struct got_reference *target_ref;
1800 
1801 			error = got_ref_open(&target_ref, repo, target, 0);
1802 			if (error) {
1803 				if (error->code == GOT_ERR_NOT_REF) {
1804 					error = NULL;
1805 					continue;
1806 				}
1807 				goto done;
1808 			}
1809 
1810 			error = create_symref(GOT_REF_HEAD, target_ref,
1811 			    verbosity, repo);
1812 			got_ref_close(target_ref);
1813 			if (error)
1814 				goto done;
1815 			break;
1816 		}
1817 	}
1818 
1819 	if (verbosity >= 0)
1820 		printf("Created %s repository '%s'\n",
1821 		    mirror_references ? "mirrored" : "cloned", repo_path);
1822 done:
1823 	if (pack_fds) {
1824 		const struct got_error *pack_err =
1825 		    got_repo_pack_fds_close(pack_fds);
1826 		if (error == NULL)
1827 			error = pack_err;
1828 	}
1829 	if (fetchpid > 0) {
1830 		if (kill(fetchpid, SIGTERM) == -1)
1831 			error = got_error_from_errno("kill");
1832 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1833 			error = got_error_from_errno("waitpid");
1834 	}
1835 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1836 		error = got_error_from_errno("close");
1837 	if (repo) {
1838 		const struct got_error *close_err = got_repo_close(repo);
1839 		if (error == NULL)
1840 			error = close_err;
1841 	}
1842 	TAILQ_FOREACH(pe, &refs, entry) {
1843 		free((void *)pe->path);
1844 		free(pe->data);
1845 	}
1846 	got_pathlist_free(&refs);
1847 	TAILQ_FOREACH(pe, &symrefs, entry) {
1848 		free((void *)pe->path);
1849 		free(pe->data);
1850 	}
1851 	got_pathlist_free(&symrefs);
1852 	got_pathlist_free(&wanted_branches);
1853 	got_pathlist_free(&wanted_refs);
1854 	free(pack_hash);
1855 	free(proto);
1856 	free(host);
1857 	free(port);
1858 	free(server_path);
1859 	free(repo_name);
1860 	free(default_destdir);
1861 	free(git_url);
1862 	return error;
1863 }
1864 
1865 static const struct got_error *
1866 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1867     int replace_tags, int verbosity, struct got_repository *repo)
1868 {
1869 	const struct got_error *err = NULL;
1870 	char *new_id_str = NULL;
1871 	struct got_object_id *old_id = NULL;
1872 
1873 	err = got_object_id_str(&new_id_str, new_id);
1874 	if (err)
1875 		goto done;
1876 
1877 	if (!replace_tags &&
1878 	    strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1879 		err = got_ref_resolve(&old_id, repo, ref);
1880 		if (err)
1881 			goto done;
1882 		if (got_object_id_cmp(old_id, new_id) == 0)
1883 			goto done;
1884 		if (verbosity >= 0) {
1885 			printf("Rejecting update of existing tag %s: %s\n",
1886 			    got_ref_get_name(ref), new_id_str);
1887 		}
1888 		goto done;
1889 	}
1890 
1891 	if (got_ref_is_symbolic(ref)) {
1892 		if (verbosity >= 0) {
1893 			printf("Replacing reference %s: %s\n",
1894 			    got_ref_get_name(ref),
1895 			    got_ref_get_symref_target(ref));
1896 		}
1897 		err = got_ref_change_symref_to_ref(ref, new_id);
1898 		if (err)
1899 			goto done;
1900 		err = got_ref_write(ref, repo);
1901 		if (err)
1902 			goto done;
1903 	} else {
1904 		err = got_ref_resolve(&old_id, repo, ref);
1905 		if (err)
1906 			goto done;
1907 		if (got_object_id_cmp(old_id, new_id) == 0)
1908 			goto done;
1909 
1910 		err = got_ref_change_ref(ref, new_id);
1911 		if (err)
1912 			goto done;
1913 		err = got_ref_write(ref, repo);
1914 		if (err)
1915 			goto done;
1916 	}
1917 
1918 	if (verbosity >= 0)
1919 		printf("Updated %s: %s\n", got_ref_get_name(ref),
1920 		    new_id_str);
1921 done:
1922 	free(old_id);
1923 	free(new_id_str);
1924 	return err;
1925 }
1926 
1927 static const struct got_error *
1928 update_symref(const char *refname, struct got_reference *target_ref,
1929     int verbosity, struct got_repository *repo)
1930 {
1931 	const struct got_error *err = NULL, *unlock_err;
1932 	struct got_reference *symref;
1933 	int symref_is_locked = 0;
1934 
1935 	err = got_ref_open(&symref, repo, refname, 1);
1936 	if (err) {
1937 		if (err->code != GOT_ERR_NOT_REF)
1938 			return err;
1939 		err = got_ref_alloc_symref(&symref, refname, target_ref);
1940 		if (err)
1941 			goto done;
1942 
1943 		err = got_ref_write(symref, repo);
1944 		if (err)
1945 			goto done;
1946 
1947 		if (verbosity >= 0)
1948 			printf("Created reference %s: %s\n",
1949 			    got_ref_get_name(symref),
1950 			    got_ref_get_symref_target(symref));
1951 	} else {
1952 		symref_is_locked = 1;
1953 
1954 		if (strcmp(got_ref_get_symref_target(symref),
1955 		    got_ref_get_name(target_ref)) == 0)
1956 			goto done;
1957 
1958 		err = got_ref_change_symref(symref,
1959 		    got_ref_get_name(target_ref));
1960 		if (err)
1961 			goto done;
1962 
1963 		err = got_ref_write(symref, repo);
1964 		if (err)
1965 			goto done;
1966 
1967 		if (verbosity >= 0)
1968 			printf("Updated %s: %s\n", got_ref_get_name(symref),
1969 			    got_ref_get_symref_target(symref));
1970 
1971 	}
1972 done:
1973 	if (symref_is_locked) {
1974 		unlock_err = got_ref_unlock(symref);
1975 		if (unlock_err && err == NULL)
1976 			err = unlock_err;
1977 	}
1978 	got_ref_close(symref);
1979 	return err;
1980 }
1981 
1982 __dead static void
1983 usage_fetch(void)
1984 {
1985 	fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1986 	    "[-r repository-path] [-t] [-q] [-v] [-R reference] [-X] "
1987 	    "[remote-repository-name]\n",
1988 	    getprogname());
1989 	exit(1);
1990 }
1991 
1992 static const struct got_error *
1993 delete_missing_ref(struct got_reference *ref,
1994     int verbosity, struct got_repository *repo)
1995 {
1996 	const struct got_error *err = NULL;
1997 	struct got_object_id *id = NULL;
1998 	char *id_str = NULL;
1999 
2000 	if (got_ref_is_symbolic(ref)) {
2001 		err = got_ref_delete(ref, repo);
2002 		if (err)
2003 			return err;
2004 		if (verbosity >= 0) {
2005 			printf("Deleted %s: %s\n",
2006 			    got_ref_get_name(ref),
2007 			    got_ref_get_symref_target(ref));
2008 		}
2009 	} else {
2010 		err = got_ref_resolve(&id, repo, ref);
2011 		if (err)
2012 			return err;
2013 		err = got_object_id_str(&id_str, id);
2014 		if (err)
2015 			goto done;
2016 
2017 		err = got_ref_delete(ref, repo);
2018 		if (err)
2019 			goto done;
2020 		if (verbosity >= 0) {
2021 			printf("Deleted %s: %s\n",
2022 			    got_ref_get_name(ref), id_str);
2023 		}
2024 	}
2025 done:
2026 	free(id);
2027 	free(id_str);
2028 	return NULL;
2029 }
2030 
2031 static const struct got_error *
2032 delete_missing_refs(struct got_pathlist_head *their_refs,
2033     struct got_pathlist_head *their_symrefs,
2034     const struct got_remote_repo *remote,
2035     int verbosity, struct got_repository *repo)
2036 {
2037 	const struct got_error *err = NULL, *unlock_err;
2038 	struct got_reflist_head my_refs;
2039 	struct got_reflist_entry *re;
2040 	struct got_pathlist_entry *pe;
2041 	char *remote_namespace = NULL;
2042 	char *local_refname = NULL;
2043 
2044 	TAILQ_INIT(&my_refs);
2045 
2046 	if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2047 	    == -1)
2048 		return got_error_from_errno("asprintf");
2049 
2050 	err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2051 	if (err)
2052 		goto done;
2053 
2054 	TAILQ_FOREACH(re, &my_refs, entry) {
2055 		const char *refname = got_ref_get_name(re->ref);
2056 		const char *their_refname;
2057 
2058 		if (remote->mirror_references) {
2059 			their_refname = refname;
2060 		} else {
2061 			if (strncmp(refname, remote_namespace,
2062 			    strlen(remote_namespace)) == 0) {
2063 				if (strcmp(refname + strlen(remote_namespace),
2064 				    GOT_REF_HEAD) == 0)
2065 					continue;
2066 				if (asprintf(&local_refname, "refs/heads/%s",
2067 				    refname + strlen(remote_namespace)) == -1) {
2068 					err = got_error_from_errno("asprintf");
2069 					goto done;
2070 				}
2071 			} else if (strncmp(refname, "refs/tags/", 10) != 0)
2072 				continue;
2073 
2074 			their_refname = local_refname;
2075 		}
2076 	
2077 		TAILQ_FOREACH(pe, their_refs, entry) {
2078 			if (strcmp(their_refname, pe->path) == 0)
2079 				break;
2080 		}
2081 		if (pe != NULL)
2082 			continue;
2083 
2084 		TAILQ_FOREACH(pe, their_symrefs, entry) {
2085 			if (strcmp(their_refname, pe->path) == 0)
2086 				break;
2087 		}
2088 		if (pe != NULL)
2089 			continue;
2090 
2091 		err = delete_missing_ref(re->ref, verbosity, repo);
2092 		if (err)
2093 			break;
2094 
2095 		if (local_refname) {
2096 			struct got_reference *ref;
2097 			err = got_ref_open(&ref, repo, local_refname, 1);
2098 			if (err) {
2099 				if (err->code != GOT_ERR_NOT_REF)
2100 					break;
2101 				free(local_refname);
2102 				local_refname = NULL;
2103 				continue;
2104 			}
2105 			err = delete_missing_ref(ref, verbosity, repo);
2106 			if (err)
2107 				break;
2108 			unlock_err = got_ref_unlock(ref);
2109 			got_ref_close(ref);
2110 			if (unlock_err && err == NULL) {
2111 				err = unlock_err;
2112 				break;
2113 			}
2114 
2115 			free(local_refname);
2116 			local_refname = NULL;
2117 		}
2118 	}
2119 done:
2120 	free(remote_namespace);
2121 	free(local_refname);
2122 	return err;
2123 }
2124 
2125 static const struct got_error *
2126 update_wanted_ref(const char *refname, struct got_object_id *id,
2127     const char *remote_repo_name, int verbosity, struct got_repository *repo)
2128 {
2129 	const struct got_error *err, *unlock_err;
2130 	char *remote_refname;
2131 	struct got_reference *ref;
2132 
2133 	if (strncmp("refs/", refname, 5) == 0)
2134 		refname += 5;
2135 
2136 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2137 	    remote_repo_name, refname) == -1)
2138 		return got_error_from_errno("asprintf");
2139 
2140 	err = got_ref_open(&ref, repo, remote_refname, 1);
2141 	if (err) {
2142 		if (err->code != GOT_ERR_NOT_REF)
2143 			goto done;
2144 		err = create_ref(remote_refname, id, verbosity, repo);
2145 	} else {
2146 		err = update_ref(ref, id, 0, verbosity, repo);
2147 		unlock_err = got_ref_unlock(ref);
2148 		if (unlock_err && err == NULL)
2149 			err = unlock_err;
2150 		got_ref_close(ref);
2151 	}
2152 done:
2153 	free(remote_refname);
2154 	return err;
2155 }
2156 
2157 static const struct got_error *
2158 delete_ref(struct got_repository *repo, struct got_reference *ref)
2159 {
2160 	const struct got_error *err = NULL;
2161 	struct got_object_id *id = NULL;
2162 	char *id_str = NULL;
2163 	const char *target;
2164 
2165 	if (got_ref_is_symbolic(ref)) {
2166 		target = got_ref_get_symref_target(ref);
2167 	} else {
2168 		err = got_ref_resolve(&id, repo, ref);
2169 		if (err)
2170 			goto done;
2171 		err = got_object_id_str(&id_str, id);
2172 		if (err)
2173 			goto done;
2174 		target = id_str;
2175 	}
2176 
2177 	err = got_ref_delete(ref, repo);
2178 	if (err)
2179 		goto done;
2180 
2181 	printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2182 done:
2183 	free(id);
2184 	free(id_str);
2185 	return err;
2186 }
2187 
2188 static const struct got_error *
2189 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2190 {
2191 	const struct got_error *err = NULL;
2192 	struct got_reflist_head refs;
2193 	struct got_reflist_entry *re;
2194 	char *prefix;
2195 
2196 	TAILQ_INIT(&refs);
2197 
2198 	if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2199 		err = got_error_from_errno("asprintf");
2200 		goto done;
2201 	}
2202 	err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2203 	if (err)
2204 		goto done;
2205 
2206 	TAILQ_FOREACH(re, &refs, entry)
2207 		delete_ref(repo, re->ref);
2208 done:
2209 	got_ref_list_free(&refs);
2210 	return err;
2211 }
2212 
2213 static const struct got_error *
2214 cmd_fetch(int argc, char *argv[])
2215 {
2216 	const struct got_error *error = NULL, *unlock_err;
2217 	char *cwd = NULL, *repo_path = NULL;
2218 	const char *remote_name;
2219 	char *proto = NULL, *host = NULL, *port = NULL;
2220 	char *repo_name = NULL, *server_path = NULL;
2221 	const struct got_remote_repo *remotes, *remote = NULL;
2222 	int nremotes;
2223 	char *id_str = NULL;
2224 	struct got_repository *repo = NULL;
2225 	struct got_worktree *worktree = NULL;
2226 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2227 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2228 	struct got_pathlist_entry *pe;
2229 	struct got_object_id *pack_hash = NULL;
2230 	int i, ch, fetchfd = -1, fetchstatus;
2231 	pid_t fetchpid = -1;
2232 	struct got_fetch_progress_arg fpa;
2233 	int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2234 	int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2235 	int *pack_fds = NULL;
2236 
2237 	TAILQ_INIT(&refs);
2238 	TAILQ_INIT(&symrefs);
2239 	TAILQ_INIT(&wanted_branches);
2240 	TAILQ_INIT(&wanted_refs);
2241 
2242 	while ((ch = getopt(argc, argv, "ab:dlr:tvqR:X")) != -1) {
2243 		switch (ch) {
2244 		case 'a':
2245 			fetch_all_branches = 1;
2246 			break;
2247 		case 'b':
2248 			error = got_pathlist_append(&wanted_branches,
2249 			    optarg, NULL);
2250 			if (error)
2251 				return error;
2252 			break;
2253 		case 'd':
2254 			delete_refs = 1;
2255 			break;
2256 		case 'l':
2257 			list_refs_only = 1;
2258 			break;
2259 		case 'r':
2260 			repo_path = realpath(optarg, NULL);
2261 			if (repo_path == NULL)
2262 				return got_error_from_errno2("realpath",
2263 				    optarg);
2264 			got_path_strip_trailing_slashes(repo_path);
2265 			break;
2266 		case 't':
2267 			replace_tags = 1;
2268 			break;
2269 		case 'v':
2270 			if (verbosity < 0)
2271 				verbosity = 0;
2272 			else if (verbosity < 3)
2273 				verbosity++;
2274 			break;
2275 		case 'q':
2276 			verbosity = -1;
2277 			break;
2278 		case 'R':
2279 			error = got_pathlist_append(&wanted_refs,
2280 			    optarg, NULL);
2281 			if (error)
2282 				return error;
2283 			break;
2284 		case 'X':
2285 			delete_remote = 1;
2286 			break;
2287 		default:
2288 			usage_fetch();
2289 			break;
2290 		}
2291 	}
2292 	argc -= optind;
2293 	argv += optind;
2294 
2295 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2296 		option_conflict('a', 'b');
2297 	if (list_refs_only) {
2298 		if (!TAILQ_EMPTY(&wanted_branches))
2299 			option_conflict('l', 'b');
2300 		if (fetch_all_branches)
2301 			option_conflict('l', 'a');
2302 		if (delete_refs)
2303 			option_conflict('l', 'd');
2304 		if (delete_remote)
2305 			option_conflict('l', 'X');
2306 	}
2307 	if (delete_remote) {
2308 		if (fetch_all_branches)
2309 			option_conflict('X', 'a');
2310 		if (!TAILQ_EMPTY(&wanted_branches))
2311 			option_conflict('X', 'b');
2312 		if (delete_refs)
2313 			option_conflict('X', 'd');
2314 		if (replace_tags)
2315 			option_conflict('X', 't');
2316 		if (!TAILQ_EMPTY(&wanted_refs))
2317 			option_conflict('X', 'R');
2318 	}
2319 
2320 	if (argc == 0) {
2321 		if (delete_remote)
2322 			errx(1, "-X option requires a remote name");
2323 		remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2324 	} else if (argc == 1)
2325 		remote_name = argv[0];
2326 	else
2327 		usage_fetch();
2328 
2329 	cwd = getcwd(NULL, 0);
2330 	if (cwd == NULL) {
2331 		error = got_error_from_errno("getcwd");
2332 		goto done;
2333 	}
2334 
2335 	error = got_repo_pack_fds_open(&pack_fds);
2336 	if (error != NULL)
2337 		goto done;
2338 
2339 	if (repo_path == NULL) {
2340 		error = got_worktree_open(&worktree, cwd);
2341 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2342 			goto done;
2343 		else
2344 			error = NULL;
2345 		if (worktree) {
2346 			repo_path =
2347 			    strdup(got_worktree_get_repo_path(worktree));
2348 			if (repo_path == NULL)
2349 				error = got_error_from_errno("strdup");
2350 			if (error)
2351 				goto done;
2352 		} else {
2353 			repo_path = strdup(cwd);
2354 			if (repo_path == NULL) {
2355 				error = got_error_from_errno("strdup");
2356 				goto done;
2357 			}
2358 		}
2359 	}
2360 
2361 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2362 	if (error)
2363 		goto done;
2364 
2365 	if (delete_remote) {
2366 		error = delete_refs_for_remote(repo, remote_name);
2367 		goto done; /* nothing else to do */
2368 	}
2369 
2370 	if (worktree) {
2371 		worktree_conf = got_worktree_get_gotconfig(worktree);
2372 		if (worktree_conf) {
2373 			got_gotconfig_get_remotes(&nremotes, &remotes,
2374 			    worktree_conf);
2375 			for (i = 0; i < nremotes; i++) {
2376 				if (strcmp(remotes[i].name, remote_name) == 0) {
2377 					remote = &remotes[i];
2378 					break;
2379 				}
2380 			}
2381 		}
2382 	}
2383 	if (remote == NULL) {
2384 		repo_conf = got_repo_get_gotconfig(repo);
2385 		if (repo_conf) {
2386 			got_gotconfig_get_remotes(&nremotes, &remotes,
2387 			    repo_conf);
2388 			for (i = 0; i < nremotes; i++) {
2389 				if (strcmp(remotes[i].name, remote_name) == 0) {
2390 					remote = &remotes[i];
2391 					break;
2392 				}
2393 			}
2394 		}
2395 	}
2396 	if (remote == NULL) {
2397 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2398 		for (i = 0; i < nremotes; i++) {
2399 			if (strcmp(remotes[i].name, remote_name) == 0) {
2400 				remote = &remotes[i];
2401 				break;
2402 			}
2403 		}
2404 	}
2405 	if (remote == NULL) {
2406 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2407 		goto done;
2408 	}
2409 
2410 	if (TAILQ_EMPTY(&wanted_branches)) {
2411 		if (!fetch_all_branches)
2412 			fetch_all_branches = remote->fetch_all_branches;
2413 		for (i = 0; i < remote->nfetch_branches; i++) {
2414 			got_pathlist_append(&wanted_branches,
2415 			    remote->fetch_branches[i], NULL);
2416 		}
2417 	}
2418 	if (TAILQ_EMPTY(&wanted_refs)) {
2419 		for (i = 0; i < remote->nfetch_refs; i++) {
2420 			got_pathlist_append(&wanted_refs,
2421 			    remote->fetch_refs[i], NULL);
2422 		}
2423 	}
2424 
2425 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2426 	    &repo_name, remote->fetch_url);
2427 	if (error)
2428 		goto done;
2429 
2430 	if (strcmp(proto, "git") == 0) {
2431 #ifndef PROFILE
2432 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2433 		    "sendfd dns inet unveil", NULL) == -1)
2434 			err(1, "pledge");
2435 #endif
2436 	} else if (strcmp(proto, "git+ssh") == 0 ||
2437 	    strcmp(proto, "ssh") == 0) {
2438 #ifndef PROFILE
2439 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2440 		    "sendfd unveil", NULL) == -1)
2441 			err(1, "pledge");
2442 #endif
2443 	} else if (strcmp(proto, "http") == 0 ||
2444 	    strcmp(proto, "git+http") == 0) {
2445 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2446 		goto done;
2447 	} else {
2448 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2449 		goto done;
2450 	}
2451 
2452 	error = got_dial_apply_unveil(proto);
2453 	if (error)
2454 		goto done;
2455 
2456 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2457 	if (error)
2458 		goto done;
2459 
2460 	if (verbosity >= 0)
2461 		printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2462 		    port ? ":" : "", port ? port : "");
2463 
2464 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2465 	    server_path, verbosity);
2466 	if (error)
2467 		goto done;
2468 
2469 	fpa.last_scaled_size[0] = '\0';
2470 	fpa.last_p_indexed = -1;
2471 	fpa.last_p_resolved = -1;
2472 	fpa.verbosity = verbosity;
2473 	fpa.repo = repo;
2474 	fpa.create_configs = 0;
2475 	fpa.configs_created = 0;
2476 	memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2477 	error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2478 	    remote->mirror_references, fetch_all_branches, &wanted_branches,
2479 	    &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2480 	    fetch_progress, &fpa);
2481 	if (error)
2482 		goto done;
2483 
2484 	if (list_refs_only) {
2485 		error = list_remote_refs(&symrefs, &refs);
2486 		goto done;
2487 	}
2488 
2489 	if (pack_hash == NULL) {
2490 		if (verbosity >= 0)
2491 			printf("Already up-to-date\n");
2492 	} else if (verbosity >= 0) {
2493 		error = got_object_id_str(&id_str, pack_hash);
2494 		if (error)
2495 			goto done;
2496 		printf("\nFetched %s.pack\n", id_str);
2497 		free(id_str);
2498 		id_str = NULL;
2499 	}
2500 
2501 	/* Update references provided with the pack file. */
2502 	TAILQ_FOREACH(pe, &refs, entry) {
2503 		const char *refname = pe->path;
2504 		struct got_object_id *id = pe->data;
2505 		struct got_reference *ref;
2506 		char *remote_refname;
2507 
2508 		if (is_wanted_ref(&wanted_refs, refname) &&
2509 		    !remote->mirror_references) {
2510 			error = update_wanted_ref(refname, id,
2511 			    remote->name, verbosity, repo);
2512 			if (error)
2513 				goto done;
2514 			continue;
2515 		}
2516 
2517 		if (remote->mirror_references ||
2518 		    strncmp("refs/tags/", refname, 10) == 0) {
2519 			error = got_ref_open(&ref, repo, refname, 1);
2520 			if (error) {
2521 				if (error->code != GOT_ERR_NOT_REF)
2522 					goto done;
2523 				error = create_ref(refname, id, verbosity,
2524 				    repo);
2525 				if (error)
2526 					goto done;
2527 			} else {
2528 				error = update_ref(ref, id, replace_tags,
2529 				    verbosity, repo);
2530 				unlock_err = got_ref_unlock(ref);
2531 				if (unlock_err && error == NULL)
2532 					error = unlock_err;
2533 				got_ref_close(ref);
2534 				if (error)
2535 					goto done;
2536 			}
2537 		} else if (strncmp("refs/heads/", refname, 11) == 0) {
2538 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2539 			    remote_name, refname + 11) == -1) {
2540 				error = got_error_from_errno("asprintf");
2541 				goto done;
2542 			}
2543 
2544 			error = got_ref_open(&ref, repo, remote_refname, 1);
2545 			if (error) {
2546 				if (error->code != GOT_ERR_NOT_REF)
2547 					goto done;
2548 				error = create_ref(remote_refname, id, 
2549 				    verbosity, repo);
2550 				if (error)
2551 					goto done;
2552 			} else {
2553 				error = update_ref(ref, id, replace_tags,
2554 				    verbosity, repo);
2555 				unlock_err = got_ref_unlock(ref);
2556 				if (unlock_err && error == NULL)
2557 					error = unlock_err;
2558 				got_ref_close(ref);
2559 				if (error)
2560 					goto done;
2561 			}
2562 
2563 			/* Also create a local branch if none exists yet. */
2564 			error = got_ref_open(&ref, repo, refname, 1);
2565 			if (error) {
2566 				if (error->code != GOT_ERR_NOT_REF)
2567 					goto done;
2568 				error = create_ref(refname, id, verbosity,
2569 				    repo);
2570 				if (error)
2571 					goto done;
2572 			} else {
2573 				unlock_err = got_ref_unlock(ref);
2574 				if (unlock_err && error == NULL)
2575 					error = unlock_err;
2576 				got_ref_close(ref);
2577 			}
2578 		}
2579 	}
2580 	if (delete_refs) {
2581 		error = delete_missing_refs(&refs, &symrefs, remote,
2582 		    verbosity, repo);
2583 		if (error)
2584 			goto done;
2585 	}
2586 
2587 	if (!remote->mirror_references) {
2588 		/* Update remote HEAD reference if the server provided one. */
2589 		TAILQ_FOREACH(pe, &symrefs, entry) {
2590 			struct got_reference *target_ref;
2591 			const char *refname = pe->path;
2592 			const char *target = pe->data;
2593 			char *remote_refname = NULL, *remote_target = NULL;
2594 
2595 			if (strcmp(refname, GOT_REF_HEAD) != 0)
2596 				continue;
2597 
2598 			if (strncmp("refs/heads/", target, 11) != 0)
2599 				continue;
2600 
2601 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2602 			    remote->name, refname) == -1) {
2603 				error = got_error_from_errno("asprintf");
2604 				goto done;
2605 			}
2606 			if (asprintf(&remote_target, "refs/remotes/%s/%s",
2607 			    remote->name, target + 11) == -1) {
2608 				error = got_error_from_errno("asprintf");
2609 				free(remote_refname);
2610 				goto done;
2611 			}
2612 
2613 			error = got_ref_open(&target_ref, repo, remote_target,
2614 			    0);
2615 			if (error) {
2616 				free(remote_refname);
2617 				free(remote_target);
2618 				if (error->code == GOT_ERR_NOT_REF) {
2619 					error = NULL;
2620 					continue;
2621 				}
2622 				goto done;
2623 			}
2624 			error = update_symref(remote_refname, target_ref,
2625 			    verbosity, repo);
2626 			free(remote_refname);
2627 			free(remote_target);
2628 			got_ref_close(target_ref);
2629 			if (error)
2630 				goto done;
2631 		}
2632 	}
2633 done:
2634 	if (fetchpid > 0) {
2635 		if (kill(fetchpid, SIGTERM) == -1)
2636 			error = got_error_from_errno("kill");
2637 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2638 			error = got_error_from_errno("waitpid");
2639 	}
2640 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2641 		error = got_error_from_errno("close");
2642 	if (repo) {
2643 		const struct got_error *close_err = got_repo_close(repo);
2644 		if (error == NULL)
2645 			error = close_err;
2646 	}
2647 	if (worktree)
2648 		got_worktree_close(worktree);
2649 	if (pack_fds) {
2650 		const struct got_error *pack_err =
2651 		    got_repo_pack_fds_close(pack_fds);
2652 		if (error == NULL)
2653 			error = pack_err;
2654 	}
2655 	TAILQ_FOREACH(pe, &refs, entry) {
2656 		free((void *)pe->path);
2657 		free(pe->data);
2658 	}
2659 	got_pathlist_free(&refs);
2660 	TAILQ_FOREACH(pe, &symrefs, entry) {
2661 		free((void *)pe->path);
2662 		free(pe->data);
2663 	}
2664 	got_pathlist_free(&symrefs);
2665 	got_pathlist_free(&wanted_branches);
2666 	got_pathlist_free(&wanted_refs);
2667 	free(id_str);
2668 	free(cwd);
2669 	free(repo_path);
2670 	free(pack_hash);
2671 	free(proto);
2672 	free(host);
2673 	free(port);
2674 	free(server_path);
2675 	free(repo_name);
2676 	return error;
2677 }
2678 
2679 
2680 __dead static void
2681 usage_checkout(void)
2682 {
2683 	fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2684 	    "[-p prefix] [-q] repository-path [worktree-path]\n",
2685 	    getprogname());
2686 	exit(1);
2687 }
2688 
2689 static void
2690 show_worktree_base_ref_warning(void)
2691 {
2692 	fprintf(stderr, "%s: warning: could not create a reference "
2693 	    "to the work tree's base commit; the commit could be "
2694 	    "garbage-collected by Git or 'gotadmin cleanup'; making the "
2695 	    "repository writable and running 'got update' will prevent this\n",
2696 	    getprogname());
2697 }
2698 
2699 struct got_checkout_progress_arg {
2700 	const char *worktree_path;
2701 	int had_base_commit_ref_error;
2702 	int verbosity;
2703 };
2704 
2705 static const struct got_error *
2706 checkout_progress(void *arg, unsigned char status, const char *path)
2707 {
2708 	struct got_checkout_progress_arg *a = arg;
2709 
2710 	/* Base commit bump happens silently. */
2711 	if (status == GOT_STATUS_BUMP_BASE)
2712 		return NULL;
2713 
2714 	if (status == GOT_STATUS_BASE_REF_ERR) {
2715 		a->had_base_commit_ref_error = 1;
2716 		return NULL;
2717 	}
2718 
2719 	while (path[0] == '/')
2720 		path++;
2721 
2722 	if (a->verbosity >= 0)
2723 		printf("%c  %s/%s\n", status, a->worktree_path, path);
2724 
2725 	return NULL;
2726 }
2727 
2728 static const struct got_error *
2729 check_cancelled(void *arg)
2730 {
2731 	if (sigint_received || sigpipe_received)
2732 		return got_error(GOT_ERR_CANCELLED);
2733 	return NULL;
2734 }
2735 
2736 static const struct got_error *
2737 check_linear_ancestry(struct got_object_id *commit_id,
2738     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2739     struct got_repository *repo)
2740 {
2741 	const struct got_error *err = NULL;
2742 	struct got_object_id *yca_id;
2743 
2744 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2745 	    commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2746 	if (err)
2747 		return err;
2748 
2749 	if (yca_id == NULL)
2750 		return got_error(GOT_ERR_ANCESTRY);
2751 
2752 	/*
2753 	 * Require a straight line of history between the target commit
2754 	 * and the work tree's base commit.
2755 	 *
2756 	 * Non-linear situations such as this require a rebase:
2757 	 *
2758 	 * (commit) D       F (base_commit)
2759 	 *           \     /
2760 	 *            C   E
2761 	 *             \ /
2762 	 *              B (yca)
2763 	 *              |
2764 	 *              A
2765 	 *
2766 	 * 'got update' only handles linear cases:
2767 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
2768 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
2769 	 */
2770 	if (allow_forwards_in_time_only) {
2771 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2772 		return got_error(GOT_ERR_ANCESTRY);
2773 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2774 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
2775 		return got_error(GOT_ERR_ANCESTRY);
2776 
2777 	free(yca_id);
2778 	return NULL;
2779 }
2780 
2781 static const struct got_error *
2782 check_same_branch(struct got_object_id *commit_id,
2783     struct got_reference *head_ref, struct got_object_id *yca_id,
2784     struct got_repository *repo)
2785 {
2786 	const struct got_error *err = NULL;
2787 	struct got_commit_graph *graph = NULL;
2788 	struct got_object_id *head_commit_id = NULL;
2789 	int is_same_branch = 0;
2790 
2791 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
2792 	if (err)
2793 		goto done;
2794 
2795 	if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2796 		is_same_branch = 1;
2797 		goto done;
2798 	}
2799 	if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2800 		is_same_branch = 1;
2801 		goto done;
2802 	}
2803 
2804 	err = got_commit_graph_open(&graph, "/", 1);
2805 	if (err)
2806 		goto done;
2807 
2808 	err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2809 	    check_cancelled, NULL);
2810 	if (err)
2811 		goto done;
2812 
2813 	for (;;) {
2814 		struct got_object_id *id;
2815 		err = got_commit_graph_iter_next(&id, graph, repo,
2816 		    check_cancelled, NULL);
2817 		if (err) {
2818 			if (err->code == GOT_ERR_ITER_COMPLETED)
2819 				err = NULL;
2820 			break;
2821 		}
2822 
2823 		if (id) {
2824 			if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2825 				break;
2826 			if (got_object_id_cmp(id, commit_id) == 0) {
2827 				is_same_branch = 1;
2828 				break;
2829 			}
2830 		}
2831 	}
2832 done:
2833 	if (graph)
2834 		got_commit_graph_close(graph);
2835 	free(head_commit_id);
2836 	if (!err && !is_same_branch)
2837 		err = got_error(GOT_ERR_ANCESTRY);
2838 	return err;
2839 }
2840 
2841 static const struct got_error *
2842 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2843 {
2844 	static char msg[512];
2845 	const char *branch_name;
2846 
2847 	if (got_ref_is_symbolic(ref))
2848 		branch_name = got_ref_get_symref_target(ref);
2849 	else
2850 		branch_name = got_ref_get_name(ref);
2851 
2852 	if (strncmp("refs/heads/", branch_name, 11) == 0)
2853 		branch_name += 11;
2854 
2855 	snprintf(msg, sizeof(msg),
2856 	    "target commit is not contained in branch '%s'; "
2857 	    "the branch to use must be specified with -b; "
2858 	    "if necessary a new branch can be created for "
2859 	    "this commit with 'got branch -c %s BRANCH_NAME'",
2860 	    branch_name, commit_id_str);
2861 
2862 	return got_error_msg(GOT_ERR_ANCESTRY, msg);
2863 }
2864 
2865 static const struct got_error *
2866 cmd_checkout(int argc, char *argv[])
2867 {
2868 	const struct got_error *error = NULL;
2869 	struct got_repository *repo = NULL;
2870 	struct got_reference *head_ref = NULL, *ref = NULL;
2871 	struct got_worktree *worktree = NULL;
2872 	char *repo_path = NULL;
2873 	char *worktree_path = NULL;
2874 	const char *path_prefix = "";
2875 	const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2876 	char *commit_id_str = NULL;
2877 	struct got_object_id *commit_id = NULL;
2878 	char *cwd = NULL;
2879 	int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2880 	struct got_pathlist_head paths;
2881 	struct got_checkout_progress_arg cpa;
2882 	int *pack_fds = NULL;
2883 
2884 	TAILQ_INIT(&paths);
2885 
2886 	while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2887 		switch (ch) {
2888 		case 'b':
2889 			branch_name = optarg;
2890 			break;
2891 		case 'c':
2892 			commit_id_str = strdup(optarg);
2893 			if (commit_id_str == NULL)
2894 				return got_error_from_errno("strdup");
2895 			break;
2896 		case 'E':
2897 			allow_nonempty = 1;
2898 			break;
2899 		case 'p':
2900 			path_prefix = optarg;
2901 			break;
2902 		case 'q':
2903 			verbosity = -1;
2904 			break;
2905 		default:
2906 			usage_checkout();
2907 			/* NOTREACHED */
2908 		}
2909 	}
2910 
2911 	argc -= optind;
2912 	argv += optind;
2913 
2914 #ifndef PROFILE
2915 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2916 	    "unveil", NULL) == -1)
2917 		err(1, "pledge");
2918 #endif
2919 	if (argc == 1) {
2920 		char *base, *dotgit;
2921 		const char *path;
2922 		repo_path = realpath(argv[0], NULL);
2923 		if (repo_path == NULL)
2924 			return got_error_from_errno2("realpath", argv[0]);
2925 		cwd = getcwd(NULL, 0);
2926 		if (cwd == NULL) {
2927 			error = got_error_from_errno("getcwd");
2928 			goto done;
2929 		}
2930 		if (path_prefix[0])
2931 			path = path_prefix;
2932 		else
2933 			path = repo_path;
2934 		error = got_path_basename(&base, path);
2935 		if (error)
2936 			goto done;
2937 		dotgit = strstr(base, ".git");
2938 		if (dotgit)
2939 			*dotgit = '\0';
2940 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2941 			error = got_error_from_errno("asprintf");
2942 			free(base);
2943 			goto done;
2944 		}
2945 		free(base);
2946 	} else if (argc == 2) {
2947 		repo_path = realpath(argv[0], NULL);
2948 		if (repo_path == NULL) {
2949 			error = got_error_from_errno2("realpath", argv[0]);
2950 			goto done;
2951 		}
2952 		worktree_path = realpath(argv[1], NULL);
2953 		if (worktree_path == NULL) {
2954 			if (errno != ENOENT) {
2955 				error = got_error_from_errno2("realpath",
2956 				    argv[1]);
2957 				goto done;
2958 			}
2959 			worktree_path = strdup(argv[1]);
2960 			if (worktree_path == NULL) {
2961 				error = got_error_from_errno("strdup");
2962 				goto done;
2963 			}
2964 		}
2965 	} else
2966 		usage_checkout();
2967 
2968 	got_path_strip_trailing_slashes(repo_path);
2969 	got_path_strip_trailing_slashes(worktree_path);
2970 
2971 	error = got_repo_pack_fds_open(&pack_fds);
2972 	if (error != NULL)
2973 		goto done;
2974 
2975 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2976 	if (error != NULL)
2977 		goto done;
2978 
2979 	/* Pre-create work tree path for unveil(2) */
2980 	error = got_path_mkdir(worktree_path);
2981 	if (error) {
2982 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2983 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2984 			goto done;
2985 		if (!allow_nonempty &&
2986 		    !got_path_dir_is_empty(worktree_path)) {
2987 			error = got_error_path(worktree_path,
2988 			    GOT_ERR_DIR_NOT_EMPTY);
2989 			goto done;
2990 		}
2991 	}
2992 
2993 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2994 	if (error)
2995 		goto done;
2996 
2997 	error = got_ref_open(&head_ref, repo, branch_name, 0);
2998 	if (error != NULL)
2999 		goto done;
3000 
3001 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
3002 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3003 		goto done;
3004 
3005 	error = got_worktree_open(&worktree, worktree_path);
3006 	if (error != NULL)
3007 		goto done;
3008 
3009 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3010 	    path_prefix);
3011 	if (error != NULL)
3012 		goto done;
3013 	if (!same_path_prefix) {
3014 		error = got_error(GOT_ERR_PATH_PREFIX);
3015 		goto done;
3016 	}
3017 
3018 	if (commit_id_str) {
3019 		struct got_reflist_head refs;
3020 		TAILQ_INIT(&refs);
3021 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3022 		    NULL);
3023 		if (error)
3024 			goto done;
3025 		error = got_repo_match_object_id(&commit_id, NULL,
3026 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3027 		got_ref_list_free(&refs);
3028 		if (error)
3029 			goto done;
3030 		error = check_linear_ancestry(commit_id,
3031 		    got_worktree_get_base_commit_id(worktree), 0, repo);
3032 		if (error != NULL) {
3033 			if (error->code == GOT_ERR_ANCESTRY) {
3034 				error = checkout_ancestry_error(
3035 				    head_ref, commit_id_str);
3036 			}
3037 			goto done;
3038 		}
3039 		error = check_same_branch(commit_id, head_ref, NULL, repo);
3040 		if (error) {
3041 			if (error->code == GOT_ERR_ANCESTRY) {
3042 				error = checkout_ancestry_error(
3043 				    head_ref, commit_id_str);
3044 			}
3045 			goto done;
3046 		}
3047 		error = got_worktree_set_base_commit_id(worktree, repo,
3048 		    commit_id);
3049 		if (error)
3050 			goto done;
3051 		/* Expand potentially abbreviated commit ID string. */
3052 		free(commit_id_str);
3053 		error = got_object_id_str(&commit_id_str, commit_id);
3054 		if (error)
3055 			goto done;
3056 	} else {
3057 		commit_id = got_object_id_dup(
3058 		    got_worktree_get_base_commit_id(worktree));
3059 		if (commit_id == NULL) {
3060 			error = got_error_from_errno("got_object_id_dup");
3061 			goto done;
3062 		}
3063 		error = got_object_id_str(&commit_id_str, commit_id);
3064 		if (error)
3065 			goto done;
3066 	}
3067 
3068 	error = got_pathlist_append(&paths, "", NULL);
3069 	if (error)
3070 		goto done;
3071 	cpa.worktree_path = worktree_path;
3072 	cpa.had_base_commit_ref_error = 0;
3073 	cpa.verbosity = verbosity;
3074 	error = got_worktree_checkout_files(worktree, &paths, repo,
3075 	    checkout_progress, &cpa, check_cancelled, NULL);
3076 	if (error != NULL)
3077 		goto done;
3078 
3079 	if (got_ref_is_symbolic(head_ref)) {
3080 		error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3081 		if (error)
3082 			goto done;
3083 		refname = got_ref_get_name(ref);
3084 	} else
3085 		refname = got_ref_get_name(head_ref);
3086 	printf("Checked out %s: %s\n", refname, commit_id_str);
3087 	printf("Now shut up and hack\n");
3088 	if (cpa.had_base_commit_ref_error)
3089 		show_worktree_base_ref_warning();
3090 done:
3091 	if (pack_fds) {
3092 		const struct got_error *pack_err =
3093 		    got_repo_pack_fds_close(pack_fds);
3094 		if (error == NULL)
3095 			error = pack_err;
3096 	}
3097 	if (head_ref)
3098 		got_ref_close(head_ref);
3099 	if (ref)
3100 		got_ref_close(ref);
3101 	got_pathlist_free(&paths);
3102 	free(commit_id_str);
3103 	free(commit_id);
3104 	free(repo_path);
3105 	free(worktree_path);
3106 	free(cwd);
3107 	return error;
3108 }
3109 
3110 struct got_update_progress_arg {
3111 	int did_something;
3112 	int conflicts;
3113 	int obstructed;
3114 	int not_updated;
3115 	int missing;
3116 	int not_deleted;
3117 	int unversioned;
3118 	int verbosity;
3119 };
3120 
3121 static void
3122 print_update_progress_stats(struct got_update_progress_arg *upa)
3123 {
3124 	if (!upa->did_something)
3125 		return;
3126 
3127 	if (upa->conflicts > 0)
3128 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
3129 	if (upa->obstructed > 0)
3130 		printf("File paths obstructed by a non-regular file: %d\n",
3131 		    upa->obstructed);
3132 	if (upa->not_updated > 0)
3133 		printf("Files not updated because of existing merge "
3134 		    "conflicts: %d\n", upa->not_updated);
3135 }
3136 
3137 /*
3138  * The meaning of some status codes differs between merge-style operations and
3139  * update operations. For example, the ! status code means "file was missing"
3140  * if changes were merged into the work tree, and "missing file was restored"
3141  * if the work tree was updated. This function should be used by any operation
3142  * which merges changes into the work tree without updating the work tree.
3143  */
3144 static void
3145 print_merge_progress_stats(struct got_update_progress_arg *upa)
3146 {
3147 	if (!upa->did_something)
3148 		return;
3149 
3150 	if (upa->conflicts > 0)
3151 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
3152 	if (upa->obstructed > 0)
3153 		printf("File paths obstructed by a non-regular file: %d\n",
3154 		    upa->obstructed);
3155 	if (upa->missing > 0)
3156 		printf("Files which had incoming changes but could not be "
3157 		    "found in the work tree: %d\n", upa->missing);
3158 	if (upa->not_deleted > 0)
3159 		printf("Files not deleted due to differences in deleted "
3160 		    "content: %d\n", upa->not_deleted);
3161 	if (upa->unversioned > 0)
3162 		printf("Files not merged because an unversioned file was "
3163 		    "found in the work tree: %d\n", upa->unversioned);
3164 }
3165 
3166 __dead static void
3167 usage_update(void)
3168 {
3169 	fprintf(stderr, "usage: %s update [-b branch] [-c commit] [-q] "
3170 	    "[path ...]\n",
3171 	    getprogname());
3172 	exit(1);
3173 }
3174 
3175 static const struct got_error *
3176 update_progress(void *arg, unsigned char status, const char *path)
3177 {
3178 	struct got_update_progress_arg *upa = arg;
3179 
3180 	if (status == GOT_STATUS_EXISTS ||
3181 	    status == GOT_STATUS_BASE_REF_ERR)
3182 		return NULL;
3183 
3184 	upa->did_something = 1;
3185 
3186 	/* Base commit bump happens silently. */
3187 	if (status == GOT_STATUS_BUMP_BASE)
3188 		return NULL;
3189 
3190 	if (status == GOT_STATUS_CONFLICT)
3191 		upa->conflicts++;
3192 	if (status == GOT_STATUS_OBSTRUCTED)
3193 		upa->obstructed++;
3194 	if (status == GOT_STATUS_CANNOT_UPDATE)
3195 		upa->not_updated++;
3196 	if (status == GOT_STATUS_MISSING)
3197 		upa->missing++;
3198 	if (status == GOT_STATUS_CANNOT_DELETE)
3199 		upa->not_deleted++;
3200 	if (status == GOT_STATUS_UNVERSIONED)
3201 		upa->unversioned++;
3202 
3203 	while (path[0] == '/')
3204 		path++;
3205 	if (upa->verbosity >= 0)
3206 		printf("%c  %s\n", status, path);
3207 
3208 	return NULL;
3209 }
3210 
3211 static const struct got_error *
3212 switch_head_ref(struct got_reference *head_ref,
3213     struct got_object_id *commit_id, struct got_worktree *worktree,
3214     struct got_repository *repo)
3215 {
3216 	const struct got_error *err = NULL;
3217 	char *base_id_str;
3218 	int ref_has_moved = 0;
3219 
3220 	/* Trivial case: switching between two different references. */
3221 	if (strcmp(got_ref_get_name(head_ref),
3222 	    got_worktree_get_head_ref_name(worktree)) != 0) {
3223 		printf("Switching work tree from %s to %s\n",
3224 		    got_worktree_get_head_ref_name(worktree),
3225 		    got_ref_get_name(head_ref));
3226 		return got_worktree_set_head_ref(worktree, head_ref);
3227 	}
3228 
3229 	err = check_linear_ancestry(commit_id,
3230 	    got_worktree_get_base_commit_id(worktree), 0, repo);
3231 	if (err) {
3232 		if (err->code != GOT_ERR_ANCESTRY)
3233 			return err;
3234 		ref_has_moved = 1;
3235 	}
3236 	if (!ref_has_moved)
3237 		return NULL;
3238 
3239 	/* Switching to a rebased branch with the same reference name. */
3240 	err = got_object_id_str(&base_id_str,
3241 	    got_worktree_get_base_commit_id(worktree));
3242 	if (err)
3243 		return err;
3244 	printf("Reference %s now points at a different branch\n",
3245 	    got_worktree_get_head_ref_name(worktree));
3246 	printf("Switching work tree from %s to %s\n", base_id_str,
3247 	    got_worktree_get_head_ref_name(worktree));
3248 	return NULL;
3249 }
3250 
3251 static const struct got_error *
3252 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3253 {
3254 	const struct got_error *err;
3255 	int in_progress;
3256 
3257 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
3258 	if (err)
3259 		return err;
3260 	if (in_progress)
3261 		return got_error(GOT_ERR_REBASING);
3262 
3263 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
3264 	if (err)
3265 		return err;
3266 	if (in_progress)
3267 		return got_error(GOT_ERR_HISTEDIT_BUSY);
3268 
3269 	return NULL;
3270 }
3271 
3272 static const struct got_error *
3273 check_merge_in_progress(struct got_worktree *worktree,
3274     struct got_repository *repo)
3275 {
3276 	const struct got_error *err;
3277 	int in_progress;
3278 
3279 	err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3280 	if (err)
3281 		return err;
3282 	if (in_progress)
3283 		return got_error(GOT_ERR_MERGE_BUSY);
3284 
3285 	return NULL;
3286 }
3287 
3288 static const struct got_error *
3289 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3290     char *argv[], struct got_worktree *worktree)
3291 {
3292 	const struct got_error *err = NULL;
3293 	char *path;
3294 	struct got_pathlist_entry *new;
3295 	int i;
3296 
3297 	if (argc == 0) {
3298 		path = strdup("");
3299 		if (path == NULL)
3300 			return got_error_from_errno("strdup");
3301 		return got_pathlist_append(paths, path, NULL);
3302 	}
3303 
3304 	for (i = 0; i < argc; i++) {
3305 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
3306 		if (err)
3307 			break;
3308 		err = got_pathlist_insert(&new, paths, path, NULL);
3309 		if (err || new == NULL /* duplicate */) {
3310 			free(path);
3311 			if (err)
3312 				break;
3313 		}
3314 	}
3315 
3316 	return err;
3317 }
3318 
3319 static const struct got_error *
3320 wrap_not_worktree_error(const struct got_error *orig_err,
3321     const char *cmdname, const char *path)
3322 {
3323 	const struct got_error *err;
3324 	struct got_repository *repo;
3325 	static char msg[512];
3326 	int *pack_fds = NULL;
3327 
3328 	err = got_repo_pack_fds_open(&pack_fds);
3329 	if (err)
3330 		return err;
3331 
3332 	err = got_repo_open(&repo, path, NULL, pack_fds);
3333 	if (err)
3334 		return orig_err;
3335 
3336 	snprintf(msg, sizeof(msg),
3337 	    "'got %s' needs a work tree in addition to a git repository\n"
3338 	    "Work trees can be checked out from this Git repository with "
3339 	    "'got checkout'.\n"
3340 	    "The got(1) manual page contains more information.", cmdname);
3341 	err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3342 	got_repo_close(repo);
3343 	if (pack_fds) {
3344 		const struct got_error *pack_err =
3345 		    got_repo_pack_fds_close(pack_fds);
3346 		if (err == NULL)
3347 			err = pack_err;
3348 	}
3349 	return err;
3350 }
3351 
3352 static const struct got_error *
3353 cmd_update(int argc, char *argv[])
3354 {
3355 	const struct got_error *error = NULL;
3356 	struct got_repository *repo = NULL;
3357 	struct got_worktree *worktree = NULL;
3358 	char *worktree_path = NULL;
3359 	struct got_object_id *commit_id = NULL;
3360 	char *commit_id_str = NULL;
3361 	const char *branch_name = NULL;
3362 	struct got_reference *head_ref = NULL;
3363 	struct got_pathlist_head paths;
3364 	struct got_pathlist_entry *pe;
3365 	int ch, verbosity = 0;
3366 	struct got_update_progress_arg upa;
3367 	int *pack_fds = NULL;
3368 
3369 	TAILQ_INIT(&paths);
3370 
3371 	while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3372 		switch (ch) {
3373 		case 'b':
3374 			branch_name = optarg;
3375 			break;
3376 		case 'c':
3377 			commit_id_str = strdup(optarg);
3378 			if (commit_id_str == NULL)
3379 				return got_error_from_errno("strdup");
3380 			break;
3381 		case 'q':
3382 			verbosity = -1;
3383 			break;
3384 		default:
3385 			usage_update();
3386 			/* NOTREACHED */
3387 		}
3388 	}
3389 
3390 	argc -= optind;
3391 	argv += optind;
3392 
3393 #ifndef PROFILE
3394 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3395 	    "unveil", NULL) == -1)
3396 		err(1, "pledge");
3397 #endif
3398 	worktree_path = getcwd(NULL, 0);
3399 	if (worktree_path == NULL) {
3400 		error = got_error_from_errno("getcwd");
3401 		goto done;
3402 	}
3403 
3404 	error = got_repo_pack_fds_open(&pack_fds);
3405 	if (error != NULL)
3406 		goto done;
3407 
3408 	error = got_worktree_open(&worktree, worktree_path);
3409 	if (error) {
3410 		if (error->code == GOT_ERR_NOT_WORKTREE)
3411 			error = wrap_not_worktree_error(error, "update",
3412 			    worktree_path);
3413 		goto done;
3414 	}
3415 
3416 	error = check_rebase_or_histedit_in_progress(worktree);
3417 	if (error)
3418 		goto done;
3419 
3420 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3421 	    NULL, pack_fds);
3422 	if (error != NULL)
3423 		goto done;
3424 
3425 	error = apply_unveil(got_repo_get_path(repo), 0,
3426 	    got_worktree_get_root_path(worktree));
3427 	if (error)
3428 		goto done;
3429 
3430 	error = check_merge_in_progress(worktree, repo);
3431 	if (error)
3432 		goto done;
3433 
3434 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3435 	if (error)
3436 		goto done;
3437 
3438 	error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3439 	    got_worktree_get_head_ref_name(worktree), 0);
3440 	if (error != NULL)
3441 		goto done;
3442 	if (commit_id_str == NULL) {
3443 		error = got_ref_resolve(&commit_id, repo, head_ref);
3444 		if (error != NULL)
3445 			goto done;
3446 		error = got_object_id_str(&commit_id_str, commit_id);
3447 		if (error != NULL)
3448 			goto done;
3449 	} else {
3450 		struct got_reflist_head refs;
3451 		TAILQ_INIT(&refs);
3452 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3453 		    NULL);
3454 		if (error)
3455 			goto done;
3456 		error = got_repo_match_object_id(&commit_id, NULL,
3457 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3458 		got_ref_list_free(&refs);
3459 		free(commit_id_str);
3460 		commit_id_str = NULL;
3461 		if (error)
3462 			goto done;
3463 		error = got_object_id_str(&commit_id_str, commit_id);
3464 		if (error)
3465 			goto done;
3466 	}
3467 
3468 	if (branch_name) {
3469 		struct got_object_id *head_commit_id;
3470 		TAILQ_FOREACH(pe, &paths, entry) {
3471 			if (pe->path_len == 0)
3472 				continue;
3473 			error = got_error_msg(GOT_ERR_BAD_PATH,
3474 			    "switching between branches requires that "
3475 			    "the entire work tree gets updated");
3476 			goto done;
3477 		}
3478 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
3479 		if (error)
3480 			goto done;
3481 		error = check_linear_ancestry(commit_id, head_commit_id, 0,
3482 		    repo);
3483 		free(head_commit_id);
3484 		if (error != NULL)
3485 			goto done;
3486 		error = check_same_branch(commit_id, head_ref, NULL, repo);
3487 		if (error)
3488 			goto done;
3489 		error = switch_head_ref(head_ref, commit_id, worktree, repo);
3490 		if (error)
3491 			goto done;
3492 	} else {
3493 		error = check_linear_ancestry(commit_id,
3494 		    got_worktree_get_base_commit_id(worktree), 0, repo);
3495 		if (error != NULL) {
3496 			if (error->code == GOT_ERR_ANCESTRY)
3497 				error = got_error(GOT_ERR_BRANCH_MOVED);
3498 			goto done;
3499 		}
3500 		error = check_same_branch(commit_id, head_ref, NULL, repo);
3501 		if (error)
3502 			goto done;
3503 	}
3504 
3505 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3506 	    commit_id) != 0) {
3507 		error = got_worktree_set_base_commit_id(worktree, repo,
3508 		    commit_id);
3509 		if (error)
3510 			goto done;
3511 	}
3512 
3513 	memset(&upa, 0, sizeof(upa));
3514 	upa.verbosity = verbosity;
3515 	error = got_worktree_checkout_files(worktree, &paths, repo,
3516 	    update_progress, &upa, check_cancelled, NULL);
3517 	if (error != NULL)
3518 		goto done;
3519 
3520 	if (upa.did_something) {
3521 		printf("Updated to %s: %s\n",
3522 		    got_worktree_get_head_ref_name(worktree), commit_id_str);
3523 	} else
3524 		printf("Already up-to-date\n");
3525 
3526 	print_update_progress_stats(&upa);
3527 done:
3528 	if (pack_fds) {
3529 		const struct got_error *pack_err =
3530 		    got_repo_pack_fds_close(pack_fds);
3531 		if (error == NULL)
3532 			error = pack_err;
3533 	}
3534 	free(worktree_path);
3535 	TAILQ_FOREACH(pe, &paths, entry)
3536 		free((char *)pe->path);
3537 	got_pathlist_free(&paths);
3538 	free(commit_id);
3539 	free(commit_id_str);
3540 	return error;
3541 }
3542 
3543 static const struct got_error *
3544 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3545     const char *path, int diff_context, int ignore_whitespace,
3546     int force_text_diff, struct got_repository *repo, FILE *outfile)
3547 {
3548 	const struct got_error *err = NULL;
3549 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3550 	FILE *f1 = NULL, *f2 = NULL;
3551 	int fd1 = -1, fd2 = -1;
3552 
3553 	fd1 = got_opentempfd();
3554 	if (fd1 == -1)
3555 		return got_error_from_errno("got_opentempfd");
3556 	fd2 = got_opentempfd();
3557 	if (fd2 == -1) {
3558 		err = got_error_from_errno("got_opentempfd");
3559 		goto done;
3560 	}
3561 
3562 	if (blob_id1) {
3563 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3564 		    fd1);
3565 		if (err)
3566 			goto done;
3567 		f1 = got_opentemp();
3568 		if (f1 == NULL) {
3569 			err = got_error_from_errno("got_opentemp");
3570 			goto done;
3571 		}
3572 	}
3573 
3574 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3575 	if (err)
3576 		goto done;
3577 
3578 	f2 = got_opentemp();
3579 	if (f2 == NULL) {
3580 		err = got_error_from_errno("got_opentemp");
3581 		goto done;
3582 	}
3583 
3584 	while (path[0] == '/')
3585 		path++;
3586 	err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3587 	    diff_context, ignore_whitespace, force_text_diff, outfile);
3588 done:
3589 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3590 		err = got_error_from_errno("close");
3591 	if (blob1)
3592 		got_object_blob_close(blob1);
3593 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3594 		err = got_error_from_errno("close");
3595 	got_object_blob_close(blob2);
3596 	if (f1 && fclose(f1) == EOF && err == NULL)
3597 		err = got_error_from_errno("fclose");
3598 	if (f2 && fclose(f2) == EOF && err == NULL)
3599 		err = got_error_from_errno("fclose");
3600 	return err;
3601 }
3602 
3603 static const struct got_error *
3604 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3605     const char *path, int diff_context, int ignore_whitespace,
3606     int force_text_diff, struct got_repository *repo, FILE *outfile)
3607 {
3608 	const struct got_error *err = NULL;
3609 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3610 	struct got_diff_blob_output_unidiff_arg arg;
3611 	FILE *f1 = NULL, *f2 = NULL;
3612 	int fd1 = -1, fd2 = -1;
3613 
3614 	if (tree_id1) {
3615 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3616 		if (err)
3617 			goto done;
3618 		f1 = got_opentemp();
3619 		if (f1 == NULL) {
3620 			err = got_error_from_errno("got_opentemp");
3621 			goto done;
3622 		}
3623 
3624 		fd1 = got_opentempfd();
3625 		if (fd1 == -1) {
3626 			err = got_error_from_errno("got_opentempfd");
3627 			goto done;
3628 		}
3629 	}
3630 
3631 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3632 	if (err)
3633 		goto done;
3634 
3635 	f2 = got_opentemp();
3636 	if (f2 == NULL) {
3637 		err = got_error_from_errno("got_opentemp");
3638 		goto done;
3639 	}
3640 	fd2 = got_opentempfd();
3641 	if (fd2 == -1) {
3642 		err = got_error_from_errno("got_opentempfd");
3643 		goto done;
3644 	}
3645 	arg.diff_context = diff_context;
3646 	arg.ignore_whitespace = ignore_whitespace;
3647 	arg.force_text_diff = force_text_diff;
3648 	arg.outfile = outfile;
3649 	arg.line_offsets = NULL;
3650 	arg.nlines = 0;
3651 	while (path[0] == '/')
3652 		path++;
3653 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3654 	    got_diff_blob_output_unidiff, &arg, 1);
3655 done:
3656 	if (tree1)
3657 		got_object_tree_close(tree1);
3658 	if (tree2)
3659 		got_object_tree_close(tree2);
3660 	if (f1 && fclose(f1) == EOF && err == NULL)
3661 		err = got_error_from_errno("fclose");
3662 	if (f2 && fclose(f2) == EOF && err == NULL)
3663 		err = got_error_from_errno("fclose");
3664 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3665 		err = got_error_from_errno("close");
3666 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3667 		err = got_error_from_errno("close");
3668 	return err;
3669 }
3670 
3671 static const struct got_error *
3672 get_changed_paths(struct got_pathlist_head *paths,
3673     struct got_commit_object *commit, struct got_repository *repo)
3674 {
3675 	const struct got_error *err = NULL;
3676 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3677 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3678 	struct got_object_qid *qid;
3679 
3680 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3681 	if (qid != NULL) {
3682 		struct got_commit_object *pcommit;
3683 		err = got_object_open_as_commit(&pcommit, repo,
3684 		    &qid->id);
3685 		if (err)
3686 			return err;
3687 
3688 		tree_id1 = got_object_id_dup(
3689 		    got_object_commit_get_tree_id(pcommit));
3690 		if (tree_id1 == NULL) {
3691 			got_object_commit_close(pcommit);
3692 			return got_error_from_errno("got_object_id_dup");
3693 		}
3694 		got_object_commit_close(pcommit);
3695 
3696 	}
3697 
3698 	if (tree_id1) {
3699 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3700 		if (err)
3701 			goto done;
3702 	}
3703 
3704 	tree_id2 = got_object_commit_get_tree_id(commit);
3705 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3706 	if (err)
3707 		goto done;
3708 
3709 	err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
3710 	    got_diff_tree_collect_changed_paths, paths, 0);
3711 done:
3712 	if (tree1)
3713 		got_object_tree_close(tree1);
3714 	if (tree2)
3715 		got_object_tree_close(tree2);
3716 	free(tree_id1);
3717 	return err;
3718 }
3719 
3720 static const struct got_error *
3721 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3722     const char *path, int diff_context, struct got_repository *repo,
3723     FILE *outfile)
3724 {
3725 	const struct got_error *err = NULL;
3726 	struct got_commit_object *pcommit = NULL;
3727 	char *id_str1 = NULL, *id_str2 = NULL;
3728 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3729 	struct got_object_qid *qid;
3730 
3731 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3732 	if (qid != NULL) {
3733 		err = got_object_open_as_commit(&pcommit, repo,
3734 		    &qid->id);
3735 		if (err)
3736 			return err;
3737 		err = got_object_id_str(&id_str1, &qid->id);
3738 		if (err)
3739 			goto done;
3740 	}
3741 
3742 	err = got_object_id_str(&id_str2, id);
3743 	if (err)
3744 		goto done;
3745 
3746 	if (path && path[0] != '\0') {
3747 		int obj_type;
3748 		err = got_object_id_by_path(&obj_id2, repo, commit, path);
3749 		if (err)
3750 			goto done;
3751 		if (pcommit) {
3752 			err = got_object_id_by_path(&obj_id1, repo,
3753 			    pcommit, path);
3754 			if (err) {
3755 				if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3756 					free(obj_id2);
3757 					goto done;
3758 				}
3759 			}
3760 		}
3761 		err = got_object_get_type(&obj_type, repo, obj_id2);
3762 		if (err) {
3763 			free(obj_id2);
3764 			goto done;
3765 		}
3766 		fprintf(outfile,
3767 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3768 		fprintf(outfile, "commit - %s\n",
3769 		    id_str1 ? id_str1 : "/dev/null");
3770 		fprintf(outfile, "commit + %s\n", id_str2);
3771 		switch (obj_type) {
3772 		case GOT_OBJ_TYPE_BLOB:
3773 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3774 			    0, 0, repo, outfile);
3775 			break;
3776 		case GOT_OBJ_TYPE_TREE:
3777 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
3778 			    0, 0, repo, outfile);
3779 			break;
3780 		default:
3781 			err = got_error(GOT_ERR_OBJ_TYPE);
3782 			break;
3783 		}
3784 		free(obj_id1);
3785 		free(obj_id2);
3786 	} else {
3787 		obj_id2 = got_object_commit_get_tree_id(commit);
3788 		if (pcommit)
3789 			obj_id1 = got_object_commit_get_tree_id(pcommit);
3790 		fprintf(outfile,
3791 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3792 		fprintf(outfile, "commit - %s\n",
3793 		    id_str1 ? id_str1 : "/dev/null");
3794 		fprintf(outfile, "commit + %s\n", id_str2);
3795 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3796 		    repo, outfile);
3797 	}
3798 done:
3799 	free(id_str1);
3800 	free(id_str2);
3801 	if (pcommit)
3802 		got_object_commit_close(pcommit);
3803 	return err;
3804 }
3805 
3806 static char *
3807 get_datestr(time_t *time, char *datebuf)
3808 {
3809 	struct tm mytm, *tm;
3810 	char *p, *s;
3811 
3812 	tm = gmtime_r(time, &mytm);
3813 	if (tm == NULL)
3814 		return NULL;
3815 	s = asctime_r(tm, datebuf);
3816 	if (s == NULL)
3817 		return NULL;
3818 	p = strchr(s, '\n');
3819 	if (p)
3820 		*p = '\0';
3821 	return s;
3822 }
3823 
3824 static const struct got_error *
3825 match_commit(int *have_match, struct got_object_id *id,
3826     struct got_commit_object *commit, regex_t *regex)
3827 {
3828 	const struct got_error *err = NULL;
3829 	regmatch_t regmatch;
3830 	char *id_str = NULL, *logmsg = NULL;
3831 
3832 	*have_match = 0;
3833 
3834 	err = got_object_id_str(&id_str, id);
3835 	if (err)
3836 		return err;
3837 
3838 	err = got_object_commit_get_logmsg(&logmsg, commit);
3839 	if (err)
3840 		goto done;
3841 
3842 	if (regexec(regex, got_object_commit_get_author(commit), 1,
3843 	    &regmatch, 0) == 0 ||
3844 	    regexec(regex, got_object_commit_get_committer(commit), 1,
3845 	    &regmatch, 0) == 0 ||
3846 	    regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
3847 	    regexec(regex, logmsg, 1, &regmatch, 0) == 0)
3848 		*have_match = 1;
3849 done:
3850 	free(id_str);
3851 	free(logmsg);
3852 	return err;
3853 }
3854 
3855 static void
3856 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3857     regex_t *regex)
3858 {
3859 	regmatch_t regmatch;
3860 	struct got_pathlist_entry *pe;
3861 
3862 	*have_match = 0;
3863 
3864 	TAILQ_FOREACH(pe, changed_paths, entry) {
3865 		if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
3866 			*have_match = 1;
3867 			break;
3868 		}
3869 	}
3870 }
3871 
3872 static const struct got_error *
3873 match_patch(int *have_match, struct got_commit_object *commit,
3874     struct got_object_id *id, const char *path, int diff_context,
3875     struct got_repository *repo, regex_t *regex, FILE *f)
3876 {
3877 	const struct got_error *err = NULL;
3878 	char *line = NULL;
3879 	size_t linesize = 0;
3880 	ssize_t linelen;
3881 	regmatch_t regmatch;
3882 
3883 	*have_match = 0;
3884 
3885 	err = got_opentemp_truncate(f);
3886 	if (err)
3887 		return err;
3888 
3889 	err = print_patch(commit, id, path, diff_context, repo, f);
3890 	if (err)
3891 		goto done;
3892 
3893 	if (fseeko(f, 0L, SEEK_SET) == -1) {
3894 		err = got_error_from_errno("fseeko");
3895 		goto done;
3896 	}
3897 
3898 	while ((linelen = getline(&line, &linesize, f)) != -1) {
3899 		if (regexec(regex, line, 1, &regmatch, 0) == 0) {
3900 			*have_match = 1;
3901 			break;
3902 		}
3903 	}
3904 done:
3905 	free(line);
3906 	return err;
3907 }
3908 
3909 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3910 
3911 static const struct got_error*
3912 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3913     struct got_object_id *id, struct got_repository *repo,
3914     int local_only)
3915 {
3916 	static const struct got_error *err = NULL;
3917 	struct got_reflist_entry *re;
3918 	char *s;
3919 	const char *name;
3920 
3921 	*refs_str = NULL;
3922 
3923 	TAILQ_FOREACH(re, refs, entry) {
3924 		struct got_tag_object *tag = NULL;
3925 		struct got_object_id *ref_id;
3926 		int cmp;
3927 
3928 		name = got_ref_get_name(re->ref);
3929 		if (strcmp(name, GOT_REF_HEAD) == 0)
3930 			continue;
3931 		if (strncmp(name, "refs/", 5) == 0)
3932 			name += 5;
3933 		if (strncmp(name, "got/", 4) == 0)
3934 			continue;
3935 		if (strncmp(name, "heads/", 6) == 0)
3936 			name += 6;
3937 		if (strncmp(name, "remotes/", 8) == 0) {
3938 			if (local_only)
3939 				continue;
3940 			name += 8;
3941 			s = strstr(name, "/" GOT_REF_HEAD);
3942 			if (s != NULL && s[strlen(s)] == '\0')
3943 				continue;
3944 		}
3945 		err = got_ref_resolve(&ref_id, repo, re->ref);
3946 		if (err)
3947 			break;
3948 		if (strncmp(name, "tags/", 5) == 0) {
3949 			err = got_object_open_as_tag(&tag, repo, ref_id);
3950 			if (err) {
3951 				if (err->code != GOT_ERR_OBJ_TYPE) {
3952 					free(ref_id);
3953 					break;
3954 				}
3955 				/* Ref points at something other than a tag. */
3956 				err = NULL;
3957 				tag = NULL;
3958 			}
3959 		}
3960 		cmp = got_object_id_cmp(tag ?
3961 		    got_object_tag_get_object_id(tag) : ref_id, id);
3962 		free(ref_id);
3963 		if (tag)
3964 			got_object_tag_close(tag);
3965 		if (cmp != 0)
3966 			continue;
3967 		s = *refs_str;
3968 		if (asprintf(refs_str, "%s%s%s", s ? s : "",
3969 		    s ? ", " : "", name) == -1) {
3970 			err = got_error_from_errno("asprintf");
3971 			free(s);
3972 			*refs_str = NULL;
3973 			break;
3974 		}
3975 		free(s);
3976 	}
3977 
3978 	return err;
3979 }
3980 
3981 static const struct got_error *
3982 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3983     struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3984 {
3985 	const struct got_error *err = NULL;
3986 	char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3987 	char *comma, *s, *nl;
3988 	struct got_reflist_head *refs;
3989 	char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3990 	struct tm tm;
3991 	time_t committer_time;
3992 
3993 	refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3994 	if (refs) {
3995 		err = build_refs_str(&ref_str, refs, id, repo, 1);
3996 		if (err)
3997 			return err;
3998 
3999 		/* Display the first matching ref only. */
4000 		if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4001 			*comma = '\0';
4002 	}
4003 
4004 	if (ref_str == NULL) {
4005 		err = got_object_id_str(&id_str, id);
4006 		if (err)
4007 			return err;
4008 	}
4009 
4010 	committer_time = got_object_commit_get_committer_time(commit);
4011 	if (gmtime_r(&committer_time, &tm) == NULL) {
4012 		err = got_error_from_errno("gmtime_r");
4013 		goto done;
4014 	}
4015 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4016 		err = got_error(GOT_ERR_NO_SPACE);
4017 		goto done;
4018 	}
4019 
4020 	err = got_object_commit_get_logmsg(&logmsg0, commit);
4021 	if (err)
4022 		goto done;
4023 
4024 	s = logmsg0;
4025 	while (isspace((unsigned char)s[0]))
4026 		s++;
4027 
4028 	nl = strchr(s, '\n');
4029 	if (nl) {
4030 		*nl = '\0';
4031 	}
4032 
4033 	if (ref_str)
4034 		printf("%s%-7s %s\n", datebuf, ref_str, s);
4035 	else
4036 		printf("%s%.7s %s\n", datebuf, id_str, s);
4037 
4038 	if (fflush(stdout) != 0 && err == NULL)
4039 		err = got_error_from_errno("fflush");
4040 done:
4041 	free(id_str);
4042 	free(ref_str);
4043 	free(logmsg0);
4044 	return err;
4045 }
4046 
4047 static const struct got_error *
4048 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4049     struct got_repository *repo, const char *path,
4050     struct got_pathlist_head *changed_paths, int show_patch,
4051     int diff_context, struct got_reflist_object_id_map *refs_idmap,
4052     const char *custom_refs_str)
4053 {
4054 	const struct got_error *err = NULL;
4055 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
4056 	char datebuf[26];
4057 	time_t committer_time;
4058 	const char *author, *committer;
4059 	char *refs_str = NULL;
4060 
4061 	err = got_object_id_str(&id_str, id);
4062 	if (err)
4063 		return err;
4064 
4065 	if (custom_refs_str == NULL) {
4066 		struct got_reflist_head *refs;
4067 		refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4068 		if (refs) {
4069 			err = build_refs_str(&refs_str, refs, id, repo, 0);
4070 			if (err)
4071 				goto done;
4072 		}
4073 	}
4074 
4075 	printf(GOT_COMMIT_SEP_STR);
4076 	if (custom_refs_str)
4077 		printf("commit %s (%s)\n", id_str, custom_refs_str); 
4078 	else
4079 		printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4080 		    refs_str ? refs_str : "", refs_str ? ")" : "");
4081 	free(id_str);
4082 	id_str = NULL;
4083 	free(refs_str);
4084 	refs_str = NULL;
4085 	printf("from: %s\n", got_object_commit_get_author(commit));
4086 	committer_time = got_object_commit_get_committer_time(commit);
4087 	datestr = get_datestr(&committer_time, datebuf);
4088 	if (datestr)
4089 		printf("date: %s UTC\n", datestr);
4090 	author = got_object_commit_get_author(commit);
4091 	committer = got_object_commit_get_committer(commit);
4092 	if (strcmp(author, committer) != 0)
4093 		printf("via: %s\n", committer);
4094 	if (got_object_commit_get_nparents(commit) > 1) {
4095 		const struct got_object_id_queue *parent_ids;
4096 		struct got_object_qid *qid;
4097 		int n = 1;
4098 		parent_ids = got_object_commit_get_parent_ids(commit);
4099 		STAILQ_FOREACH(qid, parent_ids, entry) {
4100 			err = got_object_id_str(&id_str, &qid->id);
4101 			if (err)
4102 				goto done;
4103 			printf("parent %d: %s\n", n++, id_str);
4104 			free(id_str);
4105 			id_str = NULL;
4106 		}
4107 	}
4108 
4109 	err = got_object_commit_get_logmsg(&logmsg0, commit);
4110 	if (err)
4111 		goto done;
4112 
4113 	logmsg = logmsg0;
4114 	do {
4115 		line = strsep(&logmsg, "\n");
4116 		if (line)
4117 			printf(" %s\n", line);
4118 	} while (line);
4119 	free(logmsg0);
4120 
4121 	if (changed_paths) {
4122 		struct got_pathlist_entry *pe;
4123 		TAILQ_FOREACH(pe, changed_paths, entry) {
4124 			struct got_diff_changed_path *cp = pe->data;
4125 			printf(" %c  %s\n", cp->status, pe->path);
4126 		}
4127 		printf("\n");
4128 	}
4129 	if (show_patch) {
4130 		err = print_patch(commit, id, path, diff_context, repo, stdout);
4131 		if (err == 0)
4132 			printf("\n");
4133 	}
4134 
4135 	if (fflush(stdout) != 0 && err == NULL)
4136 		err = got_error_from_errno("fflush");
4137 done:
4138 	free(id_str);
4139 	free(refs_str);
4140 	return err;
4141 }
4142 
4143 static const struct got_error *
4144 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4145     struct got_repository *repo, const char *path, int show_changed_paths,
4146     int show_patch, const char *search_pattern, int diff_context, int limit,
4147     int log_branches, int reverse_display_order,
4148     struct got_reflist_object_id_map *refs_idmap, int one_line,
4149     FILE *tmpfile)
4150 {
4151 	const struct got_error *err;
4152 	struct got_commit_graph *graph;
4153 	regex_t regex;
4154 	int have_match;
4155 	struct got_object_id_queue reversed_commits;
4156 	struct got_object_qid *qid;
4157 	struct got_commit_object *commit;
4158 	struct got_pathlist_head changed_paths;
4159 	struct got_pathlist_entry *pe;
4160 
4161 	STAILQ_INIT(&reversed_commits);
4162 	TAILQ_INIT(&changed_paths);
4163 
4164 	if (search_pattern && regcomp(&regex, search_pattern,
4165 	    REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4166 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
4167 
4168 	err = got_commit_graph_open(&graph, path, !log_branches);
4169 	if (err)
4170 		return err;
4171 	err = got_commit_graph_iter_start(graph, root_id, repo,
4172 	    check_cancelled, NULL);
4173 	if (err)
4174 		goto done;
4175 	for (;;) {
4176 		struct got_object_id *id;
4177 
4178 		if (sigint_received || sigpipe_received)
4179 			break;
4180 
4181 		err = got_commit_graph_iter_next(&id, graph, repo,
4182 		    check_cancelled, NULL);
4183 		if (err) {
4184 			if (err->code == GOT_ERR_ITER_COMPLETED)
4185 				err = NULL;
4186 			break;
4187 		}
4188 		if (id == NULL)
4189 			break;
4190 
4191 		err = got_object_open_as_commit(&commit, repo, id);
4192 		if (err)
4193 			break;
4194 
4195 		if (show_changed_paths && !reverse_display_order) {
4196 			err = get_changed_paths(&changed_paths, commit, repo);
4197 			if (err)
4198 				break;
4199 		}
4200 
4201 		if (search_pattern) {
4202 			err = match_commit(&have_match, id, commit, &regex);
4203 			if (err) {
4204 				got_object_commit_close(commit);
4205 				break;
4206 			}
4207 			if (have_match == 0 && show_changed_paths)
4208 				match_changed_paths(&have_match,
4209 				    &changed_paths, &regex);
4210 			if (have_match == 0 && show_patch) {
4211 				err = match_patch(&have_match, commit, id,
4212 				    path, diff_context, repo, &regex,
4213 				    tmpfile);
4214 				if (err)
4215 					break;
4216 			}
4217 			if (have_match == 0) {
4218 				got_object_commit_close(commit);
4219 				TAILQ_FOREACH(pe, &changed_paths, entry) {
4220 					free((char *)pe->path);
4221 					free(pe->data);
4222 				}
4223 				got_pathlist_free(&changed_paths);
4224 				continue;
4225 			}
4226 		}
4227 
4228 		if (reverse_display_order) {
4229 			err = got_object_qid_alloc(&qid, id);
4230 			if (err)
4231 				break;
4232 			STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4233 			got_object_commit_close(commit);
4234 		} else {
4235 			if (one_line)
4236 				err = print_commit_oneline(commit, id,
4237 				    repo, refs_idmap);
4238 			else
4239 				err = print_commit(commit, id, repo, path,
4240 				    show_changed_paths ? &changed_paths : NULL,
4241 				    show_patch, diff_context, refs_idmap, NULL);
4242 			got_object_commit_close(commit);
4243 			if (err)
4244 				break;
4245 		}
4246 		if ((limit && --limit == 0) ||
4247 		    (end_id && got_object_id_cmp(id, end_id) == 0))
4248 			break;
4249 
4250 		TAILQ_FOREACH(pe, &changed_paths, entry) {
4251 			free((char *)pe->path);
4252 			free(pe->data);
4253 		}
4254 		got_pathlist_free(&changed_paths);
4255 	}
4256 	if (reverse_display_order) {
4257 		STAILQ_FOREACH(qid, &reversed_commits, entry) {
4258 			err = got_object_open_as_commit(&commit, repo,
4259 			    &qid->id);
4260 			if (err)
4261 				break;
4262 			if (show_changed_paths) {
4263 				err = get_changed_paths(&changed_paths,
4264 				    commit, repo);
4265 				if (err)
4266 					break;
4267 			}
4268 			if (one_line)
4269 				err = print_commit_oneline(commit, &qid->id,
4270 				    repo, refs_idmap);
4271 			else
4272 				err = print_commit(commit, &qid->id, repo, path,
4273 				    show_changed_paths ? &changed_paths : NULL,
4274 				    show_patch, diff_context, refs_idmap, NULL);
4275 			got_object_commit_close(commit);
4276 			if (err)
4277 				break;
4278 			TAILQ_FOREACH(pe, &changed_paths, entry) {
4279 				free((char *)pe->path);
4280 				free(pe->data);
4281 			}
4282 			got_pathlist_free(&changed_paths);
4283 		}
4284 	}
4285 done:
4286 	while (!STAILQ_EMPTY(&reversed_commits)) {
4287 		qid = STAILQ_FIRST(&reversed_commits);
4288 		STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4289 		got_object_qid_free(qid);
4290 	}
4291 	TAILQ_FOREACH(pe, &changed_paths, entry) {
4292 		free((char *)pe->path);
4293 		free(pe->data);
4294 	}
4295 	got_pathlist_free(&changed_paths);
4296 	if (search_pattern)
4297 		regfree(&regex);
4298 	got_commit_graph_close(graph);
4299 	return err;
4300 }
4301 
4302 __dead static void
4303 usage_log(void)
4304 {
4305 	fprintf(stderr, "usage: %s log [-b] [-p] [-P] [-s] [-c commit] "
4306 	    "[-C number] [ -l N ] [-x commit] [-S search-pattern] "
4307 	    "[-r repository-path] [-R] [path]\n", getprogname());
4308 	exit(1);
4309 }
4310 
4311 static int
4312 get_default_log_limit(void)
4313 {
4314 	const char *got_default_log_limit;
4315 	long long n;
4316 	const char *errstr;
4317 
4318 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4319 	if (got_default_log_limit == NULL)
4320 		return 0;
4321 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4322 	if (errstr != NULL)
4323 		return 0;
4324 	return n;
4325 }
4326 
4327 static const struct got_error *
4328 cmd_log(int argc, char *argv[])
4329 {
4330 	const struct got_error *error;
4331 	struct got_repository *repo = NULL;
4332 	struct got_worktree *worktree = NULL;
4333 	struct got_object_id *start_id = NULL, *end_id = NULL;
4334 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4335 	const char *start_commit = NULL, *end_commit = NULL;
4336 	const char *search_pattern = NULL;
4337 	int diff_context = -1, ch;
4338 	int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4339 	int reverse_display_order = 0, one_line = 0;
4340 	const char *errstr;
4341 	struct got_reflist_head refs;
4342 	struct got_reflist_object_id_map *refs_idmap = NULL;
4343 	FILE *tmpfile = NULL;
4344 	int *pack_fds = NULL;
4345 
4346 	TAILQ_INIT(&refs);
4347 
4348 #ifndef PROFILE
4349 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4350 	    NULL)
4351 	    == -1)
4352 		err(1, "pledge");
4353 #endif
4354 
4355 	limit = get_default_log_limit();
4356 
4357 	while ((ch = getopt(argc, argv, "bpPc:C:l:r:RsS:x:")) != -1) {
4358 		switch (ch) {
4359 		case 'p':
4360 			show_patch = 1;
4361 			break;
4362 		case 'P':
4363 			show_changed_paths = 1;
4364 			break;
4365 		case 'c':
4366 			start_commit = optarg;
4367 			break;
4368 		case 'C':
4369 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4370 			    &errstr);
4371 			if (errstr != NULL)
4372 				errx(1, "number of context lines is %s: %s",
4373 				    errstr, optarg);
4374 			break;
4375 		case 'l':
4376 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
4377 			if (errstr != NULL)
4378 				errx(1, "number of commits is %s: %s",
4379 				    errstr, optarg);
4380 			break;
4381 		case 'b':
4382 			log_branches = 1;
4383 			break;
4384 		case 'r':
4385 			repo_path = realpath(optarg, NULL);
4386 			if (repo_path == NULL)
4387 				return got_error_from_errno2("realpath",
4388 				    optarg);
4389 			got_path_strip_trailing_slashes(repo_path);
4390 			break;
4391 		case 'R':
4392 			reverse_display_order = 1;
4393 			break;
4394 		case 's':
4395 			one_line = 1;
4396 			break;
4397 		case 'S':
4398 			search_pattern = optarg;
4399 			break;
4400 		case 'x':
4401 			end_commit = optarg;
4402 			break;
4403 		default:
4404 			usage_log();
4405 			/* NOTREACHED */
4406 		}
4407 	}
4408 
4409 	argc -= optind;
4410 	argv += optind;
4411 
4412 	if (diff_context == -1)
4413 		diff_context = 3;
4414 	else if (!show_patch)
4415 		errx(1, "-C requires -p");
4416 
4417 	if (one_line && (show_patch || show_changed_paths))
4418 		errx(1, "cannot use -s with -p or -P");
4419 
4420 	cwd = getcwd(NULL, 0);
4421 	if (cwd == NULL) {
4422 		error = got_error_from_errno("getcwd");
4423 		goto done;
4424 	}
4425 
4426 	error = got_repo_pack_fds_open(&pack_fds);
4427 	if (error != NULL)
4428 		goto done;
4429 
4430 	if (repo_path == NULL) {
4431 		error = got_worktree_open(&worktree, cwd);
4432 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4433 			goto done;
4434 		error = NULL;
4435 	}
4436 
4437 	if (argc == 1) {
4438 		if (worktree) {
4439 			error = got_worktree_resolve_path(&path, worktree,
4440 			    argv[0]);
4441 			if (error)
4442 				goto done;
4443 		} else {
4444 			path = strdup(argv[0]);
4445 			if (path == NULL) {
4446 				error = got_error_from_errno("strdup");
4447 				goto done;
4448 			}
4449 		}
4450 	} else if (argc != 0)
4451 		usage_log();
4452 
4453 	if (repo_path == NULL) {
4454 		repo_path = worktree ?
4455 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4456 	}
4457 	if (repo_path == NULL) {
4458 		error = got_error_from_errno("strdup");
4459 		goto done;
4460 	}
4461 
4462 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4463 	if (error != NULL)
4464 		goto done;
4465 
4466 	error = apply_unveil(got_repo_get_path(repo), 1,
4467 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4468 	if (error)
4469 		goto done;
4470 
4471 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4472 	if (error)
4473 		goto done;
4474 
4475 	error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4476 	if (error)
4477 		goto done;
4478 
4479 	if (start_commit == NULL) {
4480 		struct got_reference *head_ref;
4481 		struct got_commit_object *commit = NULL;
4482 		error = got_ref_open(&head_ref, repo,
4483 		    worktree ? got_worktree_get_head_ref_name(worktree)
4484 		    : GOT_REF_HEAD, 0);
4485 		if (error != NULL)
4486 			goto done;
4487 		error = got_ref_resolve(&start_id, repo, head_ref);
4488 		got_ref_close(head_ref);
4489 		if (error != NULL)
4490 			goto done;
4491 		error = got_object_open_as_commit(&commit, repo,
4492 		    start_id);
4493 		if (error != NULL)
4494 			goto done;
4495 		got_object_commit_close(commit);
4496 	} else {
4497 		error = got_repo_match_object_id(&start_id, NULL,
4498 		    start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4499 		if (error != NULL)
4500 			goto done;
4501 	}
4502 	if (end_commit != NULL) {
4503 		error = got_repo_match_object_id(&end_id, NULL,
4504 		    end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4505 		if (error != NULL)
4506 			goto done;
4507 	}
4508 
4509 	if (worktree) {
4510 		/*
4511 		 * If a path was specified on the command line it was resolved
4512 		 * to a path in the work tree above. Prepend the work tree's
4513 		 * path prefix to obtain the corresponding in-repository path.
4514 		 */
4515 		if (path) {
4516 			const char *prefix;
4517 			prefix = got_worktree_get_path_prefix(worktree);
4518 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
4519 			    (path[0] != '\0') ? "/" : "", path) == -1) {
4520 				error = got_error_from_errno("asprintf");
4521 				goto done;
4522 			}
4523 		}
4524 	} else
4525 		error = got_repo_map_path(&in_repo_path, repo,
4526 		    path ? path : "");
4527 	if (error != NULL)
4528 		goto done;
4529 	if (in_repo_path) {
4530 		free(path);
4531 		path = in_repo_path;
4532 	}
4533 
4534 	if (worktree) {
4535 		/* Release work tree lock. */
4536 		got_worktree_close(worktree);
4537 		worktree = NULL;
4538 	}
4539 
4540 	if (search_pattern && show_patch) {
4541 		tmpfile = got_opentemp();
4542 		if (tmpfile == NULL) {
4543 			error = got_error_from_errno("got_opentemp");
4544 			goto done;
4545 		}
4546 	}
4547 
4548 	error = print_commits(start_id, end_id, repo, path ? path : "",
4549 	    show_changed_paths, show_patch, search_pattern, diff_context,
4550 	    limit, log_branches, reverse_display_order, refs_idmap, one_line,
4551 	    tmpfile);
4552 done:
4553 	free(path);
4554 	free(repo_path);
4555 	free(cwd);
4556 	if (worktree)
4557 		got_worktree_close(worktree);
4558 	if (repo) {
4559 		const struct got_error *close_err = got_repo_close(repo);
4560 		if (error == NULL)
4561 			error = close_err;
4562 	}
4563 	if (pack_fds) {
4564 		const struct got_error *pack_err =
4565 		    got_repo_pack_fds_close(pack_fds);
4566 		if (error == NULL)
4567 			error = pack_err;
4568 	}
4569 	if (refs_idmap)
4570 		got_reflist_object_id_map_free(refs_idmap);
4571 	if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4572 		error = got_error_from_errno("fclose");
4573 	got_ref_list_free(&refs);
4574 	return error;
4575 }
4576 
4577 __dead static void
4578 usage_diff(void)
4579 {
4580 	fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4581 	    "[-r repository-path] [-s] [-w] [-P] "
4582 	    "[object1 object2 | path ...]\n", getprogname());
4583 	exit(1);
4584 }
4585 
4586 struct print_diff_arg {
4587 	struct got_repository *repo;
4588 	struct got_worktree *worktree;
4589 	int diff_context;
4590 	const char *id_str;
4591 	int header_shown;
4592 	int diff_staged;
4593 	int ignore_whitespace;
4594 	int force_text_diff;
4595 };
4596 
4597 /*
4598  * Create a file which contains the target path of a symlink so we can feed
4599  * it as content to the diff engine.
4600  */
4601 static const struct got_error *
4602 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4603     const char *abspath)
4604 {
4605 	const struct got_error *err = NULL;
4606 	char target_path[PATH_MAX];
4607 	ssize_t target_len, outlen;
4608 
4609 	*fd = -1;
4610 
4611 	if (dirfd != -1) {
4612 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4613 		if (target_len == -1)
4614 			return got_error_from_errno2("readlinkat", abspath);
4615 	} else {
4616 		target_len = readlink(abspath, target_path, PATH_MAX);
4617 		if (target_len == -1)
4618 			return got_error_from_errno2("readlink", abspath);
4619 	}
4620 
4621 	*fd = got_opentempfd();
4622 	if (*fd == -1)
4623 		return got_error_from_errno("got_opentempfd");
4624 
4625 	outlen = write(*fd, target_path, target_len);
4626 	if (outlen == -1) {
4627 		err = got_error_from_errno("got_opentempfd");
4628 		goto done;
4629 	}
4630 
4631 	if (lseek(*fd, 0, SEEK_SET) == -1) {
4632 		err = got_error_from_errno2("lseek", abspath);
4633 		goto done;
4634 	}
4635 done:
4636 	if (err) {
4637 		close(*fd);
4638 		*fd = -1;
4639 	}
4640 	return err;
4641 }
4642 
4643 static const struct got_error *
4644 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4645     const char *path, struct got_object_id *blob_id,
4646     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4647     int dirfd, const char *de_name)
4648 {
4649 	struct print_diff_arg *a = arg;
4650 	const struct got_error *err = NULL;
4651 	struct got_blob_object *blob1 = NULL;
4652 	int fd = -1, fd1 = -1, fd2 = -1;
4653 	FILE *f1 = NULL, *f2 = NULL;
4654 	char *abspath = NULL, *label1 = NULL;
4655 	struct stat sb;
4656 	off_t size1 = 0;
4657 
4658 	if (a->diff_staged) {
4659 		if (staged_status != GOT_STATUS_MODIFY &&
4660 		    staged_status != GOT_STATUS_ADD &&
4661 		    staged_status != GOT_STATUS_DELETE)
4662 			return NULL;
4663 	} else {
4664 		if (staged_status == GOT_STATUS_DELETE)
4665 			return NULL;
4666 		if (status == GOT_STATUS_NONEXISTENT)
4667 			return got_error_set_errno(ENOENT, path);
4668 		if (status != GOT_STATUS_MODIFY &&
4669 		    status != GOT_STATUS_ADD &&
4670 		    status != GOT_STATUS_DELETE &&
4671 		    status != GOT_STATUS_CONFLICT)
4672 			return NULL;
4673 	}
4674 
4675 	if (!a->header_shown) {
4676 		printf("diff %s%s\n", a->diff_staged ? "-s " : "",
4677 		    got_worktree_get_root_path(a->worktree));
4678 		printf("commit - %s\n", a->id_str);
4679 		printf("path + %s%s\n",
4680 		    got_worktree_get_root_path(a->worktree),
4681 		    a->diff_staged ? " (staged changes)" : "");
4682 		a->header_shown = 1;
4683 	}
4684 
4685 	if (a->diff_staged) {
4686 		const char *label1 = NULL, *label2 = NULL;
4687 		switch (staged_status) {
4688 		case GOT_STATUS_MODIFY:
4689 			label1 = path;
4690 			label2 = path;
4691 			break;
4692 		case GOT_STATUS_ADD:
4693 			label2 = path;
4694 			break;
4695 		case GOT_STATUS_DELETE:
4696 			label1 = path;
4697 			break;
4698 		default:
4699 			return got_error(GOT_ERR_FILE_STATUS);
4700 		}
4701 		f1 = got_opentemp();
4702 		if (f1 == NULL) {
4703 			err = got_error_from_errno("got_opentemp");
4704 			goto done;
4705 		}
4706 		f2 = got_opentemp();
4707 		if (f2 == NULL) {
4708 			err = got_error_from_errno("got_opentemp");
4709 			goto done;
4710 		}
4711 		fd1 = got_opentempfd();
4712 		if (fd1 == -1) {
4713 			err = got_error_from_errno("got_opentempfd");
4714 			goto done;
4715 		}
4716 		fd2 = got_opentempfd();
4717 		if (fd2 == -1) {
4718 			err = got_error_from_errno("got_opentempfd");
4719 			goto done;
4720 		}
4721 		err = got_diff_objects_as_blobs(NULL, NULL, f1, f2, fd1, fd2,
4722 		    blob_id, staged_blob_id, label1, label2, a->diff_context,
4723 		    a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4724 		goto done;
4725 	}
4726 
4727 	fd1 = got_opentempfd();
4728 	if (fd1 == -1) {
4729 		err = got_error_from_errno("got_opentempfd");
4730 		goto done;
4731 	}
4732 
4733 	if (staged_status == GOT_STATUS_ADD ||
4734 	    staged_status == GOT_STATUS_MODIFY) {
4735 		char *id_str;
4736 		err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4737 		    8192, fd1);
4738 		if (err)
4739 			goto done;
4740 		err = got_object_id_str(&id_str, staged_blob_id);
4741 		if (err)
4742 			goto done;
4743 		if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4744 			err = got_error_from_errno("asprintf");
4745 			free(id_str);
4746 			goto done;
4747 		}
4748 		free(id_str);
4749 	} else if (status != GOT_STATUS_ADD) {
4750 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4751 		    fd1);
4752 		if (err)
4753 			goto done;
4754 	}
4755 
4756 	if (status != GOT_STATUS_DELETE) {
4757 		if (asprintf(&abspath, "%s/%s",
4758 		    got_worktree_get_root_path(a->worktree), path) == -1) {
4759 			err = got_error_from_errno("asprintf");
4760 			goto done;
4761 		}
4762 
4763 		if (dirfd != -1) {
4764 			fd = openat(dirfd, de_name,
4765 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4766 			if (fd == -1) {
4767 				if (!got_err_open_nofollow_on_symlink()) {
4768 					err = got_error_from_errno2("openat",
4769 					    abspath);
4770 					goto done;
4771 				}
4772 				err = get_symlink_target_file(&fd, dirfd,
4773 				    de_name, abspath);
4774 				if (err)
4775 					goto done;
4776 			}
4777 		} else {
4778 			fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4779 			if (fd == -1) {
4780 				if (!got_err_open_nofollow_on_symlink()) {
4781 					err = got_error_from_errno2("open",
4782 					    abspath);
4783 					goto done;
4784 				}
4785 				err = get_symlink_target_file(&fd, dirfd,
4786 				    de_name, abspath);
4787 				if (err)
4788 					goto done;
4789 			}
4790 		}
4791 		if (fstat(fd, &sb) == -1) {
4792 			err = got_error_from_errno2("fstat", abspath);
4793 			goto done;
4794 		}
4795 		f2 = fdopen(fd, "r");
4796 		if (f2 == NULL) {
4797 			err = got_error_from_errno2("fdopen", abspath);
4798 			goto done;
4799 		}
4800 		fd = -1;
4801 	} else
4802 		sb.st_size = 0;
4803 
4804 	if (blob1) {
4805 		f1 = got_opentemp();
4806 		if (f1 == NULL) {
4807 			err = got_error_from_errno("got_opentemp");
4808 			goto done;
4809 		}
4810 		err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
4811 		    blob1);
4812 		if (err)
4813 			goto done;
4814 	}
4815 
4816 	err = got_diff_blob_file(blob1, f1, size1, label1, f2, sb.st_size,
4817 	    path, a->diff_context, a->ignore_whitespace, a->force_text_diff,
4818 	    stdout);
4819 done:
4820 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4821 		err = got_error_from_errno("close");
4822 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4823 		err = got_error_from_errno("close");
4824 	if (blob1)
4825 		got_object_blob_close(blob1);
4826 	if (f1 && fclose(f1) == EOF && err == NULL)
4827 		err = got_error_from_errno("fclose");
4828 	if (f2 && fclose(f2) == EOF && err == NULL)
4829 		err = got_error_from_errno("fclose");
4830 	if (fd != -1 && close(fd) == -1 && err == NULL)
4831 		err = got_error_from_errno("close");
4832 	free(abspath);
4833 	return err;
4834 }
4835 
4836 static const struct got_error *
4837 cmd_diff(int argc, char *argv[])
4838 {
4839 	const struct got_error *error;
4840 	struct got_repository *repo = NULL;
4841 	struct got_worktree *worktree = NULL;
4842 	char *cwd = NULL, *repo_path = NULL;
4843 	const char *commit_args[2] = { NULL, NULL };
4844 	int ncommit_args = 0;
4845 	struct got_object_id *ids[2] = { NULL, NULL };
4846 	char *labels[2] = { NULL, NULL };
4847 	int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4848 	int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4849 	int force_text_diff = 0, force_path = 0, rflag = 0;
4850 	const char *errstr;
4851 	struct got_reflist_head refs;
4852 	struct got_pathlist_head paths;
4853 	struct got_pathlist_entry *pe;
4854 	FILE *f1 = NULL, *f2 = NULL;
4855 	int fd1 = -1, fd2 = -1;
4856 	int *pack_fds = NULL;
4857 
4858 	TAILQ_INIT(&refs);
4859 	TAILQ_INIT(&paths);
4860 
4861 #ifndef PROFILE
4862 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4863 	    NULL) == -1)
4864 		err(1, "pledge");
4865 #endif
4866 
4867 	while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4868 		switch (ch) {
4869 		case 'a':
4870 			force_text_diff = 1;
4871 			break;
4872 		case 'c':
4873 			if (ncommit_args >= 2)
4874 				errx(1, "too many -c options used");
4875 			commit_args[ncommit_args++] = optarg;
4876 			break;
4877 		case 'C':
4878 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4879 			    &errstr);
4880 			if (errstr != NULL)
4881 				errx(1, "number of context lines is %s: %s",
4882 				    errstr, optarg);
4883 			break;
4884 		case 'r':
4885 			repo_path = realpath(optarg, NULL);
4886 			if (repo_path == NULL)
4887 				return got_error_from_errno2("realpath",
4888 				    optarg);
4889 			got_path_strip_trailing_slashes(repo_path);
4890 			rflag = 1;
4891 			break;
4892 		case 's':
4893 			diff_staged = 1;
4894 			break;
4895 		case 'w':
4896 			ignore_whitespace = 1;
4897 			break;
4898 		case 'P':
4899 			force_path = 1;
4900 			break;
4901 		default:
4902 			usage_diff();
4903 			/* NOTREACHED */
4904 		}
4905 	}
4906 
4907 	argc -= optind;
4908 	argv += optind;
4909 
4910 	cwd = getcwd(NULL, 0);
4911 	if (cwd == NULL) {
4912 		error = got_error_from_errno("getcwd");
4913 		goto done;
4914 	}
4915 
4916 	error = got_repo_pack_fds_open(&pack_fds);
4917 	if (error != NULL)
4918 		goto done;
4919 
4920 	if (repo_path == NULL) {
4921 		error = got_worktree_open(&worktree, cwd);
4922 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4923 			goto done;
4924 		else
4925 			error = NULL;
4926 		if (worktree) {
4927 			repo_path =
4928 			    strdup(got_worktree_get_repo_path(worktree));
4929 			if (repo_path == NULL) {
4930 				error = got_error_from_errno("strdup");
4931 				goto done;
4932 			}
4933 		} else {
4934 			repo_path = strdup(cwd);
4935 			if (repo_path == NULL) {
4936 				error = got_error_from_errno("strdup");
4937 				goto done;
4938 			}
4939 		}
4940 	}
4941 
4942 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4943 	free(repo_path);
4944 	if (error != NULL)
4945 		goto done;
4946 
4947 	if (rflag || worktree == NULL || ncommit_args > 0) {
4948 		if (force_path) {
4949 			error = got_error_msg(GOT_ERR_NOT_IMPL,
4950 			    "-P option can only be used when diffing "
4951 			    "a work tree");
4952 			goto done;
4953 		}
4954 		if (diff_staged) {
4955 			error = got_error_msg(GOT_ERR_NOT_IMPL,
4956 			    "-s option can only be used when diffing "
4957 			    "a work tree");
4958 			goto done;
4959 		}
4960 	}
4961 
4962 	error = apply_unveil(got_repo_get_path(repo), 1,
4963 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4964 	if (error)
4965 		goto done;
4966 
4967 	if ((!force_path && argc == 2) || ncommit_args > 0) {
4968 		int obj_type = (ncommit_args > 0 ?
4969 		    GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4970 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4971 		    NULL);
4972 		if (error)
4973 			goto done;
4974 		for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4975 			const char *arg;
4976 			if (ncommit_args > 0)
4977 				arg = commit_args[i];
4978 			else
4979 				arg = argv[i];
4980 			error = got_repo_match_object_id(&ids[i], &labels[i],
4981 			    arg, obj_type, &refs, repo);
4982 			if (error) {
4983 				if (error->code != GOT_ERR_NOT_REF &&
4984 				    error->code != GOT_ERR_NO_OBJ)
4985 					goto done;
4986 				if (ncommit_args > 0)
4987 					goto done;
4988 				error = NULL;
4989 				break;
4990 			}
4991 		}
4992 	}
4993 
4994 	if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4995 		struct print_diff_arg arg;
4996 		char *id_str;
4997 
4998 		if (worktree == NULL) {
4999 			if (argc == 2 && ids[0] == NULL) {
5000 				error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5001 				goto done;
5002 			} else if (argc == 2 && ids[1] == NULL) {
5003 				error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5004 				goto done;
5005 			} else if (argc > 0) {
5006 				error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5007 				    "%s", "specified paths cannot be resolved");
5008 				goto done;
5009 			} else {
5010 				error = got_error(GOT_ERR_NOT_WORKTREE);
5011 				goto done;
5012 			}
5013 		}
5014 
5015 		error = get_worktree_paths_from_argv(&paths, argc, argv,
5016 		    worktree);
5017 		if (error)
5018 			goto done;
5019 
5020 		error = got_object_id_str(&id_str,
5021 		    got_worktree_get_base_commit_id(worktree));
5022 		if (error)
5023 			goto done;
5024 		arg.repo = repo;
5025 		arg.worktree = worktree;
5026 		arg.diff_context = diff_context;
5027 		arg.id_str = id_str;
5028 		arg.header_shown = 0;
5029 		arg.diff_staged = diff_staged;
5030 		arg.ignore_whitespace = ignore_whitespace;
5031 		arg.force_text_diff = force_text_diff;
5032 
5033 		error = got_worktree_status(worktree, &paths, repo, 0,
5034 		    print_diff, &arg, check_cancelled, NULL);
5035 		free(id_str);
5036 		goto done;
5037 	}
5038 
5039 	if (ncommit_args == 1) {
5040 		struct got_commit_object *commit;
5041 		error = got_object_open_as_commit(&commit, repo, ids[0]);
5042 		if (error)
5043 			goto done;
5044 
5045 		labels[1] = labels[0];
5046 		ids[1] = ids[0];
5047 		if (got_object_commit_get_nparents(commit) > 0) {
5048 			const struct got_object_id_queue *pids;
5049 			struct got_object_qid *pid;
5050 			pids = got_object_commit_get_parent_ids(commit);
5051 			pid = STAILQ_FIRST(pids);
5052 			ids[0] = got_object_id_dup(&pid->id);
5053 			if (ids[0] == NULL) {
5054 				error = got_error_from_errno(
5055 				    "got_object_id_dup");
5056 				got_object_commit_close(commit);
5057 				goto done;
5058 			}
5059 			error = got_object_id_str(&labels[0], ids[0]);
5060 			if (error) {
5061 				got_object_commit_close(commit);
5062 				goto done;
5063 			}
5064 		} else {
5065 			ids[0] = NULL;
5066 			labels[0] = strdup("/dev/null");
5067 			if (labels[0] == NULL) {
5068 				error = got_error_from_errno("strdup");
5069 				got_object_commit_close(commit);
5070 				goto done;
5071 			}
5072 		}
5073 
5074 		got_object_commit_close(commit);
5075 	}
5076 
5077 	if (ncommit_args == 0 && argc > 2) {
5078 		error = got_error_msg(GOT_ERR_BAD_PATH,
5079 		    "path arguments cannot be used when diffing two objects");
5080 		goto done;
5081 	}
5082 
5083 	if (ids[0]) {
5084 		error = got_object_get_type(&type1, repo, ids[0]);
5085 		if (error)
5086 			goto done;
5087 	}
5088 
5089 	error = got_object_get_type(&type2, repo, ids[1]);
5090 	if (error)
5091 		goto done;
5092 	if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5093 		error = got_error(GOT_ERR_OBJ_TYPE);
5094 		goto done;
5095 	}
5096 	if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
5097 		error = got_error_msg(GOT_ERR_OBJ_TYPE,
5098 		    "path arguments cannot be used when diffing blobs");
5099 		goto done;
5100 	}
5101 
5102 	for (i = 0; ncommit_args > 0 && i < argc; i++) {
5103 		char *in_repo_path;
5104 		struct got_pathlist_entry *new;
5105 		if (worktree) {
5106 			const char *prefix;
5107 			char *p;
5108 			error = got_worktree_resolve_path(&p, worktree,
5109 			    argv[i]);
5110 			if (error)
5111 				goto done;
5112 			prefix = got_worktree_get_path_prefix(worktree);
5113 			while (prefix[0] == '/')
5114 				prefix++;
5115 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
5116 			    (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5117 			    p) == -1) {
5118 				error = got_error_from_errno("asprintf");
5119 				free(p);
5120 				goto done;
5121 			}
5122 			free(p);
5123 		} else {
5124 			char *mapped_path, *s;
5125 			error = got_repo_map_path(&mapped_path, repo, argv[i]);
5126 			if (error)
5127 				goto done;
5128 			s = mapped_path;
5129 			while (s[0] == '/')
5130 				s++;
5131 			in_repo_path = strdup(s);
5132 			if (in_repo_path == NULL) {
5133 				error = got_error_from_errno("asprintf");
5134 				free(mapped_path);
5135 				goto done;
5136 			}
5137 			free(mapped_path);
5138 
5139 		}
5140 		error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5141 		if (error || new == NULL /* duplicate */)
5142 			free(in_repo_path);
5143 		if (error)
5144 			goto done;
5145 	}
5146 
5147 	if (worktree) {
5148 		/* Release work tree lock. */
5149 		got_worktree_close(worktree);
5150 		worktree = NULL;
5151 	}
5152 
5153 	f1 = got_opentemp();
5154 	if (f1 == NULL) {
5155 		error = got_error_from_errno("got_opentemp");
5156 		goto done;
5157 	}
5158 
5159 	f2 = got_opentemp();
5160 	if (f2 == NULL) {
5161 		error = got_error_from_errno("got_opentemp");
5162 		goto done;
5163 	}
5164 
5165 	fd1 = got_opentempfd();
5166 	if (fd1 == -1) {
5167 		error = got_error_from_errno("got_opentempfd");
5168 		goto done;
5169 	}
5170 
5171 	fd2 = got_opentempfd();
5172 	if (fd2 == -1) {
5173 		error = got_error_from_errno("got_opentempfd");
5174 		goto done;
5175 	}
5176 
5177 	switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5178 	case GOT_OBJ_TYPE_BLOB:
5179 		error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5180 		    fd1, fd2, ids[0], ids[1], NULL, NULL, diff_context,
5181 		    ignore_whitespace, force_text_diff, repo, stdout);
5182 		break;
5183 	case GOT_OBJ_TYPE_TREE:
5184 		error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5185 		    ids[0], ids[1], &paths, "", "", diff_context,
5186 		    ignore_whitespace, force_text_diff, repo, stdout);
5187 		break;
5188 	case GOT_OBJ_TYPE_COMMIT:
5189 		printf("diff %s %s\n", labels[0], labels[1]);
5190 		error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5191 		    fd1, fd2, ids[0], ids[1], &paths, diff_context,
5192 		    ignore_whitespace, force_text_diff, repo, stdout);
5193 		break;
5194 	default:
5195 		error = got_error(GOT_ERR_OBJ_TYPE);
5196 	}
5197 done:
5198 	free(labels[0]);
5199 	free(labels[1]);
5200 	free(ids[0]);
5201 	free(ids[1]);
5202 	if (worktree)
5203 		got_worktree_close(worktree);
5204 	if (repo) {
5205 		const struct got_error *close_err = got_repo_close(repo);
5206 		if (error == NULL)
5207 			error = close_err;
5208 	}
5209 	if (pack_fds) {
5210 		const struct got_error *pack_err =
5211 		    got_repo_pack_fds_close(pack_fds);
5212 		if (error == NULL)
5213 			error = pack_err;
5214 	}
5215 	TAILQ_FOREACH(pe, &paths, entry)
5216 		free((char *)pe->path);
5217 	got_pathlist_free(&paths);
5218 	got_ref_list_free(&refs);
5219 	if (f1 && fclose(f1) == EOF && error == NULL)
5220 		error = got_error_from_errno("fclose");
5221 	if (f2 && fclose(f2) == EOF && error == NULL)
5222 		error = got_error_from_errno("fclose");
5223 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5224 		error = got_error_from_errno("close");
5225 	if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5226 		error = got_error_from_errno("close");
5227 	return error;
5228 }
5229 
5230 __dead static void
5231 usage_blame(void)
5232 {
5233 	fprintf(stderr,
5234 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
5235 	    getprogname());
5236 	exit(1);
5237 }
5238 
5239 struct blame_line {
5240 	int annotated;
5241 	char *id_str;
5242 	char *committer;
5243 	char datebuf[11]; /* YYYY-MM-DD + NUL */
5244 };
5245 
5246 struct blame_cb_args {
5247 	struct blame_line *lines;
5248 	int nlines;
5249 	int nlines_prec;
5250 	int lineno_cur;
5251 	off_t *line_offsets;
5252 	FILE *f;
5253 	struct got_repository *repo;
5254 };
5255 
5256 static const struct got_error *
5257 blame_cb(void *arg, int nlines, int lineno,
5258     struct got_commit_object *commit, struct got_object_id *id)
5259 {
5260 	const struct got_error *err = NULL;
5261 	struct blame_cb_args *a = arg;
5262 	struct blame_line *bline;
5263 	char *line = NULL;
5264 	size_t linesize = 0;
5265 	off_t offset;
5266 	struct tm tm;
5267 	time_t committer_time;
5268 
5269 	if (nlines != a->nlines ||
5270 	    (lineno != -1 && lineno < 1) || lineno > a->nlines)
5271 		return got_error(GOT_ERR_RANGE);
5272 
5273 	if (sigint_received)
5274 		return got_error(GOT_ERR_ITER_COMPLETED);
5275 
5276 	if (lineno == -1)
5277 		return NULL; /* no change in this commit */
5278 
5279 	/* Annotate this line. */
5280 	bline = &a->lines[lineno - 1];
5281 	if (bline->annotated)
5282 		return NULL;
5283 	err = got_object_id_str(&bline->id_str, id);
5284 	if (err)
5285 		return err;
5286 
5287 	bline->committer = strdup(got_object_commit_get_committer(commit));
5288 	if (bline->committer == NULL) {
5289 		err = got_error_from_errno("strdup");
5290 		goto done;
5291 	}
5292 
5293 	committer_time = got_object_commit_get_committer_time(commit);
5294 	if (gmtime_r(&committer_time, &tm) == NULL)
5295 		return got_error_from_errno("gmtime_r");
5296 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5297 	    &tm) == 0) {
5298 		err = got_error(GOT_ERR_NO_SPACE);
5299 		goto done;
5300 	}
5301 	bline->annotated = 1;
5302 
5303 	/* Print lines annotated so far. */
5304 	bline = &a->lines[a->lineno_cur - 1];
5305 	if (!bline->annotated)
5306 		goto done;
5307 
5308 	offset = a->line_offsets[a->lineno_cur - 1];
5309 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
5310 		err = got_error_from_errno("fseeko");
5311 		goto done;
5312 	}
5313 
5314 	while (bline->annotated) {
5315 		char *smallerthan, *at, *nl, *committer;
5316 		size_t len;
5317 
5318 		if (getline(&line, &linesize, a->f) == -1) {
5319 			if (ferror(a->f))
5320 				err = got_error_from_errno("getline");
5321 			break;
5322 		}
5323 
5324 		committer = bline->committer;
5325 		smallerthan = strchr(committer, '<');
5326 		if (smallerthan && smallerthan[1] != '\0')
5327 			committer = smallerthan + 1;
5328 		at = strchr(committer, '@');
5329 		if (at)
5330 			*at = '\0';
5331 		len = strlen(committer);
5332 		if (len >= 9)
5333 			committer[8] = '\0';
5334 
5335 		nl = strchr(line, '\n');
5336 		if (nl)
5337 			*nl = '\0';
5338 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5339 		    bline->id_str, bline->datebuf, committer, line);
5340 
5341 		a->lineno_cur++;
5342 		bline = &a->lines[a->lineno_cur - 1];
5343 	}
5344 done:
5345 	free(line);
5346 	return err;
5347 }
5348 
5349 static const struct got_error *
5350 cmd_blame(int argc, char *argv[])
5351 {
5352 	const struct got_error *error;
5353 	struct got_repository *repo = NULL;
5354 	struct got_worktree *worktree = NULL;
5355 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5356 	char *link_target = NULL;
5357 	struct got_object_id *obj_id = NULL;
5358 	struct got_object_id *commit_id = NULL;
5359 	struct got_commit_object *commit = NULL;
5360 	struct got_blob_object *blob = NULL;
5361 	char *commit_id_str = NULL;
5362 	struct blame_cb_args bca;
5363 	int ch, obj_type, i, fd = -1, fd1 = -1;
5364 	off_t filesize;
5365 	int *pack_fds = NULL;
5366 
5367 	fd = got_opentempfd();
5368 	if (fd == -1)
5369 		return got_error_from_errno("got_opentempfd");
5370 
5371 	memset(&bca, 0, sizeof(bca));
5372 
5373 #ifndef PROFILE
5374 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5375 	    NULL) == -1)
5376 		err(1, "pledge");
5377 #endif
5378 
5379 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5380 		switch (ch) {
5381 		case 'c':
5382 			commit_id_str = optarg;
5383 			break;
5384 		case 'r':
5385 			repo_path = realpath(optarg, NULL);
5386 			if (repo_path == NULL)
5387 				return got_error_from_errno2("realpath",
5388 				    optarg);
5389 			got_path_strip_trailing_slashes(repo_path);
5390 			break;
5391 		default:
5392 			usage_blame();
5393 			/* NOTREACHED */
5394 		}
5395 	}
5396 
5397 	argc -= optind;
5398 	argv += optind;
5399 
5400 	if (argc == 1)
5401 		path = argv[0];
5402 	else
5403 		usage_blame();
5404 
5405 	cwd = getcwd(NULL, 0);
5406 	if (cwd == NULL) {
5407 		error = got_error_from_errno("getcwd");
5408 		goto done;
5409 	}
5410 
5411 	error = got_repo_pack_fds_open(&pack_fds);
5412 	if (error != NULL)
5413 		goto done;
5414 
5415 	if (repo_path == NULL) {
5416 		error = got_worktree_open(&worktree, cwd);
5417 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5418 			goto done;
5419 		else
5420 			error = NULL;
5421 		if (worktree) {
5422 			repo_path =
5423 			    strdup(got_worktree_get_repo_path(worktree));
5424 			if (repo_path == NULL) {
5425 				error = got_error_from_errno("strdup");
5426 				if (error)
5427 					goto done;
5428 			}
5429 		} else {
5430 			repo_path = strdup(cwd);
5431 			if (repo_path == NULL) {
5432 				error = got_error_from_errno("strdup");
5433 				goto done;
5434 			}
5435 		}
5436 	}
5437 
5438 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5439 	if (error != NULL)
5440 		goto done;
5441 
5442 	if (worktree) {
5443 		const char *prefix = got_worktree_get_path_prefix(worktree);
5444 		char *p;
5445 
5446 		error = got_worktree_resolve_path(&p, worktree, path);
5447 		if (error)
5448 			goto done;
5449 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5450 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5451 		    p) == -1) {
5452 			error = got_error_from_errno("asprintf");
5453 			free(p);
5454 			goto done;
5455 		}
5456 		free(p);
5457 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5458 	} else {
5459 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5460 		if (error)
5461 			goto done;
5462 		error = got_repo_map_path(&in_repo_path, repo, path);
5463 	}
5464 	if (error)
5465 		goto done;
5466 
5467 	if (commit_id_str == NULL) {
5468 		struct got_reference *head_ref;
5469 		error = got_ref_open(&head_ref, repo, worktree ?
5470 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5471 		if (error != NULL)
5472 			goto done;
5473 		error = got_ref_resolve(&commit_id, repo, head_ref);
5474 		got_ref_close(head_ref);
5475 		if (error != NULL)
5476 			goto done;
5477 	} else {
5478 		struct got_reflist_head refs;
5479 		TAILQ_INIT(&refs);
5480 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5481 		    NULL);
5482 		if (error)
5483 			goto done;
5484 		error = got_repo_match_object_id(&commit_id, NULL,
5485 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5486 		got_ref_list_free(&refs);
5487 		if (error)
5488 			goto done;
5489 	}
5490 
5491 	if (worktree) {
5492 		/* Release work tree lock. */
5493 		got_worktree_close(worktree);
5494 		worktree = NULL;
5495 	}
5496 
5497 	error = got_object_open_as_commit(&commit, repo, commit_id);
5498 	if (error)
5499 		goto done;
5500 
5501 	error = got_object_resolve_symlinks(&link_target, in_repo_path,
5502 	    commit, repo);
5503 	if (error)
5504 		goto done;
5505 
5506 	error = got_object_id_by_path(&obj_id, repo, commit,
5507 	    link_target ? link_target : in_repo_path);
5508 	if (error)
5509 		goto done;
5510 
5511 	error = got_object_get_type(&obj_type, repo, obj_id);
5512 	if (error)
5513 		goto done;
5514 
5515 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
5516 		error = got_error_path(link_target ? link_target : in_repo_path,
5517 		    GOT_ERR_OBJ_TYPE);
5518 		goto done;
5519 	}
5520 
5521 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd);
5522 	if (error)
5523 		goto done;
5524 	bca.f = got_opentemp();
5525 	if (bca.f == NULL) {
5526 		error = got_error_from_errno("got_opentemp");
5527 		goto done;
5528 	}
5529 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5530 	    &bca.line_offsets, bca.f, blob);
5531 	if (error || bca.nlines == 0)
5532 		goto done;
5533 
5534 	/* Don't include \n at EOF in the blame line count. */
5535 	if (bca.line_offsets[bca.nlines - 1] == filesize)
5536 		bca.nlines--;
5537 
5538 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5539 	if (bca.lines == NULL) {
5540 		error = got_error_from_errno("calloc");
5541 		goto done;
5542 	}
5543 	bca.lineno_cur = 1;
5544 	bca.nlines_prec = 0;
5545 	i = bca.nlines;
5546 	while (i > 0) {
5547 		i /= 10;
5548 		bca.nlines_prec++;
5549 	}
5550 	bca.repo = repo;
5551 
5552 	fd1 = got_opentempfd();
5553 	if (fd1 == -1) {
5554 		error = got_error_from_errno("got_opentempfd");
5555 		goto done;
5556 	}
5557 	error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5558 	    repo, blame_cb, &bca, check_cancelled, NULL, fd1);
5559 done:
5560 	free(in_repo_path);
5561 	free(link_target);
5562 	free(repo_path);
5563 	free(cwd);
5564 	free(commit_id);
5565 	free(obj_id);
5566 	if (commit)
5567 		got_object_commit_close(commit);
5568 	if (fd != -1 && close(fd) == -1 && error == NULL)
5569 		error = got_error_from_errno("close");
5570 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5571 		error = got_error_from_errno("close");
5572 	if (blob)
5573 		got_object_blob_close(blob);
5574 	if (worktree)
5575 		got_worktree_close(worktree);
5576 	if (repo) {
5577 		const struct got_error *close_err = got_repo_close(repo);
5578 		if (error == NULL)
5579 			error = close_err;
5580 	}
5581 	if (pack_fds) {
5582 		const struct got_error *pack_err =
5583 		    got_repo_pack_fds_close(pack_fds);
5584 		if (error == NULL)
5585 			error = pack_err;
5586 	}
5587 	if (bca.lines) {
5588 		for (i = 0; i < bca.nlines; i++) {
5589 			struct blame_line *bline = &bca.lines[i];
5590 			free(bline->id_str);
5591 			free(bline->committer);
5592 		}
5593 		free(bca.lines);
5594 	}
5595 	free(bca.line_offsets);
5596 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
5597 		error = got_error_from_errno("fclose");
5598 	return error;
5599 }
5600 
5601 __dead static void
5602 usage_tree(void)
5603 {
5604 	fprintf(stderr,
5605 	    "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5606 	    getprogname());
5607 	exit(1);
5608 }
5609 
5610 static const struct got_error *
5611 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5612     const char *root_path, struct got_repository *repo)
5613 {
5614 	const struct got_error *err = NULL;
5615 	int is_root_path = (strcmp(path, root_path) == 0);
5616 	const char *modestr = "";
5617 	mode_t mode = got_tree_entry_get_mode(te);
5618 	char *link_target = NULL;
5619 
5620 	path += strlen(root_path);
5621 	while (path[0] == '/')
5622 		path++;
5623 
5624 	if (got_object_tree_entry_is_submodule(te))
5625 		modestr = "$";
5626 	else if (S_ISLNK(mode)) {
5627 		int i;
5628 
5629 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5630 		if (err)
5631 			return err;
5632 		for (i = 0; i < strlen(link_target); i++) {
5633 			if (!isprint((unsigned char)link_target[i]))
5634 				link_target[i] = '?';
5635 		}
5636 
5637 		modestr = "@";
5638 	}
5639 	else if (S_ISDIR(mode))
5640 		modestr = "/";
5641 	else if (mode & S_IXUSR)
5642 		modestr = "*";
5643 
5644 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5645 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5646 	    link_target ? " -> ": "", link_target ? link_target : "");
5647 
5648 	free(link_target);
5649 	return NULL;
5650 }
5651 
5652 static const struct got_error *
5653 print_tree(const char *path, struct got_commit_object *commit,
5654     int show_ids, int recurse, const char *root_path,
5655     struct got_repository *repo)
5656 {
5657 	const struct got_error *err = NULL;
5658 	struct got_object_id *tree_id = NULL;
5659 	struct got_tree_object *tree = NULL;
5660 	int nentries, i;
5661 
5662 	err = got_object_id_by_path(&tree_id, repo, commit, path);
5663 	if (err)
5664 		goto done;
5665 
5666 	err = got_object_open_as_tree(&tree, repo, tree_id);
5667 	if (err)
5668 		goto done;
5669 	nentries = got_object_tree_get_nentries(tree);
5670 	for (i = 0; i < nentries; i++) {
5671 		struct got_tree_entry *te;
5672 		char *id = NULL;
5673 
5674 		if (sigint_received || sigpipe_received)
5675 			break;
5676 
5677 		te = got_object_tree_get_entry(tree, i);
5678 		if (show_ids) {
5679 			char *id_str;
5680 			err = got_object_id_str(&id_str,
5681 			    got_tree_entry_get_id(te));
5682 			if (err)
5683 				goto done;
5684 			if (asprintf(&id, "%s ", id_str) == -1) {
5685 				err = got_error_from_errno("asprintf");
5686 				free(id_str);
5687 				goto done;
5688 			}
5689 			free(id_str);
5690 		}
5691 		err = print_entry(te, id, path, root_path, repo);
5692 		free(id);
5693 		if (err)
5694 			goto done;
5695 
5696 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5697 			char *child_path;
5698 			if (asprintf(&child_path, "%s%s%s", path,
5699 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
5700 			    got_tree_entry_get_name(te)) == -1) {
5701 				err = got_error_from_errno("asprintf");
5702 				goto done;
5703 			}
5704 			err = print_tree(child_path, commit, show_ids, 1,
5705 			    root_path, repo);
5706 			free(child_path);
5707 			if (err)
5708 				goto done;
5709 		}
5710 	}
5711 done:
5712 	if (tree)
5713 		got_object_tree_close(tree);
5714 	free(tree_id);
5715 	return err;
5716 }
5717 
5718 static const struct got_error *
5719 cmd_tree(int argc, char *argv[])
5720 {
5721 	const struct got_error *error;
5722 	struct got_repository *repo = NULL;
5723 	struct got_worktree *worktree = NULL;
5724 	const char *path, *refname = NULL;
5725 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5726 	struct got_object_id *commit_id = NULL;
5727 	struct got_commit_object *commit = NULL;
5728 	char *commit_id_str = NULL;
5729 	int show_ids = 0, recurse = 0;
5730 	int ch;
5731 	int *pack_fds = NULL;
5732 
5733 #ifndef PROFILE
5734 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5735 	    NULL) == -1)
5736 		err(1, "pledge");
5737 #endif
5738 
5739 	while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5740 		switch (ch) {
5741 		case 'c':
5742 			commit_id_str = optarg;
5743 			break;
5744 		case 'r':
5745 			repo_path = realpath(optarg, NULL);
5746 			if (repo_path == NULL)
5747 				return got_error_from_errno2("realpath",
5748 				    optarg);
5749 			got_path_strip_trailing_slashes(repo_path);
5750 			break;
5751 		case 'i':
5752 			show_ids = 1;
5753 			break;
5754 		case 'R':
5755 			recurse = 1;
5756 			break;
5757 		default:
5758 			usage_tree();
5759 			/* NOTREACHED */
5760 		}
5761 	}
5762 
5763 	argc -= optind;
5764 	argv += optind;
5765 
5766 	if (argc == 1)
5767 		path = argv[0];
5768 	else if (argc > 1)
5769 		usage_tree();
5770 	else
5771 		path = NULL;
5772 
5773 	cwd = getcwd(NULL, 0);
5774 	if (cwd == NULL) {
5775 		error = got_error_from_errno("getcwd");
5776 		goto done;
5777 	}
5778 
5779 	error = got_repo_pack_fds_open(&pack_fds);
5780 	if (error != NULL)
5781 		goto done;
5782 
5783 	if (repo_path == NULL) {
5784 		error = got_worktree_open(&worktree, cwd);
5785 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5786 			goto done;
5787 		else
5788 			error = NULL;
5789 		if (worktree) {
5790 			repo_path =
5791 			    strdup(got_worktree_get_repo_path(worktree));
5792 			if (repo_path == NULL)
5793 				error = got_error_from_errno("strdup");
5794 			if (error)
5795 				goto done;
5796 		} else {
5797 			repo_path = strdup(cwd);
5798 			if (repo_path == NULL) {
5799 				error = got_error_from_errno("strdup");
5800 				goto done;
5801 			}
5802 		}
5803 	}
5804 
5805 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5806 	if (error != NULL)
5807 		goto done;
5808 
5809 	if (worktree) {
5810 		const char *prefix = got_worktree_get_path_prefix(worktree);
5811 		char *p;
5812 
5813 		if (path == NULL)
5814 			path = "";
5815 		error = got_worktree_resolve_path(&p, worktree, path);
5816 		if (error)
5817 			goto done;
5818 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5819 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ?  "/" : "",
5820 		    p) == -1) {
5821 			error = got_error_from_errno("asprintf");
5822 			free(p);
5823 			goto done;
5824 		}
5825 		free(p);
5826 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5827 		if (error)
5828 			goto done;
5829 	} else {
5830 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5831 		if (error)
5832 			goto done;
5833 		if (path == NULL)
5834 			path = "/";
5835 		error = got_repo_map_path(&in_repo_path, repo, path);
5836 		if (error != NULL)
5837 			goto done;
5838 	}
5839 
5840 	if (commit_id_str == NULL) {
5841 		struct got_reference *head_ref;
5842 		if (worktree)
5843 			refname = got_worktree_get_head_ref_name(worktree);
5844 		else
5845 			refname = GOT_REF_HEAD;
5846 		error = got_ref_open(&head_ref, repo, refname, 0);
5847 		if (error != NULL)
5848 			goto done;
5849 		error = got_ref_resolve(&commit_id, repo, head_ref);
5850 		got_ref_close(head_ref);
5851 		if (error != NULL)
5852 			goto done;
5853 	} else {
5854 		struct got_reflist_head refs;
5855 		TAILQ_INIT(&refs);
5856 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5857 		    NULL);
5858 		if (error)
5859 			goto done;
5860 		error = got_repo_match_object_id(&commit_id, NULL,
5861 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5862 		got_ref_list_free(&refs);
5863 		if (error)
5864 			goto done;
5865 	}
5866 
5867 	if (worktree) {
5868 		/* Release work tree lock. */
5869 		got_worktree_close(worktree);
5870 		worktree = NULL;
5871 	}
5872 
5873 	error = got_object_open_as_commit(&commit, repo, commit_id);
5874 	if (error)
5875 		goto done;
5876 
5877 	error = print_tree(in_repo_path, commit, show_ids, recurse,
5878 	    in_repo_path, repo);
5879 done:
5880 	free(in_repo_path);
5881 	free(repo_path);
5882 	free(cwd);
5883 	free(commit_id);
5884 	if (commit)
5885 		got_object_commit_close(commit);
5886 	if (worktree)
5887 		got_worktree_close(worktree);
5888 	if (repo) {
5889 		const struct got_error *close_err = got_repo_close(repo);
5890 		if (error == NULL)
5891 			error = close_err;
5892 	}
5893 	if (pack_fds) {
5894 		const struct got_error *pack_err =
5895 		    got_repo_pack_fds_close(pack_fds);
5896 		if (error == NULL)
5897 			error = pack_err;
5898 	}
5899 	return error;
5900 }
5901 
5902 __dead static void
5903 usage_status(void)
5904 {
5905 	fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5906 	    "[-S status-codes] [path ...]\n", getprogname());
5907 	exit(1);
5908 }
5909 
5910 struct got_status_arg {
5911 	char *status_codes;
5912 	int suppress;
5913 };
5914 
5915 static const struct got_error *
5916 print_status(void *arg, unsigned char status, unsigned char staged_status,
5917     const char *path, struct got_object_id *blob_id,
5918     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5919     int dirfd, const char *de_name)
5920 {
5921 	struct got_status_arg *st = arg;
5922 
5923 	if (status == staged_status && (status == GOT_STATUS_DELETE))
5924 		status = GOT_STATUS_NO_CHANGE;
5925 	if (st != NULL && st->status_codes) {
5926 		size_t ncodes = strlen(st->status_codes);
5927 		int i, j = 0;
5928 
5929 		for (i = 0; i < ncodes ; i++) {
5930 			if (st->suppress) {
5931 				if (status == st->status_codes[i] ||
5932 				    staged_status == st->status_codes[i]) {
5933 					j++;
5934 					continue;
5935 				}
5936 			} else {
5937 				if (status == st->status_codes[i] ||
5938 				    staged_status == st->status_codes[i])
5939 					break;
5940 			}
5941 		}
5942 
5943 		if (st->suppress && j == 0)
5944 			goto print;
5945 
5946 		if (i == ncodes)
5947 			return NULL;
5948 	}
5949 print:
5950 	printf("%c%c %s\n", status, staged_status, path);
5951 	return NULL;
5952 }
5953 
5954 static const struct got_error *
5955 cmd_status(int argc, char *argv[])
5956 {
5957 	const struct got_error *error = NULL;
5958 	struct got_repository *repo = NULL;
5959 	struct got_worktree *worktree = NULL;
5960 	struct got_status_arg st;
5961 	char *cwd = NULL;
5962 	struct got_pathlist_head paths;
5963 	struct got_pathlist_entry *pe;
5964 	int ch, i, no_ignores = 0;
5965 	int *pack_fds = NULL;
5966 
5967 	TAILQ_INIT(&paths);
5968 
5969 	memset(&st, 0, sizeof(st));
5970 	st.status_codes = NULL;
5971 	st.suppress = 0;
5972 
5973 	while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5974 		switch (ch) {
5975 		case 'I':
5976 			no_ignores = 1;
5977 			break;
5978 		case 'S':
5979 			if (st.status_codes != NULL && st.suppress == 0)
5980 				option_conflict('S', 's');
5981 			st.suppress = 1;
5982 			/* fallthrough */
5983 		case 's':
5984 			for (i = 0; i < strlen(optarg); i++) {
5985 				switch (optarg[i]) {
5986 				case GOT_STATUS_MODIFY:
5987 				case GOT_STATUS_ADD:
5988 				case GOT_STATUS_DELETE:
5989 				case GOT_STATUS_CONFLICT:
5990 				case GOT_STATUS_MISSING:
5991 				case GOT_STATUS_OBSTRUCTED:
5992 				case GOT_STATUS_UNVERSIONED:
5993 				case GOT_STATUS_MODE_CHANGE:
5994 				case GOT_STATUS_NONEXISTENT:
5995 					break;
5996 				default:
5997 					errx(1, "invalid status code '%c'",
5998 					    optarg[i]);
5999 				}
6000 			}
6001 			if (ch == 's' && st.suppress)
6002 				option_conflict('s', 'S');
6003 			st.status_codes = optarg;
6004 			break;
6005 		default:
6006 			usage_status();
6007 			/* NOTREACHED */
6008 		}
6009 	}
6010 
6011 	argc -= optind;
6012 	argv += optind;
6013 
6014 #ifndef PROFILE
6015 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6016 	    NULL) == -1)
6017 		err(1, "pledge");
6018 #endif
6019 	cwd = getcwd(NULL, 0);
6020 	if (cwd == NULL) {
6021 		error = got_error_from_errno("getcwd");
6022 		goto done;
6023 	}
6024 
6025 	error = got_repo_pack_fds_open(&pack_fds);
6026 	if (error != NULL)
6027 		goto done;
6028 
6029 	error = got_worktree_open(&worktree, cwd);
6030 	if (error) {
6031 		if (error->code == GOT_ERR_NOT_WORKTREE)
6032 			error = wrap_not_worktree_error(error, "status", cwd);
6033 		goto done;
6034 	}
6035 
6036 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6037 	    NULL, pack_fds);
6038 	if (error != NULL)
6039 		goto done;
6040 
6041 	error = apply_unveil(got_repo_get_path(repo), 1,
6042 	    got_worktree_get_root_path(worktree));
6043 	if (error)
6044 		goto done;
6045 
6046 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6047 	if (error)
6048 		goto done;
6049 
6050 	error = got_worktree_status(worktree, &paths, repo, no_ignores,
6051 	    print_status, &st, check_cancelled, NULL);
6052 done:
6053 	if (pack_fds) {
6054 		const struct got_error *pack_err =
6055 		    got_repo_pack_fds_close(pack_fds);
6056 		if (error == NULL)
6057 			error = pack_err;
6058 	}
6059 
6060 	TAILQ_FOREACH(pe, &paths, entry)
6061 		free((char *)pe->path);
6062 	got_pathlist_free(&paths);
6063 	free(cwd);
6064 	return error;
6065 }
6066 
6067 __dead static void
6068 usage_ref(void)
6069 {
6070 	fprintf(stderr,
6071 	    "usage: %s ref [-r repository] [-l] [-t] [-c object] "
6072 	        "[-s reference] [-d] [name]\n",
6073 	    getprogname());
6074 	exit(1);
6075 }
6076 
6077 static const struct got_error *
6078 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6079 {
6080 	static const struct got_error *err = NULL;
6081 	struct got_reflist_head refs;
6082 	struct got_reflist_entry *re;
6083 
6084 	TAILQ_INIT(&refs);
6085 	err = got_ref_list(&refs, repo, refname, sort_by_time ?
6086 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6087 	    repo);
6088 	if (err)
6089 		return err;
6090 
6091 	TAILQ_FOREACH(re, &refs, entry) {
6092 		char *refstr;
6093 		refstr = got_ref_to_str(re->ref);
6094 		if (refstr == NULL) {
6095 			err = got_error_from_errno("got_ref_to_str");
6096 			break;
6097 		}
6098 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6099 		free(refstr);
6100 	}
6101 
6102 	got_ref_list_free(&refs);
6103 	return err;
6104 }
6105 
6106 static const struct got_error *
6107 delete_ref_by_name(struct got_repository *repo, const char *refname)
6108 {
6109 	const struct got_error *err;
6110 	struct got_reference *ref;
6111 
6112 	err = got_ref_open(&ref, repo, refname, 0);
6113 	if (err)
6114 		return err;
6115 
6116 	err = delete_ref(repo, ref);
6117 	got_ref_close(ref);
6118 	return err;
6119 }
6120 
6121 static const struct got_error *
6122 add_ref(struct got_repository *repo, const char *refname, const char *target)
6123 {
6124 	const struct got_error *err = NULL;
6125 	struct got_object_id *id = NULL;
6126 	struct got_reference *ref = NULL;
6127 	struct got_reflist_head refs;
6128 
6129 	/*
6130 	 * Don't let the user create a reference name with a leading '-'.
6131 	 * While technically a valid reference name, this case is usually
6132 	 * an unintended typo.
6133 	 */
6134 	if (refname[0] == '-')
6135 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6136 
6137 	TAILQ_INIT(&refs);
6138 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6139 	if (err)
6140 		goto done;
6141 	err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6142 	    &refs, repo);
6143 	got_ref_list_free(&refs);
6144 	if (err)
6145 		goto done;
6146 
6147 	err = got_ref_alloc(&ref, refname, id);
6148 	if (err)
6149 		goto done;
6150 
6151 	err = got_ref_write(ref, repo);
6152 done:
6153 	if (ref)
6154 		got_ref_close(ref);
6155 	free(id);
6156 	return err;
6157 }
6158 
6159 static const struct got_error *
6160 add_symref(struct got_repository *repo, const char *refname, const char *target)
6161 {
6162 	const struct got_error *err = NULL;
6163 	struct got_reference *ref = NULL;
6164 	struct got_reference *target_ref = NULL;
6165 
6166 	/*
6167 	 * Don't let the user create a reference name with a leading '-'.
6168 	 * While technically a valid reference name, this case is usually
6169 	 * an unintended typo.
6170 	 */
6171 	if (refname[0] == '-')
6172 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6173 
6174 	err = got_ref_open(&target_ref, repo, target, 0);
6175 	if (err)
6176 		return err;
6177 
6178 	err = got_ref_alloc_symref(&ref, refname, target_ref);
6179 	if (err)
6180 		goto done;
6181 
6182 	err = got_ref_write(ref, repo);
6183 done:
6184 	if (target_ref)
6185 		got_ref_close(target_ref);
6186 	if (ref)
6187 		got_ref_close(ref);
6188 	return err;
6189 }
6190 
6191 static const struct got_error *
6192 cmd_ref(int argc, char *argv[])
6193 {
6194 	const struct got_error *error = NULL;
6195 	struct got_repository *repo = NULL;
6196 	struct got_worktree *worktree = NULL;
6197 	char *cwd = NULL, *repo_path = NULL;
6198 	int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6199 	const char *obj_arg = NULL, *symref_target= NULL;
6200 	char *refname = NULL;
6201 	int *pack_fds = NULL;
6202 
6203 	while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
6204 		switch (ch) {
6205 		case 'c':
6206 			obj_arg = optarg;
6207 			break;
6208 		case 'd':
6209 			do_delete = 1;
6210 			break;
6211 		case 'r':
6212 			repo_path = realpath(optarg, NULL);
6213 			if (repo_path == NULL)
6214 				return got_error_from_errno2("realpath",
6215 				    optarg);
6216 			got_path_strip_trailing_slashes(repo_path);
6217 			break;
6218 		case 'l':
6219 			do_list = 1;
6220 			break;
6221 		case 's':
6222 			symref_target = optarg;
6223 			break;
6224 		case 't':
6225 			sort_by_time = 1;
6226 			break;
6227 		default:
6228 			usage_ref();
6229 			/* NOTREACHED */
6230 		}
6231 	}
6232 
6233 	if (obj_arg && do_list)
6234 		option_conflict('c', 'l');
6235 	if (obj_arg && do_delete)
6236 		option_conflict('c', 'd');
6237 	if (obj_arg && symref_target)
6238 		option_conflict('c', 's');
6239 	if (symref_target && do_delete)
6240 		option_conflict('s', 'd');
6241 	if (symref_target && do_list)
6242 		option_conflict('s', 'l');
6243 	if (do_delete && do_list)
6244 		option_conflict('d', 'l');
6245 	if (sort_by_time && !do_list)
6246 		errx(1, "-t option requires -l option");
6247 
6248 	argc -= optind;
6249 	argv += optind;
6250 
6251 	if (do_list) {
6252 		if (argc != 0 && argc != 1)
6253 			usage_ref();
6254 		if (argc == 1) {
6255 			refname = strdup(argv[0]);
6256 			if (refname == NULL) {
6257 				error = got_error_from_errno("strdup");
6258 				goto done;
6259 			}
6260 		}
6261 	} else {
6262 		if (argc != 1)
6263 			usage_ref();
6264 		refname = strdup(argv[0]);
6265 		if (refname == NULL) {
6266 			error = got_error_from_errno("strdup");
6267 			goto done;
6268 		}
6269 	}
6270 
6271 	if (refname)
6272 		got_path_strip_trailing_slashes(refname);
6273 
6274 #ifndef PROFILE
6275 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6276 	    "sendfd unveil", NULL) == -1)
6277 		err(1, "pledge");
6278 #endif
6279 	cwd = getcwd(NULL, 0);
6280 	if (cwd == NULL) {
6281 		error = got_error_from_errno("getcwd");
6282 		goto done;
6283 	}
6284 
6285 	error = got_repo_pack_fds_open(&pack_fds);
6286 	if (error != NULL)
6287 		goto done;
6288 
6289 	if (repo_path == NULL) {
6290 		error = got_worktree_open(&worktree, cwd);
6291 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6292 			goto done;
6293 		else
6294 			error = NULL;
6295 		if (worktree) {
6296 			repo_path =
6297 			    strdup(got_worktree_get_repo_path(worktree));
6298 			if (repo_path == NULL)
6299 				error = got_error_from_errno("strdup");
6300 			if (error)
6301 				goto done;
6302 		} else {
6303 			repo_path = strdup(cwd);
6304 			if (repo_path == NULL) {
6305 				error = got_error_from_errno("strdup");
6306 				goto done;
6307 			}
6308 		}
6309 	}
6310 
6311 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6312 	if (error != NULL)
6313 		goto done;
6314 
6315 #ifndef PROFILE
6316 	if (do_list) {
6317 		/* Remove "cpath" promise. */
6318 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6319 		    NULL) == -1)
6320 			err(1, "pledge");
6321 	}
6322 #endif
6323 
6324 	error = apply_unveil(got_repo_get_path(repo), do_list,
6325 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
6326 	if (error)
6327 		goto done;
6328 
6329 	if (do_list)
6330 		error = list_refs(repo, refname, sort_by_time);
6331 	else if (do_delete)
6332 		error = delete_ref_by_name(repo, refname);
6333 	else if (symref_target)
6334 		error = add_symref(repo, refname, symref_target);
6335 	else {
6336 		if (obj_arg == NULL)
6337 			usage_ref();
6338 		error = add_ref(repo, refname, obj_arg);
6339 	}
6340 done:
6341 	free(refname);
6342 	if (repo) {
6343 		const struct got_error *close_err = got_repo_close(repo);
6344 		if (error == NULL)
6345 			error = close_err;
6346 	}
6347 	if (worktree)
6348 		got_worktree_close(worktree);
6349 	if (pack_fds) {
6350 		const struct got_error *pack_err =
6351 		    got_repo_pack_fds_close(pack_fds);
6352 		if (error == NULL)
6353 			error = pack_err;
6354 	}
6355 	free(cwd);
6356 	free(repo_path);
6357 	return error;
6358 }
6359 
6360 __dead static void
6361 usage_branch(void)
6362 {
6363 	fprintf(stderr,
6364 	    "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
6365 	        "[-n] [name]\n", getprogname());
6366 	exit(1);
6367 }
6368 
6369 static const struct got_error *
6370 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6371     struct got_reference *ref)
6372 {
6373 	const struct got_error *err = NULL;
6374 	const char *refname, *marker = "  ";
6375 	char *refstr;
6376 
6377 	refname = got_ref_get_name(ref);
6378 	if (worktree && strcmp(refname,
6379 	    got_worktree_get_head_ref_name(worktree)) == 0) {
6380 		struct got_object_id *id = NULL;
6381 
6382 		err = got_ref_resolve(&id, repo, ref);
6383 		if (err)
6384 			return err;
6385 		if (got_object_id_cmp(id,
6386 		    got_worktree_get_base_commit_id(worktree)) == 0)
6387 			marker = "* ";
6388 		else
6389 			marker = "~ ";
6390 		free(id);
6391 	}
6392 
6393 	if (strncmp(refname, "refs/heads/", 11) == 0)
6394 		refname += 11;
6395 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6396 		refname += 18;
6397 	if (strncmp(refname, "refs/remotes/", 13) == 0)
6398 		refname += 13;
6399 
6400 	refstr = got_ref_to_str(ref);
6401 	if (refstr == NULL)
6402 		return got_error_from_errno("got_ref_to_str");
6403 
6404 	printf("%s%s: %s\n", marker, refname, refstr);
6405 	free(refstr);
6406 	return NULL;
6407 }
6408 
6409 static const struct got_error *
6410 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6411 {
6412 	const char *refname;
6413 
6414 	if (worktree == NULL)
6415 		return got_error(GOT_ERR_NOT_WORKTREE);
6416 
6417 	refname = got_worktree_get_head_ref_name(worktree);
6418 
6419 	if (strncmp(refname, "refs/heads/", 11) == 0)
6420 		refname += 11;
6421 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6422 		refname += 18;
6423 
6424 	printf("%s\n", refname);
6425 
6426 	return NULL;
6427 }
6428 
6429 static const struct got_error *
6430 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6431     int sort_by_time)
6432 {
6433 	static const struct got_error *err = NULL;
6434 	struct got_reflist_head refs;
6435 	struct got_reflist_entry *re;
6436 	struct got_reference *temp_ref = NULL;
6437 	int rebase_in_progress, histedit_in_progress;
6438 
6439 	TAILQ_INIT(&refs);
6440 
6441 	if (worktree) {
6442 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
6443 		    worktree);
6444 		if (err)
6445 			return err;
6446 
6447 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
6448 		    worktree);
6449 		if (err)
6450 			return err;
6451 
6452 		if (rebase_in_progress || histedit_in_progress) {
6453 			err = got_ref_open(&temp_ref, repo,
6454 			    got_worktree_get_head_ref_name(worktree), 0);
6455 			if (err)
6456 				return err;
6457 			list_branch(repo, worktree, temp_ref);
6458 			got_ref_close(temp_ref);
6459 		}
6460 	}
6461 
6462 	err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6463 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6464 	    repo);
6465 	if (err)
6466 		return err;
6467 
6468 	TAILQ_FOREACH(re, &refs, entry)
6469 		list_branch(repo, worktree, re->ref);
6470 
6471 	got_ref_list_free(&refs);
6472 
6473 	err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6474 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6475 	    repo);
6476 	if (err)
6477 		return err;
6478 
6479 	TAILQ_FOREACH(re, &refs, entry)
6480 		list_branch(repo, worktree, re->ref);
6481 
6482 	got_ref_list_free(&refs);
6483 
6484 	return NULL;
6485 }
6486 
6487 static const struct got_error *
6488 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6489     const char *branch_name)
6490 {
6491 	const struct got_error *err = NULL;
6492 	struct got_reference *ref = NULL;
6493 	char *refname, *remote_refname = NULL;
6494 
6495 	if (strncmp(branch_name, "refs/", 5) == 0)
6496 		branch_name += 5;
6497 	if (strncmp(branch_name, "heads/", 6) == 0)
6498 		branch_name += 6;
6499 	else if (strncmp(branch_name, "remotes/", 8) == 0)
6500 		branch_name += 8;
6501 
6502 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6503 		return got_error_from_errno("asprintf");
6504 
6505 	if (asprintf(&remote_refname, "refs/remotes/%s",
6506 	    branch_name) == -1) {
6507 		err = got_error_from_errno("asprintf");
6508 		goto done;
6509 	}
6510 
6511 	err = got_ref_open(&ref, repo, refname, 0);
6512 	if (err) {
6513 		const struct got_error *err2;
6514 		if (err->code != GOT_ERR_NOT_REF)
6515 			goto done;
6516 		/*
6517 		 * Keep 'err' intact such that if neither branch exists
6518 		 * we report "refs/heads" rather than "refs/remotes" in
6519 		 * our error message.
6520 		 */
6521 		err2 = got_ref_open(&ref, repo, remote_refname, 0);
6522 		if (err2)
6523 			goto done;
6524 		err = NULL;
6525 	}
6526 
6527 	if (worktree &&
6528 	    strcmp(got_worktree_get_head_ref_name(worktree),
6529 	    got_ref_get_name(ref)) == 0) {
6530 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
6531 		    "will not delete this work tree's current branch");
6532 		goto done;
6533 	}
6534 
6535 	err = delete_ref(repo, ref);
6536 done:
6537 	if (ref)
6538 		got_ref_close(ref);
6539 	free(refname);
6540 	free(remote_refname);
6541 	return err;
6542 }
6543 
6544 static const struct got_error *
6545 add_branch(struct got_repository *repo, const char *branch_name,
6546     struct got_object_id *base_commit_id)
6547 {
6548 	const struct got_error *err = NULL;
6549 	struct got_reference *ref = NULL;
6550 	char *base_refname = NULL, *refname = NULL;
6551 
6552 	/*
6553 	 * Don't let the user create a branch name with a leading '-'.
6554 	 * While technically a valid reference name, this case is usually
6555 	 * an unintended typo.
6556 	 */
6557 	if (branch_name[0] == '-')
6558 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6559 
6560 	if (strncmp(branch_name, "refs/heads/", 11) == 0)
6561 		branch_name += 11;
6562 
6563 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6564 		err = got_error_from_errno("asprintf");
6565 		goto done;
6566 	}
6567 
6568 	err = got_ref_open(&ref, repo, refname, 0);
6569 	if (err == NULL) {
6570 		err = got_error(GOT_ERR_BRANCH_EXISTS);
6571 		goto done;
6572 	} else if (err->code != GOT_ERR_NOT_REF)
6573 		goto done;
6574 
6575 	err = got_ref_alloc(&ref, refname, base_commit_id);
6576 	if (err)
6577 		goto done;
6578 
6579 	err = got_ref_write(ref, repo);
6580 done:
6581 	if (ref)
6582 		got_ref_close(ref);
6583 	free(base_refname);
6584 	free(refname);
6585 	return err;
6586 }
6587 
6588 static const struct got_error *
6589 cmd_branch(int argc, char *argv[])
6590 {
6591 	const struct got_error *error = NULL;
6592 	struct got_repository *repo = NULL;
6593 	struct got_worktree *worktree = NULL;
6594 	char *cwd = NULL, *repo_path = NULL;
6595 	int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6596 	const char *delref = NULL, *commit_id_arg = NULL;
6597 	struct got_reference *ref = NULL;
6598 	struct got_pathlist_head paths;
6599 	struct got_pathlist_entry *pe;
6600 	struct got_object_id *commit_id = NULL;
6601 	char *commit_id_str = NULL;
6602 	int *pack_fds = NULL;
6603 
6604 	TAILQ_INIT(&paths);
6605 
6606 	while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6607 		switch (ch) {
6608 		case 'c':
6609 			commit_id_arg = optarg;
6610 			break;
6611 		case 'd':
6612 			delref = optarg;
6613 			break;
6614 		case 'r':
6615 			repo_path = realpath(optarg, NULL);
6616 			if (repo_path == NULL)
6617 				return got_error_from_errno2("realpath",
6618 				    optarg);
6619 			got_path_strip_trailing_slashes(repo_path);
6620 			break;
6621 		case 'l':
6622 			do_list = 1;
6623 			break;
6624 		case 'n':
6625 			do_update = 0;
6626 			break;
6627 		case 't':
6628 			sort_by_time = 1;
6629 			break;
6630 		default:
6631 			usage_branch();
6632 			/* NOTREACHED */
6633 		}
6634 	}
6635 
6636 	if (do_list && delref)
6637 		option_conflict('l', 'd');
6638 	if (sort_by_time && !do_list)
6639 		errx(1, "-t option requires -l option");
6640 
6641 	argc -= optind;
6642 	argv += optind;
6643 
6644 	if (!do_list && !delref && argc == 0)
6645 		do_show = 1;
6646 
6647 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
6648 		errx(1, "-c option can only be used when creating a branch");
6649 
6650 	if (do_list || delref) {
6651 		if (argc > 0)
6652 			usage_branch();
6653 	} else if (!do_show && argc != 1)
6654 		usage_branch();
6655 
6656 #ifndef PROFILE
6657 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6658 	    "sendfd unveil", NULL) == -1)
6659 		err(1, "pledge");
6660 #endif
6661 	cwd = getcwd(NULL, 0);
6662 	if (cwd == NULL) {
6663 		error = got_error_from_errno("getcwd");
6664 		goto done;
6665 	}
6666 
6667 	error = got_repo_pack_fds_open(&pack_fds);
6668 	if (error != NULL)
6669 		goto done;
6670 
6671 	if (repo_path == NULL) {
6672 		error = got_worktree_open(&worktree, cwd);
6673 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6674 			goto done;
6675 		else
6676 			error = NULL;
6677 		if (worktree) {
6678 			repo_path =
6679 			    strdup(got_worktree_get_repo_path(worktree));
6680 			if (repo_path == NULL)
6681 				error = got_error_from_errno("strdup");
6682 			if (error)
6683 				goto done;
6684 		} else {
6685 			repo_path = strdup(cwd);
6686 			if (repo_path == NULL) {
6687 				error = got_error_from_errno("strdup");
6688 				goto done;
6689 			}
6690 		}
6691 	}
6692 
6693 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6694 	if (error != NULL)
6695 		goto done;
6696 
6697 #ifndef PROFILE
6698 	if (do_list || do_show) {
6699 		/* Remove "cpath" promise. */
6700 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6701 		    NULL) == -1)
6702 			err(1, "pledge");
6703 	}
6704 #endif
6705 
6706 	error = apply_unveil(got_repo_get_path(repo), do_list,
6707 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
6708 	if (error)
6709 		goto done;
6710 
6711 	if (do_show)
6712 		error = show_current_branch(repo, worktree);
6713 	else if (do_list)
6714 		error = list_branches(repo, worktree, sort_by_time);
6715 	else if (delref)
6716 		error = delete_branch(repo, worktree, delref);
6717 	else {
6718 		struct got_reflist_head refs;
6719 		TAILQ_INIT(&refs);
6720 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6721 		    NULL);
6722 		if (error)
6723 			goto done;
6724 		if (commit_id_arg == NULL)
6725 			commit_id_arg = worktree ?
6726 			    got_worktree_get_head_ref_name(worktree) :
6727 			    GOT_REF_HEAD;
6728 		error = got_repo_match_object_id(&commit_id, NULL,
6729 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6730 		got_ref_list_free(&refs);
6731 		if (error)
6732 			goto done;
6733 		error = add_branch(repo, argv[0], commit_id);
6734 		if (error)
6735 			goto done;
6736 		if (worktree && do_update) {
6737 			struct got_update_progress_arg upa;
6738 			char *branch_refname = NULL;
6739 
6740 			error = got_object_id_str(&commit_id_str, commit_id);
6741 			if (error)
6742 				goto done;
6743 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
6744 			    worktree);
6745 			if (error)
6746 				goto done;
6747 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6748 			    == -1) {
6749 				error = got_error_from_errno("asprintf");
6750 				goto done;
6751 			}
6752 			error = got_ref_open(&ref, repo, branch_refname, 0);
6753 			free(branch_refname);
6754 			if (error)
6755 				goto done;
6756 			error = switch_head_ref(ref, commit_id, worktree,
6757 			    repo);
6758 			if (error)
6759 				goto done;
6760 			error = got_worktree_set_base_commit_id(worktree, repo,
6761 			    commit_id);
6762 			if (error)
6763 				goto done;
6764 			memset(&upa, 0, sizeof(upa));
6765 			error = got_worktree_checkout_files(worktree, &paths,
6766 			    repo, update_progress, &upa, check_cancelled,
6767 			    NULL);
6768 			if (error)
6769 				goto done;
6770 			if (upa.did_something) {
6771 				printf("Updated to %s: %s\n",
6772 				    got_worktree_get_head_ref_name(worktree),
6773 				    commit_id_str);
6774 			}
6775 			print_update_progress_stats(&upa);
6776 		}
6777 	}
6778 done:
6779 	if (ref)
6780 		got_ref_close(ref);
6781 	if (repo) {
6782 		const struct got_error *close_err = got_repo_close(repo);
6783 		if (error == NULL)
6784 			error = close_err;
6785 	}
6786 	if (worktree)
6787 		got_worktree_close(worktree);
6788 	if (pack_fds) {
6789 		const struct got_error *pack_err =
6790 		    got_repo_pack_fds_close(pack_fds);
6791 		if (error == NULL)
6792 			error = pack_err;
6793 	}
6794 	free(cwd);
6795 	free(repo_path);
6796 	free(commit_id);
6797 	free(commit_id_str);
6798 	TAILQ_FOREACH(pe, &paths, entry)
6799 		free((char *)pe->path);
6800 	got_pathlist_free(&paths);
6801 	return error;
6802 }
6803 
6804 
6805 __dead static void
6806 usage_tag(void)
6807 {
6808 	fprintf(stderr,
6809 	    "usage: %s tag [-c commit] [-r repository] [-l] "
6810 	        "[-m message] name\n", getprogname());
6811 	exit(1);
6812 }
6813 
6814 #if 0
6815 static const struct got_error *
6816 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6817 {
6818 	const struct got_error *err = NULL;
6819 	struct got_reflist_entry *re, *se, *new;
6820 	struct got_object_id *re_id, *se_id;
6821 	struct got_tag_object *re_tag, *se_tag;
6822 	time_t re_time, se_time;
6823 
6824 	STAILQ_FOREACH(re, tags, entry) {
6825 		se = STAILQ_FIRST(sorted);
6826 		if (se == NULL) {
6827 			err = got_reflist_entry_dup(&new, re);
6828 			if (err)
6829 				return err;
6830 			STAILQ_INSERT_HEAD(sorted, new, entry);
6831 			continue;
6832 		} else {
6833 			err = got_ref_resolve(&re_id, repo, re->ref);
6834 			if (err)
6835 				break;
6836 			err = got_object_open_as_tag(&re_tag, repo, re_id);
6837 			free(re_id);
6838 			if (err)
6839 				break;
6840 			re_time = got_object_tag_get_tagger_time(re_tag);
6841 			got_object_tag_close(re_tag);
6842 		}
6843 
6844 		while (se) {
6845 			err = got_ref_resolve(&se_id, repo, re->ref);
6846 			if (err)
6847 				break;
6848 			err = got_object_open_as_tag(&se_tag, repo, se_id);
6849 			free(se_id);
6850 			if (err)
6851 				break;
6852 			se_time = got_object_tag_get_tagger_time(se_tag);
6853 			got_object_tag_close(se_tag);
6854 
6855 			if (se_time > re_time) {
6856 				err = got_reflist_entry_dup(&new, re);
6857 				if (err)
6858 					return err;
6859 				STAILQ_INSERT_AFTER(sorted, se, new, entry);
6860 				break;
6861 			}
6862 			se = STAILQ_NEXT(se, entry);
6863 			continue;
6864 		}
6865 	}
6866 done:
6867 	return err;
6868 }
6869 #endif
6870 
6871 static const struct got_error *
6872 get_tag_refname(char **refname, const char *tag_name)
6873 {
6874 	const struct got_error *err;
6875 
6876 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
6877 		*refname = strdup(tag_name);
6878 		if (*refname == NULL)
6879 			return got_error_from_errno("strdup");
6880 	} else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
6881 		err = got_error_from_errno("asprintf");
6882 		*refname = NULL;
6883 		return err;
6884 	}
6885 
6886 	return NULL;
6887 }
6888 
6889 static const struct got_error *
6890 list_tags(struct got_repository *repo, const char *tag_name)
6891 {
6892 	static const struct got_error *err = NULL;
6893 	struct got_reflist_head refs;
6894 	struct got_reflist_entry *re;
6895 	char *wanted_refname = NULL;
6896 
6897 	TAILQ_INIT(&refs);
6898 
6899 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6900 	if (err)
6901 		return err;
6902 
6903 	if (tag_name) {
6904 		struct got_reference *ref;
6905 		err = get_tag_refname(&wanted_refname, tag_name);
6906 		if (err)
6907 			goto done;
6908 		/* Wanted tag reference should exist. */
6909 		err = got_ref_open(&ref, repo, wanted_refname, 0);
6910 		if (err)
6911 			goto done;
6912 		got_ref_close(ref);
6913 	}
6914 
6915 	TAILQ_FOREACH(re, &refs, entry) {
6916 		const char *refname;
6917 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6918 		char datebuf[26];
6919 		const char *tagger;
6920 		time_t tagger_time;
6921 		struct got_object_id *id;
6922 		struct got_tag_object *tag;
6923 		struct got_commit_object *commit = NULL;
6924 
6925 		refname = got_ref_get_name(re->ref);
6926 		if (strncmp(refname, "refs/tags/", 10) != 0 ||
6927 		    (wanted_refname && strcmp(refname, wanted_refname) != 0))
6928 			continue;
6929 		refname += 10;
6930 		refstr = got_ref_to_str(re->ref);
6931 		if (refstr == NULL) {
6932 			err = got_error_from_errno("got_ref_to_str");
6933 			break;
6934 		}
6935 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6936 		free(refstr);
6937 
6938 		err = got_ref_resolve(&id, repo, re->ref);
6939 		if (err)
6940 			break;
6941 		err = got_object_open_as_tag(&tag, repo, id);
6942 		if (err) {
6943 			if (err->code != GOT_ERR_OBJ_TYPE) {
6944 				free(id);
6945 				break;
6946 			}
6947 			/* "lightweight" tag */
6948 			err = got_object_open_as_commit(&commit, repo, id);
6949 			if (err) {
6950 				free(id);
6951 				break;
6952 			}
6953 			tagger = got_object_commit_get_committer(commit);
6954 			tagger_time =
6955 			    got_object_commit_get_committer_time(commit);
6956 			err = got_object_id_str(&id_str, id);
6957 			free(id);
6958 			if (err)
6959 				break;
6960 		} else {
6961 			free(id);
6962 			tagger = got_object_tag_get_tagger(tag);
6963 			tagger_time = got_object_tag_get_tagger_time(tag);
6964 			err = got_object_id_str(&id_str,
6965 			    got_object_tag_get_object_id(tag));
6966 			if (err)
6967 				break;
6968 		}
6969 		printf("from: %s\n", tagger);
6970 		datestr = get_datestr(&tagger_time, datebuf);
6971 		if (datestr)
6972 			printf("date: %s UTC\n", datestr);
6973 		if (commit)
6974 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6975 		else {
6976 			switch (got_object_tag_get_object_type(tag)) {
6977 			case GOT_OBJ_TYPE_BLOB:
6978 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6979 				    id_str);
6980 				break;
6981 			case GOT_OBJ_TYPE_TREE:
6982 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6983 				    id_str);
6984 				break;
6985 			case GOT_OBJ_TYPE_COMMIT:
6986 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6987 				    id_str);
6988 				break;
6989 			case GOT_OBJ_TYPE_TAG:
6990 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6991 				    id_str);
6992 				break;
6993 			default:
6994 				break;
6995 			}
6996 		}
6997 		free(id_str);
6998 		if (commit) {
6999 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
7000 			if (err)
7001 				break;
7002 			got_object_commit_close(commit);
7003 		} else {
7004 			tagmsg0 = strdup(got_object_tag_get_message(tag));
7005 			got_object_tag_close(tag);
7006 			if (tagmsg0 == NULL) {
7007 				err = got_error_from_errno("strdup");
7008 				break;
7009 			}
7010 		}
7011 
7012 		tagmsg = tagmsg0;
7013 		do {
7014 			line = strsep(&tagmsg, "\n");
7015 			if (line)
7016 				printf(" %s\n", line);
7017 		} while (line);
7018 		free(tagmsg0);
7019 	}
7020 done:
7021 	got_ref_list_free(&refs);
7022 	free(wanted_refname);
7023 	return err;
7024 }
7025 
7026 static const struct got_error *
7027 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7028     const char *tag_name, const char *repo_path)
7029 {
7030 	const struct got_error *err = NULL;
7031 	char *template = NULL, *initial_content = NULL;
7032 	char *editor = NULL;
7033 	int initial_content_len;
7034 	int fd = -1;
7035 
7036 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7037 		err = got_error_from_errno("asprintf");
7038 		goto done;
7039 	}
7040 
7041 	initial_content_len = asprintf(&initial_content,
7042 	    "\n# tagging commit %s as %s\n",
7043 	    commit_id_str, tag_name);
7044 	if (initial_content_len == -1) {
7045 		err = got_error_from_errno("asprintf");
7046 		goto done;
7047 	}
7048 
7049 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
7050 	if (err)
7051 		goto done;
7052 
7053 	if (write(fd, initial_content, initial_content_len) == -1) {
7054 		err = got_error_from_errno2("write", *tagmsg_path);
7055 		goto done;
7056 	}
7057 
7058 	err = get_editor(&editor);
7059 	if (err)
7060 		goto done;
7061 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7062 	    initial_content_len, 1);
7063 done:
7064 	free(initial_content);
7065 	free(template);
7066 	free(editor);
7067 
7068 	if (fd != -1 && close(fd) == -1 && err == NULL)
7069 		err = got_error_from_errno2("close", *tagmsg_path);
7070 
7071 	/* Editor is done; we can now apply unveil(2) */
7072 	if (err == NULL)
7073 		err = apply_unveil(repo_path, 0, NULL);
7074 	if (err) {
7075 		free(*tagmsg);
7076 		*tagmsg = NULL;
7077 	}
7078 	return err;
7079 }
7080 
7081 static const struct got_error *
7082 add_tag(struct got_repository *repo, const char *tagger,
7083     const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
7084 {
7085 	const struct got_error *err = NULL;
7086 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
7087 	char *label = NULL, *commit_id_str = NULL;
7088 	struct got_reference *ref = NULL;
7089 	char *refname = NULL, *tagmsg = NULL;
7090 	char *tagmsg_path = NULL, *tag_id_str = NULL;
7091 	int preserve_tagmsg = 0;
7092 	struct got_reflist_head refs;
7093 
7094 	TAILQ_INIT(&refs);
7095 
7096 	/*
7097 	 * Don't let the user create a tag name with a leading '-'.
7098 	 * While technically a valid reference name, this case is usually
7099 	 * an unintended typo.
7100 	 */
7101 	if (tag_name[0] == '-')
7102 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7103 
7104 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7105 	if (err)
7106 		goto done;
7107 
7108 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7109 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
7110 	if (err)
7111 		goto done;
7112 
7113 	err = got_object_id_str(&commit_id_str, commit_id);
7114 	if (err)
7115 		goto done;
7116 
7117 	err = get_tag_refname(&refname, tag_name);
7118 	if (err)
7119 		goto done;
7120 	if (strncmp("refs/tags/", tag_name, 10) == 0)
7121 		tag_name += 10;
7122 
7123 	err = got_ref_open(&ref, repo, refname, 0);
7124 	if (err == NULL) {
7125 		err = got_error(GOT_ERR_TAG_EXISTS);
7126 		goto done;
7127 	} else if (err->code != GOT_ERR_NOT_REF)
7128 		goto done;
7129 
7130 	if (tagmsg_arg == NULL) {
7131 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7132 		    tag_name, got_repo_get_path(repo));
7133 		if (err) {
7134 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7135 			    tagmsg_path != NULL)
7136 				preserve_tagmsg = 1;
7137 			goto done;
7138 		}
7139 	}
7140 
7141 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
7142 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
7143 	if (err) {
7144 		if (tagmsg_path)
7145 			preserve_tagmsg = 1;
7146 		goto done;
7147 	}
7148 
7149 	err = got_ref_alloc(&ref, refname, tag_id);
7150 	if (err) {
7151 		if (tagmsg_path)
7152 			preserve_tagmsg = 1;
7153 		goto done;
7154 	}
7155 
7156 	err = got_ref_write(ref, repo);
7157 	if (err) {
7158 		if (tagmsg_path)
7159 			preserve_tagmsg = 1;
7160 		goto done;
7161 	}
7162 
7163 	err = got_object_id_str(&tag_id_str, tag_id);
7164 	if (err) {
7165 		if (tagmsg_path)
7166 			preserve_tagmsg = 1;
7167 		goto done;
7168 	}
7169 	printf("Created tag %s\n", tag_id_str);
7170 done:
7171 	if (preserve_tagmsg) {
7172 		fprintf(stderr, "%s: tag message preserved in %s\n",
7173 		    getprogname(), tagmsg_path);
7174 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7175 		err = got_error_from_errno2("unlink", tagmsg_path);
7176 	free(tag_id_str);
7177 	if (ref)
7178 		got_ref_close(ref);
7179 	free(commit_id);
7180 	free(commit_id_str);
7181 	free(refname);
7182 	free(tagmsg);
7183 	free(tagmsg_path);
7184 	got_ref_list_free(&refs);
7185 	return err;
7186 }
7187 
7188 static const struct got_error *
7189 cmd_tag(int argc, char *argv[])
7190 {
7191 	const struct got_error *error = NULL;
7192 	struct got_repository *repo = NULL;
7193 	struct got_worktree *worktree = NULL;
7194 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7195 	char *gitconfig_path = NULL, *tagger = NULL;
7196 	const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7197 	int ch, do_list = 0;
7198 	int *pack_fds = NULL;
7199 
7200 	while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
7201 		switch (ch) {
7202 		case 'c':
7203 			commit_id_arg = optarg;
7204 			break;
7205 		case 'm':
7206 			tagmsg = optarg;
7207 			break;
7208 		case 'r':
7209 			repo_path = realpath(optarg, NULL);
7210 			if (repo_path == NULL)
7211 				return got_error_from_errno2("realpath",
7212 				    optarg);
7213 			got_path_strip_trailing_slashes(repo_path);
7214 			break;
7215 		case 'l':
7216 			do_list = 1;
7217 			break;
7218 		default:
7219 			usage_tag();
7220 			/* NOTREACHED */
7221 		}
7222 	}
7223 
7224 	argc -= optind;
7225 	argv += optind;
7226 
7227 	if (do_list) {
7228 		if (commit_id_arg != NULL)
7229 			errx(1,
7230 			    "-c option can only be used when creating a tag");
7231 		if (tagmsg)
7232 			option_conflict('l', 'm');
7233 		if (argc > 1)
7234 			usage_tag();
7235 	} else if (argc != 1)
7236 		usage_tag();
7237 
7238 	if (argc == 1)
7239 		tag_name = argv[0];
7240 
7241 #ifndef PROFILE
7242 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7243 	    "sendfd unveil", NULL) == -1)
7244 		err(1, "pledge");
7245 #endif
7246 	cwd = getcwd(NULL, 0);
7247 	if (cwd == NULL) {
7248 		error = got_error_from_errno("getcwd");
7249 		goto done;
7250 	}
7251 
7252 	error = got_repo_pack_fds_open(&pack_fds);
7253 	if (error != NULL)
7254 		goto done;
7255 
7256 	if (repo_path == NULL) {
7257 		error = got_worktree_open(&worktree, cwd);
7258 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
7259 			goto done;
7260 		else
7261 			error = NULL;
7262 		if (worktree) {
7263 			repo_path =
7264 			    strdup(got_worktree_get_repo_path(worktree));
7265 			if (repo_path == NULL)
7266 				error = got_error_from_errno("strdup");
7267 			if (error)
7268 				goto done;
7269 		} else {
7270 			repo_path = strdup(cwd);
7271 			if (repo_path == NULL) {
7272 				error = got_error_from_errno("strdup");
7273 				goto done;
7274 			}
7275 		}
7276 	}
7277 
7278 	if (do_list) {
7279 		if (worktree) {
7280 			/* Release work tree lock. */
7281 			got_worktree_close(worktree);
7282 			worktree = NULL;
7283 		}
7284 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7285 		if (error != NULL)
7286 			goto done;
7287 
7288 #ifndef PROFILE
7289 		/* Remove "cpath" promise. */
7290 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7291 		    NULL) == -1)
7292 			err(1, "pledge");
7293 #endif
7294 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7295 		if (error)
7296 			goto done;
7297 		error = list_tags(repo, tag_name);
7298 	} else {
7299 		error = get_gitconfig_path(&gitconfig_path);
7300 		if (error)
7301 			goto done;
7302 		error = got_repo_open(&repo, repo_path, gitconfig_path,
7303 		    pack_fds);
7304 		if (error != NULL)
7305 			goto done;
7306 
7307 		error = get_author(&tagger, repo, worktree);
7308 		if (error)
7309 			goto done;
7310 		if (worktree) {
7311 			/* Release work tree lock. */
7312 			got_worktree_close(worktree);
7313 			worktree = NULL;
7314 		}
7315 
7316 		if (tagmsg) {
7317 			error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7318 			if (error)
7319 				goto done;
7320 		}
7321 
7322 		if (commit_id_arg == NULL) {
7323 			struct got_reference *head_ref;
7324 			struct got_object_id *commit_id;
7325 			error = got_ref_open(&head_ref, repo,
7326 			    worktree ? got_worktree_get_head_ref_name(worktree)
7327 			    : GOT_REF_HEAD, 0);
7328 			if (error)
7329 				goto done;
7330 			error = got_ref_resolve(&commit_id, repo, head_ref);
7331 			got_ref_close(head_ref);
7332 			if (error)
7333 				goto done;
7334 			error = got_object_id_str(&commit_id_str, commit_id);
7335 			free(commit_id);
7336 			if (error)
7337 				goto done;
7338 		}
7339 
7340 		error = add_tag(repo, tagger, tag_name,
7341 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
7342 	}
7343 done:
7344 	if (repo) {
7345 		const struct got_error *close_err = got_repo_close(repo);
7346 		if (error == NULL)
7347 			error = close_err;
7348 	}
7349 	if (worktree)
7350 		got_worktree_close(worktree);
7351 	if (pack_fds) {
7352 		const struct got_error *pack_err =
7353 		    got_repo_pack_fds_close(pack_fds);
7354 		if (error == NULL)
7355 			error = pack_err;
7356 	}
7357 	free(cwd);
7358 	free(repo_path);
7359 	free(gitconfig_path);
7360 	free(commit_id_str);
7361 	free(tagger);
7362 	return error;
7363 }
7364 
7365 __dead static void
7366 usage_add(void)
7367 {
7368 	fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
7369 	    getprogname());
7370 	exit(1);
7371 }
7372 
7373 static const struct got_error *
7374 add_progress(void *arg, unsigned char status, const char *path)
7375 {
7376 	while (path[0] == '/')
7377 		path++;
7378 	printf("%c  %s\n", status, path);
7379 	return NULL;
7380 }
7381 
7382 static const struct got_error *
7383 cmd_add(int argc, char *argv[])
7384 {
7385 	const struct got_error *error = NULL;
7386 	struct got_repository *repo = NULL;
7387 	struct got_worktree *worktree = NULL;
7388 	char *cwd = NULL;
7389 	struct got_pathlist_head paths;
7390 	struct got_pathlist_entry *pe;
7391 	int ch, can_recurse = 0, no_ignores = 0;
7392 	int *pack_fds = NULL;
7393 
7394 	TAILQ_INIT(&paths);
7395 
7396 	while ((ch = getopt(argc, argv, "IR")) != -1) {
7397 		switch (ch) {
7398 		case 'I':
7399 			no_ignores = 1;
7400 			break;
7401 		case 'R':
7402 			can_recurse = 1;
7403 			break;
7404 		default:
7405 			usage_add();
7406 			/* NOTREACHED */
7407 		}
7408 	}
7409 
7410 	argc -= optind;
7411 	argv += optind;
7412 
7413 #ifndef PROFILE
7414 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7415 	    NULL) == -1)
7416 		err(1, "pledge");
7417 #endif
7418 	if (argc < 1)
7419 		usage_add();
7420 
7421 	cwd = getcwd(NULL, 0);
7422 	if (cwd == NULL) {
7423 		error = got_error_from_errno("getcwd");
7424 		goto done;
7425 	}
7426 
7427 	error = got_repo_pack_fds_open(&pack_fds);
7428 	if (error != NULL)
7429 		goto done;
7430 
7431 	error = got_worktree_open(&worktree, cwd);
7432 	if (error) {
7433 		if (error->code == GOT_ERR_NOT_WORKTREE)
7434 			error = wrap_not_worktree_error(error, "add", cwd);
7435 		goto done;
7436 	}
7437 
7438 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7439 	    NULL, pack_fds);
7440 	if (error != NULL)
7441 		goto done;
7442 
7443 	error = apply_unveil(got_repo_get_path(repo), 1,
7444 	    got_worktree_get_root_path(worktree));
7445 	if (error)
7446 		goto done;
7447 
7448 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7449 	if (error)
7450 		goto done;
7451 
7452 	if (!can_recurse) {
7453 		char *ondisk_path;
7454 		struct stat sb;
7455 		TAILQ_FOREACH(pe, &paths, entry) {
7456 			if (asprintf(&ondisk_path, "%s/%s",
7457 			    got_worktree_get_root_path(worktree),
7458 			    pe->path) == -1) {
7459 				error = got_error_from_errno("asprintf");
7460 				goto done;
7461 			}
7462 			if (lstat(ondisk_path, &sb) == -1) {
7463 				if (errno == ENOENT) {
7464 					free(ondisk_path);
7465 					continue;
7466 				}
7467 				error = got_error_from_errno2("lstat",
7468 				    ondisk_path);
7469 				free(ondisk_path);
7470 				goto done;
7471 			}
7472 			free(ondisk_path);
7473 			if (S_ISDIR(sb.st_mode)) {
7474 				error = got_error_msg(GOT_ERR_BAD_PATH,
7475 				    "adding directories requires -R option");
7476 				goto done;
7477 			}
7478 		}
7479 	}
7480 
7481 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
7482 	    NULL, repo, no_ignores);
7483 done:
7484 	if (repo) {
7485 		const struct got_error *close_err = got_repo_close(repo);
7486 		if (error == NULL)
7487 			error = close_err;
7488 	}
7489 	if (worktree)
7490 		got_worktree_close(worktree);
7491 	if (pack_fds) {
7492 		const struct got_error *pack_err =
7493 		    got_repo_pack_fds_close(pack_fds);
7494 		if (error == NULL)
7495 			error = pack_err;
7496 	}
7497 	TAILQ_FOREACH(pe, &paths, entry)
7498 		free((char *)pe->path);
7499 	got_pathlist_free(&paths);
7500 	free(cwd);
7501 	return error;
7502 }
7503 
7504 __dead static void
7505 usage_remove(void)
7506 {
7507 	fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
7508 	    "path ...\n", getprogname());
7509 	exit(1);
7510 }
7511 
7512 static const struct got_error *
7513 print_remove_status(void *arg, unsigned char status,
7514     unsigned char staged_status, const char *path)
7515 {
7516 	while (path[0] == '/')
7517 		path++;
7518 	if (status == GOT_STATUS_NONEXISTENT)
7519 		return NULL;
7520 	if (status == staged_status && (status == GOT_STATUS_DELETE))
7521 		status = GOT_STATUS_NO_CHANGE;
7522 	printf("%c%c %s\n", status, staged_status, path);
7523 	return NULL;
7524 }
7525 
7526 static const struct got_error *
7527 cmd_remove(int argc, char *argv[])
7528 {
7529 	const struct got_error *error = NULL;
7530 	struct got_worktree *worktree = NULL;
7531 	struct got_repository *repo = NULL;
7532 	const char *status_codes = NULL;
7533 	char *cwd = NULL;
7534 	struct got_pathlist_head paths;
7535 	struct got_pathlist_entry *pe;
7536 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7537 	int ignore_missing_paths = 0;
7538 	int *pack_fds = NULL;
7539 
7540 	TAILQ_INIT(&paths);
7541 
7542 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7543 		switch (ch) {
7544 		case 'f':
7545 			delete_local_mods = 1;
7546 			ignore_missing_paths = 1;
7547 			break;
7548 		case 'k':
7549 			keep_on_disk = 1;
7550 			break;
7551 		case 'R':
7552 			can_recurse = 1;
7553 			break;
7554 		case 's':
7555 			for (i = 0; i < strlen(optarg); i++) {
7556 				switch (optarg[i]) {
7557 				case GOT_STATUS_MODIFY:
7558 					delete_local_mods = 1;
7559 					break;
7560 				case GOT_STATUS_MISSING:
7561 					ignore_missing_paths = 1;
7562 					break;
7563 				default:
7564 					errx(1, "invalid status code '%c'",
7565 					    optarg[i]);
7566 				}
7567 			}
7568 			status_codes = optarg;
7569 			break;
7570 		default:
7571 			usage_remove();
7572 			/* NOTREACHED */
7573 		}
7574 	}
7575 
7576 	argc -= optind;
7577 	argv += optind;
7578 
7579 #ifndef PROFILE
7580 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7581 	    NULL) == -1)
7582 		err(1, "pledge");
7583 #endif
7584 	if (argc < 1)
7585 		usage_remove();
7586 
7587 	cwd = getcwd(NULL, 0);
7588 	if (cwd == NULL) {
7589 		error = got_error_from_errno("getcwd");
7590 		goto done;
7591 	}
7592 
7593 	error = got_repo_pack_fds_open(&pack_fds);
7594 	if (error != NULL)
7595 		goto done;
7596 
7597 	error = got_worktree_open(&worktree, cwd);
7598 	if (error) {
7599 		if (error->code == GOT_ERR_NOT_WORKTREE)
7600 			error = wrap_not_worktree_error(error, "remove", cwd);
7601 		goto done;
7602 	}
7603 
7604 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7605 	    NULL, pack_fds);
7606 	if (error)
7607 		goto done;
7608 
7609 	error = apply_unveil(got_repo_get_path(repo), 1,
7610 	    got_worktree_get_root_path(worktree));
7611 	if (error)
7612 		goto done;
7613 
7614 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7615 	if (error)
7616 		goto done;
7617 
7618 	if (!can_recurse) {
7619 		char *ondisk_path;
7620 		struct stat sb;
7621 		TAILQ_FOREACH(pe, &paths, entry) {
7622 			if (asprintf(&ondisk_path, "%s/%s",
7623 			    got_worktree_get_root_path(worktree),
7624 			    pe->path) == -1) {
7625 				error = got_error_from_errno("asprintf");
7626 				goto done;
7627 			}
7628 			if (lstat(ondisk_path, &sb) == -1) {
7629 				if (errno == ENOENT) {
7630 					free(ondisk_path);
7631 					continue;
7632 				}
7633 				error = got_error_from_errno2("lstat",
7634 				    ondisk_path);
7635 				free(ondisk_path);
7636 				goto done;
7637 			}
7638 			free(ondisk_path);
7639 			if (S_ISDIR(sb.st_mode)) {
7640 				error = got_error_msg(GOT_ERR_BAD_PATH,
7641 				    "removing directories requires -R option");
7642 				goto done;
7643 			}
7644 		}
7645 	}
7646 
7647 	error = got_worktree_schedule_delete(worktree, &paths,
7648 	    delete_local_mods, status_codes, print_remove_status, NULL,
7649 	    repo, keep_on_disk, ignore_missing_paths);
7650 done:
7651 	if (repo) {
7652 		const struct got_error *close_err = got_repo_close(repo);
7653 		if (error == NULL)
7654 			error = close_err;
7655 	}
7656 	if (worktree)
7657 		got_worktree_close(worktree);
7658 	if (pack_fds) {
7659 		const struct got_error *pack_err =
7660 		    got_repo_pack_fds_close(pack_fds);
7661 		if (error == NULL)
7662 			error = pack_err;
7663 	}
7664 	TAILQ_FOREACH(pe, &paths, entry)
7665 		free((char *)pe->path);
7666 	got_pathlist_free(&paths);
7667 	free(cwd);
7668 	return error;
7669 }
7670 
7671 __dead static void
7672 usage_patch(void)
7673 {
7674 	fprintf(stderr, "usage: %s patch [-n] [-p strip-count] "
7675 	    "[-R] [patchfile]\n", getprogname());
7676 	exit(1);
7677 }
7678 
7679 static const struct got_error *
7680 patch_from_stdin(int *patchfd)
7681 {
7682 	const struct got_error *err = NULL;
7683 	ssize_t r;
7684 	char *path, buf[BUFSIZ];
7685 	sig_t sighup, sigint, sigquit;
7686 
7687 	err = got_opentemp_named_fd(&path, patchfd,
7688 	    GOT_TMPDIR_STR "/got-patch");
7689 	if (err)
7690 		return err;
7691 	unlink(path);
7692 	free(path);
7693 
7694 	sighup = signal(SIGHUP, SIG_DFL);
7695 	sigint = signal(SIGINT, SIG_DFL);
7696 	sigquit = signal(SIGQUIT, SIG_DFL);
7697 
7698 	for (;;) {
7699 		r = read(0, buf, sizeof(buf));
7700 		if (r == -1) {
7701 			err = got_error_from_errno("read");
7702 			break;
7703 		}
7704 		if (r == 0)
7705 			break;
7706 		if (write(*patchfd, buf, r) == -1) {
7707 			err = got_error_from_errno("write");
7708 			break;
7709 		}
7710 	}
7711 
7712 	signal(SIGHUP, sighup);
7713 	signal(SIGINT, sigint);
7714 	signal(SIGQUIT, sigquit);
7715 
7716 	if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7717 		err = got_error_from_errno("lseek");
7718 
7719 	if (err != NULL) {
7720 		close(*patchfd);
7721 		*patchfd = -1;
7722 	}
7723 
7724 	return err;
7725 }
7726 
7727 static const struct got_error *
7728 patch_progress(void *arg, const char *old, const char *new,
7729     unsigned char status, const struct got_error *error, long old_from,
7730     long old_lines, long new_from, long new_lines, long offset,
7731     const struct got_error *hunk_err)
7732 {
7733 	const char *path = new == NULL ? old : new;
7734 
7735 	while (*path == '/')
7736 		path++;
7737 
7738 	if (status != 0)
7739 		printf("%c  %s\n", status, path);
7740 
7741 	if (error != NULL)
7742 		fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7743 
7744 	if (offset != 0 || hunk_err != NULL) {
7745 		printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
7746 		    old_lines, new_from, new_lines);
7747 		if (hunk_err != NULL)
7748 			printf("%s\n", hunk_err->msg);
7749 		else
7750 			printf("applied with offset %ld\n", offset);
7751 	}
7752 
7753 	return NULL;
7754 }
7755 
7756 static const struct got_error *
7757 cmd_patch(int argc, char *argv[])
7758 {
7759 	const struct got_error *error = NULL, *close_error = NULL;
7760 	struct got_worktree *worktree = NULL;
7761 	struct got_repository *repo = NULL;
7762 	const char *errstr;
7763 	char *cwd = NULL;
7764 	int ch, nop = 0, strip = -1, reverse = 0;
7765 	int patchfd;
7766 	int *pack_fds = NULL;
7767 
7768 	while ((ch = getopt(argc, argv, "np:R")) != -1) {
7769 		switch (ch) {
7770 		case 'n':
7771 			nop = 1;
7772 			break;
7773 		case 'p':
7774 			strip = strtonum(optarg, 0, INT_MAX, &errstr);
7775 			if (errstr != NULL)
7776 				errx(1, "pathname strip count is %s: %s",
7777 				     errstr, optarg);
7778 			break;
7779 		case 'R':
7780 			reverse = 1;
7781 			break;
7782 		default:
7783 			usage_patch();
7784 			/* NOTREACHED */
7785 		}
7786 	}
7787 
7788 	argc -= optind;
7789 	argv += optind;
7790 
7791 	if (argc == 0) {
7792 		error = patch_from_stdin(&patchfd);
7793 		if (error)
7794 			return error;
7795 	} else if (argc == 1) {
7796 		patchfd = open(argv[0], O_RDONLY);
7797 		if (patchfd == -1) {
7798 			error = got_error_from_errno2("open", argv[0]);
7799 			return error;
7800 		}
7801 	} else
7802 		usage_patch();
7803 
7804 	if ((cwd = getcwd(NULL, 0)) == NULL) {
7805 		error = got_error_from_errno("getcwd");
7806 		goto done;
7807 	}
7808 
7809 	error = got_repo_pack_fds_open(&pack_fds);
7810 	if (error != NULL)
7811 		goto done;
7812 
7813 	error = got_worktree_open(&worktree, cwd);
7814 	if (error != NULL)
7815 		goto done;
7816 
7817 	const char *repo_path = got_worktree_get_repo_path(worktree);
7818 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7819 	if (error != NULL)
7820 		goto done;
7821 
7822 	error = apply_unveil(got_repo_get_path(repo), 0,
7823 	    got_worktree_get_root_path(worktree));
7824 	if (error != NULL)
7825 		goto done;
7826 
7827 #ifndef PROFILE
7828 	if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock",
7829 	    NULL) == -1)
7830 		err(1, "pledge");
7831 #endif
7832 
7833 	error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
7834 	    &patch_progress, NULL, check_cancelled, NULL);
7835 
7836 done:
7837 	if (repo) {
7838 		close_error = got_repo_close(repo);
7839 		if (error == NULL)
7840 			error = close_error;
7841 	}
7842 	if (worktree != NULL) {
7843 		close_error = got_worktree_close(worktree);
7844 		if (error == NULL)
7845 			error = close_error;
7846 	}
7847 	if (pack_fds) {
7848 		const struct got_error *pack_err =
7849 		    got_repo_pack_fds_close(pack_fds);
7850 		if (error == NULL)
7851 			error = pack_err;
7852 	}
7853 	free(cwd);
7854 	return error;
7855 }
7856 
7857 __dead static void
7858 usage_revert(void)
7859 {
7860 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7861 	    "path ...\n", getprogname());
7862 	exit(1);
7863 }
7864 
7865 static const struct got_error *
7866 revert_progress(void *arg, unsigned char status, const char *path)
7867 {
7868 	if (status == GOT_STATUS_UNVERSIONED)
7869 		return NULL;
7870 
7871 	while (path[0] == '/')
7872 		path++;
7873 	printf("%c  %s\n", status, path);
7874 	return NULL;
7875 }
7876 
7877 struct choose_patch_arg {
7878 	FILE *patch_script_file;
7879 	const char *action;
7880 };
7881 
7882 static const struct got_error *
7883 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7884     int nchanges, const char *action)
7885 {
7886 	const struct got_error *err;
7887 	char *line = NULL;
7888 	size_t linesize = 0;
7889 	ssize_t linelen;
7890 
7891 	switch (status) {
7892 	case GOT_STATUS_ADD:
7893 		printf("A  %s\n%s this addition? [y/n] ", path, action);
7894 		break;
7895 	case GOT_STATUS_DELETE:
7896 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
7897 		break;
7898 	case GOT_STATUS_MODIFY:
7899 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
7900 			return got_error_from_errno("fseek");
7901 		printf(GOT_COMMIT_SEP_STR);
7902 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7903 			printf("%s", line);
7904 		if (linelen == -1 && ferror(patch_file)) {
7905 			err = got_error_from_errno("getline");
7906 			free(line);
7907 			return err;
7908 		}
7909 		free(line);
7910 		printf(GOT_COMMIT_SEP_STR);
7911 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
7912 		    path, n, nchanges, action);
7913 		break;
7914 	default:
7915 		return got_error_path(path, GOT_ERR_FILE_STATUS);
7916 	}
7917 
7918 	return NULL;
7919 }
7920 
7921 static const struct got_error *
7922 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7923     FILE *patch_file, int n, int nchanges)
7924 {
7925 	const struct got_error *err = NULL;
7926 	char *line = NULL;
7927 	size_t linesize = 0;
7928 	ssize_t linelen;
7929 	int resp = ' ';
7930 	struct choose_patch_arg *a = arg;
7931 
7932 	*choice = GOT_PATCH_CHOICE_NONE;
7933 
7934 	if (a->patch_script_file) {
7935 		char *nl;
7936 		err = show_change(status, path, patch_file, n, nchanges,
7937 		    a->action);
7938 		if (err)
7939 			return err;
7940 		linelen = getline(&line, &linesize, a->patch_script_file);
7941 		if (linelen == -1) {
7942 			if (ferror(a->patch_script_file))
7943 				return got_error_from_errno("getline");
7944 			return NULL;
7945 		}
7946 		nl = strchr(line, '\n');
7947 		if (nl)
7948 			*nl = '\0';
7949 		if (strcmp(line, "y") == 0) {
7950 			*choice = GOT_PATCH_CHOICE_YES;
7951 			printf("y\n");
7952 		} else if (strcmp(line, "n") == 0) {
7953 			*choice = GOT_PATCH_CHOICE_NO;
7954 			printf("n\n");
7955 		} else if (strcmp(line, "q") == 0 &&
7956 		    status == GOT_STATUS_MODIFY) {
7957 			*choice = GOT_PATCH_CHOICE_QUIT;
7958 			printf("q\n");
7959 		} else
7960 			printf("invalid response '%s'\n", line);
7961 		free(line);
7962 		return NULL;
7963 	}
7964 
7965 	while (resp != 'y' && resp != 'n' && resp != 'q') {
7966 		err = show_change(status, path, patch_file, n, nchanges,
7967 		    a->action);
7968 		if (err)
7969 			return err;
7970 		resp = getchar();
7971 		if (resp == '\n')
7972 			resp = getchar();
7973 		if (status == GOT_STATUS_MODIFY) {
7974 			if (resp != 'y' && resp != 'n' && resp != 'q') {
7975 				printf("invalid response '%c'\n", resp);
7976 				resp = ' ';
7977 			}
7978 		} else if (resp != 'y' && resp != 'n') {
7979 				printf("invalid response '%c'\n", resp);
7980 				resp = ' ';
7981 		}
7982 	}
7983 
7984 	if (resp == 'y')
7985 		*choice = GOT_PATCH_CHOICE_YES;
7986 	else if (resp == 'n')
7987 		*choice = GOT_PATCH_CHOICE_NO;
7988 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7989 		*choice = GOT_PATCH_CHOICE_QUIT;
7990 
7991 	return NULL;
7992 }
7993 
7994 static const struct got_error *
7995 cmd_revert(int argc, char *argv[])
7996 {
7997 	const struct got_error *error = NULL;
7998 	struct got_worktree *worktree = NULL;
7999 	struct got_repository *repo = NULL;
8000 	char *cwd = NULL, *path = NULL;
8001 	struct got_pathlist_head paths;
8002 	struct got_pathlist_entry *pe;
8003 	int ch, can_recurse = 0, pflag = 0;
8004 	FILE *patch_script_file = NULL;
8005 	const char *patch_script_path = NULL;
8006 	struct choose_patch_arg cpa;
8007 	int *pack_fds = NULL;
8008 
8009 	TAILQ_INIT(&paths);
8010 
8011 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
8012 		switch (ch) {
8013 		case 'p':
8014 			pflag = 1;
8015 			break;
8016 		case 'F':
8017 			patch_script_path = optarg;
8018 			break;
8019 		case 'R':
8020 			can_recurse = 1;
8021 			break;
8022 		default:
8023 			usage_revert();
8024 			/* NOTREACHED */
8025 		}
8026 	}
8027 
8028 	argc -= optind;
8029 	argv += optind;
8030 
8031 #ifndef PROFILE
8032 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8033 	    "unveil", NULL) == -1)
8034 		err(1, "pledge");
8035 #endif
8036 	if (argc < 1)
8037 		usage_revert();
8038 	if (patch_script_path && !pflag)
8039 		errx(1, "-F option can only be used together with -p option");
8040 
8041 	cwd = getcwd(NULL, 0);
8042 	if (cwd == NULL) {
8043 		error = got_error_from_errno("getcwd");
8044 		goto done;
8045 	}
8046 
8047 	error = got_repo_pack_fds_open(&pack_fds);
8048 	if (error != NULL)
8049 		goto done;
8050 
8051 	error = got_worktree_open(&worktree, cwd);
8052 	if (error) {
8053 		if (error->code == GOT_ERR_NOT_WORKTREE)
8054 			error = wrap_not_worktree_error(error, "revert", cwd);
8055 		goto done;
8056 	}
8057 
8058 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8059 	    NULL, pack_fds);
8060 	if (error != NULL)
8061 		goto done;
8062 
8063 	if (patch_script_path) {
8064 		patch_script_file = fopen(patch_script_path, "re");
8065 		if (patch_script_file == NULL) {
8066 			error = got_error_from_errno2("fopen",
8067 			    patch_script_path);
8068 			goto done;
8069 		}
8070 	}
8071 	error = apply_unveil(got_repo_get_path(repo), 1,
8072 	    got_worktree_get_root_path(worktree));
8073 	if (error)
8074 		goto done;
8075 
8076 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8077 	if (error)
8078 		goto done;
8079 
8080 	if (!can_recurse) {
8081 		char *ondisk_path;
8082 		struct stat sb;
8083 		TAILQ_FOREACH(pe, &paths, entry) {
8084 			if (asprintf(&ondisk_path, "%s/%s",
8085 			    got_worktree_get_root_path(worktree),
8086 			    pe->path) == -1) {
8087 				error = got_error_from_errno("asprintf");
8088 				goto done;
8089 			}
8090 			if (lstat(ondisk_path, &sb) == -1) {
8091 				if (errno == ENOENT) {
8092 					free(ondisk_path);
8093 					continue;
8094 				}
8095 				error = got_error_from_errno2("lstat",
8096 				    ondisk_path);
8097 				free(ondisk_path);
8098 				goto done;
8099 			}
8100 			free(ondisk_path);
8101 			if (S_ISDIR(sb.st_mode)) {
8102 				error = got_error_msg(GOT_ERR_BAD_PATH,
8103 				    "reverting directories requires -R option");
8104 				goto done;
8105 			}
8106 		}
8107 	}
8108 
8109 	cpa.patch_script_file = patch_script_file;
8110 	cpa.action = "revert";
8111 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8112 	    pflag ? choose_patch : NULL, &cpa, repo);
8113 done:
8114 	if (patch_script_file && fclose(patch_script_file) == EOF &&
8115 	    error == NULL)
8116 		error = got_error_from_errno2("fclose", patch_script_path);
8117 	if (repo) {
8118 		const struct got_error *close_err = got_repo_close(repo);
8119 		if (error == NULL)
8120 			error = close_err;
8121 	}
8122 	if (worktree)
8123 		got_worktree_close(worktree);
8124 	if (pack_fds) {
8125 		const struct got_error *pack_err =
8126 		    got_repo_pack_fds_close(pack_fds);
8127 		if (error == NULL)
8128 			error = pack_err;
8129 	}
8130 	free(path);
8131 	free(cwd);
8132 	return error;
8133 }
8134 
8135 __dead static void
8136 usage_commit(void)
8137 {
8138 	fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
8139 	    "[path ...]\n", getprogname());
8140 	exit(1);
8141 }
8142 
8143 struct collect_commit_logmsg_arg {
8144 	const char *cmdline_log;
8145 	const char *prepared_log;
8146 	int non_interactive;
8147 	const char *editor;
8148 	const char *worktree_path;
8149 	const char *branch_name;
8150 	const char *repo_path;
8151 	char *logmsg_path;
8152 
8153 };
8154 
8155 static const struct got_error *
8156 read_prepared_logmsg(char **logmsg, const char *path)
8157 {
8158 	const struct got_error *err = NULL;
8159 	FILE *f = NULL;
8160 	struct stat sb;
8161 	size_t r;
8162 
8163 	*logmsg = NULL;
8164 	memset(&sb, 0, sizeof(sb));
8165 
8166 	f = fopen(path, "re");
8167 	if (f == NULL)
8168 		return got_error_from_errno2("fopen", path);
8169 
8170 	if (fstat(fileno(f), &sb) == -1) {
8171 		err = got_error_from_errno2("fstat", path);
8172 		goto done;
8173 	}
8174 	if (sb.st_size == 0) {
8175 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8176 		goto done;
8177 	}
8178 
8179 	*logmsg = malloc(sb.st_size + 1);
8180 	if (*logmsg == NULL) {
8181 		err = got_error_from_errno("malloc");
8182 		goto done;
8183 	}
8184 
8185 	r = fread(*logmsg, 1, sb.st_size, f);
8186 	if (r != sb.st_size) {
8187 		if (ferror(f))
8188 			err = got_error_from_errno2("fread", path);
8189 		else
8190 			err = got_error(GOT_ERR_IO);
8191 		goto done;
8192 	}
8193 	(*logmsg)[sb.st_size] = '\0';
8194 done:
8195 	if (fclose(f) == EOF && err == NULL)
8196 		err = got_error_from_errno2("fclose", path);
8197 	if (err) {
8198 		free(*logmsg);
8199 		*logmsg = NULL;
8200 	}
8201 	return err;
8202 	
8203 }
8204 
8205 static const struct got_error *
8206 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
8207     void *arg)
8208 {
8209 	char *initial_content = NULL;
8210 	struct got_pathlist_entry *pe;
8211 	const struct got_error *err = NULL;
8212 	char *template = NULL;
8213 	struct collect_commit_logmsg_arg *a = arg;
8214 	int initial_content_len;
8215 	int fd = -1;
8216 	size_t len;
8217 
8218 	/* if a message was specified on the command line, just use it */
8219 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
8220 		len = strlen(a->cmdline_log) + 1;
8221 		*logmsg = malloc(len + 1);
8222 		if (*logmsg == NULL)
8223 			return got_error_from_errno("malloc");
8224 		strlcpy(*logmsg, a->cmdline_log, len);
8225 		return NULL;
8226 	} else if (a->prepared_log != NULL && a->non_interactive)
8227 		return read_prepared_logmsg(logmsg, a->prepared_log);
8228 
8229 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
8230 		return got_error_from_errno("asprintf");
8231 
8232 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
8233 	if (err)
8234 		goto done;
8235 
8236 	if (a->prepared_log) {
8237 		char *msg;
8238 		err = read_prepared_logmsg(&msg, a->prepared_log);
8239 		if (err)
8240 			goto done;
8241 		if (write(fd, msg, strlen(msg)) == -1) {
8242 			err = got_error_from_errno2("write", a->logmsg_path);
8243 			free(msg);
8244 			goto done;
8245 		}
8246 		free(msg);
8247 	}
8248 
8249 	initial_content_len = asprintf(&initial_content,
8250 	    "\n# changes to be committed on branch %s:\n",
8251 	    a->branch_name);
8252 	if (initial_content_len == -1) {
8253 		err = got_error_from_errno("asprintf");
8254 		goto done;
8255 	}
8256 
8257 	if (write(fd, initial_content, initial_content_len) == -1) {
8258 		err = got_error_from_errno2("write", a->logmsg_path);
8259 		goto done;
8260 	}
8261 
8262 	TAILQ_FOREACH(pe, commitable_paths, entry) {
8263 		struct got_commitable *ct = pe->data;
8264 		dprintf(fd, "#  %c  %s\n",
8265 		    got_commitable_get_status(ct),
8266 		    got_commitable_get_path(ct));
8267 	}
8268 
8269 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
8270 	    initial_content_len, a->prepared_log ? 0 : 1);
8271 done:
8272 	free(initial_content);
8273 	free(template);
8274 
8275 	if (fd != -1 && close(fd) == -1 && err == NULL)
8276 		err = got_error_from_errno2("close", a->logmsg_path);
8277 
8278 	/* Editor is done; we can now apply unveil(2) */
8279 	if (err == NULL)
8280 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
8281 	if (err) {
8282 		free(*logmsg);
8283 		*logmsg = NULL;
8284 	}
8285 	return err;
8286 }
8287 
8288 static const struct got_error *
8289 cmd_commit(int argc, char *argv[])
8290 {
8291 	const struct got_error *error = NULL;
8292 	struct got_worktree *worktree = NULL;
8293 	struct got_repository *repo = NULL;
8294 	char *cwd = NULL, *id_str = NULL;
8295 	struct got_object_id *id = NULL;
8296 	const char *logmsg = NULL;
8297 	char *prepared_logmsg = NULL;
8298 	struct collect_commit_logmsg_arg cl_arg;
8299 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
8300 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8301 	int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8302 	struct got_pathlist_head paths;
8303 	int *pack_fds = NULL;
8304 
8305 	TAILQ_INIT(&paths);
8306 	cl_arg.logmsg_path = NULL;
8307 
8308 	while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
8309 		switch (ch) {
8310 		case 'F':
8311 			if (logmsg != NULL)
8312 				option_conflict('F', 'm');
8313 			prepared_logmsg = realpath(optarg, NULL);
8314 			if (prepared_logmsg == NULL)
8315 				return got_error_from_errno2("realpath",
8316 				    optarg);
8317 			break;
8318 		case 'm':
8319 			if (prepared_logmsg)
8320 				option_conflict('m', 'F');
8321 			logmsg = optarg;
8322 			break;
8323 		case 'N':
8324 			non_interactive = 1;
8325 			break;
8326 		case 'S':
8327 			allow_bad_symlinks = 1;
8328 			break;
8329 		default:
8330 			usage_commit();
8331 			/* NOTREACHED */
8332 		}
8333 	}
8334 
8335 	argc -= optind;
8336 	argv += optind;
8337 
8338 #ifndef PROFILE
8339 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8340 	    "unveil", NULL) == -1)
8341 		err(1, "pledge");
8342 #endif
8343 	cwd = getcwd(NULL, 0);
8344 	if (cwd == NULL) {
8345 		error = got_error_from_errno("getcwd");
8346 		goto done;
8347 	}
8348 
8349 	error = got_repo_pack_fds_open(&pack_fds);
8350 	if (error != NULL)
8351 		goto done;
8352 
8353 	error = got_worktree_open(&worktree, cwd);
8354 	if (error) {
8355 		if (error->code == GOT_ERR_NOT_WORKTREE)
8356 			error = wrap_not_worktree_error(error, "commit", cwd);
8357 		goto done;
8358 	}
8359 
8360 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8361 	if (error)
8362 		goto done;
8363 	if (rebase_in_progress) {
8364 		error = got_error(GOT_ERR_REBASING);
8365 		goto done;
8366 	}
8367 
8368 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
8369 	    worktree);
8370 	if (error)
8371 		goto done;
8372 
8373 	error = get_gitconfig_path(&gitconfig_path);
8374 	if (error)
8375 		goto done;
8376 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8377 	    gitconfig_path, pack_fds);
8378 	if (error != NULL)
8379 		goto done;
8380 
8381 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8382 	if (error)
8383 		goto done;
8384 	if (merge_in_progress) {
8385 		error = got_error(GOT_ERR_MERGE_BUSY);
8386 		goto done;
8387 	}
8388 
8389 	error = get_author(&author, repo, worktree);
8390 	if (error)
8391 		return error;
8392 
8393 	/*
8394 	 * unveil(2) traverses exec(2); if an editor is used we have
8395 	 * to apply unveil after the log message has been written.
8396 	 */
8397 	if (logmsg == NULL || strlen(logmsg) == 0)
8398 		error = get_editor(&editor);
8399 	else
8400 		error = apply_unveil(got_repo_get_path(repo), 0,
8401 		    got_worktree_get_root_path(worktree));
8402 	if (error)
8403 		goto done;
8404 
8405 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8406 	if (error)
8407 		goto done;
8408 
8409 	cl_arg.editor = editor;
8410 	cl_arg.cmdline_log = logmsg;
8411 	cl_arg.prepared_log = prepared_logmsg;
8412 	cl_arg.non_interactive = non_interactive;
8413 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8414 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
8415 	if (!histedit_in_progress) {
8416 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
8417 			error = got_error(GOT_ERR_COMMIT_BRANCH);
8418 			goto done;
8419 		}
8420 		cl_arg.branch_name += 11;
8421 	}
8422 	cl_arg.repo_path = got_repo_get_path(repo);
8423 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
8424 	    allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
8425 	    print_status, NULL, repo);
8426 	if (error) {
8427 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8428 		    cl_arg.logmsg_path != NULL)
8429 			preserve_logmsg = 1;
8430 		goto done;
8431 	}
8432 
8433 	error = got_object_id_str(&id_str, id);
8434 	if (error)
8435 		goto done;
8436 	printf("Created commit %s\n", id_str);
8437 done:
8438 	if (preserve_logmsg) {
8439 		fprintf(stderr, "%s: log message preserved in %s\n",
8440 		    getprogname(), cl_arg.logmsg_path);
8441 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8442 	    error == NULL)
8443 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8444 	free(cl_arg.logmsg_path);
8445 	if (repo) {
8446 		const struct got_error *close_err = got_repo_close(repo);
8447 		if (error == NULL)
8448 			error = close_err;
8449 	}
8450 	if (worktree)
8451 		got_worktree_close(worktree);
8452 	if (pack_fds) {
8453 		const struct got_error *pack_err =
8454 		    got_repo_pack_fds_close(pack_fds);
8455 		if (error == NULL)
8456 			error = pack_err;
8457 	}
8458 	free(cwd);
8459 	free(id_str);
8460 	free(gitconfig_path);
8461 	free(editor);
8462 	free(author);
8463 	free(prepared_logmsg);
8464 	return error;
8465 }
8466 
8467 __dead static void
8468 usage_send(void)
8469 {
8470 	fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
8471 	    "[-r repository-path] [-t tag] [-T] [-q] [-v] "
8472 	    "[remote-repository]\n", getprogname());
8473 	exit(1);
8474 }
8475 
8476 static void
8477 print_load_info(int print_colored, int print_found, int print_trees,
8478     int ncolored, int nfound, int ntrees)
8479 {
8480 	if (print_colored) {
8481 		printf("%d commit%s colored", ncolored,
8482 		    ncolored == 1 ? "" : "s");
8483 	}
8484 	if (print_found) {
8485 		printf("%s%d object%s found",
8486 		    ncolored > 0 ? "; " : "",
8487 		    nfound, nfound == 1 ? "" : "s");
8488 	}
8489 	if (print_trees) {
8490 		printf("; %d tree%s scanned", ntrees,
8491 		    ntrees == 1 ? "" : "s");
8492 	}
8493 }
8494 
8495 struct got_send_progress_arg {
8496 	char last_scaled_packsize[FMT_SCALED_STRSIZE];
8497 	int verbosity;
8498 	int last_ncolored;
8499 	int last_nfound;
8500 	int last_ntrees;
8501 	int loading_done;
8502 	int last_ncommits;
8503 	int last_nobj_total;
8504 	int last_p_deltify;
8505 	int last_p_written;
8506 	int last_p_sent;
8507 	int printed_something;
8508 	int sent_something;
8509 	struct got_pathlist_head *delete_branches;
8510 };
8511 
8512 static const struct got_error *
8513 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8514     off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8515     int nobj_written, off_t bytes_sent, const char *refname, int success)
8516 {
8517 	struct got_send_progress_arg *a = arg;
8518 	char scaled_packsize[FMT_SCALED_STRSIZE];
8519 	char scaled_sent[FMT_SCALED_STRSIZE];
8520 	int p_deltify = 0, p_written = 0, p_sent = 0;
8521 	int print_colored = 0, print_found = 0, print_trees = 0;
8522 	int print_searching = 0, print_total = 0;
8523 	int print_deltify = 0, print_written = 0, print_sent = 0;
8524 
8525 	if (a->verbosity < 0)
8526 		return NULL;
8527 
8528 	if (refname) {
8529 		const char *status = success ? "accepted" : "rejected";
8530 
8531 		if (success) {
8532 			struct got_pathlist_entry *pe;
8533 			TAILQ_FOREACH(pe, a->delete_branches, entry) {
8534 				const char *branchname = pe->path;
8535 				if (got_path_cmp(branchname, refname,
8536 				    strlen(branchname), strlen(refname)) == 0) {
8537 					status = "deleted";
8538 					a->sent_something = 1;
8539 					break;
8540 				}
8541 			}
8542 		}
8543 
8544 		if (a->printed_something)
8545 			putchar('\n');
8546 		printf("Server has %s %s", status, refname);
8547 		a->printed_something = 1;
8548 		return NULL;
8549 	}
8550 
8551 	if (a->last_ncolored != ncolored) {
8552 		print_colored = 1;
8553 		a->last_ncolored = ncolored;
8554 	}
8555 
8556 	if (a->last_nfound != nfound) {
8557 		print_colored = 1;
8558 		print_found = 1;
8559 		a->last_nfound = nfound;
8560 	}
8561 
8562 	if (a->last_ntrees != ntrees) {
8563 		print_colored = 1;
8564 		print_found = 1;
8565 		print_trees = 1;
8566 		a->last_ntrees = ntrees;
8567 	}
8568 
8569 	if ((print_colored || print_found || print_trees) &&
8570 	    !a->loading_done) {
8571 		printf("\r");
8572 		print_load_info(print_colored, print_found, print_trees,
8573 		    ncolored, nfound, ntrees);
8574 		a->printed_something = 1;
8575 		fflush(stdout);
8576 		return NULL;
8577 	} else if (!a->loading_done) {
8578 		printf("\r");
8579 		print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8580 		printf("\n");
8581 		a->loading_done = 1;
8582 	}
8583 
8584 	if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8585 		return got_error_from_errno("fmt_scaled");
8586 	if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8587 		return got_error_from_errno("fmt_scaled");
8588 
8589 	if (a->last_ncommits != ncommits) {
8590 		print_searching = 1;
8591 		a->last_ncommits = ncommits;
8592 	}
8593 
8594 	if (a->last_nobj_total != nobj_total) {
8595 		print_searching = 1;
8596 		print_total = 1;
8597 		a->last_nobj_total = nobj_total;
8598 	}
8599 
8600 	if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8601 	    strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8602 		if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8603 		    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8604 			return got_error(GOT_ERR_NO_SPACE);
8605 	}
8606 
8607 	if (nobj_deltify > 0 || nobj_written > 0) {
8608 		if (nobj_deltify > 0) {
8609 			p_deltify = (nobj_deltify * 100) / nobj_total;
8610 			if (p_deltify != a->last_p_deltify) {
8611 				a->last_p_deltify = p_deltify;
8612 				print_searching = 1;
8613 				print_total = 1;
8614 				print_deltify = 1;
8615 			}
8616 		}
8617 		if (nobj_written > 0) {
8618 			p_written = (nobj_written * 100) / nobj_total;
8619 			if (p_written != a->last_p_written) {
8620 				a->last_p_written = p_written;
8621 				print_searching = 1;
8622 				print_total = 1;
8623 				print_deltify = 1;
8624 				print_written = 1;
8625 			}
8626 		}
8627 	}
8628 
8629 	if (bytes_sent > 0) {
8630 		p_sent = (bytes_sent * 100) / packfile_size;
8631 		if (p_sent != a->last_p_sent) {
8632 			a->last_p_sent = p_sent;
8633 			print_searching = 1;
8634 			print_total = 1;
8635 			print_deltify = 1;
8636 			print_written = 1;
8637 			print_sent = 1;
8638 		}
8639 		a->sent_something = 1;
8640 	}
8641 
8642 	if (print_searching || print_total || print_deltify || print_written ||
8643 	    print_sent)
8644 		printf("\r");
8645 	if (print_searching)
8646 		printf("packing %d reference%s", ncommits,
8647 		    ncommits == 1 ? "" : "s");
8648 	if (print_total)
8649 		printf("; %d object%s", nobj_total,
8650 		    nobj_total == 1 ? "" : "s");
8651 	if (print_deltify)
8652 		printf("; deltify: %d%%", p_deltify);
8653 	if (print_sent)
8654 		printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8655 		    scaled_packsize, p_sent);
8656 	else if (print_written)
8657 		printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8658 		    scaled_packsize, p_written);
8659 	if (print_searching || print_total || print_deltify ||
8660 	    print_written || print_sent) {
8661 		a->printed_something = 1;
8662 		fflush(stdout);
8663 	}
8664 	return NULL;
8665 }
8666 
8667 static const struct got_error *
8668 cmd_send(int argc, char *argv[])
8669 {
8670 	const struct got_error *error = NULL;
8671 	char *cwd = NULL, *repo_path = NULL;
8672 	const char *remote_name;
8673 	char *proto = NULL, *host = NULL, *port = NULL;
8674 	char *repo_name = NULL, *server_path = NULL;
8675 	const struct got_remote_repo *remotes, *remote = NULL;
8676 	int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
8677 	struct got_repository *repo = NULL;
8678 	struct got_worktree *worktree = NULL;
8679 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8680 	struct got_pathlist_head branches;
8681 	struct got_pathlist_head tags;
8682 	struct got_reflist_head all_branches;
8683 	struct got_reflist_head all_tags;
8684 	struct got_pathlist_head delete_args;
8685 	struct got_pathlist_head delete_branches;
8686 	struct got_reflist_entry *re;
8687 	struct got_pathlist_entry *pe;
8688 	int i, ch, sendfd = -1, sendstatus;
8689 	pid_t sendpid = -1;
8690 	struct got_send_progress_arg spa;
8691 	int verbosity = 0, overwrite_refs = 0;
8692 	int send_all_branches = 0, send_all_tags = 0;
8693 	struct got_reference *ref = NULL;
8694 	int *pack_fds = NULL;
8695 
8696 	TAILQ_INIT(&branches);
8697 	TAILQ_INIT(&tags);
8698 	TAILQ_INIT(&all_branches);
8699 	TAILQ_INIT(&all_tags);
8700 	TAILQ_INIT(&delete_args);
8701 	TAILQ_INIT(&delete_branches);
8702 
8703 	while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8704 		switch (ch) {
8705 		case 'a':
8706 			send_all_branches = 1;
8707 			break;
8708 		case 'b':
8709 			error = got_pathlist_append(&branches, optarg, NULL);
8710 			if (error)
8711 				return error;
8712 			nbranches++;
8713 			break;
8714 		case 'd':
8715 			error = got_pathlist_append(&delete_args, optarg, NULL);
8716 			if (error)
8717 				return error;
8718 			break;
8719 		case 'f':
8720 			overwrite_refs = 1;
8721 			break;
8722 		case 'r':
8723 			repo_path = realpath(optarg, NULL);
8724 			if (repo_path == NULL)
8725 				return got_error_from_errno2("realpath",
8726 				    optarg);
8727 			got_path_strip_trailing_slashes(repo_path);
8728 			break;
8729 		case 't':
8730 			error = got_pathlist_append(&tags, optarg, NULL);
8731 			if (error)
8732 				return error;
8733 			ntags++;
8734 			break;
8735 		case 'T':
8736 			send_all_tags = 1;
8737 			break;
8738 		case 'v':
8739 			if (verbosity < 0)
8740 				verbosity = 0;
8741 			else if (verbosity < 3)
8742 				verbosity++;
8743 			break;
8744 		case 'q':
8745 			verbosity = -1;
8746 			break;
8747 		default:
8748 			usage_send();
8749 			/* NOTREACHED */
8750 		}
8751 	}
8752 	argc -= optind;
8753 	argv += optind;
8754 
8755 	if (send_all_branches && !TAILQ_EMPTY(&branches))
8756 		option_conflict('a', 'b');
8757 	if (send_all_tags && !TAILQ_EMPTY(&tags))
8758 		option_conflict('T', 't');
8759 
8760 
8761 	if (argc == 0)
8762 		remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8763 	else if (argc == 1)
8764 		remote_name = argv[0];
8765 	else
8766 		usage_send();
8767 
8768 	cwd = getcwd(NULL, 0);
8769 	if (cwd == NULL) {
8770 		error = got_error_from_errno("getcwd");
8771 		goto done;
8772 	}
8773 
8774 	error = got_repo_pack_fds_open(&pack_fds);
8775 	if (error != NULL)
8776 		goto done;
8777 
8778 	if (repo_path == NULL) {
8779 		error = got_worktree_open(&worktree, cwd);
8780 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
8781 			goto done;
8782 		else
8783 			error = NULL;
8784 		if (worktree) {
8785 			repo_path =
8786 			    strdup(got_worktree_get_repo_path(worktree));
8787 			if (repo_path == NULL)
8788 				error = got_error_from_errno("strdup");
8789 			if (error)
8790 				goto done;
8791 		} else {
8792 			repo_path = strdup(cwd);
8793 			if (repo_path == NULL) {
8794 				error = got_error_from_errno("strdup");
8795 				goto done;
8796 			}
8797 		}
8798 	}
8799 
8800 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8801 	if (error)
8802 		goto done;
8803 
8804 	if (worktree) {
8805 		worktree_conf = got_worktree_get_gotconfig(worktree);
8806 		if (worktree_conf) {
8807 			got_gotconfig_get_remotes(&nremotes, &remotes,
8808 			    worktree_conf);
8809 			for (i = 0; i < nremotes; i++) {
8810 				if (strcmp(remotes[i].name, remote_name) == 0) {
8811 					remote = &remotes[i];
8812 					break;
8813 				}
8814 			}
8815 		}
8816 	}
8817 	if (remote == NULL) {
8818 		repo_conf = got_repo_get_gotconfig(repo);
8819 		if (repo_conf) {
8820 			got_gotconfig_get_remotes(&nremotes, &remotes,
8821 			    repo_conf);
8822 			for (i = 0; i < nremotes; i++) {
8823 				if (strcmp(remotes[i].name, remote_name) == 0) {
8824 					remote = &remotes[i];
8825 					break;
8826 				}
8827 			}
8828 		}
8829 	}
8830 	if (remote == NULL) {
8831 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8832 		for (i = 0; i < nremotes; i++) {
8833 			if (strcmp(remotes[i].name, remote_name) == 0) {
8834 				remote = &remotes[i];
8835 				break;
8836 			}
8837 		}
8838 	}
8839 	if (remote == NULL) {
8840 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8841 		goto done;
8842 	}
8843 
8844 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8845 	    &repo_name, remote->send_url);
8846 	if (error)
8847 		goto done;
8848 
8849 	if (strcmp(proto, "git") == 0) {
8850 #ifndef PROFILE
8851 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8852 		    "sendfd dns inet unveil", NULL) == -1)
8853 			err(1, "pledge");
8854 #endif
8855 	} else if (strcmp(proto, "git+ssh") == 0 ||
8856 	    strcmp(proto, "ssh") == 0) {
8857 #ifndef PROFILE
8858 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8859 		    "sendfd unveil", NULL) == -1)
8860 			err(1, "pledge");
8861 #endif
8862 	} else if (strcmp(proto, "http") == 0 ||
8863 	    strcmp(proto, "git+http") == 0) {
8864 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8865 		goto done;
8866 	} else {
8867 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8868 		goto done;
8869 	}
8870 
8871 	error = got_dial_apply_unveil(proto);
8872 	if (error)
8873 		goto done;
8874 
8875 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8876 	if (error)
8877 		goto done;
8878 
8879 	if (send_all_branches) {
8880 		error = got_ref_list(&all_branches, repo, "refs/heads",
8881 		    got_ref_cmp_by_name, NULL);
8882 		if (error)
8883 			goto done;
8884 		TAILQ_FOREACH(re, &all_branches, entry) {
8885 			const char *branchname = got_ref_get_name(re->ref);
8886 			error = got_pathlist_append(&branches,
8887 			    branchname, NULL);
8888 			if (error)
8889 				goto done;
8890 			nbranches++;
8891 		}
8892 	} else if (nbranches == 0) {
8893 		for (i = 0; i < remote->nsend_branches; i++) {
8894 			got_pathlist_append(&branches,
8895 			    remote->send_branches[i], NULL);
8896 		}
8897 	}
8898 
8899 	if (send_all_tags) {
8900 		error = got_ref_list(&all_tags, repo, "refs/tags",
8901 		    got_ref_cmp_by_name, NULL);
8902 		if (error)
8903 			goto done;
8904 		TAILQ_FOREACH(re, &all_tags, entry) {
8905 			const char *tagname = got_ref_get_name(re->ref);
8906 			error = got_pathlist_append(&tags,
8907 			    tagname, NULL);
8908 			if (error)
8909 				goto done;
8910 			ntags++;
8911 		}
8912 	}
8913 
8914 	/*
8915 	 * To prevent accidents only branches in refs/heads/ can be deleted
8916 	 * with 'got send -d'.
8917 	 * Deleting anything else requires local repository access or Git.
8918 	 */
8919 	TAILQ_FOREACH(pe, &delete_args, entry) {
8920 		const char *branchname = pe->path;
8921 		char *s;
8922 		struct got_pathlist_entry *new;
8923 		if (strncmp(branchname, "refs/heads/", 11) == 0) {
8924 			s = strdup(branchname);
8925 			if (s == NULL) {
8926 				error = got_error_from_errno("strdup");
8927 				goto done;
8928 			}
8929 		} else {
8930 			if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8931 				error = got_error_from_errno("asprintf");
8932 				goto done;
8933 			}
8934 		}
8935 		error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8936 		if (error || new == NULL /* duplicate */)
8937 			free(s);
8938 		if (error)
8939 			goto done;
8940 		ndelete_branches++;
8941 	}
8942 
8943 	if (nbranches == 0 && ndelete_branches == 0) {
8944 		struct got_reference *head_ref;
8945 		if (worktree)
8946 			error = got_ref_open(&head_ref, repo,
8947 			    got_worktree_get_head_ref_name(worktree), 0);
8948 		else
8949 			error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8950 		if (error)
8951 			goto done;
8952 		if (got_ref_is_symbolic(head_ref)) {
8953 			error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8954 			got_ref_close(head_ref);
8955 			if (error)
8956 				goto done;
8957 		} else
8958 			ref = head_ref;
8959 		error = got_pathlist_append(&branches, got_ref_get_name(ref),
8960 		    NULL);
8961 		if (error)
8962 			goto done;
8963 		nbranches++;
8964 	}
8965 
8966 	if (verbosity >= 0)
8967 		printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8968 		    port ? ":" : "", port ? port : "");
8969 
8970 	error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8971 	    server_path, verbosity);
8972 	if (error)
8973 		goto done;
8974 
8975 	memset(&spa, 0, sizeof(spa));
8976 	spa.last_scaled_packsize[0] = '\0';
8977 	spa.last_p_deltify = -1;
8978 	spa.last_p_written = -1;
8979 	spa.verbosity = verbosity;
8980 	spa.delete_branches = &delete_branches;
8981 	error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8982 	    verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8983 	    check_cancelled, NULL);
8984 	if (spa.printed_something)
8985 		putchar('\n');
8986 	if (error)
8987 		goto done;
8988 	if (!spa.sent_something && verbosity >= 0)
8989 		printf("Already up-to-date\n");
8990 done:
8991 	if (sendpid > 0) {
8992 		if (kill(sendpid, SIGTERM) == -1)
8993 			error = got_error_from_errno("kill");
8994 		if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8995 			error = got_error_from_errno("waitpid");
8996 	}
8997 	if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8998 		error = got_error_from_errno("close");
8999 	if (repo) {
9000 		const struct got_error *close_err = got_repo_close(repo);
9001 		if (error == NULL)
9002 			error = close_err;
9003 	}
9004 	if (worktree)
9005 		got_worktree_close(worktree);
9006 	if (pack_fds) {
9007 		const struct got_error *pack_err =
9008 		    got_repo_pack_fds_close(pack_fds);
9009 		if (error == NULL)
9010 			error = pack_err;
9011 	}
9012 	if (ref)
9013 		got_ref_close(ref);
9014 	got_pathlist_free(&branches);
9015 	got_pathlist_free(&tags);
9016 	got_ref_list_free(&all_branches);
9017 	got_ref_list_free(&all_tags);
9018 	got_pathlist_free(&delete_args);
9019 	TAILQ_FOREACH(pe, &delete_branches, entry)
9020 		free((char *)pe->path);
9021 	got_pathlist_free(&delete_branches);
9022 	free(cwd);
9023 	free(repo_path);
9024 	free(proto);
9025 	free(host);
9026 	free(port);
9027 	free(server_path);
9028 	free(repo_name);
9029 	return error;
9030 }
9031 
9032 __dead static void
9033 usage_cherrypick(void)
9034 {
9035 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
9036 	exit(1);
9037 }
9038 
9039 static const struct got_error *
9040 cmd_cherrypick(int argc, char *argv[])
9041 {
9042 	const struct got_error *error = NULL;
9043 	struct got_worktree *worktree = NULL;
9044 	struct got_repository *repo = NULL;
9045 	char *cwd = NULL, *commit_id_str = NULL;
9046 	struct got_object_id *commit_id = NULL;
9047 	struct got_commit_object *commit = NULL;
9048 	struct got_object_qid *pid;
9049 	int ch;
9050 	struct got_update_progress_arg upa;
9051 	int *pack_fds = NULL;
9052 
9053 	while ((ch = getopt(argc, argv, "")) != -1) {
9054 		switch (ch) {
9055 		default:
9056 			usage_cherrypick();
9057 			/* NOTREACHED */
9058 		}
9059 	}
9060 
9061 	argc -= optind;
9062 	argv += optind;
9063 
9064 #ifndef PROFILE
9065 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9066 	    "unveil", NULL) == -1)
9067 		err(1, "pledge");
9068 #endif
9069 	if (argc != 1)
9070 		usage_cherrypick();
9071 
9072 	cwd = getcwd(NULL, 0);
9073 	if (cwd == NULL) {
9074 		error = got_error_from_errno("getcwd");
9075 		goto done;
9076 	}
9077 
9078 	error = got_repo_pack_fds_open(&pack_fds);
9079 	if (error != NULL)
9080 		goto done;
9081 
9082 	error = got_worktree_open(&worktree, cwd);
9083 	if (error) {
9084 		if (error->code == GOT_ERR_NOT_WORKTREE)
9085 			error = wrap_not_worktree_error(error, "cherrypick",
9086 			    cwd);
9087 		goto done;
9088 	}
9089 
9090 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9091 	    NULL, pack_fds);
9092 	if (error != NULL)
9093 		goto done;
9094 
9095 	error = apply_unveil(got_repo_get_path(repo), 0,
9096 	    got_worktree_get_root_path(worktree));
9097 	if (error)
9098 		goto done;
9099 
9100 	error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9101 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
9102 	if (error)
9103 		goto done;
9104 	error = got_object_id_str(&commit_id_str, commit_id);
9105 	if (error)
9106 		goto done;
9107 
9108 	error = got_object_open_as_commit(&commit, repo, commit_id);
9109 	if (error)
9110 		goto done;
9111 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9112 	memset(&upa, 0, sizeof(upa));
9113 	error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
9114 	    commit_id, repo, update_progress, &upa, check_cancelled,
9115 	    NULL);
9116 	if (error != NULL)
9117 		goto done;
9118 
9119 	if (upa.did_something)
9120 		printf("Merged commit %s\n", commit_id_str);
9121 	print_merge_progress_stats(&upa);
9122 done:
9123 	if (commit)
9124 		got_object_commit_close(commit);
9125 	free(commit_id_str);
9126 	if (worktree)
9127 		got_worktree_close(worktree);
9128 	if (repo) {
9129 		const struct got_error *close_err = got_repo_close(repo);
9130 		if (error == NULL)
9131 			error = close_err;
9132 	}
9133 	if (pack_fds) {
9134 		const struct got_error *pack_err =
9135 		    got_repo_pack_fds_close(pack_fds);
9136 		if (error == NULL)
9137 			error = pack_err;
9138 	}
9139 
9140 	return error;
9141 }
9142 
9143 __dead static void
9144 usage_backout(void)
9145 {
9146 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
9147 	exit(1);
9148 }
9149 
9150 static const struct got_error *
9151 cmd_backout(int argc, char *argv[])
9152 {
9153 	const struct got_error *error = NULL;
9154 	struct got_worktree *worktree = NULL;
9155 	struct got_repository *repo = NULL;
9156 	char *cwd = NULL, *commit_id_str = NULL;
9157 	struct got_object_id *commit_id = NULL;
9158 	struct got_commit_object *commit = NULL;
9159 	struct got_object_qid *pid;
9160 	int ch;
9161 	struct got_update_progress_arg upa;
9162 	int *pack_fds = NULL;
9163 
9164 	while ((ch = getopt(argc, argv, "")) != -1) {
9165 		switch (ch) {
9166 		default:
9167 			usage_backout();
9168 			/* NOTREACHED */
9169 		}
9170 	}
9171 
9172 	argc -= optind;
9173 	argv += optind;
9174 
9175 #ifndef PROFILE
9176 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9177 	    "unveil", NULL) == -1)
9178 		err(1, "pledge");
9179 #endif
9180 	if (argc != 1)
9181 		usage_backout();
9182 
9183 	cwd = getcwd(NULL, 0);
9184 	if (cwd == NULL) {
9185 		error = got_error_from_errno("getcwd");
9186 		goto done;
9187 	}
9188 
9189 	error = got_repo_pack_fds_open(&pack_fds);
9190 	if (error != NULL)
9191 		goto done;
9192 
9193 	error = got_worktree_open(&worktree, cwd);
9194 	if (error) {
9195 		if (error->code == GOT_ERR_NOT_WORKTREE)
9196 			error = wrap_not_worktree_error(error, "backout", cwd);
9197 		goto done;
9198 	}
9199 
9200 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9201 	    NULL, pack_fds);
9202 	if (error != NULL)
9203 		goto done;
9204 
9205 	error = apply_unveil(got_repo_get_path(repo), 0,
9206 	    got_worktree_get_root_path(worktree));
9207 	if (error)
9208 		goto done;
9209 
9210 	error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9211 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
9212 	if (error)
9213 		goto done;
9214 	error = got_object_id_str(&commit_id_str, commit_id);
9215 	if (error)
9216 		goto done;
9217 
9218 	error = got_object_open_as_commit(&commit, repo, commit_id);
9219 	if (error)
9220 		goto done;
9221 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9222 	if (pid == NULL) {
9223 		error = got_error(GOT_ERR_ROOT_COMMIT);
9224 		goto done;
9225 	}
9226 
9227 	memset(&upa, 0, sizeof(upa));
9228 	error = got_worktree_merge_files(worktree, commit_id, &pid->id,
9229 	    repo, update_progress, &upa, check_cancelled, NULL);
9230 	if (error != NULL)
9231 		goto done;
9232 
9233 	if (upa.did_something)
9234 		printf("Backed out commit %s\n", commit_id_str);
9235 	print_merge_progress_stats(&upa);
9236 done:
9237 	if (commit)
9238 		got_object_commit_close(commit);
9239 	free(commit_id_str);
9240 	if (worktree)
9241 		got_worktree_close(worktree);
9242 	if (repo) {
9243 		const struct got_error *close_err = got_repo_close(repo);
9244 		if (error == NULL)
9245 			error = close_err;
9246 	}
9247 	if (pack_fds) {
9248 		const struct got_error *pack_err =
9249 		    got_repo_pack_fds_close(pack_fds);
9250 		if (error == NULL)
9251 			error = pack_err;
9252 	}
9253 	return error;
9254 }
9255 
9256 __dead static void
9257 usage_rebase(void)
9258 {
9259 	fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
9260 	    getprogname());
9261 	exit(1);
9262 }
9263 
9264 static void
9265 trim_logmsg(char *logmsg, int limit)
9266 {
9267 	char *nl;
9268 	size_t len;
9269 
9270 	len = strlen(logmsg);
9271 	if (len > limit)
9272 		len = limit;
9273 	logmsg[len] = '\0';
9274 	nl = strchr(logmsg, '\n');
9275 	if (nl)
9276 		*nl = '\0';
9277 }
9278 
9279 static const struct got_error *
9280 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
9281 {
9282 	const struct got_error *err;
9283 	char *logmsg0 = NULL;
9284 	const char *s;
9285 
9286 	err = got_object_commit_get_logmsg(&logmsg0, commit);
9287 	if (err)
9288 		return err;
9289 
9290 	s = logmsg0;
9291 	while (isspace((unsigned char)s[0]))
9292 		s++;
9293 
9294 	*logmsg = strdup(s);
9295 	if (*logmsg == NULL) {
9296 		err = got_error_from_errno("strdup");
9297 		goto done;
9298 	}
9299 
9300 	trim_logmsg(*logmsg, limit);
9301 done:
9302 	free(logmsg0);
9303 	return err;
9304 }
9305 
9306 static const struct got_error *
9307 show_rebase_merge_conflict(struct got_object_id *id,
9308     struct got_repository *repo)
9309 {
9310 	const struct got_error *err;
9311 	struct got_commit_object *commit = NULL;
9312 	char *id_str = NULL, *logmsg = NULL;
9313 
9314 	err = got_object_open_as_commit(&commit, repo, id);
9315 	if (err)
9316 		return err;
9317 
9318 	err = got_object_id_str(&id_str, id);
9319 	if (err)
9320 		goto done;
9321 
9322 	id_str[12] = '\0';
9323 
9324 	err = get_short_logmsg(&logmsg, 42, commit);
9325 	if (err)
9326 		goto done;
9327 
9328 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
9329 done:
9330 	free(id_str);
9331 	got_object_commit_close(commit);
9332 	free(logmsg);
9333 	return err;
9334 }
9335 
9336 static const struct got_error *
9337 show_rebase_progress(struct got_commit_object *commit,
9338     struct got_object_id *old_id, struct got_object_id *new_id)
9339 {
9340 	const struct got_error *err;
9341 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9342 
9343 	err = got_object_id_str(&old_id_str, old_id);
9344 	if (err)
9345 		goto done;
9346 
9347 	if (new_id) {
9348 		err = got_object_id_str(&new_id_str, new_id);
9349 		if (err)
9350 			goto done;
9351 	}
9352 
9353 	old_id_str[12] = '\0';
9354 	if (new_id_str)
9355 		new_id_str[12] = '\0';
9356 
9357 	err = get_short_logmsg(&logmsg, 42, commit);
9358 	if (err)
9359 		goto done;
9360 
9361 	printf("%s -> %s: %s\n", old_id_str,
9362 	    new_id_str ? new_id_str : "no-op change", logmsg);
9363 done:
9364 	free(old_id_str);
9365 	free(new_id_str);
9366 	free(logmsg);
9367 	return err;
9368 }
9369 
9370 static const struct got_error *
9371 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
9372     struct got_reference *branch, struct got_reference *new_base_branch,
9373     struct got_reference *tmp_branch, struct got_repository *repo,
9374     int create_backup)
9375 {
9376 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
9377 	return got_worktree_rebase_complete(worktree, fileindex,
9378 	    new_base_branch, tmp_branch, branch, repo, create_backup);
9379 }
9380 
9381 static const struct got_error *
9382 rebase_commit(struct got_pathlist_head *merged_paths,
9383     struct got_worktree *worktree, struct got_fileindex *fileindex,
9384     struct got_reference *tmp_branch,
9385     struct got_object_id *commit_id, struct got_repository *repo)
9386 {
9387 	const struct got_error *error;
9388 	struct got_commit_object *commit;
9389 	struct got_object_id *new_commit_id;
9390 
9391 	error = got_object_open_as_commit(&commit, repo, commit_id);
9392 	if (error)
9393 		return error;
9394 
9395 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
9396 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
9397 	if (error) {
9398 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
9399 			goto done;
9400 		error = show_rebase_progress(commit, commit_id, NULL);
9401 	} else {
9402 		error = show_rebase_progress(commit, commit_id, new_commit_id);
9403 		free(new_commit_id);
9404 	}
9405 done:
9406 	got_object_commit_close(commit);
9407 	return error;
9408 }
9409 
9410 struct check_path_prefix_arg {
9411 	const char *path_prefix;
9412 	size_t len;
9413 	int errcode;
9414 };
9415 
9416 static const struct got_error *
9417 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
9418     struct got_blob_object *blob2, FILE *f1, FILE *f2,
9419     struct got_object_id *id1, struct got_object_id *id2,
9420     const char *path1, const char *path2,
9421     mode_t mode1, mode_t mode2, struct got_repository *repo)
9422 {
9423 	struct check_path_prefix_arg *a = arg;
9424 
9425 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
9426 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
9427 		return got_error(a->errcode);
9428 
9429 	return NULL;
9430 }
9431 
9432 static const struct got_error *
9433 check_path_prefix(struct got_object_id *parent_id,
9434     struct got_object_id *commit_id, const char *path_prefix,
9435     int errcode, struct got_repository *repo)
9436 {
9437 	const struct got_error *err;
9438 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
9439 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
9440 	struct check_path_prefix_arg cpp_arg;
9441 
9442 	if (got_path_is_root_dir(path_prefix))
9443 		return NULL;
9444 
9445 	err = got_object_open_as_commit(&commit, repo, commit_id);
9446 	if (err)
9447 		goto done;
9448 
9449 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
9450 	if (err)
9451 		goto done;
9452 
9453 	err = got_object_open_as_tree(&tree1, repo,
9454 	    got_object_commit_get_tree_id(parent_commit));
9455 	if (err)
9456 		goto done;
9457 
9458 	err = got_object_open_as_tree(&tree2, repo,
9459 	    got_object_commit_get_tree_id(commit));
9460 	if (err)
9461 		goto done;
9462 
9463 	cpp_arg.path_prefix = path_prefix;
9464 	while (cpp_arg.path_prefix[0] == '/')
9465 		cpp_arg.path_prefix++;
9466 	cpp_arg.len = strlen(cpp_arg.path_prefix);
9467 	cpp_arg.errcode = errcode;
9468 	err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
9469 	    check_path_prefix_in_diff, &cpp_arg, 0);
9470 done:
9471 	if (tree1)
9472 		got_object_tree_close(tree1);
9473 	if (tree2)
9474 		got_object_tree_close(tree2);
9475 	if (commit)
9476 		got_object_commit_close(commit);
9477 	if (parent_commit)
9478 		got_object_commit_close(parent_commit);
9479 	return err;
9480 }
9481 
9482 static const struct got_error *
9483 collect_commits(struct got_object_id_queue *commits,
9484     struct got_object_id *initial_commit_id,
9485     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
9486     const char *path_prefix, int path_prefix_errcode,
9487     struct got_repository *repo)
9488 {
9489 	const struct got_error *err = NULL;
9490 	struct got_commit_graph *graph = NULL;
9491 	struct got_object_id *parent_id = NULL;
9492 	struct got_object_qid *qid;
9493         struct got_object_id *commit_id = initial_commit_id;
9494 
9495 	err = got_commit_graph_open(&graph, "/", 1);
9496 	if (err)
9497 		return err;
9498 
9499 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
9500 	    check_cancelled, NULL);
9501 	if (err)
9502 		goto done;
9503 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
9504 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
9505 		    check_cancelled, NULL);
9506 		if (err) {
9507 			if (err->code == GOT_ERR_ITER_COMPLETED) {
9508 				err = got_error_msg(GOT_ERR_ANCESTRY,
9509 				    "ran out of commits to rebase before "
9510 				    "youngest common ancestor commit has "
9511 				    "been reached?!?");
9512 			}
9513 			goto done;
9514 		} else {
9515 			err = check_path_prefix(parent_id, commit_id,
9516 			    path_prefix, path_prefix_errcode, repo);
9517 			if (err)
9518 				goto done;
9519 
9520 			err = got_object_qid_alloc(&qid, commit_id);
9521 			if (err)
9522 				goto done;
9523 			STAILQ_INSERT_HEAD(commits, qid, entry);
9524 			commit_id = parent_id;
9525 		}
9526 	}
9527 done:
9528 	got_commit_graph_close(graph);
9529 	return err;
9530 }
9531 
9532 static const struct got_error *
9533 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9534 {
9535 	const struct got_error *err = NULL;
9536 	time_t committer_time;
9537 	struct tm tm;
9538 	char datebuf[11]; /* YYYY-MM-DD + NUL */
9539 	char *author0 = NULL, *author, *smallerthan;
9540 	char *logmsg0 = NULL, *logmsg, *newline;
9541 
9542 	committer_time = got_object_commit_get_committer_time(commit);
9543 	if (gmtime_r(&committer_time, &tm) == NULL)
9544 		return got_error_from_errno("gmtime_r");
9545 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9546 		return got_error(GOT_ERR_NO_SPACE);
9547 
9548 	author0 = strdup(got_object_commit_get_author(commit));
9549 	if (author0 == NULL)
9550 		return got_error_from_errno("strdup");
9551 	author = author0;
9552 	smallerthan = strchr(author, '<');
9553 	if (smallerthan && smallerthan[1] != '\0')
9554 		author = smallerthan + 1;
9555 	author[strcspn(author, "@>")] = '\0';
9556 
9557 	err = got_object_commit_get_logmsg(&logmsg0, commit);
9558 	if (err)
9559 		goto done;
9560 	logmsg = logmsg0;
9561 	while (*logmsg == '\n')
9562 		logmsg++;
9563 	newline = strchr(logmsg, '\n');
9564 	if (newline)
9565 		*newline = '\0';
9566 
9567 	if (asprintf(brief_str, "%s %s  %s",
9568 	    datebuf, author, logmsg) == -1)
9569 		err = got_error_from_errno("asprintf");
9570 done:
9571 	free(author0);
9572 	free(logmsg0);
9573 	return err;
9574 }
9575 
9576 static const struct got_error *
9577 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9578     struct got_repository *repo)
9579 {
9580 	const struct got_error *err;
9581 	char *id_str;
9582 
9583 	err = got_object_id_str(&id_str, id);
9584 	if (err)
9585 		return err;
9586 
9587 	err = got_ref_delete(ref, repo);
9588 	if (err)
9589 		goto done;
9590 
9591 	printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
9592 done:
9593 	free(id_str);
9594 	return err;
9595 }
9596 
9597 static const struct got_error *
9598 print_backup_ref(const char *branch_name, const char *new_id_str,
9599     struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
9600     struct got_reflist_object_id_map *refs_idmap,
9601     struct got_repository *repo)
9602 {
9603 	const struct got_error *err = NULL;
9604 	struct got_reflist_head *refs;
9605 	char *refs_str = NULL;
9606 	struct got_object_id *new_commit_id = NULL;
9607 	struct got_commit_object *new_commit = NULL;
9608 	char *new_commit_brief_str = NULL;
9609 	struct got_object_id *yca_id = NULL;
9610 	struct got_commit_object *yca_commit = NULL;
9611 	char *yca_id_str = NULL, *yca_brief_str = NULL;
9612 	char *custom_refs_str;
9613 
9614 	if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9615 		return got_error_from_errno("asprintf");
9616 
9617 	err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9618 	    0, 0, refs_idmap, custom_refs_str);
9619 	if (err)
9620 		goto done;
9621 
9622 	err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9623 	if (err)
9624 		goto done;
9625 
9626 	refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9627 	if (refs) {
9628 		err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
9629 		if (err)
9630 			goto done;
9631 	}
9632 
9633 	err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9634 	if (err)
9635 		goto done;
9636 
9637 	err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9638 	if (err)
9639 		goto done;
9640 
9641 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9642 	    old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9643 	if (err)
9644 		goto done;
9645 
9646 	printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9647 	    refs_str ? " (" : "", refs_str ? refs_str : "",
9648 	    refs_str ? ")" : "", new_commit_brief_str);
9649 	if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9650 	    got_object_id_cmp(yca_id, old_commit_id) != 0) {
9651 		free(refs_str);
9652 		refs_str = NULL;
9653 
9654 		err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9655 		if (err)
9656 			goto done;
9657 
9658 		err = get_commit_brief_str(&yca_brief_str, yca_commit);
9659 		if (err)
9660 			goto done;
9661 
9662 		err = got_object_id_str(&yca_id_str, yca_id);
9663 		if (err)
9664 			goto done;
9665 
9666 		refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9667 		if (refs) {
9668 			err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
9669 			if (err)
9670 				goto done;
9671 		}
9672 		printf("history forked at %s%s%s%s\n %s\n",
9673 		    yca_id_str,
9674 		    refs_str ? " (" : "", refs_str ? refs_str : "",
9675 		    refs_str ? ")" : "", yca_brief_str);
9676 	}
9677 done:
9678 	free(custom_refs_str);
9679 	free(new_commit_id);
9680 	free(refs_str);
9681 	free(yca_id);
9682 	free(yca_id_str);
9683 	free(yca_brief_str);
9684 	if (new_commit)
9685 		got_object_commit_close(new_commit);
9686 	if (yca_commit)
9687 		got_object_commit_close(yca_commit);
9688 
9689 	return NULL;
9690 }
9691 
9692 static const struct got_error *
9693 process_backup_refs(const char *backup_ref_prefix,
9694     const char *wanted_branch_name,
9695     int delete, struct got_repository *repo)
9696 {
9697 	const struct got_error *err;
9698 	struct got_reflist_head refs, backup_refs;
9699 	struct got_reflist_entry *re;
9700 	const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9701 	struct got_object_id *old_commit_id = NULL;
9702 	char *branch_name = NULL;
9703 	struct got_commit_object *old_commit = NULL;
9704 	struct got_reflist_object_id_map *refs_idmap = NULL;
9705 	int wanted_branch_found = 0;
9706 
9707 	TAILQ_INIT(&refs);
9708 	TAILQ_INIT(&backup_refs);
9709 
9710 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9711 	if (err)
9712 		return err;
9713 
9714 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9715 	if (err)
9716 		goto done;
9717 
9718 	if (wanted_branch_name) {
9719 		if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9720 			wanted_branch_name += 11;
9721 	}
9722 
9723 	err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9724 	    got_ref_cmp_by_commit_timestamp_descending, repo);
9725 	if (err)
9726 		goto done;
9727 
9728 	TAILQ_FOREACH(re, &backup_refs, entry) {
9729 		const char *refname = got_ref_get_name(re->ref);
9730 		char *slash;
9731 
9732 		err = check_cancelled(NULL);
9733 		if (err)
9734 			break;
9735 
9736 		err = got_ref_resolve(&old_commit_id, repo, re->ref);
9737 		if (err)
9738 			break;
9739 
9740 		err = got_object_open_as_commit(&old_commit, repo,
9741 		    old_commit_id);
9742 		if (err)
9743 			break;
9744 
9745 		if (strncmp(backup_ref_prefix, refname,
9746 		    backup_ref_prefix_len) == 0)
9747 			refname += backup_ref_prefix_len;
9748 
9749 		while (refname[0] == '/')
9750 			refname++;
9751 
9752 		branch_name = strdup(refname);
9753 		if (branch_name == NULL) {
9754 			err = got_error_from_errno("strdup");
9755 			break;
9756 		}
9757 		slash = strrchr(branch_name, '/');
9758 		if (slash) {
9759 			*slash = '\0';
9760 			refname += strlen(branch_name) + 1;
9761 		}
9762 
9763 		if (wanted_branch_name == NULL ||
9764 		    strcmp(wanted_branch_name, branch_name) == 0) {
9765 			wanted_branch_found = 1;
9766 			if (delete) {
9767 				err = delete_backup_ref(re->ref,
9768 				    old_commit_id, repo);
9769 			} else {
9770 				err = print_backup_ref(branch_name, refname,
9771 				    old_commit_id, old_commit, refs_idmap,
9772 				    repo);
9773 			}
9774 			if (err)
9775 				break;
9776 		}
9777 
9778 		free(old_commit_id);
9779 		old_commit_id = NULL;
9780 		free(branch_name);
9781 		branch_name = NULL;
9782 		got_object_commit_close(old_commit);
9783 		old_commit = NULL;
9784 	}
9785 
9786 	if (wanted_branch_name && !wanted_branch_found) {
9787 		err = got_error_fmt(GOT_ERR_NOT_REF,
9788 		    "%s/%s/", backup_ref_prefix, wanted_branch_name);
9789 	}
9790 done:
9791 	if (refs_idmap)
9792 		got_reflist_object_id_map_free(refs_idmap);
9793 	got_ref_list_free(&refs);
9794 	got_ref_list_free(&backup_refs);
9795 	free(old_commit_id);
9796 	free(branch_name);
9797 	if (old_commit)
9798 		got_object_commit_close(old_commit);
9799 	return err;
9800 }
9801 
9802 static const struct got_error *
9803 abort_progress(void *arg, unsigned char status, const char *path)
9804 {
9805 	/*
9806 	 * Unversioned files should not clutter progress output when
9807 	 * an operation is aborted.
9808 	 */
9809 	if (status == GOT_STATUS_UNVERSIONED)
9810 		return NULL;
9811 
9812 	return update_progress(arg, status, path);
9813 }
9814 
9815 static const struct got_error *
9816 cmd_rebase(int argc, char *argv[])
9817 {
9818 	const struct got_error *error = NULL;
9819 	struct got_worktree *worktree = NULL;
9820 	struct got_repository *repo = NULL;
9821 	struct got_fileindex *fileindex = NULL;
9822 	char *cwd = NULL;
9823 	struct got_reference *branch = NULL;
9824 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9825 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
9826 	struct got_object_id *resume_commit_id = NULL;
9827 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9828 	struct got_commit_object *commit = NULL;
9829 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9830 	int histedit_in_progress = 0, merge_in_progress = 0;
9831 	int create_backup = 1, list_backups = 0, delete_backups = 0;
9832 	struct got_object_id_queue commits;
9833 	struct got_pathlist_head merged_paths;
9834 	const struct got_object_id_queue *parent_ids;
9835 	struct got_object_qid *qid, *pid;
9836 	struct got_update_progress_arg upa;
9837 	int *pack_fds = NULL;
9838 
9839 	STAILQ_INIT(&commits);
9840 	TAILQ_INIT(&merged_paths);
9841 	memset(&upa, 0, sizeof(upa));
9842 
9843 	while ((ch = getopt(argc, argv, "aclX")) != -1) {
9844 		switch (ch) {
9845 		case 'a':
9846 			abort_rebase = 1;
9847 			break;
9848 		case 'c':
9849 			continue_rebase = 1;
9850 			break;
9851 		case 'l':
9852 			list_backups = 1;
9853 			break;
9854 		case 'X':
9855 			delete_backups = 1;
9856 			break;
9857 		default:
9858 			usage_rebase();
9859 			/* NOTREACHED */
9860 		}
9861 	}
9862 
9863 	argc -= optind;
9864 	argv += optind;
9865 
9866 #ifndef PROFILE
9867 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9868 	    "unveil", NULL) == -1)
9869 		err(1, "pledge");
9870 #endif
9871 	if (list_backups) {
9872 		if (abort_rebase)
9873 			option_conflict('l', 'a');
9874 		if (continue_rebase)
9875 			option_conflict('l', 'c');
9876 		if (delete_backups)
9877 			option_conflict('l', 'X');
9878 		if (argc != 0 && argc != 1)
9879 			usage_rebase();
9880 	} else if (delete_backups) {
9881 		if (abort_rebase)
9882 			option_conflict('X', 'a');
9883 		if (continue_rebase)
9884 			option_conflict('X', 'c');
9885 		if (list_backups)
9886 			option_conflict('l', 'X');
9887 		if (argc != 0 && argc != 1)
9888 			usage_rebase();
9889 	} else {
9890 		if (abort_rebase && continue_rebase)
9891 			usage_rebase();
9892 		else if (abort_rebase || continue_rebase) {
9893 			if (argc != 0)
9894 				usage_rebase();
9895 		} else if (argc != 1)
9896 			usage_rebase();
9897 	}
9898 
9899 	cwd = getcwd(NULL, 0);
9900 	if (cwd == NULL) {
9901 		error = got_error_from_errno("getcwd");
9902 		goto done;
9903 	}
9904 
9905 	error = got_repo_pack_fds_open(&pack_fds);
9906 	if (error != NULL)
9907 		goto done;
9908 
9909 	error = got_worktree_open(&worktree, cwd);
9910 	if (error) {
9911 		if (list_backups || delete_backups) {
9912 			if (error->code != GOT_ERR_NOT_WORKTREE)
9913 				goto done;
9914 		} else {
9915 			if (error->code == GOT_ERR_NOT_WORKTREE)
9916 				error = wrap_not_worktree_error(error,
9917 				    "rebase", cwd);
9918 			goto done;
9919 		}
9920 	}
9921 
9922 	error = got_repo_open(&repo,
9923 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
9924 	    pack_fds);
9925 	if (error != NULL)
9926 		goto done;
9927 
9928 	error = apply_unveil(got_repo_get_path(repo), 0,
9929 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
9930 	if (error)
9931 		goto done;
9932 
9933 	if (list_backups || delete_backups) {
9934 		error = process_backup_refs(
9935 		    GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9936 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
9937 		goto done; /* nothing else to do */
9938 	}
9939 
9940 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
9941 	    worktree);
9942 	if (error)
9943 		goto done;
9944 	if (histedit_in_progress) {
9945 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
9946 		goto done;
9947 	}
9948 
9949 	error = got_worktree_merge_in_progress(&merge_in_progress,
9950 	    worktree, repo);
9951 	if (error)
9952 		goto done;
9953 	if (merge_in_progress) {
9954 		error = got_error(GOT_ERR_MERGE_BUSY);
9955 		goto done;
9956 	}
9957 
9958 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9959 	if (error)
9960 		goto done;
9961 
9962 	if (abort_rebase) {
9963 		if (!rebase_in_progress) {
9964 			error = got_error(GOT_ERR_NOT_REBASING);
9965 			goto done;
9966 		}
9967 		error = got_worktree_rebase_continue(&resume_commit_id,
9968 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
9969 		    worktree, repo);
9970 		if (error)
9971 			goto done;
9972 		printf("Switching work tree to %s\n",
9973 		    got_ref_get_symref_target(new_base_branch));
9974 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
9975 		    new_base_branch, abort_progress, &upa);
9976 		if (error)
9977 			goto done;
9978 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9979 		print_merge_progress_stats(&upa);
9980 		goto done; /* nothing else to do */
9981 	}
9982 
9983 	if (continue_rebase) {
9984 		if (!rebase_in_progress) {
9985 			error = got_error(GOT_ERR_NOT_REBASING);
9986 			goto done;
9987 		}
9988 		error = got_worktree_rebase_continue(&resume_commit_id,
9989 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
9990 		    worktree, repo);
9991 		if (error)
9992 			goto done;
9993 
9994 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9995 		    resume_commit_id, repo);
9996 		if (error)
9997 			goto done;
9998 
9999 		yca_id = got_object_id_dup(resume_commit_id);
10000 		if (yca_id == NULL) {
10001 			error = got_error_from_errno("got_object_id_dup");
10002 			goto done;
10003 		}
10004 	} else {
10005 		error = got_ref_open(&branch, repo, argv[0], 0);
10006 		if (error != NULL)
10007 			goto done;
10008 	}
10009 
10010 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
10011 	if (error)
10012 		goto done;
10013 
10014 	if (!continue_rebase) {
10015 		struct got_object_id *base_commit_id;
10016 
10017 		base_commit_id = got_worktree_get_base_commit_id(worktree);
10018 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10019 		    base_commit_id, branch_head_commit_id, 1, repo,
10020 		    check_cancelled, NULL);
10021 		if (error)
10022 			goto done;
10023 		if (yca_id == NULL) {
10024 			error = got_error_msg(GOT_ERR_ANCESTRY,
10025 			    "specified branch shares no common ancestry "
10026 			    "with work tree's branch");
10027 			goto done;
10028 		}
10029 
10030 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
10031 		if (error) {
10032 			if (error->code != GOT_ERR_ANCESTRY)
10033 				goto done;
10034 			error = NULL;
10035 		} else {
10036 			struct got_pathlist_head paths;
10037 			printf("%s is already based on %s\n",
10038 			    got_ref_get_name(branch),
10039 			    got_worktree_get_head_ref_name(worktree));
10040 			error = switch_head_ref(branch, branch_head_commit_id,
10041 			    worktree, repo);
10042 			if (error)
10043 				goto done;
10044 			error = got_worktree_set_base_commit_id(worktree, repo,
10045 			    branch_head_commit_id);
10046 			if (error)
10047 				goto done;
10048 			TAILQ_INIT(&paths);
10049 			error = got_pathlist_append(&paths, "", NULL);
10050 			if (error)
10051 				goto done;
10052 			error = got_worktree_checkout_files(worktree,
10053 			    &paths, repo, update_progress, &upa,
10054 			    check_cancelled, NULL);
10055 			got_pathlist_free(&paths);
10056 			if (error)
10057 				goto done;
10058 			if (upa.did_something) {
10059 				char *id_str;
10060 				error = got_object_id_str(&id_str,
10061 				    branch_head_commit_id);
10062 				if (error)
10063 					goto done;
10064 				printf("Updated to %s: %s\n",
10065 				    got_worktree_get_head_ref_name(worktree),
10066 				    id_str);
10067 				free(id_str);
10068 			} else
10069 				printf("Already up-to-date\n");
10070 			print_update_progress_stats(&upa);
10071 			goto done;
10072 		}
10073 	}
10074 
10075 	commit_id = branch_head_commit_id;
10076 	error = got_object_open_as_commit(&commit, repo, commit_id);
10077 	if (error)
10078 		goto done;
10079 
10080 	parent_ids = got_object_commit_get_parent_ids(commit);
10081 	pid = STAILQ_FIRST(parent_ids);
10082 	if (pid == NULL) {
10083 		error = got_error(GOT_ERR_EMPTY_REBASE);
10084 		goto done;
10085 	}
10086 	error = collect_commits(&commits, commit_id, &pid->id,
10087 	    yca_id, got_worktree_get_path_prefix(worktree),
10088 	    GOT_ERR_REBASE_PATH, repo);
10089 	got_object_commit_close(commit);
10090 	commit = NULL;
10091 	if (error)
10092 		goto done;
10093 
10094 	if (!continue_rebase) {
10095 		error = got_worktree_rebase_prepare(&new_base_branch,
10096 		    &tmp_branch, &fileindex, worktree, branch, repo);
10097 		if (error)
10098 			goto done;
10099 	}
10100 
10101 	if (STAILQ_EMPTY(&commits)) {
10102 		if (continue_rebase) {
10103 			error = rebase_complete(worktree, fileindex,
10104 			    branch, new_base_branch, tmp_branch, repo,
10105 			    create_backup);
10106 			goto done;
10107 		} else {
10108 			/* Fast-forward the reference of the branch. */
10109 			struct got_object_id *new_head_commit_id;
10110 			char *id_str;
10111 			error = got_ref_resolve(&new_head_commit_id, repo,
10112 			    new_base_branch);
10113 			if (error)
10114 				goto done;
10115 			error = got_object_id_str(&id_str, new_head_commit_id);
10116 			printf("Forwarding %s to commit %s\n",
10117 			    got_ref_get_name(branch), id_str);
10118 			free(id_str);
10119 			error = got_ref_change_ref(branch,
10120 			    new_head_commit_id);
10121 			if (error)
10122 				goto done;
10123 			/* No backup needed since objects did not change. */
10124 			create_backup = 0;
10125 		}
10126 	}
10127 
10128 	pid = NULL;
10129 	STAILQ_FOREACH(qid, &commits, entry) {
10130 
10131 		commit_id = &qid->id;
10132 		parent_id = pid ? &pid->id : yca_id;
10133 		pid = qid;
10134 
10135 		memset(&upa, 0, sizeof(upa));
10136 		error = got_worktree_rebase_merge_files(&merged_paths,
10137 		    worktree, fileindex, parent_id, commit_id, repo,
10138 		    update_progress, &upa, check_cancelled, NULL);
10139 		if (error)
10140 			goto done;
10141 
10142 		print_merge_progress_stats(&upa);
10143 		if (upa.conflicts > 0 || upa.missing > 0 ||
10144 		    upa.not_deleted > 0 || upa.unversioned > 0) {
10145 			if (upa.conflicts > 0) {
10146 				error = show_rebase_merge_conflict(&qid->id,
10147 				    repo);
10148 				if (error)
10149 					goto done;
10150 			}
10151 			got_worktree_rebase_pathlist_free(&merged_paths);
10152 			break;
10153 		}
10154 
10155 		error = rebase_commit(&merged_paths, worktree, fileindex,
10156 		    tmp_branch, commit_id, repo);
10157 		got_worktree_rebase_pathlist_free(&merged_paths);
10158 		if (error)
10159 			goto done;
10160 	}
10161 
10162 	if (upa.conflicts > 0 || upa.missing > 0 ||
10163 	    upa.not_deleted > 0 || upa.unversioned > 0) {
10164 		error = got_worktree_rebase_postpone(worktree, fileindex);
10165 		if (error)
10166 			goto done;
10167 		if (upa.conflicts > 0 && upa.missing == 0 &&
10168 		    upa.not_deleted == 0 && upa.unversioned == 0) {
10169 			error = got_error_msg(GOT_ERR_CONFLICTS,
10170 			    "conflicts must be resolved before rebasing "
10171 			    "can continue");
10172 		} else if (upa.conflicts > 0) {
10173 			error = got_error_msg(GOT_ERR_CONFLICTS,
10174 			    "conflicts must be resolved before rebasing "
10175 			    "can continue; changes destined for some "
10176 			    "files were not yet merged and should be "
10177 			    "merged manually if required before the "
10178 			    "rebase operation is continued");
10179 		} else {
10180 			error = got_error_msg(GOT_ERR_CONFLICTS,
10181 			    "changes destined for some files were not "
10182 			    "yet merged and should be merged manually "
10183 			    "if required before the rebase operation "
10184 			    "is continued");
10185 		}
10186 	} else
10187 		error = rebase_complete(worktree, fileindex, branch,
10188 		    new_base_branch, tmp_branch, repo, create_backup);
10189 done:
10190 	got_object_id_queue_free(&commits);
10191 	free(branch_head_commit_id);
10192 	free(resume_commit_id);
10193 	free(yca_id);
10194 	if (commit)
10195 		got_object_commit_close(commit);
10196 	if (branch)
10197 		got_ref_close(branch);
10198 	if (new_base_branch)
10199 		got_ref_close(new_base_branch);
10200 	if (tmp_branch)
10201 		got_ref_close(tmp_branch);
10202 	if (worktree)
10203 		got_worktree_close(worktree);
10204 	if (repo) {
10205 		const struct got_error *close_err = got_repo_close(repo);
10206 		if (error == NULL)
10207 			error = close_err;
10208 	}
10209 	if (pack_fds) {
10210 		const struct got_error *pack_err =
10211 		    got_repo_pack_fds_close(pack_fds);
10212 		if (error == NULL)
10213 			error = pack_err;
10214 	}
10215 	return error;
10216 }
10217 
10218 __dead static void
10219 usage_histedit(void)
10220 {
10221 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
10222 	    "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
10223 	    getprogname());
10224 	exit(1);
10225 }
10226 
10227 #define GOT_HISTEDIT_PICK 'p'
10228 #define GOT_HISTEDIT_EDIT 'e'
10229 #define GOT_HISTEDIT_FOLD 'f'
10230 #define GOT_HISTEDIT_DROP 'd'
10231 #define GOT_HISTEDIT_MESG 'm'
10232 
10233 static const struct got_histedit_cmd {
10234 	unsigned char code;
10235 	const char *name;
10236 	const char *desc;
10237 } got_histedit_cmds[] = {
10238 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
10239 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
10240 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
10241 	    "be used" },
10242 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
10243 	{ GOT_HISTEDIT_MESG, "mesg",
10244 	    "single-line log message for commit above (open editor if empty)" },
10245 };
10246 
10247 struct got_histedit_list_entry {
10248 	TAILQ_ENTRY(got_histedit_list_entry) entry;
10249 	struct got_object_id *commit_id;
10250 	const struct got_histedit_cmd *cmd;
10251 	char *logmsg;
10252 };
10253 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
10254 
10255 static const struct got_error *
10256 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
10257     FILE *f, struct got_repository *repo)
10258 {
10259 	const struct got_error *err = NULL;
10260 	char *logmsg = NULL, *id_str = NULL;
10261 	struct got_commit_object *commit = NULL;
10262 	int n;
10263 
10264 	err = got_object_open_as_commit(&commit, repo, commit_id);
10265 	if (err)
10266 		goto done;
10267 
10268 	err = get_short_logmsg(&logmsg, 34, commit);
10269 	if (err)
10270 		goto done;
10271 
10272 	err = got_object_id_str(&id_str, commit_id);
10273 	if (err)
10274 		goto done;
10275 
10276 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
10277 	if (n < 0)
10278 		err = got_ferror(f, GOT_ERR_IO);
10279 done:
10280 	if (commit)
10281 		got_object_commit_close(commit);
10282 	free(id_str);
10283 	free(logmsg);
10284 	return err;
10285 }
10286 
10287 static const struct got_error *
10288 histedit_write_commit_list(struct got_object_id_queue *commits,
10289     FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
10290     struct got_repository *repo)
10291 {
10292 	const struct got_error *err = NULL;
10293 	struct got_object_qid *qid;
10294 	const char *histedit_cmd = NULL;
10295 
10296 	if (STAILQ_EMPTY(commits))
10297 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
10298 
10299 	STAILQ_FOREACH(qid, commits, entry) {
10300 		histedit_cmd = got_histedit_cmds[0].name;
10301 		if (edit_only)
10302 			histedit_cmd = "edit";
10303 		else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
10304 			histedit_cmd = "fold";
10305 		err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
10306 		if (err)
10307 			break;
10308 		if (edit_logmsg_only) {
10309 			int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
10310 			if (n < 0) {
10311 				err = got_ferror(f, GOT_ERR_IO);
10312 				break;
10313 			}
10314 		}
10315 	}
10316 
10317 	return err;
10318 }
10319 
10320 static const struct got_error *
10321 write_cmd_list(FILE *f, const char *branch_name,
10322     struct got_object_id_queue *commits)
10323 {
10324 	const struct got_error *err = NULL;
10325 	size_t i;
10326 	int n;
10327 	char *id_str;
10328 	struct got_object_qid *qid;
10329 
10330 	qid = STAILQ_FIRST(commits);
10331 	err = got_object_id_str(&id_str, &qid->id);
10332 	if (err)
10333 		return err;
10334 
10335 	n = fprintf(f,
10336 	    "# Editing the history of branch '%s' starting at\n"
10337 	    "# commit %s\n"
10338 	    "# Commits will be processed in order from top to "
10339 	    "bottom of this file.\n", branch_name, id_str);
10340 	if (n < 0) {
10341 		err = got_ferror(f, GOT_ERR_IO);
10342 		goto done;
10343 	}
10344 
10345 	n = fprintf(f, "# Available histedit commands:\n");
10346 	if (n < 0) {
10347 		err = got_ferror(f, GOT_ERR_IO);
10348 		goto done;
10349 	}
10350 
10351 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
10352 		const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
10353 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
10354 		    cmd->desc);
10355 		if (n < 0) {
10356 			err = got_ferror(f, GOT_ERR_IO);
10357 			break;
10358 		}
10359 	}
10360 done:
10361 	free(id_str);
10362 	return err;
10363 }
10364 
10365 static const struct got_error *
10366 histedit_syntax_error(int lineno)
10367 {
10368 	static char msg[42];
10369 	int ret;
10370 
10371 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
10372 	    lineno);
10373 	if (ret == -1 || ret >= sizeof(msg))
10374 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
10375 
10376 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
10377 }
10378 
10379 static const struct got_error *
10380 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
10381     char *logmsg, struct got_repository *repo)
10382 {
10383 	const struct got_error *err;
10384 	struct got_commit_object *folded_commit = NULL;
10385 	char *id_str, *folded_logmsg = NULL;
10386 
10387 	err = got_object_id_str(&id_str, hle->commit_id);
10388 	if (err)
10389 		return err;
10390 
10391 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
10392 	if (err)
10393 		goto done;
10394 
10395 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
10396 	if (err)
10397 		goto done;
10398 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
10399 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
10400 	    folded_logmsg) == -1) {
10401 		err = got_error_from_errno("asprintf");
10402 	}
10403 done:
10404 	if (folded_commit)
10405 		got_object_commit_close(folded_commit);
10406 	free(id_str);
10407 	free(folded_logmsg);
10408 	return err;
10409 }
10410 
10411 static struct got_histedit_list_entry *
10412 get_folded_commits(struct got_histedit_list_entry *hle)
10413 {
10414 	struct got_histedit_list_entry *prev, *folded = NULL;
10415 
10416 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
10417 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
10418 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
10419 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
10420 			folded = prev;
10421 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
10422 	}
10423 
10424 	return folded;
10425 }
10426 
10427 static const struct got_error *
10428 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
10429     struct got_repository *repo)
10430 {
10431 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
10432 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
10433 	const struct got_error *err = NULL;
10434 	struct got_commit_object *commit = NULL;
10435 	int logmsg_len;
10436 	int fd;
10437 	struct got_histedit_list_entry *folded = NULL;
10438 
10439 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10440 	if (err)
10441 		return err;
10442 
10443 	folded = get_folded_commits(hle);
10444 	if (folded) {
10445 		while (folded != hle) {
10446 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
10447 				folded = TAILQ_NEXT(folded, entry);
10448 				continue;
10449 			}
10450 			err = append_folded_commit_msg(&new_msg, folded,
10451 			    logmsg, repo);
10452 			if (err)
10453 				goto done;
10454 			free(logmsg);
10455 			logmsg = new_msg;
10456 			folded = TAILQ_NEXT(folded, entry);
10457 		}
10458 	}
10459 
10460 	err = got_object_id_str(&id_str, hle->commit_id);
10461 	if (err)
10462 		goto done;
10463 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
10464 	if (err)
10465 		goto done;
10466 	logmsg_len = asprintf(&new_msg,
10467 	    "%s\n# original log message of commit %s: %s",
10468 	    logmsg ? logmsg : "", id_str, orig_logmsg);
10469 	if (logmsg_len == -1) {
10470 		err = got_error_from_errno("asprintf");
10471 		goto done;
10472 	}
10473 	free(logmsg);
10474 	logmsg = new_msg;
10475 
10476 	err = got_object_id_str(&id_str, hle->commit_id);
10477 	if (err)
10478 		goto done;
10479 
10480 	err = got_opentemp_named_fd(&logmsg_path, &fd,
10481 	    GOT_TMPDIR_STR "/got-logmsg");
10482 	if (err)
10483 		goto done;
10484 
10485 	write(fd, logmsg, logmsg_len);
10486 	close(fd);
10487 
10488 	err = get_editor(&editor);
10489 	if (err)
10490 		goto done;
10491 
10492 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
10493 	    logmsg_len, 0);
10494 	if (err) {
10495 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
10496 			goto done;
10497 		err = NULL;
10498 		hle->logmsg = strdup(new_msg);
10499 		if (hle->logmsg == NULL)
10500 			err = got_error_from_errno("strdup");
10501 	}
10502 done:
10503 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
10504 		err = got_error_from_errno2("unlink", logmsg_path);
10505 	free(logmsg_path);
10506 	free(logmsg);
10507 	free(orig_logmsg);
10508 	free(editor);
10509 	if (commit)
10510 		got_object_commit_close(commit);
10511 	return err;
10512 }
10513 
10514 static const struct got_error *
10515 histedit_parse_list(struct got_histedit_list *histedit_cmds,
10516     FILE *f, struct got_repository *repo)
10517 {
10518 	const struct got_error *err = NULL;
10519 	char *line = NULL, *p, *end;
10520 	size_t i, size;
10521 	ssize_t len;
10522 	int lineno = 0;
10523 	const struct got_histedit_cmd *cmd;
10524 	struct got_object_id *commit_id = NULL;
10525 	struct got_histedit_list_entry *hle = NULL;
10526 
10527 	for (;;) {
10528 		len = getline(&line, &size, f);
10529 		if (len == -1) {
10530 			const struct got_error *getline_err;
10531 			if (feof(f))
10532 				break;
10533 			getline_err = got_error_from_errno("getline");
10534 			err = got_ferror(f, getline_err->code);
10535 			break;
10536 		}
10537 		lineno++;
10538 		p = line;
10539 		while (isspace((unsigned char)p[0]))
10540 			p++;
10541 		if (p[0] == '#' || p[0] == '\0') {
10542 			free(line);
10543 			line = NULL;
10544 			continue;
10545 		}
10546 		cmd = NULL;
10547 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
10548 			cmd = &got_histedit_cmds[i];
10549 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10550 			    isspace((unsigned char)p[strlen(cmd->name)])) {
10551 				p += strlen(cmd->name);
10552 				break;
10553 			}
10554 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
10555 				p++;
10556 				break;
10557 			}
10558 		}
10559 		if (i == nitems(got_histedit_cmds)) {
10560 			err = histedit_syntax_error(lineno);
10561 			break;
10562 		}
10563 		while (isspace((unsigned char)p[0]))
10564 			p++;
10565 		if (cmd->code == GOT_HISTEDIT_MESG) {
10566 			if (hle == NULL || hle->logmsg != NULL) {
10567 				err = got_error(GOT_ERR_HISTEDIT_CMD);
10568 				break;
10569 			}
10570 			if (p[0] == '\0') {
10571 				err = histedit_edit_logmsg(hle, repo);
10572 				if (err)
10573 					break;
10574 			} else {
10575 				hle->logmsg = strdup(p);
10576 				if (hle->logmsg == NULL) {
10577 					err = got_error_from_errno("strdup");
10578 					break;
10579 				}
10580 			}
10581 			free(line);
10582 			line = NULL;
10583 			continue;
10584 		} else {
10585 			end = p;
10586 			while (end[0] && !isspace((unsigned char)end[0]))
10587 				end++;
10588 			*end = '\0';
10589 
10590 			err = got_object_resolve_id_str(&commit_id, repo, p);
10591 			if (err) {
10592 				/* override error code */
10593 				err = histedit_syntax_error(lineno);
10594 				break;
10595 			}
10596 		}
10597 		hle = malloc(sizeof(*hle));
10598 		if (hle == NULL) {
10599 			err = got_error_from_errno("malloc");
10600 			break;
10601 		}
10602 		hle->cmd = cmd;
10603 		hle->commit_id = commit_id;
10604 		hle->logmsg = NULL;
10605 		commit_id = NULL;
10606 		free(line);
10607 		line = NULL;
10608 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10609 	}
10610 
10611 	free(line);
10612 	free(commit_id);
10613 	return err;
10614 }
10615 
10616 static const struct got_error *
10617 histedit_check_script(struct got_histedit_list *histedit_cmds,
10618     struct got_object_id_queue *commits, struct got_repository *repo)
10619 {
10620 	const struct got_error *err = NULL;
10621 	struct got_object_qid *qid;
10622 	struct got_histedit_list_entry *hle;
10623 	static char msg[92];
10624 	char *id_str;
10625 
10626 	if (TAILQ_EMPTY(histedit_cmds))
10627 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10628 		    "histedit script contains no commands");
10629 	if (STAILQ_EMPTY(commits))
10630 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
10631 
10632 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
10633 		struct got_histedit_list_entry *hle2;
10634 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10635 			if (hle == hle2)
10636 				continue;
10637 			if (got_object_id_cmp(hle->commit_id,
10638 			    hle2->commit_id) != 0)
10639 				continue;
10640 			err = got_object_id_str(&id_str, hle->commit_id);
10641 			if (err)
10642 				return err;
10643 			snprintf(msg, sizeof(msg), "commit %s is listed "
10644 			    "more than once in histedit script", id_str);
10645 			free(id_str);
10646 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10647 		}
10648 	}
10649 
10650 	STAILQ_FOREACH(qid, commits, entry) {
10651 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
10652 			if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
10653 				break;
10654 		}
10655 		if (hle == NULL) {
10656 			err = got_object_id_str(&id_str, &qid->id);
10657 			if (err)
10658 				return err;
10659 			snprintf(msg, sizeof(msg),
10660 			    "commit %s missing from histedit script", id_str);
10661 			free(id_str);
10662 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10663 		}
10664 	}
10665 
10666 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10667 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10668 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10669 		    "last commit in histedit script cannot be folded");
10670 
10671 	return NULL;
10672 }
10673 
10674 static const struct got_error *
10675 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10676     const char *path, struct got_object_id_queue *commits,
10677     struct got_repository *repo)
10678 {
10679 	const struct got_error *err = NULL;
10680 	char *editor;
10681 	FILE *f = NULL;
10682 
10683 	err = get_editor(&editor);
10684 	if (err)
10685 		return err;
10686 
10687 	if (spawn_editor(editor, path) == -1) {
10688 		err = got_error_from_errno("failed spawning editor");
10689 		goto done;
10690 	}
10691 
10692 	f = fopen(path, "re");
10693 	if (f == NULL) {
10694 		err = got_error_from_errno("fopen");
10695 		goto done;
10696 	}
10697 	err = histedit_parse_list(histedit_cmds, f, repo);
10698 	if (err)
10699 		goto done;
10700 
10701 	err = histedit_check_script(histedit_cmds, commits, repo);
10702 done:
10703 	if (f && fclose(f) == EOF && err == NULL)
10704 		err = got_error_from_errno("fclose");
10705 	free(editor);
10706 	return err;
10707 }
10708 
10709 static const struct got_error *
10710 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10711     struct got_object_id_queue *, const char *, const char *,
10712     struct got_repository *);
10713 
10714 static const struct got_error *
10715 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10716     struct got_object_id_queue *commits, const char *branch_name,
10717     int edit_logmsg_only, int fold_only, int edit_only,
10718     struct got_repository *repo)
10719 {
10720 	const struct got_error *err;
10721 	FILE *f = NULL;
10722 	char *path = NULL;
10723 
10724 	err = got_opentemp_named(&path, &f, "got-histedit");
10725 	if (err)
10726 		return err;
10727 
10728 	err = write_cmd_list(f, branch_name, commits);
10729 	if (err)
10730 		goto done;
10731 
10732 	err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10733 	    fold_only, edit_only, repo);
10734 	if (err)
10735 		goto done;
10736 
10737 	if (edit_logmsg_only || fold_only || edit_only) {
10738 		rewind(f);
10739 		err = histedit_parse_list(histedit_cmds, f, repo);
10740 	} else {
10741 		if (fclose(f) == EOF) {
10742 			err = got_error_from_errno("fclose");
10743 			goto done;
10744 		}
10745 		f = NULL;
10746 		err = histedit_run_editor(histedit_cmds, path, commits, repo);
10747 		if (err) {
10748 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10749 			    err->code != GOT_ERR_HISTEDIT_CMD)
10750 				goto done;
10751 			err = histedit_edit_list_retry(histedit_cmds, err,
10752 			    commits, path, branch_name, repo);
10753 		}
10754 	}
10755 done:
10756 	if (f && fclose(f) == EOF && err == NULL)
10757 		err = got_error_from_errno("fclose");
10758 	if (path && unlink(path) != 0 && err == NULL)
10759 		err = got_error_from_errno2("unlink", path);
10760 	free(path);
10761 	return err;
10762 }
10763 
10764 static const struct got_error *
10765 histedit_save_list(struct got_histedit_list *histedit_cmds,
10766     struct got_worktree *worktree, struct got_repository *repo)
10767 {
10768 	const struct got_error *err = NULL;
10769 	char *path = NULL;
10770 	FILE *f = NULL;
10771 	struct got_histedit_list_entry *hle;
10772 	struct got_commit_object *commit = NULL;
10773 
10774 	err = got_worktree_get_histedit_script_path(&path, worktree);
10775 	if (err)
10776 		return err;
10777 
10778 	f = fopen(path, "we");
10779 	if (f == NULL) {
10780 		err = got_error_from_errno2("fopen", path);
10781 		goto done;
10782 	}
10783 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
10784 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10785 		    repo);
10786 		if (err)
10787 			break;
10788 
10789 		if (hle->logmsg) {
10790 			int n = fprintf(f, "%c %s\n",
10791 			    GOT_HISTEDIT_MESG, hle->logmsg);
10792 			if (n < 0) {
10793 				err = got_ferror(f, GOT_ERR_IO);
10794 				break;
10795 			}
10796 		}
10797 	}
10798 done:
10799 	if (f && fclose(f) == EOF && err == NULL)
10800 		err = got_error_from_errno("fclose");
10801 	free(path);
10802 	if (commit)
10803 		got_object_commit_close(commit);
10804 	return err;
10805 }
10806 
10807 static void
10808 histedit_free_list(struct got_histedit_list *histedit_cmds)
10809 {
10810 	struct got_histedit_list_entry *hle;
10811 
10812 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
10813 		TAILQ_REMOVE(histedit_cmds, hle, entry);
10814 		free(hle);
10815 	}
10816 }
10817 
10818 static const struct got_error *
10819 histedit_load_list(struct got_histedit_list *histedit_cmds,
10820     const char *path, struct got_repository *repo)
10821 {
10822 	const struct got_error *err = NULL;
10823 	FILE *f = NULL;
10824 
10825 	f = fopen(path, "re");
10826 	if (f == NULL) {
10827 		err = got_error_from_errno2("fopen", path);
10828 		goto done;
10829 	}
10830 
10831 	err = histedit_parse_list(histedit_cmds, f, repo);
10832 done:
10833 	if (f && fclose(f) == EOF && err == NULL)
10834 		err = got_error_from_errno("fclose");
10835 	return err;
10836 }
10837 
10838 static const struct got_error *
10839 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10840     const struct got_error *edit_err, struct got_object_id_queue *commits,
10841     const char *path, const char *branch_name, struct got_repository *repo)
10842 {
10843 	const struct got_error *err = NULL, *prev_err = edit_err;
10844 	int resp = ' ';
10845 
10846 	while (resp != 'c' && resp != 'r' && resp != 'a') {
10847 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10848 		    "or (a)bort: ", getprogname(), prev_err->msg);
10849 		resp = getchar();
10850 		if (resp == '\n')
10851 			resp = getchar();
10852 		if (resp == 'c') {
10853 			histedit_free_list(histedit_cmds);
10854 			err = histedit_run_editor(histedit_cmds, path, commits,
10855 			    repo);
10856 			if (err) {
10857 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10858 				    err->code != GOT_ERR_HISTEDIT_CMD)
10859 					break;
10860 				prev_err = err;
10861 				resp = ' ';
10862 				continue;
10863 			}
10864 			break;
10865 		} else if (resp == 'r') {
10866 			histedit_free_list(histedit_cmds);
10867 			err = histedit_edit_script(histedit_cmds,
10868 			    commits, branch_name, 0, 0, 0, repo);
10869 			if (err) {
10870 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10871 				    err->code != GOT_ERR_HISTEDIT_CMD)
10872 					break;
10873 				prev_err = err;
10874 				resp = ' ';
10875 				continue;
10876 			}
10877 			break;
10878 		} else if (resp == 'a') {
10879 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10880 			break;
10881 		} else
10882 			printf("invalid response '%c'\n", resp);
10883 	}
10884 
10885 	return err;
10886 }
10887 
10888 static const struct got_error *
10889 histedit_complete(struct got_worktree *worktree,
10890     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10891     struct got_reference *branch, struct got_repository *repo)
10892 {
10893 	printf("Switching work tree to %s\n",
10894 	    got_ref_get_symref_target(branch));
10895 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10896 	    branch, repo);
10897 }
10898 
10899 static const struct got_error *
10900 show_histedit_progress(struct got_commit_object *commit,
10901     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10902 {
10903 	const struct got_error *err;
10904 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10905 
10906 	err = got_object_id_str(&old_id_str, hle->commit_id);
10907 	if (err)
10908 		goto done;
10909 
10910 	if (new_id) {
10911 		err = got_object_id_str(&new_id_str, new_id);
10912 		if (err)
10913 			goto done;
10914 	}
10915 
10916 	old_id_str[12] = '\0';
10917 	if (new_id_str)
10918 		new_id_str[12] = '\0';
10919 
10920 	if (hle->logmsg) {
10921 		logmsg = strdup(hle->logmsg);
10922 		if (logmsg == NULL) {
10923 			err = got_error_from_errno("strdup");
10924 			goto done;
10925 		}
10926 		trim_logmsg(logmsg, 42);
10927 	} else {
10928 		err = get_short_logmsg(&logmsg, 42, commit);
10929 		if (err)
10930 			goto done;
10931 	}
10932 
10933 	switch (hle->cmd->code) {
10934 	case GOT_HISTEDIT_PICK:
10935 	case GOT_HISTEDIT_EDIT:
10936 		printf("%s -> %s: %s\n", old_id_str,
10937 		    new_id_str ? new_id_str : "no-op change", logmsg);
10938 		break;
10939 	case GOT_HISTEDIT_DROP:
10940 	case GOT_HISTEDIT_FOLD:
10941 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
10942 		    logmsg);
10943 		break;
10944 	default:
10945 		break;
10946 	}
10947 done:
10948 	free(old_id_str);
10949 	free(new_id_str);
10950 	return err;
10951 }
10952 
10953 static const struct got_error *
10954 histedit_commit(struct got_pathlist_head *merged_paths,
10955     struct got_worktree *worktree, struct got_fileindex *fileindex,
10956     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10957     struct got_repository *repo)
10958 {
10959 	const struct got_error *err;
10960 	struct got_commit_object *commit;
10961 	struct got_object_id *new_commit_id;
10962 
10963 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10964 	    && hle->logmsg == NULL) {
10965 		err = histedit_edit_logmsg(hle, repo);
10966 		if (err)
10967 			return err;
10968 	}
10969 
10970 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10971 	if (err)
10972 		return err;
10973 
10974 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10975 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
10976 	    hle->logmsg, repo);
10977 	if (err) {
10978 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10979 			goto done;
10980 		err = show_histedit_progress(commit, hle, NULL);
10981 	} else {
10982 		err = show_histedit_progress(commit, hle, new_commit_id);
10983 		free(new_commit_id);
10984 	}
10985 done:
10986 	got_object_commit_close(commit);
10987 	return err;
10988 }
10989 
10990 static const struct got_error *
10991 histedit_skip_commit(struct got_histedit_list_entry *hle,
10992     struct got_worktree *worktree, struct got_repository *repo)
10993 {
10994 	const struct got_error *error;
10995 	struct got_commit_object *commit;
10996 
10997 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10998 	    repo);
10999 	if (error)
11000 		return error;
11001 
11002 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
11003 	if (error)
11004 		return error;
11005 
11006 	error = show_histedit_progress(commit, hle, NULL);
11007 	got_object_commit_close(commit);
11008 	return error;
11009 }
11010 
11011 static const struct got_error *
11012 check_local_changes(void *arg, unsigned char status,
11013     unsigned char staged_status, const char *path,
11014     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11015     struct got_object_id *commit_id, int dirfd, const char *de_name)
11016 {
11017 	int *have_local_changes = arg;
11018 
11019 	switch (status) {
11020 	case GOT_STATUS_ADD:
11021 	case GOT_STATUS_DELETE:
11022 	case GOT_STATUS_MODIFY:
11023 	case GOT_STATUS_CONFLICT:
11024 		*have_local_changes = 1;
11025 		return got_error(GOT_ERR_CANCELLED);
11026 	default:
11027 		break;
11028 	}
11029 
11030 	switch (staged_status) {
11031 	case GOT_STATUS_ADD:
11032 	case GOT_STATUS_DELETE:
11033 	case GOT_STATUS_MODIFY:
11034 		*have_local_changes = 1;
11035 		return got_error(GOT_ERR_CANCELLED);
11036 	default:
11037 		break;
11038 	}
11039 
11040 	return NULL;
11041 }
11042 
11043 static const struct got_error *
11044 cmd_histedit(int argc, char *argv[])
11045 {
11046 	const struct got_error *error = NULL;
11047 	struct got_worktree *worktree = NULL;
11048 	struct got_fileindex *fileindex = NULL;
11049 	struct got_repository *repo = NULL;
11050 	char *cwd = NULL;
11051 	struct got_reference *branch = NULL;
11052 	struct got_reference *tmp_branch = NULL;
11053 	struct got_object_id *resume_commit_id = NULL;
11054 	struct got_object_id *base_commit_id = NULL;
11055 	struct got_object_id *head_commit_id = NULL;
11056 	struct got_commit_object *commit = NULL;
11057 	int ch, rebase_in_progress = 0, merge_in_progress = 0;
11058 	struct got_update_progress_arg upa;
11059 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
11060 	int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
11061 	int list_backups = 0, delete_backups = 0;
11062 	const char *edit_script_path = NULL;
11063 	struct got_object_id_queue commits;
11064 	struct got_pathlist_head merged_paths;
11065 	const struct got_object_id_queue *parent_ids;
11066 	struct got_object_qid *pid;
11067 	struct got_histedit_list histedit_cmds;
11068 	struct got_histedit_list_entry *hle;
11069 	int *pack_fds = NULL;
11070 
11071 	STAILQ_INIT(&commits);
11072 	TAILQ_INIT(&histedit_cmds);
11073 	TAILQ_INIT(&merged_paths);
11074 	memset(&upa, 0, sizeof(upa));
11075 
11076 	while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
11077 		switch (ch) {
11078 		case 'a':
11079 			abort_edit = 1;
11080 			break;
11081 		case 'c':
11082 			continue_edit = 1;
11083 			break;
11084 		case 'e':
11085 			edit_only = 1;
11086 			break;
11087 		case 'f':
11088 			fold_only = 1;
11089 			break;
11090 		case 'F':
11091 			edit_script_path = optarg;
11092 			break;
11093 		case 'm':
11094 			edit_logmsg_only = 1;
11095 			break;
11096 		case 'l':
11097 			list_backups = 1;
11098 			break;
11099 		case 'X':
11100 			delete_backups = 1;
11101 			break;
11102 		default:
11103 			usage_histedit();
11104 			/* NOTREACHED */
11105 		}
11106 	}
11107 
11108 	argc -= optind;
11109 	argv += optind;
11110 
11111 #ifndef PROFILE
11112 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11113 	    "unveil", NULL) == -1)
11114 		err(1, "pledge");
11115 #endif
11116 	if (abort_edit && continue_edit)
11117 		option_conflict('a', 'c');
11118 	if (edit_script_path && edit_logmsg_only)
11119 		option_conflict('F', 'm');
11120 	if (abort_edit && edit_logmsg_only)
11121 		option_conflict('a', 'm');
11122 	if (continue_edit && edit_logmsg_only)
11123 		option_conflict('c', 'm');
11124 	if (abort_edit && fold_only)
11125 		option_conflict('a', 'f');
11126 	if (continue_edit && fold_only)
11127 		option_conflict('c', 'f');
11128 	if (fold_only && edit_logmsg_only)
11129 		option_conflict('f', 'm');
11130 	if (edit_script_path && fold_only)
11131 		option_conflict('F', 'f');
11132 	if (abort_edit && edit_only)
11133 		option_conflict('a', 'e');
11134 	if (continue_edit && edit_only)
11135 		option_conflict('c', 'e');
11136 	if (edit_only && edit_logmsg_only)
11137 		option_conflict('e', 'm');
11138 	if (edit_script_path && edit_only)
11139 		option_conflict('F', 'e');
11140 	if (list_backups) {
11141 		if (abort_edit)
11142 			option_conflict('l', 'a');
11143 		if (continue_edit)
11144 			option_conflict('l', 'c');
11145 		if (edit_script_path)
11146 			option_conflict('l', 'F');
11147 		if (edit_logmsg_only)
11148 			option_conflict('l', 'm');
11149 		if (fold_only)
11150 			option_conflict('l', 'f');
11151 		if (edit_only)
11152 			option_conflict('l', 'e');
11153 		if (delete_backups)
11154 			option_conflict('l', 'X');
11155 		if (argc != 0 && argc != 1)
11156 			usage_histedit();
11157 	} else if (delete_backups) {
11158 		if (abort_edit)
11159 			option_conflict('X', 'a');
11160 		if (continue_edit)
11161 			option_conflict('X', 'c');
11162 		if (edit_script_path)
11163 			option_conflict('X', 'F');
11164 		if (edit_logmsg_only)
11165 			option_conflict('X', 'm');
11166 		if (fold_only)
11167 			option_conflict('X', 'f');
11168 		if (edit_only)
11169 			option_conflict('X', 'e');
11170 		if (list_backups)
11171 			option_conflict('X', 'l');
11172 		if (argc != 0 && argc != 1)
11173 			usage_histedit();
11174 	} else if (argc != 0)
11175 		usage_histedit();
11176 
11177 	/*
11178 	 * This command cannot apply unveil(2) in all cases because the
11179 	 * user may choose to run an editor to edit the histedit script
11180 	 * and to edit individual commit log messages.
11181 	 * unveil(2) traverses exec(2); if an editor is used we have to
11182 	 * apply unveil after edit script and log messages have been written.
11183 	 * XXX TODO: Make use of unveil(2) where possible.
11184 	 */
11185 
11186 	cwd = getcwd(NULL, 0);
11187 	if (cwd == NULL) {
11188 		error = got_error_from_errno("getcwd");
11189 		goto done;
11190 	}
11191 
11192 	error = got_repo_pack_fds_open(&pack_fds);
11193 	if (error != NULL)
11194 		goto done;
11195 
11196 	error = got_worktree_open(&worktree, cwd);
11197 	if (error) {
11198 		if (list_backups || delete_backups) {
11199 			if (error->code != GOT_ERR_NOT_WORKTREE)
11200 				goto done;
11201 		} else {
11202 			if (error->code == GOT_ERR_NOT_WORKTREE)
11203 				error = wrap_not_worktree_error(error,
11204 				    "histedit", cwd);
11205 			goto done;
11206 		}
11207 	}
11208 
11209 	if (list_backups || delete_backups) {
11210 		error = got_repo_open(&repo,
11211 		    worktree ? got_worktree_get_repo_path(worktree) : cwd,
11212 		    NULL, pack_fds);
11213 		if (error != NULL)
11214 			goto done;
11215 		error = apply_unveil(got_repo_get_path(repo), 0,
11216 		    worktree ? got_worktree_get_root_path(worktree) : NULL);
11217 		if (error)
11218 			goto done;
11219 		error = process_backup_refs(
11220 		    GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
11221 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
11222 		goto done; /* nothing else to do */
11223 	}
11224 
11225 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11226 	    NULL, pack_fds);
11227 	if (error != NULL)
11228 		goto done;
11229 
11230 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11231 	if (error)
11232 		goto done;
11233 	if (rebase_in_progress) {
11234 		error = got_error(GOT_ERR_REBASING);
11235 		goto done;
11236 	}
11237 
11238 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11239 	    repo);
11240 	if (error)
11241 		goto done;
11242 	if (merge_in_progress) {
11243 		error = got_error(GOT_ERR_MERGE_BUSY);
11244 		goto done;
11245 	}
11246 
11247 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
11248 	if (error)
11249 		goto done;
11250 
11251 	if (edit_in_progress && edit_logmsg_only) {
11252 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11253 		    "histedit operation is in progress in this "
11254 		    "work tree and must be continued or aborted "
11255 		    "before the -m option can be used");
11256 		goto done;
11257 	}
11258 	if (edit_in_progress && fold_only) {
11259 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11260 		    "histedit operation is in progress in this "
11261 		    "work tree and must be continued or aborted "
11262 		    "before the -f option can be used");
11263 		goto done;
11264 	}
11265 	if (edit_in_progress && edit_only) {
11266 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11267 		    "histedit operation is in progress in this "
11268 		    "work tree and must be continued or aborted "
11269 		    "before the -e option can be used");
11270 		goto done;
11271 	}
11272 
11273 	if (edit_in_progress && abort_edit) {
11274 		error = got_worktree_histedit_continue(&resume_commit_id,
11275 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
11276 		    worktree, repo);
11277 		if (error)
11278 			goto done;
11279 		printf("Switching work tree to %s\n",
11280 		    got_ref_get_symref_target(branch));
11281 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
11282 		    branch, base_commit_id, abort_progress, &upa);
11283 		if (error)
11284 			goto done;
11285 		printf("Histedit of %s aborted\n",
11286 		    got_ref_get_symref_target(branch));
11287 		print_merge_progress_stats(&upa);
11288 		goto done; /* nothing else to do */
11289 	} else if (abort_edit) {
11290 		error = got_error(GOT_ERR_NOT_HISTEDIT);
11291 		goto done;
11292 	}
11293 
11294 	if (continue_edit) {
11295 		char *path;
11296 
11297 		if (!edit_in_progress) {
11298 			error = got_error(GOT_ERR_NOT_HISTEDIT);
11299 			goto done;
11300 		}
11301 
11302 		error = got_worktree_get_histedit_script_path(&path, worktree);
11303 		if (error)
11304 			goto done;
11305 
11306 		error = histedit_load_list(&histedit_cmds, path, repo);
11307 		free(path);
11308 		if (error)
11309 			goto done;
11310 
11311 		error = got_worktree_histedit_continue(&resume_commit_id,
11312 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
11313 		    worktree, repo);
11314 		if (error)
11315 			goto done;
11316 
11317 		error = got_ref_resolve(&head_commit_id, repo, branch);
11318 		if (error)
11319 			goto done;
11320 
11321 		error = got_object_open_as_commit(&commit, repo,
11322 		    head_commit_id);
11323 		if (error)
11324 			goto done;
11325 		parent_ids = got_object_commit_get_parent_ids(commit);
11326 		pid = STAILQ_FIRST(parent_ids);
11327 		if (pid == NULL) {
11328 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11329 			goto done;
11330 		}
11331 		error = collect_commits(&commits, head_commit_id, &pid->id,
11332 		    base_commit_id, got_worktree_get_path_prefix(worktree),
11333 		    GOT_ERR_HISTEDIT_PATH, repo);
11334 		got_object_commit_close(commit);
11335 		commit = NULL;
11336 		if (error)
11337 			goto done;
11338 	} else {
11339 		if (edit_in_progress) {
11340 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
11341 			goto done;
11342 		}
11343 
11344 		error = got_ref_open(&branch, repo,
11345 		    got_worktree_get_head_ref_name(worktree), 0);
11346 		if (error != NULL)
11347 			goto done;
11348 
11349 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11350 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11351 			    "will not edit commit history of a branch outside "
11352 			    "the \"refs/heads/\" reference namespace");
11353 			goto done;
11354 		}
11355 
11356 		error = got_ref_resolve(&head_commit_id, repo, branch);
11357 		got_ref_close(branch);
11358 		branch = NULL;
11359 		if (error)
11360 			goto done;
11361 
11362 		error = got_object_open_as_commit(&commit, repo,
11363 		    head_commit_id);
11364 		if (error)
11365 			goto done;
11366 		parent_ids = got_object_commit_get_parent_ids(commit);
11367 		pid = STAILQ_FIRST(parent_ids);
11368 		if (pid == NULL) {
11369 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11370 			goto done;
11371 		}
11372 		error = collect_commits(&commits, head_commit_id, &pid->id,
11373 		    got_worktree_get_base_commit_id(worktree),
11374 		    got_worktree_get_path_prefix(worktree),
11375 		    GOT_ERR_HISTEDIT_PATH, repo);
11376 		got_object_commit_close(commit);
11377 		commit = NULL;
11378 		if (error)
11379 			goto done;
11380 
11381 		if (STAILQ_EMPTY(&commits)) {
11382 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11383 			goto done;
11384 		}
11385 
11386 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
11387 		    &base_commit_id, &fileindex, worktree, repo);
11388 		if (error)
11389 			goto done;
11390 
11391 		if (edit_script_path) {
11392 			error = histedit_load_list(&histedit_cmds,
11393 			    edit_script_path, repo);
11394 			if (error) {
11395 				got_worktree_histedit_abort(worktree, fileindex,
11396 				    repo, branch, base_commit_id,
11397 				    abort_progress, &upa);
11398 				print_merge_progress_stats(&upa);
11399 				goto done;
11400 			}
11401 		} else {
11402 			const char *branch_name;
11403 			branch_name = got_ref_get_symref_target(branch);
11404 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
11405 				branch_name += 11;
11406 			error = histedit_edit_script(&histedit_cmds, &commits,
11407 			    branch_name, edit_logmsg_only, fold_only,
11408 			    edit_only, repo);
11409 			if (error) {
11410 				got_worktree_histedit_abort(worktree, fileindex,
11411 				    repo, branch, base_commit_id,
11412 				    abort_progress, &upa);
11413 				print_merge_progress_stats(&upa);
11414 				goto done;
11415 			}
11416 
11417 		}
11418 
11419 		error = histedit_save_list(&histedit_cmds, worktree,
11420 		    repo);
11421 		if (error) {
11422 			got_worktree_histedit_abort(worktree, fileindex,
11423 			    repo, branch, base_commit_id,
11424 			    abort_progress, &upa);
11425 			print_merge_progress_stats(&upa);
11426 			goto done;
11427 		}
11428 
11429 	}
11430 
11431 	error = histedit_check_script(&histedit_cmds, &commits, repo);
11432 	if (error)
11433 		goto done;
11434 
11435 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
11436 		if (resume_commit_id) {
11437 			if (got_object_id_cmp(hle->commit_id,
11438 			    resume_commit_id) != 0)
11439 				continue;
11440 
11441 			resume_commit_id = NULL;
11442 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
11443 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
11444 				error = histedit_skip_commit(hle, worktree,
11445 				    repo);
11446 				if (error)
11447 					goto done;
11448 			} else {
11449 				struct got_pathlist_head paths;
11450 				int have_changes = 0;
11451 
11452 				TAILQ_INIT(&paths);
11453 				error = got_pathlist_append(&paths, "", NULL);
11454 				if (error)
11455 					goto done;
11456 				error = got_worktree_status(worktree, &paths,
11457 				    repo, 0, check_local_changes, &have_changes,
11458 				    check_cancelled, NULL);
11459 				got_pathlist_free(&paths);
11460 				if (error) {
11461 					if (error->code != GOT_ERR_CANCELLED)
11462 						goto done;
11463 					if (sigint_received || sigpipe_received)
11464 						goto done;
11465 				}
11466 				if (have_changes) {
11467 					error = histedit_commit(NULL, worktree,
11468 					    fileindex, tmp_branch, hle, repo);
11469 					if (error)
11470 						goto done;
11471 				} else {
11472 					error = got_object_open_as_commit(
11473 					    &commit, repo, hle->commit_id);
11474 					if (error)
11475 						goto done;
11476 					error = show_histedit_progress(commit,
11477 					    hle, NULL);
11478 					got_object_commit_close(commit);
11479 					commit = NULL;
11480 					if (error)
11481 						goto done;
11482 				}
11483 			}
11484 			continue;
11485 		}
11486 
11487 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
11488 			error = histedit_skip_commit(hle, worktree, repo);
11489 			if (error)
11490 				goto done;
11491 			continue;
11492 		}
11493 
11494 		error = got_object_open_as_commit(&commit, repo,
11495 		    hle->commit_id);
11496 		if (error)
11497 			goto done;
11498 		parent_ids = got_object_commit_get_parent_ids(commit);
11499 		pid = STAILQ_FIRST(parent_ids);
11500 
11501 		error = got_worktree_histedit_merge_files(&merged_paths,
11502 		    worktree, fileindex, &pid->id, hle->commit_id, repo,
11503 		    update_progress, &upa, check_cancelled, NULL);
11504 		if (error)
11505 			goto done;
11506 		got_object_commit_close(commit);
11507 		commit = NULL;
11508 
11509 		print_merge_progress_stats(&upa);
11510 		if (upa.conflicts > 0 || upa.missing > 0 ||
11511 		    upa.not_deleted > 0 || upa.unversioned > 0) {
11512 			if (upa.conflicts > 0) {
11513 				error = show_rebase_merge_conflict(
11514 				    hle->commit_id, repo);
11515 				if (error)
11516 					goto done;
11517 			}
11518 			got_worktree_rebase_pathlist_free(&merged_paths);
11519 			break;
11520 		}
11521 
11522 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
11523 			char *id_str;
11524 			error = got_object_id_str(&id_str, hle->commit_id);
11525 			if (error)
11526 				goto done;
11527 			printf("Stopping histedit for amending commit %s\n",
11528 			    id_str);
11529 			free(id_str);
11530 			got_worktree_rebase_pathlist_free(&merged_paths);
11531 			error = got_worktree_histedit_postpone(worktree,
11532 			    fileindex);
11533 			goto done;
11534 		}
11535 
11536 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11537 			error = histedit_skip_commit(hle, worktree, repo);
11538 			if (error)
11539 				goto done;
11540 			continue;
11541 		}
11542 
11543 		error = histedit_commit(&merged_paths, worktree, fileindex,
11544 		    tmp_branch, hle, repo);
11545 		got_worktree_rebase_pathlist_free(&merged_paths);
11546 		if (error)
11547 			goto done;
11548 	}
11549 
11550 	if (upa.conflicts > 0 || upa.missing > 0 ||
11551 	    upa.not_deleted > 0 || upa.unversioned > 0) {
11552 		error = got_worktree_histedit_postpone(worktree, fileindex);
11553 		if (error)
11554 			goto done;
11555 		if (upa.conflicts > 0 && upa.missing == 0 &&
11556 		    upa.not_deleted == 0 && upa.unversioned == 0) {
11557 			error = got_error_msg(GOT_ERR_CONFLICTS,
11558 			    "conflicts must be resolved before histedit "
11559 			    "can continue");
11560 		} else if (upa.conflicts > 0) {
11561 			error = got_error_msg(GOT_ERR_CONFLICTS,
11562 			    "conflicts must be resolved before histedit "
11563 			    "can continue; changes destined for some "
11564 			    "files were not yet merged and should be "
11565 			    "merged manually if required before the "
11566 			    "histedit operation is continued");
11567 		} else {
11568 			error = got_error_msg(GOT_ERR_CONFLICTS,
11569 			    "changes destined for some files were not "
11570 			    "yet merged and should be merged manually "
11571 			    "if required before the histedit operation "
11572 			    "is continued");
11573 		}
11574 	} else
11575 		error = histedit_complete(worktree, fileindex, tmp_branch,
11576 		    branch, repo);
11577 done:
11578 	got_object_id_queue_free(&commits);
11579 	histedit_free_list(&histedit_cmds);
11580 	free(head_commit_id);
11581 	free(base_commit_id);
11582 	free(resume_commit_id);
11583 	if (commit)
11584 		got_object_commit_close(commit);
11585 	if (branch)
11586 		got_ref_close(branch);
11587 	if (tmp_branch)
11588 		got_ref_close(tmp_branch);
11589 	if (worktree)
11590 		got_worktree_close(worktree);
11591 	if (repo) {
11592 		const struct got_error *close_err = got_repo_close(repo);
11593 		if (error == NULL)
11594 			error = close_err;
11595 	}
11596 	if (pack_fds) {
11597 		const struct got_error *pack_err =
11598 		    got_repo_pack_fds_close(pack_fds);
11599 		if (error == NULL)
11600 			error = pack_err;
11601 	}
11602 	return error;
11603 }
11604 
11605 __dead static void
11606 usage_integrate(void)
11607 {
11608 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
11609 	exit(1);
11610 }
11611 
11612 static const struct got_error *
11613 cmd_integrate(int argc, char *argv[])
11614 {
11615 	const struct got_error *error = NULL;
11616 	struct got_repository *repo = NULL;
11617 	struct got_worktree *worktree = NULL;
11618 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
11619 	const char *branch_arg = NULL;
11620 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11621 	struct got_fileindex *fileindex = NULL;
11622 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11623 	int ch;
11624 	struct got_update_progress_arg upa;
11625 	int *pack_fds = NULL;
11626 
11627 	while ((ch = getopt(argc, argv, "")) != -1) {
11628 		switch (ch) {
11629 		default:
11630 			usage_integrate();
11631 			/* NOTREACHED */
11632 		}
11633 	}
11634 
11635 	argc -= optind;
11636 	argv += optind;
11637 
11638 	if (argc != 1)
11639 		usage_integrate();
11640 	branch_arg = argv[0];
11641 #ifndef PROFILE
11642 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11643 	    "unveil", NULL) == -1)
11644 		err(1, "pledge");
11645 #endif
11646 	cwd = getcwd(NULL, 0);
11647 	if (cwd == NULL) {
11648 		error = got_error_from_errno("getcwd");
11649 		goto done;
11650 	}
11651 
11652 	error = got_repo_pack_fds_open(&pack_fds);
11653 	if (error != NULL)
11654 		goto done;
11655 
11656 	error = got_worktree_open(&worktree, cwd);
11657 	if (error) {
11658 		if (error->code == GOT_ERR_NOT_WORKTREE)
11659 			error = wrap_not_worktree_error(error, "integrate",
11660 			    cwd);
11661 		goto done;
11662 	}
11663 
11664 	error = check_rebase_or_histedit_in_progress(worktree);
11665 	if (error)
11666 		goto done;
11667 
11668 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11669 	    NULL, pack_fds);
11670 	if (error != NULL)
11671 		goto done;
11672 
11673 	error = apply_unveil(got_repo_get_path(repo), 0,
11674 	    got_worktree_get_root_path(worktree));
11675 	if (error)
11676 		goto done;
11677 
11678 	error = check_merge_in_progress(worktree, repo);
11679 	if (error)
11680 		goto done;
11681 
11682 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11683 		error = got_error_from_errno("asprintf");
11684 		goto done;
11685 	}
11686 
11687 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11688 	    &base_branch_ref, worktree, refname, repo);
11689 	if (error)
11690 		goto done;
11691 
11692 	refname = strdup(got_ref_get_name(branch_ref));
11693 	if (refname == NULL) {
11694 		error = got_error_from_errno("strdup");
11695 		got_worktree_integrate_abort(worktree, fileindex, repo,
11696 		    branch_ref, base_branch_ref);
11697 		goto done;
11698 	}
11699 	base_refname = strdup(got_ref_get_name(base_branch_ref));
11700 	if (base_refname == NULL) {
11701 		error = got_error_from_errno("strdup");
11702 		got_worktree_integrate_abort(worktree, fileindex, repo,
11703 		    branch_ref, base_branch_ref);
11704 		goto done;
11705 	}
11706 
11707 	error = got_ref_resolve(&commit_id, repo, branch_ref);
11708 	if (error)
11709 		goto done;
11710 
11711 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11712 	if (error)
11713 		goto done;
11714 
11715 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11716 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
11717 		    "specified branch has already been integrated");
11718 		got_worktree_integrate_abort(worktree, fileindex, repo,
11719 		    branch_ref, base_branch_ref);
11720 		goto done;
11721 	}
11722 
11723 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11724 	if (error) {
11725 		if (error->code == GOT_ERR_ANCESTRY)
11726 			error = got_error(GOT_ERR_REBASE_REQUIRED);
11727 		got_worktree_integrate_abort(worktree, fileindex, repo,
11728 		    branch_ref, base_branch_ref);
11729 		goto done;
11730 	}
11731 
11732 	memset(&upa, 0, sizeof(upa));
11733 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
11734 	    branch_ref, base_branch_ref, update_progress, &upa,
11735 	    check_cancelled, NULL);
11736 	if (error)
11737 		goto done;
11738 
11739 	printf("Integrated %s into %s\n", refname, base_refname);
11740 	print_update_progress_stats(&upa);
11741 done:
11742 	if (repo) {
11743 		const struct got_error *close_err = got_repo_close(repo);
11744 		if (error == NULL)
11745 			error = close_err;
11746 	}
11747 	if (worktree)
11748 		got_worktree_close(worktree);
11749 	if (pack_fds) {
11750 		const struct got_error *pack_err =
11751 		    got_repo_pack_fds_close(pack_fds);
11752 		if (error == NULL)
11753 			error = pack_err;
11754 	}
11755 	free(cwd);
11756 	free(base_commit_id);
11757 	free(commit_id);
11758 	free(refname);
11759 	free(base_refname);
11760 	return error;
11761 }
11762 
11763 __dead static void
11764 usage_merge(void)
11765 {
11766 	fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11767 	    getprogname());
11768 	exit(1);
11769 }
11770 
11771 static const struct got_error *
11772 cmd_merge(int argc, char *argv[])
11773 {
11774 	const struct got_error *error = NULL;
11775 	struct got_worktree *worktree = NULL;
11776 	struct got_repository *repo = NULL;
11777 	struct got_fileindex *fileindex = NULL;
11778 	char *cwd = NULL, *id_str = NULL, *author = NULL;
11779 	struct got_reference *branch = NULL, *wt_branch = NULL;
11780 	struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11781 	struct got_object_id *wt_branch_tip = NULL;
11782 	int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11783 	int interrupt_merge = 0;
11784 	struct got_update_progress_arg upa;
11785 	struct got_object_id *merge_commit_id = NULL;
11786 	char *branch_name = NULL;
11787 	int *pack_fds = NULL;
11788 
11789 	memset(&upa, 0, sizeof(upa));
11790 
11791 	while ((ch = getopt(argc, argv, "acn")) != -1) {
11792 		switch (ch) {
11793 		case 'a':
11794 			abort_merge = 1;
11795 			break;
11796 		case 'c':
11797 			continue_merge = 1;
11798 			break;
11799 		case 'n':
11800 			interrupt_merge = 1;
11801 			break;
11802 		default:
11803 			usage_rebase();
11804 			/* NOTREACHED */
11805 		}
11806 	}
11807 
11808 	argc -= optind;
11809 	argv += optind;
11810 
11811 #ifndef PROFILE
11812 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11813 	    "unveil", NULL) == -1)
11814 		err(1, "pledge");
11815 #endif
11816 
11817 	if (abort_merge && continue_merge)
11818 		option_conflict('a', 'c');
11819 	if (abort_merge || continue_merge) {
11820 		if (argc != 0)
11821 			usage_merge();
11822 	} else if (argc != 1)
11823 		usage_merge();
11824 
11825 	cwd = getcwd(NULL, 0);
11826 	if (cwd == NULL) {
11827 		error = got_error_from_errno("getcwd");
11828 		goto done;
11829 	}
11830 
11831 	error = got_repo_pack_fds_open(&pack_fds);
11832 	if (error != NULL)
11833 		goto done;
11834 
11835 	error = got_worktree_open(&worktree, cwd);
11836 	if (error) {
11837 		if (error->code == GOT_ERR_NOT_WORKTREE)
11838 			error = wrap_not_worktree_error(error,
11839 			    "merge", cwd);
11840 		goto done;
11841 	}
11842 
11843 	error = got_repo_open(&repo,
11844 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
11845 	    pack_fds);
11846 	if (error != NULL)
11847 		goto done;
11848 
11849 	error = apply_unveil(got_repo_get_path(repo), 0,
11850 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
11851 	if (error)
11852 		goto done;
11853 
11854 	error = check_rebase_or_histedit_in_progress(worktree);
11855 	if (error)
11856 		goto done;
11857 
11858 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11859 	    repo);
11860 	if (error)
11861 		goto done;
11862 
11863 	if (abort_merge) {
11864 		if (!merge_in_progress) {
11865 			error = got_error(GOT_ERR_NOT_MERGING);
11866 			goto done;
11867 		}
11868 		error = got_worktree_merge_continue(&branch_name,
11869 		    &branch_tip, &fileindex, worktree, repo);
11870 		if (error)
11871 			goto done;
11872 		error = got_worktree_merge_abort(worktree, fileindex, repo,
11873 		    abort_progress, &upa);
11874 		if (error)
11875 			goto done;
11876 		printf("Merge of %s aborted\n", branch_name);
11877 		goto done; /* nothing else to do */
11878 	}
11879 
11880 	error = get_author(&author, repo, worktree);
11881 	if (error)
11882 		goto done;
11883 
11884 	if (continue_merge) {
11885 		if (!merge_in_progress) {
11886 			error = got_error(GOT_ERR_NOT_MERGING);
11887 			goto done;
11888 		}
11889 		error = got_worktree_merge_continue(&branch_name,
11890 		    &branch_tip, &fileindex, worktree, repo);
11891 		if (error)
11892 			goto done;
11893 	} else {
11894 		error = got_ref_open(&branch, repo, argv[0], 0);
11895 		if (error != NULL)
11896 			goto done;
11897 		branch_name = strdup(got_ref_get_name(branch));
11898 		if (branch_name == NULL) {
11899 			error = got_error_from_errno("strdup");
11900 			goto done;
11901 		}
11902 		error = got_ref_resolve(&branch_tip, repo, branch);
11903 		if (error)
11904 			goto done;
11905 	}
11906 
11907 	error = got_ref_open(&wt_branch, repo,
11908 	    got_worktree_get_head_ref_name(worktree), 0);
11909 	if (error)
11910 		goto done;
11911 	error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11912 	if (error)
11913 		goto done;
11914 	error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11915 	    wt_branch_tip, branch_tip, 0, repo,
11916 	    check_cancelled, NULL);
11917 	if (error && error->code != GOT_ERR_ANCESTRY)
11918 		goto done;
11919 
11920 	if (!continue_merge) {
11921 		error = check_path_prefix(wt_branch_tip, branch_tip,
11922 		    got_worktree_get_path_prefix(worktree),
11923 		    GOT_ERR_MERGE_PATH, repo);
11924 		if (error)
11925 			goto done;
11926 		if (yca_id) {
11927 			error = check_same_branch(wt_branch_tip, branch,
11928 			    yca_id, repo);
11929 			if (error) {
11930 				if (error->code != GOT_ERR_ANCESTRY)
11931 					goto done;
11932 				error = NULL;
11933 			} else {
11934 				static char msg[512];
11935 				snprintf(msg, sizeof(msg),
11936 				    "cannot create a merge commit because "
11937 				    "%s is based on %s; %s can be integrated "
11938 				    "with 'got integrate' instead", branch_name,
11939 				    got_worktree_get_head_ref_name(worktree),
11940 				    branch_name);
11941 				error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11942 				goto done;
11943 			}
11944 		}
11945 		error = got_worktree_merge_prepare(&fileindex, worktree,
11946 		    branch, repo);
11947 		if (error)
11948 			goto done;
11949 
11950 		error = got_worktree_merge_branch(worktree, fileindex,
11951 		    yca_id, branch_tip, repo, update_progress, &upa,
11952 		    check_cancelled, NULL);
11953 		if (error)
11954 			goto done;
11955 		print_merge_progress_stats(&upa);
11956 		if (!upa.did_something) {
11957 			error = got_worktree_merge_abort(worktree, fileindex,
11958 			    repo, abort_progress, &upa);
11959 			if (error)
11960 				goto done;
11961 			printf("Already up-to-date\n");
11962 			goto done;
11963 		}
11964 	}
11965 
11966 	if (interrupt_merge) {
11967 		error = got_worktree_merge_postpone(worktree, fileindex);
11968 		if (error)
11969 			goto done;
11970 		printf("Merge of %s interrupted on request\n", branch_name);
11971 	} else if (upa.conflicts > 0 || upa.missing > 0 ||
11972 	    upa.not_deleted > 0 || upa.unversioned > 0) {
11973 		error = got_worktree_merge_postpone(worktree, fileindex);
11974 		if (error)
11975 			goto done;
11976 		if (upa.conflicts > 0 && upa.missing == 0 &&
11977 		    upa.not_deleted == 0 && upa.unversioned == 0) {
11978 			error = got_error_msg(GOT_ERR_CONFLICTS,
11979 			    "conflicts must be resolved before merging "
11980 			    "can continue");
11981 		} else if (upa.conflicts > 0) {
11982 			error = got_error_msg(GOT_ERR_CONFLICTS,
11983 			    "conflicts must be resolved before merging "
11984 			    "can continue; changes destined for some "
11985 			    "files were not yet merged and "
11986 			    "should be merged manually if required before the "
11987 			    "merge operation is continued");
11988 		} else {
11989 			error = got_error_msg(GOT_ERR_CONFLICTS,
11990 			    "changes destined for some "
11991 			    "files were not yet merged and should be "
11992 			    "merged manually if required before the "
11993 			    "merge operation is continued");
11994 		}
11995 		goto done;
11996 	} else {
11997 		error = got_worktree_merge_commit(&merge_commit_id, worktree,
11998 		    fileindex, author, NULL, 1, branch_tip, branch_name,
11999 		    repo, continue_merge ? print_status : NULL, NULL);
12000 		if (error)
12001 			goto done;
12002 		error = got_worktree_merge_complete(worktree, fileindex, repo);
12003 		if (error)
12004 			goto done;
12005 		error = got_object_id_str(&id_str, merge_commit_id);
12006 		if (error)
12007 			goto done;
12008 		printf("Merged %s into %s: %s\n", branch_name,
12009 		    got_worktree_get_head_ref_name(worktree),
12010 		    id_str);
12011 
12012 	}
12013 done:
12014 	free(id_str);
12015 	free(merge_commit_id);
12016 	free(author);
12017 	free(branch_tip);
12018 	free(branch_name);
12019 	free(yca_id);
12020 	if (branch)
12021 		got_ref_close(branch);
12022 	if (wt_branch)
12023 		got_ref_close(wt_branch);
12024 	if (worktree)
12025 		got_worktree_close(worktree);
12026 	if (repo) {
12027 		const struct got_error *close_err = got_repo_close(repo);
12028 		if (error == NULL)
12029 			error = close_err;
12030 	}
12031 	if (pack_fds) {
12032 		const struct got_error *pack_err =
12033 		    got_repo_pack_fds_close(pack_fds);
12034 		if (error == NULL)
12035 			error = pack_err;
12036 	}
12037 	return error;
12038 }
12039 
12040 __dead static void
12041 usage_stage(void)
12042 {
12043 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
12044 	    "[-S] [file-path ...]\n",
12045 	    getprogname());
12046 	exit(1);
12047 }
12048 
12049 static const struct got_error *
12050 print_stage(void *arg, unsigned char status, unsigned char staged_status,
12051     const char *path, struct got_object_id *blob_id,
12052     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
12053     int dirfd, const char *de_name)
12054 {
12055 	const struct got_error *err = NULL;
12056 	char *id_str = NULL;
12057 
12058 	if (staged_status != GOT_STATUS_ADD &&
12059 	    staged_status != GOT_STATUS_MODIFY &&
12060 	    staged_status != GOT_STATUS_DELETE)
12061 		return NULL;
12062 
12063 	if (staged_status == GOT_STATUS_ADD ||
12064 	    staged_status == GOT_STATUS_MODIFY)
12065 		err = got_object_id_str(&id_str, staged_blob_id);
12066 	else
12067 		err = got_object_id_str(&id_str, blob_id);
12068 	if (err)
12069 		return err;
12070 
12071 	printf("%s %c %s\n", id_str, staged_status, path);
12072 	free(id_str);
12073 	return NULL;
12074 }
12075 
12076 static const struct got_error *
12077 cmd_stage(int argc, char *argv[])
12078 {
12079 	const struct got_error *error = NULL;
12080 	struct got_repository *repo = NULL;
12081 	struct got_worktree *worktree = NULL;
12082 	char *cwd = NULL;
12083 	struct got_pathlist_head paths;
12084 	struct got_pathlist_entry *pe;
12085 	int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
12086 	FILE *patch_script_file = NULL;
12087 	const char *patch_script_path = NULL;
12088 	struct choose_patch_arg cpa;
12089 	int *pack_fds = NULL;
12090 
12091 	TAILQ_INIT(&paths);
12092 
12093 	while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
12094 		switch (ch) {
12095 		case 'l':
12096 			list_stage = 1;
12097 			break;
12098 		case 'p':
12099 			pflag = 1;
12100 			break;
12101 		case 'F':
12102 			patch_script_path = optarg;
12103 			break;
12104 		case 'S':
12105 			allow_bad_symlinks = 1;
12106 			break;
12107 		default:
12108 			usage_stage();
12109 			/* NOTREACHED */
12110 		}
12111 	}
12112 
12113 	argc -= optind;
12114 	argv += optind;
12115 
12116 #ifndef PROFILE
12117 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12118 	    "unveil", NULL) == -1)
12119 		err(1, "pledge");
12120 #endif
12121 	if (list_stage && (pflag || patch_script_path))
12122 		errx(1, "-l option cannot be used with other options");
12123 	if (patch_script_path && !pflag)
12124 		errx(1, "-F option can only be used together with -p option");
12125 
12126 	cwd = getcwd(NULL, 0);
12127 	if (cwd == NULL) {
12128 		error = got_error_from_errno("getcwd");
12129 		goto done;
12130 	}
12131 
12132 	error = got_repo_pack_fds_open(&pack_fds);
12133 	if (error != NULL)
12134 		goto done;
12135 
12136 	error = got_worktree_open(&worktree, cwd);
12137 	if (error) {
12138 		if (error->code == GOT_ERR_NOT_WORKTREE)
12139 			error = wrap_not_worktree_error(error, "stage", cwd);
12140 		goto done;
12141 	}
12142 
12143 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12144 	    NULL, pack_fds);
12145 	if (error != NULL)
12146 		goto done;
12147 
12148 	if (patch_script_path) {
12149 		patch_script_file = fopen(patch_script_path, "re");
12150 		if (patch_script_file == NULL) {
12151 			error = got_error_from_errno2("fopen",
12152 			    patch_script_path);
12153 			goto done;
12154 		}
12155 	}
12156 	error = apply_unveil(got_repo_get_path(repo), 0,
12157 	    got_worktree_get_root_path(worktree));
12158 	if (error)
12159 		goto done;
12160 
12161 	error = check_merge_in_progress(worktree, repo);
12162 	if (error)
12163 		goto done;
12164 
12165 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12166 	if (error)
12167 		goto done;
12168 
12169 	if (list_stage)
12170 		error = got_worktree_status(worktree, &paths, repo, 0,
12171 		    print_stage, NULL, check_cancelled, NULL);
12172 	else {
12173 		cpa.patch_script_file = patch_script_file;
12174 		cpa.action = "stage";
12175 		error = got_worktree_stage(worktree, &paths,
12176 		    pflag ? NULL : print_status, NULL,
12177 		    pflag ? choose_patch : NULL, &cpa,
12178 		    allow_bad_symlinks, repo);
12179 	}
12180 done:
12181 	if (patch_script_file && fclose(patch_script_file) == EOF &&
12182 	    error == NULL)
12183 		error = got_error_from_errno2("fclose", patch_script_path);
12184 	if (repo) {
12185 		const struct got_error *close_err = got_repo_close(repo);
12186 		if (error == NULL)
12187 			error = close_err;
12188 	}
12189 	if (worktree)
12190 		got_worktree_close(worktree);
12191 	if (pack_fds) {
12192 		const struct got_error *pack_err =
12193 		    got_repo_pack_fds_close(pack_fds);
12194 		if (error == NULL)
12195 			error = pack_err;
12196 	}
12197 	TAILQ_FOREACH(pe, &paths, entry)
12198 		free((char *)pe->path);
12199 	got_pathlist_free(&paths);
12200 	free(cwd);
12201 	return error;
12202 }
12203 
12204 __dead static void
12205 usage_unstage(void)
12206 {
12207 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
12208 	    "[file-path ...]\n",
12209 	    getprogname());
12210 	exit(1);
12211 }
12212 
12213 
12214 static const struct got_error *
12215 cmd_unstage(int argc, char *argv[])
12216 {
12217 	const struct got_error *error = NULL;
12218 	struct got_repository *repo = NULL;
12219 	struct got_worktree *worktree = NULL;
12220 	char *cwd = NULL;
12221 	struct got_pathlist_head paths;
12222 	struct got_pathlist_entry *pe;
12223 	int ch, pflag = 0;
12224 	struct got_update_progress_arg upa;
12225 	FILE *patch_script_file = NULL;
12226 	const char *patch_script_path = NULL;
12227 	struct choose_patch_arg cpa;
12228 	int *pack_fds = NULL;
12229 
12230 	TAILQ_INIT(&paths);
12231 
12232 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
12233 		switch (ch) {
12234 		case 'p':
12235 			pflag = 1;
12236 			break;
12237 		case 'F':
12238 			patch_script_path = optarg;
12239 			break;
12240 		default:
12241 			usage_unstage();
12242 			/* NOTREACHED */
12243 		}
12244 	}
12245 
12246 	argc -= optind;
12247 	argv += optind;
12248 
12249 #ifndef PROFILE
12250 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12251 	    "unveil", NULL) == -1)
12252 		err(1, "pledge");
12253 #endif
12254 	if (patch_script_path && !pflag)
12255 		errx(1, "-F option can only be used together with -p option");
12256 
12257 	cwd = getcwd(NULL, 0);
12258 	if (cwd == NULL) {
12259 		error = got_error_from_errno("getcwd");
12260 		goto done;
12261 	}
12262 
12263 	error = got_repo_pack_fds_open(&pack_fds);
12264 	if (error != NULL)
12265 		goto done;
12266 
12267 	error = got_worktree_open(&worktree, cwd);
12268 	if (error) {
12269 		if (error->code == GOT_ERR_NOT_WORKTREE)
12270 			error = wrap_not_worktree_error(error, "unstage", cwd);
12271 		goto done;
12272 	}
12273 
12274 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12275 	    NULL, pack_fds);
12276 	if (error != NULL)
12277 		goto done;
12278 
12279 	if (patch_script_path) {
12280 		patch_script_file = fopen(patch_script_path, "re");
12281 		if (patch_script_file == NULL) {
12282 			error = got_error_from_errno2("fopen",
12283 			    patch_script_path);
12284 			goto done;
12285 		}
12286 	}
12287 
12288 	error = apply_unveil(got_repo_get_path(repo), 0,
12289 	    got_worktree_get_root_path(worktree));
12290 	if (error)
12291 		goto done;
12292 
12293 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12294 	if (error)
12295 		goto done;
12296 
12297 	cpa.patch_script_file = patch_script_file;
12298 	cpa.action = "unstage";
12299 	memset(&upa, 0, sizeof(upa));
12300 	error = got_worktree_unstage(worktree, &paths, update_progress,
12301 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
12302 	if (!error)
12303 		print_merge_progress_stats(&upa);
12304 done:
12305 	if (patch_script_file && fclose(patch_script_file) == EOF &&
12306 	    error == NULL)
12307 		error = got_error_from_errno2("fclose", patch_script_path);
12308 	if (repo) {
12309 		const struct got_error *close_err = got_repo_close(repo);
12310 		if (error == NULL)
12311 			error = close_err;
12312 	}
12313 	if (worktree)
12314 		got_worktree_close(worktree);
12315 	if (pack_fds) {
12316 		const struct got_error *pack_err =
12317 		    got_repo_pack_fds_close(pack_fds);
12318 		if (error == NULL)
12319 			error = pack_err;
12320 	}
12321 	TAILQ_FOREACH(pe, &paths, entry)
12322 		free((char *)pe->path);
12323 	got_pathlist_free(&paths);
12324 	free(cwd);
12325 	return error;
12326 }
12327 
12328 __dead static void
12329 usage_cat(void)
12330 {
12331 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
12332 	    "arg1 [arg2 ...]\n", getprogname());
12333 	exit(1);
12334 }
12335 
12336 static const struct got_error *
12337 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12338 {
12339 	const struct got_error *err;
12340 	struct got_blob_object *blob;
12341 	int fd = -1;
12342 
12343 	fd = got_opentempfd();
12344 	if (fd == -1)
12345 		return got_error_from_errno("got_opentempfd");
12346 
12347 	err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
12348 	if (err)
12349 		goto done;
12350 
12351 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
12352 done:
12353 	if (fd != -1 && close(fd) == -1 && err == NULL)
12354 		err = got_error_from_errno("close");
12355 	if (blob)
12356 		got_object_blob_close(blob);
12357 	return err;
12358 }
12359 
12360 static const struct got_error *
12361 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12362 {
12363 	const struct got_error *err;
12364 	struct got_tree_object *tree;
12365 	int nentries, i;
12366 
12367 	err = got_object_open_as_tree(&tree, repo, id);
12368 	if (err)
12369 		return err;
12370 
12371 	nentries = got_object_tree_get_nentries(tree);
12372 	for (i = 0; i < nentries; i++) {
12373 		struct got_tree_entry *te;
12374 		char *id_str;
12375 		if (sigint_received || sigpipe_received)
12376 			break;
12377 		te = got_object_tree_get_entry(tree, i);
12378 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
12379 		if (err)
12380 			break;
12381 		fprintf(outfile, "%s %.7o %s\n", id_str,
12382 		    got_tree_entry_get_mode(te),
12383 		    got_tree_entry_get_name(te));
12384 		free(id_str);
12385 	}
12386 
12387 	got_object_tree_close(tree);
12388 	return err;
12389 }
12390 
12391 static void
12392 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
12393 {
12394 	long long h, m;
12395 	char sign = '+';
12396 
12397 	if (gmtoff < 0) {
12398 		sign = '-';
12399 		gmtoff = -gmtoff;
12400 	}
12401 
12402 	h = (long long)gmtoff / 3600;
12403 	m = ((long long)gmtoff - h*3600) / 60;
12404 	snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
12405 }
12406 
12407 static const struct got_error *
12408 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12409 {
12410 	const struct got_error *err;
12411 	struct got_commit_object *commit;
12412 	const struct got_object_id_queue *parent_ids;
12413 	struct got_object_qid *pid;
12414 	char *id_str = NULL;
12415 	const char *logmsg = NULL;
12416 	char gmtoff[6];
12417 
12418 	err = got_object_open_as_commit(&commit, repo, id);
12419 	if (err)
12420 		return err;
12421 
12422 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
12423 	if (err)
12424 		goto done;
12425 
12426 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
12427 	parent_ids = got_object_commit_get_parent_ids(commit);
12428 	fprintf(outfile, "numparents %d\n",
12429 	    got_object_commit_get_nparents(commit));
12430 	STAILQ_FOREACH(pid, parent_ids, entry) {
12431 		char *pid_str;
12432 		err = got_object_id_str(&pid_str, &pid->id);
12433 		if (err)
12434 			goto done;
12435 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
12436 		free(pid_str);
12437 	}
12438 	format_gmtoff(gmtoff, sizeof(gmtoff),
12439 	    got_object_commit_get_author_gmtoff(commit));
12440 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
12441 	    got_object_commit_get_author(commit),
12442 	    (long long)got_object_commit_get_author_time(commit),
12443 	    gmtoff);
12444 
12445 	format_gmtoff(gmtoff, sizeof(gmtoff),
12446 	    got_object_commit_get_committer_gmtoff(commit));
12447 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
12448 	    got_object_commit_get_author(commit),
12449 	    (long long)got_object_commit_get_committer_time(commit),
12450 	    gmtoff);
12451 
12452 	logmsg = got_object_commit_get_logmsg_raw(commit);
12453 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
12454 	fprintf(outfile, "%s", logmsg);
12455 done:
12456 	free(id_str);
12457 	got_object_commit_close(commit);
12458 	return err;
12459 }
12460 
12461 static const struct got_error *
12462 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12463 {
12464 	const struct got_error *err;
12465 	struct got_tag_object *tag;
12466 	char *id_str = NULL;
12467 	const char *tagmsg = NULL;
12468 	char gmtoff[6];
12469 
12470 	err = got_object_open_as_tag(&tag, repo, id);
12471 	if (err)
12472 		return err;
12473 
12474 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
12475 	if (err)
12476 		goto done;
12477 
12478 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
12479 
12480 	switch (got_object_tag_get_object_type(tag)) {
12481 	case GOT_OBJ_TYPE_BLOB:
12482 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12483 		    GOT_OBJ_LABEL_BLOB);
12484 		break;
12485 	case GOT_OBJ_TYPE_TREE:
12486 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12487 		    GOT_OBJ_LABEL_TREE);
12488 		break;
12489 	case GOT_OBJ_TYPE_COMMIT:
12490 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12491 		    GOT_OBJ_LABEL_COMMIT);
12492 		break;
12493 	case GOT_OBJ_TYPE_TAG:
12494 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12495 		    GOT_OBJ_LABEL_TAG);
12496 		break;
12497 	default:
12498 		break;
12499 	}
12500 
12501 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
12502 	    got_object_tag_get_name(tag));
12503 
12504 	format_gmtoff(gmtoff, sizeof(gmtoff),
12505 	    got_object_tag_get_tagger_gmtoff(tag));
12506 	fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
12507 	    got_object_tag_get_tagger(tag),
12508 	    (long long)got_object_tag_get_tagger_time(tag),
12509 	    gmtoff);
12510 
12511 	tagmsg = got_object_tag_get_message(tag);
12512 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
12513 	fprintf(outfile, "%s", tagmsg);
12514 done:
12515 	free(id_str);
12516 	got_object_tag_close(tag);
12517 	return err;
12518 }
12519 
12520 static const struct got_error *
12521 cmd_cat(int argc, char *argv[])
12522 {
12523 	const struct got_error *error;
12524 	struct got_repository *repo = NULL;
12525 	struct got_worktree *worktree = NULL;
12526 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
12527 	const char *commit_id_str = NULL;
12528 	struct got_object_id *id = NULL, *commit_id = NULL;
12529 	struct got_commit_object *commit = NULL;
12530 	int ch, obj_type, i, force_path = 0;
12531 	struct got_reflist_head refs;
12532 	int *pack_fds = NULL;
12533 
12534 	TAILQ_INIT(&refs);
12535 
12536 #ifndef PROFILE
12537 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12538 	    NULL) == -1)
12539 		err(1, "pledge");
12540 #endif
12541 
12542 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
12543 		switch (ch) {
12544 		case 'c':
12545 			commit_id_str = optarg;
12546 			break;
12547 		case 'r':
12548 			repo_path = realpath(optarg, NULL);
12549 			if (repo_path == NULL)
12550 				return got_error_from_errno2("realpath",
12551 				    optarg);
12552 			got_path_strip_trailing_slashes(repo_path);
12553 			break;
12554 		case 'P':
12555 			force_path = 1;
12556 			break;
12557 		default:
12558 			usage_cat();
12559 			/* NOTREACHED */
12560 		}
12561 	}
12562 
12563 	argc -= optind;
12564 	argv += optind;
12565 
12566 	cwd = getcwd(NULL, 0);
12567 	if (cwd == NULL) {
12568 		error = got_error_from_errno("getcwd");
12569 		goto done;
12570 	}
12571 
12572 	error = got_repo_pack_fds_open(&pack_fds);
12573 	if (error != NULL)
12574 		goto done;
12575 
12576 	if (repo_path == NULL) {
12577 		error = got_worktree_open(&worktree, cwd);
12578 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
12579 			goto done;
12580 		if (worktree) {
12581 			repo_path = strdup(
12582 			    got_worktree_get_repo_path(worktree));
12583 			if (repo_path == NULL) {
12584 				error = got_error_from_errno("strdup");
12585 				goto done;
12586 			}
12587 
12588 			/* Release work tree lock. */
12589 			got_worktree_close(worktree);
12590 			worktree = NULL;
12591 		}
12592 	}
12593 
12594 	if (repo_path == NULL) {
12595 		repo_path = strdup(cwd);
12596 		if (repo_path == NULL)
12597 			return got_error_from_errno("strdup");
12598 	}
12599 
12600 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
12601 	free(repo_path);
12602 	if (error != NULL)
12603 		goto done;
12604 
12605 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
12606 	if (error)
12607 		goto done;
12608 
12609 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
12610 	if (error)
12611 		goto done;
12612 
12613 	if (commit_id_str == NULL)
12614 		commit_id_str = GOT_REF_HEAD;
12615 	error = got_repo_match_object_id(&commit_id, NULL,
12616 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
12617 	if (error)
12618 		goto done;
12619 
12620 	error = got_object_open_as_commit(&commit, repo, commit_id);
12621 	if (error)
12622 		goto done;
12623 
12624 	for (i = 0; i < argc; i++) {
12625 		if (force_path) {
12626 			error = got_object_id_by_path(&id, repo, commit,
12627 			    argv[i]);
12628 			if (error)
12629 				break;
12630 		} else {
12631 			error = got_repo_match_object_id(&id, &label, argv[i],
12632 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
12633 			    repo);
12634 			if (error) {
12635 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
12636 				    error->code != GOT_ERR_NOT_REF)
12637 					break;
12638 				error = got_object_id_by_path(&id, repo,
12639 				    commit, argv[i]);
12640 				if (error)
12641 					break;
12642 			}
12643 		}
12644 
12645 		error = got_object_get_type(&obj_type, repo, id);
12646 		if (error)
12647 			break;
12648 
12649 		switch (obj_type) {
12650 		case GOT_OBJ_TYPE_BLOB:
12651 			error = cat_blob(id, repo, stdout);
12652 			break;
12653 		case GOT_OBJ_TYPE_TREE:
12654 			error = cat_tree(id, repo, stdout);
12655 			break;
12656 		case GOT_OBJ_TYPE_COMMIT:
12657 			error = cat_commit(id, repo, stdout);
12658 			break;
12659 		case GOT_OBJ_TYPE_TAG:
12660 			error = cat_tag(id, repo, stdout);
12661 			break;
12662 		default:
12663 			error = got_error(GOT_ERR_OBJ_TYPE);
12664 			break;
12665 		}
12666 		if (error)
12667 			break;
12668 		free(label);
12669 		label = NULL;
12670 		free(id);
12671 		id = NULL;
12672 	}
12673 done:
12674 	free(label);
12675 	free(id);
12676 	free(commit_id);
12677 	if (commit)
12678 		got_object_commit_close(commit);
12679 	if (worktree)
12680 		got_worktree_close(worktree);
12681 	if (repo) {
12682 		const struct got_error *close_err = got_repo_close(repo);
12683 		if (error == NULL)
12684 			error = close_err;
12685 	}
12686 	if (pack_fds) {
12687 		const struct got_error *pack_err =
12688 		    got_repo_pack_fds_close(pack_fds);
12689 		if (error == NULL)
12690 			error = pack_err;
12691 	}
12692 
12693 	got_ref_list_free(&refs);
12694 	return error;
12695 }
12696 
12697 __dead static void
12698 usage_info(void)
12699 {
12700 	fprintf(stderr, "usage: %s info [path ...]\n",
12701 	    getprogname());
12702 	exit(1);
12703 }
12704 
12705 static const struct got_error *
12706 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12707     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12708     struct got_object_id *commit_id)
12709 {
12710 	const struct got_error *err = NULL;
12711 	char *id_str = NULL;
12712 	char datebuf[128];
12713 	struct tm mytm, *tm;
12714 	struct got_pathlist_head *paths = arg;
12715 	struct got_pathlist_entry *pe;
12716 
12717 	/*
12718 	 * Clear error indication from any of the path arguments which
12719 	 * would cause this file index entry to be displayed.
12720 	 */
12721 	TAILQ_FOREACH(pe, paths, entry) {
12722 		if (got_path_cmp(path, pe->path, strlen(path),
12723 		    pe->path_len) == 0 ||
12724 		    got_path_is_child(path, pe->path, pe->path_len))
12725 			pe->data = NULL; /* no error */
12726 	}
12727 
12728 	printf(GOT_COMMIT_SEP_STR);
12729 	if (S_ISLNK(mode))
12730 		printf("symlink: %s\n", path);
12731 	else if (S_ISREG(mode)) {
12732 		printf("file: %s\n", path);
12733 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12734 	} else if (S_ISDIR(mode))
12735 		printf("directory: %s\n", path);
12736 	else
12737 		printf("something: %s\n", path);
12738 
12739 	tm = localtime_r(&mtime, &mytm);
12740 	if (tm == NULL)
12741 		return NULL;
12742 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12743 		return got_error(GOT_ERR_NO_SPACE);
12744 	printf("timestamp: %s\n", datebuf);
12745 
12746 	if (blob_id) {
12747 		err = got_object_id_str(&id_str, blob_id);
12748 		if (err)
12749 			return err;
12750 		printf("based on blob: %s\n", id_str);
12751 		free(id_str);
12752 	}
12753 
12754 	if (staged_blob_id) {
12755 		err = got_object_id_str(&id_str, staged_blob_id);
12756 		if (err)
12757 			return err;
12758 		printf("based on staged blob: %s\n", id_str);
12759 		free(id_str);
12760 	}
12761 
12762 	if (commit_id) {
12763 		err = got_object_id_str(&id_str, commit_id);
12764 		if (err)
12765 			return err;
12766 		printf("based on commit: %s\n", id_str);
12767 		free(id_str);
12768 	}
12769 
12770 	return NULL;
12771 }
12772 
12773 static const struct got_error *
12774 cmd_info(int argc, char *argv[])
12775 {
12776 	const struct got_error *error = NULL;
12777 	struct got_worktree *worktree = NULL;
12778 	char *cwd = NULL, *id_str = NULL;
12779 	struct got_pathlist_head paths;
12780 	struct got_pathlist_entry *pe;
12781 	char *uuidstr = NULL;
12782 	int ch, show_files = 0;
12783 	int *pack_fds = NULL;
12784 
12785 	TAILQ_INIT(&paths);
12786 
12787 	while ((ch = getopt(argc, argv, "")) != -1) {
12788 		switch (ch) {
12789 		default:
12790 			usage_info();
12791 			/* NOTREACHED */
12792 		}
12793 	}
12794 
12795 	argc -= optind;
12796 	argv += optind;
12797 
12798 #ifndef PROFILE
12799 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12800 	    NULL) == -1)
12801 		err(1, "pledge");
12802 #endif
12803 	cwd = getcwd(NULL, 0);
12804 	if (cwd == NULL) {
12805 		error = got_error_from_errno("getcwd");
12806 		goto done;
12807 	}
12808 
12809 	error = got_repo_pack_fds_open(&pack_fds);
12810 	if (error != NULL)
12811 		goto done;
12812 
12813 	error = got_worktree_open(&worktree, cwd);
12814 	if (error) {
12815 		if (error->code == GOT_ERR_NOT_WORKTREE)
12816 			error = wrap_not_worktree_error(error, "info", cwd);
12817 		goto done;
12818 	}
12819 
12820 #ifndef PROFILE
12821 	/* Remove "cpath" promise. */
12822 	if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
12823 	    NULL) == -1)
12824 		err(1, "pledge");
12825 #endif
12826 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
12827 	if (error)
12828 		goto done;
12829 
12830 	if (argc >= 1) {
12831 		error = get_worktree_paths_from_argv(&paths, argc, argv,
12832 		    worktree);
12833 		if (error)
12834 			goto done;
12835 		show_files = 1;
12836 	}
12837 
12838 	error = got_object_id_str(&id_str,
12839 	    got_worktree_get_base_commit_id(worktree));
12840 	if (error)
12841 		goto done;
12842 
12843 	error = got_worktree_get_uuid(&uuidstr, worktree);
12844 	if (error)
12845 		goto done;
12846 
12847 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12848 	printf("work tree base commit: %s\n", id_str);
12849 	printf("work tree path prefix: %s\n",
12850 	    got_worktree_get_path_prefix(worktree));
12851 	printf("work tree branch reference: %s\n",
12852 	    got_worktree_get_head_ref_name(worktree));
12853 	printf("work tree UUID: %s\n", uuidstr);
12854 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12855 
12856 	if (show_files) {
12857 		struct got_pathlist_entry *pe;
12858 		TAILQ_FOREACH(pe, &paths, entry) {
12859 			if (pe->path_len == 0)
12860 				continue;
12861 			/*
12862 			 * Assume this path will fail. This will be corrected
12863 			 * in print_path_info() in case the path does suceeed.
12864 			 */
12865 			pe->data = (void *)got_error_path(pe->path,
12866 			    GOT_ERR_BAD_PATH);
12867 		}
12868 		error = got_worktree_path_info(worktree, &paths,
12869 		    print_path_info, &paths, check_cancelled, NULL);
12870 		if (error)
12871 			goto done;
12872 		TAILQ_FOREACH(pe, &paths, entry) {
12873 			if (pe->data != NULL) {
12874 				error = pe->data; /* bad path */
12875 				break;
12876 			}
12877 		}
12878 	}
12879 done:
12880 	if (pack_fds) {
12881 		const struct got_error *pack_err =
12882 		    got_repo_pack_fds_close(pack_fds);
12883 		if (error == NULL)
12884 			error = pack_err;
12885 	}
12886 	TAILQ_FOREACH(pe, &paths, entry)
12887 		free((char *)pe->path);
12888 	got_pathlist_free(&paths);
12889 	free(cwd);
12890 	free(id_str);
12891 	free(uuidstr);
12892 	return error;
12893 }