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