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