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