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