1 /*
2  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3  * Copyright (c) 2018, 2019 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/limits.h>
20 #include <sys/types.h>
21 #include <sys/stat.h>
22 #include <sys/param.h>
23 #include <sys/wait.h>
24 
25 #include <err.h>
26 #include <errno.h>
27 #include <locale.h>
28 #include <ctype.h>
29 #include <signal.h>
30 #include <stdio.h>
31 #include <stdlib.h>
32 #include <string.h>
33 #include <unistd.h>
34 #include <libgen.h>
35 #include <time.h>
36 #include <paths.h>
37 
38 #include "got_version.h"
39 #include "got_error.h"
40 #include "got_object.h"
41 #include "got_reference.h"
42 #include "got_repository.h"
43 #include "got_path.h"
44 #include "got_worktree.h"
45 #include "got_diff.h"
46 #include "got_commit_graph.h"
47 #include "got_blame.h"
48 #include "got_privsep.h"
49 #include "got_opentemp.h"
50 
51 #ifndef nitems
52 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
53 #endif
54 
55 static volatile sig_atomic_t sigint_received;
56 static volatile sig_atomic_t sigpipe_received;
57 
58 static void
59 catch_sigint(int signo)
60 {
61 	sigint_received = 1;
62 }
63 
64 static void
65 catch_sigpipe(int signo)
66 {
67 	sigpipe_received = 1;
68 }
69 
70 
71 struct got_cmd {
72 	const char	 *cmd_name;
73 	const struct got_error *(*cmd_main)(int, char *[]);
74 	void		(*cmd_usage)(void);
75 	const char	*cmd_alias;
76 };
77 
78 __dead static void	usage(int);
79 __dead static void	usage_init(void);
80 __dead static void	usage_import(void);
81 __dead static void	usage_checkout(void);
82 __dead static void	usage_update(void);
83 __dead static void	usage_log(void);
84 __dead static void	usage_diff(void);
85 __dead static void	usage_blame(void);
86 __dead static void	usage_tree(void);
87 __dead static void	usage_status(void);
88 __dead static void	usage_ref(void);
89 __dead static void	usage_branch(void);
90 __dead static void	usage_add(void);
91 __dead static void	usage_remove(void);
92 __dead static void	usage_revert(void);
93 __dead static void	usage_commit(void);
94 __dead static void	usage_cherrypick(void);
95 __dead static void	usage_backout(void);
96 __dead static void	usage_rebase(void);
97 __dead static void	usage_histedit(void);
98 __dead static void	usage_stage(void);
99 
100 static const struct got_error*		cmd_init(int, char *[]);
101 static const struct got_error*		cmd_import(int, char *[]);
102 static const struct got_error*		cmd_checkout(int, char *[]);
103 static const struct got_error*		cmd_update(int, char *[]);
104 static const struct got_error*		cmd_log(int, char *[]);
105 static const struct got_error*		cmd_diff(int, char *[]);
106 static const struct got_error*		cmd_blame(int, char *[]);
107 static const struct got_error*		cmd_tree(int, char *[]);
108 static const struct got_error*		cmd_status(int, char *[]);
109 static const struct got_error*		cmd_ref(int, char *[]);
110 static const struct got_error*		cmd_branch(int, char *[]);
111 static const struct got_error*		cmd_add(int, char *[]);
112 static const struct got_error*		cmd_remove(int, char *[]);
113 static const struct got_error*		cmd_revert(int, char *[]);
114 static const struct got_error*		cmd_commit(int, char *[]);
115 static const struct got_error*		cmd_cherrypick(int, char *[]);
116 static const struct got_error*		cmd_backout(int, char *[]);
117 static const struct got_error*		cmd_rebase(int, char *[]);
118 static const struct got_error*		cmd_histedit(int, char *[]);
119 static const struct got_error*		cmd_stage(int, char *[]);
120 
121 static struct got_cmd got_commands[] = {
122 	{ "init",	cmd_init,	usage_init,	"" },
123 	{ "import",	cmd_import,	usage_import,	"" },
124 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
125 	{ "update",	cmd_update,	usage_update,	"up" },
126 	{ "log",	cmd_log,	usage_log,	"" },
127 	{ "diff",	cmd_diff,	usage_diff,	"" },
128 	{ "blame",	cmd_blame,	usage_blame,	"" },
129 	{ "tree",	cmd_tree,	usage_tree,	"" },
130 	{ "status",	cmd_status,	usage_status,	"st" },
131 	{ "ref",	cmd_ref,	usage_ref,	"" },
132 	{ "branch",	cmd_branch,	usage_branch,	"br" },
133 	{ "add",	cmd_add,	usage_add,	"" },
134 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
135 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
136 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
137 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
138 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
139 	{ "rebase",	cmd_rebase,	usage_rebase,	"rb" },
140 	{ "histedit",	cmd_histedit,	usage_histedit,	"he" },
141 	{ "stage",	cmd_stage,	usage_stage,	"sg" },
142 };
143 
144 static void
145 list_commands(void)
146 {
147 	int i;
148 
149 	fprintf(stderr, "commands:");
150 	for (i = 0; i < nitems(got_commands); i++) {
151 		struct got_cmd *cmd = &got_commands[i];
152 		fprintf(stderr, " %s", cmd->cmd_name);
153 	}
154 	fputc('\n', stderr);
155 }
156 
157 int
158 main(int argc, char *argv[])
159 {
160 	struct got_cmd *cmd;
161 	unsigned int i;
162 	int ch;
163 	int hflag = 0, Vflag = 0;
164 
165 	setlocale(LC_CTYPE, "");
166 
167 	while ((ch = getopt(argc, argv, "hV")) != -1) {
168 		switch (ch) {
169 		case 'h':
170 			hflag = 1;
171 			break;
172 		case 'V':
173 			Vflag = 1;
174 			break;
175 		default:
176 			usage(hflag);
177 			/* NOTREACHED */
178 		}
179 	}
180 
181 	argc -= optind;
182 	argv += optind;
183 	optind = 0;
184 
185 	if (Vflag) {
186 		got_version_print_str();
187 		return 1;
188 	}
189 
190 	if (argc <= 0)
191 		usage(hflag);
192 
193 	signal(SIGINT, catch_sigint);
194 	signal(SIGPIPE, catch_sigpipe);
195 
196 	for (i = 0; i < nitems(got_commands); i++) {
197 		const struct got_error *error;
198 
199 		cmd = &got_commands[i];
200 
201 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
202 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
203 			continue;
204 
205 		if (hflag)
206 			got_commands[i].cmd_usage();
207 
208 		error = got_commands[i].cmd_main(argc, argv);
209 		if (error && !(sigint_received || sigpipe_received)) {
210 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
211 			return 1;
212 		}
213 
214 		return 0;
215 	}
216 
217 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
218 	list_commands();
219 	return 1;
220 }
221 
222 __dead static void
223 usage(int hflag)
224 {
225 	fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
226 	    getprogname());
227 	if (hflag)
228 		list_commands();
229 	exit(1);
230 }
231 
232 static const struct got_error *
233 get_editor(char **abspath)
234 {
235 	const struct got_error *err = NULL;
236 	const char *editor;
237 
238 	editor = getenv("VISUAL");
239 	if (editor == NULL)
240 		editor = getenv("EDITOR");
241 
242 	if (editor) {
243 		err = got_path_find_prog(abspath, editor);
244 		if (err)
245 			return err;
246 	}
247 
248 	if (*abspath == NULL) {
249 		*abspath = strdup("/bin/ed");
250 		if (*abspath == NULL)
251 			return got_error_from_errno("strdup");
252 	}
253 
254 	return NULL;
255 }
256 
257 static const struct got_error *
258 apply_unveil(const char *repo_path, int repo_read_only,
259     const char *worktree_path)
260 {
261 	const struct got_error *err;
262 
263 #ifdef PROFILE
264 	if (unveil("gmon.out", "rwc") != 0)
265 		return got_error_from_errno2("unveil", "gmon.out");
266 #endif
267 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
268 		return got_error_from_errno2("unveil", repo_path);
269 
270 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
271 		return got_error_from_errno2("unveil", worktree_path);
272 
273 	if (unveil("/tmp", "rwc") != 0)
274 		return got_error_from_errno2("unveil", "/tmp");
275 
276 	err = got_privsep_unveil_exec_helpers();
277 	if (err != NULL)
278 		return err;
279 
280 	if (unveil(NULL, NULL) != 0)
281 		return got_error_from_errno("unveil");
282 
283 	return NULL;
284 }
285 
286 __dead static void
287 usage_init(void)
288 {
289 	fprintf(stderr, "usage: %s init repository-path\n", getprogname());
290 	exit(1);
291 }
292 
293 static const struct got_error *
294 cmd_init(int argc, char *argv[])
295 {
296 	const struct got_error *error = NULL;
297 	char *repo_path = NULL;
298 	int ch;
299 
300 	while ((ch = getopt(argc, argv, "")) != -1) {
301 		switch (ch) {
302 		default:
303 			usage_init();
304 			/* NOTREACHED */
305 		}
306 	}
307 
308 	argc -= optind;
309 	argv += optind;
310 
311 #ifndef PROFILE
312 	if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
313 		err(1, "pledge");
314 #endif
315 	if (argc != 1)
316 		usage_init();
317 
318 	repo_path = strdup(argv[0]);
319 	if (repo_path == NULL)
320 		return got_error_from_errno("strdup");
321 
322 	got_path_strip_trailing_slashes(repo_path);
323 
324 	error = got_path_mkdir(repo_path);
325 	if (error &&
326 	    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
327 		goto done;
328 
329 	error = apply_unveil(repo_path, 0, NULL);
330 	if (error)
331 		goto done;
332 
333 	error = got_repo_init(repo_path);
334 	if (error != NULL)
335 		goto done;
336 
337 done:
338 	free(repo_path);
339 	return error;
340 }
341 
342 __dead static void
343 usage_import(void)
344 {
345 	fprintf(stderr, "usage: %s import [-b branch] [-m message] "
346 	    "[-r repository-path] [-I pattern] path\n", getprogname());
347 	exit(1);
348 }
349 
350 int
351 spawn_editor(const char *editor, const char *file)
352 {
353 	pid_t pid;
354 	sig_t sighup, sigint, sigquit;
355 	int st = -1;
356 
357 	sighup = signal(SIGHUP, SIG_IGN);
358 	sigint = signal(SIGINT, SIG_IGN);
359 	sigquit = signal(SIGQUIT, SIG_IGN);
360 
361 	switch (pid = fork()) {
362 	case -1:
363 		goto doneediting;
364 	case 0:
365 		execl(editor, editor, file, (char *)NULL);
366 		_exit(127);
367 	}
368 
369 	while (waitpid(pid, &st, 0) == -1)
370 		if (errno != EINTR)
371 			break;
372 
373 doneediting:
374 	(void)signal(SIGHUP, sighup);
375 	(void)signal(SIGINT, sigint);
376 	(void)signal(SIGQUIT, sigquit);
377 
378 	if (!WIFEXITED(st)) {
379 		errno = EINTR;
380 		return -1;
381 	}
382 
383 	return WEXITSTATUS(st);
384 }
385 
386 static const struct got_error *
387 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
388     const char *initial_content)
389 {
390 	const struct got_error *err = NULL;
391 	char buf[1024];
392 	struct stat st, st2;
393 	FILE *fp;
394 	int content_changed = 0;
395 	size_t len;
396 
397 	*logmsg = NULL;
398 
399 	if (stat(logmsg_path, &st) == -1)
400 		return got_error_from_errno2("stat", logmsg_path);
401 
402 	if (spawn_editor(editor, logmsg_path) == -1)
403 		return got_error_from_errno("failed spawning editor");
404 
405 	if (stat(logmsg_path, &st2) == -1)
406 		return got_error_from_errno("stat");
407 
408 	if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
409 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
410 		    "no changes made to commit message, aborting");
411 
412 	*logmsg = malloc(st2.st_size + 1);
413 	if (*logmsg == NULL)
414 		return got_error_from_errno("malloc");
415 	(*logmsg)[0] = '\0';
416 	len = 0;
417 
418 	fp = fopen(logmsg_path, "r");
419 	if (fp == NULL) {
420 		err = got_error_from_errno("fopen");
421 		goto done;
422 	}
423 	while (fgets(buf, sizeof(buf), fp) != NULL) {
424 		if (!content_changed && strcmp(buf, initial_content) != 0)
425 			content_changed = 1;
426 		if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
427 			continue; /* remove comments and leading empty lines */
428 		len = strlcat(*logmsg, buf, st2.st_size);
429 	}
430 	fclose(fp);
431 
432 	while (len > 0 && (*logmsg)[len - 1] == '\n') {
433 		(*logmsg)[len - 1] = '\0';
434 		len--;
435 	}
436 
437 	if (len == 0 || !content_changed)
438 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
439 		    "commit message cannot be empty, aborting");
440 done:
441 	if (err) {
442 		free(*logmsg);
443 		*logmsg = NULL;
444 	}
445 	return err;
446 }
447 
448 static const struct got_error *
449 collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
450     const char *branch_name)
451 {
452 	char *initial_content = NULL, *logmsg_path = NULL;
453 	const struct got_error *err = NULL;
454 	int fd;
455 
456 	if (asprintf(&initial_content,
457 	    "\n# %s to be imported to branch %s\n", path_dir,
458 	    branch_name) == -1)
459 		return got_error_from_errno("asprintf");
460 
461 	err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
462 	if (err)
463 		goto done;
464 
465 	dprintf(fd, initial_content);
466 	close(fd);
467 
468 	err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
469 done:
470 	free(initial_content);
471 	free(logmsg_path);
472 	return err;
473 }
474 
475 static const struct got_error *
476 import_progress(void *arg, const char *path)
477 {
478 	printf("A  %s\n", path);
479 	return NULL;
480 }
481 
482 static const struct got_error *
483 cmd_import(int argc, char *argv[])
484 {
485 	const struct got_error *error = NULL;
486 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
487 	char *editor = NULL;
488 	const char *got_author = getenv("GOT_AUTHOR");
489 	const char *branch_name = "master";
490 	char *refname = NULL, *id_str = NULL;
491 	struct got_repository *repo = NULL;
492 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
493 	struct got_object_id *new_commit_id = NULL;
494 	int ch;
495 	struct got_pathlist_head ignores;
496 	struct got_pathlist_entry *pe;
497 
498 	TAILQ_INIT(&ignores);
499 
500 	while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
501 		switch (ch) {
502 		case 'b':
503 			branch_name = optarg;
504 			break;
505 		case 'm':
506 			logmsg = strdup(optarg);
507 			if (logmsg == NULL) {
508 				error = got_error_from_errno("strdup");
509 				goto done;
510 			}
511 			break;
512 		case 'r':
513 			repo_path = realpath(optarg, NULL);
514 			if (repo_path == NULL) {
515 				error = got_error_from_errno("realpath");
516 				goto done;
517 			}
518 			break;
519 		case 'I':
520 			if (optarg[0] == '\0')
521 				break;
522 			error = got_pathlist_insert(&pe, &ignores, optarg,
523 			    NULL);
524 			if (error)
525 				goto done;
526 			break;
527 		default:
528 			usage_init();
529 			/* NOTREACHED */
530 		}
531 	}
532 
533 	argc -= optind;
534 	argv += optind;
535 
536 #ifndef PROFILE
537 	if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
538 	    NULL) == -1)
539 		err(1, "pledge");
540 #endif
541 	if (argc != 1)
542 		usage_import();
543 
544 	if (got_author == NULL) {
545 		/* TODO: Look current user up in password database */
546 		error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
547 		goto done;
548 	}
549 
550 	if (repo_path == NULL) {
551 		repo_path = getcwd(NULL, 0);
552 		if (repo_path == NULL)
553 			return got_error_from_errno("getcwd");
554 	}
555 	got_path_strip_trailing_slashes(repo_path);
556 	error = got_repo_open(&repo, repo_path);
557 	if (error)
558 		goto done;
559 
560 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
561 		error = got_error_from_errno("asprintf");
562 		goto done;
563 	}
564 
565 	error = got_ref_open(&branch_ref, repo, refname, 0);
566 	if (error) {
567 		if (error->code != GOT_ERR_NOT_REF)
568 			goto done;
569 	} else {
570 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
571 		    "import target branch already exists");
572 		goto done;
573 	}
574 
575 	path_dir = realpath(argv[0], NULL);
576 	if (path_dir == NULL) {
577 		error = got_error_from_errno("realpath");
578 		goto done;
579 	}
580 	got_path_strip_trailing_slashes(path_dir);
581 
582 	/*
583 	 * unveil(2) traverses exec(2); if an editor is used we have
584 	 * to apply unveil after the log message has been written.
585 	 */
586 	if (logmsg == NULL || strlen(logmsg) == 0) {
587 		error = get_editor(&editor);
588 		if (error)
589 			goto done;
590 		error = collect_import_msg(&logmsg, editor, path_dir, refname);
591 		if (error)
592 			goto done;
593 	}
594 
595 	if (unveil(path_dir, "r") != 0)
596 		return got_error_from_errno2("unveil", path_dir);
597 
598 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
599 	if (error)
600 		goto done;
601 
602 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
603 	    got_author, &ignores, repo, import_progress, NULL);
604 	if (error)
605 		goto done;
606 
607 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
608 	if (error)
609 		goto done;
610 
611 	error = got_ref_write(branch_ref, repo);
612 	if (error)
613 		goto done;
614 
615 	error = got_object_id_str(&id_str, new_commit_id);
616 	if (error)
617 		goto done;
618 
619 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
620 	if (error) {
621 		if (error->code != GOT_ERR_NOT_REF)
622 			goto done;
623 
624 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
625 		    branch_ref);
626 		if (error)
627 			goto done;
628 
629 		error = got_ref_write(head_ref, repo);
630 		if (error)
631 			goto done;
632 	}
633 
634 	printf("Created branch %s with commit %s\n",
635 	    got_ref_get_name(branch_ref), id_str);
636 done:
637 	free(repo_path);
638 	free(editor);
639 	free(refname);
640 	free(new_commit_id);
641 	free(id_str);
642 	if (branch_ref)
643 		got_ref_close(branch_ref);
644 	if (head_ref)
645 		got_ref_close(head_ref);
646 	return error;
647 }
648 
649 __dead static void
650 usage_checkout(void)
651 {
652 	fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
653 	    "[-p prefix] repository-path [worktree-path]\n", getprogname());
654 	exit(1);
655 }
656 
657 static const struct got_error *
658 checkout_progress(void *arg, unsigned char status, const char *path)
659 {
660 	char *worktree_path = arg;
661 
662 	/* Base commit bump happens silently. */
663 	if (status == GOT_STATUS_BUMP_BASE)
664 		return NULL;
665 
666 	while (path[0] == '/')
667 		path++;
668 
669 	printf("%c  %s/%s\n", status, worktree_path, path);
670 	return NULL;
671 }
672 
673 static const struct got_error *
674 check_cancelled(void *arg)
675 {
676 	if (sigint_received || sigpipe_received)
677 		return got_error(GOT_ERR_CANCELLED);
678 	return NULL;
679 }
680 
681 static const struct got_error *
682 check_linear_ancestry(struct got_object_id *commit_id,
683     struct got_object_id *base_commit_id, struct got_repository *repo)
684 {
685 	const struct got_error *err = NULL;
686 	struct got_object_id *yca_id;
687 
688 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
689 	    commit_id, base_commit_id, repo);
690 	if (err)
691 		return err;
692 
693 	if (yca_id == NULL)
694 		return got_error(GOT_ERR_ANCESTRY);
695 
696 	/*
697 	 * Require a straight line of history between the target commit
698 	 * and the work tree's base commit.
699 	 *
700 	 * Non-linear situations such as this require a rebase:
701 	 *
702 	 * (commit) D       F (base_commit)
703 	 *           \     /
704 	 *            C   E
705 	 *             \ /
706 	 *              B (yca)
707 	 *              |
708 	 *              A
709 	 *
710 	 * 'got update' only handles linear cases:
711 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
712 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
713 	 */
714 	if (got_object_id_cmp(commit_id, yca_id) != 0 &&
715 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
716 		return got_error(GOT_ERR_ANCESTRY);
717 
718 	free(yca_id);
719 	return NULL;
720 }
721 
722 static const struct got_error *
723 check_same_branch(struct got_object_id *commit_id,
724     struct got_reference *head_ref, struct got_object_id *yca_id,
725     struct got_repository *repo)
726 {
727 	const struct got_error *err = NULL;
728 	struct got_commit_graph *graph = NULL;
729 	struct got_object_id *head_commit_id = NULL;
730 	int is_same_branch = 0;
731 
732 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
733 	if (err)
734 		goto done;
735 
736 	if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
737 		is_same_branch = 1;
738 		goto done;
739 	}
740 	if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
741 		is_same_branch = 1;
742 		goto done;
743 	}
744 
745 	err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
746 	if (err)
747 		goto done;
748 
749 	err = got_commit_graph_iter_start(graph, head_commit_id, repo);
750 	if (err)
751 		goto done;
752 
753 	for (;;) {
754 		struct got_object_id *id;
755 		err = got_commit_graph_iter_next(&id, graph);
756 		if (err) {
757 			if (err->code == GOT_ERR_ITER_COMPLETED) {
758 				err = NULL;
759 				break;
760 			} else if (err->code != GOT_ERR_ITER_NEED_MORE)
761 				break;
762 			err = got_commit_graph_fetch_commits(graph, 1,
763 			    repo);
764 			if (err)
765 				break;
766 		}
767 
768 		if (id) {
769 			if (yca_id && got_object_id_cmp(id, yca_id) == 0)
770 				break;
771 			if (got_object_id_cmp(id, commit_id) == 0) {
772 				is_same_branch = 1;
773 				break;
774 			}
775 		}
776 	}
777 done:
778 	if (graph)
779 		got_commit_graph_close(graph);
780 	free(head_commit_id);
781 	if (!err && !is_same_branch)
782 		err = got_error(GOT_ERR_ANCESTRY);
783 	return err;
784 }
785 
786 static const struct got_error *
787 resolve_commit_arg(struct got_object_id **commit_id,
788     const char *commit_id_arg, struct got_repository *repo)
789 {
790 	const struct got_error *err;
791 	struct got_reference *ref;
792 
793 	err = got_ref_open(&ref, repo, commit_id_arg, 0);
794 	if (err == NULL) {
795 		err = got_ref_resolve(commit_id, repo, ref);
796 		got_ref_close(ref);
797 	} else {
798 		if (err->code != GOT_ERR_NOT_REF)
799 			return err;
800 		err = got_repo_match_object_id_prefix(commit_id,
801 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
802 	}
803 	return err;
804 }
805 
806 static const struct got_error *
807 cmd_checkout(int argc, char *argv[])
808 {
809 	const struct got_error *error = NULL;
810 	struct got_repository *repo = NULL;
811 	struct got_reference *head_ref = NULL;
812 	struct got_worktree *worktree = NULL;
813 	char *repo_path = NULL;
814 	char *worktree_path = NULL;
815 	const char *path_prefix = "";
816 	const char *branch_name = GOT_REF_HEAD;
817 	char *commit_id_str = NULL;
818 	int ch, same_path_prefix;
819 	struct got_pathlist_head paths;
820 
821 	TAILQ_INIT(&paths);
822 
823 	while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
824 		switch (ch) {
825 		case 'b':
826 			branch_name = optarg;
827 			break;
828 		case 'c':
829 			commit_id_str = strdup(optarg);
830 			if (commit_id_str == NULL)
831 				return got_error_from_errno("strdup");
832 			break;
833 		case 'p':
834 			path_prefix = optarg;
835 			break;
836 		default:
837 			usage_checkout();
838 			/* NOTREACHED */
839 		}
840 	}
841 
842 	argc -= optind;
843 	argv += optind;
844 
845 #ifndef PROFILE
846 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
847 	    "unveil", NULL) == -1)
848 		err(1, "pledge");
849 #endif
850 	if (argc == 1) {
851 		char *cwd, *base, *dotgit;
852 		repo_path = realpath(argv[0], NULL);
853 		if (repo_path == NULL)
854 			return got_error_from_errno2("realpath", argv[0]);
855 		cwd = getcwd(NULL, 0);
856 		if (cwd == NULL) {
857 			error = got_error_from_errno("getcwd");
858 			goto done;
859 		}
860 		if (path_prefix[0]) {
861 			base = basename(path_prefix);
862 			if (base == NULL) {
863 				error = got_error_from_errno2("basename",
864 				    path_prefix);
865 				goto done;
866 			}
867 		} else {
868 			base = basename(repo_path);
869 			if (base == NULL) {
870 				error = got_error_from_errno2("basename",
871 				    repo_path);
872 				goto done;
873 			}
874 		}
875 		dotgit = strstr(base, ".git");
876 		if (dotgit)
877 			*dotgit = '\0';
878 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
879 			error = got_error_from_errno("asprintf");
880 			free(cwd);
881 			goto done;
882 		}
883 		free(cwd);
884 	} else if (argc == 2) {
885 		repo_path = realpath(argv[0], NULL);
886 		if (repo_path == NULL) {
887 			error = got_error_from_errno2("realpath", argv[0]);
888 			goto done;
889 		}
890 		worktree_path = realpath(argv[1], NULL);
891 		if (worktree_path == NULL) {
892 			if (errno != ENOENT) {
893 				error = got_error_from_errno2("realpath",
894 				    argv[1]);
895 				goto done;
896 			}
897 			worktree_path = strdup(argv[1]);
898 			if (worktree_path == NULL) {
899 				error = got_error_from_errno("strdup");
900 				goto done;
901 			}
902 		}
903 	} else
904 		usage_checkout();
905 
906 	got_path_strip_trailing_slashes(repo_path);
907 	got_path_strip_trailing_slashes(worktree_path);
908 
909 	error = got_repo_open(&repo, repo_path);
910 	if (error != NULL)
911 		goto done;
912 
913 	/* Pre-create work tree path for unveil(2) */
914 	error = got_path_mkdir(worktree_path);
915 	if (error) {
916 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR))
917 			goto done;
918 		if (!got_path_dir_is_empty(worktree_path)) {
919 			error = got_error_path(worktree_path,
920 			    GOT_ERR_DIR_NOT_EMPTY);
921 			goto done;
922 		}
923 	}
924 
925 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
926 	if (error)
927 		goto done;
928 
929 	error = got_ref_open(&head_ref, repo, branch_name, 0);
930 	if (error != NULL)
931 		goto done;
932 
933 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
934 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
935 		goto done;
936 
937 	error = got_worktree_open(&worktree, worktree_path);
938 	if (error != NULL)
939 		goto done;
940 
941 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
942 	    path_prefix);
943 	if (error != NULL)
944 		goto done;
945 	if (!same_path_prefix) {
946 		error = got_error(GOT_ERR_PATH_PREFIX);
947 		goto done;
948 	}
949 
950 	if (commit_id_str) {
951 		struct got_object_id *commit_id;
952 		error = resolve_commit_arg(&commit_id, commit_id_str, repo);
953 		if (error)
954 			goto done;
955 		error = check_linear_ancestry(commit_id,
956 		    got_worktree_get_base_commit_id(worktree), repo);
957 		if (error != NULL) {
958 			free(commit_id);
959 			goto done;
960 		}
961 		error = check_same_branch(commit_id, head_ref, NULL, repo);
962 		if (error)
963 			goto done;
964 		error = got_worktree_set_base_commit_id(worktree, repo,
965 		    commit_id);
966 		free(commit_id);
967 		if (error)
968 			goto done;
969 	}
970 
971 	error = got_pathlist_append(&paths, "", NULL);
972 	if (error)
973 		goto done;
974 	error = got_worktree_checkout_files(worktree, &paths, repo,
975 	    checkout_progress, worktree_path, check_cancelled, NULL);
976 	if (error != NULL)
977 		goto done;
978 
979 	printf("Now shut up and hack\n");
980 
981 done:
982 	got_pathlist_free(&paths);
983 	free(commit_id_str);
984 	free(repo_path);
985 	free(worktree_path);
986 	return error;
987 }
988 
989 __dead static void
990 usage_update(void)
991 {
992 	fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
993 	    getprogname());
994 	exit(1);
995 }
996 
997 static const struct got_error *
998 update_progress(void *arg, unsigned char status, const char *path)
999 {
1000 	int *did_something = arg;
1001 
1002 	if (status == GOT_STATUS_EXISTS)
1003 		return NULL;
1004 
1005 	*did_something = 1;
1006 
1007 	/* Base commit bump happens silently. */
1008 	if (status == GOT_STATUS_BUMP_BASE)
1009 		return NULL;
1010 
1011 	while (path[0] == '/')
1012 		path++;
1013 	printf("%c  %s\n", status, path);
1014 	return NULL;
1015 }
1016 
1017 static const struct got_error *
1018 switch_head_ref(struct got_reference *head_ref,
1019     struct got_object_id *commit_id, struct got_worktree *worktree,
1020     struct got_repository *repo)
1021 {
1022 	const struct got_error *err = NULL;
1023 	char *base_id_str;
1024 	int ref_has_moved = 0;
1025 
1026 	/* Trivial case: switching between two different references. */
1027 	if (strcmp(got_ref_get_name(head_ref),
1028 	    got_worktree_get_head_ref_name(worktree)) != 0) {
1029 		printf("Switching work tree from %s to %s\n",
1030 		    got_worktree_get_head_ref_name(worktree),
1031 		    got_ref_get_name(head_ref));
1032 		return got_worktree_set_head_ref(worktree, head_ref);
1033 	}
1034 
1035 	err = check_linear_ancestry(commit_id,
1036 	    got_worktree_get_base_commit_id(worktree), repo);
1037 	if (err) {
1038 		if (err->code != GOT_ERR_ANCESTRY)
1039 			return err;
1040 		ref_has_moved = 1;
1041 	}
1042 	if (!ref_has_moved)
1043 		return NULL;
1044 
1045 	/* Switching to a rebased branch with the same reference name. */
1046 	err = got_object_id_str(&base_id_str,
1047 	    got_worktree_get_base_commit_id(worktree));
1048 	if (err)
1049 		return err;
1050 	printf("Reference %s now points at a different branch\n",
1051 	    got_worktree_get_head_ref_name(worktree));
1052 	printf("Switching work tree from %s to %s\n", base_id_str,
1053 	    got_worktree_get_head_ref_name(worktree));
1054 	return NULL;
1055 }
1056 
1057 static const struct got_error *
1058 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1059 {
1060 	const struct got_error *err;
1061 	int in_progress;
1062 
1063 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
1064 	if (err)
1065 		return err;
1066 	if (in_progress)
1067 		return got_error(GOT_ERR_REBASING);
1068 
1069 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
1070 	if (err)
1071 		return err;
1072 	if (in_progress)
1073 		return got_error(GOT_ERR_HISTEDIT_BUSY);
1074 
1075 	return NULL;
1076 }
1077 
1078 static const struct got_error *
1079 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1080     char *argv[], struct got_worktree *worktree)
1081 {
1082 	const struct got_error *err;
1083 	char *path;
1084 	int i;
1085 
1086 	if (argc == 0) {
1087 		path = strdup("");
1088 		if (path == NULL)
1089 			return got_error_from_errno("strdup");
1090 		return got_pathlist_append(paths, path, NULL);
1091 	}
1092 
1093 	for (i = 0; i < argc; i++) {
1094 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
1095 		if (err)
1096 			break;
1097 		err = got_pathlist_append(paths, path, NULL);
1098 		if (err) {
1099 			free(path);
1100 			break;
1101 		}
1102 	}
1103 
1104 	return err;
1105 }
1106 
1107 static const struct got_error *
1108 cmd_update(int argc, char *argv[])
1109 {
1110 	const struct got_error *error = NULL;
1111 	struct got_repository *repo = NULL;
1112 	struct got_worktree *worktree = NULL;
1113 	char *worktree_path = NULL;
1114 	struct got_object_id *commit_id = NULL;
1115 	char *commit_id_str = NULL;
1116 	const char *branch_name = NULL;
1117 	struct got_reference *head_ref = NULL;
1118 	struct got_pathlist_head paths;
1119 	struct got_pathlist_entry *pe;
1120 	int ch, did_something = 0;
1121 
1122 	TAILQ_INIT(&paths);
1123 
1124 	while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1125 		switch (ch) {
1126 		case 'b':
1127 			branch_name = optarg;
1128 			break;
1129 		case 'c':
1130 			commit_id_str = strdup(optarg);
1131 			if (commit_id_str == NULL)
1132 				return got_error_from_errno("strdup");
1133 			break;
1134 		default:
1135 			usage_update();
1136 			/* NOTREACHED */
1137 		}
1138 	}
1139 
1140 	argc -= optind;
1141 	argv += optind;
1142 
1143 #ifndef PROFILE
1144 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1145 	    "unveil", NULL) == -1)
1146 		err(1, "pledge");
1147 #endif
1148 	worktree_path = getcwd(NULL, 0);
1149 	if (worktree_path == NULL) {
1150 		error = got_error_from_errno("getcwd");
1151 		goto done;
1152 	}
1153 	error = got_worktree_open(&worktree, worktree_path);
1154 	if (error)
1155 		goto done;
1156 
1157 	error = check_rebase_or_histedit_in_progress(worktree);
1158 	if (error)
1159 		goto done;
1160 
1161 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1162 	if (error)
1163 		goto done;
1164 
1165 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1166 	if (error != NULL)
1167 		goto done;
1168 
1169 	error = apply_unveil(got_repo_get_path(repo), 0,
1170 	    got_worktree_get_root_path(worktree));
1171 	if (error)
1172 		goto done;
1173 
1174 	error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1175 	    got_worktree_get_head_ref_name(worktree), 0);
1176 	if (error != NULL)
1177 		goto done;
1178 	if (commit_id_str == NULL) {
1179 		error = got_ref_resolve(&commit_id, repo, head_ref);
1180 		if (error != NULL)
1181 			goto done;
1182 		error = got_object_id_str(&commit_id_str, commit_id);
1183 		if (error != NULL)
1184 			goto done;
1185 	} else {
1186 		error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1187 		free(commit_id_str);
1188 		commit_id_str = NULL;
1189 		if (error)
1190 			goto done;
1191 		error = got_object_id_str(&commit_id_str, commit_id);
1192 		if (error)
1193 			goto done;
1194 	}
1195 
1196 	if (branch_name) {
1197 		struct got_object_id *head_commit_id;
1198 		TAILQ_FOREACH(pe, &paths, entry) {
1199 			if (pe->path_len == 0)
1200 				continue;
1201 			error = got_error_msg(GOT_ERR_BAD_PATH,
1202 			    "switching between branches requires that "
1203 			    "the entire work tree gets updated");
1204 			goto done;
1205 		}
1206 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
1207 		if (error)
1208 			goto done;
1209 		error = check_linear_ancestry(commit_id, head_commit_id, repo);
1210 		free(head_commit_id);
1211 		if (error != NULL)
1212 			goto done;
1213 		error = check_same_branch(commit_id, head_ref, NULL, repo);
1214 		if (error)
1215 			goto done;
1216 		error = switch_head_ref(head_ref, commit_id, worktree, repo);
1217 		if (error)
1218 			goto done;
1219 	} else {
1220 		error = check_linear_ancestry(commit_id,
1221 		    got_worktree_get_base_commit_id(worktree), repo);
1222 		if (error != NULL) {
1223 			if (error->code == GOT_ERR_ANCESTRY)
1224 				error = got_error(GOT_ERR_BRANCH_MOVED);
1225 			goto done;
1226 		}
1227 		error = check_same_branch(commit_id, head_ref, NULL, repo);
1228 		if (error)
1229 			goto done;
1230 	}
1231 
1232 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1233 	    commit_id) != 0) {
1234 		error = got_worktree_set_base_commit_id(worktree, repo,
1235 		    commit_id);
1236 		if (error)
1237 			goto done;
1238 	}
1239 
1240 	error = got_worktree_checkout_files(worktree, &paths, repo,
1241 	    update_progress, &did_something, check_cancelled, NULL);
1242 	if (error != NULL)
1243 		goto done;
1244 
1245 	if (did_something)
1246 		printf("Updated to commit %s\n", commit_id_str);
1247 	else
1248 		printf("Already up-to-date\n");
1249 done:
1250 	free(worktree_path);
1251 	TAILQ_FOREACH(pe, &paths, entry)
1252 		free((char *)pe->path);
1253 	got_pathlist_free(&paths);
1254 	free(commit_id);
1255 	free(commit_id_str);
1256 	return error;
1257 }
1258 
1259 static const struct got_error *
1260 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1261     int diff_context, struct got_repository *repo)
1262 {
1263 	const struct got_error *err = NULL;
1264 	struct got_tree_object *tree1 = NULL, *tree2;
1265 	struct got_object_qid *qid;
1266 	char *id_str1 = NULL, *id_str2;
1267 	struct got_diff_blob_output_unidiff_arg arg;
1268 
1269 	err = got_object_open_as_tree(&tree2, repo,
1270 	    got_object_commit_get_tree_id(commit));
1271 	if (err)
1272 		return err;
1273 
1274 	qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1275 	if (qid != NULL) {
1276 		struct got_commit_object *pcommit;
1277 
1278 		err = got_object_open_as_commit(&pcommit, repo, qid->id);
1279 		if (err)
1280 			return err;
1281 
1282 		err = got_object_open_as_tree(&tree1, repo,
1283 		    got_object_commit_get_tree_id(pcommit));
1284 		got_object_commit_close(pcommit);
1285 		if (err)
1286 			return err;
1287 
1288 		err = got_object_id_str(&id_str1, qid->id);
1289 		if (err)
1290 			return err;
1291 	}
1292 
1293 	err = got_object_id_str(&id_str2, id);
1294 	if (err)
1295 		goto done;
1296 
1297 	printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1298 	arg.diff_context = diff_context;
1299 	arg.outfile = stdout;
1300 	err = got_diff_tree(tree1, tree2, "", "", repo,
1301 	    got_diff_blob_output_unidiff, &arg, 1);
1302 done:
1303 	if (tree1)
1304 		got_object_tree_close(tree1);
1305 	got_object_tree_close(tree2);
1306 	free(id_str1);
1307 	free(id_str2);
1308 	return err;
1309 }
1310 
1311 static char *
1312 get_datestr(time_t *time, char *datebuf)
1313 {
1314 	char *p, *s = ctime_r(time, datebuf);
1315 	p = strchr(s, '\n');
1316 	if (p)
1317 		*p = '\0';
1318 	return s;
1319 }
1320 
1321 static const struct got_error *
1322 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1323     struct got_repository *repo, int show_patch, int diff_context,
1324     struct got_reflist_head *refs)
1325 {
1326 	const struct got_error *err = NULL;
1327 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
1328 	char datebuf[26];
1329 	time_t committer_time;
1330 	const char *author, *committer;
1331 	char *refs_str = NULL;
1332 	struct got_reflist_entry *re;
1333 
1334 	SIMPLEQ_FOREACH(re, refs, entry) {
1335 		char *s;
1336 		const char *name;
1337 		if (got_object_id_cmp(re->id, id) != 0)
1338 			continue;
1339 		name = got_ref_get_name(re->ref);
1340 		if (strcmp(name, GOT_REF_HEAD) == 0)
1341 			continue;
1342 		if (strncmp(name, "refs/", 5) == 0)
1343 			name += 5;
1344 		if (strncmp(name, "got/", 4) == 0)
1345 			continue;
1346 		if (strncmp(name, "heads/", 6) == 0)
1347 			name += 6;
1348 		if (strncmp(name, "remotes/", 8) == 0)
1349 			name += 8;
1350 		s = refs_str;
1351 		if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1352 		    name) == -1) {
1353 			err = got_error_from_errno("asprintf");
1354 			free(s);
1355 			break;
1356 		}
1357 		free(s);
1358 	}
1359 	err = got_object_id_str(&id_str, id);
1360 	if (err)
1361 		return err;
1362 
1363 	printf("-----------------------------------------------\n");
1364 	printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1365 	    refs_str ? refs_str : "", refs_str ? ")" : "");
1366 	free(id_str);
1367 	id_str = NULL;
1368 	free(refs_str);
1369 	refs_str = NULL;
1370 	printf("from: %s\n", got_object_commit_get_author(commit));
1371 	committer_time = got_object_commit_get_committer_time(commit);
1372 	datestr = get_datestr(&committer_time, datebuf);
1373 	printf("date: %s UTC\n", datestr);
1374 	author = got_object_commit_get_author(commit);
1375 	committer = got_object_commit_get_committer(commit);
1376 	if (strcmp(author, committer) != 0)
1377 		printf("via: %s\n", committer);
1378 	if (got_object_commit_get_nparents(commit) > 1) {
1379 		const struct got_object_id_queue *parent_ids;
1380 		struct got_object_qid *qid;
1381 		int n = 1;
1382 		parent_ids = got_object_commit_get_parent_ids(commit);
1383 		SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1384 			err = got_object_id_str(&id_str, qid->id);
1385 			if (err)
1386 				return err;
1387 			printf("parent %d: %s\n", n++, id_str);
1388 			free(id_str);
1389 		}
1390 	}
1391 
1392 	logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1393 	if (logmsg0 == NULL)
1394 		return got_error_from_errno("strdup");
1395 
1396 	logmsg = logmsg0;
1397 	do {
1398 		line = strsep(&logmsg, "\n");
1399 		if (line)
1400 			printf(" %s\n", line);
1401 	} while (line);
1402 	free(logmsg0);
1403 
1404 	if (show_patch) {
1405 		err = print_patch(commit, id, diff_context, repo);
1406 		if (err == 0)
1407 			printf("\n");
1408 	}
1409 
1410 	if (fflush(stdout) != 0 && err == NULL)
1411 		err = got_error_from_errno("fflush");
1412 	return err;
1413 }
1414 
1415 static const struct got_error *
1416 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1417     char *path, int show_patch, int diff_context, int limit,
1418     int first_parent_traversal, struct got_reflist_head *refs)
1419 {
1420 	const struct got_error *err;
1421 	struct got_commit_graph *graph;
1422 
1423 	err = got_commit_graph_open(&graph, root_id, path,
1424 	    first_parent_traversal, repo);
1425 	if (err)
1426 		return err;
1427 	err = got_commit_graph_iter_start(graph, root_id, repo);
1428 	if (err)
1429 		goto done;
1430 	for (;;) {
1431 		struct got_commit_object *commit;
1432 		struct got_object_id *id;
1433 
1434 		if (sigint_received || sigpipe_received)
1435 			break;
1436 
1437 		err = got_commit_graph_iter_next(&id, graph);
1438 		if (err) {
1439 			if (err->code == GOT_ERR_ITER_COMPLETED) {
1440 				err = NULL;
1441 				break;
1442 			}
1443 			if (err->code != GOT_ERR_ITER_NEED_MORE)
1444 				break;
1445 			err = got_commit_graph_fetch_commits(graph, 1, repo);
1446 			if (err)
1447 				break;
1448 			else
1449 				continue;
1450 		}
1451 		if (id == NULL)
1452 			break;
1453 
1454 		err = got_object_open_as_commit(&commit, repo, id);
1455 		if (err)
1456 			break;
1457 		err = print_commit(commit, id, repo, show_patch, diff_context,
1458 		    refs);
1459 		got_object_commit_close(commit);
1460 		if (err || (limit && --limit == 0))
1461 			break;
1462 	}
1463 done:
1464 	got_commit_graph_close(graph);
1465 	return err;
1466 }
1467 
1468 __dead static void
1469 usage_log(void)
1470 {
1471 	fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1472 	    "[-r repository-path] [path]\n", getprogname());
1473 	exit(1);
1474 }
1475 
1476 static const struct got_error *
1477 cmd_log(int argc, char *argv[])
1478 {
1479 	const struct got_error *error;
1480 	struct got_repository *repo = NULL;
1481 	struct got_worktree *worktree = NULL;
1482 	struct got_commit_object *commit = NULL;
1483 	struct got_object_id *id = NULL;
1484 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1485 	char *start_commit = NULL;
1486 	int diff_context = 3, ch;
1487 	int show_patch = 0, limit = 0, first_parent_traversal = 0;
1488 	const char *errstr;
1489 	struct got_reflist_head refs;
1490 
1491 	SIMPLEQ_INIT(&refs);
1492 
1493 #ifndef PROFILE
1494 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1495 	    NULL)
1496 	    == -1)
1497 		err(1, "pledge");
1498 #endif
1499 
1500 	while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1501 		switch (ch) {
1502 		case 'p':
1503 			show_patch = 1;
1504 			break;
1505 		case 'c':
1506 			start_commit = optarg;
1507 			break;
1508 		case 'C':
1509 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1510 			    &errstr);
1511 			if (errstr != NULL)
1512 				err(1, "-C option %s", errstr);
1513 			break;
1514 		case 'l':
1515 			limit = strtonum(optarg, 1, INT_MAX, &errstr);
1516 			if (errstr != NULL)
1517 				err(1, "-l option %s", errstr);
1518 			break;
1519 		case 'f':
1520 			first_parent_traversal = 1;
1521 			break;
1522 		case 'r':
1523 			repo_path = realpath(optarg, NULL);
1524 			if (repo_path == NULL)
1525 				err(1, "-r option");
1526 			got_path_strip_trailing_slashes(repo_path);
1527 			break;
1528 		default:
1529 			usage_log();
1530 			/* NOTREACHED */
1531 		}
1532 	}
1533 
1534 	argc -= optind;
1535 	argv += optind;
1536 
1537 	cwd = getcwd(NULL, 0);
1538 	if (cwd == NULL) {
1539 		error = got_error_from_errno("getcwd");
1540 		goto done;
1541 	}
1542 
1543 	error = got_worktree_open(&worktree, cwd);
1544 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
1545 		goto done;
1546 	error = NULL;
1547 
1548 	if (argc == 0) {
1549 		path = strdup("");
1550 		if (path == NULL) {
1551 			error = got_error_from_errno("strdup");
1552 			goto done;
1553 		}
1554 	} else if (argc == 1) {
1555 		if (worktree) {
1556 			error = got_worktree_resolve_path(&path, worktree,
1557 			    argv[0]);
1558 			if (error)
1559 				goto done;
1560 		} else {
1561 			path = strdup(argv[0]);
1562 			if (path == NULL) {
1563 				error = got_error_from_errno("strdup");
1564 				goto done;
1565 			}
1566 		}
1567 	} else
1568 		usage_log();
1569 
1570 	if (repo_path == NULL) {
1571 		repo_path = worktree ?
1572 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1573 	}
1574 	if (repo_path == NULL) {
1575 		error = got_error_from_errno("strdup");
1576 		goto done;
1577 	}
1578 
1579 	error = got_repo_open(&repo, repo_path);
1580 	if (error != NULL)
1581 		goto done;
1582 
1583 	error = apply_unveil(got_repo_get_path(repo), 1,
1584 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
1585 	if (error)
1586 		goto done;
1587 
1588 	if (start_commit == NULL) {
1589 		struct got_reference *head_ref;
1590 		error = got_ref_open(&head_ref, repo,
1591 		    worktree ? got_worktree_get_head_ref_name(worktree)
1592 		    : GOT_REF_HEAD, 0);
1593 		if (error != NULL)
1594 			return error;
1595 		error = got_ref_resolve(&id, repo, head_ref);
1596 		got_ref_close(head_ref);
1597 		if (error != NULL)
1598 			return error;
1599 		error = got_object_open_as_commit(&commit, repo, id);
1600 	} else {
1601 		struct got_reference *ref;
1602 		error = got_ref_open(&ref, repo, start_commit, 0);
1603 		if (error == NULL) {
1604 			int obj_type;
1605 			error = got_ref_resolve(&id, repo, ref);
1606 			got_ref_close(ref);
1607 			if (error != NULL)
1608 				goto done;
1609 			error = got_object_get_type(&obj_type, repo, id);
1610 			if (error != NULL)
1611 				goto done;
1612 			if (obj_type == GOT_OBJ_TYPE_TAG) {
1613 				struct got_tag_object *tag;
1614 				error = got_object_open_as_tag(&tag, repo, id);
1615 				if (error != NULL)
1616 					goto done;
1617 				if (got_object_tag_get_object_type(tag) !=
1618 				    GOT_OBJ_TYPE_COMMIT) {
1619 					got_object_tag_close(tag);
1620 					error = got_error(GOT_ERR_OBJ_TYPE);
1621 					goto done;
1622 				}
1623 				free(id);
1624 				id = got_object_id_dup(
1625 				    got_object_tag_get_object_id(tag));
1626 				if (id == NULL)
1627 					error = got_error_from_errno(
1628 					    "got_object_id_dup");
1629 				got_object_tag_close(tag);
1630 				if (error)
1631 					goto done;
1632 			} else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1633 				error = got_error(GOT_ERR_OBJ_TYPE);
1634 				goto done;
1635 			}
1636 			error = got_object_open_as_commit(&commit, repo, id);
1637 			if (error != NULL)
1638 				goto done;
1639 		}
1640 		if (commit == NULL) {
1641 			error = got_repo_match_object_id_prefix(&id,
1642 			    start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1643 			if (error != NULL)
1644 				return error;
1645 		}
1646 	}
1647 	if (error != NULL)
1648 		goto done;
1649 
1650 	error = got_repo_map_path(&in_repo_path, repo, path, 1);
1651 	if (error != NULL)
1652 		goto done;
1653 	if (in_repo_path) {
1654 		free(path);
1655 		path = in_repo_path;
1656 	}
1657 
1658 	error = got_ref_list(&refs, repo);
1659 	if (error)
1660 		goto done;
1661 
1662 	error = print_commits(id, repo, path, show_patch,
1663 	    diff_context, limit, first_parent_traversal, &refs);
1664 done:
1665 	free(path);
1666 	free(repo_path);
1667 	free(cwd);
1668 	free(id);
1669 	if (worktree)
1670 		got_worktree_close(worktree);
1671 	if (repo) {
1672 		const struct got_error *repo_error;
1673 		repo_error = got_repo_close(repo);
1674 		if (error == NULL)
1675 			error = repo_error;
1676 	}
1677 	got_ref_list_free(&refs);
1678 	return error;
1679 }
1680 
1681 __dead static void
1682 usage_diff(void)
1683 {
1684 	fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] "
1685 	    "[object1 object2 | path]\n", getprogname());
1686 	exit(1);
1687 }
1688 
1689 struct print_diff_arg {
1690 	struct got_repository *repo;
1691 	struct got_worktree *worktree;
1692 	int diff_context;
1693 	const char *id_str;
1694 	int header_shown;
1695 };
1696 
1697 static const struct got_error *
1698 print_diff(void *arg, unsigned char status, unsigned char staged_status,
1699     const char *path, struct got_object_id *blob_id,
1700     struct got_object_id *commit_id)
1701 {
1702 	struct print_diff_arg *a = arg;
1703 	const struct got_error *err = NULL;
1704 	struct got_blob_object *blob1 = NULL;
1705 	FILE *f2 = NULL;
1706 	char *abspath = NULL;
1707 	struct stat sb;
1708 
1709 	if (status != GOT_STATUS_MODIFY && status != GOT_STATUS_ADD &&
1710 	    status != GOT_STATUS_DELETE && status != GOT_STATUS_CONFLICT)
1711 		return NULL;
1712 
1713 	if (!a->header_shown) {
1714 		printf("diff %s %s\n", a->id_str,
1715 		    got_worktree_get_root_path(a->worktree));
1716 		a->header_shown = 1;
1717 	}
1718 
1719 	if (status != GOT_STATUS_ADD) {
1720 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1721 		if (err)
1722 			goto done;
1723 
1724 	}
1725 
1726 	if (status != GOT_STATUS_DELETE) {
1727 		if (asprintf(&abspath, "%s/%s",
1728 		    got_worktree_get_root_path(a->worktree), path) == -1) {
1729 			err = got_error_from_errno("asprintf");
1730 			goto done;
1731 		}
1732 
1733 		f2 = fopen(abspath, "r");
1734 		if (f2 == NULL) {
1735 			err = got_error_from_errno2("fopen", abspath);
1736 			goto done;
1737 		}
1738 		if (lstat(abspath, &sb) == -1) {
1739 			err = got_error_from_errno2("lstat", abspath);
1740 			goto done;
1741 		}
1742 	} else
1743 		sb.st_size = 0;
1744 
1745 	err = got_diff_blob_file(blob1, f2, sb.st_size, path, a->diff_context,
1746 	    stdout);
1747 done:
1748 	if (blob1)
1749 		got_object_blob_close(blob1);
1750 	if (f2 && fclose(f2) != 0 && err == NULL)
1751 		err = got_error_from_errno("fclose");
1752 	free(abspath);
1753 	return err;
1754 }
1755 
1756 static const struct got_error *
1757 cmd_diff(int argc, char *argv[])
1758 {
1759 	const struct got_error *error;
1760 	struct got_repository *repo = NULL;
1761 	struct got_worktree *worktree = NULL;
1762 	char *cwd = NULL, *repo_path = NULL;
1763 	struct got_object_id *id1 = NULL, *id2 = NULL;
1764 	const char *id_str1 = NULL, *id_str2 = NULL;
1765 	char *label1 = NULL, *label2 = NULL;
1766 	int type1, type2;
1767 	int diff_context = 3, ch;
1768 	const char *errstr;
1769 	char *path = NULL;
1770 
1771 #ifndef PROFILE
1772 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1773 	    NULL) == -1)
1774 		err(1, "pledge");
1775 #endif
1776 
1777 	while ((ch = getopt(argc, argv, "C:r:")) != -1) {
1778 		switch (ch) {
1779 		case 'C':
1780 			diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1781 			if (errstr != NULL)
1782 				err(1, "-C option %s", errstr);
1783 			break;
1784 		case 'r':
1785 			repo_path = realpath(optarg, NULL);
1786 			if (repo_path == NULL)
1787 				err(1, "-r option");
1788 			got_path_strip_trailing_slashes(repo_path);
1789 			break;
1790 		default:
1791 			usage_diff();
1792 			/* NOTREACHED */
1793 		}
1794 	}
1795 
1796 	argc -= optind;
1797 	argv += optind;
1798 
1799 	cwd = getcwd(NULL, 0);
1800 	if (cwd == NULL) {
1801 		error = got_error_from_errno("getcwd");
1802 		goto done;
1803 	}
1804 	error = got_worktree_open(&worktree, cwd);
1805 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
1806 		goto done;
1807 	if (argc <= 1) {
1808 		if (worktree == NULL) {
1809 			error = got_error(GOT_ERR_NOT_WORKTREE);
1810 			goto done;
1811 		}
1812 		if (repo_path)
1813 			errx(1,
1814 			    "-r option can't be used when diffing a work tree");
1815 		repo_path = strdup(got_worktree_get_repo_path(worktree));
1816 		if (repo_path == NULL) {
1817 			error = got_error_from_errno("strdup");
1818 			goto done;
1819 		}
1820 		if (argc == 1) {
1821 			error = got_worktree_resolve_path(&path, worktree,
1822 			    argv[0]);
1823 			if (error)
1824 				goto done;
1825 		} else {
1826 			path = strdup("");
1827 			if (path == NULL) {
1828 				error = got_error_from_errno("strdup");
1829 				goto done;
1830 			}
1831 		}
1832 	} else if (argc == 2) {
1833 		id_str1 = argv[0];
1834 		id_str2 = argv[1];
1835 		if (worktree && repo_path == NULL) {
1836 			repo_path =
1837 			    strdup(got_worktree_get_repo_path(worktree));
1838 			if (repo_path == NULL) {
1839 				error = got_error_from_errno("strdup");
1840 				goto done;
1841 			}
1842 		}
1843 	} else
1844 		usage_diff();
1845 
1846 	if (repo_path == NULL) {
1847 		repo_path = getcwd(NULL, 0);
1848 		if (repo_path == NULL)
1849 			return got_error_from_errno("getcwd");
1850 	}
1851 
1852 	error = got_repo_open(&repo, repo_path);
1853 	free(repo_path);
1854 	if (error != NULL)
1855 		goto done;
1856 
1857 	error = apply_unveil(got_repo_get_path(repo), 1,
1858 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
1859 	if (error)
1860 		goto done;
1861 
1862 	if (argc <= 1) {
1863 		struct print_diff_arg arg;
1864 		struct got_pathlist_head paths;
1865 		char *id_str;
1866 
1867 		TAILQ_INIT(&paths);
1868 
1869 		error = got_object_id_str(&id_str,
1870 		    got_worktree_get_base_commit_id(worktree));
1871 		if (error)
1872 			goto done;
1873 		arg.repo = repo;
1874 		arg.worktree = worktree;
1875 		arg.diff_context = diff_context;
1876 		arg.id_str = id_str;
1877 		arg.header_shown = 0;
1878 
1879 		error = got_pathlist_append(&paths, path, NULL);
1880 		if (error)
1881 			goto done;
1882 
1883 		error = got_worktree_status(worktree, &paths, repo, print_diff,
1884 		    &arg, check_cancelled, NULL);
1885 		free(id_str);
1886 		got_pathlist_free(&paths);
1887 		goto done;
1888 	}
1889 
1890 	error = got_repo_match_object_id_prefix(&id1, id_str1,
1891 	    GOT_OBJ_TYPE_ANY, repo);
1892 	if (error) {
1893 		struct got_reference *ref;
1894 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1895 			goto done;
1896 		error = got_ref_open(&ref, repo, id_str1, 0);
1897 		if (error != NULL)
1898 			goto done;
1899 		label1 = strdup(got_ref_get_name(ref));
1900 		if (label1 == NULL) {
1901 			error = got_error_from_errno("strdup");
1902 			goto done;
1903 		}
1904 		error = got_ref_resolve(&id1, repo, ref);
1905 		got_ref_close(ref);
1906 		if (error != NULL)
1907 			goto done;
1908 	} else {
1909 		error = got_object_id_str(&label1, id1);
1910 		if (label1 == NULL) {
1911 			error = got_error_from_errno("strdup");
1912 			goto done;
1913 		}
1914 	}
1915 
1916 	error = got_repo_match_object_id_prefix(&id2, id_str2,
1917 	    GOT_OBJ_TYPE_ANY, repo);
1918 	if (error) {
1919 		struct got_reference *ref;
1920 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
1921 			goto done;
1922 		error = got_ref_open(&ref, repo, id_str2, 0);
1923 		if (error != NULL)
1924 			goto done;
1925 		label2 = strdup(got_ref_get_name(ref));
1926 		if (label2 == NULL) {
1927 			error = got_error_from_errno("strdup");
1928 			goto done;
1929 		}
1930 		error = got_ref_resolve(&id2, repo, ref);
1931 		got_ref_close(ref);
1932 		if (error != NULL)
1933 			goto done;
1934 	} else {
1935 		error = got_object_id_str(&label2, id2);
1936 		if (label2 == NULL) {
1937 			error = got_error_from_errno("strdup");
1938 			goto done;
1939 		}
1940 	}
1941 
1942 	error = got_object_get_type(&type1, repo, id1);
1943 	if (error)
1944 		goto done;
1945 
1946 	error = got_object_get_type(&type2, repo, id2);
1947 	if (error)
1948 		goto done;
1949 
1950 	if (type1 != type2) {
1951 		error = got_error(GOT_ERR_OBJ_TYPE);
1952 		goto done;
1953 	}
1954 
1955 	switch (type1) {
1956 	case GOT_OBJ_TYPE_BLOB:
1957 		error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
1958 		    diff_context, repo, stdout);
1959 		break;
1960 	case GOT_OBJ_TYPE_TREE:
1961 		error = got_diff_objects_as_trees(id1, id2, "", "",
1962 		    diff_context, repo, stdout);
1963 		break;
1964 	case GOT_OBJ_TYPE_COMMIT:
1965 		printf("diff %s %s\n", label1, label2);
1966 		error = got_diff_objects_as_commits(id1, id2, diff_context,
1967 		    repo, stdout);
1968 		break;
1969 	default:
1970 		error = got_error(GOT_ERR_OBJ_TYPE);
1971 	}
1972 
1973 done:
1974 	free(label1);
1975 	free(label2);
1976 	free(id1);
1977 	free(id2);
1978 	free(path);
1979 	if (worktree)
1980 		got_worktree_close(worktree);
1981 	if (repo) {
1982 		const struct got_error *repo_error;
1983 		repo_error = got_repo_close(repo);
1984 		if (error == NULL)
1985 			error = repo_error;
1986 	}
1987 	return error;
1988 }
1989 
1990 __dead static void
1991 usage_blame(void)
1992 {
1993 	fprintf(stderr,
1994 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
1995 	    getprogname());
1996 	exit(1);
1997 }
1998 
1999 static const struct got_error *
2000 cmd_blame(int argc, char *argv[])
2001 {
2002 	const struct got_error *error;
2003 	struct got_repository *repo = NULL;
2004 	struct got_worktree *worktree = NULL;
2005 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2006 	struct got_object_id *commit_id = NULL;
2007 	char *commit_id_str = NULL;
2008 	int ch;
2009 
2010 #ifndef PROFILE
2011 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2012 	    NULL) == -1)
2013 		err(1, "pledge");
2014 #endif
2015 
2016 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2017 		switch (ch) {
2018 		case 'c':
2019 			commit_id_str = optarg;
2020 			break;
2021 		case 'r':
2022 			repo_path = realpath(optarg, NULL);
2023 			if (repo_path == NULL)
2024 				err(1, "-r option");
2025 			got_path_strip_trailing_slashes(repo_path);
2026 			break;
2027 		default:
2028 			usage_blame();
2029 			/* NOTREACHED */
2030 		}
2031 	}
2032 
2033 	argc -= optind;
2034 	argv += optind;
2035 
2036 	if (argc == 1)
2037 		path = argv[0];
2038 	else
2039 		usage_blame();
2040 
2041 	cwd = getcwd(NULL, 0);
2042 	if (cwd == NULL) {
2043 		error = got_error_from_errno("getcwd");
2044 		goto done;
2045 	}
2046 	if (repo_path == NULL) {
2047 		error = got_worktree_open(&worktree, cwd);
2048 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2049 			goto done;
2050 		else
2051 			error = NULL;
2052 		if (worktree) {
2053 			repo_path =
2054 			    strdup(got_worktree_get_repo_path(worktree));
2055 			if (repo_path == NULL)
2056 				error = got_error_from_errno("strdup");
2057 			if (error)
2058 				goto done;
2059 		} else {
2060 			repo_path = strdup(cwd);
2061 			if (repo_path == NULL) {
2062 				error = got_error_from_errno("strdup");
2063 				goto done;
2064 			}
2065 		}
2066 	}
2067 
2068 	error = got_repo_open(&repo, repo_path);
2069 	if (error != NULL)
2070 		goto done;
2071 
2072 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2073 	if (error)
2074 		goto done;
2075 
2076 	if (worktree) {
2077 		const char *prefix = got_worktree_get_path_prefix(worktree);
2078 		char *p, *worktree_subdir = cwd +
2079 		    strlen(got_worktree_get_root_path(worktree));
2080 		if (asprintf(&p, "%s%s%s%s%s",
2081 		    prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2082 		    worktree_subdir, worktree_subdir[0] ? "/" : "",
2083 		    path) == -1) {
2084 			error = got_error_from_errno("asprintf");
2085 			goto done;
2086 		}
2087 		error = got_repo_map_path(&in_repo_path, repo, p, 0);
2088 		free(p);
2089 	} else {
2090 		error = got_repo_map_path(&in_repo_path, repo, path, 1);
2091 	}
2092 	if (error)
2093 		goto done;
2094 
2095 	if (commit_id_str == NULL) {
2096 		struct got_reference *head_ref;
2097 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2098 		if (error != NULL)
2099 			goto done;
2100 		error = got_ref_resolve(&commit_id, repo, head_ref);
2101 		got_ref_close(head_ref);
2102 		if (error != NULL)
2103 			goto done;
2104 	} else {
2105 		error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2106 		if (error)
2107 			goto done;
2108 	}
2109 
2110 	error = got_blame(in_repo_path, commit_id, repo, stdout);
2111 done:
2112 	free(in_repo_path);
2113 	free(repo_path);
2114 	free(cwd);
2115 	free(commit_id);
2116 	if (worktree)
2117 		got_worktree_close(worktree);
2118 	if (repo) {
2119 		const struct got_error *repo_error;
2120 		repo_error = got_repo_close(repo);
2121 		if (error == NULL)
2122 			error = repo_error;
2123 	}
2124 	return error;
2125 }
2126 
2127 __dead static void
2128 usage_tree(void)
2129 {
2130 	fprintf(stderr,
2131 	    "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2132 	    getprogname());
2133 	exit(1);
2134 }
2135 
2136 static void
2137 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2138     const char *root_path)
2139 {
2140 	int is_root_path = (strcmp(path, root_path) == 0);
2141 
2142 	path += strlen(root_path);
2143 	while (path[0] == '/')
2144 		path++;
2145 
2146 	printf("%s%s%s%s%s\n", id ? id : "", path,
2147 	    is_root_path ? "" : "/", te->name,
2148 	    S_ISDIR(te->mode) ? "/" : ((te->mode & S_IXUSR) ? "*" : ""));
2149 }
2150 
2151 static const struct got_error *
2152 print_tree(const char *path, struct got_object_id *commit_id,
2153     int show_ids, int recurse, const char *root_path,
2154     struct got_repository *repo)
2155 {
2156 	const struct got_error *err = NULL;
2157 	struct got_object_id *tree_id = NULL;
2158 	struct got_tree_object *tree = NULL;
2159 	const struct got_tree_entries *entries;
2160 	struct got_tree_entry *te;
2161 
2162 	err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2163 	if (err)
2164 		goto done;
2165 
2166 	err = got_object_open_as_tree(&tree, repo, tree_id);
2167 	if (err)
2168 		goto done;
2169 	entries = got_object_tree_get_entries(tree);
2170 	te = SIMPLEQ_FIRST(&entries->head);
2171 	while (te) {
2172 		char *id = NULL;
2173 
2174 		if (sigint_received || sigpipe_received)
2175 			break;
2176 
2177 		if (show_ids) {
2178 			char *id_str;
2179 			err = got_object_id_str(&id_str, te->id);
2180 			if (err)
2181 				goto done;
2182 			if (asprintf(&id, "%s ", id_str) == -1) {
2183 				err = got_error_from_errno("asprintf");
2184 				free(id_str);
2185 				goto done;
2186 			}
2187 			free(id_str);
2188 		}
2189 		print_entry(te, id, path, root_path);
2190 		free(id);
2191 
2192 		if (recurse && S_ISDIR(te->mode)) {
2193 			char *child_path;
2194 			if (asprintf(&child_path, "%s%s%s", path,
2195 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
2196 			    te->name) == -1) {
2197 				err = got_error_from_errno("asprintf");
2198 				goto done;
2199 			}
2200 			err = print_tree(child_path, commit_id, show_ids, 1,
2201 			    root_path, repo);
2202 			free(child_path);
2203 			if (err)
2204 				goto done;
2205 		}
2206 
2207 		te = SIMPLEQ_NEXT(te, entry);
2208 	}
2209 done:
2210 	if (tree)
2211 		got_object_tree_close(tree);
2212 	free(tree_id);
2213 	return err;
2214 }
2215 
2216 static const struct got_error *
2217 cmd_tree(int argc, char *argv[])
2218 {
2219 	const struct got_error *error;
2220 	struct got_repository *repo = NULL;
2221 	struct got_worktree *worktree = NULL;
2222 	const char *path;
2223 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2224 	struct got_object_id *commit_id = NULL;
2225 	char *commit_id_str = NULL;
2226 	int show_ids = 0, recurse = 0;
2227 	int ch;
2228 
2229 #ifndef PROFILE
2230 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2231 	    NULL) == -1)
2232 		err(1, "pledge");
2233 #endif
2234 
2235 	while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2236 		switch (ch) {
2237 		case 'c':
2238 			commit_id_str = optarg;
2239 			break;
2240 		case 'r':
2241 			repo_path = realpath(optarg, NULL);
2242 			if (repo_path == NULL)
2243 				err(1, "-r option");
2244 			got_path_strip_trailing_slashes(repo_path);
2245 			break;
2246 		case 'i':
2247 			show_ids = 1;
2248 			break;
2249 		case 'R':
2250 			recurse = 1;
2251 			break;
2252 		default:
2253 			usage_tree();
2254 			/* NOTREACHED */
2255 		}
2256 	}
2257 
2258 	argc -= optind;
2259 	argv += optind;
2260 
2261 	if (argc == 1)
2262 		path = argv[0];
2263 	else if (argc > 1)
2264 		usage_tree();
2265 	else
2266 		path = NULL;
2267 
2268 	cwd = getcwd(NULL, 0);
2269 	if (cwd == NULL) {
2270 		error = got_error_from_errno("getcwd");
2271 		goto done;
2272 	}
2273 	if (repo_path == NULL) {
2274 		error = got_worktree_open(&worktree, cwd);
2275 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2276 			goto done;
2277 		else
2278 			error = NULL;
2279 		if (worktree) {
2280 			repo_path =
2281 			    strdup(got_worktree_get_repo_path(worktree));
2282 			if (repo_path == NULL)
2283 				error = got_error_from_errno("strdup");
2284 			if (error)
2285 				goto done;
2286 		} else {
2287 			repo_path = strdup(cwd);
2288 			if (repo_path == NULL) {
2289 				error = got_error_from_errno("strdup");
2290 				goto done;
2291 			}
2292 		}
2293 	}
2294 
2295 	error = got_repo_open(&repo, repo_path);
2296 	if (error != NULL)
2297 		goto done;
2298 
2299 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2300 	if (error)
2301 		goto done;
2302 
2303 	if (path == NULL) {
2304 		if (worktree) {
2305 			char *p, *worktree_subdir = cwd +
2306 			    strlen(got_worktree_get_root_path(worktree));
2307 			if (asprintf(&p, "%s/%s",
2308 			    got_worktree_get_path_prefix(worktree),
2309 			    worktree_subdir) == -1) {
2310 				error = got_error_from_errno("asprintf");
2311 				goto done;
2312 			}
2313 			error = got_repo_map_path(&in_repo_path, repo, p, 1);
2314 			free(p);
2315 			if (error)
2316 				goto done;
2317 		} else
2318 			path = "/";
2319 	}
2320 	if (in_repo_path == NULL) {
2321 		error = got_repo_map_path(&in_repo_path, repo, path, 1);
2322 		if (error != NULL)
2323 			goto done;
2324 	}
2325 
2326 	if (commit_id_str == NULL) {
2327 		struct got_reference *head_ref;
2328 		error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2329 		if (error != NULL)
2330 			goto done;
2331 		error = got_ref_resolve(&commit_id, repo, head_ref);
2332 		got_ref_close(head_ref);
2333 		if (error != NULL)
2334 			goto done;
2335 	} else {
2336 		error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2337 		if (error)
2338 			goto done;
2339 	}
2340 
2341 	error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2342 	    in_repo_path, repo);
2343 done:
2344 	free(in_repo_path);
2345 	free(repo_path);
2346 	free(cwd);
2347 	free(commit_id);
2348 	if (worktree)
2349 		got_worktree_close(worktree);
2350 	if (repo) {
2351 		const struct got_error *repo_error;
2352 		repo_error = got_repo_close(repo);
2353 		if (error == NULL)
2354 			error = repo_error;
2355 	}
2356 	return error;
2357 }
2358 
2359 __dead static void
2360 usage_status(void)
2361 {
2362 	fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2363 	exit(1);
2364 }
2365 
2366 static const struct got_error *
2367 print_status(void *arg, unsigned char status, unsigned char staged_status,
2368     const char *path, struct got_object_id *blob_id,
2369     struct got_object_id *commit_id)
2370 {
2371 	if (status == staged_status &&
2372 	    (status == GOT_STATUS_ADD || status == GOT_STATUS_DELETE))
2373 		status = GOT_STATUS_NO_CHANGE;
2374 	printf("%c%c %s\n", status, staged_status, path);
2375 	return NULL;
2376 }
2377 
2378 static const struct got_error *
2379 cmd_status(int argc, char *argv[])
2380 {
2381 	const struct got_error *error = NULL;
2382 	struct got_repository *repo = NULL;
2383 	struct got_worktree *worktree = NULL;
2384 	char *cwd = NULL;
2385 	struct got_pathlist_head paths;
2386 	struct got_pathlist_entry *pe;
2387 	int ch;
2388 
2389 	TAILQ_INIT(&paths);
2390 
2391 	while ((ch = getopt(argc, argv, "")) != -1) {
2392 		switch (ch) {
2393 		default:
2394 			usage_status();
2395 			/* NOTREACHED */
2396 		}
2397 	}
2398 
2399 	argc -= optind;
2400 	argv += optind;
2401 
2402 #ifndef PROFILE
2403 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2404 	    NULL) == -1)
2405 		err(1, "pledge");
2406 #endif
2407 	cwd = getcwd(NULL, 0);
2408 	if (cwd == NULL) {
2409 		error = got_error_from_errno("getcwd");
2410 		goto done;
2411 	}
2412 
2413 	error = got_worktree_open(&worktree, cwd);
2414 	if (error != NULL)
2415 		goto done;
2416 
2417 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2418 	if (error)
2419 		goto done;
2420 
2421 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2422 	if (error != NULL)
2423 		goto done;
2424 
2425 	error = apply_unveil(got_repo_get_path(repo), 1,
2426 	    got_worktree_get_root_path(worktree));
2427 	if (error)
2428 		goto done;
2429 
2430 	error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2431 	    check_cancelled, NULL);
2432 done:
2433 	TAILQ_FOREACH(pe, &paths, entry)
2434 		free((char *)pe->path);
2435 	got_pathlist_free(&paths);
2436 	free(cwd);
2437 	return error;
2438 }
2439 
2440 __dead static void
2441 usage_ref(void)
2442 {
2443 	fprintf(stderr,
2444 	    "usage: %s ref [-r repository] -l | -d name | name target\n",
2445 	    getprogname());
2446 	exit(1);
2447 }
2448 
2449 static const struct got_error *
2450 list_refs(struct got_repository *repo)
2451 {
2452 	static const struct got_error *err = NULL;
2453 	struct got_reflist_head refs;
2454 	struct got_reflist_entry *re;
2455 
2456 	SIMPLEQ_INIT(&refs);
2457 	err = got_ref_list(&refs, repo);
2458 	if (err)
2459 		return err;
2460 
2461 	SIMPLEQ_FOREACH(re, &refs, entry) {
2462 		char *refstr;
2463 		refstr = got_ref_to_str(re->ref);
2464 		if (refstr == NULL)
2465 			return got_error_from_errno("got_ref_to_str");
2466 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2467 		free(refstr);
2468 	}
2469 
2470 	got_ref_list_free(&refs);
2471 	return NULL;
2472 }
2473 
2474 static const struct got_error *
2475 delete_ref(struct got_repository *repo, const char *refname)
2476 {
2477 	const struct got_error *err = NULL;
2478 	struct got_reference *ref;
2479 
2480 	err = got_ref_open(&ref, repo, refname, 0);
2481 	if (err)
2482 		return err;
2483 
2484 	err = got_ref_delete(ref, repo);
2485 	got_ref_close(ref);
2486 	return err;
2487 }
2488 
2489 static const struct got_error *
2490 add_ref(struct got_repository *repo, const char *refname, const char *target)
2491 {
2492 	const struct got_error *err = NULL;
2493 	struct got_object_id *id;
2494 	struct got_reference *ref = NULL;
2495 
2496 	/*
2497 	 * Don't let the user create a reference named '-'.
2498 	 * While technically a valid reference name, this case is usually
2499 	 * an unintended typo.
2500 	 */
2501 	if (refname[0] == '-' && refname[1] == '\0')
2502 		return got_error(GOT_ERR_BAD_REF_NAME);
2503 
2504 	err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2505 	    repo);
2506 	if (err) {
2507 		struct got_reference *target_ref;
2508 
2509 		if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2510 			return err;
2511 		err = got_ref_open(&target_ref, repo, target, 0);
2512 		if (err)
2513 			return err;
2514 		err = got_ref_resolve(&id, repo, target_ref);
2515 		got_ref_close(target_ref);
2516 		if (err)
2517 			return err;
2518 	}
2519 
2520 	err = got_ref_alloc(&ref, refname, id);
2521 	if (err)
2522 		goto done;
2523 
2524 	err = got_ref_write(ref, repo);
2525 done:
2526 	if (ref)
2527 		got_ref_close(ref);
2528 	free(id);
2529 	return err;
2530 }
2531 
2532 static const struct got_error *
2533 cmd_ref(int argc, char *argv[])
2534 {
2535 	const struct got_error *error = NULL;
2536 	struct got_repository *repo = NULL;
2537 	struct got_worktree *worktree = NULL;
2538 	char *cwd = NULL, *repo_path = NULL;
2539 	int ch, do_list = 0;
2540 	const char *delref = NULL;
2541 
2542 	/* TODO: Add -s option for adding symbolic references. */
2543 	while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2544 		switch (ch) {
2545 		case 'd':
2546 			delref = optarg;
2547 			break;
2548 		case 'r':
2549 			repo_path = realpath(optarg, NULL);
2550 			if (repo_path == NULL)
2551 				err(1, "-r option");
2552 			got_path_strip_trailing_slashes(repo_path);
2553 			break;
2554 		case 'l':
2555 			do_list = 1;
2556 			break;
2557 		default:
2558 			usage_ref();
2559 			/* NOTREACHED */
2560 		}
2561 	}
2562 
2563 	if (do_list && delref)
2564 		errx(1, "-l and -d options are mutually exclusive\n");
2565 
2566 	argc -= optind;
2567 	argv += optind;
2568 
2569 	if (do_list || delref) {
2570 		if (argc > 0)
2571 			usage_ref();
2572 	} else if (argc != 2)
2573 		usage_ref();
2574 
2575 #ifndef PROFILE
2576 	if (do_list) {
2577 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2578 		    NULL) == -1)
2579 			err(1, "pledge");
2580 	} else {
2581 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2582 		    "sendfd unveil", NULL) == -1)
2583 			err(1, "pledge");
2584 	}
2585 #endif
2586 	cwd = getcwd(NULL, 0);
2587 	if (cwd == NULL) {
2588 		error = got_error_from_errno("getcwd");
2589 		goto done;
2590 	}
2591 
2592 	if (repo_path == NULL) {
2593 		error = got_worktree_open(&worktree, cwd);
2594 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2595 			goto done;
2596 		else
2597 			error = NULL;
2598 		if (worktree) {
2599 			repo_path =
2600 			    strdup(got_worktree_get_repo_path(worktree));
2601 			if (repo_path == NULL)
2602 				error = got_error_from_errno("strdup");
2603 			if (error)
2604 				goto done;
2605 		} else {
2606 			repo_path = strdup(cwd);
2607 			if (repo_path == NULL) {
2608 				error = got_error_from_errno("strdup");
2609 				goto done;
2610 			}
2611 		}
2612 	}
2613 
2614 	error = got_repo_open(&repo, repo_path);
2615 	if (error != NULL)
2616 		goto done;
2617 
2618 	error = apply_unveil(got_repo_get_path(repo), do_list,
2619 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
2620 	if (error)
2621 		goto done;
2622 
2623 	if (do_list)
2624 		error = list_refs(repo);
2625 	else if (delref)
2626 		error = delete_ref(repo, delref);
2627 	else
2628 		error = add_ref(repo, argv[0], argv[1]);
2629 done:
2630 	if (repo)
2631 		got_repo_close(repo);
2632 	if (worktree)
2633 		got_worktree_close(worktree);
2634 	free(cwd);
2635 	free(repo_path);
2636 	return error;
2637 }
2638 
2639 __dead static void
2640 usage_branch(void)
2641 {
2642 	fprintf(stderr,
2643 	    "usage: %s branch [-r repository] -l | -d name | "
2644 	    "name [base-branch]\n", getprogname());
2645 	exit(1);
2646 }
2647 
2648 static const struct got_error *
2649 list_branches(struct got_repository *repo, struct got_worktree *worktree)
2650 {
2651 	static const struct got_error *err = NULL;
2652 	struct got_reflist_head refs;
2653 	struct got_reflist_entry *re;
2654 
2655 	SIMPLEQ_INIT(&refs);
2656 
2657 	err = got_ref_list(&refs, repo);
2658 	if (err)
2659 		return err;
2660 
2661 	SIMPLEQ_FOREACH(re, &refs, entry) {
2662 		const char *refname, *marker = "  ";
2663 		char *refstr;
2664 		refname = got_ref_get_name(re->ref);
2665 		if (strncmp(refname, "refs/heads/", 11) != 0)
2666 			continue;
2667 		if (worktree && strcmp(refname,
2668 		    got_worktree_get_head_ref_name(worktree)) == 0) {
2669 			struct got_object_id *id = NULL;
2670 			err = got_ref_resolve(&id, repo, re->ref);
2671 			if (err)
2672 				return err;
2673 			if (got_object_id_cmp(id,
2674 			    got_worktree_get_base_commit_id(worktree)) == 0)
2675 				marker = "* ";
2676 			else
2677 				marker = "~ ";
2678 			free(id);
2679 		}
2680 		refname += 11;
2681 		refstr = got_ref_to_str(re->ref);
2682 		if (refstr == NULL)
2683 			return got_error_from_errno("got_ref_to_str");
2684 		printf("%s%s: %s\n", marker, refname, refstr);
2685 		free(refstr);
2686 	}
2687 
2688 	got_ref_list_free(&refs);
2689 	return NULL;
2690 }
2691 
2692 static const struct got_error *
2693 delete_branch(struct got_repository *repo, const char *branch_name)
2694 {
2695 	const struct got_error *err = NULL;
2696 	struct got_reference *ref;
2697 	char *refname;
2698 
2699 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2700 		return got_error_from_errno("asprintf");
2701 
2702 	err = got_ref_open(&ref, repo, refname, 0);
2703 	if (err)
2704 		goto done;
2705 
2706 	err = got_ref_delete(ref, repo);
2707 	got_ref_close(ref);
2708 done:
2709 	free(refname);
2710 	return err;
2711 }
2712 
2713 static const struct got_error *
2714 add_branch(struct got_repository *repo, const char *branch_name,
2715     const char *base_branch)
2716 {
2717 	const struct got_error *err = NULL;
2718 	struct got_object_id *id = NULL;
2719 	struct got_reference *ref = NULL;
2720 	char *base_refname = NULL, *refname = NULL;
2721 	struct got_reference *base_ref;
2722 
2723 	/*
2724 	 * Don't let the user create a branch named '-'.
2725 	 * While technically a valid reference name, this case is usually
2726 	 * an unintended typo.
2727 	 */
2728 	if (branch_name[0] == '-' && branch_name[1] == '\0')
2729 		return got_error(GOT_ERR_BAD_REF_NAME);
2730 
2731 	if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2732 		base_refname = strdup(GOT_REF_HEAD);
2733 		if (base_refname == NULL)
2734 			return got_error_from_errno("strdup");
2735 	} else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2736 		return got_error_from_errno("asprintf");
2737 
2738 	err = got_ref_open(&base_ref, repo, base_refname, 0);
2739 	if (err)
2740 		goto done;
2741 	err = got_ref_resolve(&id, repo, base_ref);
2742 	got_ref_close(base_ref);
2743 	if (err)
2744 		goto done;
2745 
2746 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2747 		 err = got_error_from_errno("asprintf");
2748 		 goto done;
2749 	}
2750 
2751 	err = got_ref_open(&ref, repo, refname, 0);
2752 	if (err == NULL) {
2753 		err = got_error(GOT_ERR_BRANCH_EXISTS);
2754 		goto done;
2755 	} else if (err->code != GOT_ERR_NOT_REF)
2756 		goto done;
2757 
2758 	err = got_ref_alloc(&ref, refname, id);
2759 	if (err)
2760 		goto done;
2761 
2762 	err = got_ref_write(ref, repo);
2763 done:
2764 	if (ref)
2765 		got_ref_close(ref);
2766 	free(id);
2767 	free(base_refname);
2768 	free(refname);
2769 	return err;
2770 }
2771 
2772 static const struct got_error *
2773 cmd_branch(int argc, char *argv[])
2774 {
2775 	const struct got_error *error = NULL;
2776 	struct got_repository *repo = NULL;
2777 	struct got_worktree *worktree = NULL;
2778 	char *cwd = NULL, *repo_path = NULL;
2779 	int ch, do_list = 0;
2780 	const char *delref = NULL;
2781 
2782 	while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2783 		switch (ch) {
2784 		case 'd':
2785 			delref = optarg;
2786 			break;
2787 		case 'r':
2788 			repo_path = realpath(optarg, NULL);
2789 			if (repo_path == NULL)
2790 				err(1, "-r option");
2791 			got_path_strip_trailing_slashes(repo_path);
2792 			break;
2793 		case 'l':
2794 			do_list = 1;
2795 			break;
2796 		default:
2797 			usage_branch();
2798 			/* NOTREACHED */
2799 		}
2800 	}
2801 
2802 	if (do_list && delref)
2803 		errx(1, "-l and -d options are mutually exclusive\n");
2804 
2805 	argc -= optind;
2806 	argv += optind;
2807 
2808 	if (do_list || delref) {
2809 		if (argc > 0)
2810 			usage_branch();
2811 	} else if (argc < 1 || argc > 2)
2812 		usage_branch();
2813 
2814 #ifndef PROFILE
2815 	if (do_list) {
2816 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2817 		    NULL) == -1)
2818 			err(1, "pledge");
2819 	} else {
2820 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2821 		    "sendfd unveil", NULL) == -1)
2822 			err(1, "pledge");
2823 	}
2824 #endif
2825 	cwd = getcwd(NULL, 0);
2826 	if (cwd == NULL) {
2827 		error = got_error_from_errno("getcwd");
2828 		goto done;
2829 	}
2830 
2831 	if (repo_path == NULL) {
2832 		error = got_worktree_open(&worktree, cwd);
2833 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2834 			goto done;
2835 		else
2836 			error = NULL;
2837 		if (worktree) {
2838 			repo_path =
2839 			    strdup(got_worktree_get_repo_path(worktree));
2840 			if (repo_path == NULL)
2841 				error = got_error_from_errno("strdup");
2842 			if (error)
2843 				goto done;
2844 		} else {
2845 			repo_path = strdup(cwd);
2846 			if (repo_path == NULL) {
2847 				error = got_error_from_errno("strdup");
2848 				goto done;
2849 			}
2850 		}
2851 	}
2852 
2853 	error = got_repo_open(&repo, repo_path);
2854 	if (error != NULL)
2855 		goto done;
2856 
2857 	error = apply_unveil(got_repo_get_path(repo), do_list,
2858 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
2859 	if (error)
2860 		goto done;
2861 
2862 	if (do_list)
2863 		error = list_branches(repo, worktree);
2864 	else if (delref)
2865 		error = delete_branch(repo, delref);
2866 	else {
2867 		const char *base_branch;
2868 		if (argc == 1) {
2869 			base_branch = worktree ?
2870 			    got_worktree_get_head_ref_name(worktree) :
2871 			    GOT_REF_HEAD;
2872 			if (strncmp(base_branch, "refs/heads/", 11) == 0)
2873 				base_branch += 11;
2874 		} else
2875 			base_branch = argv[1];
2876 		error = add_branch(repo, argv[0], base_branch);
2877 	}
2878 done:
2879 	if (repo)
2880 		got_repo_close(repo);
2881 	if (worktree)
2882 		got_worktree_close(worktree);
2883 	free(cwd);
2884 	free(repo_path);
2885 	return error;
2886 }
2887 
2888 __dead static void
2889 usage_add(void)
2890 {
2891 	fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
2892 	exit(1);
2893 }
2894 
2895 static const struct got_error *
2896 cmd_add(int argc, char *argv[])
2897 {
2898 	const struct got_error *error = NULL;
2899 	struct got_repository *repo = NULL;
2900 	struct got_worktree *worktree = NULL;
2901 	char *cwd = NULL;
2902 	struct got_pathlist_head paths;
2903 	struct got_pathlist_entry *pe;
2904 	int ch, x;
2905 
2906 	TAILQ_INIT(&paths);
2907 
2908 	while ((ch = getopt(argc, argv, "")) != -1) {
2909 		switch (ch) {
2910 		default:
2911 			usage_add();
2912 			/* NOTREACHED */
2913 		}
2914 	}
2915 
2916 	argc -= optind;
2917 	argv += optind;
2918 
2919 #ifndef PROFILE
2920 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2921 	    NULL) == -1)
2922 		err(1, "pledge");
2923 #endif
2924 	if (argc < 1)
2925 		usage_add();
2926 
2927 	cwd = getcwd(NULL, 0);
2928 	if (cwd == NULL) {
2929 		error = got_error_from_errno("getcwd");
2930 		goto done;
2931 	}
2932 
2933 	error = got_worktree_open(&worktree, cwd);
2934 	if (error)
2935 		goto done;
2936 
2937 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2938 	if (error != NULL)
2939 		goto done;
2940 
2941 	error = apply_unveil(got_repo_get_path(repo), 1,
2942 	    got_worktree_get_root_path(worktree));
2943 	if (error)
2944 		goto done;
2945 
2946 	for (x = 0; x < argc; x++) {
2947 		char *path = realpath(argv[x], NULL);
2948 		if (path == NULL) {
2949 			error = got_error_from_errno2("realpath", argv[x]);
2950 			goto done;
2951 		}
2952 
2953 		got_path_strip_trailing_slashes(path);
2954 		error = got_pathlist_insert(&pe, &paths, path, NULL);
2955 		if (error) {
2956 			free(path);
2957 			goto done;
2958 		}
2959 	}
2960 	error = got_worktree_schedule_add(worktree, &paths, print_status,
2961 	    NULL, repo);
2962 done:
2963 	if (repo)
2964 		got_repo_close(repo);
2965 	if (worktree)
2966 		got_worktree_close(worktree);
2967 	TAILQ_FOREACH(pe, &paths, entry)
2968 		free((char *)pe->path);
2969 	got_pathlist_free(&paths);
2970 	free(cwd);
2971 	return error;
2972 }
2973 
2974 __dead static void
2975 usage_remove(void)
2976 {
2977 	fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
2978 	exit(1);
2979 }
2980 
2981 static const struct got_error *
2982 cmd_remove(int argc, char *argv[])
2983 {
2984 	const struct got_error *error = NULL;
2985 	struct got_worktree *worktree = NULL;
2986 	struct got_repository *repo = NULL;
2987 	char *cwd = NULL;
2988 	struct got_pathlist_head paths;
2989 	struct got_pathlist_entry *pe;
2990 	int ch, i, delete_local_mods = 0;
2991 
2992 	TAILQ_INIT(&paths);
2993 
2994 	while ((ch = getopt(argc, argv, "f")) != -1) {
2995 		switch (ch) {
2996 		case 'f':
2997 			delete_local_mods = 1;
2998 			break;
2999 		default:
3000 			usage_add();
3001 			/* NOTREACHED */
3002 		}
3003 	}
3004 
3005 	argc -= optind;
3006 	argv += optind;
3007 
3008 #ifndef PROFILE
3009 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3010 	    NULL) == -1)
3011 		err(1, "pledge");
3012 #endif
3013 	if (argc < 1)
3014 		usage_remove();
3015 
3016 	cwd = getcwd(NULL, 0);
3017 	if (cwd == NULL) {
3018 		error = got_error_from_errno("getcwd");
3019 		goto done;
3020 	}
3021 	error = got_worktree_open(&worktree, cwd);
3022 	if (error)
3023 		goto done;
3024 
3025 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3026 	if (error)
3027 		goto done;
3028 
3029 	error = apply_unveil(got_repo_get_path(repo), 1,
3030 	    got_worktree_get_root_path(worktree));
3031 	if (error)
3032 		goto done;
3033 
3034 	for (i = 0; i < argc; i++) {
3035 		char *path = realpath(argv[i], NULL);
3036 		if (path == NULL) {
3037 			error = got_error_from_errno2("realpath", argv[i]);
3038 			goto done;
3039 		}
3040 
3041 		got_path_strip_trailing_slashes(path);
3042 		error = got_pathlist_insert(&pe, &paths, path, NULL);
3043 		if (error) {
3044 			free(path);
3045 			goto done;
3046 		}
3047 	}
3048 	error = got_worktree_schedule_delete(worktree, &paths,
3049 	    delete_local_mods, print_status, NULL, repo);
3050 	if (error)
3051 		goto done;
3052 done:
3053 	if (repo)
3054 		got_repo_close(repo);
3055 	if (worktree)
3056 		got_worktree_close(worktree);
3057 	TAILQ_FOREACH(pe, &paths, entry)
3058 		free((char *)pe->path);
3059 	got_pathlist_free(&paths);
3060 	free(cwd);
3061 	return error;
3062 }
3063 
3064 __dead static void
3065 usage_revert(void)
3066 {
3067 	fprintf(stderr, "usage: %s revert file-path ...\n", getprogname());
3068 	exit(1);
3069 }
3070 
3071 static const struct got_error *
3072 revert_progress(void *arg, unsigned char status, const char *path)
3073 {
3074 	while (path[0] == '/')
3075 		path++;
3076 	printf("%c  %s\n", status, path);
3077 	return NULL;
3078 }
3079 
3080 static const struct got_error *
3081 cmd_revert(int argc, char *argv[])
3082 {
3083 	const struct got_error *error = NULL;
3084 	struct got_worktree *worktree = NULL;
3085 	struct got_repository *repo = NULL;
3086 	char *cwd = NULL, *path = NULL;
3087 	struct got_pathlist_head paths;
3088 	struct got_pathlist_entry *pe;
3089 	const char *worktree_path;
3090 	int ch, i;
3091 
3092 	TAILQ_INIT(&paths);
3093 
3094 	while ((ch = getopt(argc, argv, "")) != -1) {
3095 		switch (ch) {
3096 		default:
3097 			usage_revert();
3098 			/* NOTREACHED */
3099 		}
3100 	}
3101 
3102 	argc -= optind;
3103 	argv += optind;
3104 
3105 #ifndef PROFILE
3106 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3107 	    "unveil", NULL) == -1)
3108 		err(1, "pledge");
3109 #endif
3110 	if (argc < 1)
3111 		usage_revert();
3112 
3113 	cwd = getcwd(NULL, 0);
3114 	if (cwd == NULL) {
3115 		error = got_error_from_errno("getcwd");
3116 		goto done;
3117 	}
3118 	error = got_worktree_open(&worktree, cwd);
3119 	if (error)
3120 		goto done;
3121 
3122 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3123 	if (error != NULL)
3124 		goto done;
3125 
3126 	error = apply_unveil(got_repo_get_path(repo), 1,
3127 	    got_worktree_get_root_path(worktree));
3128 	if (error)
3129 		goto done;
3130 
3131 	worktree_path = got_worktree_get_root_path(worktree);
3132 	for (i = 0; i < argc; i++) {
3133 		char *path = realpath(argv[i], NULL);
3134 		if (path == NULL) {
3135 			if (errno != ENOENT) {
3136 				error = got_error_from_errno2("realpath",
3137 				    argv[i]);
3138 				goto done;
3139 			}
3140 			if (got_path_is_child(argv[i], worktree_path,
3141 			    strlen(worktree_path))) {
3142 				path = strdup(argv[i]);
3143 				if (path == NULL) {
3144 					error = got_error_from_errno("strdup");
3145 					goto done;
3146 				}
3147 
3148 			} else if (asprintf(&path, "%s/%s",
3149 			    got_worktree_get_root_path(worktree),
3150 			    argv[i]) == -1) {
3151 				error = got_error_from_errno("asprintf");
3152 				goto done;
3153 			}
3154 		}
3155 
3156 		got_path_strip_trailing_slashes(path);
3157 		error = got_pathlist_insert(&pe, &paths, path, NULL);
3158 		if (error) {
3159 			free(path);
3160 			goto done;
3161 		}
3162 	}
3163 
3164 	error = got_worktree_revert(worktree, &paths,
3165 	    revert_progress, NULL, repo);
3166 	if (error)
3167 		goto done;
3168 done:
3169 	if (repo)
3170 		got_repo_close(repo);
3171 	if (worktree)
3172 		got_worktree_close(worktree);
3173 	free(path);
3174 	free(cwd);
3175 	return error;
3176 }
3177 
3178 __dead static void
3179 usage_commit(void)
3180 {
3181 	fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
3182 	    getprogname());
3183 	exit(1);
3184 }
3185 
3186 struct collect_commit_logmsg_arg {
3187 	const char *cmdline_log;
3188 	const char *editor;
3189 	const char *worktree_path;
3190 	const char *branch_name;
3191 	const char *repo_path;
3192 	char *logmsg_path;
3193 
3194 };
3195 
3196 static const struct got_error *
3197 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3198     void *arg)
3199 {
3200 	char *initial_content = NULL;
3201 	struct got_pathlist_entry *pe;
3202 	const struct got_error *err = NULL;
3203 	char *template = NULL;
3204 	struct collect_commit_logmsg_arg *a = arg;
3205 	int fd;
3206 	size_t len;
3207 
3208 	/* if a message was specified on the command line, just use it */
3209 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3210 		len = strlen(a->cmdline_log) + 1;
3211 		*logmsg = malloc(len + 1);
3212 		if (*logmsg == NULL)
3213 			return got_error_from_errno("malloc");
3214 		strlcpy(*logmsg, a->cmdline_log, len);
3215 		return NULL;
3216 	}
3217 
3218 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3219 		return got_error_from_errno("asprintf");
3220 
3221 	if (asprintf(&initial_content,
3222 	    "\n# changes to be committed on branch %s:\n",
3223 	    a->branch_name) == -1)
3224 		return got_error_from_errno("asprintf");
3225 
3226 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3227 	if (err)
3228 		goto done;
3229 
3230 	dprintf(fd, initial_content);
3231 
3232 	TAILQ_FOREACH(pe, commitable_paths, entry) {
3233 		struct got_commitable *ct = pe->data;
3234 		dprintf(fd, "#  %c  %s\n",
3235 		    got_commitable_get_status(ct),
3236 		    got_commitable_get_path(ct));
3237 	}
3238 	close(fd);
3239 
3240 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3241 done:
3242 	unlink(a->logmsg_path);
3243 	free(a->logmsg_path);
3244 	free(initial_content);
3245 	free(template);
3246 
3247 	/* Editor is done; we can now apply unveil(2) */
3248 	if (err == NULL) {
3249 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
3250 		if (err) {
3251 			free(*logmsg);
3252 			*logmsg = NULL;
3253 		}
3254 	}
3255 	return err;
3256 }
3257 
3258 static const struct got_error *
3259 cmd_commit(int argc, char *argv[])
3260 {
3261 	const struct got_error *error = NULL;
3262 	struct got_worktree *worktree = NULL;
3263 	struct got_repository *repo = NULL;
3264 	char *cwd = NULL, *id_str = NULL;
3265 	struct got_object_id *id = NULL;
3266 	const char *logmsg = NULL;
3267 	const char *got_author = getenv("GOT_AUTHOR");
3268 	struct collect_commit_logmsg_arg cl_arg;
3269 	char *editor = NULL;
3270 	int ch, rebase_in_progress, histedit_in_progress;
3271 	struct got_pathlist_head paths;
3272 
3273 	TAILQ_INIT(&paths);
3274 
3275 	while ((ch = getopt(argc, argv, "m:")) != -1) {
3276 		switch (ch) {
3277 		case 'm':
3278 			logmsg = optarg;
3279 			break;
3280 		default:
3281 			usage_commit();
3282 			/* NOTREACHED */
3283 		}
3284 	}
3285 
3286 	argc -= optind;
3287 	argv += optind;
3288 
3289 #ifndef PROFILE
3290 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3291 	    "unveil", NULL) == -1)
3292 		err(1, "pledge");
3293 #endif
3294 	if (got_author == NULL) {
3295 		/* TODO: Look current user up in password database */
3296 		error = got_error(GOT_ERR_COMMIT_NO_AUTHOR);
3297 		goto done;
3298 	}
3299 
3300 	cwd = getcwd(NULL, 0);
3301 	if (cwd == NULL) {
3302 		error = got_error_from_errno("getcwd");
3303 		goto done;
3304 	}
3305 	error = got_worktree_open(&worktree, cwd);
3306 	if (error)
3307 		goto done;
3308 
3309 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3310 	if (error)
3311 		goto done;
3312 	if (rebase_in_progress) {
3313 		error = got_error(GOT_ERR_REBASING);
3314 		goto done;
3315 	}
3316 
3317 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
3318 	    worktree);
3319 	if (error)
3320 		goto done;
3321 
3322 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3323 	if (error)
3324 		goto done;
3325 
3326 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3327 	if (error != NULL)
3328 		goto done;
3329 
3330 	/*
3331 	 * unveil(2) traverses exec(2); if an editor is used we have
3332 	 * to apply unveil after the log message has been written.
3333 	 */
3334 	if (logmsg == NULL || strlen(logmsg) == 0)
3335 		error = get_editor(&editor);
3336 	else
3337 		error = apply_unveil(got_repo_get_path(repo), 0,
3338 		    got_worktree_get_root_path(worktree));
3339 	if (error)
3340 		goto done;
3341 
3342 	cl_arg.editor = editor;
3343 	cl_arg.cmdline_log = logmsg;
3344 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3345 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3346 	if (!histedit_in_progress) {
3347 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
3348 			error = got_error(GOT_ERR_COMMIT_BRANCH);
3349 			goto done;
3350 		}
3351 		cl_arg.branch_name += 11;
3352 	}
3353 	cl_arg.repo_path = got_repo_get_path(repo);
3354 	cl_arg.logmsg_path = NULL;
3355 	error = got_worktree_commit(&id, worktree, &paths, got_author, NULL,
3356 	    collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3357 	if (error) {
3358 		if (cl_arg.logmsg_path)
3359 			fprintf(stderr, "%s: log message preserved in %s\n",
3360 			    getprogname(), cl_arg.logmsg_path);
3361 		goto done;
3362 	}
3363 
3364 	if (cl_arg.logmsg_path)
3365 		unlink(cl_arg.logmsg_path);
3366 
3367 	error = got_object_id_str(&id_str, id);
3368 	if (error)
3369 		goto done;
3370 	printf("Created commit %s\n", id_str);
3371 done:
3372 	if (repo)
3373 		got_repo_close(repo);
3374 	if (worktree)
3375 		got_worktree_close(worktree);
3376 	free(cwd);
3377 	free(id_str);
3378 	free(editor);
3379 	return error;
3380 }
3381 
3382 __dead static void
3383 usage_cherrypick(void)
3384 {
3385 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3386 	exit(1);
3387 }
3388 
3389 static const struct got_error *
3390 cmd_cherrypick(int argc, char *argv[])
3391 {
3392 	const struct got_error *error = NULL;
3393 	struct got_worktree *worktree = NULL;
3394 	struct got_repository *repo = NULL;
3395 	char *cwd = NULL, *commit_id_str = NULL;
3396 	struct got_object_id *commit_id = NULL;
3397 	struct got_commit_object *commit = NULL;
3398 	struct got_object_qid *pid;
3399 	struct got_reference *head_ref = NULL;
3400 	int ch, did_something = 0;
3401 
3402 	while ((ch = getopt(argc, argv, "")) != -1) {
3403 		switch (ch) {
3404 		default:
3405 			usage_cherrypick();
3406 			/* NOTREACHED */
3407 		}
3408 	}
3409 
3410 	argc -= optind;
3411 	argv += optind;
3412 
3413 #ifndef PROFILE
3414 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3415 	    "unveil", NULL) == -1)
3416 		err(1, "pledge");
3417 #endif
3418 	if (argc != 1)
3419 		usage_cherrypick();
3420 
3421 	cwd = getcwd(NULL, 0);
3422 	if (cwd == NULL) {
3423 		error = got_error_from_errno("getcwd");
3424 		goto done;
3425 	}
3426 	error = got_worktree_open(&worktree, cwd);
3427 	if (error)
3428 		goto done;
3429 
3430 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3431 	if (error != NULL)
3432 		goto done;
3433 
3434 	error = apply_unveil(got_repo_get_path(repo), 0,
3435 	    got_worktree_get_root_path(worktree));
3436 	if (error)
3437 		goto done;
3438 
3439 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3440 	    GOT_OBJ_TYPE_COMMIT, repo);
3441 	if (error != NULL) {
3442 		struct got_reference *ref;
3443 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3444 			goto done;
3445 		error = got_ref_open(&ref, repo, argv[0], 0);
3446 		if (error != NULL)
3447 			goto done;
3448 		error = got_ref_resolve(&commit_id, repo, ref);
3449 		got_ref_close(ref);
3450 		if (error != NULL)
3451 			goto done;
3452 	}
3453 	error = got_object_id_str(&commit_id_str, commit_id);
3454 	if (error)
3455 		goto done;
3456 
3457 	error = got_ref_open(&head_ref, repo,
3458 	    got_worktree_get_head_ref_name(worktree), 0);
3459 	if (error != NULL)
3460 		goto done;
3461 
3462 	error = check_same_branch(commit_id, head_ref, NULL, repo);
3463 	if (error) {
3464 		if (error->code != GOT_ERR_ANCESTRY)
3465 			goto done;
3466 		error = NULL;
3467 	} else {
3468 		error = got_error(GOT_ERR_SAME_BRANCH);
3469 		goto done;
3470 	}
3471 
3472 	error = got_object_open_as_commit(&commit, repo, commit_id);
3473 	if (error)
3474 		goto done;
3475 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3476 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3477 	    commit_id, repo, update_progress, &did_something, check_cancelled,
3478 	    NULL);
3479 	if (error != NULL)
3480 		goto done;
3481 
3482 	if (did_something)
3483 		printf("Merged commit %s\n", commit_id_str);
3484 done:
3485 	if (commit)
3486 		got_object_commit_close(commit);
3487 	free(commit_id_str);
3488 	if (head_ref)
3489 		got_ref_close(head_ref);
3490 	if (worktree)
3491 		got_worktree_close(worktree);
3492 	if (repo)
3493 		got_repo_close(repo);
3494 	return error;
3495 }
3496 
3497 __dead static void
3498 usage_backout(void)
3499 {
3500 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3501 	exit(1);
3502 }
3503 
3504 static const struct got_error *
3505 cmd_backout(int argc, char *argv[])
3506 {
3507 	const struct got_error *error = NULL;
3508 	struct got_worktree *worktree = NULL;
3509 	struct got_repository *repo = NULL;
3510 	char *cwd = NULL, *commit_id_str = NULL;
3511 	struct got_object_id *commit_id = NULL;
3512 	struct got_commit_object *commit = NULL;
3513 	struct got_object_qid *pid;
3514 	struct got_reference *head_ref = NULL;
3515 	int ch, did_something = 0;
3516 
3517 	while ((ch = getopt(argc, argv, "")) != -1) {
3518 		switch (ch) {
3519 		default:
3520 			usage_backout();
3521 			/* NOTREACHED */
3522 		}
3523 	}
3524 
3525 	argc -= optind;
3526 	argv += optind;
3527 
3528 #ifndef PROFILE
3529 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3530 	    "unveil", NULL) == -1)
3531 		err(1, "pledge");
3532 #endif
3533 	if (argc != 1)
3534 		usage_backout();
3535 
3536 	cwd = getcwd(NULL, 0);
3537 	if (cwd == NULL) {
3538 		error = got_error_from_errno("getcwd");
3539 		goto done;
3540 	}
3541 	error = got_worktree_open(&worktree, cwd);
3542 	if (error)
3543 		goto done;
3544 
3545 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3546 	if (error != NULL)
3547 		goto done;
3548 
3549 	error = apply_unveil(got_repo_get_path(repo), 0,
3550 	    got_worktree_get_root_path(worktree));
3551 	if (error)
3552 		goto done;
3553 
3554 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3555 	    GOT_OBJ_TYPE_COMMIT, repo);
3556 	if (error != NULL) {
3557 		struct got_reference *ref;
3558 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3559 			goto done;
3560 		error = got_ref_open(&ref, repo, argv[0], 0);
3561 		if (error != NULL)
3562 			goto done;
3563 		error = got_ref_resolve(&commit_id, repo, ref);
3564 		got_ref_close(ref);
3565 		if (error != NULL)
3566 			goto done;
3567 	}
3568 	error = got_object_id_str(&commit_id_str, commit_id);
3569 	if (error)
3570 		goto done;
3571 
3572 	error = got_ref_open(&head_ref, repo,
3573 	    got_worktree_get_head_ref_name(worktree), 0);
3574 	if (error != NULL)
3575 		goto done;
3576 
3577 	error = check_same_branch(commit_id, head_ref, NULL, repo);
3578 	if (error)
3579 		goto done;
3580 
3581 	error = got_object_open_as_commit(&commit, repo, commit_id);
3582 	if (error)
3583 		goto done;
3584 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3585 	if (pid == NULL) {
3586 		error = got_error(GOT_ERR_ROOT_COMMIT);
3587 		goto done;
3588 	}
3589 
3590 	error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3591 	    update_progress, &did_something, check_cancelled, NULL);
3592 	if (error != NULL)
3593 		goto done;
3594 
3595 	if (did_something)
3596 		printf("Backed out commit %s\n", commit_id_str);
3597 done:
3598 	if (commit)
3599 		got_object_commit_close(commit);
3600 	free(commit_id_str);
3601 	if (head_ref)
3602 		got_ref_close(head_ref);
3603 	if (worktree)
3604 		got_worktree_close(worktree);
3605 	if (repo)
3606 		got_repo_close(repo);
3607 	return error;
3608 }
3609 
3610 __dead static void
3611 usage_rebase(void)
3612 {
3613 	fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3614 	    getprogname());
3615 	exit(1);
3616 }
3617 
3618 void
3619 trim_logmsg(char *logmsg, int limit)
3620 {
3621 	char *nl;
3622 	size_t len;
3623 
3624 	len = strlen(logmsg);
3625 	if (len > limit)
3626 		len = limit;
3627 	logmsg[len] = '\0';
3628 	nl = strchr(logmsg, '\n');
3629 	if (nl)
3630 		*nl = '\0';
3631 }
3632 
3633 static const struct got_error *
3634 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
3635 {
3636 	const char *logmsg0 = NULL;
3637 
3638 	logmsg0 = got_object_commit_get_logmsg(commit);
3639 
3640 	while (isspace((unsigned char)logmsg0[0]))
3641 		logmsg0++;
3642 
3643 	*logmsg = strdup(logmsg0);
3644 	if (*logmsg == NULL)
3645 		return got_error_from_errno("strdup");
3646 
3647 	trim_logmsg(*logmsg, limit);
3648 	return NULL;
3649 }
3650 
3651 static const struct got_error *
3652 show_rebase_progress(struct got_commit_object *commit,
3653     struct got_object_id *old_id, struct got_object_id *new_id)
3654 {
3655 	const struct got_error *err;
3656 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
3657 
3658 	err = got_object_id_str(&old_id_str, old_id);
3659 	if (err)
3660 		goto done;
3661 
3662 	if (new_id) {
3663 		err = got_object_id_str(&new_id_str, new_id);
3664 		if (err)
3665 			goto done;
3666 	}
3667 
3668 	old_id_str[12] = '\0';
3669 	if (new_id_str)
3670 		new_id_str[12] = '\0';
3671 
3672 	err = get_short_logmsg(&logmsg, 42, commit);
3673 	if (err)
3674 		goto done;
3675 
3676 	printf("%s -> %s: %s\n", old_id_str,
3677 	    new_id_str ? new_id_str : "no-op change", logmsg);
3678 done:
3679 	free(old_id_str);
3680 	free(new_id_str);
3681 	return err;
3682 }
3683 
3684 static const struct got_error *
3685 rebase_progress(void *arg, unsigned char status, const char *path)
3686 {
3687 	unsigned char *rebase_status = arg;
3688 
3689 	while (path[0] == '/')
3690 		path++;
3691 	printf("%c  %s\n", status, path);
3692 
3693 	if (*rebase_status == GOT_STATUS_CONFLICT)
3694 		return NULL;
3695 	if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3696 		*rebase_status = status;
3697 	return NULL;
3698 }
3699 
3700 static const struct got_error *
3701 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
3702     struct got_reference *branch, struct got_reference *new_base_branch,
3703     struct got_reference *tmp_branch, struct got_repository *repo)
3704 {
3705 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
3706 	return got_worktree_rebase_complete(worktree, fileindex,
3707 	    new_base_branch, tmp_branch, branch, repo);
3708 }
3709 
3710 static const struct got_error *
3711 rebase_commit(struct got_pathlist_head *merged_paths,
3712     struct got_worktree *worktree, struct got_fileindex *fileindex,
3713     struct got_reference *tmp_branch,
3714     struct got_object_id *commit_id, struct got_repository *repo)
3715 {
3716 	const struct got_error *error;
3717 	struct got_commit_object *commit;
3718 	struct got_object_id *new_commit_id;
3719 
3720 	error = got_object_open_as_commit(&commit, repo, commit_id);
3721 	if (error)
3722 		return error;
3723 
3724 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
3725 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
3726 	if (error) {
3727 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
3728 			goto done;
3729 		error = show_rebase_progress(commit, commit_id, NULL);
3730 	} else {
3731 		error = show_rebase_progress(commit, commit_id, new_commit_id);
3732 		free(new_commit_id);
3733 	}
3734 done:
3735 	got_object_commit_close(commit);
3736 	return error;
3737 }
3738 
3739 struct check_path_prefix_arg {
3740 	const char *path_prefix;
3741 	size_t len;
3742 	int errcode;
3743 };
3744 
3745 static const struct got_error *
3746 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
3747     struct got_blob_object *blob2, struct got_object_id *id1,
3748     struct got_object_id *id2, const char *path1, const char *path2,
3749     struct got_repository *repo)
3750 {
3751 	struct check_path_prefix_arg *a = arg;
3752 
3753 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
3754 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
3755 		return got_error(a->errcode);
3756 
3757 	return NULL;
3758 }
3759 
3760 static const struct got_error *
3761 check_path_prefix(struct got_object_id *parent_id,
3762     struct got_object_id *commit_id, const char *path_prefix,
3763     int errcode, struct got_repository *repo)
3764 {
3765 	const struct got_error *err;
3766 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3767 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
3768 	struct check_path_prefix_arg cpp_arg;
3769 
3770 	if (got_path_is_root_dir(path_prefix))
3771 		return NULL;
3772 
3773 	err = got_object_open_as_commit(&commit, repo, commit_id);
3774 	if (err)
3775 		goto done;
3776 
3777 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
3778 	if (err)
3779 		goto done;
3780 
3781 	err = got_object_open_as_tree(&tree1, repo,
3782 	    got_object_commit_get_tree_id(parent_commit));
3783 	if (err)
3784 		goto done;
3785 
3786 	err = got_object_open_as_tree(&tree2, repo,
3787 	    got_object_commit_get_tree_id(commit));
3788 	if (err)
3789 		goto done;
3790 
3791 	cpp_arg.path_prefix = path_prefix;
3792 	while (cpp_arg.path_prefix[0] == '/')
3793 		cpp_arg.path_prefix++;
3794 	cpp_arg.len = strlen(cpp_arg.path_prefix);
3795 	cpp_arg.errcode = errcode;
3796 	err = got_diff_tree(tree1, tree2, "", "", repo,
3797 	    check_path_prefix_in_diff, &cpp_arg, 0);
3798 done:
3799 	if (tree1)
3800 		got_object_tree_close(tree1);
3801 	if (tree2)
3802 		got_object_tree_close(tree2);
3803 	if (commit)
3804 		got_object_commit_close(commit);
3805 	if (parent_commit)
3806 		got_object_commit_close(parent_commit);
3807 	return err;
3808 }
3809 
3810 static const struct got_error *
3811 collect_commits(struct got_object_id_queue *commits,
3812     struct got_object_id *initial_commit_id,
3813     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
3814     const char *path_prefix, int path_prefix_errcode,
3815     struct got_repository *repo)
3816 {
3817 	const struct got_error *err = NULL;
3818 	struct got_commit_graph *graph = NULL;
3819 	struct got_object_id *parent_id = NULL;
3820 	struct got_object_qid *qid;
3821         struct got_object_id *commit_id = initial_commit_id;
3822 
3823 	err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
3824 	if (err)
3825 		return err;
3826 
3827 	err = got_commit_graph_iter_start(graph, iter_start_id, repo);
3828 	if (err)
3829 		goto done;
3830 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
3831 		err = got_commit_graph_iter_next(&parent_id, graph);
3832 		if (err) {
3833 			if (err->code == GOT_ERR_ITER_COMPLETED) {
3834 				err = got_error_msg(GOT_ERR_ANCESTRY,
3835 				    "ran out of commits to rebase before "
3836 				    "youngest common ancestor commit has "
3837 				    "been reached?!?");
3838 				goto done;
3839 			} else if (err->code != GOT_ERR_ITER_NEED_MORE)
3840 				goto done;
3841 			err = got_commit_graph_fetch_commits(graph, 1, repo);
3842 			if (err)
3843 				goto done;
3844 		} else {
3845 			err = check_path_prefix(parent_id, commit_id,
3846 			    path_prefix, path_prefix_errcode, repo);
3847 			if (err)
3848 				goto done;
3849 
3850 			err = got_object_qid_alloc(&qid, commit_id);
3851 			if (err)
3852 				goto done;
3853 			SIMPLEQ_INSERT_HEAD(commits, qid, entry);
3854 			commit_id = parent_id;
3855 		}
3856 	}
3857 done:
3858 	got_commit_graph_close(graph);
3859 	return err;
3860 }
3861 
3862 static const struct got_error *
3863 cmd_rebase(int argc, char *argv[])
3864 {
3865 	const struct got_error *error = NULL;
3866 	struct got_worktree *worktree = NULL;
3867 	struct got_repository *repo = NULL;
3868 	struct got_fileindex *fileindex = NULL;
3869 	char *cwd = NULL;
3870 	struct got_reference *branch = NULL;
3871 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
3872 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
3873 	struct got_object_id *resume_commit_id = NULL;
3874 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
3875 	struct got_commit_object *commit = NULL;
3876 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
3877 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
3878 	struct got_object_id_queue commits;
3879 	struct got_pathlist_head merged_paths;
3880 	const struct got_object_id_queue *parent_ids;
3881 	struct got_object_qid *qid, *pid;
3882 
3883 	SIMPLEQ_INIT(&commits);
3884 	TAILQ_INIT(&merged_paths);
3885 
3886 	while ((ch = getopt(argc, argv, "ac")) != -1) {
3887 		switch (ch) {
3888 		case 'a':
3889 			abort_rebase = 1;
3890 			break;
3891 		case 'c':
3892 			continue_rebase = 1;
3893 			break;
3894 		default:
3895 			usage_rebase();
3896 			/* NOTREACHED */
3897 		}
3898 	}
3899 
3900 	argc -= optind;
3901 	argv += optind;
3902 
3903 #ifndef PROFILE
3904 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3905 	    "unveil", NULL) == -1)
3906 		err(1, "pledge");
3907 #endif
3908 	if (abort_rebase && continue_rebase)
3909 		usage_rebase();
3910 	else if (abort_rebase || continue_rebase) {
3911 		if (argc != 0)
3912 			usage_rebase();
3913 	} else if (argc != 1)
3914 		usage_rebase();
3915 
3916 	cwd = getcwd(NULL, 0);
3917 	if (cwd == NULL) {
3918 		error = got_error_from_errno("getcwd");
3919 		goto done;
3920 	}
3921 	error = got_worktree_open(&worktree, cwd);
3922 	if (error)
3923 		goto done;
3924 
3925 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3926 	if (error != NULL)
3927 		goto done;
3928 
3929 	error = apply_unveil(got_repo_get_path(repo), 0,
3930 	    got_worktree_get_root_path(worktree));
3931 	if (error)
3932 		goto done;
3933 
3934 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3935 	if (error)
3936 		goto done;
3937 
3938 	if (abort_rebase) {
3939 		int did_something;
3940 		if (!rebase_in_progress) {
3941 			error = got_error(GOT_ERR_NOT_REBASING);
3942 			goto done;
3943 		}
3944 		error = got_worktree_rebase_continue(&resume_commit_id,
3945 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
3946 		    worktree, repo);
3947 		if (error)
3948 			goto done;
3949 		printf("Switching work tree to %s\n",
3950 		    got_ref_get_symref_target(new_base_branch));
3951 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
3952 		    new_base_branch, update_progress, &did_something);
3953 		if (error)
3954 			goto done;
3955 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
3956 		goto done; /* nothing else to do */
3957 	}
3958 
3959 	if (continue_rebase) {
3960 		if (!rebase_in_progress) {
3961 			error = got_error(GOT_ERR_NOT_REBASING);
3962 			goto done;
3963 		}
3964 		error = got_worktree_rebase_continue(&resume_commit_id,
3965 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
3966 		    worktree, repo);
3967 		if (error)
3968 			goto done;
3969 
3970 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
3971 		    resume_commit_id, repo);
3972 		if (error)
3973 			goto done;
3974 
3975 		yca_id = got_object_id_dup(resume_commit_id);
3976 		if (yca_id == NULL) {
3977 			error = got_error_from_errno("got_object_id_dup");
3978 			goto done;
3979 		}
3980 	} else {
3981 		error = got_ref_open(&branch, repo, argv[0], 0);
3982 		if (error != NULL)
3983 			goto done;
3984 	}
3985 
3986 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
3987 	if (error)
3988 		goto done;
3989 
3990 	if (!continue_rebase) {
3991 		struct got_object_id *base_commit_id;
3992 
3993 		base_commit_id = got_worktree_get_base_commit_id(worktree);
3994 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
3995 		    base_commit_id, branch_head_commit_id, repo);
3996 		if (error)
3997 			goto done;
3998 		if (yca_id == NULL) {
3999 			error = got_error_msg(GOT_ERR_ANCESTRY,
4000 			    "specified branch shares no common ancestry "
4001 			    "with work tree's branch");
4002 			goto done;
4003 		}
4004 
4005 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
4006 		if (error) {
4007 			if (error->code != GOT_ERR_ANCESTRY)
4008 				goto done;
4009 			error = NULL;
4010 		} else {
4011 			error = got_error_msg(GOT_ERR_SAME_BRANCH,
4012 			    "specified branch resolves to a commit which "
4013 			    "is already contained in work tree's branch");
4014 			goto done;
4015 		}
4016 		error = got_worktree_rebase_prepare(&new_base_branch,
4017 		    &tmp_branch, &fileindex, worktree, branch, repo);
4018 		if (error)
4019 			goto done;
4020 	}
4021 
4022 	commit_id = branch_head_commit_id;
4023 	error = got_object_open_as_commit(&commit, repo, commit_id);
4024 	if (error)
4025 		goto done;
4026 
4027 	parent_ids = got_object_commit_get_parent_ids(commit);
4028 	pid = SIMPLEQ_FIRST(parent_ids);
4029 	error = collect_commits(&commits, commit_id, pid->id,
4030 	    yca_id, got_worktree_get_path_prefix(worktree),
4031 	    GOT_ERR_REBASE_PATH, repo);
4032 	got_object_commit_close(commit);
4033 	commit = NULL;
4034 	if (error)
4035 		goto done;
4036 
4037 	if (SIMPLEQ_EMPTY(&commits)) {
4038 		if (continue_rebase)
4039 			error = rebase_complete(worktree, fileindex,
4040 			    branch, new_base_branch, tmp_branch, repo);
4041 		else
4042 			error = got_error(GOT_ERR_EMPTY_REBASE);
4043 		goto done;
4044 	}
4045 
4046 	pid = NULL;
4047 	SIMPLEQ_FOREACH(qid, &commits, entry) {
4048 		commit_id = qid->id;
4049 		parent_id = pid ? pid->id : yca_id;
4050 		pid = qid;
4051 
4052 		error = got_worktree_rebase_merge_files(&merged_paths,
4053 		    worktree, fileindex, parent_id, commit_id, repo,
4054 		    rebase_progress, &rebase_status, check_cancelled, NULL);
4055 		if (error)
4056 			goto done;
4057 
4058 		if (rebase_status == GOT_STATUS_CONFLICT) {
4059 			got_worktree_rebase_pathlist_free(&merged_paths);
4060 			break;
4061 		}
4062 
4063 		error = rebase_commit(&merged_paths, worktree, fileindex,
4064 		    tmp_branch, commit_id, repo);
4065 		got_worktree_rebase_pathlist_free(&merged_paths);
4066 		if (error)
4067 			goto done;
4068 	}
4069 
4070 	if (rebase_status == GOT_STATUS_CONFLICT) {
4071 		error = got_worktree_rebase_postpone(worktree, fileindex);
4072 		if (error)
4073 			goto done;
4074 		error = got_error_msg(GOT_ERR_CONFLICTS,
4075 		    "conflicts must be resolved before rebasing can continue");
4076 	} else
4077 		error = rebase_complete(worktree, fileindex, branch,
4078 		    new_base_branch, tmp_branch, repo);
4079 done:
4080 	got_object_id_queue_free(&commits);
4081 	free(branch_head_commit_id);
4082 	free(resume_commit_id);
4083 	free(yca_id);
4084 	if (commit)
4085 		got_object_commit_close(commit);
4086 	if (branch)
4087 		got_ref_close(branch);
4088 	if (new_base_branch)
4089 		got_ref_close(new_base_branch);
4090 	if (tmp_branch)
4091 		got_ref_close(tmp_branch);
4092 	if (worktree)
4093 		got_worktree_close(worktree);
4094 	if (repo)
4095 		got_repo_close(repo);
4096 	return error;
4097 }
4098 
4099 __dead static void
4100 usage_histedit(void)
4101 {
4102 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-F path]\n",
4103 	    getprogname());
4104 	exit(1);
4105 }
4106 
4107 #define GOT_HISTEDIT_PICK 'p'
4108 #define GOT_HISTEDIT_EDIT 'e'
4109 #define GOT_HISTEDIT_FOLD 'f'
4110 #define GOT_HISTEDIT_DROP 'd'
4111 #define GOT_HISTEDIT_MESG 'm'
4112 
4113 static struct got_histedit_cmd {
4114 	unsigned char code;
4115 	const char *name;
4116 	const char *desc;
4117 } got_histedit_cmds[] = {
4118 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
4119 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
4120 	{ GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
4121 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
4122 	{ GOT_HISTEDIT_MESG, "mesg",
4123 	    "single-line log message for commit above (open editor if empty)" },
4124 };
4125 
4126 struct got_histedit_list_entry {
4127 	TAILQ_ENTRY(got_histedit_list_entry) entry;
4128 	struct got_object_id *commit_id;
4129 	const struct got_histedit_cmd *cmd;
4130 	char *logmsg;
4131 };
4132 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
4133 
4134 static const struct got_error *
4135 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
4136     FILE *f, struct got_repository *repo)
4137 {
4138 	const struct got_error *err = NULL;
4139 	char *logmsg = NULL, *id_str = NULL;
4140 	struct got_commit_object *commit = NULL;
4141 	size_t n;
4142 
4143 	err = got_object_open_as_commit(&commit, repo, commit_id);
4144 	if (err)
4145 		goto done;
4146 
4147 	err = get_short_logmsg(&logmsg, 34, commit);
4148 	if (err)
4149 		goto done;
4150 
4151 	err = got_object_id_str(&id_str, commit_id);
4152 	if (err)
4153 		goto done;
4154 
4155 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
4156 	if (n < 0)
4157 		err = got_ferror(f, GOT_ERR_IO);
4158 done:
4159 	if (commit)
4160 		got_object_commit_close(commit);
4161 	free(id_str);
4162 	free(logmsg);
4163 	return err;
4164 }
4165 
4166 static const struct got_error *
4167 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
4168     struct got_repository *repo)
4169 {
4170 	const struct got_error *err = NULL;
4171 	struct got_object_qid *qid;
4172 
4173 	if (SIMPLEQ_EMPTY(commits))
4174 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
4175 
4176 	SIMPLEQ_FOREACH(qid, commits, entry) {
4177 		err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
4178 		    f, repo);
4179 		if (err)
4180 			break;
4181 	}
4182 
4183 	return err;
4184 }
4185 
4186 static const struct got_error *
4187 write_cmd_list(FILE *f)
4188 {
4189 	const struct got_error *err = NULL;
4190 	int n, i;
4191 
4192 	n = fprintf(f, "# Available histedit commands:\n");
4193 	if (n < 0)
4194 		return got_ferror(f, GOT_ERR_IO);
4195 
4196 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
4197 		struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
4198 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
4199 		    cmd->desc);
4200 		if (n < 0) {
4201 			err = got_ferror(f, GOT_ERR_IO);
4202 			break;
4203 		}
4204 	}
4205 	n = fprintf(f, "# Commits will be processed in order from top to "
4206 	    "bottom of this file.\n");
4207 	if (n < 0)
4208 		return got_ferror(f, GOT_ERR_IO);
4209 	return err;
4210 }
4211 
4212 static const struct got_error *
4213 histedit_syntax_error(int lineno)
4214 {
4215 	static char msg[42];
4216 	int ret;
4217 
4218 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
4219 	    lineno);
4220 	if (ret == -1 || ret >= sizeof(msg))
4221 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
4222 
4223 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
4224 }
4225 
4226 static const struct got_error *
4227 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
4228     char *logmsg, struct got_repository *repo)
4229 {
4230 	const struct got_error *err;
4231 	struct got_commit_object *folded_commit = NULL;
4232 	char *id_str;
4233 
4234 	err = got_object_id_str(&id_str, hle->commit_id);
4235 	if (err)
4236 		return err;
4237 
4238 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
4239 	if (err)
4240 		goto done;
4241 
4242 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
4243 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
4244 	    got_object_commit_get_logmsg(folded_commit)) == -1) {
4245 		err = got_error_from_errno("asprintf");
4246 		goto done;
4247 	}
4248 done:
4249 	if (folded_commit)
4250 		got_object_commit_close(folded_commit);
4251 	free(id_str);
4252 	return err;
4253 }
4254 
4255 static struct got_histedit_list_entry *
4256 get_folded_commits(struct got_histedit_list_entry *hle)
4257 {
4258 	struct got_histedit_list_entry *prev, *folded = NULL;
4259 
4260 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
4261 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
4262 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
4263 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
4264 			folded = prev;
4265 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
4266 	}
4267 
4268 	return folded;
4269 }
4270 
4271 static const struct got_error *
4272 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
4273     struct got_repository *repo)
4274 {
4275 	char *logmsg_path = NULL, *id_str = NULL;
4276 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
4277 	const struct got_error *err = NULL;
4278 	struct got_commit_object *commit = NULL;
4279 	int fd;
4280 	struct got_histedit_list_entry *folded = NULL;
4281 
4282 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4283 	if (err)
4284 		return err;
4285 
4286 	folded = get_folded_commits(hle);
4287 	if (folded) {
4288 		while (folded != hle) {
4289 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
4290 				folded = TAILQ_NEXT(folded, entry);
4291 				continue;
4292 			}
4293 			err = append_folded_commit_msg(&new_msg, folded,
4294 			    logmsg, repo);
4295 			if (err)
4296 				goto done;
4297 			free(logmsg);
4298 			logmsg = new_msg;
4299 			folded = TAILQ_NEXT(folded, entry);
4300 		}
4301 	}
4302 
4303 	err = got_object_id_str(&id_str, hle->commit_id);
4304 	if (err)
4305 		goto done;
4306 	if (asprintf(&new_msg,
4307 	    "%s\n# original log message of commit %s: %s",
4308 	    logmsg ? logmsg : "", id_str,
4309 	    got_object_commit_get_logmsg(commit)) == -1) {
4310 		err = got_error_from_errno("asprintf");
4311 		goto done;
4312 	}
4313 	free(logmsg);
4314 	logmsg = new_msg;
4315 
4316 	err = got_object_id_str(&id_str, hle->commit_id);
4317 	if (err)
4318 		goto done;
4319 
4320 	err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
4321 	if (err)
4322 		goto done;
4323 
4324 	dprintf(fd, logmsg);
4325 	close(fd);
4326 
4327 	err = get_editor(&editor);
4328 	if (err)
4329 		goto done;
4330 
4331 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
4332 	if (err) {
4333 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
4334 			goto done;
4335 		err = NULL;
4336 		hle->logmsg = strdup(got_object_commit_get_logmsg(commit));
4337 		if (hle->logmsg == NULL)
4338 			err = got_error_from_errno("strdup");
4339 	}
4340 done:
4341 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
4342 		err = got_error_from_errno2("unlink", logmsg_path);
4343 	free(logmsg_path);
4344 	free(logmsg);
4345 	free(editor);
4346 	if (commit)
4347 		got_object_commit_close(commit);
4348 	return err;
4349 }
4350 
4351 static const struct got_error *
4352 histedit_parse_list(struct got_histedit_list *histedit_cmds,
4353     FILE *f, struct got_repository *repo)
4354 {
4355 	const struct got_error *err = NULL;
4356 	char *line = NULL, *p, *end;
4357 	size_t size;
4358 	ssize_t len;
4359 	int lineno = 0, i;
4360 	const struct got_histedit_cmd *cmd;
4361 	struct got_object_id *commit_id = NULL;
4362 	struct got_histedit_list_entry *hle = NULL;
4363 
4364 	for (;;) {
4365 		len = getline(&line, &size, f);
4366 		if (len == -1) {
4367 			const struct got_error *getline_err;
4368 			if (feof(f))
4369 				break;
4370 			getline_err = got_error_from_errno("getline");
4371 			err = got_ferror(f, getline_err->code);
4372 			break;
4373 		}
4374 		lineno++;
4375 		p = line;
4376 		while (isspace((unsigned char)p[0]))
4377 			p++;
4378 		if (p[0] == '#' || p[0] == '\0') {
4379 			free(line);
4380 			line = NULL;
4381 			continue;
4382 		}
4383 		cmd = NULL;
4384 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
4385 			cmd = &got_histedit_cmds[i];
4386 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
4387 			    isspace((unsigned char)p[strlen(cmd->name)])) {
4388 				p += strlen(cmd->name);
4389 				break;
4390 			}
4391 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
4392 				p++;
4393 				break;
4394 			}
4395 		}
4396 		if (i == nitems(got_histedit_cmds)) {
4397 			err = histedit_syntax_error(lineno);
4398 			break;
4399 		}
4400 		while (isspace((unsigned char)p[0]))
4401 			p++;
4402 		if (cmd->code == GOT_HISTEDIT_MESG) {
4403 			if (hle == NULL || hle->logmsg != NULL) {
4404 				err = got_error(GOT_ERR_HISTEDIT_CMD);
4405 				break;
4406 			}
4407 			if (p[0] == '\0') {
4408 				err = histedit_edit_logmsg(hle, repo);
4409 				if (err)
4410 					break;
4411 			} else {
4412 				hle->logmsg = strdup(p);
4413 				if (hle->logmsg == NULL) {
4414 					err = got_error_from_errno("strdup");
4415 					break;
4416 				}
4417 			}
4418 			free(line);
4419 			line = NULL;
4420 			continue;
4421 		} else {
4422 			end = p;
4423 			while (end[0] && !isspace((unsigned char)end[0]))
4424 				end++;
4425 			*end = '\0';
4426 
4427 			err = got_object_resolve_id_str(&commit_id, repo, p);
4428 			if (err) {
4429 				/* override error code */
4430 				err = histedit_syntax_error(lineno);
4431 				break;
4432 			}
4433 		}
4434 		hle = malloc(sizeof(*hle));
4435 		if (hle == NULL) {
4436 			err = got_error_from_errno("malloc");
4437 			break;
4438 		}
4439 		hle->cmd = cmd;
4440 		hle->commit_id = commit_id;
4441 		hle->logmsg = NULL;
4442 		commit_id = NULL;
4443 		free(line);
4444 		line = NULL;
4445 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
4446 	}
4447 
4448 	free(line);
4449 	free(commit_id);
4450 	return err;
4451 }
4452 
4453 static const struct got_error *
4454 histedit_check_script(struct got_histedit_list *histedit_cmds,
4455     struct got_object_id_queue *commits, struct got_repository *repo)
4456 {
4457 	const struct got_error *err = NULL;
4458 	struct got_object_qid *qid;
4459 	struct got_histedit_list_entry *hle;
4460 	static char msg[80];
4461 	char *id_str;
4462 
4463 	if (TAILQ_EMPTY(histedit_cmds))
4464 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
4465 		    "histedit script contains no commands");
4466 
4467 	SIMPLEQ_FOREACH(qid, commits, entry) {
4468 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
4469 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
4470 				break;
4471 		}
4472 		if (hle == NULL) {
4473 			err = got_object_id_str(&id_str, qid->id);
4474 			if (err)
4475 				return err;
4476 			snprintf(msg, sizeof(msg),
4477 			    "commit %s missing from histedit script", id_str);
4478 			free(id_str);
4479 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
4480 		}
4481 	}
4482 
4483 	if (hle->cmd->code == GOT_HISTEDIT_FOLD)
4484 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
4485 		    "last commit in histedit script cannot be folded");
4486 
4487 	return NULL;
4488 }
4489 
4490 static const struct got_error *
4491 histedit_run_editor(struct got_histedit_list *histedit_cmds,
4492     const char *path, struct got_object_id_queue *commits,
4493     struct got_repository *repo)
4494 {
4495 	const struct got_error *err = NULL;
4496 	char *editor;
4497 	FILE *f = NULL;
4498 
4499 	err = get_editor(&editor);
4500 	if (err)
4501 		return err;
4502 
4503 	if (spawn_editor(editor, path) == -1) {
4504 		err = got_error_from_errno("failed spawning editor");
4505 		goto done;
4506 	}
4507 
4508 	f = fopen(path, "r");
4509 	if (f == NULL) {
4510 		err = got_error_from_errno("fopen");
4511 		goto done;
4512 	}
4513 	err = histedit_parse_list(histedit_cmds, f, repo);
4514 	if (err)
4515 		goto done;
4516 
4517 	err = histedit_check_script(histedit_cmds, commits, repo);
4518 done:
4519 	if (f && fclose(f) != 0 && err == NULL)
4520 		err = got_error_from_errno("fclose");
4521 	free(editor);
4522 	return err;
4523 }
4524 
4525 static const struct got_error *
4526 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
4527     struct got_object_id_queue *, const char *, struct got_repository *);
4528 
4529 static const struct got_error *
4530 histedit_edit_script(struct got_histedit_list *histedit_cmds,
4531     struct got_object_id_queue *commits, struct got_repository *repo)
4532 {
4533 	const struct got_error *err;
4534 	FILE *f = NULL;
4535 	char *path = NULL;
4536 
4537 	err = got_opentemp_named(&path, &f, "got-histedit");
4538 	if (err)
4539 		return err;
4540 
4541 	err = write_cmd_list(f);
4542 	if (err)
4543 		goto done;
4544 
4545 	err = histedit_write_commit_list(commits, f, repo);
4546 	if (err)
4547 		goto done;
4548 
4549 	if (fclose(f) != 0) {
4550 		err = got_error_from_errno("fclose");
4551 		goto done;
4552 	}
4553 	f = NULL;
4554 
4555 	err = histedit_run_editor(histedit_cmds, path, commits, repo);
4556 	if (err) {
4557 		if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4558 		    err->code != GOT_ERR_HISTEDIT_CMD)
4559 			goto done;
4560 		err = histedit_edit_list_retry(histedit_cmds, err,
4561 		    commits, path, repo);
4562 	}
4563 done:
4564 	if (f && fclose(f) != 0 && err == NULL)
4565 		err = got_error_from_errno("fclose");
4566 	if (path && unlink(path) != 0 && err == NULL)
4567 		err = got_error_from_errno2("unlink", path);
4568 	free(path);
4569 	return err;
4570 }
4571 
4572 static const struct got_error *
4573 histedit_save_list(struct got_histedit_list *histedit_cmds,
4574     struct got_worktree *worktree, struct got_repository *repo)
4575 {
4576 	const struct got_error *err = NULL;
4577 	char *path = NULL;
4578 	FILE *f = NULL;
4579 	struct got_histedit_list_entry *hle;
4580 	struct got_commit_object *commit = NULL;
4581 
4582 	err = got_worktree_get_histedit_script_path(&path, worktree);
4583 	if (err)
4584 		return err;
4585 
4586 	f = fopen(path, "w");
4587 	if (f == NULL) {
4588 		err = got_error_from_errno2("fopen", path);
4589 		goto done;
4590 	}
4591 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
4592 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
4593 		    repo);
4594 		if (err)
4595 			break;
4596 
4597 		if (hle->logmsg) {
4598 			int n = fprintf(f, "%c %s\n",
4599 			    GOT_HISTEDIT_MESG, hle->logmsg);
4600 			if (n < 0) {
4601 				err = got_ferror(f, GOT_ERR_IO);
4602 				break;
4603 			}
4604 		}
4605 	}
4606 done:
4607 	if (f && fclose(f) != 0 && err == NULL)
4608 		err = got_error_from_errno("fclose");
4609 	free(path);
4610 	if (commit)
4611 		got_object_commit_close(commit);
4612 	return err;
4613 }
4614 
4615 void
4616 histedit_free_list(struct got_histedit_list *histedit_cmds)
4617 {
4618 	struct got_histedit_list_entry *hle;
4619 
4620 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
4621 		TAILQ_REMOVE(histedit_cmds, hle, entry);
4622 		free(hle);
4623 	}
4624 }
4625 
4626 static const struct got_error *
4627 histedit_load_list(struct got_histedit_list *histedit_cmds,
4628     const char *path, struct got_repository *repo)
4629 {
4630 	const struct got_error *err = NULL;
4631 	FILE *f = NULL;
4632 
4633 	f = fopen(path, "r");
4634 	if (f == NULL) {
4635 		err = got_error_from_errno2("fopen", path);
4636 		goto done;
4637 	}
4638 
4639 	err = histedit_parse_list(histedit_cmds, f, repo);
4640 done:
4641 	if (f && fclose(f) != 0 && err == NULL)
4642 		err = got_error_from_errno("fclose");
4643 	return err;
4644 }
4645 
4646 static const struct got_error *
4647 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
4648     const struct got_error *edit_err, struct got_object_id_queue *commits,
4649     const char *path, struct got_repository *repo)
4650 {
4651 	const struct got_error *err = NULL, *prev_err = edit_err;
4652 	int resp = ' ';
4653 
4654 	while (resp != 'c' && resp != 'r' && resp != 'a') {
4655 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
4656 		    "or (a)bort: ", getprogname(), prev_err->msg);
4657 		resp = getchar();
4658 		if (resp == 'c') {
4659 			histedit_free_list(histedit_cmds);
4660 			err = histedit_run_editor(histedit_cmds, path, commits,
4661 			    repo);
4662 			if (err) {
4663 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4664 				    err->code != GOT_ERR_HISTEDIT_CMD)
4665 					break;
4666 				prev_err = err;
4667 				resp = ' ';
4668 				continue;
4669 			}
4670 			break;
4671 		} else if (resp == 'r') {
4672 			histedit_free_list(histedit_cmds);
4673 			err = histedit_edit_script(histedit_cmds,
4674 			    commits, repo);
4675 			if (err) {
4676 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4677 				    err->code != GOT_ERR_HISTEDIT_CMD)
4678 					break;
4679 				prev_err = err;
4680 				resp = ' ';
4681 				continue;
4682 			}
4683 			break;
4684 		} else if (resp == 'a') {
4685 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
4686 			break;
4687 		} else
4688 			printf("invalid response '%c'\n", resp);
4689 	}
4690 
4691 	return err;
4692 }
4693 
4694 static const struct got_error *
4695 histedit_complete(struct got_worktree *worktree,
4696     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
4697     struct got_reference *branch, struct got_repository *repo)
4698 {
4699 	printf("Switching work tree to %s\n",
4700 	    got_ref_get_symref_target(branch));
4701 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
4702 	    branch, repo);
4703 }
4704 
4705 static const struct got_error *
4706 show_histedit_progress(struct got_commit_object *commit,
4707     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
4708 {
4709 	const struct got_error *err;
4710 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4711 
4712 	err = got_object_id_str(&old_id_str, hle->commit_id);
4713 	if (err)
4714 		goto done;
4715 
4716 	if (new_id) {
4717 		err = got_object_id_str(&new_id_str, new_id);
4718 		if (err)
4719 			goto done;
4720 	}
4721 
4722 	old_id_str[12] = '\0';
4723 	if (new_id_str)
4724 		new_id_str[12] = '\0';
4725 
4726 	if (hle->logmsg) {
4727 		logmsg = strdup(hle->logmsg);
4728 		if (logmsg == NULL) {
4729 			err = got_error_from_errno("strdup");
4730 			goto done;
4731 		}
4732 		trim_logmsg(logmsg, 42);
4733 	} else {
4734 		err = get_short_logmsg(&logmsg, 42, commit);
4735 		if (err)
4736 			goto done;
4737 	}
4738 
4739 	switch (hle->cmd->code) {
4740 	case GOT_HISTEDIT_PICK:
4741 	case GOT_HISTEDIT_EDIT:
4742 		printf("%s -> %s: %s\n", old_id_str,
4743 		    new_id_str ? new_id_str : "no-op change", logmsg);
4744 		break;
4745 	case GOT_HISTEDIT_DROP:
4746 	case GOT_HISTEDIT_FOLD:
4747 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
4748 		    logmsg);
4749 		break;
4750 	default:
4751 		break;
4752 	}
4753 
4754 done:
4755 	free(old_id_str);
4756 	free(new_id_str);
4757 	return err;
4758 }
4759 
4760 static const struct got_error *
4761 histedit_commit(struct got_pathlist_head *merged_paths,
4762     struct got_worktree *worktree, struct got_fileindex *fileindex,
4763     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
4764     struct got_repository *repo)
4765 {
4766 	const struct got_error *err;
4767 	struct got_commit_object *commit;
4768 	struct got_object_id *new_commit_id;
4769 
4770 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
4771 	    && hle->logmsg == NULL) {
4772 		err = histedit_edit_logmsg(hle, repo);
4773 		if (err)
4774 			return err;
4775 	}
4776 
4777 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4778 	if (err)
4779 		return err;
4780 
4781 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
4782 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
4783 	    hle->logmsg, repo);
4784 	if (err) {
4785 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
4786 			goto done;
4787 		err = show_histedit_progress(commit, hle, NULL);
4788 	} else {
4789 		err = show_histedit_progress(commit, hle, new_commit_id);
4790 		free(new_commit_id);
4791 	}
4792 done:
4793 	got_object_commit_close(commit);
4794 	return err;
4795 }
4796 
4797 static const struct got_error *
4798 histedit_skip_commit(struct got_histedit_list_entry *hle,
4799     struct got_worktree *worktree, struct got_repository *repo)
4800 {
4801 	const struct got_error *error;
4802 	struct got_commit_object *commit;
4803 
4804 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
4805 	    repo);
4806 	if (error)
4807 		return error;
4808 
4809 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
4810 	if (error)
4811 		return error;
4812 
4813 	error = show_histedit_progress(commit, hle, NULL);
4814 	got_object_commit_close(commit);
4815 	return error;
4816 }
4817 
4818 static const struct got_error *
4819 cmd_histedit(int argc, char *argv[])
4820 {
4821 	const struct got_error *error = NULL;
4822 	struct got_worktree *worktree = NULL;
4823 	struct got_fileindex *fileindex = NULL;
4824 	struct got_repository *repo = NULL;
4825 	char *cwd = NULL;
4826 	struct got_reference *branch = NULL;
4827 	struct got_reference *tmp_branch = NULL;
4828 	struct got_object_id *resume_commit_id = NULL;
4829 	struct got_object_id *base_commit_id = NULL;
4830 	struct got_object_id *head_commit_id = NULL;
4831 	struct got_commit_object *commit = NULL;
4832 	int ch, rebase_in_progress = 0, did_something;
4833 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
4834 	const char *edit_script_path = NULL;
4835 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4836 	struct got_object_id_queue commits;
4837 	struct got_pathlist_head merged_paths;
4838 	const struct got_object_id_queue *parent_ids;
4839 	struct got_object_qid *pid;
4840 	struct got_histedit_list histedit_cmds;
4841 	struct got_histedit_list_entry *hle;
4842 
4843 	SIMPLEQ_INIT(&commits);
4844 	TAILQ_INIT(&histedit_cmds);
4845 	TAILQ_INIT(&merged_paths);
4846 
4847 	while ((ch = getopt(argc, argv, "acF:")) != -1) {
4848 		switch (ch) {
4849 		case 'a':
4850 			abort_edit = 1;
4851 			break;
4852 		case 'c':
4853 			continue_edit = 1;
4854 			break;
4855 		case 'F':
4856 			edit_script_path = optarg;
4857 			break;
4858 		default:
4859 			usage_histedit();
4860 			/* NOTREACHED */
4861 		}
4862 	}
4863 
4864 	argc -= optind;
4865 	argv += optind;
4866 
4867 #ifndef PROFILE
4868 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4869 	    "unveil", NULL) == -1)
4870 		err(1, "pledge");
4871 #endif
4872 	if (abort_edit && continue_edit)
4873 		usage_histedit();
4874 	if (argc != 0)
4875 		usage_histedit();
4876 
4877 	/*
4878 	 * This command cannot apply unveil(2) in all cases because the
4879 	 * user may choose to run an editor to edit the histedit script
4880 	 * and to edit individual commit log messages.
4881 	 * unveil(2) traverses exec(2); if an editor is used we have to
4882 	 * apply unveil after edit script and log messages have been written.
4883 	 * XXX TODO: Make use of unveil(2) where possible.
4884 	 */
4885 
4886 	cwd = getcwd(NULL, 0);
4887 	if (cwd == NULL) {
4888 		error = got_error_from_errno("getcwd");
4889 		goto done;
4890 	}
4891 	error = got_worktree_open(&worktree, cwd);
4892 	if (error)
4893 		goto done;
4894 
4895 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4896 	if (error != NULL)
4897 		goto done;
4898 
4899 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4900 	if (error)
4901 		goto done;
4902 	if (rebase_in_progress) {
4903 		error = got_error(GOT_ERR_REBASING);
4904 		goto done;
4905 	}
4906 
4907 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
4908 	if (error)
4909 		goto done;
4910 
4911 	if (edit_in_progress && abort_edit) {
4912 		error = got_worktree_histedit_continue(&resume_commit_id,
4913 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
4914 		    worktree, repo);
4915 		if (error)
4916 			goto done;
4917 		printf("Switching work tree to %s\n",
4918 		    got_ref_get_symref_target(branch));
4919 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
4920 		    branch, base_commit_id, update_progress, &did_something);
4921 		if (error)
4922 			goto done;
4923 		printf("Histedit of %s aborted\n",
4924 		    got_ref_get_symref_target(branch));
4925 		goto done; /* nothing else to do */
4926 	} else if (abort_edit) {
4927 		error = got_error(GOT_ERR_NOT_HISTEDIT);
4928 		goto done;
4929 	}
4930 
4931 	if (continue_edit) {
4932 		char *path;
4933 
4934 		if (!edit_in_progress) {
4935 			error = got_error(GOT_ERR_NOT_HISTEDIT);
4936 			goto done;
4937 		}
4938 
4939 		error = got_worktree_get_histedit_script_path(&path, worktree);
4940 		if (error)
4941 			goto done;
4942 
4943 		error = histedit_load_list(&histedit_cmds, path, repo);
4944 		free(path);
4945 		if (error)
4946 			goto done;
4947 
4948 		error = got_worktree_histedit_continue(&resume_commit_id,
4949 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
4950 		    worktree, repo);
4951 		if (error)
4952 			goto done;
4953 
4954 		error = got_ref_resolve(&head_commit_id, repo, branch);
4955 		if (error)
4956 			goto done;
4957 
4958 		error = got_object_open_as_commit(&commit, repo,
4959 		    head_commit_id);
4960 		if (error)
4961 			goto done;
4962 		parent_ids = got_object_commit_get_parent_ids(commit);
4963 		pid = SIMPLEQ_FIRST(parent_ids);
4964 		if (pid == NULL) {
4965 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
4966 			goto done;
4967 		}
4968 		error = collect_commits(&commits, head_commit_id, pid->id,
4969 		    base_commit_id, got_worktree_get_path_prefix(worktree),
4970 		    GOT_ERR_HISTEDIT_PATH, repo);
4971 		got_object_commit_close(commit);
4972 		commit = NULL;
4973 		if (error)
4974 			goto done;
4975 	} else {
4976 		if (edit_in_progress) {
4977 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
4978 			goto done;
4979 		}
4980 
4981 		error = got_ref_open(&branch, repo,
4982 		    got_worktree_get_head_ref_name(worktree), 0);
4983 		if (error != NULL)
4984 			goto done;
4985 
4986 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
4987 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
4988 			    "will not edit commit history of a branch outside "
4989 			    "the \"refs/heads/\" reference namespace");
4990 			goto done;
4991 		}
4992 
4993 		error = got_ref_resolve(&head_commit_id, repo, branch);
4994 		got_ref_close(branch);
4995 		branch = NULL;
4996 		if (error)
4997 			goto done;
4998 
4999 		error = got_object_open_as_commit(&commit, repo,
5000 		    head_commit_id);
5001 		if (error)
5002 			goto done;
5003 		parent_ids = got_object_commit_get_parent_ids(commit);
5004 		pid = SIMPLEQ_FIRST(parent_ids);
5005 		if (pid == NULL) {
5006 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5007 			goto done;
5008 		}
5009 		error = collect_commits(&commits, head_commit_id, pid->id,
5010 		    got_worktree_get_base_commit_id(worktree),
5011 		    got_worktree_get_path_prefix(worktree),
5012 		    GOT_ERR_HISTEDIT_PATH, repo);
5013 		got_object_commit_close(commit);
5014 		commit = NULL;
5015 		if (error)
5016 			goto done;
5017 
5018 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
5019 		    &base_commit_id, &fileindex, worktree, repo);
5020 		if (error)
5021 			goto done;
5022 
5023 		if (edit_script_path) {
5024 			error = histedit_load_list(&histedit_cmds,
5025 			    edit_script_path, repo);
5026 			if (error) {
5027 				got_worktree_histedit_abort(worktree, fileindex,
5028 				    repo, branch, base_commit_id,
5029 				    update_progress, &did_something);
5030 				goto done;
5031 			}
5032 		} else {
5033 			error = histedit_edit_script(&histedit_cmds, &commits,
5034 			    repo);
5035 			if (error) {
5036 				got_worktree_histedit_abort(worktree, fileindex,
5037 				    repo, branch, base_commit_id,
5038 				    update_progress, &did_something);
5039 				goto done;
5040 			}
5041 
5042 		}
5043 
5044 		error = histedit_save_list(&histedit_cmds, worktree,
5045 		    repo);
5046 		if (error) {
5047 			got_worktree_histedit_abort(worktree, fileindex,
5048 			    repo, branch, base_commit_id,
5049 			    update_progress, &did_something);
5050 			goto done;
5051 		}
5052 
5053 	}
5054 
5055 	 error = histedit_check_script(&histedit_cmds, &commits, repo);
5056 	 if (error)
5057 		goto done;
5058 
5059 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
5060 		if (resume_commit_id) {
5061 			if (got_object_id_cmp(hle->commit_id,
5062 			    resume_commit_id) != 0)
5063 				continue;
5064 
5065 			resume_commit_id = NULL;
5066 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
5067 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
5068 				error = histedit_skip_commit(hle, worktree,
5069 				   repo);
5070 			} else {
5071 				error = histedit_commit(NULL, worktree,
5072 				    fileindex, tmp_branch, hle, repo);
5073 			}
5074 			if (error)
5075 				goto done;
5076 			continue;
5077 		}
5078 
5079 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
5080 			error = histedit_skip_commit(hle, worktree, repo);
5081 			if (error)
5082 				goto done;
5083 			continue;
5084 		}
5085 
5086 		error = got_object_open_as_commit(&commit, repo,
5087 		    hle->commit_id);
5088 		if (error)
5089 			goto done;
5090 		parent_ids = got_object_commit_get_parent_ids(commit);
5091 		pid = SIMPLEQ_FIRST(parent_ids);
5092 
5093 		error = got_worktree_histedit_merge_files(&merged_paths,
5094 		    worktree, fileindex, pid->id, hle->commit_id, repo,
5095 		    rebase_progress, &rebase_status, check_cancelled, NULL);
5096 		if (error)
5097 			goto done;
5098 		got_object_commit_close(commit);
5099 		commit = NULL;
5100 
5101 		if (rebase_status == GOT_STATUS_CONFLICT) {
5102 			got_worktree_rebase_pathlist_free(&merged_paths);
5103 			break;
5104 		}
5105 
5106 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
5107 			char *id_str;
5108 			error = got_object_id_str(&id_str, hle->commit_id);
5109 			if (error)
5110 				goto done;
5111 			printf("Stopping histedit for amending commit %s\n",
5112 			    id_str);
5113 			free(id_str);
5114 			got_worktree_rebase_pathlist_free(&merged_paths);
5115 			error = got_worktree_histedit_postpone(worktree,
5116 			    fileindex);
5117 			goto done;
5118 		}
5119 
5120 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
5121 			error = histedit_skip_commit(hle, worktree, repo);
5122 			if (error)
5123 				goto done;
5124 			continue;
5125 		}
5126 
5127 		error = histedit_commit(&merged_paths, worktree, fileindex,
5128 		    tmp_branch, hle, repo);
5129 		got_worktree_rebase_pathlist_free(&merged_paths);
5130 		if (error)
5131 			goto done;
5132 	}
5133 
5134 	if (rebase_status == GOT_STATUS_CONFLICT) {
5135 		error = got_worktree_histedit_postpone(worktree, fileindex);
5136 		if (error)
5137 			goto done;
5138 		error = got_error_msg(GOT_ERR_CONFLICTS,
5139 		    "conflicts must be resolved before rebasing can continue");
5140 	} else
5141 		error = histedit_complete(worktree, fileindex, tmp_branch,
5142 		    branch, repo);
5143 done:
5144 	got_object_id_queue_free(&commits);
5145 	histedit_free_list(&histedit_cmds);
5146 	free(head_commit_id);
5147 	free(base_commit_id);
5148 	free(resume_commit_id);
5149 	if (commit)
5150 		got_object_commit_close(commit);
5151 	if (branch)
5152 		got_ref_close(branch);
5153 	if (tmp_branch)
5154 		got_ref_close(tmp_branch);
5155 	if (worktree)
5156 		got_worktree_close(worktree);
5157 	if (repo)
5158 		got_repo_close(repo);
5159 	return error;
5160 }
5161 
5162 __dead static void
5163 usage_stage(void)
5164 {
5165 	fprintf(stderr, "usage: %s stage file-path ...\n",
5166 	    getprogname());
5167 	exit(1);
5168 }
5169 
5170 static const struct got_error *
5171 cmd_stage(int argc, char *argv[])
5172 {
5173 	const struct got_error *error = NULL;
5174 	struct got_repository *repo = NULL;
5175 	struct got_worktree *worktree = NULL;
5176 	char *cwd = NULL;
5177 	struct got_pathlist_head paths;
5178 	struct got_pathlist_entry *pe;
5179 	const char *worktree_path;
5180 	int ch, x;
5181 
5182 	TAILQ_INIT(&paths);
5183 
5184 	while ((ch = getopt(argc, argv, "")) != -1) {
5185 		switch (ch) {
5186 		default:
5187 			usage_stage();
5188 			/* NOTREACHED */
5189 		}
5190 	}
5191 
5192 	argc -= optind;
5193 	argv += optind;
5194 
5195 #ifndef PROFILE
5196 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5197 	    "unveil", NULL) == -1)
5198 		err(1, "pledge");
5199 #endif
5200 	if (argc < 1)
5201 		usage_stage();
5202 
5203 	cwd = getcwd(NULL, 0);
5204 	if (cwd == NULL) {
5205 		error = got_error_from_errno("getcwd");
5206 		goto done;
5207 	}
5208 
5209 	error = got_worktree_open(&worktree, cwd);
5210 	if (error)
5211 		goto done;
5212 
5213 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5214 	if (error != NULL)
5215 		goto done;
5216 
5217 	error = apply_unveil(got_repo_get_path(repo), 1,
5218 	    got_worktree_get_root_path(worktree));
5219 	if (error)
5220 		goto done;
5221 
5222 	worktree_path = got_worktree_get_root_path(worktree);
5223 	for (x = 0; x < argc; x++) {
5224 		char *path = realpath(argv[x], NULL);
5225 		if (path == NULL) {
5226 			if (errno != ENOENT) {
5227 				error = got_error_from_errno2("realpath",
5228 				    argv[x]);
5229 				goto done;
5230 			}
5231 			if (got_path_is_child(argv[x], worktree_path,
5232 			    strlen(worktree_path))) {
5233 				path = strdup(argv[x]);
5234 				if (path == NULL) {
5235 					error = got_error_from_errno("strdup");
5236 					goto done;
5237 				}
5238 
5239 			} else if (asprintf(&path, "%s/%s",
5240 			    got_worktree_get_root_path(worktree),
5241 			    argv[x]) == -1) {
5242 				error = got_error_from_errno("asprintf");
5243 				goto done;
5244 			}
5245 		}
5246 
5247 		got_path_strip_trailing_slashes(path);
5248 		error = got_pathlist_insert(&pe, &paths, path, NULL);
5249 		if (error) {
5250 			free(path);
5251 			goto done;
5252 		}
5253 	}
5254 	error = got_worktree_stage(worktree, &paths, print_status, NULL, repo);
5255 done:
5256 	if (repo)
5257 		got_repo_close(repo);
5258 	if (worktree)
5259 		got_worktree_close(worktree);
5260 	TAILQ_FOREACH(pe, &paths, entry)
5261 		free((char *)pe->path);
5262 	got_pathlist_free(&paths);
5263 	free(cwd);
5264 	return error;
5265 }