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