1 /*
2  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3  * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4  *
5  * Permission to use, copy, modify, and distribute this software for any
6  * purpose with or without fee is hereby granted, provided that the above
7  * copyright notice and this permission notice appear in all copies.
8  *
9  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16  */
17 
18 #include <sys/queue.h>
19 #include <sys/types.h>
20 #include <sys/stat.h>
21 #include <sys/param.h>
22 #include <sys/wait.h>
23 
24 #include <err.h>
25 #include <errno.h>
26 #include <fcntl.h>
27 #include <limits.h>
28 #include <locale.h>
29 #include <ctype.h>
30 #include <signal.h>
31 #include <stdio.h>
32 #include <stdlib.h>
33 #include <string.h>
34 #include <unistd.h>
35 #include <libgen.h>
36 #include <time.h>
37 #include <paths.h>
38 #include <regex.h>
39 #include <getopt.h>
40 
41 #include "got_version.h"
42 #include "got_error.h"
43 #include "got_object.h"
44 #include "got_reference.h"
45 #include "got_repository.h"
46 #include "got_path.h"
47 #include "got_cancel.h"
48 #include "got_worktree.h"
49 #include "got_diff.h"
50 #include "got_commit_graph.h"
51 #include "got_blame.h"
52 #include "got_privsep.h"
53 #include "got_opentemp.h"
54 
55 #ifndef nitems
56 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
57 #endif
58 
59 static volatile sig_atomic_t sigint_received;
60 static volatile sig_atomic_t sigpipe_received;
61 
62 static void
63 catch_sigint(int signo)
64 {
65 	sigint_received = 1;
66 }
67 
68 static void
69 catch_sigpipe(int signo)
70 {
71 	sigpipe_received = 1;
72 }
73 
74 
75 struct got_cmd {
76 	const char	 *cmd_name;
77 	const struct got_error *(*cmd_main)(int, char *[]);
78 	void		(*cmd_usage)(void);
79 	const char	*cmd_alias;
80 };
81 
82 __dead static void	usage(int);
83 __dead static void	usage_init(void);
84 __dead static void	usage_import(void);
85 __dead static void	usage_checkout(void);
86 __dead static void	usage_update(void);
87 __dead static void	usage_log(void);
88 __dead static void	usage_diff(void);
89 __dead static void	usage_blame(void);
90 __dead static void	usage_tree(void);
91 __dead static void	usage_status(void);
92 __dead static void	usage_ref(void);
93 __dead static void	usage_branch(void);
94 __dead static void	usage_tag(void);
95 __dead static void	usage_add(void);
96 __dead static void	usage_remove(void);
97 __dead static void	usage_revert(void);
98 __dead static void	usage_commit(void);
99 __dead static void	usage_cherrypick(void);
100 __dead static void	usage_backout(void);
101 __dead static void	usage_rebase(void);
102 __dead static void	usage_histedit(void);
103 __dead static void	usage_integrate(void);
104 __dead static void	usage_stage(void);
105 __dead static void	usage_unstage(void);
106 __dead static void	usage_cat(void);
107 
108 static const struct got_error*		cmd_init(int, char *[]);
109 static const struct got_error*		cmd_import(int, char *[]);
110 static const struct got_error*		cmd_checkout(int, char *[]);
111 static const struct got_error*		cmd_update(int, char *[]);
112 static const struct got_error*		cmd_log(int, char *[]);
113 static const struct got_error*		cmd_diff(int, char *[]);
114 static const struct got_error*		cmd_blame(int, char *[]);
115 static const struct got_error*		cmd_tree(int, char *[]);
116 static const struct got_error*		cmd_status(int, char *[]);
117 static const struct got_error*		cmd_ref(int, char *[]);
118 static const struct got_error*		cmd_branch(int, char *[]);
119 static const struct got_error*		cmd_tag(int, char *[]);
120 static const struct got_error*		cmd_add(int, char *[]);
121 static const struct got_error*		cmd_remove(int, char *[]);
122 static const struct got_error*		cmd_revert(int, char *[]);
123 static const struct got_error*		cmd_commit(int, char *[]);
124 static const struct got_error*		cmd_cherrypick(int, char *[]);
125 static const struct got_error*		cmd_backout(int, char *[]);
126 static const struct got_error*		cmd_rebase(int, char *[]);
127 static const struct got_error*		cmd_histedit(int, char *[]);
128 static const struct got_error*		cmd_integrate(int, char *[]);
129 static const struct got_error*		cmd_stage(int, char *[]);
130 static const struct got_error*		cmd_unstage(int, char *[]);
131 static const struct got_error*		cmd_cat(int, char *[]);
132 
133 static struct got_cmd got_commands[] = {
134 	{ "init",	cmd_init,	usage_init,	"in" },
135 	{ "import",	cmd_import,	usage_import,	"im" },
136 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
137 	{ "update",	cmd_update,	usage_update,	"up" },
138 	{ "log",	cmd_log,	usage_log,	"" },
139 	{ "diff",	cmd_diff,	usage_diff,	"di" },
140 	{ "blame",	cmd_blame,	usage_blame,	"bl" },
141 	{ "tree",	cmd_tree,	usage_tree,	"tr" },
142 	{ "status",	cmd_status,	usage_status,	"st" },
143 	{ "ref",	cmd_ref,	usage_ref,	"" },
144 	{ "branch",	cmd_branch,	usage_branch,	"br" },
145 	{ "tag",	cmd_tag,	usage_tag,	"" },
146 	{ "add",	cmd_add,	usage_add,	"" },
147 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
148 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
149 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
150 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
151 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
152 	{ "rebase",	cmd_rebase,	usage_rebase,	"rb" },
153 	{ "histedit",	cmd_histedit,	usage_histedit,	"he" },
154 	{ "integrate",  cmd_integrate,  usage_integrate,"ig" },
155 	{ "stage",	cmd_stage,	usage_stage,	"sg" },
156 	{ "unstage",	cmd_unstage,	usage_unstage,	"ug" },
157 	{ "cat",	cmd_cat,	usage_cat,	"" },
158 };
159 
160 static void
161 list_commands(void)
162 {
163 	int i;
164 
165 	fprintf(stderr, "commands:");
166 	for (i = 0; i < nitems(got_commands); i++) {
167 		struct got_cmd *cmd = &got_commands[i];
168 		fprintf(stderr, " %s", cmd->cmd_name);
169 	}
170 	fputc('\n', stderr);
171 }
172 
173 int
174 main(int argc, char *argv[])
175 {
176 	struct got_cmd *cmd;
177 	unsigned int i;
178 	int ch;
179 	int hflag = 0, Vflag = 0;
180 	static struct option longopts[] = {
181 	     { "version", no_argument, NULL, 'V' },
182 	     { NULL, 0, NULL, 0}
183 	};
184 
185 	setlocale(LC_CTYPE, "");
186 
187 	while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
188 		switch (ch) {
189 		case 'h':
190 			hflag = 1;
191 			break;
192 		case 'V':
193 			Vflag = 1;
194 			break;
195 		default:
196 			usage(hflag);
197 			/* NOTREACHED */
198 		}
199 	}
200 
201 	argc -= optind;
202 	argv += optind;
203 	optind = 0;
204 
205 	if (Vflag) {
206 		got_version_print_str();
207 		return 1;
208 	}
209 
210 	if (argc <= 0)
211 		usage(hflag);
212 
213 	signal(SIGINT, catch_sigint);
214 	signal(SIGPIPE, catch_sigpipe);
215 
216 	for (i = 0; i < nitems(got_commands); i++) {
217 		const struct got_error *error;
218 
219 		cmd = &got_commands[i];
220 
221 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
222 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
223 			continue;
224 
225 		if (hflag)
226 			got_commands[i].cmd_usage();
227 
228 		error = got_commands[i].cmd_main(argc, argv);
229 		if (error && error->code != GOT_ERR_CANCELLED &&
230 		    error->code != GOT_ERR_PRIVSEP_EXIT &&
231 		    !(sigpipe_received &&
232 		      error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
233 		    !(sigint_received &&
234 		      error->code == GOT_ERR_ERRNO && errno == EINTR)) {
235 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
236 			return 1;
237 		}
238 
239 		return 0;
240 	}
241 
242 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
243 	list_commands();
244 	return 1;
245 }
246 
247 __dead static void
248 usage(int hflag)
249 {
250 	fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
251 	    getprogname());
252 	if (hflag)
253 		list_commands();
254 	exit(1);
255 }
256 
257 static const struct got_error *
258 get_editor(char **abspath)
259 {
260 	const struct got_error *err = NULL;
261 	const char *editor;
262 
263 	*abspath = NULL;
264 
265 	editor = getenv("VISUAL");
266 	if (editor == NULL)
267 		editor = getenv("EDITOR");
268 
269 	if (editor) {
270 		err = got_path_find_prog(abspath, editor);
271 		if (err)
272 			return err;
273 	}
274 
275 	if (*abspath == NULL) {
276 		*abspath = strdup("/bin/ed");
277 		if (*abspath == NULL)
278 			return got_error_from_errno("strdup");
279 	}
280 
281 	return NULL;
282 }
283 
284 static const struct got_error *
285 apply_unveil(const char *repo_path, int repo_read_only,
286     const char *worktree_path)
287 {
288 	const struct got_error *err;
289 
290 #ifdef PROFILE
291 	if (unveil("gmon.out", "rwc") != 0)
292 		return got_error_from_errno2("unveil", "gmon.out");
293 #endif
294 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
295 		return got_error_from_errno2("unveil", repo_path);
296 
297 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
298 		return got_error_from_errno2("unveil", worktree_path);
299 
300 	if (unveil("/tmp", "rwc") != 0)
301 		return got_error_from_errno2("unveil", "/tmp");
302 
303 	err = got_privsep_unveil_exec_helpers();
304 	if (err != NULL)
305 		return err;
306 
307 	if (unveil(NULL, NULL) != 0)
308 		return got_error_from_errno("unveil");
309 
310 	return NULL;
311 }
312 
313 __dead static void
314 usage_init(void)
315 {
316 	fprintf(stderr, "usage: %s init repository-path\n", getprogname());
317 	exit(1);
318 }
319 
320 static const struct got_error *
321 cmd_init(int argc, char *argv[])
322 {
323 	const struct got_error *error = NULL;
324 	char *repo_path = NULL;
325 	int ch;
326 
327 	while ((ch = getopt(argc, argv, "")) != -1) {
328 		switch (ch) {
329 		default:
330 			usage_init();
331 			/* NOTREACHED */
332 		}
333 	}
334 
335 	argc -= optind;
336 	argv += optind;
337 
338 #ifndef PROFILE
339 	if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
340 		err(1, "pledge");
341 #endif
342 	if (argc != 1)
343 		usage_init();
344 
345 	repo_path = strdup(argv[0]);
346 	if (repo_path == NULL)
347 		return got_error_from_errno("strdup");
348 
349 	got_path_strip_trailing_slashes(repo_path);
350 
351 	error = got_path_mkdir(repo_path);
352 	if (error &&
353 	    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
354 		goto done;
355 
356 	error = apply_unveil(repo_path, 0, NULL);
357 	if (error)
358 		goto done;
359 
360 	error = got_repo_init(repo_path);
361 done:
362 	free(repo_path);
363 	return error;
364 }
365 
366 __dead static void
367 usage_import(void)
368 {
369 	fprintf(stderr, "usage: %s import [-b branch] [-m message] "
370 	    "[-r repository-path] [-I pattern] path\n", getprogname());
371 	exit(1);
372 }
373 
374 int
375 spawn_editor(const char *editor, const char *file)
376 {
377 	pid_t pid;
378 	sig_t sighup, sigint, sigquit;
379 	int st = -1;
380 
381 	sighup = signal(SIGHUP, SIG_IGN);
382 	sigint = signal(SIGINT, SIG_IGN);
383 	sigquit = signal(SIGQUIT, SIG_IGN);
384 
385 	switch (pid = fork()) {
386 	case -1:
387 		goto doneediting;
388 	case 0:
389 		execl(editor, editor, file, (char *)NULL);
390 		_exit(127);
391 	}
392 
393 	while (waitpid(pid, &st, 0) == -1)
394 		if (errno != EINTR)
395 			break;
396 
397 doneediting:
398 	(void)signal(SIGHUP, sighup);
399 	(void)signal(SIGINT, sigint);
400 	(void)signal(SIGQUIT, sigquit);
401 
402 	if (!WIFEXITED(st)) {
403 		errno = EINTR;
404 		return -1;
405 	}
406 
407 	return WEXITSTATUS(st);
408 }
409 
410 static const struct got_error *
411 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
412     const char *initial_content)
413 {
414 	const struct got_error *err = NULL;
415 	char buf[1024];
416 	struct stat st, st2;
417 	FILE *fp;
418 	int content_changed = 0;
419 	size_t len;
420 
421 	*logmsg = NULL;
422 
423 	if (stat(logmsg_path, &st) == -1)
424 		return got_error_from_errno2("stat", logmsg_path);
425 
426 	if (spawn_editor(editor, logmsg_path) == -1)
427 		return got_error_from_errno("failed spawning editor");
428 
429 	if (stat(logmsg_path, &st2) == -1)
430 		return got_error_from_errno("stat");
431 
432 	if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
433 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
434 		    "no changes made to commit message, aborting");
435 
436 	*logmsg = malloc(st2.st_size + 1);
437 	if (*logmsg == NULL)
438 		return got_error_from_errno("malloc");
439 	(*logmsg)[0] = '\0';
440 	len = 0;
441 
442 	fp = fopen(logmsg_path, "r");
443 	if (fp == NULL) {
444 		err = got_error_from_errno("fopen");
445 		goto done;
446 	}
447 	while (fgets(buf, sizeof(buf), fp) != NULL) {
448 		if (!content_changed && strcmp(buf, initial_content) != 0)
449 			content_changed = 1;
450 		if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
451 			continue; /* remove comments and leading empty lines */
452 		len = strlcat(*logmsg, buf, st2.st_size);
453 	}
454 	fclose(fp);
455 
456 	while (len > 0 && (*logmsg)[len - 1] == '\n') {
457 		(*logmsg)[len - 1] = '\0';
458 		len--;
459 	}
460 
461 	if (len == 0 || !content_changed)
462 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
463 		    "commit message cannot be empty, aborting");
464 done:
465 	if (err) {
466 		free(*logmsg);
467 		*logmsg = NULL;
468 	}
469 	return err;
470 }
471 
472 static const struct got_error *
473 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
474     const char *path_dir, const char *branch_name)
475 {
476 	char *initial_content = NULL;
477 	const struct got_error *err = NULL;
478 	int fd;
479 
480 	if (asprintf(&initial_content,
481 	    "\n# %s to be imported to branch %s\n", path_dir,
482 	    branch_name) == -1)
483 		return got_error_from_errno("asprintf");
484 
485 	err = got_opentemp_named_fd(logmsg_path, &fd, "/tmp/got-importmsg");
486 	if (err)
487 		goto done;
488 
489 	dprintf(fd, initial_content);
490 	close(fd);
491 
492 	err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
493 done:
494 	free(initial_content);
495 	return err;
496 }
497 
498 static const struct got_error *
499 import_progress(void *arg, const char *path)
500 {
501 	printf("A  %s\n", path);
502 	return NULL;
503 }
504 
505 static const struct got_error *
506 get_author(char **author, struct got_repository *repo)
507 {
508 	const struct got_error *err = NULL;
509 	const char *got_author, *name, *email;
510 
511 	*author = NULL;
512 
513 	name = got_repo_get_gitconfig_author_name(repo);
514 	email = got_repo_get_gitconfig_author_email(repo);
515 	if (name && email) {
516 		if (asprintf(author, "%s <%s>", name, email) == -1)
517 			return got_error_from_errno("asprintf");
518 		return NULL;
519 	}
520 
521 	got_author = getenv("GOT_AUTHOR");
522 	if (got_author == NULL) {
523 		name = got_repo_get_global_gitconfig_author_name(repo);
524 		email = got_repo_get_global_gitconfig_author_email(repo);
525 		if (name && email) {
526 			if (asprintf(author, "%s <%s>", name, email) == -1)
527 				return got_error_from_errno("asprintf");
528 			return NULL;
529 		}
530 		/* TODO: Look up user in password database? */
531 		return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
532 	}
533 
534 	*author = strdup(got_author);
535 	if (*author == NULL)
536 		return got_error_from_errno("strdup");
537 
538 	/*
539 	 * Really dumb email address check; we're only doing this to
540 	 * avoid git's object parser breaking on commits we create.
541 	 */
542 	while (*got_author && *got_author != '<')
543 		got_author++;
544 	if (*got_author != '<') {
545 		err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
546 		goto done;
547 	}
548 	while (*got_author && *got_author != '@')
549 		got_author++;
550 	if (*got_author != '@') {
551 		err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
552 		goto done;
553 	}
554 	while (*got_author && *got_author != '>')
555 		got_author++;
556 	if (*got_author != '>')
557 		err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
558 done:
559 	if (err) {
560 		free(*author);
561 		*author = NULL;
562 	}
563 	return err;
564 }
565 
566 static const struct got_error *
567 get_gitconfig_path(char **gitconfig_path)
568 {
569 	const char *homedir = getenv("HOME");
570 
571 	*gitconfig_path = NULL;
572 	if (homedir) {
573 		if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
574 			return got_error_from_errno("asprintf");
575 
576 	}
577 	return NULL;
578 }
579 
580 static const struct got_error *
581 cmd_import(int argc, char *argv[])
582 {
583 	const struct got_error *error = NULL;
584 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
585 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
586 	const char *branch_name = "main";
587 	char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
588 	struct got_repository *repo = NULL;
589 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
590 	struct got_object_id *new_commit_id = NULL;
591 	int ch;
592 	struct got_pathlist_head ignores;
593 	struct got_pathlist_entry *pe;
594 	int preserve_logmsg = 0;
595 
596 	TAILQ_INIT(&ignores);
597 
598 	while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
599 		switch (ch) {
600 		case 'b':
601 			branch_name = optarg;
602 			break;
603 		case 'm':
604 			logmsg = strdup(optarg);
605 			if (logmsg == NULL) {
606 				error = got_error_from_errno("strdup");
607 				goto done;
608 			}
609 			break;
610 		case 'r':
611 			repo_path = realpath(optarg, NULL);
612 			if (repo_path == NULL) {
613 				error = got_error_from_errno2("realpath",
614 				    optarg);
615 				goto done;
616 			}
617 			break;
618 		case 'I':
619 			if (optarg[0] == '\0')
620 				break;
621 			error = got_pathlist_insert(&pe, &ignores, optarg,
622 			    NULL);
623 			if (error)
624 				goto done;
625 			break;
626 		default:
627 			usage_import();
628 			/* NOTREACHED */
629 		}
630 	}
631 
632 	argc -= optind;
633 	argv += optind;
634 
635 #ifndef PROFILE
636 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
637 	    "unveil",
638 	    NULL) == -1)
639 		err(1, "pledge");
640 #endif
641 	if (argc != 1)
642 		usage_import();
643 
644 	if (repo_path == NULL) {
645 		repo_path = getcwd(NULL, 0);
646 		if (repo_path == NULL)
647 			return got_error_from_errno("getcwd");
648 	}
649 	got_path_strip_trailing_slashes(repo_path);
650 	error = get_gitconfig_path(&gitconfig_path);
651 	if (error)
652 		goto done;
653 	error = got_repo_open(&repo, repo_path, gitconfig_path);
654 	if (error)
655 		goto done;
656 
657 	error = get_author(&author, repo);
658 	if (error)
659 		return error;
660 
661 	/*
662 	 * Don't let the user create a branch name with a leading '-'.
663 	 * While technically a valid reference name, this case is usually
664 	 * an unintended typo.
665 	 */
666 	if (branch_name[0] == '-')
667 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
668 
669 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
670 		error = got_error_from_errno("asprintf");
671 		goto done;
672 	}
673 
674 	error = got_ref_open(&branch_ref, repo, refname, 0);
675 	if (error) {
676 		if (error->code != GOT_ERR_NOT_REF)
677 			goto done;
678 	} else {
679 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
680 		    "import target branch already exists");
681 		goto done;
682 	}
683 
684 	path_dir = realpath(argv[0], NULL);
685 	if (path_dir == NULL) {
686 		error = got_error_from_errno2("realpath", argv[0]);
687 		goto done;
688 	}
689 	got_path_strip_trailing_slashes(path_dir);
690 
691 	/*
692 	 * unveil(2) traverses exec(2); if an editor is used we have
693 	 * to apply unveil after the log message has been written.
694 	 */
695 	if (logmsg == NULL || strlen(logmsg) == 0) {
696 		error = get_editor(&editor);
697 		if (error)
698 			goto done;
699 		free(logmsg);
700 		error = collect_import_msg(&logmsg, &logmsg_path, editor,
701 		    path_dir, refname);
702 		if (error) {
703 			if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
704 			    logmsg_path != NULL)
705 				preserve_logmsg = 1;
706 			goto done;
707 		}
708 	}
709 
710 	if (unveil(path_dir, "r") != 0) {
711 		error = got_error_from_errno2("unveil", path_dir);
712 		if (logmsg_path)
713 			preserve_logmsg = 1;
714 		goto done;
715 	}
716 
717 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
718 	if (error) {
719 		if (logmsg_path)
720 			preserve_logmsg = 1;
721 		goto done;
722 	}
723 
724 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
725 	    author, &ignores, repo, import_progress, NULL);
726 	if (error) {
727 		if (logmsg_path)
728 			preserve_logmsg = 1;
729 		goto done;
730 	}
731 
732 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
733 	if (error) {
734 		if (logmsg_path)
735 			preserve_logmsg = 1;
736 		goto done;
737 	}
738 
739 	error = got_ref_write(branch_ref, repo);
740 	if (error) {
741 		if (logmsg_path)
742 			preserve_logmsg = 1;
743 		goto done;
744 	}
745 
746 	error = got_object_id_str(&id_str, new_commit_id);
747 	if (error) {
748 		if (logmsg_path)
749 			preserve_logmsg = 1;
750 		goto done;
751 	}
752 
753 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
754 	if (error) {
755 		if (error->code != GOT_ERR_NOT_REF) {
756 			if (logmsg_path)
757 				preserve_logmsg = 1;
758 			goto done;
759 		}
760 
761 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
762 		    branch_ref);
763 		if (error) {
764 			if (logmsg_path)
765 				preserve_logmsg = 1;
766 			goto done;
767 		}
768 
769 		error = got_ref_write(head_ref, repo);
770 		if (error) {
771 			if (logmsg_path)
772 				preserve_logmsg = 1;
773 			goto done;
774 		}
775 	}
776 
777 	printf("Created branch %s with commit %s\n",
778 	    got_ref_get_name(branch_ref), id_str);
779 done:
780 	if (preserve_logmsg) {
781 		fprintf(stderr, "%s: log message preserved in %s\n",
782 		    getprogname(), logmsg_path);
783 	} else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
784 		error = got_error_from_errno2("unlink", logmsg_path);
785 	free(logmsg);
786 	free(logmsg_path);
787 	free(repo_path);
788 	free(editor);
789 	free(refname);
790 	free(new_commit_id);
791 	free(id_str);
792 	free(author);
793 	free(gitconfig_path);
794 	if (branch_ref)
795 		got_ref_close(branch_ref);
796 	if (head_ref)
797 		got_ref_close(head_ref);
798 	return error;
799 }
800 
801 __dead static void
802 usage_checkout(void)
803 {
804 	fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
805 	    "[-p prefix] repository-path [worktree-path]\n", getprogname());
806 	exit(1);
807 }
808 
809 static void
810 show_worktree_base_ref_warning(void)
811 {
812 	fprintf(stderr, "%s: warning: could not create a reference "
813 	    "to the work tree's base commit; the commit could be "
814 	    "garbage-collected by Git; making the repository "
815 	    "writable and running 'got update' will prevent this\n",
816 	    getprogname());
817 }
818 
819 struct got_checkout_progress_arg {
820 	const char *worktree_path;
821 	int had_base_commit_ref_error;
822 };
823 
824 static const struct got_error *
825 checkout_progress(void *arg, unsigned char status, const char *path)
826 {
827 	struct got_checkout_progress_arg *a = arg;
828 
829 	/* Base commit bump happens silently. */
830 	if (status == GOT_STATUS_BUMP_BASE)
831 		return NULL;
832 
833 	if (status == GOT_STATUS_BASE_REF_ERR) {
834 		a->had_base_commit_ref_error = 1;
835 		return NULL;
836 	}
837 
838 	while (path[0] == '/')
839 		path++;
840 
841 	printf("%c  %s/%s\n", status, a->worktree_path, path);
842 	return NULL;
843 }
844 
845 static const struct got_error *
846 check_cancelled(void *arg)
847 {
848 	if (sigint_received || sigpipe_received)
849 		return got_error(GOT_ERR_CANCELLED);
850 	return NULL;
851 }
852 
853 static const struct got_error *
854 check_linear_ancestry(struct got_object_id *commit_id,
855     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
856     struct got_repository *repo)
857 {
858 	const struct got_error *err = NULL;
859 	struct got_object_id *yca_id;
860 
861 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
862 	    commit_id, base_commit_id, repo, check_cancelled, NULL);
863 	if (err)
864 		return err;
865 
866 	if (yca_id == NULL)
867 		return got_error(GOT_ERR_ANCESTRY);
868 
869 	/*
870 	 * Require a straight line of history between the target commit
871 	 * and the work tree's base commit.
872 	 *
873 	 * Non-linear situations such as this require a rebase:
874 	 *
875 	 * (commit) D       F (base_commit)
876 	 *           \     /
877 	 *            C   E
878 	 *             \ /
879 	 *              B (yca)
880 	 *              |
881 	 *              A
882 	 *
883 	 * 'got update' only handles linear cases:
884 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
885 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
886 	 */
887 	if (allow_forwards_in_time_only) {
888 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
889 		return got_error(GOT_ERR_ANCESTRY);
890 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
891 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
892 		return got_error(GOT_ERR_ANCESTRY);
893 
894 	free(yca_id);
895 	return NULL;
896 }
897 
898 static const struct got_error *
899 check_same_branch(struct got_object_id *commit_id,
900     struct got_reference *head_ref, struct got_object_id *yca_id,
901     struct got_repository *repo)
902 {
903 	const struct got_error *err = NULL;
904 	struct got_commit_graph *graph = NULL;
905 	struct got_object_id *head_commit_id = NULL;
906 	int is_same_branch = 0;
907 
908 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
909 	if (err)
910 		goto done;
911 
912 	if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
913 		is_same_branch = 1;
914 		goto done;
915 	}
916 	if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
917 		is_same_branch = 1;
918 		goto done;
919 	}
920 
921 	err = got_commit_graph_open(&graph, "/", 1);
922 	if (err)
923 		goto done;
924 
925 	err = got_commit_graph_iter_start(graph, head_commit_id, repo,
926 	    check_cancelled, NULL);
927 	if (err)
928 		goto done;
929 
930 	for (;;) {
931 		struct got_object_id *id;
932 		err = got_commit_graph_iter_next(&id, graph, repo,
933 		    check_cancelled, NULL);
934 		if (err) {
935 			if (err->code == GOT_ERR_ITER_COMPLETED)
936 				err = NULL;
937 			break;
938 		}
939 
940 		if (id) {
941 			if (yca_id && got_object_id_cmp(id, yca_id) == 0)
942 				break;
943 			if (got_object_id_cmp(id, commit_id) == 0) {
944 				is_same_branch = 1;
945 				break;
946 			}
947 		}
948 	}
949 done:
950 	if (graph)
951 		got_commit_graph_close(graph);
952 	free(head_commit_id);
953 	if (!err && !is_same_branch)
954 		err = got_error(GOT_ERR_ANCESTRY);
955 	return err;
956 }
957 
958 static const struct got_error *
959 cmd_checkout(int argc, char *argv[])
960 {
961 	const struct got_error *error = NULL;
962 	struct got_repository *repo = NULL;
963 	struct got_reference *head_ref = NULL;
964 	struct got_worktree *worktree = NULL;
965 	char *repo_path = NULL;
966 	char *worktree_path = NULL;
967 	const char *path_prefix = "";
968 	const char *branch_name = GOT_REF_HEAD;
969 	char *commit_id_str = NULL;
970 	int ch, same_path_prefix, allow_nonempty = 0;
971 	struct got_pathlist_head paths;
972 	struct got_checkout_progress_arg cpa;
973 
974 	TAILQ_INIT(&paths);
975 
976 	while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
977 		switch (ch) {
978 		case 'b':
979 			branch_name = optarg;
980 			break;
981 		case 'c':
982 			commit_id_str = strdup(optarg);
983 			if (commit_id_str == NULL)
984 				return got_error_from_errno("strdup");
985 			break;
986 		case 'E':
987 			allow_nonempty = 1;
988 			break;
989 		case 'p':
990 			path_prefix = optarg;
991 			break;
992 		default:
993 			usage_checkout();
994 			/* NOTREACHED */
995 		}
996 	}
997 
998 	argc -= optind;
999 	argv += optind;
1000 
1001 #ifndef PROFILE
1002 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1003 	    "unveil", NULL) == -1)
1004 		err(1, "pledge");
1005 #endif
1006 	if (argc == 1) {
1007 		char *cwd, *base, *dotgit;
1008 		repo_path = realpath(argv[0], NULL);
1009 		if (repo_path == NULL)
1010 			return got_error_from_errno2("realpath", argv[0]);
1011 		cwd = getcwd(NULL, 0);
1012 		if (cwd == NULL) {
1013 			error = got_error_from_errno("getcwd");
1014 			goto done;
1015 		}
1016 		if (path_prefix[0]) {
1017 			base = basename(path_prefix);
1018 			if (base == NULL) {
1019 				error = got_error_from_errno2("basename",
1020 				    path_prefix);
1021 				goto done;
1022 			}
1023 		} else {
1024 			base = basename(repo_path);
1025 			if (base == NULL) {
1026 				error = got_error_from_errno2("basename",
1027 				    repo_path);
1028 				goto done;
1029 			}
1030 		}
1031 		dotgit = strstr(base, ".git");
1032 		if (dotgit)
1033 			*dotgit = '\0';
1034 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1035 			error = got_error_from_errno("asprintf");
1036 			free(cwd);
1037 			goto done;
1038 		}
1039 		free(cwd);
1040 	} else if (argc == 2) {
1041 		repo_path = realpath(argv[0], NULL);
1042 		if (repo_path == NULL) {
1043 			error = got_error_from_errno2("realpath", argv[0]);
1044 			goto done;
1045 		}
1046 		worktree_path = realpath(argv[1], NULL);
1047 		if (worktree_path == NULL) {
1048 			if (errno != ENOENT) {
1049 				error = got_error_from_errno2("realpath",
1050 				    argv[1]);
1051 				goto done;
1052 			}
1053 			worktree_path = strdup(argv[1]);
1054 			if (worktree_path == NULL) {
1055 				error = got_error_from_errno("strdup");
1056 				goto done;
1057 			}
1058 		}
1059 	} else
1060 		usage_checkout();
1061 
1062 	got_path_strip_trailing_slashes(repo_path);
1063 	got_path_strip_trailing_slashes(worktree_path);
1064 
1065 	error = got_repo_open(&repo, repo_path, NULL);
1066 	if (error != NULL)
1067 		goto done;
1068 
1069 	/* Pre-create work tree path for unveil(2) */
1070 	error = got_path_mkdir(worktree_path);
1071 	if (error) {
1072 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1073 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1074 			goto done;
1075 		if (!allow_nonempty &&
1076 		    !got_path_dir_is_empty(worktree_path)) {
1077 			error = got_error_path(worktree_path,
1078 			    GOT_ERR_DIR_NOT_EMPTY);
1079 			goto done;
1080 		}
1081 	}
1082 
1083 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1084 	if (error)
1085 		goto done;
1086 
1087 	error = got_ref_open(&head_ref, repo, branch_name, 0);
1088 	if (error != NULL)
1089 		goto done;
1090 
1091 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1092 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1093 		goto done;
1094 
1095 	error = got_worktree_open(&worktree, worktree_path);
1096 	if (error != NULL)
1097 		goto done;
1098 
1099 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1100 	    path_prefix);
1101 	if (error != NULL)
1102 		goto done;
1103 	if (!same_path_prefix) {
1104 		error = got_error(GOT_ERR_PATH_PREFIX);
1105 		goto done;
1106 	}
1107 
1108 	if (commit_id_str) {
1109 		struct got_object_id *commit_id;
1110 		error = got_repo_match_object_id(&commit_id, NULL,
1111 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1112 		if (error)
1113 			goto done;
1114 		error = check_linear_ancestry(commit_id,
1115 		    got_worktree_get_base_commit_id(worktree), 0, repo);
1116 		if (error != NULL) {
1117 			free(commit_id);
1118 			goto done;
1119 		}
1120 		error = check_same_branch(commit_id, head_ref, NULL, repo);
1121 		if (error)
1122 			goto done;
1123 		error = got_worktree_set_base_commit_id(worktree, repo,
1124 		    commit_id);
1125 		free(commit_id);
1126 		if (error)
1127 			goto done;
1128 	}
1129 
1130 	error = got_pathlist_append(&paths, "", NULL);
1131 	if (error)
1132 		goto done;
1133 	cpa.worktree_path = worktree_path;
1134 	cpa.had_base_commit_ref_error = 0;
1135 	error = got_worktree_checkout_files(worktree, &paths, repo,
1136 	    checkout_progress, &cpa, check_cancelled, NULL);
1137 	if (error != NULL)
1138 		goto done;
1139 
1140 	printf("Now shut up and hack\n");
1141 	if (cpa.had_base_commit_ref_error)
1142 		show_worktree_base_ref_warning();
1143 done:
1144 	got_pathlist_free(&paths);
1145 	free(commit_id_str);
1146 	free(repo_path);
1147 	free(worktree_path);
1148 	return error;
1149 }
1150 
1151 __dead static void
1152 usage_update(void)
1153 {
1154 	fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1155 	    getprogname());
1156 	exit(1);
1157 }
1158 
1159 static const struct got_error *
1160 update_progress(void *arg, unsigned char status, const char *path)
1161 {
1162 	int *did_something = arg;
1163 
1164 	if (status == GOT_STATUS_EXISTS ||
1165 	    status == GOT_STATUS_BASE_REF_ERR)
1166 		return NULL;
1167 
1168 	*did_something = 1;
1169 
1170 	/* Base commit bump happens silently. */
1171 	if (status == GOT_STATUS_BUMP_BASE)
1172 		return NULL;
1173 
1174 	while (path[0] == '/')
1175 		path++;
1176 	printf("%c  %s\n", status, path);
1177 	return NULL;
1178 }
1179 
1180 static const struct got_error *
1181 switch_head_ref(struct got_reference *head_ref,
1182     struct got_object_id *commit_id, struct got_worktree *worktree,
1183     struct got_repository *repo)
1184 {
1185 	const struct got_error *err = NULL;
1186 	char *base_id_str;
1187 	int ref_has_moved = 0;
1188 
1189 	/* Trivial case: switching between two different references. */
1190 	if (strcmp(got_ref_get_name(head_ref),
1191 	    got_worktree_get_head_ref_name(worktree)) != 0) {
1192 		printf("Switching work tree from %s to %s\n",
1193 		    got_worktree_get_head_ref_name(worktree),
1194 		    got_ref_get_name(head_ref));
1195 		return got_worktree_set_head_ref(worktree, head_ref);
1196 	}
1197 
1198 	err = check_linear_ancestry(commit_id,
1199 	    got_worktree_get_base_commit_id(worktree), 0, repo);
1200 	if (err) {
1201 		if (err->code != GOT_ERR_ANCESTRY)
1202 			return err;
1203 		ref_has_moved = 1;
1204 	}
1205 	if (!ref_has_moved)
1206 		return NULL;
1207 
1208 	/* Switching to a rebased branch with the same reference name. */
1209 	err = got_object_id_str(&base_id_str,
1210 	    got_worktree_get_base_commit_id(worktree));
1211 	if (err)
1212 		return err;
1213 	printf("Reference %s now points at a different branch\n",
1214 	    got_worktree_get_head_ref_name(worktree));
1215 	printf("Switching work tree from %s to %s\n", base_id_str,
1216 	    got_worktree_get_head_ref_name(worktree));
1217 	return NULL;
1218 }
1219 
1220 static const struct got_error *
1221 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1222 {
1223 	const struct got_error *err;
1224 	int in_progress;
1225 
1226 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
1227 	if (err)
1228 		return err;
1229 	if (in_progress)
1230 		return got_error(GOT_ERR_REBASING);
1231 
1232 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
1233 	if (err)
1234 		return err;
1235 	if (in_progress)
1236 		return got_error(GOT_ERR_HISTEDIT_BUSY);
1237 
1238 	return NULL;
1239 }
1240 
1241 static const struct got_error *
1242 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1243     char *argv[], struct got_worktree *worktree)
1244 {
1245 	const struct got_error *err = NULL;
1246 	char *path;
1247 	int i;
1248 
1249 	if (argc == 0) {
1250 		path = strdup("");
1251 		if (path == NULL)
1252 			return got_error_from_errno("strdup");
1253 		return got_pathlist_append(paths, path, NULL);
1254 	}
1255 
1256 	for (i = 0; i < argc; i++) {
1257 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
1258 		if (err)
1259 			break;
1260 		err = got_pathlist_append(paths, path, NULL);
1261 		if (err) {
1262 			free(path);
1263 			break;
1264 		}
1265 	}
1266 
1267 	return err;
1268 }
1269 
1270 static const struct got_error *
1271 cmd_update(int argc, char *argv[])
1272 {
1273 	const struct got_error *error = NULL;
1274 	struct got_repository *repo = NULL;
1275 	struct got_worktree *worktree = NULL;
1276 	char *worktree_path = NULL;
1277 	struct got_object_id *commit_id = NULL;
1278 	char *commit_id_str = NULL;
1279 	const char *branch_name = NULL;
1280 	struct got_reference *head_ref = NULL;
1281 	struct got_pathlist_head paths;
1282 	struct got_pathlist_entry *pe;
1283 	int ch, did_something = 0;
1284 
1285 	TAILQ_INIT(&paths);
1286 
1287 	while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1288 		switch (ch) {
1289 		case 'b':
1290 			branch_name = optarg;
1291 			break;
1292 		case 'c':
1293 			commit_id_str = strdup(optarg);
1294 			if (commit_id_str == NULL)
1295 				return got_error_from_errno("strdup");
1296 			break;
1297 		default:
1298 			usage_update();
1299 			/* NOTREACHED */
1300 		}
1301 	}
1302 
1303 	argc -= optind;
1304 	argv += optind;
1305 
1306 #ifndef PROFILE
1307 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1308 	    "unveil", NULL) == -1)
1309 		err(1, "pledge");
1310 #endif
1311 	worktree_path = getcwd(NULL, 0);
1312 	if (worktree_path == NULL) {
1313 		error = got_error_from_errno("getcwd");
1314 		goto done;
1315 	}
1316 	error = got_worktree_open(&worktree, worktree_path);
1317 	if (error)
1318 		goto done;
1319 
1320 	error = check_rebase_or_histedit_in_progress(worktree);
1321 	if (error)
1322 		goto done;
1323 
1324 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1325 	    NULL);
1326 	if (error != NULL)
1327 		goto done;
1328 
1329 	error = apply_unveil(got_repo_get_path(repo), 0,
1330 	    got_worktree_get_root_path(worktree));
1331 	if (error)
1332 		goto done;
1333 
1334 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1335 	if (error)
1336 		goto done;
1337 
1338 	error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1339 	    got_worktree_get_head_ref_name(worktree), 0);
1340 	if (error != NULL)
1341 		goto done;
1342 	if (commit_id_str == NULL) {
1343 		error = got_ref_resolve(&commit_id, repo, head_ref);
1344 		if (error != NULL)
1345 			goto done;
1346 		error = got_object_id_str(&commit_id_str, commit_id);
1347 		if (error != NULL)
1348 			goto done;
1349 	} else {
1350 		error = got_repo_match_object_id(&commit_id, NULL,
1351 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1352 		free(commit_id_str);
1353 		commit_id_str = NULL;
1354 		if (error)
1355 			goto done;
1356 		error = got_object_id_str(&commit_id_str, commit_id);
1357 		if (error)
1358 			goto done;
1359 	}
1360 
1361 	if (branch_name) {
1362 		struct got_object_id *head_commit_id;
1363 		TAILQ_FOREACH(pe, &paths, entry) {
1364 			if (pe->path_len == 0)
1365 				continue;
1366 			error = got_error_msg(GOT_ERR_BAD_PATH,
1367 			    "switching between branches requires that "
1368 			    "the entire work tree gets updated");
1369 			goto done;
1370 		}
1371 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
1372 		if (error)
1373 			goto done;
1374 		error = check_linear_ancestry(commit_id, head_commit_id, 0,
1375 		    repo);
1376 		free(head_commit_id);
1377 		if (error != NULL)
1378 			goto done;
1379 		error = check_same_branch(commit_id, head_ref, NULL, repo);
1380 		if (error)
1381 			goto done;
1382 		error = switch_head_ref(head_ref, commit_id, worktree, repo);
1383 		if (error)
1384 			goto done;
1385 	} else {
1386 		error = check_linear_ancestry(commit_id,
1387 		    got_worktree_get_base_commit_id(worktree), 0, repo);
1388 		if (error != NULL) {
1389 			if (error->code == GOT_ERR_ANCESTRY)
1390 				error = got_error(GOT_ERR_BRANCH_MOVED);
1391 			goto done;
1392 		}
1393 		error = check_same_branch(commit_id, head_ref, NULL, repo);
1394 		if (error)
1395 			goto done;
1396 	}
1397 
1398 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1399 	    commit_id) != 0) {
1400 		error = got_worktree_set_base_commit_id(worktree, repo,
1401 		    commit_id);
1402 		if (error)
1403 			goto done;
1404 	}
1405 
1406 	error = got_worktree_checkout_files(worktree, &paths, repo,
1407 	    update_progress, &did_something, check_cancelled, NULL);
1408 	if (error != NULL)
1409 		goto done;
1410 
1411 	if (did_something)
1412 		printf("Updated to commit %s\n", commit_id_str);
1413 	else
1414 		printf("Already up-to-date\n");
1415 done:
1416 	free(worktree_path);
1417 	TAILQ_FOREACH(pe, &paths, entry)
1418 		free((char *)pe->path);
1419 	got_pathlist_free(&paths);
1420 	free(commit_id);
1421 	free(commit_id_str);
1422 	return error;
1423 }
1424 
1425 static const struct got_error *
1426 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1427     const char *path, int diff_context, int ignore_whitespace,
1428     struct got_repository *repo)
1429 {
1430 	const struct got_error *err = NULL;
1431 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1432 
1433 	if (blob_id1) {
1434 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1435 		if (err)
1436 			goto done;
1437 	}
1438 
1439 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1440 	if (err)
1441 		goto done;
1442 
1443 	while (path[0] == '/')
1444 		path++;
1445 	err = got_diff_blob(blob1, blob2, path, path, diff_context,
1446 	    ignore_whitespace, stdout);
1447 done:
1448 	if (blob1)
1449 		got_object_blob_close(blob1);
1450 	got_object_blob_close(blob2);
1451 	return err;
1452 }
1453 
1454 static const struct got_error *
1455 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1456     const char *path, int diff_context, int ignore_whitespace,
1457     struct got_repository *repo)
1458 {
1459 	const struct got_error *err = NULL;
1460 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1461 	struct got_diff_blob_output_unidiff_arg arg;
1462 
1463 	if (tree_id1) {
1464 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
1465 		if (err)
1466 			goto done;
1467 	}
1468 
1469 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
1470 	if (err)
1471 		goto done;
1472 
1473 	arg.diff_context = diff_context;
1474 	arg.ignore_whitespace = ignore_whitespace;
1475 	arg.outfile = stdout;
1476 	while (path[0] == '/')
1477 		path++;
1478 	err = got_diff_tree(tree1, tree2, path, path, repo,
1479 	    got_diff_blob_output_unidiff, &arg, 1);
1480 done:
1481 	if (tree1)
1482 		got_object_tree_close(tree1);
1483 	if (tree2)
1484 		got_object_tree_close(tree2);
1485 	return err;
1486 }
1487 
1488 static const struct got_error *
1489 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1490     const char *path, int diff_context, struct got_repository *repo)
1491 {
1492 	const struct got_error *err = NULL;
1493 	struct got_commit_object *pcommit = NULL;
1494 	char *id_str1 = NULL, *id_str2 = NULL;
1495 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1496 	struct got_object_qid *qid;
1497 
1498 	qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1499 	if (qid != NULL) {
1500 		err = got_object_open_as_commit(&pcommit, repo,
1501 		    qid->id);
1502 		if (err)
1503 			return err;
1504 	}
1505 
1506 	if (path && path[0] != '\0') {
1507 		int obj_type;
1508 		err = got_object_id_by_path(&obj_id2, repo, id, path);
1509 		if (err)
1510 			goto done;
1511 		err = got_object_id_str(&id_str2, obj_id2);
1512 		if (err) {
1513 			free(obj_id2);
1514 			goto done;
1515 		}
1516 		if (pcommit) {
1517 			err = got_object_id_by_path(&obj_id1, repo,
1518 			    qid->id, path);
1519 			if (err) {
1520 				free(obj_id2);
1521 				goto done;
1522 			}
1523 			err = got_object_id_str(&id_str1, obj_id1);
1524 			if (err) {
1525 				free(obj_id2);
1526 				goto done;
1527 			}
1528 		}
1529 		err = got_object_get_type(&obj_type, repo, obj_id2);
1530 		if (err) {
1531 			free(obj_id2);
1532 			goto done;
1533 		}
1534 		printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1535 		switch (obj_type) {
1536 		case GOT_OBJ_TYPE_BLOB:
1537 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1538 			    0, repo);
1539 			break;
1540 		case GOT_OBJ_TYPE_TREE:
1541 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
1542 			    0, repo);
1543 			break;
1544 		default:
1545 			err = got_error(GOT_ERR_OBJ_TYPE);
1546 			break;
1547 		}
1548 		free(obj_id1);
1549 		free(obj_id2);
1550 	} else {
1551 		obj_id2 = got_object_commit_get_tree_id(commit);
1552 		err = got_object_id_str(&id_str2, obj_id2);
1553 		if (err)
1554 			goto done;
1555 		obj_id1 = got_object_commit_get_tree_id(pcommit);
1556 		err = got_object_id_str(&id_str1, obj_id1);
1557 		if (err)
1558 			goto done;
1559 		printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1560 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1561 	}
1562 done:
1563 	free(id_str1);
1564 	free(id_str2);
1565 	if (pcommit)
1566 		got_object_commit_close(pcommit);
1567 	return err;
1568 }
1569 
1570 static char *
1571 get_datestr(time_t *time, char *datebuf)
1572 {
1573 	struct tm mytm, *tm;
1574 	char *p, *s;
1575 
1576 	tm = gmtime_r(time, &mytm);
1577 	if (tm == NULL)
1578 		return NULL;
1579 	s = asctime_r(tm, datebuf);
1580 	if (s == NULL)
1581 		return NULL;
1582 	p = strchr(s, '\n');
1583 	if (p)
1584 		*p = '\0';
1585 	return s;
1586 }
1587 
1588 static const struct got_error *
1589 match_logmsg(int *have_match, struct got_object_id *id,
1590     struct got_commit_object *commit, regex_t *regex)
1591 {
1592 	const struct got_error *err = NULL;
1593 	regmatch_t regmatch;
1594 	char *id_str = NULL, *logmsg = NULL;
1595 
1596 	*have_match = 0;
1597 
1598 	err = got_object_id_str(&id_str, id);
1599 	if (err)
1600 		return err;
1601 
1602 	err = got_object_commit_get_logmsg(&logmsg, commit);
1603 	if (err)
1604 		goto done;
1605 
1606 	if (regexec(regex, logmsg, 1, &regmatch, 0) == 0)
1607 		*have_match = 1;
1608 done:
1609 	free(id_str);
1610 	free(logmsg);
1611 	return err;
1612 }
1613 
1614 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1615 
1616 static const struct got_error *
1617 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1618     struct got_repository *repo, const char *path, int show_patch,
1619     int diff_context, struct got_reflist_head *refs)
1620 {
1621 	const struct got_error *err = NULL;
1622 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
1623 	char datebuf[26];
1624 	time_t committer_time;
1625 	const char *author, *committer;
1626 	char *refs_str = NULL;
1627 	struct got_reflist_entry *re;
1628 
1629 	SIMPLEQ_FOREACH(re, refs, entry) {
1630 		char *s;
1631 		const char *name;
1632 		struct got_tag_object *tag = NULL;
1633 		int cmp;
1634 
1635 		name = got_ref_get_name(re->ref);
1636 		if (strcmp(name, GOT_REF_HEAD) == 0)
1637 			continue;
1638 		if (strncmp(name, "refs/", 5) == 0)
1639 			name += 5;
1640 		if (strncmp(name, "got/", 4) == 0)
1641 			continue;
1642 		if (strncmp(name, "heads/", 6) == 0)
1643 			name += 6;
1644 		if (strncmp(name, "remotes/", 8) == 0)
1645 			name += 8;
1646 		if (strncmp(name, "tags/", 5) == 0) {
1647 			err = got_object_open_as_tag(&tag, repo, re->id);
1648 			if (err) {
1649 				if (err->code != GOT_ERR_OBJ_TYPE)
1650 					return err;
1651 				/* Ref points at something other than a tag. */
1652 				err = NULL;
1653 				tag = NULL;
1654 			}
1655 		}
1656 		cmp = got_object_id_cmp(tag ?
1657 		    got_object_tag_get_object_id(tag) : re->id, id);
1658 		if (tag)
1659 			got_object_tag_close(tag);
1660 		if (cmp != 0)
1661 			continue;
1662 		s = refs_str;
1663 		if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1664 		    name) == -1) {
1665 			err = got_error_from_errno("asprintf");
1666 			free(s);
1667 			return err;
1668 		}
1669 		free(s);
1670 	}
1671 	err = got_object_id_str(&id_str, id);
1672 	if (err)
1673 		return err;
1674 
1675 	printf(GOT_COMMIT_SEP_STR);
1676 	printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1677 	    refs_str ? refs_str : "", refs_str ? ")" : "");
1678 	free(id_str);
1679 	id_str = NULL;
1680 	free(refs_str);
1681 	refs_str = NULL;
1682 	printf("from: %s\n", got_object_commit_get_author(commit));
1683 	committer_time = got_object_commit_get_committer_time(commit);
1684 	datestr = get_datestr(&committer_time, datebuf);
1685 	if (datestr)
1686 		printf("date: %s UTC\n", datestr);
1687 	author = got_object_commit_get_author(commit);
1688 	committer = got_object_commit_get_committer(commit);
1689 	if (strcmp(author, committer) != 0)
1690 		printf("via: %s\n", committer);
1691 	if (got_object_commit_get_nparents(commit) > 1) {
1692 		const struct got_object_id_queue *parent_ids;
1693 		struct got_object_qid *qid;
1694 		int n = 1;
1695 		parent_ids = got_object_commit_get_parent_ids(commit);
1696 		SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1697 			err = got_object_id_str(&id_str, qid->id);
1698 			if (err)
1699 				return err;
1700 			printf("parent %d: %s\n", n++, id_str);
1701 			free(id_str);
1702 		}
1703 	}
1704 
1705 	err = got_object_commit_get_logmsg(&logmsg0, commit);
1706 	if (err)
1707 		return err;
1708 
1709 	logmsg = logmsg0;
1710 	do {
1711 		line = strsep(&logmsg, "\n");
1712 		if (line)
1713 			printf(" %s\n", line);
1714 	} while (line);
1715 	free(logmsg0);
1716 
1717 	if (show_patch) {
1718 		err = print_patch(commit, id, path, diff_context, repo);
1719 		if (err == 0)
1720 			printf("\n");
1721 	}
1722 
1723 	if (fflush(stdout) != 0 && err == NULL)
1724 		err = got_error_from_errno("fflush");
1725 	return err;
1726 }
1727 
1728 static const struct got_error *
1729 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1730     const char *path, int show_patch, const char *search_pattern,
1731     int diff_context, int limit, int first_parent_traversal,
1732     struct got_reflist_head *refs)
1733 {
1734 	const struct got_error *err;
1735 	struct got_commit_graph *graph;
1736 	regex_t regex;
1737 	int have_match;
1738 
1739 	if (search_pattern &&
1740 	    regcomp(&regex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1741 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
1742 
1743 	err = got_commit_graph_open(&graph, path, first_parent_traversal);
1744 	if (err)
1745 		return err;
1746 	err = got_commit_graph_iter_start(graph, root_id, repo,
1747 	    check_cancelled, NULL);
1748 	if (err)
1749 		goto done;
1750 	for (;;) {
1751 		struct got_commit_object *commit;
1752 		struct got_object_id *id;
1753 
1754 		if (sigint_received || sigpipe_received)
1755 			break;
1756 
1757 		err = got_commit_graph_iter_next(&id, graph, repo,
1758 		    check_cancelled, NULL);
1759 		if (err) {
1760 			if (err->code == GOT_ERR_ITER_COMPLETED)
1761 				err = NULL;
1762 			break;
1763 		}
1764 		if (id == NULL)
1765 			break;
1766 
1767 		err = got_object_open_as_commit(&commit, repo, id);
1768 		if (err)
1769 			break;
1770 
1771 		if (search_pattern) {
1772 			err = match_logmsg(&have_match, id, commit, &regex);
1773 			if (err) {
1774 				got_object_commit_close(commit);
1775 				break;
1776 			}
1777 			if (have_match == 0) {
1778 				got_object_commit_close(commit);
1779 				continue;
1780 			}
1781 		}
1782 
1783 		err = print_commit(commit, id, repo, path, show_patch,
1784 		    diff_context, refs);
1785 		got_object_commit_close(commit);
1786 		if (err || (limit && --limit == 0))
1787 			break;
1788 	}
1789 done:
1790 	if (search_pattern)
1791 		regfree(&regex);
1792 	got_commit_graph_close(graph);
1793 	return err;
1794 }
1795 
1796 __dead static void
1797 usage_log(void)
1798 {
1799 	fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1800 	    "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1801 	exit(1);
1802 }
1803 
1804 static int
1805 get_default_log_limit(void)
1806 {
1807 	const char *got_default_log_limit;
1808 	long long n;
1809 	const char *errstr;
1810 
1811 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1812 	if (got_default_log_limit == NULL)
1813 		return 0;
1814 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1815 	if (errstr != NULL)
1816 		return 0;
1817 	return n;
1818 }
1819 
1820 static const struct got_error *
1821 cmd_log(int argc, char *argv[])
1822 {
1823 	const struct got_error *error;
1824 	struct got_repository *repo = NULL;
1825 	struct got_worktree *worktree = NULL;
1826 	struct got_commit_object *commit = NULL;
1827 	struct got_object_id *id = NULL;
1828 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1829 	const char *start_commit = NULL, *search_pattern = NULL;
1830 	int diff_context = -1, ch;
1831 	int show_patch = 0, limit = 0, first_parent_traversal = 0;
1832 	const char *errstr;
1833 	struct got_reflist_head refs;
1834 
1835 	SIMPLEQ_INIT(&refs);
1836 
1837 #ifndef PROFILE
1838 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1839 	    NULL)
1840 	    == -1)
1841 		err(1, "pledge");
1842 #endif
1843 
1844 	limit = get_default_log_limit();
1845 
1846 	while ((ch = getopt(argc, argv, "b:pc:C:l:fr:s:")) != -1) {
1847 		switch (ch) {
1848 		case 'p':
1849 			show_patch = 1;
1850 			break;
1851 		case 'c':
1852 			start_commit = optarg;
1853 			break;
1854 		case 'C':
1855 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1856 			    &errstr);
1857 			if (errstr != NULL)
1858 				err(1, "-C option %s", errstr);
1859 			break;
1860 		case 'l':
1861 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
1862 			if (errstr != NULL)
1863 				err(1, "-l option %s", errstr);
1864 			break;
1865 		case 'f':
1866 			first_parent_traversal = 1;
1867 			break;
1868 		case 'r':
1869 			repo_path = realpath(optarg, NULL);
1870 			if (repo_path == NULL)
1871 				return got_error_from_errno2("realpath",
1872 				    optarg);
1873 			got_path_strip_trailing_slashes(repo_path);
1874 			break;
1875 		case 's':
1876 			search_pattern = optarg;
1877 			break;
1878 		default:
1879 			usage_log();
1880 			/* NOTREACHED */
1881 		}
1882 	}
1883 
1884 	argc -= optind;
1885 	argv += optind;
1886 
1887 	if (diff_context == -1)
1888 		diff_context = 3;
1889 	else if (!show_patch)
1890 		errx(1, "-C reguires -p");
1891 
1892 	cwd = getcwd(NULL, 0);
1893 	if (cwd == NULL) {
1894 		error = got_error_from_errno("getcwd");
1895 		goto done;
1896 	}
1897 
1898 	error = got_worktree_open(&worktree, cwd);
1899 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
1900 		goto done;
1901 	error = NULL;
1902 
1903 	if (argc == 0) {
1904 		path = strdup("");
1905 		if (path == NULL) {
1906 			error = got_error_from_errno("strdup");
1907 			goto done;
1908 		}
1909 	} else if (argc == 1) {
1910 		if (worktree) {
1911 			error = got_worktree_resolve_path(&path, worktree,
1912 			    argv[0]);
1913 			if (error)
1914 				goto done;
1915 		} else {
1916 			path = strdup(argv[0]);
1917 			if (path == NULL) {
1918 				error = got_error_from_errno("strdup");
1919 				goto done;
1920 			}
1921 		}
1922 	} else
1923 		usage_log();
1924 
1925 	if (repo_path == NULL) {
1926 		repo_path = worktree ?
1927 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1928 	}
1929 	if (repo_path == NULL) {
1930 		error = got_error_from_errno("strdup");
1931 		goto done;
1932 	}
1933 
1934 	error = got_repo_open(&repo, repo_path, NULL);
1935 	if (error != NULL)
1936 		goto done;
1937 
1938 	error = apply_unveil(got_repo_get_path(repo), 1,
1939 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
1940 	if (error)
1941 		goto done;
1942 
1943 	if (start_commit == NULL) {
1944 		struct got_reference *head_ref;
1945 		error = got_ref_open(&head_ref, repo,
1946 		    worktree ? got_worktree_get_head_ref_name(worktree)
1947 		    : GOT_REF_HEAD, 0);
1948 		if (error != NULL)
1949 			return error;
1950 		error = got_ref_resolve(&id, repo, head_ref);
1951 		got_ref_close(head_ref);
1952 		if (error != NULL)
1953 			return error;
1954 		error = got_object_open_as_commit(&commit, repo, id);
1955 	} else {
1956 		struct got_reference *ref;
1957 		error = got_ref_open(&ref, repo, start_commit, 0);
1958 		if (error == NULL) {
1959 			int obj_type;
1960 			error = got_ref_resolve(&id, repo, ref);
1961 			got_ref_close(ref);
1962 			if (error != NULL)
1963 				goto done;
1964 			error = got_object_get_type(&obj_type, repo, id);
1965 			if (error != NULL)
1966 				goto done;
1967 			if (obj_type == GOT_OBJ_TYPE_TAG) {
1968 				struct got_tag_object *tag;
1969 				error = got_object_open_as_tag(&tag, repo, id);
1970 				if (error != NULL)
1971 					goto done;
1972 				if (got_object_tag_get_object_type(tag) !=
1973 				    GOT_OBJ_TYPE_COMMIT) {
1974 					got_object_tag_close(tag);
1975 					error = got_error(GOT_ERR_OBJ_TYPE);
1976 					goto done;
1977 				}
1978 				free(id);
1979 				id = got_object_id_dup(
1980 				    got_object_tag_get_object_id(tag));
1981 				if (id == NULL)
1982 					error = got_error_from_errno(
1983 					    "got_object_id_dup");
1984 				got_object_tag_close(tag);
1985 				if (error)
1986 					goto done;
1987 			} else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1988 				error = got_error(GOT_ERR_OBJ_TYPE);
1989 				goto done;
1990 			}
1991 			error = got_object_open_as_commit(&commit, repo, id);
1992 			if (error != NULL)
1993 				goto done;
1994 		}
1995 		if (commit == NULL) {
1996 			error = got_repo_match_object_id_prefix(&id,
1997 			    start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1998 			if (error != NULL)
1999 				return error;
2000 		}
2001 	}
2002 	if (error != NULL)
2003 		goto done;
2004 
2005 	if (worktree) {
2006 		const char *prefix = got_worktree_get_path_prefix(worktree);
2007 		char *p;
2008 		if (asprintf(&p, "%s%s%s", prefix,
2009 		    (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2010 			error = got_error_from_errno("asprintf");
2011 			goto done;
2012 		}
2013 		error = got_repo_map_path(&in_repo_path, repo, p, 1);
2014 		free(p);
2015 	} else
2016 		error = got_repo_map_path(&in_repo_path, repo, path, 1);
2017 	if (error != NULL)
2018 		goto done;
2019 	if (in_repo_path) {
2020 		free(path);
2021 		path = in_repo_path;
2022 	}
2023 
2024 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2025 	if (error)
2026 		goto done;
2027 
2028 	error = print_commits(id, repo, path, show_patch, search_pattern,
2029 	    diff_context, limit, first_parent_traversal, &refs);
2030 done:
2031 	free(path);
2032 	free(repo_path);
2033 	free(cwd);
2034 	free(id);
2035 	if (worktree)
2036 		got_worktree_close(worktree);
2037 	if (repo) {
2038 		const struct got_error *repo_error;
2039 		repo_error = got_repo_close(repo);
2040 		if (error == NULL)
2041 			error = repo_error;
2042 	}
2043 	got_ref_list_free(&refs);
2044 	return error;
2045 }
2046 
2047 __dead static void
2048 usage_diff(void)
2049 {
2050 	fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2051 	    "[-w] [object1 object2 | path]\n", getprogname());
2052 	exit(1);
2053 }
2054 
2055 struct print_diff_arg {
2056 	struct got_repository *repo;
2057 	struct got_worktree *worktree;
2058 	int diff_context;
2059 	const char *id_str;
2060 	int header_shown;
2061 	int diff_staged;
2062 	int ignore_whitespace;
2063 };
2064 
2065 static const struct got_error *
2066 print_diff(void *arg, unsigned char status, unsigned char staged_status,
2067     const char *path, struct got_object_id *blob_id,
2068     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2069     int dirfd, const char *de_name)
2070 {
2071 	struct print_diff_arg *a = arg;
2072 	const struct got_error *err = NULL;
2073 	struct got_blob_object *blob1 = NULL;
2074 	int fd = -1;
2075 	FILE *f2 = NULL;
2076 	char *abspath = NULL, *label1 = NULL;
2077 	struct stat sb;
2078 
2079 	if (a->diff_staged) {
2080 		if (staged_status != GOT_STATUS_MODIFY &&
2081 		    staged_status != GOT_STATUS_ADD &&
2082 		    staged_status != GOT_STATUS_DELETE)
2083 			return NULL;
2084 	} else {
2085 		if (staged_status == GOT_STATUS_DELETE)
2086 			return NULL;
2087 		if (status == GOT_STATUS_NONEXISTENT)
2088 			return got_error_set_errno(ENOENT, path);
2089 		if (status != GOT_STATUS_MODIFY &&
2090 		    status != GOT_STATUS_ADD &&
2091 		    status != GOT_STATUS_DELETE &&
2092 		    status != GOT_STATUS_CONFLICT)
2093 			return NULL;
2094 	}
2095 
2096 	if (!a->header_shown) {
2097 		printf("diff %s %s%s\n", a->id_str,
2098 		    got_worktree_get_root_path(a->worktree),
2099 		    a->diff_staged ? " (staged changes)" : "");
2100 		a->header_shown = 1;
2101 	}
2102 
2103 	if (a->diff_staged) {
2104 		const char *label1 = NULL, *label2 = NULL;
2105 		switch (staged_status) {
2106 		case GOT_STATUS_MODIFY:
2107 			label1 = path;
2108 			label2 = path;
2109 			break;
2110 		case GOT_STATUS_ADD:
2111 			label2 = path;
2112 			break;
2113 		case GOT_STATUS_DELETE:
2114 			label1 = path;
2115 			break;
2116 		default:
2117 			return got_error(GOT_ERR_FILE_STATUS);
2118 		}
2119 		return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2120 		    label1, label2, a->diff_context, a->ignore_whitespace,
2121 		    a->repo, stdout);
2122 	}
2123 
2124 	if (staged_status == GOT_STATUS_ADD ||
2125 	    staged_status == GOT_STATUS_MODIFY) {
2126 		char *id_str;
2127 		err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2128 		    8192);
2129 		if (err)
2130 			goto done;
2131 		err = got_object_id_str(&id_str, staged_blob_id);
2132 		if (err)
2133 			goto done;
2134 		if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2135 			err = got_error_from_errno("asprintf");
2136 			free(id_str);
2137 			goto done;
2138 		}
2139 		free(id_str);
2140 	} else if (status != GOT_STATUS_ADD) {
2141 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2142 		if (err)
2143 			goto done;
2144 	}
2145 
2146 	if (status != GOT_STATUS_DELETE) {
2147 		if (asprintf(&abspath, "%s/%s",
2148 		    got_worktree_get_root_path(a->worktree), path) == -1) {
2149 			err = got_error_from_errno("asprintf");
2150 			goto done;
2151 		}
2152 
2153 		if (dirfd != -1) {
2154 			fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2155 			if (fd == -1) {
2156 				err = got_error_from_errno2("openat", abspath);
2157 				goto done;
2158 			}
2159 		} else {
2160 			fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2161 			if (fd == -1) {
2162 				err = got_error_from_errno2("open", abspath);
2163 				goto done;
2164 			}
2165 		}
2166 		if (fstat(fd, &sb) == -1) {
2167 			err = got_error_from_errno2("fstat", abspath);
2168 			goto done;
2169 		}
2170 		f2 = fdopen(fd, "r");
2171 		if (f2 == NULL) {
2172 			err = got_error_from_errno2("fdopen", abspath);
2173 			goto done;
2174 		}
2175 		fd = -1;
2176 	} else
2177 		sb.st_size = 0;
2178 
2179 	err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2180 	    a->diff_context, a->ignore_whitespace, stdout);
2181 done:
2182 	if (blob1)
2183 		got_object_blob_close(blob1);
2184 	if (f2 && fclose(f2) == EOF && err == NULL)
2185 		err = got_error_from_errno("fclose");
2186 	if (fd != -1 && close(fd) == -1 && err == NULL)
2187 		err = got_error_from_errno("close");
2188 	free(abspath);
2189 	return err;
2190 }
2191 
2192 static const struct got_error *
2193 cmd_diff(int argc, char *argv[])
2194 {
2195 	const struct got_error *error;
2196 	struct got_repository *repo = NULL;
2197 	struct got_worktree *worktree = NULL;
2198 	char *cwd = NULL, *repo_path = NULL;
2199 	struct got_object_id *id1 = NULL, *id2 = NULL;
2200 	const char *id_str1 = NULL, *id_str2 = NULL;
2201 	char *label1 = NULL, *label2 = NULL;
2202 	int type1, type2;
2203 	int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2204 	const char *errstr;
2205 	char *path = NULL;
2206 
2207 #ifndef PROFILE
2208 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2209 	    NULL) == -1)
2210 		err(1, "pledge");
2211 #endif
2212 
2213 	while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2214 		switch (ch) {
2215 		case 'C':
2216 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2217 			    &errstr);
2218 			if (errstr != NULL)
2219 				err(1, "-C option %s", errstr);
2220 			break;
2221 		case 'r':
2222 			repo_path = realpath(optarg, NULL);
2223 			if (repo_path == NULL)
2224 				return got_error_from_errno2("realpath",
2225 				    optarg);
2226 			got_path_strip_trailing_slashes(repo_path);
2227 			break;
2228 		case 's':
2229 			diff_staged = 1;
2230 			break;
2231 		case 'w':
2232 			ignore_whitespace = 1;
2233 			break;
2234 		default:
2235 			usage_diff();
2236 			/* NOTREACHED */
2237 		}
2238 	}
2239 
2240 	argc -= optind;
2241 	argv += optind;
2242 
2243 	cwd = getcwd(NULL, 0);
2244 	if (cwd == NULL) {
2245 		error = got_error_from_errno("getcwd");
2246 		goto done;
2247 	}
2248 	error = got_worktree_open(&worktree, cwd);
2249 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
2250 		goto done;
2251 	if (argc <= 1) {
2252 		if (worktree == NULL) {
2253 			error = got_error(GOT_ERR_NOT_WORKTREE);
2254 			goto done;
2255 		}
2256 		if (repo_path)
2257 			errx(1,
2258 			    "-r option can't be used when diffing a work tree");
2259 		repo_path = strdup(got_worktree_get_repo_path(worktree));
2260 		if (repo_path == NULL) {
2261 			error = got_error_from_errno("strdup");
2262 			goto done;
2263 		}
2264 		if (argc == 1) {
2265 			error = got_worktree_resolve_path(&path, worktree,
2266 			    argv[0]);
2267 			if (error)
2268 				goto done;
2269 		} else {
2270 			path = strdup("");
2271 			if (path == NULL) {
2272 				error = got_error_from_errno("strdup");
2273 				goto done;
2274 			}
2275 		}
2276 	} else if (argc == 2) {
2277 		if (diff_staged)
2278 			errx(1, "-s option can't be used when diffing "
2279 			    "objects in repository");
2280 		id_str1 = argv[0];
2281 		id_str2 = argv[1];
2282 		if (worktree && repo_path == NULL) {
2283 			repo_path =
2284 			    strdup(got_worktree_get_repo_path(worktree));
2285 			if (repo_path == NULL) {
2286 				error = got_error_from_errno("strdup");
2287 				goto done;
2288 			}
2289 		}
2290 	} else
2291 		usage_diff();
2292 
2293 	if (repo_path == NULL) {
2294 		repo_path = getcwd(NULL, 0);
2295 		if (repo_path == NULL)
2296 			return got_error_from_errno("getcwd");
2297 	}
2298 
2299 	error = got_repo_open(&repo, repo_path, NULL);
2300 	free(repo_path);
2301 	if (error != NULL)
2302 		goto done;
2303 
2304 	error = apply_unveil(got_repo_get_path(repo), 1,
2305 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
2306 	if (error)
2307 		goto done;
2308 
2309 	if (argc <= 1) {
2310 		struct print_diff_arg arg;
2311 		struct got_pathlist_head paths;
2312 		char *id_str;
2313 
2314 		TAILQ_INIT(&paths);
2315 
2316 		error = got_object_id_str(&id_str,
2317 		    got_worktree_get_base_commit_id(worktree));
2318 		if (error)
2319 			goto done;
2320 		arg.repo = repo;
2321 		arg.worktree = worktree;
2322 		arg.diff_context = diff_context;
2323 		arg.id_str = id_str;
2324 		arg.header_shown = 0;
2325 		arg.diff_staged = diff_staged;
2326 		arg.ignore_whitespace = ignore_whitespace;
2327 
2328 		error = got_pathlist_append(&paths, path, NULL);
2329 		if (error)
2330 			goto done;
2331 
2332 		error = got_worktree_status(worktree, &paths, repo, print_diff,
2333 		    &arg, check_cancelled, NULL);
2334 		free(id_str);
2335 		got_pathlist_free(&paths);
2336 		goto done;
2337 	}
2338 
2339 	error = got_repo_match_object_id(&id1, &label1, id_str1,
2340 	    GOT_OBJ_TYPE_ANY, 1, repo);
2341 	if (error)
2342 		goto done;
2343 
2344 	error = got_repo_match_object_id(&id2, &label2, id_str2,
2345 	    GOT_OBJ_TYPE_ANY, 1, repo);
2346 	if (error)
2347 		goto done;
2348 
2349 	error = got_object_get_type(&type1, repo, id1);
2350 	if (error)
2351 		goto done;
2352 
2353 	error = got_object_get_type(&type2, repo, id2);
2354 	if (error)
2355 		goto done;
2356 
2357 	if (type1 != type2) {
2358 		error = got_error(GOT_ERR_OBJ_TYPE);
2359 		goto done;
2360 	}
2361 
2362 	switch (type1) {
2363 	case GOT_OBJ_TYPE_BLOB:
2364 		error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2365 		    diff_context, ignore_whitespace, repo, stdout);
2366 		break;
2367 	case GOT_OBJ_TYPE_TREE:
2368 		error = got_diff_objects_as_trees(id1, id2, "", "",
2369 		    diff_context, ignore_whitespace, repo, stdout);
2370 		break;
2371 	case GOT_OBJ_TYPE_COMMIT:
2372 		printf("diff %s %s\n", label1, label2);
2373 		error = got_diff_objects_as_commits(id1, id2, diff_context,
2374 		    ignore_whitespace, repo, stdout);
2375 		break;
2376 	default:
2377 		error = got_error(GOT_ERR_OBJ_TYPE);
2378 	}
2379 done:
2380 	free(label1);
2381 	free(label2);
2382 	free(id1);
2383 	free(id2);
2384 	free(path);
2385 	if (worktree)
2386 		got_worktree_close(worktree);
2387 	if (repo) {
2388 		const struct got_error *repo_error;
2389 		repo_error = got_repo_close(repo);
2390 		if (error == NULL)
2391 			error = repo_error;
2392 	}
2393 	return error;
2394 }
2395 
2396 __dead static void
2397 usage_blame(void)
2398 {
2399 	fprintf(stderr,
2400 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
2401 	    getprogname());
2402 	exit(1);
2403 }
2404 
2405 struct blame_line {
2406 	int annotated;
2407 	char *id_str;
2408 	char *committer;
2409 	char datebuf[11]; /* YYYY-MM-DD + NUL */
2410 };
2411 
2412 struct blame_cb_args {
2413 	struct blame_line *lines;
2414 	int nlines;
2415 	int nlines_prec;
2416 	int lineno_cur;
2417 	off_t *line_offsets;
2418 	FILE *f;
2419 	struct got_repository *repo;
2420 };
2421 
2422 static const struct got_error *
2423 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2424 {
2425 	const struct got_error *err = NULL;
2426 	struct blame_cb_args *a = arg;
2427 	struct blame_line *bline;
2428 	char *line = NULL;
2429 	size_t linesize = 0;
2430 	struct got_commit_object *commit = NULL;
2431 	off_t offset;
2432 	struct tm tm;
2433 	time_t committer_time;
2434 
2435 	if (nlines != a->nlines ||
2436 	    (lineno != -1 && lineno < 1) || lineno > a->nlines)
2437 		return got_error(GOT_ERR_RANGE);
2438 
2439 	if (sigint_received)
2440 		return got_error(GOT_ERR_ITER_COMPLETED);
2441 
2442 	if (lineno == -1)
2443 		return NULL; /* no change in this commit */
2444 
2445 	/* Annotate this line. */
2446 	bline = &a->lines[lineno - 1];
2447 	if (bline->annotated)
2448 		return NULL;
2449 	err = got_object_id_str(&bline->id_str, id);
2450 	if (err)
2451 		return err;
2452 
2453 	err = got_object_open_as_commit(&commit, a->repo, id);
2454 	if (err)
2455 		goto done;
2456 
2457 	bline->committer = strdup(got_object_commit_get_committer(commit));
2458 	if (bline->committer == NULL) {
2459 		err = got_error_from_errno("strdup");
2460 		goto done;
2461 	}
2462 
2463 	committer_time = got_object_commit_get_committer_time(commit);
2464 	if (localtime_r(&committer_time, &tm) == NULL)
2465 		return got_error_from_errno("localtime_r");
2466 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2467 	    &tm) >= sizeof(bline->datebuf)) {
2468 		err = got_error(GOT_ERR_NO_SPACE);
2469 		goto done;
2470 	}
2471 	bline->annotated = 1;
2472 
2473 	/* Print lines annotated so far. */
2474 	bline = &a->lines[a->lineno_cur - 1];
2475 	if (!bline->annotated)
2476 		goto done;
2477 
2478 	offset = a->line_offsets[a->lineno_cur - 1];
2479 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
2480 		err = got_error_from_errno("fseeko");
2481 		goto done;
2482 	}
2483 
2484 	while (bline->annotated) {
2485 		char *smallerthan, *at, *nl, *committer;
2486 		size_t len;
2487 
2488 		if (getline(&line, &linesize, a->f) == -1) {
2489 			if (ferror(a->f))
2490 				err = got_error_from_errno("getline");
2491 			break;
2492 		}
2493 
2494 		committer = bline->committer;
2495 		smallerthan = strchr(committer, '<');
2496 		if (smallerthan && smallerthan[1] != '\0')
2497 			committer = smallerthan + 1;
2498 		at = strchr(committer, '@');
2499 		if (at)
2500 			*at = '\0';
2501 		len = strlen(committer);
2502 		if (len >= 9)
2503 			committer[8] = '\0';
2504 
2505 		nl = strchr(line, '\n');
2506 		if (nl)
2507 			*nl = '\0';
2508 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2509 		    bline->id_str, bline->datebuf, committer, line);
2510 
2511 		a->lineno_cur++;
2512 		bline = &a->lines[a->lineno_cur - 1];
2513 	}
2514 done:
2515 	if (commit)
2516 		got_object_commit_close(commit);
2517 	free(line);
2518 	return err;
2519 }
2520 
2521 static const struct got_error *
2522 cmd_blame(int argc, char *argv[])
2523 {
2524 	const struct got_error *error;
2525 	struct got_repository *repo = NULL;
2526 	struct got_worktree *worktree = NULL;
2527 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2528 	struct got_object_id *obj_id = NULL;
2529 	struct got_object_id *commit_id = NULL;
2530 	struct got_blob_object *blob = NULL;
2531 	char *commit_id_str = NULL;
2532 	struct blame_cb_args bca;
2533 	int ch, obj_type, i;
2534 	size_t filesize;
2535 
2536 	memset(&bca, 0, sizeof(bca));
2537 
2538 #ifndef PROFILE
2539 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2540 	    NULL) == -1)
2541 		err(1, "pledge");
2542 #endif
2543 
2544 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2545 		switch (ch) {
2546 		case 'c':
2547 			commit_id_str = optarg;
2548 			break;
2549 		case 'r':
2550 			repo_path = realpath(optarg, NULL);
2551 			if (repo_path == NULL)
2552 				return got_error_from_errno2("realpath",
2553 				    optarg);
2554 			got_path_strip_trailing_slashes(repo_path);
2555 			break;
2556 		default:
2557 			usage_blame();
2558 			/* NOTREACHED */
2559 		}
2560 	}
2561 
2562 	argc -= optind;
2563 	argv += optind;
2564 
2565 	if (argc == 1)
2566 		path = argv[0];
2567 	else
2568 		usage_blame();
2569 
2570 	cwd = getcwd(NULL, 0);
2571 	if (cwd == NULL) {
2572 		error = got_error_from_errno("getcwd");
2573 		goto done;
2574 	}
2575 	if (repo_path == NULL) {
2576 		error = got_worktree_open(&worktree, cwd);
2577 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2578 			goto done;
2579 		else
2580 			error = NULL;
2581 		if (worktree) {
2582 			repo_path =
2583 			    strdup(got_worktree_get_repo_path(worktree));
2584 			if (repo_path == NULL)
2585 				error = got_error_from_errno("strdup");
2586 			if (error)
2587 				goto done;
2588 		} else {
2589 			repo_path = strdup(cwd);
2590 			if (repo_path == NULL) {
2591 				error = got_error_from_errno("strdup");
2592 				goto done;
2593 			}
2594 		}
2595 	}
2596 
2597 	error = got_repo_open(&repo, repo_path, NULL);
2598 	if (error != NULL)
2599 		goto done;
2600 
2601 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2602 	if (error)
2603 		goto done;
2604 
2605 	if (worktree) {
2606 		const char *prefix = got_worktree_get_path_prefix(worktree);
2607 		char *p, *worktree_subdir = cwd +
2608 		    strlen(got_worktree_get_root_path(worktree));
2609 		if (asprintf(&p, "%s%s%s%s%s",
2610 		    prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2611 		    worktree_subdir, worktree_subdir[0] ? "/" : "",
2612 		    path) == -1) {
2613 			error = got_error_from_errno("asprintf");
2614 			goto done;
2615 		}
2616 		error = got_repo_map_path(&in_repo_path, repo, p, 0);
2617 		free(p);
2618 	} else {
2619 		error = got_repo_map_path(&in_repo_path, repo, path, 1);
2620 	}
2621 	if (error)
2622 		goto done;
2623 
2624 	if (commit_id_str == NULL) {
2625 		struct got_reference *head_ref;
2626 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2627 		if (error != NULL)
2628 			goto done;
2629 		error = got_ref_resolve(&commit_id, repo, head_ref);
2630 		got_ref_close(head_ref);
2631 		if (error != NULL)
2632 			goto done;
2633 	} else {
2634 		error = got_repo_match_object_id(&commit_id, NULL,
2635 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2636 		if (error)
2637 			goto done;
2638 	}
2639 
2640 	error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2641 	if (error)
2642 		goto done;
2643 	if (obj_id == NULL) {
2644 		error = got_error(GOT_ERR_NO_OBJ);
2645 		goto done;
2646 	}
2647 
2648 	error = got_object_get_type(&obj_type, repo, obj_id);
2649 	if (error)
2650 		goto done;
2651 
2652 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
2653 		error = got_error(GOT_ERR_OBJ_TYPE);
2654 		goto done;
2655 	}
2656 
2657 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2658 	if (error)
2659 		goto done;
2660 	bca.f = got_opentemp();
2661 	if (bca.f == NULL) {
2662 		error = got_error_from_errno("got_opentemp");
2663 		goto done;
2664 	}
2665 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2666 	    &bca.line_offsets, bca.f, blob);
2667 	if (error || bca.nlines == 0)
2668 		goto done;
2669 
2670 	/* Don't include \n at EOF in the blame line count. */
2671 	if (bca.line_offsets[bca.nlines - 1] == filesize)
2672 		bca.nlines--;
2673 
2674 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2675 	if (bca.lines == NULL) {
2676 		error = got_error_from_errno("calloc");
2677 		goto done;
2678 	}
2679 	bca.lineno_cur = 1;
2680 	bca.nlines_prec = 0;
2681 	i = bca.nlines;
2682 	while (i > 0) {
2683 		i /= 10;
2684 		bca.nlines_prec++;
2685 	}
2686 	bca.repo = repo;
2687 
2688 	error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2689 	    check_cancelled, NULL);
2690 done:
2691 	free(in_repo_path);
2692 	free(repo_path);
2693 	free(cwd);
2694 	free(commit_id);
2695 	free(obj_id);
2696 	if (blob)
2697 		got_object_blob_close(blob);
2698 	if (worktree)
2699 		got_worktree_close(worktree);
2700 	if (repo) {
2701 		const struct got_error *repo_error;
2702 		repo_error = got_repo_close(repo);
2703 		if (error == NULL)
2704 			error = repo_error;
2705 	}
2706 	if (bca.lines) {
2707 		for (i = 0; i < bca.nlines; i++) {
2708 			struct blame_line *bline = &bca.lines[i];
2709 			free(bline->id_str);
2710 			free(bline->committer);
2711 		}
2712 		free(bca.lines);
2713 	}
2714 	free(bca.line_offsets);
2715 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
2716 		error = got_error_from_errno("fclose");
2717 	return error;
2718 }
2719 
2720 __dead static void
2721 usage_tree(void)
2722 {
2723 	fprintf(stderr,
2724 	    "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2725 	    getprogname());
2726 	exit(1);
2727 }
2728 
2729 static void
2730 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2731     const char *root_path)
2732 {
2733 	int is_root_path = (strcmp(path, root_path) == 0);
2734 	const char *modestr = "";
2735 	mode_t mode = got_tree_entry_get_mode(te);
2736 
2737 	path += strlen(root_path);
2738 	while (path[0] == '/')
2739 		path++;
2740 
2741 	if (got_object_tree_entry_is_submodule(te))
2742 		modestr = "$";
2743 	else if (S_ISLNK(mode))
2744 		modestr = "@";
2745 	else if (S_ISDIR(mode))
2746 		modestr = "/";
2747 	else if (mode & S_IXUSR)
2748 		modestr = "*";
2749 
2750 	printf("%s%s%s%s%s\n", id ? id : "", path,
2751 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2752 }
2753 
2754 static const struct got_error *
2755 print_tree(const char *path, struct got_object_id *commit_id,
2756     int show_ids, int recurse, const char *root_path,
2757     struct got_repository *repo)
2758 {
2759 	const struct got_error *err = NULL;
2760 	struct got_object_id *tree_id = NULL;
2761 	struct got_tree_object *tree = NULL;
2762 	int nentries, i;
2763 
2764 	err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2765 	if (err)
2766 		goto done;
2767 
2768 	err = got_object_open_as_tree(&tree, repo, tree_id);
2769 	if (err)
2770 		goto done;
2771 	nentries = got_object_tree_get_nentries(tree);
2772 	for (i = 0; i < nentries; i++) {
2773 		struct got_tree_entry *te;
2774 		char *id = NULL;
2775 
2776 		if (sigint_received || sigpipe_received)
2777 			break;
2778 
2779 		te = got_object_tree_get_entry(tree, i);
2780 		if (show_ids) {
2781 			char *id_str;
2782 			err = got_object_id_str(&id_str,
2783 			    got_tree_entry_get_id(te));
2784 			if (err)
2785 				goto done;
2786 			if (asprintf(&id, "%s ", id_str) == -1) {
2787 				err = got_error_from_errno("asprintf");
2788 				free(id_str);
2789 				goto done;
2790 			}
2791 			free(id_str);
2792 		}
2793 		print_entry(te, id, path, root_path);
2794 		free(id);
2795 
2796 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2797 			char *child_path;
2798 			if (asprintf(&child_path, "%s%s%s", path,
2799 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
2800 			    got_tree_entry_get_name(te)) == -1) {
2801 				err = got_error_from_errno("asprintf");
2802 				goto done;
2803 			}
2804 			err = print_tree(child_path, commit_id, show_ids, 1,
2805 			    root_path, repo);
2806 			free(child_path);
2807 			if (err)
2808 				goto done;
2809 		}
2810 	}
2811 done:
2812 	if (tree)
2813 		got_object_tree_close(tree);
2814 	free(tree_id);
2815 	return err;
2816 }
2817 
2818 static const struct got_error *
2819 cmd_tree(int argc, char *argv[])
2820 {
2821 	const struct got_error *error;
2822 	struct got_repository *repo = NULL;
2823 	struct got_worktree *worktree = NULL;
2824 	const char *path;
2825 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2826 	struct got_object_id *commit_id = NULL;
2827 	char *commit_id_str = NULL;
2828 	int show_ids = 0, recurse = 0;
2829 	int ch;
2830 
2831 #ifndef PROFILE
2832 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2833 	    NULL) == -1)
2834 		err(1, "pledge");
2835 #endif
2836 
2837 	while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2838 		switch (ch) {
2839 		case 'c':
2840 			commit_id_str = optarg;
2841 			break;
2842 		case 'r':
2843 			repo_path = realpath(optarg, NULL);
2844 			if (repo_path == NULL)
2845 				return got_error_from_errno2("realpath",
2846 				    optarg);
2847 			got_path_strip_trailing_slashes(repo_path);
2848 			break;
2849 		case 'i':
2850 			show_ids = 1;
2851 			break;
2852 		case 'R':
2853 			recurse = 1;
2854 			break;
2855 		default:
2856 			usage_tree();
2857 			/* NOTREACHED */
2858 		}
2859 	}
2860 
2861 	argc -= optind;
2862 	argv += optind;
2863 
2864 	if (argc == 1)
2865 		path = argv[0];
2866 	else if (argc > 1)
2867 		usage_tree();
2868 	else
2869 		path = NULL;
2870 
2871 	cwd = getcwd(NULL, 0);
2872 	if (cwd == NULL) {
2873 		error = got_error_from_errno("getcwd");
2874 		goto done;
2875 	}
2876 	if (repo_path == NULL) {
2877 		error = got_worktree_open(&worktree, cwd);
2878 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2879 			goto done;
2880 		else
2881 			error = NULL;
2882 		if (worktree) {
2883 			repo_path =
2884 			    strdup(got_worktree_get_repo_path(worktree));
2885 			if (repo_path == NULL)
2886 				error = got_error_from_errno("strdup");
2887 			if (error)
2888 				goto done;
2889 		} else {
2890 			repo_path = strdup(cwd);
2891 			if (repo_path == NULL) {
2892 				error = got_error_from_errno("strdup");
2893 				goto done;
2894 			}
2895 		}
2896 	}
2897 
2898 	error = got_repo_open(&repo, repo_path, NULL);
2899 	if (error != NULL)
2900 		goto done;
2901 
2902 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2903 	if (error)
2904 		goto done;
2905 
2906 	if (path == NULL) {
2907 		if (worktree) {
2908 			char *p, *worktree_subdir = cwd +
2909 			    strlen(got_worktree_get_root_path(worktree));
2910 			if (asprintf(&p, "%s/%s",
2911 			    got_worktree_get_path_prefix(worktree),
2912 			    worktree_subdir) == -1) {
2913 				error = got_error_from_errno("asprintf");
2914 				goto done;
2915 			}
2916 			error = got_repo_map_path(&in_repo_path, repo, p, 1);
2917 			free(p);
2918 			if (error)
2919 				goto done;
2920 		} else
2921 			path = "/";
2922 	}
2923 	if (in_repo_path == NULL) {
2924 		error = got_repo_map_path(&in_repo_path, repo, path, 1);
2925 		if (error != NULL)
2926 			goto done;
2927 	}
2928 
2929 	if (commit_id_str == NULL) {
2930 		struct got_reference *head_ref;
2931 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2932 		if (error != NULL)
2933 			goto done;
2934 		error = got_ref_resolve(&commit_id, repo, head_ref);
2935 		got_ref_close(head_ref);
2936 		if (error != NULL)
2937 			goto done;
2938 	} else {
2939 		error = got_repo_match_object_id(&commit_id, NULL,
2940 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2941 		if (error)
2942 			goto done;
2943 	}
2944 
2945 	error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2946 	    in_repo_path, repo);
2947 done:
2948 	free(in_repo_path);
2949 	free(repo_path);
2950 	free(cwd);
2951 	free(commit_id);
2952 	if (worktree)
2953 		got_worktree_close(worktree);
2954 	if (repo) {
2955 		const struct got_error *repo_error;
2956 		repo_error = got_repo_close(repo);
2957 		if (error == NULL)
2958 			error = repo_error;
2959 	}
2960 	return error;
2961 }
2962 
2963 __dead static void
2964 usage_status(void)
2965 {
2966 	fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2967 	exit(1);
2968 }
2969 
2970 static const struct got_error *
2971 print_status(void *arg, unsigned char status, unsigned char staged_status,
2972     const char *path, struct got_object_id *blob_id,
2973     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2974     int dirfd, const char *de_name)
2975 {
2976 	if (status == staged_status && (status == GOT_STATUS_DELETE))
2977 		status = GOT_STATUS_NO_CHANGE;
2978 	printf("%c%c %s\n", status, staged_status, path);
2979 	return NULL;
2980 }
2981 
2982 static const struct got_error *
2983 cmd_status(int argc, char *argv[])
2984 {
2985 	const struct got_error *error = NULL;
2986 	struct got_repository *repo = NULL;
2987 	struct got_worktree *worktree = NULL;
2988 	char *cwd = NULL;
2989 	struct got_pathlist_head paths;
2990 	struct got_pathlist_entry *pe;
2991 	int ch;
2992 
2993 	TAILQ_INIT(&paths);
2994 
2995 	while ((ch = getopt(argc, argv, "")) != -1) {
2996 		switch (ch) {
2997 		default:
2998 			usage_status();
2999 			/* NOTREACHED */
3000 		}
3001 	}
3002 
3003 	argc -= optind;
3004 	argv += optind;
3005 
3006 #ifndef PROFILE
3007 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3008 	    NULL) == -1)
3009 		err(1, "pledge");
3010 #endif
3011 	cwd = getcwd(NULL, 0);
3012 	if (cwd == NULL) {
3013 		error = got_error_from_errno("getcwd");
3014 		goto done;
3015 	}
3016 
3017 	error = got_worktree_open(&worktree, cwd);
3018 	if (error != NULL)
3019 		goto done;
3020 
3021 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3022 	    NULL);
3023 	if (error != NULL)
3024 		goto done;
3025 
3026 	error = apply_unveil(got_repo_get_path(repo), 1,
3027 	    got_worktree_get_root_path(worktree));
3028 	if (error)
3029 		goto done;
3030 
3031 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3032 	if (error)
3033 		goto done;
3034 
3035 	error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3036 	    check_cancelled, NULL);
3037 done:
3038 	TAILQ_FOREACH(pe, &paths, entry)
3039 		free((char *)pe->path);
3040 	got_pathlist_free(&paths);
3041 	free(cwd);
3042 	return error;
3043 }
3044 
3045 __dead static void
3046 usage_ref(void)
3047 {
3048 	fprintf(stderr,
3049 	    "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3050 	    getprogname());
3051 	exit(1);
3052 }
3053 
3054 static const struct got_error *
3055 list_refs(struct got_repository *repo)
3056 {
3057 	static const struct got_error *err = NULL;
3058 	struct got_reflist_head refs;
3059 	struct got_reflist_entry *re;
3060 
3061 	SIMPLEQ_INIT(&refs);
3062 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3063 	if (err)
3064 		return err;
3065 
3066 	SIMPLEQ_FOREACH(re, &refs, entry) {
3067 		char *refstr;
3068 		refstr = got_ref_to_str(re->ref);
3069 		if (refstr == NULL)
3070 			return got_error_from_errno("got_ref_to_str");
3071 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3072 		free(refstr);
3073 	}
3074 
3075 	got_ref_list_free(&refs);
3076 	return NULL;
3077 }
3078 
3079 static const struct got_error *
3080 delete_ref(struct got_repository *repo, const char *refname)
3081 {
3082 	const struct got_error *err = NULL;
3083 	struct got_reference *ref;
3084 
3085 	err = got_ref_open(&ref, repo, refname, 0);
3086 	if (err)
3087 		return err;
3088 
3089 	err = got_ref_delete(ref, repo);
3090 	got_ref_close(ref);
3091 	return err;
3092 }
3093 
3094 static const struct got_error *
3095 add_ref(struct got_repository *repo, const char *refname, const char *target)
3096 {
3097 	const struct got_error *err = NULL;
3098 	struct got_object_id *id;
3099 	struct got_reference *ref = NULL;
3100 
3101 	/*
3102 	 * Don't let the user create a reference name with a leading '-'.
3103 	 * While technically a valid reference name, this case is usually
3104 	 * an unintended typo.
3105 	 */
3106 	if (refname[0] == '-')
3107 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3108 
3109 	err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3110 	    repo);
3111 	if (err) {
3112 		struct got_reference *target_ref;
3113 
3114 		if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3115 			return err;
3116 		err = got_ref_open(&target_ref, repo, target, 0);
3117 		if (err)
3118 			return err;
3119 		err = got_ref_resolve(&id, repo, target_ref);
3120 		got_ref_close(target_ref);
3121 		if (err)
3122 			return err;
3123 	}
3124 
3125 	err = got_ref_alloc(&ref, refname, id);
3126 	if (err)
3127 		goto done;
3128 
3129 	err = got_ref_write(ref, repo);
3130 done:
3131 	if (ref)
3132 		got_ref_close(ref);
3133 	free(id);
3134 	return err;
3135 }
3136 
3137 static const struct got_error *
3138 add_symref(struct got_repository *repo, const char *refname, const char *target)
3139 {
3140 	const struct got_error *err = NULL;
3141 	struct got_reference *ref = NULL;
3142 	struct got_reference *target_ref = NULL;
3143 
3144 	/*
3145 	 * Don't let the user create a reference name with a leading '-'.
3146 	 * While technically a valid reference name, this case is usually
3147 	 * an unintended typo.
3148 	 */
3149 	if (refname[0] == '-')
3150 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3151 
3152 	err = got_ref_open(&target_ref, repo, target, 0);
3153 	if (err)
3154 		return err;
3155 
3156 	err = got_ref_alloc_symref(&ref, refname, target_ref);
3157 	if (err)
3158 		goto done;
3159 
3160 	err = got_ref_write(ref, repo);
3161 done:
3162 	if (target_ref)
3163 		got_ref_close(target_ref);
3164 	if (ref)
3165 		got_ref_close(ref);
3166 	return err;
3167 }
3168 
3169 static const struct got_error *
3170 cmd_ref(int argc, char *argv[])
3171 {
3172 	const struct got_error *error = NULL;
3173 	struct got_repository *repo = NULL;
3174 	struct got_worktree *worktree = NULL;
3175 	char *cwd = NULL, *repo_path = NULL;
3176 	int ch, do_list = 0, create_symref = 0;
3177 	const char *delref = NULL;
3178 
3179 	/* TODO: Add -s option for adding symbolic references. */
3180 	while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3181 		switch (ch) {
3182 		case 'd':
3183 			delref = optarg;
3184 			break;
3185 		case 'r':
3186 			repo_path = realpath(optarg, NULL);
3187 			if (repo_path == NULL)
3188 				return got_error_from_errno2("realpath",
3189 				    optarg);
3190 			got_path_strip_trailing_slashes(repo_path);
3191 			break;
3192 		case 'l':
3193 			do_list = 1;
3194 			break;
3195 		case 's':
3196 			create_symref = 1;
3197 			break;
3198 		default:
3199 			usage_ref();
3200 			/* NOTREACHED */
3201 		}
3202 	}
3203 
3204 	if (do_list && delref)
3205 		errx(1, "-l and -d options are mutually exclusive\n");
3206 
3207 	argc -= optind;
3208 	argv += optind;
3209 
3210 	if (do_list || delref) {
3211 		if (create_symref)
3212 			errx(1, "-s option cannot be used together with the "
3213 			    "-l or -d options");
3214 		if (argc > 0)
3215 			usage_ref();
3216 	} else if (argc != 2)
3217 		usage_ref();
3218 
3219 #ifndef PROFILE
3220 	if (do_list) {
3221 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3222 		    NULL) == -1)
3223 			err(1, "pledge");
3224 	} else {
3225 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3226 		    "sendfd unveil", NULL) == -1)
3227 			err(1, "pledge");
3228 	}
3229 #endif
3230 	cwd = getcwd(NULL, 0);
3231 	if (cwd == NULL) {
3232 		error = got_error_from_errno("getcwd");
3233 		goto done;
3234 	}
3235 
3236 	if (repo_path == NULL) {
3237 		error = got_worktree_open(&worktree, cwd);
3238 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
3239 			goto done;
3240 		else
3241 			error = NULL;
3242 		if (worktree) {
3243 			repo_path =
3244 			    strdup(got_worktree_get_repo_path(worktree));
3245 			if (repo_path == NULL)
3246 				error = got_error_from_errno("strdup");
3247 			if (error)
3248 				goto done;
3249 		} else {
3250 			repo_path = strdup(cwd);
3251 			if (repo_path == NULL) {
3252 				error = got_error_from_errno("strdup");
3253 				goto done;
3254 			}
3255 		}
3256 	}
3257 
3258 	error = got_repo_open(&repo, repo_path, NULL);
3259 	if (error != NULL)
3260 		goto done;
3261 
3262 	error = apply_unveil(got_repo_get_path(repo), do_list,
3263 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
3264 	if (error)
3265 		goto done;
3266 
3267 	if (do_list)
3268 		error = list_refs(repo);
3269 	else if (delref)
3270 		error = delete_ref(repo, delref);
3271 	else if (create_symref)
3272 		error = add_symref(repo, argv[0], argv[1]);
3273 	else
3274 		error = add_ref(repo, argv[0], argv[1]);
3275 done:
3276 	if (repo)
3277 		got_repo_close(repo);
3278 	if (worktree)
3279 		got_worktree_close(worktree);
3280 	free(cwd);
3281 	free(repo_path);
3282 	return error;
3283 }
3284 
3285 __dead static void
3286 usage_branch(void)
3287 {
3288 	fprintf(stderr,
3289 	    "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3290 	    "[name]\n", getprogname());
3291 	exit(1);
3292 }
3293 
3294 static const struct got_error *
3295 list_branch(struct got_repository *repo, struct got_worktree *worktree,
3296     struct got_reference *ref)
3297 {
3298 	const struct got_error *err = NULL;
3299 	const char *refname, *marker = "  ";
3300 	char *refstr;
3301 
3302 	refname = got_ref_get_name(ref);
3303 	if (worktree && strcmp(refname,
3304 	    got_worktree_get_head_ref_name(worktree)) == 0) {
3305 		struct got_object_id *id = NULL;
3306 
3307 		err = got_ref_resolve(&id, repo, ref);
3308 		if (err)
3309 			return err;
3310 		if (got_object_id_cmp(id,
3311 		    got_worktree_get_base_commit_id(worktree)) == 0)
3312 			marker = "* ";
3313 		else
3314 			marker = "~ ";
3315 		free(id);
3316 	}
3317 
3318 	if (strncmp(refname, "refs/heads/", 11) == 0)
3319 		refname += 11;
3320 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3321 		refname += 18;
3322 
3323 	refstr = got_ref_to_str(ref);
3324 	if (refstr == NULL)
3325 		return got_error_from_errno("got_ref_to_str");
3326 
3327 	printf("%s%s: %s\n", marker, refname, refstr);
3328 	free(refstr);
3329 	return NULL;
3330 }
3331 
3332 static const struct got_error *
3333 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3334 {
3335 	const char *refname;
3336 
3337 	if (worktree == NULL)
3338 		return got_error(GOT_ERR_NOT_WORKTREE);
3339 
3340 	refname = got_worktree_get_head_ref_name(worktree);
3341 
3342 	if (strncmp(refname, "refs/heads/", 11) == 0)
3343 		refname += 11;
3344 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3345 		refname += 18;
3346 
3347 	printf("%s\n", refname);
3348 
3349 	return NULL;
3350 }
3351 
3352 static const struct got_error *
3353 list_branches(struct got_repository *repo, struct got_worktree *worktree)
3354 {
3355 	static const struct got_error *err = NULL;
3356 	struct got_reflist_head refs;
3357 	struct got_reflist_entry *re;
3358 	struct got_reference *temp_ref = NULL;
3359 	int rebase_in_progress, histedit_in_progress;
3360 
3361 	SIMPLEQ_INIT(&refs);
3362 
3363 	if (worktree) {
3364 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
3365 		    worktree);
3366 		if (err)
3367 			return err;
3368 
3369 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
3370 		    worktree);
3371 		if (err)
3372 			return err;
3373 
3374 		if (rebase_in_progress || histedit_in_progress) {
3375 			err = got_ref_open(&temp_ref, repo,
3376 			    got_worktree_get_head_ref_name(worktree), 0);
3377 			if (err)
3378 				return err;
3379 			list_branch(repo, worktree, temp_ref);
3380 			got_ref_close(temp_ref);
3381 		}
3382 	}
3383 
3384 	err = got_ref_list(&refs, repo, "refs/heads",
3385 	    got_ref_cmp_by_name, NULL);
3386 	if (err)
3387 		return err;
3388 
3389 	SIMPLEQ_FOREACH(re, &refs, entry)
3390 		list_branch(repo, worktree, re->ref);
3391 
3392 	got_ref_list_free(&refs);
3393 	return NULL;
3394 }
3395 
3396 static const struct got_error *
3397 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3398     const char *branch_name)
3399 {
3400 	const struct got_error *err = NULL;
3401 	struct got_reference *ref = NULL;
3402 	char *refname;
3403 
3404 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3405 		return got_error_from_errno("asprintf");
3406 
3407 	err = got_ref_open(&ref, repo, refname, 0);
3408 	if (err)
3409 		goto done;
3410 
3411 	if (worktree &&
3412 	    strcmp(got_worktree_get_head_ref_name(worktree),
3413 	    got_ref_get_name(ref)) == 0) {
3414 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
3415 		    "will not delete this work tree's current branch");
3416 		goto done;
3417 	}
3418 
3419 	err = got_ref_delete(ref, repo);
3420 done:
3421 	if (ref)
3422 		got_ref_close(ref);
3423 	free(refname);
3424 	return err;
3425 }
3426 
3427 static const struct got_error *
3428 add_branch(struct got_repository *repo, const char *branch_name,
3429     struct got_object_id *base_commit_id)
3430 {
3431 	const struct got_error *err = NULL;
3432 	struct got_reference *ref = NULL;
3433 	char *base_refname = NULL, *refname = NULL;
3434 
3435 	/*
3436 	 * Don't let the user create a branch name with a leading '-'.
3437 	 * While technically a valid reference name, this case is usually
3438 	 * an unintended typo.
3439 	 */
3440 	if (branch_name[0] == '-')
3441 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3442 
3443 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3444 		 err = got_error_from_errno("asprintf");
3445 		 goto done;
3446 	}
3447 
3448 	err = got_ref_open(&ref, repo, refname, 0);
3449 	if (err == NULL) {
3450 		err = got_error(GOT_ERR_BRANCH_EXISTS);
3451 		goto done;
3452 	} else if (err->code != GOT_ERR_NOT_REF)
3453 		goto done;
3454 
3455 	err = got_ref_alloc(&ref, refname, base_commit_id);
3456 	if (err)
3457 		goto done;
3458 
3459 	err = got_ref_write(ref, repo);
3460 done:
3461 	if (ref)
3462 		got_ref_close(ref);
3463 	free(base_refname);
3464 	free(refname);
3465 	return err;
3466 }
3467 
3468 static const struct got_error *
3469 cmd_branch(int argc, char *argv[])
3470 {
3471 	const struct got_error *error = NULL;
3472 	struct got_repository *repo = NULL;
3473 	struct got_worktree *worktree = NULL;
3474 	char *cwd = NULL, *repo_path = NULL;
3475 	int ch, do_list = 0, do_show = 0;
3476 	const char *delref = NULL, *commit_id_arg = NULL;
3477 
3478 	while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3479 		switch (ch) {
3480 		case 'c':
3481 			commit_id_arg = optarg;
3482 			break;
3483 		case 'd':
3484 			delref = optarg;
3485 			break;
3486 		case 'r':
3487 			repo_path = realpath(optarg, NULL);
3488 			if (repo_path == NULL)
3489 				return got_error_from_errno2("realpath",
3490 				    optarg);
3491 			got_path_strip_trailing_slashes(repo_path);
3492 			break;
3493 		case 'l':
3494 			do_list = 1;
3495 			break;
3496 		default:
3497 			usage_branch();
3498 			/* NOTREACHED */
3499 		}
3500 	}
3501 
3502 	if (do_list && delref)
3503 		errx(1, "-l and -d options are mutually exclusive\n");
3504 
3505 	argc -= optind;
3506 	argv += optind;
3507 
3508 	if (!do_list && !delref && argc == 0)
3509 		do_show = 1;
3510 
3511 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
3512 		errx(1, "-c option can only be used when creating a branch");
3513 
3514 	if (do_list || delref) {
3515 		if (argc > 0)
3516 			usage_branch();
3517 	} else if (!do_show && argc != 1)
3518 		usage_branch();
3519 
3520 #ifndef PROFILE
3521 	if (do_list || do_show) {
3522 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3523 		    NULL) == -1)
3524 			err(1, "pledge");
3525 	} else {
3526 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3527 		    "sendfd unveil", NULL) == -1)
3528 			err(1, "pledge");
3529 	}
3530 #endif
3531 	cwd = getcwd(NULL, 0);
3532 	if (cwd == NULL) {
3533 		error = got_error_from_errno("getcwd");
3534 		goto done;
3535 	}
3536 
3537 	if (repo_path == NULL) {
3538 		error = got_worktree_open(&worktree, cwd);
3539 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
3540 			goto done;
3541 		else
3542 			error = NULL;
3543 		if (worktree) {
3544 			repo_path =
3545 			    strdup(got_worktree_get_repo_path(worktree));
3546 			if (repo_path == NULL)
3547 				error = got_error_from_errno("strdup");
3548 			if (error)
3549 				goto done;
3550 		} else {
3551 			repo_path = strdup(cwd);
3552 			if (repo_path == NULL) {
3553 				error = got_error_from_errno("strdup");
3554 				goto done;
3555 			}
3556 		}
3557 	}
3558 
3559 	error = got_repo_open(&repo, repo_path, NULL);
3560 	if (error != NULL)
3561 		goto done;
3562 
3563 	error = apply_unveil(got_repo_get_path(repo), do_list,
3564 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
3565 	if (error)
3566 		goto done;
3567 
3568 	if (do_show)
3569 		error = show_current_branch(repo, worktree);
3570 	else if (do_list)
3571 		error = list_branches(repo, worktree);
3572 	else if (delref)
3573 		error = delete_branch(repo, worktree, delref);
3574 	else {
3575 		struct got_object_id *commit_id;
3576 		if (commit_id_arg == NULL)
3577 			commit_id_arg = worktree ?
3578 			    got_worktree_get_head_ref_name(worktree) :
3579 			    GOT_REF_HEAD;
3580 		error = got_repo_match_object_id(&commit_id, NULL,
3581 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3582 		if (error)
3583 			goto done;
3584 		error = add_branch(repo, argv[0], commit_id);
3585 		free(commit_id);
3586 	}
3587 done:
3588 	if (repo)
3589 		got_repo_close(repo);
3590 	if (worktree)
3591 		got_worktree_close(worktree);
3592 	free(cwd);
3593 	free(repo_path);
3594 	return error;
3595 }
3596 
3597 
3598 __dead static void
3599 usage_tag(void)
3600 {
3601 	fprintf(stderr,
3602 	    "usage: %s tag [-r repository] | -l | "
3603 	        "[-m message] name [commit]\n", getprogname());
3604 	exit(1);
3605 }
3606 
3607 #if 0
3608 static const struct got_error *
3609 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3610 {
3611 	const struct got_error *err = NULL;
3612 	struct got_reflist_entry *re, *se, *new;
3613 	struct got_object_id *re_id, *se_id;
3614 	struct got_tag_object *re_tag, *se_tag;
3615 	time_t re_time, se_time;
3616 
3617 	SIMPLEQ_FOREACH(re, tags, entry) {
3618 		se = SIMPLEQ_FIRST(sorted);
3619 		if (se == NULL) {
3620 			err = got_reflist_entry_dup(&new, re);
3621 			if (err)
3622 				return err;
3623 			SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3624 			continue;
3625 		} else {
3626 			err = got_ref_resolve(&re_id, repo, re->ref);
3627 			if (err)
3628 				break;
3629 			err = got_object_open_as_tag(&re_tag, repo, re_id);
3630 			free(re_id);
3631 			if (err)
3632 				break;
3633 			re_time = got_object_tag_get_tagger_time(re_tag);
3634 			got_object_tag_close(re_tag);
3635 		}
3636 
3637 		while (se) {
3638 			err = got_ref_resolve(&se_id, repo, re->ref);
3639 			if (err)
3640 				break;
3641 			err = got_object_open_as_tag(&se_tag, repo, se_id);
3642 			free(se_id);
3643 			if (err)
3644 				break;
3645 			se_time = got_object_tag_get_tagger_time(se_tag);
3646 			got_object_tag_close(se_tag);
3647 
3648 			if (se_time > re_time) {
3649 				err = got_reflist_entry_dup(&new, re);
3650 				if (err)
3651 					return err;
3652 				SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3653 				break;
3654 			}
3655 			se = SIMPLEQ_NEXT(se, entry);
3656 			continue;
3657 		}
3658 	}
3659 done:
3660 	return err;
3661 }
3662 #endif
3663 
3664 static const struct got_error *
3665 cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3666     struct got_reference *ref2)
3667 {
3668 	const struct got_error *err = NULL;
3669 	struct got_repository *repo = arg;
3670 	struct got_object_id *id1, *id2 = NULL;
3671 	struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3672 	struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3673 	time_t time1, time2;
3674 
3675 	*cmp = 0;
3676 
3677 	err = got_ref_resolve(&id1, repo, ref1);
3678 	if (err)
3679 		return err;
3680 	err = got_object_open_as_tag(&tag1, repo, id1);
3681 	if (err) {
3682 		if (err->code != GOT_ERR_OBJ_TYPE)
3683 			goto done;
3684 		/* "lightweight" tag */
3685 		err = got_object_open_as_commit(&commit1, repo, id1);
3686 		if (err)
3687 			goto done;
3688 		time1 = got_object_commit_get_committer_time(commit1);
3689 	} else
3690 		time1 = got_object_tag_get_tagger_time(tag1);
3691 
3692 	err = got_ref_resolve(&id2, repo, ref2);
3693 	if (err)
3694 		goto done;
3695 	err = got_object_open_as_tag(&tag2, repo, id2);
3696 	if (err) {
3697 		if (err->code != GOT_ERR_OBJ_TYPE)
3698 			goto done;
3699 		/* "lightweight" tag */
3700 		err = got_object_open_as_commit(&commit2, repo, id2);
3701 		if (err)
3702 			goto done;
3703 		time2 = got_object_commit_get_committer_time(commit2);
3704 	} else
3705 		time2 = got_object_tag_get_tagger_time(tag2);
3706 
3707 	/* Put latest tags first. */
3708 	if (time1 < time2)
3709 		*cmp = 1;
3710 	else if (time1 > time2)
3711 		*cmp = -1;
3712 	else
3713 		err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3714 done:
3715 	free(id1);
3716 	free(id2);
3717 	if (tag1)
3718 		got_object_tag_close(tag1);
3719 	if (tag2)
3720 		got_object_tag_close(tag2);
3721 	if (commit1)
3722 		got_object_commit_close(commit1);
3723 	if (commit2)
3724 		got_object_commit_close(commit2);
3725 	return err;
3726 }
3727 
3728 static const struct got_error *
3729 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3730 {
3731 	static const struct got_error *err = NULL;
3732 	struct got_reflist_head refs;
3733 	struct got_reflist_entry *re;
3734 
3735 	SIMPLEQ_INIT(&refs);
3736 
3737 	err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3738 	if (err)
3739 		return err;
3740 
3741 	SIMPLEQ_FOREACH(re, &refs, entry) {
3742 		const char *refname;
3743 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3744 		char datebuf[26];
3745 		const char *tagger;
3746 		time_t tagger_time;
3747 		struct got_object_id *id;
3748 		struct got_tag_object *tag;
3749 		struct got_commit_object *commit = NULL;
3750 
3751 		refname = got_ref_get_name(re->ref);
3752 		if (strncmp(refname, "refs/tags/", 10) != 0)
3753 			continue;
3754 		refname += 10;
3755 		refstr = got_ref_to_str(re->ref);
3756 		if (refstr == NULL) {
3757 			err = got_error_from_errno("got_ref_to_str");
3758 			break;
3759 		}
3760 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3761 		free(refstr);
3762 
3763 		err = got_ref_resolve(&id, repo, re->ref);
3764 		if (err)
3765 			break;
3766 		err = got_object_open_as_tag(&tag, repo, id);
3767 		if (err) {
3768 			if (err->code != GOT_ERR_OBJ_TYPE) {
3769 				free(id);
3770 				break;
3771 			}
3772 			/* "lightweight" tag */
3773 			err = got_object_open_as_commit(&commit, repo, id);
3774 			if (err) {
3775 				free(id);
3776 				break;
3777 			}
3778 			tagger = got_object_commit_get_committer(commit);
3779 			tagger_time =
3780 			    got_object_commit_get_committer_time(commit);
3781 			err = got_object_id_str(&id_str, id);
3782 			free(id);
3783 			if (err)
3784 				break;
3785 		} else {
3786 			free(id);
3787 			tagger = got_object_tag_get_tagger(tag);
3788 			tagger_time = got_object_tag_get_tagger_time(tag);
3789 			err = got_object_id_str(&id_str,
3790 			    got_object_tag_get_object_id(tag));
3791 			if (err)
3792 				break;
3793 		}
3794 		printf("from: %s\n", tagger);
3795 		datestr = get_datestr(&tagger_time, datebuf);
3796 		if (datestr)
3797 			printf("date: %s UTC\n", datestr);
3798 		if (commit)
3799 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3800 		else {
3801 			switch (got_object_tag_get_object_type(tag)) {
3802 			case GOT_OBJ_TYPE_BLOB:
3803 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
3804 				    id_str);
3805 				break;
3806 			case GOT_OBJ_TYPE_TREE:
3807 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
3808 				    id_str);
3809 				break;
3810 			case GOT_OBJ_TYPE_COMMIT:
3811 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
3812 				    id_str);
3813 				break;
3814 			case GOT_OBJ_TYPE_TAG:
3815 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
3816 				    id_str);
3817 				break;
3818 			default:
3819 				break;
3820 			}
3821 		}
3822 		free(id_str);
3823 		if (commit) {
3824 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
3825 			if (err)
3826 				break;
3827 			got_object_commit_close(commit);
3828 		} else {
3829 			tagmsg0 = strdup(got_object_tag_get_message(tag));
3830 			got_object_tag_close(tag);
3831 			if (tagmsg0 == NULL) {
3832 				err = got_error_from_errno("strdup");
3833 				break;
3834 			}
3835 		}
3836 
3837 		tagmsg = tagmsg0;
3838 		do {
3839 			line = strsep(&tagmsg, "\n");
3840 			if (line)
3841 				printf(" %s\n", line);
3842 		} while (line);
3843 		free(tagmsg0);
3844 	}
3845 
3846 	got_ref_list_free(&refs);
3847 	return NULL;
3848 }
3849 
3850 static const struct got_error *
3851 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3852     const char *tag_name, const char *repo_path)
3853 {
3854 	const struct got_error *err = NULL;
3855 	char *template = NULL, *initial_content = NULL;
3856 	char *editor = NULL;
3857 	int fd = -1;
3858 
3859 	if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3860 		err = got_error_from_errno("asprintf");
3861 		goto done;
3862 	}
3863 
3864 	if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3865 	    commit_id_str, tag_name) == -1) {
3866 		err = got_error_from_errno("asprintf");
3867 		goto done;
3868 	}
3869 
3870 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3871 	if (err)
3872 		goto done;
3873 
3874 	dprintf(fd, initial_content);
3875 	close(fd);
3876 
3877 	err = get_editor(&editor);
3878 	if (err)
3879 		goto done;
3880 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3881 done:
3882 	free(initial_content);
3883 	free(template);
3884 	free(editor);
3885 
3886 	/* Editor is done; we can now apply unveil(2) */
3887 	if (err == NULL) {
3888 		err = apply_unveil(repo_path, 0, NULL);
3889 		if (err) {
3890 			free(*tagmsg);
3891 			*tagmsg = NULL;
3892 		}
3893 	}
3894 	return err;
3895 }
3896 
3897 static const struct got_error *
3898 add_tag(struct got_repository *repo, const char *tag_name,
3899     const char *commit_arg, const char *tagmsg_arg)
3900 {
3901 	const struct got_error *err = NULL;
3902 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
3903 	char *label = NULL, *commit_id_str = NULL;
3904 	struct got_reference *ref = NULL;
3905 	char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3906 	char *tagmsg_path = NULL, *tag_id_str = NULL;
3907 	int preserve_tagmsg = 0;
3908 
3909 	/*
3910 	 * Don't let the user create a tag name with a leading '-'.
3911 	 * While technically a valid reference name, this case is usually
3912 	 * an unintended typo.
3913 	 */
3914 	if (tag_name[0] == '-')
3915 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3916 
3917 	err = get_author(&tagger, repo);
3918 	if (err)
3919 		return err;
3920 
3921 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
3922 	    GOT_OBJ_TYPE_COMMIT, 1, repo);
3923 	if (err)
3924 		goto done;
3925 
3926 	err = got_object_id_str(&commit_id_str, commit_id);
3927 	if (err)
3928 		goto done;
3929 
3930 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
3931 		refname = strdup(tag_name);
3932 		if (refname == NULL) {
3933 			 err = got_error_from_errno("strdup");
3934 			 goto done;
3935 		}
3936 		tag_name += 10;
3937 	} else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3938 		 err = got_error_from_errno("asprintf");
3939 		 goto done;
3940 	}
3941 
3942 	err = got_ref_open(&ref, repo, refname, 0);
3943 	if (err == NULL) {
3944 		err = got_error(GOT_ERR_TAG_EXISTS);
3945 		goto done;
3946 	} else if (err->code != GOT_ERR_NOT_REF)
3947 		goto done;
3948 
3949 	if (tagmsg_arg == NULL) {
3950 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3951 		    tag_name, got_repo_get_path(repo));
3952 		if (err) {
3953 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3954 			    tagmsg_path != NULL)
3955 				preserve_tagmsg = 1;
3956 			goto done;
3957 		}
3958 	}
3959 
3960 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
3961 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3962 	if (err) {
3963 		if (tagmsg_path)
3964 			preserve_tagmsg = 1;
3965 		goto done;
3966 	}
3967 
3968 	err = got_ref_alloc(&ref, refname, tag_id);
3969 	if (err) {
3970 		if (tagmsg_path)
3971 			preserve_tagmsg = 1;
3972 		goto done;
3973 	}
3974 
3975 	err = got_ref_write(ref, repo);
3976 	if (err) {
3977 		if (tagmsg_path)
3978 			preserve_tagmsg = 1;
3979 		goto done;
3980 	}
3981 
3982 	err = got_object_id_str(&tag_id_str, tag_id);
3983 	if (err) {
3984 		if (tagmsg_path)
3985 			preserve_tagmsg = 1;
3986 		goto done;
3987 	}
3988 	printf("Created tag %s\n", tag_id_str);
3989 done:
3990 	if (preserve_tagmsg) {
3991 		fprintf(stderr, "%s: tag message preserved in %s\n",
3992 		    getprogname(), tagmsg_path);
3993 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3994 		err = got_error_from_errno2("unlink", tagmsg_path);
3995 	free(tag_id_str);
3996 	if (ref)
3997 		got_ref_close(ref);
3998 	free(commit_id);
3999 	free(commit_id_str);
4000 	free(refname);
4001 	free(tagmsg);
4002 	free(tagmsg_path);
4003 	free(tagger);
4004 	return err;
4005 }
4006 
4007 static const struct got_error *
4008 cmd_tag(int argc, char *argv[])
4009 {
4010 	const struct got_error *error = NULL;
4011 	struct got_repository *repo = NULL;
4012 	struct got_worktree *worktree = NULL;
4013 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4014 	char *gitconfig_path = NULL;
4015 	const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4016 	int ch, do_list = 0;
4017 
4018 	while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
4019 		switch (ch) {
4020 		case 'm':
4021 			tagmsg = optarg;
4022 			break;
4023 		case 'r':
4024 			repo_path = realpath(optarg, NULL);
4025 			if (repo_path == NULL)
4026 				return got_error_from_errno2("realpath",
4027 				    optarg);
4028 			got_path_strip_trailing_slashes(repo_path);
4029 			break;
4030 		case 'l':
4031 			do_list = 1;
4032 			break;
4033 		default:
4034 			usage_tag();
4035 			/* NOTREACHED */
4036 		}
4037 	}
4038 
4039 	argc -= optind;
4040 	argv += optind;
4041 
4042 	if (do_list) {
4043 		if (tagmsg)
4044 			errx(1, "-l and -m options are mutually exclusive\n");
4045 		if (argc > 0)
4046 			usage_tag();
4047 	} else if (argc < 1 || argc > 2)
4048 		usage_tag();
4049 	else if (argc > 1)
4050 		commit_id_arg = argv[1];
4051 	tag_name = argv[0];
4052 
4053 #ifndef PROFILE
4054 	if (do_list) {
4055 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4056 		    NULL) == -1)
4057 			err(1, "pledge");
4058 	} else {
4059 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4060 		    "sendfd unveil", NULL) == -1)
4061 			err(1, "pledge");
4062 	}
4063 #endif
4064 	cwd = getcwd(NULL, 0);
4065 	if (cwd == NULL) {
4066 		error = got_error_from_errno("getcwd");
4067 		goto done;
4068 	}
4069 
4070 	if (repo_path == NULL) {
4071 		error = got_worktree_open(&worktree, cwd);
4072 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4073 			goto done;
4074 		else
4075 			error = NULL;
4076 		if (worktree) {
4077 			repo_path =
4078 			    strdup(got_worktree_get_repo_path(worktree));
4079 			if (repo_path == NULL)
4080 				error = got_error_from_errno("strdup");
4081 			if (error)
4082 				goto done;
4083 		} else {
4084 			repo_path = strdup(cwd);
4085 			if (repo_path == NULL) {
4086 				error = got_error_from_errno("strdup");
4087 				goto done;
4088 			}
4089 		}
4090 	}
4091 
4092 	if (do_list) {
4093 		error = got_repo_open(&repo, repo_path, NULL);
4094 		if (error != NULL)
4095 			goto done;
4096 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4097 		if (error)
4098 			goto done;
4099 		error = list_tags(repo, worktree);
4100 	} else {
4101 		error = get_gitconfig_path(&gitconfig_path);
4102 		if (error)
4103 			goto done;
4104 		error = got_repo_open(&repo, repo_path, gitconfig_path);
4105 		if (error != NULL)
4106 			goto done;
4107 
4108 		if (tagmsg) {
4109 			error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4110 			if (error)
4111 				goto done;
4112 		}
4113 
4114 		if (commit_id_arg == NULL) {
4115 			struct got_reference *head_ref;
4116 			struct got_object_id *commit_id;
4117 			error = got_ref_open(&head_ref, repo,
4118 			    worktree ? got_worktree_get_head_ref_name(worktree)
4119 			    : GOT_REF_HEAD, 0);
4120 			if (error)
4121 				goto done;
4122 			error = got_ref_resolve(&commit_id, repo, head_ref);
4123 			got_ref_close(head_ref);
4124 			if (error)
4125 				goto done;
4126 			error = got_object_id_str(&commit_id_str, commit_id);
4127 			free(commit_id);
4128 			if (error)
4129 				goto done;
4130 		}
4131 
4132 		error = add_tag(repo, tag_name,
4133 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4134 	}
4135 done:
4136 	if (repo)
4137 		got_repo_close(repo);
4138 	if (worktree)
4139 		got_worktree_close(worktree);
4140 	free(cwd);
4141 	free(repo_path);
4142 	free(gitconfig_path);
4143 	free(commit_id_str);
4144 	return error;
4145 }
4146 
4147 __dead static void
4148 usage_add(void)
4149 {
4150 	fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4151 	    getprogname());
4152 	exit(1);
4153 }
4154 
4155 static const struct got_error *
4156 add_progress(void *arg, unsigned char status, const char *path)
4157 {
4158 	while (path[0] == '/')
4159 		path++;
4160 	printf("%c  %s\n", status, path);
4161 	return NULL;
4162 }
4163 
4164 static const struct got_error *
4165 cmd_add(int argc, char *argv[])
4166 {
4167 	const struct got_error *error = NULL;
4168 	struct got_repository *repo = NULL;
4169 	struct got_worktree *worktree = NULL;
4170 	char *cwd = NULL;
4171 	struct got_pathlist_head paths;
4172 	struct got_pathlist_entry *pe;
4173 	int ch, can_recurse = 0, no_ignores = 0;
4174 
4175 	TAILQ_INIT(&paths);
4176 
4177 	while ((ch = getopt(argc, argv, "IR")) != -1) {
4178 		switch (ch) {
4179 		case 'I':
4180 			no_ignores = 1;
4181 			break;
4182 		case 'R':
4183 			can_recurse = 1;
4184 			break;
4185 		default:
4186 			usage_add();
4187 			/* NOTREACHED */
4188 		}
4189 	}
4190 
4191 	argc -= optind;
4192 	argv += optind;
4193 
4194 #ifndef PROFILE
4195 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4196 	    NULL) == -1)
4197 		err(1, "pledge");
4198 #endif
4199 	if (argc < 1)
4200 		usage_add();
4201 
4202 	cwd = getcwd(NULL, 0);
4203 	if (cwd == NULL) {
4204 		error = got_error_from_errno("getcwd");
4205 		goto done;
4206 	}
4207 
4208 	error = got_worktree_open(&worktree, cwd);
4209 	if (error)
4210 		goto done;
4211 
4212 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4213 	    NULL);
4214 	if (error != NULL)
4215 		goto done;
4216 
4217 	error = apply_unveil(got_repo_get_path(repo), 1,
4218 	    got_worktree_get_root_path(worktree));
4219 	if (error)
4220 		goto done;
4221 
4222 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4223 	if (error)
4224 		goto done;
4225 
4226 	if (!can_recurse && no_ignores) {
4227 		error = got_error_msg(GOT_ERR_BAD_PATH,
4228 		    "disregarding ignores requires -R option");
4229 		goto done;
4230 
4231 	}
4232 
4233 	if (!can_recurse) {
4234 		char *ondisk_path;
4235 		struct stat sb;
4236 		TAILQ_FOREACH(pe, &paths, entry) {
4237 			if (asprintf(&ondisk_path, "%s/%s",
4238 			    got_worktree_get_root_path(worktree),
4239 			       pe->path) == -1) {
4240 				error = got_error_from_errno("asprintf");
4241 				goto done;
4242 			}
4243 			if (lstat(ondisk_path, &sb) == -1) {
4244 				if (errno == ENOENT) {
4245 					free(ondisk_path);
4246 					continue;
4247 				}
4248 				error = got_error_from_errno2("lstat",
4249 				    ondisk_path);
4250 				free(ondisk_path);
4251 				goto done;
4252 			}
4253 			free(ondisk_path);
4254 			if (S_ISDIR(sb.st_mode)) {
4255 				error = got_error_msg(GOT_ERR_BAD_PATH,
4256 				    "adding directories requires -R option");
4257 				goto done;
4258 			}
4259 		}
4260 	}
4261 
4262 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
4263 	    NULL, repo, no_ignores);
4264 done:
4265 	if (repo)
4266 		got_repo_close(repo);
4267 	if (worktree)
4268 		got_worktree_close(worktree);
4269 	TAILQ_FOREACH(pe, &paths, entry)
4270 		free((char *)pe->path);
4271 	got_pathlist_free(&paths);
4272 	free(cwd);
4273 	return error;
4274 }
4275 
4276 __dead static void
4277 usage_remove(void)
4278 {
4279 	fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4280 	    getprogname());
4281 	exit(1);
4282 }
4283 
4284 static const struct got_error *
4285 print_remove_status(void *arg, unsigned char status,
4286     unsigned char staged_status, const char *path)
4287 {
4288 	while (path[0] == '/')
4289 		path++;
4290 	if (status == GOT_STATUS_NONEXISTENT)
4291 		return NULL;
4292 	if (status == staged_status && (status == GOT_STATUS_DELETE))
4293 		status = GOT_STATUS_NO_CHANGE;
4294 	printf("%c%c %s\n", status, staged_status, path);
4295 	return NULL;
4296 }
4297 
4298 static const struct got_error *
4299 cmd_remove(int argc, char *argv[])
4300 {
4301 	const struct got_error *error = NULL;
4302 	struct got_worktree *worktree = NULL;
4303 	struct got_repository *repo = NULL;
4304 	char *cwd = NULL;
4305 	struct got_pathlist_head paths;
4306 	struct got_pathlist_entry *pe;
4307 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4308 
4309 	TAILQ_INIT(&paths);
4310 
4311 	while ((ch = getopt(argc, argv, "fkR")) != -1) {
4312 		switch (ch) {
4313 		case 'f':
4314 			delete_local_mods = 1;
4315 			break;
4316 		case 'k':
4317 			keep_on_disk = 1;
4318 			break;
4319 		case 'R':
4320 			can_recurse = 1;
4321 			break;
4322 		default:
4323 			usage_remove();
4324 			/* NOTREACHED */
4325 		}
4326 	}
4327 
4328 	argc -= optind;
4329 	argv += optind;
4330 
4331 #ifndef PROFILE
4332 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4333 	    NULL) == -1)
4334 		err(1, "pledge");
4335 #endif
4336 	if (argc < 1)
4337 		usage_remove();
4338 
4339 	cwd = getcwd(NULL, 0);
4340 	if (cwd == NULL) {
4341 		error = got_error_from_errno("getcwd");
4342 		goto done;
4343 	}
4344 	error = got_worktree_open(&worktree, cwd);
4345 	if (error)
4346 		goto done;
4347 
4348 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4349 	    NULL);
4350 	if (error)
4351 		goto done;
4352 
4353 	error = apply_unveil(got_repo_get_path(repo), 1,
4354 	    got_worktree_get_root_path(worktree));
4355 	if (error)
4356 		goto done;
4357 
4358 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4359 	if (error)
4360 		goto done;
4361 
4362 	if (!can_recurse) {
4363 		char *ondisk_path;
4364 		struct stat sb;
4365 		TAILQ_FOREACH(pe, &paths, entry) {
4366 			if (asprintf(&ondisk_path, "%s/%s",
4367 			    got_worktree_get_root_path(worktree),
4368 			       pe->path) == -1) {
4369 				error = got_error_from_errno("asprintf");
4370 				goto done;
4371 			}
4372 			if (lstat(ondisk_path, &sb) == -1) {
4373 				if (errno == ENOENT) {
4374 					free(ondisk_path);
4375 					continue;
4376 				}
4377 				error = got_error_from_errno2("lstat",
4378 				    ondisk_path);
4379 				free(ondisk_path);
4380 				goto done;
4381 			}
4382 			free(ondisk_path);
4383 			if (S_ISDIR(sb.st_mode)) {
4384 				error = got_error_msg(GOT_ERR_BAD_PATH,
4385 				    "removing directories requires -R option");
4386 				goto done;
4387 			}
4388 		}
4389 	}
4390 
4391 	error = got_worktree_schedule_delete(worktree, &paths,
4392 	    delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4393 done:
4394 	if (repo)
4395 		got_repo_close(repo);
4396 	if (worktree)
4397 		got_worktree_close(worktree);
4398 	TAILQ_FOREACH(pe, &paths, entry)
4399 		free((char *)pe->path);
4400 	got_pathlist_free(&paths);
4401 	free(cwd);
4402 	return error;
4403 }
4404 
4405 __dead static void
4406 usage_revert(void)
4407 {
4408 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4409 	    "path ...\n", getprogname());
4410 	exit(1);
4411 }
4412 
4413 static const struct got_error *
4414 revert_progress(void *arg, unsigned char status, const char *path)
4415 {
4416 	while (path[0] == '/')
4417 		path++;
4418 	printf("%c  %s\n", status, path);
4419 	return NULL;
4420 }
4421 
4422 struct choose_patch_arg {
4423 	FILE *patch_script_file;
4424 	const char *action;
4425 };
4426 
4427 static const struct got_error *
4428 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4429     int nchanges, const char *action)
4430 {
4431 	char *line = NULL;
4432 	size_t linesize = 0;
4433 	ssize_t linelen;
4434 
4435 	switch (status) {
4436 	case GOT_STATUS_ADD:
4437 		printf("A  %s\n%s this addition? [y/n] ", path, action);
4438 		break;
4439 	case GOT_STATUS_DELETE:
4440 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
4441 		break;
4442 	case GOT_STATUS_MODIFY:
4443 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
4444 			return got_error_from_errno("fseek");
4445 		printf(GOT_COMMIT_SEP_STR);
4446 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4447 			printf("%s", line);
4448 		if (ferror(patch_file))
4449 			return got_error_from_errno("getline");
4450 		printf(GOT_COMMIT_SEP_STR);
4451 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
4452 		    path, n, nchanges, action);
4453 		break;
4454 	default:
4455 		return got_error_path(path, GOT_ERR_FILE_STATUS);
4456 	}
4457 
4458 	return NULL;
4459 }
4460 
4461 static const struct got_error *
4462 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4463     FILE *patch_file, int n, int nchanges)
4464 {
4465 	const struct got_error *err = NULL;
4466 	char *line = NULL;
4467 	size_t linesize = 0;
4468 	ssize_t linelen;
4469 	int resp = ' ';
4470 	struct choose_patch_arg *a = arg;
4471 
4472 	*choice = GOT_PATCH_CHOICE_NONE;
4473 
4474 	if (a->patch_script_file) {
4475 		char *nl;
4476 		err = show_change(status, path, patch_file, n, nchanges,
4477 		    a->action);
4478 		if (err)
4479 			return err;
4480 		linelen = getline(&line, &linesize, a->patch_script_file);
4481 		if (linelen == -1) {
4482 			if (ferror(a->patch_script_file))
4483 				return got_error_from_errno("getline");
4484 			return NULL;
4485 		}
4486 		nl = strchr(line, '\n');
4487 		if (nl)
4488 			*nl = '\0';
4489 		if (strcmp(line, "y") == 0) {
4490 			*choice = GOT_PATCH_CHOICE_YES;
4491 			printf("y\n");
4492 		} else if (strcmp(line, "n") == 0) {
4493 			*choice = GOT_PATCH_CHOICE_NO;
4494 			printf("n\n");
4495 		} else if (strcmp(line, "q") == 0 &&
4496 		    status == GOT_STATUS_MODIFY) {
4497 			*choice = GOT_PATCH_CHOICE_QUIT;
4498 			printf("q\n");
4499 		} else
4500 			printf("invalid response '%s'\n", line);
4501 		free(line);
4502 		return NULL;
4503 	}
4504 
4505 	while (resp != 'y' && resp != 'n' && resp != 'q') {
4506 		err = show_change(status, path, patch_file, n, nchanges,
4507 		    a->action);
4508 		if (err)
4509 			return err;
4510 		resp = getchar();
4511 		if (resp == '\n')
4512 			resp = getchar();
4513 		if (status == GOT_STATUS_MODIFY) {
4514 			if (resp != 'y' && resp != 'n' && resp != 'q') {
4515 				printf("invalid response '%c'\n", resp);
4516 				resp = ' ';
4517 			}
4518 		} else if (resp != 'y' && resp != 'n') {
4519 				printf("invalid response '%c'\n", resp);
4520 				resp = ' ';
4521 		}
4522 	}
4523 
4524 	if (resp == 'y')
4525 		*choice = GOT_PATCH_CHOICE_YES;
4526 	else if (resp == 'n')
4527 		*choice = GOT_PATCH_CHOICE_NO;
4528 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4529 		*choice = GOT_PATCH_CHOICE_QUIT;
4530 
4531 	return NULL;
4532 }
4533 
4534 
4535 static const struct got_error *
4536 cmd_revert(int argc, char *argv[])
4537 {
4538 	const struct got_error *error = NULL;
4539 	struct got_worktree *worktree = NULL;
4540 	struct got_repository *repo = NULL;
4541 	char *cwd = NULL, *path = NULL;
4542 	struct got_pathlist_head paths;
4543 	struct got_pathlist_entry *pe;
4544 	int ch, can_recurse = 0, pflag = 0;
4545 	FILE *patch_script_file = NULL;
4546 	const char *patch_script_path = NULL;
4547 	struct choose_patch_arg cpa;
4548 
4549 	TAILQ_INIT(&paths);
4550 
4551 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4552 		switch (ch) {
4553 		case 'p':
4554 			pflag = 1;
4555 			break;
4556 		case 'F':
4557 			patch_script_path = optarg;
4558 			break;
4559 		case 'R':
4560 			can_recurse = 1;
4561 			break;
4562 		default:
4563 			usage_revert();
4564 			/* NOTREACHED */
4565 		}
4566 	}
4567 
4568 	argc -= optind;
4569 	argv += optind;
4570 
4571 #ifndef PROFILE
4572 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4573 	    "unveil", NULL) == -1)
4574 		err(1, "pledge");
4575 #endif
4576 	if (argc < 1)
4577 		usage_revert();
4578 	if (patch_script_path && !pflag)
4579 		errx(1, "-F option can only be used together with -p option");
4580 
4581 	cwd = getcwd(NULL, 0);
4582 	if (cwd == NULL) {
4583 		error = got_error_from_errno("getcwd");
4584 		goto done;
4585 	}
4586 	error = got_worktree_open(&worktree, cwd);
4587 	if (error)
4588 		goto done;
4589 
4590 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4591 	    NULL);
4592 	if (error != NULL)
4593 		goto done;
4594 
4595 	if (patch_script_path) {
4596 		patch_script_file = fopen(patch_script_path, "r");
4597 		if (patch_script_file == NULL) {
4598 			error = got_error_from_errno2("fopen",
4599 			    patch_script_path);
4600 			goto done;
4601 		}
4602 	}
4603 	error = apply_unveil(got_repo_get_path(repo), 1,
4604 	    got_worktree_get_root_path(worktree));
4605 	if (error)
4606 		goto done;
4607 
4608 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4609 	if (error)
4610 		goto done;
4611 
4612 	if (!can_recurse) {
4613 		char *ondisk_path;
4614 		struct stat sb;
4615 		TAILQ_FOREACH(pe, &paths, entry) {
4616 			if (asprintf(&ondisk_path, "%s/%s",
4617 			    got_worktree_get_root_path(worktree),
4618 			       pe->path) == -1) {
4619 				error = got_error_from_errno("asprintf");
4620 				goto done;
4621 			}
4622 			if (lstat(ondisk_path, &sb) == -1) {
4623 				if (errno == ENOENT) {
4624 					free(ondisk_path);
4625 					continue;
4626 				}
4627 				error = got_error_from_errno2("lstat",
4628 				    ondisk_path);
4629 				free(ondisk_path);
4630 				goto done;
4631 			}
4632 			free(ondisk_path);
4633 			if (S_ISDIR(sb.st_mode)) {
4634 				error = got_error_msg(GOT_ERR_BAD_PATH,
4635 				    "reverting directories requires -R option");
4636 				goto done;
4637 			}
4638 		}
4639 	}
4640 
4641 	cpa.patch_script_file = patch_script_file;
4642 	cpa.action = "revert";
4643 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4644 	    pflag ? choose_patch : NULL, &cpa, repo);
4645 done:
4646 	if (patch_script_file && fclose(patch_script_file) == EOF &&
4647 	    error == NULL)
4648 		error = got_error_from_errno2("fclose", patch_script_path);
4649 	if (repo)
4650 		got_repo_close(repo);
4651 	if (worktree)
4652 		got_worktree_close(worktree);
4653 	free(path);
4654 	free(cwd);
4655 	return error;
4656 }
4657 
4658 __dead static void
4659 usage_commit(void)
4660 {
4661 	fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4662 	    getprogname());
4663 	exit(1);
4664 }
4665 
4666 struct collect_commit_logmsg_arg {
4667 	const char *cmdline_log;
4668 	const char *editor;
4669 	const char *worktree_path;
4670 	const char *branch_name;
4671 	const char *repo_path;
4672 	char *logmsg_path;
4673 
4674 };
4675 
4676 static const struct got_error *
4677 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4678     void *arg)
4679 {
4680 	char *initial_content = NULL;
4681 	struct got_pathlist_entry *pe;
4682 	const struct got_error *err = NULL;
4683 	char *template = NULL;
4684 	struct collect_commit_logmsg_arg *a = arg;
4685 	int fd;
4686 	size_t len;
4687 
4688 	/* if a message was specified on the command line, just use it */
4689 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4690 		len = strlen(a->cmdline_log) + 1;
4691 		*logmsg = malloc(len + 1);
4692 		if (*logmsg == NULL)
4693 			return got_error_from_errno("malloc");
4694 		strlcpy(*logmsg, a->cmdline_log, len);
4695 		return NULL;
4696 	}
4697 
4698 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4699 		return got_error_from_errno("asprintf");
4700 
4701 	if (asprintf(&initial_content,
4702 	    "\n# changes to be committed on branch %s:\n",
4703 	    a->branch_name) == -1)
4704 		return got_error_from_errno("asprintf");
4705 
4706 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4707 	if (err)
4708 		goto done;
4709 
4710 	dprintf(fd, initial_content);
4711 
4712 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4713 		struct got_commitable *ct = pe->data;
4714 		dprintf(fd, "#  %c  %s\n",
4715 		    got_commitable_get_status(ct),
4716 		    got_commitable_get_path(ct));
4717 	}
4718 	close(fd);
4719 
4720 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4721 done:
4722 	free(initial_content);
4723 	free(template);
4724 
4725 	/* Editor is done; we can now apply unveil(2) */
4726 	if (err == NULL) {
4727 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
4728 		if (err) {
4729 			free(*logmsg);
4730 			*logmsg = NULL;
4731 		}
4732 	}
4733 	return err;
4734 }
4735 
4736 static const struct got_error *
4737 cmd_commit(int argc, char *argv[])
4738 {
4739 	const struct got_error *error = NULL;
4740 	struct got_worktree *worktree = NULL;
4741 	struct got_repository *repo = NULL;
4742 	char *cwd = NULL, *id_str = NULL;
4743 	struct got_object_id *id = NULL;
4744 	const char *logmsg = NULL;
4745 	struct collect_commit_logmsg_arg cl_arg;
4746 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4747 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4748 	struct got_pathlist_head paths;
4749 
4750 	TAILQ_INIT(&paths);
4751 	cl_arg.logmsg_path = NULL;
4752 
4753 	while ((ch = getopt(argc, argv, "m:")) != -1) {
4754 		switch (ch) {
4755 		case 'm':
4756 			logmsg = optarg;
4757 			break;
4758 		default:
4759 			usage_commit();
4760 			/* NOTREACHED */
4761 		}
4762 	}
4763 
4764 	argc -= optind;
4765 	argv += optind;
4766 
4767 #ifndef PROFILE
4768 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4769 	    "unveil", NULL) == -1)
4770 		err(1, "pledge");
4771 #endif
4772 	cwd = getcwd(NULL, 0);
4773 	if (cwd == NULL) {
4774 		error = got_error_from_errno("getcwd");
4775 		goto done;
4776 	}
4777 	error = got_worktree_open(&worktree, cwd);
4778 	if (error)
4779 		goto done;
4780 
4781 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4782 	if (error)
4783 		goto done;
4784 	if (rebase_in_progress) {
4785 		error = got_error(GOT_ERR_REBASING);
4786 		goto done;
4787 	}
4788 
4789 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
4790 	    worktree);
4791 	if (error)
4792 		goto done;
4793 
4794 	error = get_gitconfig_path(&gitconfig_path);
4795 	if (error)
4796 		goto done;
4797 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4798 	    gitconfig_path);
4799 	if (error != NULL)
4800 		goto done;
4801 
4802 	error = get_author(&author, repo);
4803 	if (error)
4804 		return error;
4805 
4806 	/*
4807 	 * unveil(2) traverses exec(2); if an editor is used we have
4808 	 * to apply unveil after the log message has been written.
4809 	 */
4810 	if (logmsg == NULL || strlen(logmsg) == 0)
4811 		error = get_editor(&editor);
4812 	else
4813 		error = apply_unveil(got_repo_get_path(repo), 0,
4814 		    got_worktree_get_root_path(worktree));
4815 	if (error)
4816 		goto done;
4817 
4818 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4819 	if (error)
4820 		goto done;
4821 
4822 	cl_arg.editor = editor;
4823 	cl_arg.cmdline_log = logmsg;
4824 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4825 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4826 	if (!histedit_in_progress) {
4827 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4828 			error = got_error(GOT_ERR_COMMIT_BRANCH);
4829 			goto done;
4830 		}
4831 		cl_arg.branch_name += 11;
4832 	}
4833 	cl_arg.repo_path = got_repo_get_path(repo);
4834 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4835 	    collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4836 	if (error) {
4837 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4838 		    cl_arg.logmsg_path != NULL)
4839 			preserve_logmsg = 1;
4840 		goto done;
4841 	}
4842 
4843 	error = got_object_id_str(&id_str, id);
4844 	if (error)
4845 		goto done;
4846 	printf("Created commit %s\n", id_str);
4847 done:
4848 	if (preserve_logmsg) {
4849 		fprintf(stderr, "%s: log message preserved in %s\n",
4850 		    getprogname(), cl_arg.logmsg_path);
4851 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4852 	    error == NULL)
4853 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4854 	free(cl_arg.logmsg_path);
4855 	if (repo)
4856 		got_repo_close(repo);
4857 	if (worktree)
4858 		got_worktree_close(worktree);
4859 	free(cwd);
4860 	free(id_str);
4861 	free(gitconfig_path);
4862 	free(editor);
4863 	free(author);
4864 	return error;
4865 }
4866 
4867 __dead static void
4868 usage_cherrypick(void)
4869 {
4870 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4871 	exit(1);
4872 }
4873 
4874 static const struct got_error *
4875 cmd_cherrypick(int argc, char *argv[])
4876 {
4877 	const struct got_error *error = NULL;
4878 	struct got_worktree *worktree = NULL;
4879 	struct got_repository *repo = NULL;
4880 	char *cwd = NULL, *commit_id_str = NULL;
4881 	struct got_object_id *commit_id = NULL;
4882 	struct got_commit_object *commit = NULL;
4883 	struct got_object_qid *pid;
4884 	struct got_reference *head_ref = NULL;
4885 	int ch, did_something = 0;
4886 
4887 	while ((ch = getopt(argc, argv, "")) != -1) {
4888 		switch (ch) {
4889 		default:
4890 			usage_cherrypick();
4891 			/* NOTREACHED */
4892 		}
4893 	}
4894 
4895 	argc -= optind;
4896 	argv += optind;
4897 
4898 #ifndef PROFILE
4899 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4900 	    "unveil", NULL) == -1)
4901 		err(1, "pledge");
4902 #endif
4903 	if (argc != 1)
4904 		usage_cherrypick();
4905 
4906 	cwd = getcwd(NULL, 0);
4907 	if (cwd == NULL) {
4908 		error = got_error_from_errno("getcwd");
4909 		goto done;
4910 	}
4911 	error = got_worktree_open(&worktree, cwd);
4912 	if (error)
4913 		goto done;
4914 
4915 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4916 	    NULL);
4917 	if (error != NULL)
4918 		goto done;
4919 
4920 	error = apply_unveil(got_repo_get_path(repo), 0,
4921 	    got_worktree_get_root_path(worktree));
4922 	if (error)
4923 		goto done;
4924 
4925 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4926 	    GOT_OBJ_TYPE_COMMIT, repo);
4927 	if (error != NULL) {
4928 		struct got_reference *ref;
4929 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4930 			goto done;
4931 		error = got_ref_open(&ref, repo, argv[0], 0);
4932 		if (error != NULL)
4933 			goto done;
4934 		error = got_ref_resolve(&commit_id, repo, ref);
4935 		got_ref_close(ref);
4936 		if (error != NULL)
4937 			goto done;
4938 	}
4939 	error = got_object_id_str(&commit_id_str, commit_id);
4940 	if (error)
4941 		goto done;
4942 
4943 	error = got_ref_open(&head_ref, repo,
4944 	    got_worktree_get_head_ref_name(worktree), 0);
4945 	if (error != NULL)
4946 		goto done;
4947 
4948 	error = check_same_branch(commit_id, head_ref, NULL, repo);
4949 	if (error) {
4950 		if (error->code != GOT_ERR_ANCESTRY)
4951 			goto done;
4952 		error = NULL;
4953 	} else {
4954 		error = got_error(GOT_ERR_SAME_BRANCH);
4955 		goto done;
4956 	}
4957 
4958 	error = got_object_open_as_commit(&commit, repo, commit_id);
4959 	if (error)
4960 		goto done;
4961 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4962 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4963 	    commit_id, repo, update_progress, &did_something, check_cancelled,
4964 	    NULL);
4965 	if (error != NULL)
4966 		goto done;
4967 
4968 	if (did_something)
4969 		printf("Merged commit %s\n", commit_id_str);
4970 done:
4971 	if (commit)
4972 		got_object_commit_close(commit);
4973 	free(commit_id_str);
4974 	if (head_ref)
4975 		got_ref_close(head_ref);
4976 	if (worktree)
4977 		got_worktree_close(worktree);
4978 	if (repo)
4979 		got_repo_close(repo);
4980 	return error;
4981 }
4982 
4983 __dead static void
4984 usage_backout(void)
4985 {
4986 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4987 	exit(1);
4988 }
4989 
4990 static const struct got_error *
4991 cmd_backout(int argc, char *argv[])
4992 {
4993 	const struct got_error *error = NULL;
4994 	struct got_worktree *worktree = NULL;
4995 	struct got_repository *repo = NULL;
4996 	char *cwd = NULL, *commit_id_str = NULL;
4997 	struct got_object_id *commit_id = NULL;
4998 	struct got_commit_object *commit = NULL;
4999 	struct got_object_qid *pid;
5000 	struct got_reference *head_ref = NULL;
5001 	int ch, did_something = 0;
5002 
5003 	while ((ch = getopt(argc, argv, "")) != -1) {
5004 		switch (ch) {
5005 		default:
5006 			usage_backout();
5007 			/* NOTREACHED */
5008 		}
5009 	}
5010 
5011 	argc -= optind;
5012 	argv += optind;
5013 
5014 #ifndef PROFILE
5015 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5016 	    "unveil", NULL) == -1)
5017 		err(1, "pledge");
5018 #endif
5019 	if (argc != 1)
5020 		usage_backout();
5021 
5022 	cwd = getcwd(NULL, 0);
5023 	if (cwd == NULL) {
5024 		error = got_error_from_errno("getcwd");
5025 		goto done;
5026 	}
5027 	error = got_worktree_open(&worktree, cwd);
5028 	if (error)
5029 		goto done;
5030 
5031 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5032 	    NULL);
5033 	if (error != NULL)
5034 		goto done;
5035 
5036 	error = apply_unveil(got_repo_get_path(repo), 0,
5037 	    got_worktree_get_root_path(worktree));
5038 	if (error)
5039 		goto done;
5040 
5041 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5042 	    GOT_OBJ_TYPE_COMMIT, repo);
5043 	if (error != NULL) {
5044 		struct got_reference *ref;
5045 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5046 			goto done;
5047 		error = got_ref_open(&ref, repo, argv[0], 0);
5048 		if (error != NULL)
5049 			goto done;
5050 		error = got_ref_resolve(&commit_id, repo, ref);
5051 		got_ref_close(ref);
5052 		if (error != NULL)
5053 			goto done;
5054 	}
5055 	error = got_object_id_str(&commit_id_str, commit_id);
5056 	if (error)
5057 		goto done;
5058 
5059 	error = got_ref_open(&head_ref, repo,
5060 	    got_worktree_get_head_ref_name(worktree), 0);
5061 	if (error != NULL)
5062 		goto done;
5063 
5064 	error = check_same_branch(commit_id, head_ref, NULL, repo);
5065 	if (error)
5066 		goto done;
5067 
5068 	error = got_object_open_as_commit(&commit, repo, commit_id);
5069 	if (error)
5070 		goto done;
5071 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5072 	if (pid == NULL) {
5073 		error = got_error(GOT_ERR_ROOT_COMMIT);
5074 		goto done;
5075 	}
5076 
5077 	error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5078 	    update_progress, &did_something, check_cancelled, NULL);
5079 	if (error != NULL)
5080 		goto done;
5081 
5082 	if (did_something)
5083 		printf("Backed out commit %s\n", commit_id_str);
5084 done:
5085 	if (commit)
5086 		got_object_commit_close(commit);
5087 	free(commit_id_str);
5088 	if (head_ref)
5089 		got_ref_close(head_ref);
5090 	if (worktree)
5091 		got_worktree_close(worktree);
5092 	if (repo)
5093 		got_repo_close(repo);
5094 	return error;
5095 }
5096 
5097 __dead static void
5098 usage_rebase(void)
5099 {
5100 	fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5101 	    getprogname());
5102 	exit(1);
5103 }
5104 
5105 void
5106 trim_logmsg(char *logmsg, int limit)
5107 {
5108 	char *nl;
5109 	size_t len;
5110 
5111 	len = strlen(logmsg);
5112 	if (len > limit)
5113 		len = limit;
5114 	logmsg[len] = '\0';
5115 	nl = strchr(logmsg, '\n');
5116 	if (nl)
5117 		*nl = '\0';
5118 }
5119 
5120 static const struct got_error *
5121 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5122 {
5123 	const struct got_error *err;
5124 	char *logmsg0 = NULL;
5125 	const char *s;
5126 
5127 	err = got_object_commit_get_logmsg(&logmsg0, commit);
5128 	if (err)
5129 		return err;
5130 
5131 	s = logmsg0;
5132 	while (isspace((unsigned char)s[0]))
5133 		s++;
5134 
5135 	*logmsg = strdup(s);
5136 	if (*logmsg == NULL) {
5137 		err = got_error_from_errno("strdup");
5138 		goto done;
5139 	}
5140 
5141 	trim_logmsg(*logmsg, limit);
5142 done:
5143 	free(logmsg0);
5144 	return err;
5145 }
5146 
5147 static const struct got_error *
5148 show_rebase_progress(struct got_commit_object *commit,
5149     struct got_object_id *old_id, struct got_object_id *new_id)
5150 {
5151 	const struct got_error *err;
5152 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5153 
5154 	err = got_object_id_str(&old_id_str, old_id);
5155 	if (err)
5156 		goto done;
5157 
5158 	if (new_id) {
5159 		err = got_object_id_str(&new_id_str, new_id);
5160 		if (err)
5161 			goto done;
5162 	}
5163 
5164 	old_id_str[12] = '\0';
5165 	if (new_id_str)
5166 		new_id_str[12] = '\0';
5167 
5168 	err = get_short_logmsg(&logmsg, 42, commit);
5169 	if (err)
5170 		goto done;
5171 
5172 	printf("%s -> %s: %s\n", old_id_str,
5173 	    new_id_str ? new_id_str : "no-op change", logmsg);
5174 done:
5175 	free(old_id_str);
5176 	free(new_id_str);
5177 	return err;
5178 }
5179 
5180 static const struct got_error *
5181 rebase_progress(void *arg, unsigned char status, const char *path)
5182 {
5183 	unsigned char *rebase_status = arg;
5184 
5185 	while (path[0] == '/')
5186 		path++;
5187 	printf("%c  %s\n", status, path);
5188 
5189 	if (*rebase_status == GOT_STATUS_CONFLICT)
5190 		return NULL;
5191 	if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5192 		*rebase_status = status;
5193 	return NULL;
5194 }
5195 
5196 static const struct got_error *
5197 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5198     struct got_reference *branch, struct got_reference *new_base_branch,
5199     struct got_reference *tmp_branch, struct got_repository *repo)
5200 {
5201 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
5202 	return got_worktree_rebase_complete(worktree, fileindex,
5203 	    new_base_branch, tmp_branch, branch, repo);
5204 }
5205 
5206 static const struct got_error *
5207 rebase_commit(struct got_pathlist_head *merged_paths,
5208     struct got_worktree *worktree, struct got_fileindex *fileindex,
5209     struct got_reference *tmp_branch,
5210     struct got_object_id *commit_id, struct got_repository *repo)
5211 {
5212 	const struct got_error *error;
5213 	struct got_commit_object *commit;
5214 	struct got_object_id *new_commit_id;
5215 
5216 	error = got_object_open_as_commit(&commit, repo, commit_id);
5217 	if (error)
5218 		return error;
5219 
5220 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5221 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
5222 	if (error) {
5223 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5224 			goto done;
5225 		error = show_rebase_progress(commit, commit_id, NULL);
5226 	} else {
5227 		error = show_rebase_progress(commit, commit_id, new_commit_id);
5228 		free(new_commit_id);
5229 	}
5230 done:
5231 	got_object_commit_close(commit);
5232 	return error;
5233 }
5234 
5235 struct check_path_prefix_arg {
5236 	const char *path_prefix;
5237 	size_t len;
5238 	int errcode;
5239 };
5240 
5241 static const struct got_error *
5242 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5243     struct got_blob_object *blob2, struct got_object_id *id1,
5244     struct got_object_id *id2, const char *path1, const char *path2,
5245     mode_t mode1, mode_t mode2, struct got_repository *repo)
5246 {
5247 	struct check_path_prefix_arg *a = arg;
5248 
5249 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5250 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5251 		return got_error(a->errcode);
5252 
5253 	return NULL;
5254 }
5255 
5256 static const struct got_error *
5257 check_path_prefix(struct got_object_id *parent_id,
5258     struct got_object_id *commit_id, const char *path_prefix,
5259     int errcode, struct got_repository *repo)
5260 {
5261 	const struct got_error *err;
5262 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5263 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
5264 	struct check_path_prefix_arg cpp_arg;
5265 
5266 	if (got_path_is_root_dir(path_prefix))
5267 		return NULL;
5268 
5269 	err = got_object_open_as_commit(&commit, repo, commit_id);
5270 	if (err)
5271 		goto done;
5272 
5273 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5274 	if (err)
5275 		goto done;
5276 
5277 	err = got_object_open_as_tree(&tree1, repo,
5278 	    got_object_commit_get_tree_id(parent_commit));
5279 	if (err)
5280 		goto done;
5281 
5282 	err = got_object_open_as_tree(&tree2, repo,
5283 	    got_object_commit_get_tree_id(commit));
5284 	if (err)
5285 		goto done;
5286 
5287 	cpp_arg.path_prefix = path_prefix;
5288 	while (cpp_arg.path_prefix[0] == '/')
5289 		cpp_arg.path_prefix++;
5290 	cpp_arg.len = strlen(cpp_arg.path_prefix);
5291 	cpp_arg.errcode = errcode;
5292 	err = got_diff_tree(tree1, tree2, "", "", repo,
5293 	    check_path_prefix_in_diff, &cpp_arg, 0);
5294 done:
5295 	if (tree1)
5296 		got_object_tree_close(tree1);
5297 	if (tree2)
5298 		got_object_tree_close(tree2);
5299 	if (commit)
5300 		got_object_commit_close(commit);
5301 	if (parent_commit)
5302 		got_object_commit_close(parent_commit);
5303 	return err;
5304 }
5305 
5306 static const struct got_error *
5307 collect_commits(struct got_object_id_queue *commits,
5308     struct got_object_id *initial_commit_id,
5309     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5310     const char *path_prefix, int path_prefix_errcode,
5311     struct got_repository *repo)
5312 {
5313 	const struct got_error *err = NULL;
5314 	struct got_commit_graph *graph = NULL;
5315 	struct got_object_id *parent_id = NULL;
5316 	struct got_object_qid *qid;
5317         struct got_object_id *commit_id = initial_commit_id;
5318 
5319 	err = got_commit_graph_open(&graph, "/", 1);
5320 	if (err)
5321 		return err;
5322 
5323 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5324 	    check_cancelled, NULL);
5325 	if (err)
5326 		goto done;
5327 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5328 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
5329 		    check_cancelled, NULL);
5330 		if (err) {
5331 			if (err->code == GOT_ERR_ITER_COMPLETED) {
5332 				err = got_error_msg(GOT_ERR_ANCESTRY,
5333 				    "ran out of commits to rebase before "
5334 				    "youngest common ancestor commit has "
5335 				    "been reached?!?");
5336 			}
5337 			goto done;
5338 		} else {
5339 			err = check_path_prefix(parent_id, commit_id,
5340 			    path_prefix, path_prefix_errcode, repo);
5341 			if (err)
5342 				goto done;
5343 
5344 			err = got_object_qid_alloc(&qid, commit_id);
5345 			if (err)
5346 				goto done;
5347 			SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5348 			commit_id = parent_id;
5349 		}
5350 	}
5351 done:
5352 	got_commit_graph_close(graph);
5353 	return err;
5354 }
5355 
5356 static const struct got_error *
5357 cmd_rebase(int argc, char *argv[])
5358 {
5359 	const struct got_error *error = NULL;
5360 	struct got_worktree *worktree = NULL;
5361 	struct got_repository *repo = NULL;
5362 	struct got_fileindex *fileindex = NULL;
5363 	char *cwd = NULL;
5364 	struct got_reference *branch = NULL;
5365 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5366 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
5367 	struct got_object_id *resume_commit_id = NULL;
5368 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5369 	struct got_commit_object *commit = NULL;
5370 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5371 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5372 	struct got_object_id_queue commits;
5373 	struct got_pathlist_head merged_paths;
5374 	const struct got_object_id_queue *parent_ids;
5375 	struct got_object_qid *qid, *pid;
5376 
5377 	SIMPLEQ_INIT(&commits);
5378 	TAILQ_INIT(&merged_paths);
5379 
5380 	while ((ch = getopt(argc, argv, "ac")) != -1) {
5381 		switch (ch) {
5382 		case 'a':
5383 			abort_rebase = 1;
5384 			break;
5385 		case 'c':
5386 			continue_rebase = 1;
5387 			break;
5388 		default:
5389 			usage_rebase();
5390 			/* NOTREACHED */
5391 		}
5392 	}
5393 
5394 	argc -= optind;
5395 	argv += optind;
5396 
5397 #ifndef PROFILE
5398 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5399 	    "unveil", NULL) == -1)
5400 		err(1, "pledge");
5401 #endif
5402 	if (abort_rebase && continue_rebase)
5403 		usage_rebase();
5404 	else if (abort_rebase || continue_rebase) {
5405 		if (argc != 0)
5406 			usage_rebase();
5407 	} else if (argc != 1)
5408 		usage_rebase();
5409 
5410 	cwd = getcwd(NULL, 0);
5411 	if (cwd == NULL) {
5412 		error = got_error_from_errno("getcwd");
5413 		goto done;
5414 	}
5415 	error = got_worktree_open(&worktree, cwd);
5416 	if (error)
5417 		goto done;
5418 
5419 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5420 	    NULL);
5421 	if (error != NULL)
5422 		goto done;
5423 
5424 	error = apply_unveil(got_repo_get_path(repo), 0,
5425 	    got_worktree_get_root_path(worktree));
5426 	if (error)
5427 		goto done;
5428 
5429 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5430 	if (error)
5431 		goto done;
5432 
5433 	if (abort_rebase) {
5434 		int did_something;
5435 		if (!rebase_in_progress) {
5436 			error = got_error(GOT_ERR_NOT_REBASING);
5437 			goto done;
5438 		}
5439 		error = got_worktree_rebase_continue(&resume_commit_id,
5440 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
5441 		    worktree, repo);
5442 		if (error)
5443 			goto done;
5444 		printf("Switching work tree to %s\n",
5445 		    got_ref_get_symref_target(new_base_branch));
5446 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
5447 		    new_base_branch, update_progress, &did_something);
5448 		if (error)
5449 			goto done;
5450 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5451 		goto done; /* nothing else to do */
5452 	}
5453 
5454 	if (continue_rebase) {
5455 		if (!rebase_in_progress) {
5456 			error = got_error(GOT_ERR_NOT_REBASING);
5457 			goto done;
5458 		}
5459 		error = got_worktree_rebase_continue(&resume_commit_id,
5460 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
5461 		    worktree, repo);
5462 		if (error)
5463 			goto done;
5464 
5465 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5466 		    resume_commit_id, repo);
5467 		if (error)
5468 			goto done;
5469 
5470 		yca_id = got_object_id_dup(resume_commit_id);
5471 		if (yca_id == NULL) {
5472 			error = got_error_from_errno("got_object_id_dup");
5473 			goto done;
5474 		}
5475 	} else {
5476 		error = got_ref_open(&branch, repo, argv[0], 0);
5477 		if (error != NULL)
5478 			goto done;
5479 	}
5480 
5481 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5482 	if (error)
5483 		goto done;
5484 
5485 	if (!continue_rebase) {
5486 		struct got_object_id *base_commit_id;
5487 
5488 		base_commit_id = got_worktree_get_base_commit_id(worktree);
5489 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5490 		    base_commit_id, branch_head_commit_id, repo,
5491 		    check_cancelled, NULL);
5492 		if (error)
5493 			goto done;
5494 		if (yca_id == NULL) {
5495 			error = got_error_msg(GOT_ERR_ANCESTRY,
5496 			    "specified branch shares no common ancestry "
5497 			    "with work tree's branch");
5498 			goto done;
5499 		}
5500 
5501 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
5502 		if (error) {
5503 			if (error->code != GOT_ERR_ANCESTRY)
5504 				goto done;
5505 			error = NULL;
5506 		} else {
5507 			error = got_error_msg(GOT_ERR_SAME_BRANCH,
5508 			    "specified branch resolves to a commit which "
5509 			    "is already contained in work tree's branch");
5510 			goto done;
5511 		}
5512 		error = got_worktree_rebase_prepare(&new_base_branch,
5513 		    &tmp_branch, &fileindex, worktree, branch, repo);
5514 		if (error)
5515 			goto done;
5516 	}
5517 
5518 	commit_id = branch_head_commit_id;
5519 	error = got_object_open_as_commit(&commit, repo, commit_id);
5520 	if (error)
5521 		goto done;
5522 
5523 	parent_ids = got_object_commit_get_parent_ids(commit);
5524 	pid = SIMPLEQ_FIRST(parent_ids);
5525 	if (pid == NULL) {
5526 		if (!continue_rebase) {
5527 			int did_something;
5528 			error = got_worktree_rebase_abort(worktree, fileindex,
5529 			    repo, new_base_branch, update_progress,
5530 			    &did_something);
5531 			if (error)
5532 				goto done;
5533 			printf("Rebase of %s aborted\n",
5534 			    got_ref_get_name(branch));
5535 		}
5536 		error = got_error(GOT_ERR_EMPTY_REBASE);
5537 		goto done;
5538 	}
5539 	error = collect_commits(&commits, commit_id, pid->id,
5540 	    yca_id, got_worktree_get_path_prefix(worktree),
5541 	    GOT_ERR_REBASE_PATH, repo);
5542 	got_object_commit_close(commit);
5543 	commit = NULL;
5544 	if (error)
5545 		goto done;
5546 
5547 	if (SIMPLEQ_EMPTY(&commits)) {
5548 		if (continue_rebase) {
5549 			error = rebase_complete(worktree, fileindex,
5550 			    branch, new_base_branch, tmp_branch, repo);
5551 			goto done;
5552 		} else {
5553 			/* Fast-forward the reference of the branch. */
5554 			struct got_object_id *new_head_commit_id;
5555 			char *id_str;
5556 			error = got_ref_resolve(&new_head_commit_id, repo,
5557 			    new_base_branch);
5558 			if (error)
5559 				goto done;
5560 			error = got_object_id_str(&id_str, new_head_commit_id);
5561 			printf("Forwarding %s to commit %s\n",
5562 			    got_ref_get_name(branch), id_str);
5563 			free(id_str);
5564 			error = got_ref_change_ref(branch,
5565 			    new_head_commit_id);
5566 			if (error)
5567 				goto done;
5568 		}
5569 	}
5570 
5571 	pid = NULL;
5572 	SIMPLEQ_FOREACH(qid, &commits, entry) {
5573 		commit_id = qid->id;
5574 		parent_id = pid ? pid->id : yca_id;
5575 		pid = qid;
5576 
5577 		error = got_worktree_rebase_merge_files(&merged_paths,
5578 		    worktree, fileindex, parent_id, commit_id, repo,
5579 		    rebase_progress, &rebase_status, check_cancelled, NULL);
5580 		if (error)
5581 			goto done;
5582 
5583 		if (rebase_status == GOT_STATUS_CONFLICT) {
5584 			got_worktree_rebase_pathlist_free(&merged_paths);
5585 			break;
5586 		}
5587 
5588 		error = rebase_commit(&merged_paths, worktree, fileindex,
5589 		    tmp_branch, commit_id, repo);
5590 		got_worktree_rebase_pathlist_free(&merged_paths);
5591 		if (error)
5592 			goto done;
5593 	}
5594 
5595 	if (rebase_status == GOT_STATUS_CONFLICT) {
5596 		error = got_worktree_rebase_postpone(worktree, fileindex);
5597 		if (error)
5598 			goto done;
5599 		error = got_error_msg(GOT_ERR_CONFLICTS,
5600 		    "conflicts must be resolved before rebasing can continue");
5601 	} else
5602 		error = rebase_complete(worktree, fileindex, branch,
5603 		    new_base_branch, tmp_branch, repo);
5604 done:
5605 	got_object_id_queue_free(&commits);
5606 	free(branch_head_commit_id);
5607 	free(resume_commit_id);
5608 	free(yca_id);
5609 	if (commit)
5610 		got_object_commit_close(commit);
5611 	if (branch)
5612 		got_ref_close(branch);
5613 	if (new_base_branch)
5614 		got_ref_close(new_base_branch);
5615 	if (tmp_branch)
5616 		got_ref_close(tmp_branch);
5617 	if (worktree)
5618 		got_worktree_close(worktree);
5619 	if (repo)
5620 		got_repo_close(repo);
5621 	return error;
5622 }
5623 
5624 __dead static void
5625 usage_histedit(void)
5626 {
5627 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5628 	    getprogname());
5629 	exit(1);
5630 }
5631 
5632 #define GOT_HISTEDIT_PICK 'p'
5633 #define GOT_HISTEDIT_EDIT 'e'
5634 #define GOT_HISTEDIT_FOLD 'f'
5635 #define GOT_HISTEDIT_DROP 'd'
5636 #define GOT_HISTEDIT_MESG 'm'
5637 
5638 static struct got_histedit_cmd {
5639 	unsigned char code;
5640 	const char *name;
5641 	const char *desc;
5642 } got_histedit_cmds[] = {
5643 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
5644 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5645 	{ GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5646 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5647 	{ GOT_HISTEDIT_MESG, "mesg",
5648 	    "single-line log message for commit above (open editor if empty)" },
5649 };
5650 
5651 struct got_histedit_list_entry {
5652 	TAILQ_ENTRY(got_histedit_list_entry) entry;
5653 	struct got_object_id *commit_id;
5654 	const struct got_histedit_cmd *cmd;
5655 	char *logmsg;
5656 };
5657 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5658 
5659 static const struct got_error *
5660 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5661     FILE *f, struct got_repository *repo)
5662 {
5663 	const struct got_error *err = NULL;
5664 	char *logmsg = NULL, *id_str = NULL;
5665 	struct got_commit_object *commit = NULL;
5666 	int n;
5667 
5668 	err = got_object_open_as_commit(&commit, repo, commit_id);
5669 	if (err)
5670 		goto done;
5671 
5672 	err = get_short_logmsg(&logmsg, 34, commit);
5673 	if (err)
5674 		goto done;
5675 
5676 	err = got_object_id_str(&id_str, commit_id);
5677 	if (err)
5678 		goto done;
5679 
5680 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5681 	if (n < 0)
5682 		err = got_ferror(f, GOT_ERR_IO);
5683 done:
5684 	if (commit)
5685 		got_object_commit_close(commit);
5686 	free(id_str);
5687 	free(logmsg);
5688 	return err;
5689 }
5690 
5691 static const struct got_error *
5692 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5693     struct got_repository *repo)
5694 {
5695 	const struct got_error *err = NULL;
5696 	struct got_object_qid *qid;
5697 
5698 	if (SIMPLEQ_EMPTY(commits))
5699 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
5700 
5701 	SIMPLEQ_FOREACH(qid, commits, entry) {
5702 		err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5703 		    f, repo);
5704 		if (err)
5705 			break;
5706 	}
5707 
5708 	return err;
5709 }
5710 
5711 static const struct got_error *
5712 write_cmd_list(FILE *f)
5713 {
5714 	const struct got_error *err = NULL;
5715 	int n, i;
5716 
5717 	n = fprintf(f, "# Available histedit commands:\n");
5718 	if (n < 0)
5719 		return got_ferror(f, GOT_ERR_IO);
5720 
5721 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
5722 		struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5723 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
5724 		    cmd->desc);
5725 		if (n < 0) {
5726 			err = got_ferror(f, GOT_ERR_IO);
5727 			break;
5728 		}
5729 	}
5730 	n = fprintf(f, "# Commits will be processed in order from top to "
5731 	    "bottom of this file.\n");
5732 	if (n < 0)
5733 		return got_ferror(f, GOT_ERR_IO);
5734 	return err;
5735 }
5736 
5737 static const struct got_error *
5738 histedit_syntax_error(int lineno)
5739 {
5740 	static char msg[42];
5741 	int ret;
5742 
5743 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5744 	    lineno);
5745 	if (ret == -1 || ret >= sizeof(msg))
5746 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5747 
5748 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5749 }
5750 
5751 static const struct got_error *
5752 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5753     char *logmsg, struct got_repository *repo)
5754 {
5755 	const struct got_error *err;
5756 	struct got_commit_object *folded_commit = NULL;
5757 	char *id_str, *folded_logmsg = NULL;
5758 
5759 	err = got_object_id_str(&id_str, hle->commit_id);
5760 	if (err)
5761 		return err;
5762 
5763 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5764 	if (err)
5765 		goto done;
5766 
5767 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5768 	if (err)
5769 		goto done;
5770 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5771 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5772 	    folded_logmsg) == -1) {
5773 		err = got_error_from_errno("asprintf");
5774 	}
5775 done:
5776 	if (folded_commit)
5777 		got_object_commit_close(folded_commit);
5778 	free(id_str);
5779 	free(folded_logmsg);
5780 	return err;
5781 }
5782 
5783 static struct got_histedit_list_entry *
5784 get_folded_commits(struct got_histedit_list_entry *hle)
5785 {
5786 	struct got_histedit_list_entry *prev, *folded = NULL;
5787 
5788 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
5789 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5790 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
5791 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5792 			folded = prev;
5793 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
5794 	}
5795 
5796 	return folded;
5797 }
5798 
5799 static const struct got_error *
5800 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5801     struct got_repository *repo)
5802 {
5803 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5804 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5805 	const struct got_error *err = NULL;
5806 	struct got_commit_object *commit = NULL;
5807 	int fd;
5808 	struct got_histedit_list_entry *folded = NULL;
5809 
5810 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5811 	if (err)
5812 		return err;
5813 
5814 	folded = get_folded_commits(hle);
5815 	if (folded) {
5816 		while (folded != hle) {
5817 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5818 				folded = TAILQ_NEXT(folded, entry);
5819 				continue;
5820 			}
5821 			err = append_folded_commit_msg(&new_msg, folded,
5822 			    logmsg, repo);
5823 			if (err)
5824 				goto done;
5825 			free(logmsg);
5826 			logmsg = new_msg;
5827 			folded = TAILQ_NEXT(folded, entry);
5828 		}
5829 	}
5830 
5831 	err = got_object_id_str(&id_str, hle->commit_id);
5832 	if (err)
5833 		goto done;
5834 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5835 	if (err)
5836 		goto done;
5837 	if (asprintf(&new_msg,
5838 	    "%s\n# original log message of commit %s: %s",
5839 	    logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5840 		err = got_error_from_errno("asprintf");
5841 		goto done;
5842 	}
5843 	free(logmsg);
5844 	logmsg = new_msg;
5845 
5846 	err = got_object_id_str(&id_str, hle->commit_id);
5847 	if (err)
5848 		goto done;
5849 
5850 	err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5851 	if (err)
5852 		goto done;
5853 
5854 	dprintf(fd, logmsg);
5855 	close(fd);
5856 
5857 	err = get_editor(&editor);
5858 	if (err)
5859 		goto done;
5860 
5861 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5862 	if (err) {
5863 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5864 			goto done;
5865 		err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5866 	}
5867 done:
5868 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5869 		err = got_error_from_errno2("unlink", logmsg_path);
5870 	free(logmsg_path);
5871 	free(logmsg);
5872 	free(orig_logmsg);
5873 	free(editor);
5874 	if (commit)
5875 		got_object_commit_close(commit);
5876 	return err;
5877 }
5878 
5879 static const struct got_error *
5880 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5881     FILE *f, struct got_repository *repo)
5882 {
5883 	const struct got_error *err = NULL;
5884 	char *line = NULL, *p, *end;
5885 	size_t size;
5886 	ssize_t len;
5887 	int lineno = 0, i;
5888 	const struct got_histedit_cmd *cmd;
5889 	struct got_object_id *commit_id = NULL;
5890 	struct got_histedit_list_entry *hle = NULL;
5891 
5892 	for (;;) {
5893 		len = getline(&line, &size, f);
5894 		if (len == -1) {
5895 			const struct got_error *getline_err;
5896 			if (feof(f))
5897 				break;
5898 			getline_err = got_error_from_errno("getline");
5899 			err = got_ferror(f, getline_err->code);
5900 			break;
5901 		}
5902 		lineno++;
5903 		p = line;
5904 		while (isspace((unsigned char)p[0]))
5905 			p++;
5906 		if (p[0] == '#' || p[0] == '\0') {
5907 			free(line);
5908 			line = NULL;
5909 			continue;
5910 		}
5911 		cmd = NULL;
5912 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
5913 			cmd = &got_histedit_cmds[i];
5914 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5915 			    isspace((unsigned char)p[strlen(cmd->name)])) {
5916 				p += strlen(cmd->name);
5917 				break;
5918 			}
5919 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5920 				p++;
5921 				break;
5922 			}
5923 		}
5924 		if (i == nitems(got_histedit_cmds)) {
5925 			err = histedit_syntax_error(lineno);
5926 			break;
5927 		}
5928 		while (isspace((unsigned char)p[0]))
5929 			p++;
5930 		if (cmd->code == GOT_HISTEDIT_MESG) {
5931 			if (hle == NULL || hle->logmsg != NULL) {
5932 				err = got_error(GOT_ERR_HISTEDIT_CMD);
5933 				break;
5934 			}
5935 			if (p[0] == '\0') {
5936 				err = histedit_edit_logmsg(hle, repo);
5937 				if (err)
5938 					break;
5939 			} else {
5940 				hle->logmsg = strdup(p);
5941 				if (hle->logmsg == NULL) {
5942 					err = got_error_from_errno("strdup");
5943 					break;
5944 				}
5945 			}
5946 			free(line);
5947 			line = NULL;
5948 			continue;
5949 		} else {
5950 			end = p;
5951 			while (end[0] && !isspace((unsigned char)end[0]))
5952 				end++;
5953 			*end = '\0';
5954 
5955 			err = got_object_resolve_id_str(&commit_id, repo, p);
5956 			if (err) {
5957 				/* override error code */
5958 				err = histedit_syntax_error(lineno);
5959 				break;
5960 			}
5961 		}
5962 		hle = malloc(sizeof(*hle));
5963 		if (hle == NULL) {
5964 			err = got_error_from_errno("malloc");
5965 			break;
5966 		}
5967 		hle->cmd = cmd;
5968 		hle->commit_id = commit_id;
5969 		hle->logmsg = NULL;
5970 		commit_id = NULL;
5971 		free(line);
5972 		line = NULL;
5973 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5974 	}
5975 
5976 	free(line);
5977 	free(commit_id);
5978 	return err;
5979 }
5980 
5981 static const struct got_error *
5982 histedit_check_script(struct got_histedit_list *histedit_cmds,
5983     struct got_object_id_queue *commits, struct got_repository *repo)
5984 {
5985 	const struct got_error *err = NULL;
5986 	struct got_object_qid *qid;
5987 	struct got_histedit_list_entry *hle;
5988 	static char msg[80];
5989 	char *id_str;
5990 
5991 	if (TAILQ_EMPTY(histedit_cmds))
5992 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5993 		    "histedit script contains no commands");
5994 	if (SIMPLEQ_EMPTY(commits))
5995 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
5996 
5997 	SIMPLEQ_FOREACH(qid, commits, entry) {
5998 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
5999 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6000 				break;
6001 		}
6002 		if (hle == NULL) {
6003 			err = got_object_id_str(&id_str, qid->id);
6004 			if (err)
6005 				return err;
6006 			snprintf(msg, sizeof(msg),
6007 			    "commit %s missing from histedit script", id_str);
6008 			free(id_str);
6009 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6010 		}
6011 	}
6012 
6013 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6014 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6015 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6016 		    "last commit in histedit script cannot be folded");
6017 
6018 	return NULL;
6019 }
6020 
6021 static const struct got_error *
6022 histedit_run_editor(struct got_histedit_list *histedit_cmds,
6023     const char *path, struct got_object_id_queue *commits,
6024     struct got_repository *repo)
6025 {
6026 	const struct got_error *err = NULL;
6027 	char *editor;
6028 	FILE *f = NULL;
6029 
6030 	err = get_editor(&editor);
6031 	if (err)
6032 		return err;
6033 
6034 	if (spawn_editor(editor, path) == -1) {
6035 		err = got_error_from_errno("failed spawning editor");
6036 		goto done;
6037 	}
6038 
6039 	f = fopen(path, "r");
6040 	if (f == NULL) {
6041 		err = got_error_from_errno("fopen");
6042 		goto done;
6043 	}
6044 	err = histedit_parse_list(histedit_cmds, f, repo);
6045 	if (err)
6046 		goto done;
6047 
6048 	err = histedit_check_script(histedit_cmds, commits, repo);
6049 done:
6050 	if (f && fclose(f) != 0 && err == NULL)
6051 		err = got_error_from_errno("fclose");
6052 	free(editor);
6053 	return err;
6054 }
6055 
6056 static const struct got_error *
6057 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6058     struct got_object_id_queue *, const char *, struct got_repository *);
6059 
6060 static const struct got_error *
6061 histedit_edit_script(struct got_histedit_list *histedit_cmds,
6062     struct got_object_id_queue *commits, struct got_repository *repo)
6063 {
6064 	const struct got_error *err;
6065 	FILE *f = NULL;
6066 	char *path = NULL;
6067 
6068 	err = got_opentemp_named(&path, &f, "got-histedit");
6069 	if (err)
6070 		return err;
6071 
6072 	err = write_cmd_list(f);
6073 	if (err)
6074 		goto done;
6075 
6076 	err = histedit_write_commit_list(commits, f, repo);
6077 	if (err)
6078 		goto done;
6079 
6080 	if (fclose(f) != 0) {
6081 		err = got_error_from_errno("fclose");
6082 		goto done;
6083 	}
6084 	f = NULL;
6085 
6086 	err = histedit_run_editor(histedit_cmds, path, commits, repo);
6087 	if (err) {
6088 		if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6089 		    err->code != GOT_ERR_HISTEDIT_CMD)
6090 			goto done;
6091 		err = histedit_edit_list_retry(histedit_cmds, err,
6092 		    commits, path, repo);
6093 	}
6094 done:
6095 	if (f && fclose(f) != 0 && err == NULL)
6096 		err = got_error_from_errno("fclose");
6097 	if (path && unlink(path) != 0 && err == NULL)
6098 		err = got_error_from_errno2("unlink", path);
6099 	free(path);
6100 	return err;
6101 }
6102 
6103 static const struct got_error *
6104 histedit_save_list(struct got_histedit_list *histedit_cmds,
6105     struct got_worktree *worktree, struct got_repository *repo)
6106 {
6107 	const struct got_error *err = NULL;
6108 	char *path = NULL;
6109 	FILE *f = NULL;
6110 	struct got_histedit_list_entry *hle;
6111 	struct got_commit_object *commit = NULL;
6112 
6113 	err = got_worktree_get_histedit_script_path(&path, worktree);
6114 	if (err)
6115 		return err;
6116 
6117 	f = fopen(path, "w");
6118 	if (f == NULL) {
6119 		err = got_error_from_errno2("fopen", path);
6120 		goto done;
6121 	}
6122 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
6123 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6124 		    repo);
6125 		if (err)
6126 			break;
6127 
6128 		if (hle->logmsg) {
6129 			int n = fprintf(f, "%c %s\n",
6130 			    GOT_HISTEDIT_MESG, hle->logmsg);
6131 			if (n < 0) {
6132 				err = got_ferror(f, GOT_ERR_IO);
6133 				break;
6134 			}
6135 		}
6136 	}
6137 done:
6138 	if (f && fclose(f) != 0 && err == NULL)
6139 		err = got_error_from_errno("fclose");
6140 	free(path);
6141 	if (commit)
6142 		got_object_commit_close(commit);
6143 	return err;
6144 }
6145 
6146 void
6147 histedit_free_list(struct got_histedit_list *histedit_cmds)
6148 {
6149 	struct got_histedit_list_entry *hle;
6150 
6151 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
6152 		TAILQ_REMOVE(histedit_cmds, hle, entry);
6153 		free(hle);
6154 	}
6155 }
6156 
6157 static const struct got_error *
6158 histedit_load_list(struct got_histedit_list *histedit_cmds,
6159     const char *path, struct got_repository *repo)
6160 {
6161 	const struct got_error *err = NULL;
6162 	FILE *f = NULL;
6163 
6164 	f = fopen(path, "r");
6165 	if (f == NULL) {
6166 		err = got_error_from_errno2("fopen", path);
6167 		goto done;
6168 	}
6169 
6170 	err = histedit_parse_list(histedit_cmds, f, repo);
6171 done:
6172 	if (f && fclose(f) != 0 && err == NULL)
6173 		err = got_error_from_errno("fclose");
6174 	return err;
6175 }
6176 
6177 static const struct got_error *
6178 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6179     const struct got_error *edit_err, struct got_object_id_queue *commits,
6180     const char *path, struct got_repository *repo)
6181 {
6182 	const struct got_error *err = NULL, *prev_err = edit_err;
6183 	int resp = ' ';
6184 
6185 	while (resp != 'c' && resp != 'r' && resp != 'a') {
6186 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6187 		    "or (a)bort: ", getprogname(), prev_err->msg);
6188 		resp = getchar();
6189 		if (resp == '\n')
6190 			resp = getchar();
6191 		if (resp == 'c') {
6192 			histedit_free_list(histedit_cmds);
6193 			err = histedit_run_editor(histedit_cmds, path, commits,
6194 			    repo);
6195 			if (err) {
6196 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6197 				    err->code != GOT_ERR_HISTEDIT_CMD)
6198 					break;
6199 				prev_err = err;
6200 				resp = ' ';
6201 				continue;
6202 			}
6203 			break;
6204 		} else if (resp == 'r') {
6205 			histedit_free_list(histedit_cmds);
6206 			err = histedit_edit_script(histedit_cmds,
6207 			    commits, repo);
6208 			if (err) {
6209 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6210 				    err->code != GOT_ERR_HISTEDIT_CMD)
6211 					break;
6212 				prev_err = err;
6213 				resp = ' ';
6214 				continue;
6215 			}
6216 			break;
6217 		} else if (resp == 'a') {
6218 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6219 			break;
6220 		} else
6221 			printf("invalid response '%c'\n", resp);
6222 	}
6223 
6224 	return err;
6225 }
6226 
6227 static const struct got_error *
6228 histedit_complete(struct got_worktree *worktree,
6229     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6230     struct got_reference *branch, struct got_repository *repo)
6231 {
6232 	printf("Switching work tree to %s\n",
6233 	    got_ref_get_symref_target(branch));
6234 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6235 	    branch, repo);
6236 }
6237 
6238 static const struct got_error *
6239 show_histedit_progress(struct got_commit_object *commit,
6240     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6241 {
6242 	const struct got_error *err;
6243 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6244 
6245 	err = got_object_id_str(&old_id_str, hle->commit_id);
6246 	if (err)
6247 		goto done;
6248 
6249 	if (new_id) {
6250 		err = got_object_id_str(&new_id_str, new_id);
6251 		if (err)
6252 			goto done;
6253 	}
6254 
6255 	old_id_str[12] = '\0';
6256 	if (new_id_str)
6257 		new_id_str[12] = '\0';
6258 
6259 	if (hle->logmsg) {
6260 		logmsg = strdup(hle->logmsg);
6261 		if (logmsg == NULL) {
6262 			err = got_error_from_errno("strdup");
6263 			goto done;
6264 		}
6265 		trim_logmsg(logmsg, 42);
6266 	} else {
6267 		err = get_short_logmsg(&logmsg, 42, commit);
6268 		if (err)
6269 			goto done;
6270 	}
6271 
6272 	switch (hle->cmd->code) {
6273 	case GOT_HISTEDIT_PICK:
6274 	case GOT_HISTEDIT_EDIT:
6275 		printf("%s -> %s: %s\n", old_id_str,
6276 		    new_id_str ? new_id_str : "no-op change", logmsg);
6277 		break;
6278 	case GOT_HISTEDIT_DROP:
6279 	case GOT_HISTEDIT_FOLD:
6280 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
6281 		    logmsg);
6282 		break;
6283 	default:
6284 		break;
6285 	}
6286 done:
6287 	free(old_id_str);
6288 	free(new_id_str);
6289 	return err;
6290 }
6291 
6292 static const struct got_error *
6293 histedit_commit(struct got_pathlist_head *merged_paths,
6294     struct got_worktree *worktree, struct got_fileindex *fileindex,
6295     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6296     struct got_repository *repo)
6297 {
6298 	const struct got_error *err;
6299 	struct got_commit_object *commit;
6300 	struct got_object_id *new_commit_id;
6301 
6302 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6303 	    && hle->logmsg == NULL) {
6304 		err = histedit_edit_logmsg(hle, repo);
6305 		if (err)
6306 			return err;
6307 	}
6308 
6309 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6310 	if (err)
6311 		return err;
6312 
6313 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6314 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
6315 	    hle->logmsg, repo);
6316 	if (err) {
6317 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6318 			goto done;
6319 		err = show_histedit_progress(commit, hle, NULL);
6320 	} else {
6321 		err = show_histedit_progress(commit, hle, new_commit_id);
6322 		free(new_commit_id);
6323 	}
6324 done:
6325 	got_object_commit_close(commit);
6326 	return err;
6327 }
6328 
6329 static const struct got_error *
6330 histedit_skip_commit(struct got_histedit_list_entry *hle,
6331     struct got_worktree *worktree, struct got_repository *repo)
6332 {
6333 	const struct got_error *error;
6334 	struct got_commit_object *commit;
6335 
6336 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6337 	    repo);
6338 	if (error)
6339 		return error;
6340 
6341 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6342 	if (error)
6343 		return error;
6344 
6345 	error = show_histedit_progress(commit, hle, NULL);
6346 	got_object_commit_close(commit);
6347 	return error;
6348 }
6349 
6350 static const struct got_error *
6351 cmd_histedit(int argc, char *argv[])
6352 {
6353 	const struct got_error *error = NULL;
6354 	struct got_worktree *worktree = NULL;
6355 	struct got_fileindex *fileindex = NULL;
6356 	struct got_repository *repo = NULL;
6357 	char *cwd = NULL;
6358 	struct got_reference *branch = NULL;
6359 	struct got_reference *tmp_branch = NULL;
6360 	struct got_object_id *resume_commit_id = NULL;
6361 	struct got_object_id *base_commit_id = NULL;
6362 	struct got_object_id *head_commit_id = NULL;
6363 	struct got_commit_object *commit = NULL;
6364 	int ch, rebase_in_progress = 0, did_something;
6365 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6366 	const char *edit_script_path = NULL;
6367 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6368 	struct got_object_id_queue commits;
6369 	struct got_pathlist_head merged_paths;
6370 	const struct got_object_id_queue *parent_ids;
6371 	struct got_object_qid *pid;
6372 	struct got_histedit_list histedit_cmds;
6373 	struct got_histedit_list_entry *hle;
6374 
6375 	SIMPLEQ_INIT(&commits);
6376 	TAILQ_INIT(&histedit_cmds);
6377 	TAILQ_INIT(&merged_paths);
6378 
6379 	while ((ch = getopt(argc, argv, "acF:")) != -1) {
6380 		switch (ch) {
6381 		case 'a':
6382 			abort_edit = 1;
6383 			break;
6384 		case 'c':
6385 			continue_edit = 1;
6386 			break;
6387 		case 'F':
6388 			edit_script_path = optarg;
6389 			break;
6390 		default:
6391 			usage_histedit();
6392 			/* NOTREACHED */
6393 		}
6394 	}
6395 
6396 	argc -= optind;
6397 	argv += optind;
6398 
6399 #ifndef PROFILE
6400 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6401 	    "unveil", NULL) == -1)
6402 		err(1, "pledge");
6403 #endif
6404 	if (abort_edit && continue_edit)
6405 		usage_histedit();
6406 	if (argc != 0)
6407 		usage_histedit();
6408 
6409 	/*
6410 	 * This command cannot apply unveil(2) in all cases because the
6411 	 * user may choose to run an editor to edit the histedit script
6412 	 * and to edit individual commit log messages.
6413 	 * unveil(2) traverses exec(2); if an editor is used we have to
6414 	 * apply unveil after edit script and log messages have been written.
6415 	 * XXX TODO: Make use of unveil(2) where possible.
6416 	 */
6417 
6418 	cwd = getcwd(NULL, 0);
6419 	if (cwd == NULL) {
6420 		error = got_error_from_errno("getcwd");
6421 		goto done;
6422 	}
6423 	error = got_worktree_open(&worktree, cwd);
6424 	if (error)
6425 		goto done;
6426 
6427 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6428 	    NULL);
6429 	if (error != NULL)
6430 		goto done;
6431 
6432 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6433 	if (error)
6434 		goto done;
6435 	if (rebase_in_progress) {
6436 		error = got_error(GOT_ERR_REBASING);
6437 		goto done;
6438 	}
6439 
6440 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6441 	if (error)
6442 		goto done;
6443 
6444 	if (edit_in_progress && abort_edit) {
6445 		error = got_worktree_histedit_continue(&resume_commit_id,
6446 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
6447 		    worktree, repo);
6448 		if (error)
6449 			goto done;
6450 		printf("Switching work tree to %s\n",
6451 		    got_ref_get_symref_target(branch));
6452 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
6453 		    branch, base_commit_id, update_progress, &did_something);
6454 		if (error)
6455 			goto done;
6456 		printf("Histedit of %s aborted\n",
6457 		    got_ref_get_symref_target(branch));
6458 		goto done; /* nothing else to do */
6459 	} else if (abort_edit) {
6460 		error = got_error(GOT_ERR_NOT_HISTEDIT);
6461 		goto done;
6462 	}
6463 
6464 	if (continue_edit) {
6465 		char *path;
6466 
6467 		if (!edit_in_progress) {
6468 			error = got_error(GOT_ERR_NOT_HISTEDIT);
6469 			goto done;
6470 		}
6471 
6472 		error = got_worktree_get_histedit_script_path(&path, worktree);
6473 		if (error)
6474 			goto done;
6475 
6476 		error = histedit_load_list(&histedit_cmds, path, repo);
6477 		free(path);
6478 		if (error)
6479 			goto done;
6480 
6481 		error = got_worktree_histedit_continue(&resume_commit_id,
6482 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
6483 		    worktree, repo);
6484 		if (error)
6485 			goto done;
6486 
6487 		error = got_ref_resolve(&head_commit_id, repo, branch);
6488 		if (error)
6489 			goto done;
6490 
6491 		error = got_object_open_as_commit(&commit, repo,
6492 		    head_commit_id);
6493 		if (error)
6494 			goto done;
6495 		parent_ids = got_object_commit_get_parent_ids(commit);
6496 		pid = SIMPLEQ_FIRST(parent_ids);
6497 		if (pid == NULL) {
6498 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6499 			goto done;
6500 		}
6501 		error = collect_commits(&commits, head_commit_id, pid->id,
6502 		    base_commit_id, got_worktree_get_path_prefix(worktree),
6503 		    GOT_ERR_HISTEDIT_PATH, repo);
6504 		got_object_commit_close(commit);
6505 		commit = NULL;
6506 		if (error)
6507 			goto done;
6508 	} else {
6509 		if (edit_in_progress) {
6510 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
6511 			goto done;
6512 		}
6513 
6514 		error = got_ref_open(&branch, repo,
6515 		    got_worktree_get_head_ref_name(worktree), 0);
6516 		if (error != NULL)
6517 			goto done;
6518 
6519 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6520 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6521 			    "will not edit commit history of a branch outside "
6522 			    "the \"refs/heads/\" reference namespace");
6523 			goto done;
6524 		}
6525 
6526 		error = got_ref_resolve(&head_commit_id, repo, branch);
6527 		got_ref_close(branch);
6528 		branch = NULL;
6529 		if (error)
6530 			goto done;
6531 
6532 		error = got_object_open_as_commit(&commit, repo,
6533 		    head_commit_id);
6534 		if (error)
6535 			goto done;
6536 		parent_ids = got_object_commit_get_parent_ids(commit);
6537 		pid = SIMPLEQ_FIRST(parent_ids);
6538 		if (pid == NULL) {
6539 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6540 			goto done;
6541 		}
6542 		error = collect_commits(&commits, head_commit_id, pid->id,
6543 		    got_worktree_get_base_commit_id(worktree),
6544 		    got_worktree_get_path_prefix(worktree),
6545 		    GOT_ERR_HISTEDIT_PATH, repo);
6546 		got_object_commit_close(commit);
6547 		commit = NULL;
6548 		if (error)
6549 			goto done;
6550 
6551 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6552 		    &base_commit_id, &fileindex, worktree, repo);
6553 		if (error)
6554 			goto done;
6555 
6556 		if (edit_script_path) {
6557 			error = histedit_load_list(&histedit_cmds,
6558 			    edit_script_path, repo);
6559 			if (error) {
6560 				got_worktree_histedit_abort(worktree, fileindex,
6561 				    repo, branch, base_commit_id,
6562 				    update_progress, &did_something);
6563 				goto done;
6564 			}
6565 		} else {
6566 			error = histedit_edit_script(&histedit_cmds, &commits,
6567 			    repo);
6568 			if (error) {
6569 				got_worktree_histedit_abort(worktree, fileindex,
6570 				    repo, branch, base_commit_id,
6571 				    update_progress, &did_something);
6572 				goto done;
6573 			}
6574 
6575 		}
6576 
6577 		error = histedit_save_list(&histedit_cmds, worktree,
6578 		    repo);
6579 		if (error) {
6580 			got_worktree_histedit_abort(worktree, fileindex,
6581 			    repo, branch, base_commit_id,
6582 			    update_progress, &did_something);
6583 			goto done;
6584 		}
6585 
6586 	}
6587 
6588 	error = histedit_check_script(&histedit_cmds, &commits, repo);
6589 	if (error)
6590 		goto done;
6591 
6592 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6593 		if (resume_commit_id) {
6594 			if (got_object_id_cmp(hle->commit_id,
6595 			    resume_commit_id) != 0)
6596 				continue;
6597 
6598 			resume_commit_id = NULL;
6599 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6600 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
6601 				error = histedit_skip_commit(hle, worktree,
6602 				   repo);
6603 			} else {
6604 				error = histedit_commit(NULL, worktree,
6605 				    fileindex, tmp_branch, hle, repo);
6606 			}
6607 			if (error)
6608 				goto done;
6609 			continue;
6610 		}
6611 
6612 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6613 			error = histedit_skip_commit(hle, worktree, repo);
6614 			if (error)
6615 				goto done;
6616 			continue;
6617 		}
6618 
6619 		error = got_object_open_as_commit(&commit, repo,
6620 		    hle->commit_id);
6621 		if (error)
6622 			goto done;
6623 		parent_ids = got_object_commit_get_parent_ids(commit);
6624 		pid = SIMPLEQ_FIRST(parent_ids);
6625 
6626 		error = got_worktree_histedit_merge_files(&merged_paths,
6627 		    worktree, fileindex, pid->id, hle->commit_id, repo,
6628 		    rebase_progress, &rebase_status, check_cancelled, NULL);
6629 		if (error)
6630 			goto done;
6631 		got_object_commit_close(commit);
6632 		commit = NULL;
6633 
6634 		if (rebase_status == GOT_STATUS_CONFLICT) {
6635 			got_worktree_rebase_pathlist_free(&merged_paths);
6636 			break;
6637 		}
6638 
6639 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6640 			char *id_str;
6641 			error = got_object_id_str(&id_str, hle->commit_id);
6642 			if (error)
6643 				goto done;
6644 			printf("Stopping histedit for amending commit %s\n",
6645 			    id_str);
6646 			free(id_str);
6647 			got_worktree_rebase_pathlist_free(&merged_paths);
6648 			error = got_worktree_histedit_postpone(worktree,
6649 			    fileindex);
6650 			goto done;
6651 		}
6652 
6653 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6654 			error = histedit_skip_commit(hle, worktree, repo);
6655 			if (error)
6656 				goto done;
6657 			continue;
6658 		}
6659 
6660 		error = histedit_commit(&merged_paths, worktree, fileindex,
6661 		    tmp_branch, hle, repo);
6662 		got_worktree_rebase_pathlist_free(&merged_paths);
6663 		if (error)
6664 			goto done;
6665 	}
6666 
6667 	if (rebase_status == GOT_STATUS_CONFLICT) {
6668 		error = got_worktree_histedit_postpone(worktree, fileindex);
6669 		if (error)
6670 			goto done;
6671 		error = got_error_msg(GOT_ERR_CONFLICTS,
6672 		    "conflicts must be resolved before rebasing can continue");
6673 	} else
6674 		error = histedit_complete(worktree, fileindex, tmp_branch,
6675 		    branch, repo);
6676 done:
6677 	got_object_id_queue_free(&commits);
6678 	histedit_free_list(&histedit_cmds);
6679 	free(head_commit_id);
6680 	free(base_commit_id);
6681 	free(resume_commit_id);
6682 	if (commit)
6683 		got_object_commit_close(commit);
6684 	if (branch)
6685 		got_ref_close(branch);
6686 	if (tmp_branch)
6687 		got_ref_close(tmp_branch);
6688 	if (worktree)
6689 		got_worktree_close(worktree);
6690 	if (repo)
6691 		got_repo_close(repo);
6692 	return error;
6693 }
6694 
6695 __dead static void
6696 usage_integrate(void)
6697 {
6698 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6699 	exit(1);
6700 }
6701 
6702 static const struct got_error *
6703 cmd_integrate(int argc, char *argv[])
6704 {
6705 	const struct got_error *error = NULL;
6706 	struct got_repository *repo = NULL;
6707 	struct got_worktree *worktree = NULL;
6708 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6709 	const char *branch_arg = NULL;
6710 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6711 	struct got_fileindex *fileindex = NULL;
6712 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6713 	int ch, did_something = 0;
6714 
6715 	while ((ch = getopt(argc, argv, "")) != -1) {
6716 		switch (ch) {
6717 		default:
6718 			usage_integrate();
6719 			/* NOTREACHED */
6720 		}
6721 	}
6722 
6723 	argc -= optind;
6724 	argv += optind;
6725 
6726 	if (argc != 1)
6727 		usage_integrate();
6728 	branch_arg = argv[0];
6729 
6730 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6731 	    "unveil", NULL) == -1)
6732 		err(1, "pledge");
6733 
6734 	cwd = getcwd(NULL, 0);
6735 	if (cwd == NULL) {
6736 		error = got_error_from_errno("getcwd");
6737 		goto done;
6738 	}
6739 
6740 	error = got_worktree_open(&worktree, cwd);
6741 	if (error)
6742 		goto done;
6743 
6744 	error = check_rebase_or_histedit_in_progress(worktree);
6745 	if (error)
6746 		goto done;
6747 
6748 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6749 	    NULL);
6750 	if (error != NULL)
6751 		goto done;
6752 
6753 	error = apply_unveil(got_repo_get_path(repo), 0,
6754 	    got_worktree_get_root_path(worktree));
6755 	if (error)
6756 		goto done;
6757 
6758 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6759 		error = got_error_from_errno("asprintf");
6760 		goto done;
6761 	}
6762 
6763 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6764 	    &base_branch_ref, worktree, refname, repo);
6765 	if (error)
6766 		goto done;
6767 
6768 	refname = strdup(got_ref_get_name(branch_ref));
6769 	if (refname == NULL) {
6770 		error = got_error_from_errno("strdup");
6771 		got_worktree_integrate_abort(worktree, fileindex, repo,
6772 		    branch_ref, base_branch_ref);
6773 		goto done;
6774 	}
6775 	base_refname = strdup(got_ref_get_name(base_branch_ref));
6776 	if (base_refname == NULL) {
6777 		error = got_error_from_errno("strdup");
6778 		got_worktree_integrate_abort(worktree, fileindex, repo,
6779 		    branch_ref, base_branch_ref);
6780 		goto done;
6781 	}
6782 
6783 	error = got_ref_resolve(&commit_id, repo, branch_ref);
6784 	if (error)
6785 		goto done;
6786 
6787 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6788 	if (error)
6789 		goto done;
6790 
6791 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6792 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
6793 		    "specified branch has already been integrated");
6794 		got_worktree_integrate_abort(worktree, fileindex, repo,
6795 		    branch_ref, base_branch_ref);
6796 		goto done;
6797 	}
6798 
6799 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6800 	if (error) {
6801 		if (error->code == GOT_ERR_ANCESTRY)
6802 			error = got_error(GOT_ERR_REBASE_REQUIRED);
6803 		got_worktree_integrate_abort(worktree, fileindex, repo,
6804 		    branch_ref, base_branch_ref);
6805 		goto done;
6806 	}
6807 
6808 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
6809 	    branch_ref, base_branch_ref, update_progress, &did_something,
6810 	    check_cancelled, NULL);
6811 	if (error)
6812 		goto done;
6813 
6814 	printf("Integrated %s into %s\n", refname, base_refname);
6815 done:
6816 	if (repo)
6817 		got_repo_close(repo);
6818 	if (worktree)
6819 		got_worktree_close(worktree);
6820 	free(cwd);
6821 	free(base_commit_id);
6822 	free(commit_id);
6823 	free(refname);
6824 	free(base_refname);
6825 	return error;
6826 }
6827 
6828 __dead static void
6829 usage_stage(void)
6830 {
6831 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6832 	    "[file-path ...]\n",
6833 	    getprogname());
6834 	exit(1);
6835 }
6836 
6837 static const struct got_error *
6838 print_stage(void *arg, unsigned char status, unsigned char staged_status,
6839     const char *path, struct got_object_id *blob_id,
6840     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6841     int dirfd, const char *de_name)
6842 {
6843 	const struct got_error *err = NULL;
6844 	char *id_str = NULL;
6845 
6846 	if (staged_status != GOT_STATUS_ADD &&
6847 	    staged_status != GOT_STATUS_MODIFY &&
6848 	    staged_status != GOT_STATUS_DELETE)
6849 		return NULL;
6850 
6851 	if (staged_status == GOT_STATUS_ADD ||
6852 	    staged_status == GOT_STATUS_MODIFY)
6853 		err = got_object_id_str(&id_str, staged_blob_id);
6854 	else
6855 		err = got_object_id_str(&id_str, blob_id);
6856 	if (err)
6857 		return err;
6858 
6859 	printf("%s %c %s\n", id_str, staged_status, path);
6860 	free(id_str);
6861 	return NULL;
6862 }
6863 
6864 static const struct got_error *
6865 cmd_stage(int argc, char *argv[])
6866 {
6867 	const struct got_error *error = NULL;
6868 	struct got_repository *repo = NULL;
6869 	struct got_worktree *worktree = NULL;
6870 	char *cwd = NULL;
6871 	struct got_pathlist_head paths;
6872 	struct got_pathlist_entry *pe;
6873 	int ch, list_stage = 0, pflag = 0;
6874 	FILE *patch_script_file = NULL;
6875 	const char *patch_script_path = NULL;
6876 	struct choose_patch_arg cpa;
6877 
6878 	TAILQ_INIT(&paths);
6879 
6880 	while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6881 		switch (ch) {
6882 		case 'l':
6883 			list_stage = 1;
6884 			break;
6885 		case 'p':
6886 			pflag = 1;
6887 			break;
6888 		case 'F':
6889 			patch_script_path = optarg;
6890 			break;
6891 		default:
6892 			usage_stage();
6893 			/* NOTREACHED */
6894 		}
6895 	}
6896 
6897 	argc -= optind;
6898 	argv += optind;
6899 
6900 #ifndef PROFILE
6901 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6902 	    "unveil", NULL) == -1)
6903 		err(1, "pledge");
6904 #endif
6905 	if (list_stage && (pflag || patch_script_path))
6906 		errx(1, "-l option cannot be used with other options");
6907 	if (patch_script_path && !pflag)
6908 		errx(1, "-F option can only be used together with -p option");
6909 
6910 	cwd = getcwd(NULL, 0);
6911 	if (cwd == NULL) {
6912 		error = got_error_from_errno("getcwd");
6913 		goto done;
6914 	}
6915 
6916 	error = got_worktree_open(&worktree, cwd);
6917 	if (error)
6918 		goto done;
6919 
6920 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6921 	    NULL);
6922 	if (error != NULL)
6923 		goto done;
6924 
6925 	if (patch_script_path) {
6926 		patch_script_file = fopen(patch_script_path, "r");
6927 		if (patch_script_file == NULL) {
6928 			error = got_error_from_errno2("fopen",
6929 			    patch_script_path);
6930 			goto done;
6931 		}
6932 	}
6933 	error = apply_unveil(got_repo_get_path(repo), 0,
6934 	    got_worktree_get_root_path(worktree));
6935 	if (error)
6936 		goto done;
6937 
6938 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6939 	if (error)
6940 		goto done;
6941 
6942 	if (list_stage)
6943 		error = got_worktree_status(worktree, &paths, repo,
6944 		    print_stage, NULL, check_cancelled, NULL);
6945 	else {
6946 		cpa.patch_script_file = patch_script_file;
6947 		cpa.action = "stage";
6948 		error = got_worktree_stage(worktree, &paths,
6949 		    pflag ? NULL : print_status, NULL,
6950 		    pflag ? choose_patch : NULL, &cpa, repo);
6951 	}
6952 done:
6953 	if (patch_script_file && fclose(patch_script_file) == EOF &&
6954 	    error == NULL)
6955 		error = got_error_from_errno2("fclose", patch_script_path);
6956 	if (repo)
6957 		got_repo_close(repo);
6958 	if (worktree)
6959 		got_worktree_close(worktree);
6960 	TAILQ_FOREACH(pe, &paths, entry)
6961 		free((char *)pe->path);
6962 	got_pathlist_free(&paths);
6963 	free(cwd);
6964 	return error;
6965 }
6966 
6967 __dead static void
6968 usage_unstage(void)
6969 {
6970 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6971 	    "[file-path ...]\n",
6972 	    getprogname());
6973 	exit(1);
6974 }
6975 
6976 
6977 static const struct got_error *
6978 cmd_unstage(int argc, char *argv[])
6979 {
6980 	const struct got_error *error = NULL;
6981 	struct got_repository *repo = NULL;
6982 	struct got_worktree *worktree = NULL;
6983 	char *cwd = NULL;
6984 	struct got_pathlist_head paths;
6985 	struct got_pathlist_entry *pe;
6986 	int ch, did_something = 0, pflag = 0;
6987 	FILE *patch_script_file = NULL;
6988 	const char *patch_script_path = NULL;
6989 	struct choose_patch_arg cpa;
6990 
6991 	TAILQ_INIT(&paths);
6992 
6993 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
6994 		switch (ch) {
6995 		case 'p':
6996 			pflag = 1;
6997 			break;
6998 		case 'F':
6999 			patch_script_path = optarg;
7000 			break;
7001 		default:
7002 			usage_unstage();
7003 			/* NOTREACHED */
7004 		}
7005 	}
7006 
7007 	argc -= optind;
7008 	argv += optind;
7009 
7010 #ifndef PROFILE
7011 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7012 	    "unveil", NULL) == -1)
7013 		err(1, "pledge");
7014 #endif
7015 	if (patch_script_path && !pflag)
7016 		errx(1, "-F option can only be used together with -p option");
7017 
7018 	cwd = getcwd(NULL, 0);
7019 	if (cwd == NULL) {
7020 		error = got_error_from_errno("getcwd");
7021 		goto done;
7022 	}
7023 
7024 	error = got_worktree_open(&worktree, cwd);
7025 	if (error)
7026 		goto done;
7027 
7028 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7029 	    NULL);
7030 	if (error != NULL)
7031 		goto done;
7032 
7033 	if (patch_script_path) {
7034 		patch_script_file = fopen(patch_script_path, "r");
7035 		if (patch_script_file == NULL) {
7036 			error = got_error_from_errno2("fopen",
7037 			    patch_script_path);
7038 			goto done;
7039 		}
7040 	}
7041 
7042 	error = apply_unveil(got_repo_get_path(repo), 0,
7043 	    got_worktree_get_root_path(worktree));
7044 	if (error)
7045 		goto done;
7046 
7047 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7048 	if (error)
7049 		goto done;
7050 
7051 	cpa.patch_script_file = patch_script_file;
7052 	cpa.action = "unstage";
7053 	error = got_worktree_unstage(worktree, &paths, update_progress,
7054 	    &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7055 done:
7056 	if (patch_script_file && fclose(patch_script_file) == EOF &&
7057 	    error == NULL)
7058 		error = got_error_from_errno2("fclose", patch_script_path);
7059 	if (repo)
7060 		got_repo_close(repo);
7061 	if (worktree)
7062 		got_worktree_close(worktree);
7063 	TAILQ_FOREACH(pe, &paths, entry)
7064 		free((char *)pe->path);
7065 	got_pathlist_free(&paths);
7066 	free(cwd);
7067 	return error;
7068 }
7069 
7070 __dead static void
7071 usage_cat(void)
7072 {
7073 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7074 	    "arg1 [arg2 ...]\n", getprogname());
7075 	exit(1);
7076 }
7077 
7078 static const struct got_error *
7079 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7080 {
7081 	const struct got_error *err;
7082 	struct got_blob_object *blob;
7083 
7084 	err = got_object_open_as_blob(&blob, repo, id, 8192);
7085 	if (err)
7086 		return err;
7087 
7088 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7089 	got_object_blob_close(blob);
7090 	return err;
7091 }
7092 
7093 static const struct got_error *
7094 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7095 {
7096 	const struct got_error *err;
7097 	struct got_tree_object *tree;
7098 	int nentries, i;
7099 
7100 	err = got_object_open_as_tree(&tree, repo, id);
7101 	if (err)
7102 		return err;
7103 
7104 	nentries = got_object_tree_get_nentries(tree);
7105 	for (i = 0; i < nentries; i++) {
7106 		struct got_tree_entry *te;
7107 		char *id_str;
7108 		if (sigint_received || sigpipe_received)
7109 			break;
7110 		te = got_object_tree_get_entry(tree, i);
7111 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7112 		if (err)
7113 			break;
7114 		fprintf(outfile, "%s %.7o %s\n", id_str,
7115 		    got_tree_entry_get_mode(te),
7116 		    got_tree_entry_get_name(te));
7117 		free(id_str);
7118 	}
7119 
7120 	got_object_tree_close(tree);
7121 	return err;
7122 }
7123 
7124 static const struct got_error *
7125 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7126 {
7127 	const struct got_error *err;
7128 	struct got_commit_object *commit;
7129 	const struct got_object_id_queue *parent_ids;
7130 	struct got_object_qid *pid;
7131 	char *id_str = NULL;
7132 	const char *logmsg = NULL;
7133 
7134 	err = got_object_open_as_commit(&commit, repo, id);
7135 	if (err)
7136 		return err;
7137 
7138 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7139 	if (err)
7140 		goto done;
7141 
7142 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7143 	parent_ids = got_object_commit_get_parent_ids(commit);
7144 	fprintf(outfile, "numparents %d\n",
7145 	    got_object_commit_get_nparents(commit));
7146 	SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7147 		char *pid_str;
7148 		err = got_object_id_str(&pid_str, pid->id);
7149 		if (err)
7150 			goto done;
7151 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7152 		free(pid_str);
7153 	}
7154 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7155 	    got_object_commit_get_author(commit),
7156 	    got_object_commit_get_author_time(commit));
7157 
7158 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7159 	    got_object_commit_get_author(commit),
7160 	    got_object_commit_get_committer_time(commit));
7161 
7162 	logmsg = got_object_commit_get_logmsg_raw(commit);
7163 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7164 	fprintf(outfile, "%s", logmsg);
7165 done:
7166 	free(id_str);
7167 	got_object_commit_close(commit);
7168 	return err;
7169 }
7170 
7171 static const struct got_error *
7172 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7173 {
7174 	const struct got_error *err;
7175 	struct got_tag_object *tag;
7176 	char *id_str = NULL;
7177 	const char *tagmsg = NULL;
7178 
7179 	err = got_object_open_as_tag(&tag, repo, id);
7180 	if (err)
7181 		return err;
7182 
7183 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7184 	if (err)
7185 		goto done;
7186 
7187 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7188 
7189 	switch (got_object_tag_get_object_type(tag)) {
7190 	case GOT_OBJ_TYPE_BLOB:
7191 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7192 		    GOT_OBJ_LABEL_BLOB);
7193 		break;
7194 	case GOT_OBJ_TYPE_TREE:
7195 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7196 		    GOT_OBJ_LABEL_TREE);
7197 		break;
7198 	case GOT_OBJ_TYPE_COMMIT:
7199 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7200 		    GOT_OBJ_LABEL_COMMIT);
7201 		break;
7202 	case GOT_OBJ_TYPE_TAG:
7203 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7204 		    GOT_OBJ_LABEL_TAG);
7205 		break;
7206 	default:
7207 		break;
7208 	}
7209 
7210 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7211 	    got_object_tag_get_name(tag));
7212 
7213 	fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7214 	    got_object_tag_get_tagger(tag),
7215 	    got_object_tag_get_tagger_time(tag));
7216 
7217 	tagmsg = got_object_tag_get_message(tag);
7218 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7219 	fprintf(outfile, "%s", tagmsg);
7220 done:
7221 	free(id_str);
7222 	got_object_tag_close(tag);
7223 	return err;
7224 }
7225 
7226 static const struct got_error *
7227 cmd_cat(int argc, char *argv[])
7228 {
7229 	const struct got_error *error;
7230 	struct got_repository *repo = NULL;
7231 	struct got_worktree *worktree = NULL;
7232 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
7233 	const char *commit_id_str = NULL;
7234 	struct got_object_id *id = NULL, *commit_id = NULL;
7235 	int ch, obj_type, i, force_path = 0;
7236 
7237 #ifndef PROFILE
7238 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7239 	    NULL) == -1)
7240 		err(1, "pledge");
7241 #endif
7242 
7243 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7244 		switch (ch) {
7245 		case 'c':
7246 			commit_id_str = optarg;
7247 			break;
7248 		case 'r':
7249 			repo_path = realpath(optarg, NULL);
7250 			if (repo_path == NULL)
7251 				return got_error_from_errno2("realpath",
7252 				    optarg);
7253 			got_path_strip_trailing_slashes(repo_path);
7254 			break;
7255 		case 'P':
7256 			force_path = 1;
7257 			break;
7258 		default:
7259 			usage_cat();
7260 			/* NOTREACHED */
7261 		}
7262 	}
7263 
7264 	argc -= optind;
7265 	argv += optind;
7266 
7267 	cwd = getcwd(NULL, 0);
7268 	if (cwd == NULL) {
7269 		error = got_error_from_errno("getcwd");
7270 		goto done;
7271 	}
7272 	error = got_worktree_open(&worktree, cwd);
7273 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
7274 		goto done;
7275 	if (worktree) {
7276 		if (repo_path == NULL) {
7277 			repo_path = strdup(
7278 			    got_worktree_get_repo_path(worktree));
7279 			if (repo_path == NULL) {
7280 				error = got_error_from_errno("strdup");
7281 				goto done;
7282 			}
7283 		}
7284 	}
7285 
7286 	if (repo_path == NULL) {
7287 		repo_path = getcwd(NULL, 0);
7288 		if (repo_path == NULL)
7289 			return got_error_from_errno("getcwd");
7290 	}
7291 
7292 	error = got_repo_open(&repo, repo_path, NULL);
7293 	free(repo_path);
7294 	if (error != NULL)
7295 		goto done;
7296 
7297 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7298 	if (error)
7299 		goto done;
7300 
7301 	if (commit_id_str == NULL)
7302 		commit_id_str = GOT_REF_HEAD;
7303 	error = got_repo_match_object_id(&commit_id, NULL,
7304 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7305 	if (error)
7306 		goto done;
7307 
7308 	for (i = 0; i < argc; i++) {
7309 		if (force_path) {
7310 			error = got_object_id_by_path(&id, repo, commit_id,
7311 			    argv[i]);
7312 			if (error)
7313 				break;
7314 		} else {
7315 			error = got_repo_match_object_id(&id, &label, argv[i],
7316 			    GOT_OBJ_TYPE_ANY, 0, repo);
7317 			if (error) {
7318 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7319 				    error->code != GOT_ERR_NOT_REF)
7320 					break;
7321 				error = got_object_id_by_path(&id, repo,
7322 				    commit_id, argv[i]);
7323 				if (error)
7324 					break;
7325 			}
7326 		}
7327 
7328 		error = got_object_get_type(&obj_type, repo, id);
7329 		if (error)
7330 			break;
7331 
7332 		switch (obj_type) {
7333 		case GOT_OBJ_TYPE_BLOB:
7334 			error = cat_blob(id, repo, stdout);
7335 			break;
7336 		case GOT_OBJ_TYPE_TREE:
7337 			error = cat_tree(id, repo, stdout);
7338 			break;
7339 		case GOT_OBJ_TYPE_COMMIT:
7340 			error = cat_commit(id, repo, stdout);
7341 			break;
7342 		case GOT_OBJ_TYPE_TAG:
7343 			error = cat_tag(id, repo, stdout);
7344 			break;
7345 		default:
7346 			error = got_error(GOT_ERR_OBJ_TYPE);
7347 			break;
7348 		}
7349 		if (error)
7350 			break;
7351 		free(label);
7352 		label = NULL;
7353 		free(id);
7354 		id = NULL;
7355 	}
7356 done:
7357 	free(label);
7358 	free(id);
7359 	free(commit_id);
7360 	if (worktree)
7361 		got_worktree_close(worktree);
7362 	if (repo) {
7363 		const struct got_error *repo_error;
7364 		repo_error = got_repo_close(repo);
7365 		if (error == NULL)
7366 			error = repo_error;
7367 	}
7368 	return error;
7369 }