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