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 [-c commit] [-r repository] [-l] | -d name | "
3279 	    "[name]\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     struct got_object_id *base_commit_id)
3419 {
3420 	const struct got_error *err = NULL;
3421 	struct got_reference *ref = NULL;
3422 	char *base_refname = NULL, *refname = NULL;
3423 
3424 	/*
3425 	 * Don't let the user create a branch named '-'.
3426 	 * While technically a valid reference name, this case is usually
3427 	 * an unintended typo.
3428 	 */
3429 	if (branch_name[0] == '-' && branch_name[1] == '\0')
3430 		return got_error_path(branch_name, GOT_ERR_BAD_REF_NAME);
3431 
3432 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3433 		 err = got_error_from_errno("asprintf");
3434 		 goto done;
3435 	}
3436 
3437 	err = got_ref_open(&ref, repo, refname, 0);
3438 	if (err == NULL) {
3439 		err = got_error(GOT_ERR_BRANCH_EXISTS);
3440 		goto done;
3441 	} else if (err->code != GOT_ERR_NOT_REF)
3442 		goto done;
3443 
3444 	err = got_ref_alloc(&ref, refname, base_commit_id);
3445 	if (err)
3446 		goto done;
3447 
3448 	err = got_ref_write(ref, repo);
3449 done:
3450 	if (ref)
3451 		got_ref_close(ref);
3452 	free(base_refname);
3453 	free(refname);
3454 	return err;
3455 }
3456 
3457 static const struct got_error *
3458 cmd_branch(int argc, char *argv[])
3459 {
3460 	const struct got_error *error = NULL;
3461 	struct got_repository *repo = NULL;
3462 	struct got_worktree *worktree = NULL;
3463 	char *cwd = NULL, *repo_path = NULL;
3464 	int ch, do_list = 0, do_show = 0;
3465 	const char *delref = NULL, *commit_id_arg = NULL;
3466 
3467 	while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3468 		switch (ch) {
3469 		case 'c':
3470 			commit_id_arg = optarg;
3471 			break;
3472 		case 'd':
3473 			delref = optarg;
3474 			break;
3475 		case 'r':
3476 			repo_path = realpath(optarg, NULL);
3477 			if (repo_path == NULL)
3478 				return got_error_from_errno2("realpath",
3479 				    optarg);
3480 			got_path_strip_trailing_slashes(repo_path);
3481 			break;
3482 		case 'l':
3483 			do_list = 1;
3484 			break;
3485 		default:
3486 			usage_branch();
3487 			/* NOTREACHED */
3488 		}
3489 	}
3490 
3491 	if (do_list && delref)
3492 		errx(1, "-l and -d options are mutually exclusive\n");
3493 
3494 	argc -= optind;
3495 	argv += optind;
3496 
3497 	if (!do_list && !delref && argc == 0)
3498 		do_show = 1;
3499 
3500 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
3501 		errx(1, "-c option can only be used when creating a branch");
3502 
3503 	if (do_list || delref) {
3504 		if (argc > 0)
3505 			usage_branch();
3506 	} else if (!do_show && argc != 1)
3507 		usage_branch();
3508 
3509 #ifndef PROFILE
3510 	if (do_list || do_show) {
3511 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3512 		    NULL) == -1)
3513 			err(1, "pledge");
3514 	} else {
3515 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3516 		    "sendfd unveil", NULL) == -1)
3517 			err(1, "pledge");
3518 	}
3519 #endif
3520 	cwd = getcwd(NULL, 0);
3521 	if (cwd == NULL) {
3522 		error = got_error_from_errno("getcwd");
3523 		goto done;
3524 	}
3525 
3526 	if (repo_path == NULL) {
3527 		error = got_worktree_open(&worktree, cwd);
3528 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
3529 			goto done;
3530 		else
3531 			error = NULL;
3532 		if (worktree) {
3533 			repo_path =
3534 			    strdup(got_worktree_get_repo_path(worktree));
3535 			if (repo_path == NULL)
3536 				error = got_error_from_errno("strdup");
3537 			if (error)
3538 				goto done;
3539 		} else {
3540 			repo_path = strdup(cwd);
3541 			if (repo_path == NULL) {
3542 				error = got_error_from_errno("strdup");
3543 				goto done;
3544 			}
3545 		}
3546 	}
3547 
3548 	error = got_repo_open(&repo, repo_path, NULL);
3549 	if (error != NULL)
3550 		goto done;
3551 
3552 	error = apply_unveil(got_repo_get_path(repo), do_list,
3553 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
3554 	if (error)
3555 		goto done;
3556 
3557 	if (do_show)
3558 		error = show_current_branch(repo, worktree);
3559 	else if (do_list)
3560 		error = list_branches(repo, worktree);
3561 	else if (delref)
3562 		error = delete_branch(repo, worktree, delref);
3563 	else {
3564 		struct got_object_id *commit_id;
3565 		if (commit_id_arg == NULL)
3566 			commit_id_arg = worktree ?
3567 			    got_worktree_get_head_ref_name(worktree) :
3568 			    GOT_REF_HEAD;
3569 		error = resolve_commit_arg(&commit_id, commit_id_arg, repo);
3570 		if (error)
3571 			goto done;
3572 		error = add_branch(repo, argv[0], commit_id);
3573 		free(commit_id);
3574 	}
3575 done:
3576 	if (repo)
3577 		got_repo_close(repo);
3578 	if (worktree)
3579 		got_worktree_close(worktree);
3580 	free(cwd);
3581 	free(repo_path);
3582 	return error;
3583 }
3584 
3585 
3586 __dead static void
3587 usage_tag(void)
3588 {
3589 	fprintf(stderr,
3590 	    "usage: %s tag [-r repository] | -l | "
3591 	        "[-m message] name [commit]\n", getprogname());
3592 	exit(1);
3593 }
3594 
3595 #if 0
3596 static const struct got_error *
3597 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3598 {
3599 	const struct got_error *err = NULL;
3600 	struct got_reflist_entry *re, *se, *new;
3601 	struct got_object_id *re_id, *se_id;
3602 	struct got_tag_object *re_tag, *se_tag;
3603 	time_t re_time, se_time;
3604 
3605 	SIMPLEQ_FOREACH(re, tags, entry) {
3606 		se = SIMPLEQ_FIRST(sorted);
3607 		if (se == NULL) {
3608 			err = got_reflist_entry_dup(&new, re);
3609 			if (err)
3610 				return err;
3611 			SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3612 			continue;
3613 		} else {
3614 			err = got_ref_resolve(&re_id, repo, re->ref);
3615 			if (err)
3616 				break;
3617 			err = got_object_open_as_tag(&re_tag, repo, re_id);
3618 			free(re_id);
3619 			if (err)
3620 				break;
3621 			re_time = got_object_tag_get_tagger_time(re_tag);
3622 			got_object_tag_close(re_tag);
3623 		}
3624 
3625 		while (se) {
3626 			err = got_ref_resolve(&se_id, repo, re->ref);
3627 			if (err)
3628 				break;
3629 			err = got_object_open_as_tag(&se_tag, repo, se_id);
3630 			free(se_id);
3631 			if (err)
3632 				break;
3633 			se_time = got_object_tag_get_tagger_time(se_tag);
3634 			got_object_tag_close(se_tag);
3635 
3636 			if (se_time > re_time) {
3637 				err = got_reflist_entry_dup(&new, re);
3638 				if (err)
3639 					return err;
3640 				SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3641 				break;
3642 			}
3643 			se = SIMPLEQ_NEXT(se, entry);
3644 			continue;
3645 		}
3646 	}
3647 done:
3648 	return err;
3649 }
3650 #endif
3651 
3652 static const struct got_error *
3653 cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3654     struct got_reference *ref2)
3655 {
3656 	const struct got_error *err = NULL;
3657 	struct got_repository *repo = arg;
3658 	struct got_object_id *id1, *id2 = NULL;
3659 	struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3660 	time_t time1, time2;
3661 
3662 	*cmp = 0;
3663 
3664 	err = got_ref_resolve(&id1, repo, ref1);
3665 	if (err)
3666 		return err;
3667 	err = got_object_open_as_tag(&tag1, repo, id1);
3668 	if (err)
3669 		goto done;
3670 
3671 	err = got_ref_resolve(&id2, repo, ref2);
3672 	if (err)
3673 		goto done;
3674 	err = got_object_open_as_tag(&tag2, repo, id2);
3675 	if (err)
3676 		goto done;
3677 
3678 	time1 = got_object_tag_get_tagger_time(tag1);
3679 	time2 = got_object_tag_get_tagger_time(tag2);
3680 
3681 	/* Put latest tags first. */
3682 	if (time1 < time2)
3683 		*cmp = 1;
3684 	else if (time1 > time2)
3685 		*cmp = -1;
3686 	else
3687 		err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3688 done:
3689 	free(id1);
3690 	free(id2);
3691 	if (tag1)
3692 		got_object_tag_close(tag1);
3693 	if (tag2)
3694 		got_object_tag_close(tag2);
3695 	return err;
3696 }
3697 
3698 static const struct got_error *
3699 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3700 {
3701 	static const struct got_error *err = NULL;
3702 	struct got_reflist_head refs;
3703 	struct got_reflist_entry *re;
3704 
3705 	SIMPLEQ_INIT(&refs);
3706 
3707 	err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3708 	if (err)
3709 		return err;
3710 
3711 	SIMPLEQ_FOREACH(re, &refs, entry) {
3712 		const char *refname;
3713 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3714 		char datebuf[26];
3715 		time_t tagger_time;
3716 		struct got_object_id *id;
3717 		struct got_tag_object *tag;
3718 
3719 		refname = got_ref_get_name(re->ref);
3720 		if (strncmp(refname, "refs/tags/", 10) != 0)
3721 			continue;
3722 		refname += 10;
3723 		refstr = got_ref_to_str(re->ref);
3724 		if (refstr == NULL) {
3725 			err = got_error_from_errno("got_ref_to_str");
3726 			break;
3727 		}
3728 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3729 		free(refstr);
3730 
3731 		err = got_ref_resolve(&id, repo, re->ref);
3732 		if (err)
3733 			break;
3734 		err = got_object_open_as_tag(&tag, repo, id);
3735 		free(id);
3736 		if (err)
3737 			break;
3738 		printf("from: %s\n", got_object_tag_get_tagger(tag));
3739 		tagger_time = got_object_tag_get_tagger_time(tag);
3740 		datestr = get_datestr(&tagger_time, datebuf);
3741 		if (datestr)
3742 			printf("date: %s UTC\n", datestr);
3743 		err = got_object_id_str(&id_str,
3744 		    got_object_tag_get_object_id(tag));
3745 		if (err)
3746 			break;
3747 		switch (got_object_tag_get_object_type(tag)) {
3748 		case GOT_OBJ_TYPE_BLOB:
3749 			printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3750 			break;
3751 		case GOT_OBJ_TYPE_TREE:
3752 			printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3753 			break;
3754 		case GOT_OBJ_TYPE_COMMIT:
3755 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3756 			break;
3757 		case GOT_OBJ_TYPE_TAG:
3758 			printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3759 			break;
3760 		default:
3761 			break;
3762 		}
3763 		free(id_str);
3764 		tagmsg0 = strdup(got_object_tag_get_message(tag));
3765 		got_object_tag_close(tag);
3766 		if (tagmsg0 == NULL) {
3767 			err = got_error_from_errno("strdup");
3768 			break;
3769 		}
3770 
3771 		tagmsg = tagmsg0;
3772 		do {
3773 			line = strsep(&tagmsg, "\n");
3774 			if (line)
3775 				printf(" %s\n", line);
3776 		} while (line);
3777 		free(tagmsg0);
3778 	}
3779 
3780 	got_ref_list_free(&refs);
3781 	return NULL;
3782 }
3783 
3784 static const struct got_error *
3785 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3786     const char *tag_name, const char *repo_path)
3787 {
3788 	const struct got_error *err = NULL;
3789 	char *template = NULL, *initial_content = NULL;
3790 	char *editor = NULL;
3791 	int fd = -1;
3792 
3793 	if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3794 		err = got_error_from_errno("asprintf");
3795 		goto done;
3796 	}
3797 
3798 	if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3799 	    commit_id_str, tag_name) == -1) {
3800 		err = got_error_from_errno("asprintf");
3801 		goto done;
3802 	}
3803 
3804 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3805 	if (err)
3806 		goto done;
3807 
3808 	dprintf(fd, initial_content);
3809 	close(fd);
3810 
3811 	err = get_editor(&editor);
3812 	if (err)
3813 		goto done;
3814 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3815 done:
3816 	free(initial_content);
3817 	free(template);
3818 	free(editor);
3819 
3820 	/* Editor is done; we can now apply unveil(2) */
3821 	if (err == NULL) {
3822 		err = apply_unveil(repo_path, 0, NULL);
3823 		if (err) {
3824 			free(*tagmsg);
3825 			*tagmsg = NULL;
3826 		}
3827 	}
3828 	return err;
3829 }
3830 
3831 static const struct got_error *
3832 add_tag(struct got_repository *repo, const char *tag_name,
3833     const char *commit_arg, const char *tagmsg_arg)
3834 {
3835 	const struct got_error *err = NULL;
3836 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
3837 	char *label = NULL, *commit_id_str = NULL;
3838 	struct got_reference *ref = NULL;
3839 	char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3840 	char *tagmsg_path = NULL, *tag_id_str = NULL;
3841 	int preserve_tagmsg = 0;
3842 
3843 	/*
3844 	 * Don't let the user create a tag named '-'.
3845 	 * While technically a valid reference name, this case is usually
3846 	 * an unintended typo.
3847 	 */
3848 	if (tag_name[0] == '-' && tag_name[1] == '\0')
3849 		return got_error_path(tag_name, GOT_ERR_BAD_REF_NAME);
3850 
3851 	err = get_author(&tagger, repo);
3852 	if (err)
3853 		return err;
3854 
3855 	err = match_object_id(&commit_id, &label, commit_arg,
3856 	    GOT_OBJ_TYPE_COMMIT, 1, repo);
3857 	if (err)
3858 		goto done;
3859 
3860 	err = got_object_id_str(&commit_id_str, commit_id);
3861 	if (err)
3862 		goto done;
3863 
3864 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
3865 		refname = strdup(tag_name);
3866 		if (refname == NULL) {
3867 			 err = got_error_from_errno("strdup");
3868 			 goto done;
3869 		}
3870 		tag_name += 10;
3871 	} else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3872 		 err = got_error_from_errno("asprintf");
3873 		 goto done;
3874 	}
3875 
3876 	err = got_ref_open(&ref, repo, refname, 0);
3877 	if (err == NULL) {
3878 		err = got_error(GOT_ERR_TAG_EXISTS);
3879 		goto done;
3880 	} else if (err->code != GOT_ERR_NOT_REF)
3881 		goto done;
3882 
3883 	if (tagmsg_arg == NULL) {
3884 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3885 		    tag_name, got_repo_get_path(repo));
3886 		if (err) {
3887 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3888 			    tagmsg_path != NULL)
3889 				preserve_tagmsg = 1;
3890 			goto done;
3891 		}
3892 	}
3893 
3894 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
3895 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3896 	if (err) {
3897 		if (tagmsg_path)
3898 			preserve_tagmsg = 1;
3899 		goto done;
3900 	}
3901 
3902 	err = got_ref_alloc(&ref, refname, tag_id);
3903 	if (err) {
3904 		if (tagmsg_path)
3905 			preserve_tagmsg = 1;
3906 		goto done;
3907 	}
3908 
3909 	err = got_ref_write(ref, repo);
3910 	if (err) {
3911 		if (tagmsg_path)
3912 			preserve_tagmsg = 1;
3913 		goto done;
3914 	}
3915 
3916 	err = got_object_id_str(&tag_id_str, tag_id);
3917 	if (err) {
3918 		if (tagmsg_path)
3919 			preserve_tagmsg = 1;
3920 		goto done;
3921 	}
3922 	printf("Created tag %s\n", tag_id_str);
3923 done:
3924 	if (preserve_tagmsg) {
3925 		fprintf(stderr, "%s: tag message preserved in %s\n",
3926 		    getprogname(), tagmsg_path);
3927 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3928 		err = got_error_from_errno2("unlink", tagmsg_path);
3929 	free(tag_id_str);
3930 	if (ref)
3931 		got_ref_close(ref);
3932 	free(commit_id);
3933 	free(commit_id_str);
3934 	free(refname);
3935 	free(tagmsg);
3936 	free(tagmsg_path);
3937 	free(tagger);
3938 	return err;
3939 }
3940 
3941 static const struct got_error *
3942 cmd_tag(int argc, char *argv[])
3943 {
3944 	const struct got_error *error = NULL;
3945 	struct got_repository *repo = NULL;
3946 	struct got_worktree *worktree = NULL;
3947 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3948 	char *gitconfig_path = NULL;
3949 	const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3950 	int ch, do_list = 0;
3951 
3952 	while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3953 		switch (ch) {
3954 		case 'm':
3955 			tagmsg = optarg;
3956 			break;
3957 		case 'r':
3958 			repo_path = realpath(optarg, NULL);
3959 			if (repo_path == NULL)
3960 				return got_error_from_errno2("realpath",
3961 				    optarg);
3962 			got_path_strip_trailing_slashes(repo_path);
3963 			break;
3964 		case 'l':
3965 			do_list = 1;
3966 			break;
3967 		default:
3968 			usage_tag();
3969 			/* NOTREACHED */
3970 		}
3971 	}
3972 
3973 	argc -= optind;
3974 	argv += optind;
3975 
3976 	if (do_list) {
3977 		if (tagmsg)
3978 			errx(1, "-l and -m options are mutually exclusive\n");
3979 		if (argc > 0)
3980 			usage_tag();
3981 	} else if (argc < 1 || argc > 2)
3982 		usage_tag();
3983 	else if (argc > 1)
3984 		commit_id_arg = argv[1];
3985 	tag_name = argv[0];
3986 
3987 #ifndef PROFILE
3988 	if (do_list) {
3989 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3990 		    NULL) == -1)
3991 			err(1, "pledge");
3992 	} else {
3993 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3994 		    "sendfd unveil", NULL) == -1)
3995 			err(1, "pledge");
3996 	}
3997 #endif
3998 	cwd = getcwd(NULL, 0);
3999 	if (cwd == NULL) {
4000 		error = got_error_from_errno("getcwd");
4001 		goto done;
4002 	}
4003 
4004 	if (repo_path == NULL) {
4005 		error = got_worktree_open(&worktree, cwd);
4006 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4007 			goto done;
4008 		else
4009 			error = NULL;
4010 		if (worktree) {
4011 			repo_path =
4012 			    strdup(got_worktree_get_repo_path(worktree));
4013 			if (repo_path == NULL)
4014 				error = got_error_from_errno("strdup");
4015 			if (error)
4016 				goto done;
4017 		} else {
4018 			repo_path = strdup(cwd);
4019 			if (repo_path == NULL) {
4020 				error = got_error_from_errno("strdup");
4021 				goto done;
4022 			}
4023 		}
4024 	}
4025 
4026 	if (do_list) {
4027 		error = got_repo_open(&repo, repo_path, NULL);
4028 		if (error != NULL)
4029 			goto done;
4030 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4031 		if (error)
4032 			goto done;
4033 		error = list_tags(repo, worktree);
4034 	} else {
4035 		error = get_gitconfig_path(&gitconfig_path);
4036 		if (error)
4037 			goto done;
4038 		error = got_repo_open(&repo, repo_path, gitconfig_path);
4039 		if (error != NULL)
4040 			goto done;
4041 
4042 		if (tagmsg) {
4043 			error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4044 			if (error)
4045 				goto done;
4046 		}
4047 
4048 		if (commit_id_arg == NULL) {
4049 			struct got_reference *head_ref;
4050 			struct got_object_id *commit_id;
4051 			error = got_ref_open(&head_ref, repo,
4052 			    worktree ? got_worktree_get_head_ref_name(worktree)
4053 			    : GOT_REF_HEAD, 0);
4054 			if (error)
4055 				goto done;
4056 			error = got_ref_resolve(&commit_id, repo, head_ref);
4057 			got_ref_close(head_ref);
4058 			if (error)
4059 				goto done;
4060 			error = got_object_id_str(&commit_id_str, commit_id);
4061 			free(commit_id);
4062 			if (error)
4063 				goto done;
4064 		}
4065 
4066 		error = add_tag(repo, tag_name,
4067 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4068 	}
4069 done:
4070 	if (repo)
4071 		got_repo_close(repo);
4072 	if (worktree)
4073 		got_worktree_close(worktree);
4074 	free(cwd);
4075 	free(repo_path);
4076 	free(gitconfig_path);
4077 	free(commit_id_str);
4078 	return error;
4079 }
4080 
4081 __dead static void
4082 usage_add(void)
4083 {
4084 	fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
4085 	exit(1);
4086 }
4087 
4088 static const struct got_error *
4089 cmd_add(int argc, char *argv[])
4090 {
4091 	const struct got_error *error = NULL;
4092 	struct got_repository *repo = NULL;
4093 	struct got_worktree *worktree = NULL;
4094 	char *cwd = NULL;
4095 	struct got_pathlist_head paths;
4096 	struct got_pathlist_entry *pe;
4097 	int ch;
4098 
4099 	TAILQ_INIT(&paths);
4100 
4101 	while ((ch = getopt(argc, argv, "")) != -1) {
4102 		switch (ch) {
4103 		default:
4104 			usage_add();
4105 			/* NOTREACHED */
4106 		}
4107 	}
4108 
4109 	argc -= optind;
4110 	argv += optind;
4111 
4112 #ifndef PROFILE
4113 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4114 	    NULL) == -1)
4115 		err(1, "pledge");
4116 #endif
4117 	if (argc < 1)
4118 		usage_add();
4119 
4120 	cwd = getcwd(NULL, 0);
4121 	if (cwd == NULL) {
4122 		error = got_error_from_errno("getcwd");
4123 		goto done;
4124 	}
4125 
4126 	error = got_worktree_open(&worktree, cwd);
4127 	if (error)
4128 		goto done;
4129 
4130 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4131 	    NULL);
4132 	if (error != NULL)
4133 		goto done;
4134 
4135 	error = apply_unveil(got_repo_get_path(repo), 1,
4136 	    got_worktree_get_root_path(worktree));
4137 	if (error)
4138 		goto done;
4139 
4140 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4141 	if (error)
4142 		goto done;
4143 
4144 	error = got_worktree_schedule_add(worktree, &paths, print_status,
4145 	    NULL, repo);
4146 done:
4147 	if (repo)
4148 		got_repo_close(repo);
4149 	if (worktree)
4150 		got_worktree_close(worktree);
4151 	TAILQ_FOREACH(pe, &paths, entry)
4152 		free((char *)pe->path);
4153 	got_pathlist_free(&paths);
4154 	free(cwd);
4155 	return error;
4156 }
4157 
4158 __dead static void
4159 usage_remove(void)
4160 {
4161 	fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4162 	exit(1);
4163 }
4164 
4165 static const struct got_error *
4166 print_remove_status(void *arg, unsigned char status,
4167     unsigned char staged_status, const char *path,
4168     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4169     struct got_object_id *commit_id)
4170 {
4171 	if (status == GOT_STATUS_NONEXISTENT)
4172 		return NULL;
4173 	if (status == staged_status && (status == GOT_STATUS_DELETE))
4174 		status = GOT_STATUS_NO_CHANGE;
4175 	printf("%c%c %s\n", status, staged_status, path);
4176 	return NULL;
4177 }
4178 
4179 static const struct got_error *
4180 cmd_remove(int argc, char *argv[])
4181 {
4182 	const struct got_error *error = NULL;
4183 	struct got_worktree *worktree = NULL;
4184 	struct got_repository *repo = NULL;
4185 	char *cwd = NULL;
4186 	struct got_pathlist_head paths;
4187 	struct got_pathlist_entry *pe;
4188 	int ch, delete_local_mods = 0;
4189 
4190 	TAILQ_INIT(&paths);
4191 
4192 	while ((ch = getopt(argc, argv, "f")) != -1) {
4193 		switch (ch) {
4194 		case 'f':
4195 			delete_local_mods = 1;
4196 			break;
4197 		default:
4198 			usage_add();
4199 			/* NOTREACHED */
4200 		}
4201 	}
4202 
4203 	argc -= optind;
4204 	argv += optind;
4205 
4206 #ifndef PROFILE
4207 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4208 	    NULL) == -1)
4209 		err(1, "pledge");
4210 #endif
4211 	if (argc < 1)
4212 		usage_remove();
4213 
4214 	cwd = getcwd(NULL, 0);
4215 	if (cwd == NULL) {
4216 		error = got_error_from_errno("getcwd");
4217 		goto done;
4218 	}
4219 	error = got_worktree_open(&worktree, cwd);
4220 	if (error)
4221 		goto done;
4222 
4223 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4224 	    NULL);
4225 	if (error)
4226 		goto done;
4227 
4228 	error = apply_unveil(got_repo_get_path(repo), 1,
4229 	    got_worktree_get_root_path(worktree));
4230 	if (error)
4231 		goto done;
4232 
4233 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4234 	if (error)
4235 		goto done;
4236 
4237 	error = got_worktree_schedule_delete(worktree, &paths,
4238 	    delete_local_mods, print_remove_status, NULL, repo);
4239 	if (error)
4240 		goto done;
4241 done:
4242 	if (repo)
4243 		got_repo_close(repo);
4244 	if (worktree)
4245 		got_worktree_close(worktree);
4246 	TAILQ_FOREACH(pe, &paths, entry)
4247 		free((char *)pe->path);
4248 	got_pathlist_free(&paths);
4249 	free(cwd);
4250 	return error;
4251 }
4252 
4253 __dead static void
4254 usage_revert(void)
4255 {
4256 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4257 	    "path ...\n", getprogname());
4258 	exit(1);
4259 }
4260 
4261 static const struct got_error *
4262 revert_progress(void *arg, unsigned char status, const char *path)
4263 {
4264 	while (path[0] == '/')
4265 		path++;
4266 	printf("%c  %s\n", status, path);
4267 	return NULL;
4268 }
4269 
4270 struct choose_patch_arg {
4271 	FILE *patch_script_file;
4272 	const char *action;
4273 };
4274 
4275 static const struct got_error *
4276 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4277     int nchanges, const char *action)
4278 {
4279 	char *line = NULL;
4280 	size_t linesize = 0;
4281 	ssize_t linelen;
4282 
4283 	switch (status) {
4284 	case GOT_STATUS_ADD:
4285 		printf("A  %s\n%s this addition? [y/n] ", path, action);
4286 		break;
4287 	case GOT_STATUS_DELETE:
4288 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
4289 		break;
4290 	case GOT_STATUS_MODIFY:
4291 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
4292 			return got_error_from_errno("fseek");
4293 		printf(GOT_COMMIT_SEP_STR);
4294 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4295 			printf("%s", line);
4296 		if (ferror(patch_file))
4297 			return got_error_from_errno("getline");
4298 		printf(GOT_COMMIT_SEP_STR);
4299 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
4300 		    path, n, nchanges, action);
4301 		break;
4302 	default:
4303 		return got_error_path(path, GOT_ERR_FILE_STATUS);
4304 	}
4305 
4306 	return NULL;
4307 }
4308 
4309 static const struct got_error *
4310 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4311     FILE *patch_file, int n, int nchanges)
4312 {
4313 	const struct got_error *err = NULL;
4314 	char *line = NULL;
4315 	size_t linesize = 0;
4316 	ssize_t linelen;
4317 	int resp = ' ';
4318 	struct choose_patch_arg *a = arg;
4319 
4320 	*choice = GOT_PATCH_CHOICE_NONE;
4321 
4322 	if (a->patch_script_file) {
4323 		char *nl;
4324 		err = show_change(status, path, patch_file, n, nchanges,
4325 		    a->action);
4326 		if (err)
4327 			return err;
4328 		linelen = getline(&line, &linesize, a->patch_script_file);
4329 		if (linelen == -1) {
4330 			if (ferror(a->patch_script_file))
4331 				return got_error_from_errno("getline");
4332 			return NULL;
4333 		}
4334 		nl = strchr(line, '\n');
4335 		if (nl)
4336 			*nl = '\0';
4337 		if (strcmp(line, "y") == 0) {
4338 			*choice = GOT_PATCH_CHOICE_YES;
4339 			printf("y\n");
4340 		} else if (strcmp(line, "n") == 0) {
4341 			*choice = GOT_PATCH_CHOICE_NO;
4342 			printf("n\n");
4343 		} else if (strcmp(line, "q") == 0 &&
4344 		    status == GOT_STATUS_MODIFY) {
4345 			*choice = GOT_PATCH_CHOICE_QUIT;
4346 			printf("q\n");
4347 		} else
4348 			printf("invalid response '%s'\n", line);
4349 		free(line);
4350 		return NULL;
4351 	}
4352 
4353 	while (resp != 'y' && resp != 'n' && resp != 'q') {
4354 		err = show_change(status, path, patch_file, n, nchanges,
4355 		    a->action);
4356 		if (err)
4357 			return err;
4358 		resp = getchar();
4359 		if (resp == '\n')
4360 			resp = getchar();
4361 		if (status == GOT_STATUS_MODIFY) {
4362 			if (resp != 'y' && resp != 'n' && resp != 'q') {
4363 				printf("invalid response '%c'\n", resp);
4364 				resp = ' ';
4365 			}
4366 		} else if (resp != 'y' && resp != 'n') {
4367 				printf("invalid response '%c'\n", resp);
4368 				resp = ' ';
4369 		}
4370 	}
4371 
4372 	if (resp == 'y')
4373 		*choice = GOT_PATCH_CHOICE_YES;
4374 	else if (resp == 'n')
4375 		*choice = GOT_PATCH_CHOICE_NO;
4376 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4377 		*choice = GOT_PATCH_CHOICE_QUIT;
4378 
4379 	return NULL;
4380 }
4381 
4382 
4383 static const struct got_error *
4384 cmd_revert(int argc, char *argv[])
4385 {
4386 	const struct got_error *error = NULL;
4387 	struct got_worktree *worktree = NULL;
4388 	struct got_repository *repo = NULL;
4389 	char *cwd = NULL, *path = NULL;
4390 	struct got_pathlist_head paths;
4391 	struct got_pathlist_entry *pe;
4392 	int ch, can_recurse = 0, pflag = 0;
4393 	FILE *patch_script_file = NULL;
4394 	const char *patch_script_path = NULL;
4395 	struct choose_patch_arg cpa;
4396 
4397 	TAILQ_INIT(&paths);
4398 
4399 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4400 		switch (ch) {
4401 		case 'p':
4402 			pflag = 1;
4403 			break;
4404 		case 'F':
4405 			patch_script_path = optarg;
4406 			break;
4407 		case 'R':
4408 			can_recurse = 1;
4409 			break;
4410 		default:
4411 			usage_revert();
4412 			/* NOTREACHED */
4413 		}
4414 	}
4415 
4416 	argc -= optind;
4417 	argv += optind;
4418 
4419 #ifndef PROFILE
4420 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4421 	    "unveil", NULL) == -1)
4422 		err(1, "pledge");
4423 #endif
4424 	if (argc < 1)
4425 		usage_revert();
4426 	if (patch_script_path && !pflag)
4427 		errx(1, "-F option can only be used together with -p option");
4428 
4429 	cwd = getcwd(NULL, 0);
4430 	if (cwd == NULL) {
4431 		error = got_error_from_errno("getcwd");
4432 		goto done;
4433 	}
4434 	error = got_worktree_open(&worktree, cwd);
4435 	if (error)
4436 		goto done;
4437 
4438 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4439 	    NULL);
4440 	if (error != NULL)
4441 		goto done;
4442 
4443 	if (patch_script_path) {
4444 		patch_script_file = fopen(patch_script_path, "r");
4445 		if (patch_script_file == NULL) {
4446 			error = got_error_from_errno2("fopen",
4447 			    patch_script_path);
4448 			goto done;
4449 		}
4450 	}
4451 	error = apply_unveil(got_repo_get_path(repo), 1,
4452 	    got_worktree_get_root_path(worktree));
4453 	if (error)
4454 		goto done;
4455 
4456 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4457 	if (error)
4458 		goto done;
4459 
4460 	if (!can_recurse) {
4461 		char *ondisk_path;
4462 		struct stat sb;
4463 		TAILQ_FOREACH(pe, &paths, entry) {
4464 			if (asprintf(&ondisk_path, "%s/%s",
4465 			    got_worktree_get_root_path(worktree),
4466 			       pe->path) == -1) {
4467 				error = got_error_from_errno("asprintf");
4468 				goto done;
4469 			}
4470 			if (lstat(ondisk_path, &sb) == -1) {
4471 				if (errno == ENOENT) {
4472 					free(ondisk_path);
4473 					continue;
4474 				}
4475 				error = got_error_from_errno2("lstat",
4476 				    ondisk_path);
4477 				free(ondisk_path);
4478 				goto done;
4479 			}
4480 			free(ondisk_path);
4481 			if (S_ISDIR(sb.st_mode)) {
4482 				error = got_error_msg(GOT_ERR_BAD_PATH,
4483 				    "reverting directories requires -R option");
4484 				goto done;
4485 			}
4486 		}
4487 	}
4488 
4489 	cpa.patch_script_file = patch_script_file;
4490 	cpa.action = "revert";
4491 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4492 	    pflag ? choose_patch : NULL, &cpa, repo);
4493 	if (error)
4494 		goto done;
4495 done:
4496 	if (patch_script_file && fclose(patch_script_file) == EOF &&
4497 	    error == NULL)
4498 		error = got_error_from_errno2("fclose", patch_script_path);
4499 	if (repo)
4500 		got_repo_close(repo);
4501 	if (worktree)
4502 		got_worktree_close(worktree);
4503 	free(path);
4504 	free(cwd);
4505 	return error;
4506 }
4507 
4508 __dead static void
4509 usage_commit(void)
4510 {
4511 	fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4512 	    getprogname());
4513 	exit(1);
4514 }
4515 
4516 struct collect_commit_logmsg_arg {
4517 	const char *cmdline_log;
4518 	const char *editor;
4519 	const char *worktree_path;
4520 	const char *branch_name;
4521 	const char *repo_path;
4522 	char *logmsg_path;
4523 
4524 };
4525 
4526 static const struct got_error *
4527 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4528     void *arg)
4529 {
4530 	char *initial_content = NULL;
4531 	struct got_pathlist_entry *pe;
4532 	const struct got_error *err = NULL;
4533 	char *template = NULL;
4534 	struct collect_commit_logmsg_arg *a = arg;
4535 	int fd;
4536 	size_t len;
4537 
4538 	/* if a message was specified on the command line, just use it */
4539 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4540 		len = strlen(a->cmdline_log) + 1;
4541 		*logmsg = malloc(len + 1);
4542 		if (*logmsg == NULL)
4543 			return got_error_from_errno("malloc");
4544 		strlcpy(*logmsg, a->cmdline_log, len);
4545 		return NULL;
4546 	}
4547 
4548 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4549 		return got_error_from_errno("asprintf");
4550 
4551 	if (asprintf(&initial_content,
4552 	    "\n# changes to be committed on branch %s:\n",
4553 	    a->branch_name) == -1)
4554 		return got_error_from_errno("asprintf");
4555 
4556 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4557 	if (err)
4558 		goto done;
4559 
4560 	dprintf(fd, initial_content);
4561 
4562 	TAILQ_FOREACH(pe, commitable_paths, entry) {
4563 		struct got_commitable *ct = pe->data;
4564 		dprintf(fd, "#  %c  %s\n",
4565 		    got_commitable_get_status(ct),
4566 		    got_commitable_get_path(ct));
4567 	}
4568 	close(fd);
4569 
4570 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4571 done:
4572 	free(initial_content);
4573 	free(template);
4574 
4575 	/* Editor is done; we can now apply unveil(2) */
4576 	if (err == NULL) {
4577 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
4578 		if (err) {
4579 			free(*logmsg);
4580 			*logmsg = NULL;
4581 		}
4582 	}
4583 	return err;
4584 }
4585 
4586 static const struct got_error *
4587 cmd_commit(int argc, char *argv[])
4588 {
4589 	const struct got_error *error = NULL;
4590 	struct got_worktree *worktree = NULL;
4591 	struct got_repository *repo = NULL;
4592 	char *cwd = NULL, *id_str = NULL;
4593 	struct got_object_id *id = NULL;
4594 	const char *logmsg = NULL;
4595 	struct collect_commit_logmsg_arg cl_arg;
4596 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4597 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4598 	struct got_pathlist_head paths;
4599 
4600 	TAILQ_INIT(&paths);
4601 	cl_arg.logmsg_path = NULL;
4602 
4603 	while ((ch = getopt(argc, argv, "m:")) != -1) {
4604 		switch (ch) {
4605 		case 'm':
4606 			logmsg = optarg;
4607 			break;
4608 		default:
4609 			usage_commit();
4610 			/* NOTREACHED */
4611 		}
4612 	}
4613 
4614 	argc -= optind;
4615 	argv += optind;
4616 
4617 #ifndef PROFILE
4618 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4619 	    "unveil", NULL) == -1)
4620 		err(1, "pledge");
4621 #endif
4622 	cwd = getcwd(NULL, 0);
4623 	if (cwd == NULL) {
4624 		error = got_error_from_errno("getcwd");
4625 		goto done;
4626 	}
4627 	error = got_worktree_open(&worktree, cwd);
4628 	if (error)
4629 		goto done;
4630 
4631 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4632 	if (error)
4633 		goto done;
4634 	if (rebase_in_progress) {
4635 		error = got_error(GOT_ERR_REBASING);
4636 		goto done;
4637 	}
4638 
4639 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
4640 	    worktree);
4641 	if (error)
4642 		goto done;
4643 
4644 	error = get_gitconfig_path(&gitconfig_path);
4645 	if (error)
4646 		goto done;
4647 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4648 	    gitconfig_path);
4649 	if (error != NULL)
4650 		goto done;
4651 
4652 	error = get_author(&author, repo);
4653 	if (error)
4654 		return error;
4655 
4656 	/*
4657 	 * unveil(2) traverses exec(2); if an editor is used we have
4658 	 * to apply unveil after the log message has been written.
4659 	 */
4660 	if (logmsg == NULL || strlen(logmsg) == 0)
4661 		error = get_editor(&editor);
4662 	else
4663 		error = apply_unveil(got_repo_get_path(repo), 0,
4664 		    got_worktree_get_root_path(worktree));
4665 	if (error)
4666 		goto done;
4667 
4668 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4669 	if (error)
4670 		goto done;
4671 
4672 	cl_arg.editor = editor;
4673 	cl_arg.cmdline_log = logmsg;
4674 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4675 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4676 	if (!histedit_in_progress) {
4677 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4678 			error = got_error(GOT_ERR_COMMIT_BRANCH);
4679 			goto done;
4680 		}
4681 		cl_arg.branch_name += 11;
4682 	}
4683 	cl_arg.repo_path = got_repo_get_path(repo);
4684 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4685 	    collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4686 	if (error) {
4687 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4688 		    cl_arg.logmsg_path != NULL)
4689 			preserve_logmsg = 1;
4690 		goto done;
4691 	}
4692 
4693 	error = got_object_id_str(&id_str, id);
4694 	if (error)
4695 		goto done;
4696 	printf("Created commit %s\n", id_str);
4697 done:
4698 	if (preserve_logmsg) {
4699 		fprintf(stderr, "%s: log message preserved in %s\n",
4700 		    getprogname(), cl_arg.logmsg_path);
4701 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4702 	    error == NULL)
4703 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4704 	free(cl_arg.logmsg_path);
4705 	if (repo)
4706 		got_repo_close(repo);
4707 	if (worktree)
4708 		got_worktree_close(worktree);
4709 	free(cwd);
4710 	free(id_str);
4711 	free(gitconfig_path);
4712 	free(editor);
4713 	free(author);
4714 	return error;
4715 }
4716 
4717 __dead static void
4718 usage_cherrypick(void)
4719 {
4720 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4721 	exit(1);
4722 }
4723 
4724 static const struct got_error *
4725 cmd_cherrypick(int argc, char *argv[])
4726 {
4727 	const struct got_error *error = NULL;
4728 	struct got_worktree *worktree = NULL;
4729 	struct got_repository *repo = NULL;
4730 	char *cwd = NULL, *commit_id_str = NULL;
4731 	struct got_object_id *commit_id = NULL;
4732 	struct got_commit_object *commit = NULL;
4733 	struct got_object_qid *pid;
4734 	struct got_reference *head_ref = NULL;
4735 	int ch, did_something = 0;
4736 
4737 	while ((ch = getopt(argc, argv, "")) != -1) {
4738 		switch (ch) {
4739 		default:
4740 			usage_cherrypick();
4741 			/* NOTREACHED */
4742 		}
4743 	}
4744 
4745 	argc -= optind;
4746 	argv += optind;
4747 
4748 #ifndef PROFILE
4749 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4750 	    "unveil", NULL) == -1)
4751 		err(1, "pledge");
4752 #endif
4753 	if (argc != 1)
4754 		usage_cherrypick();
4755 
4756 	cwd = getcwd(NULL, 0);
4757 	if (cwd == NULL) {
4758 		error = got_error_from_errno("getcwd");
4759 		goto done;
4760 	}
4761 	error = got_worktree_open(&worktree, cwd);
4762 	if (error)
4763 		goto done;
4764 
4765 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4766 	    NULL);
4767 	if (error != NULL)
4768 		goto done;
4769 
4770 	error = apply_unveil(got_repo_get_path(repo), 0,
4771 	    got_worktree_get_root_path(worktree));
4772 	if (error)
4773 		goto done;
4774 
4775 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4776 	    GOT_OBJ_TYPE_COMMIT, repo);
4777 	if (error != NULL) {
4778 		struct got_reference *ref;
4779 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4780 			goto done;
4781 		error = got_ref_open(&ref, repo, argv[0], 0);
4782 		if (error != NULL)
4783 			goto done;
4784 		error = got_ref_resolve(&commit_id, repo, ref);
4785 		got_ref_close(ref);
4786 		if (error != NULL)
4787 			goto done;
4788 	}
4789 	error = got_object_id_str(&commit_id_str, commit_id);
4790 	if (error)
4791 		goto done;
4792 
4793 	error = got_ref_open(&head_ref, repo,
4794 	    got_worktree_get_head_ref_name(worktree), 0);
4795 	if (error != NULL)
4796 		goto done;
4797 
4798 	error = check_same_branch(commit_id, head_ref, NULL, repo);
4799 	if (error) {
4800 		if (error->code != GOT_ERR_ANCESTRY)
4801 			goto done;
4802 		error = NULL;
4803 	} else {
4804 		error = got_error(GOT_ERR_SAME_BRANCH);
4805 		goto done;
4806 	}
4807 
4808 	error = got_object_open_as_commit(&commit, repo, commit_id);
4809 	if (error)
4810 		goto done;
4811 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4812 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4813 	    commit_id, repo, update_progress, &did_something, check_cancelled,
4814 	    NULL);
4815 	if (error != NULL)
4816 		goto done;
4817 
4818 	if (did_something)
4819 		printf("Merged commit %s\n", commit_id_str);
4820 done:
4821 	if (commit)
4822 		got_object_commit_close(commit);
4823 	free(commit_id_str);
4824 	if (head_ref)
4825 		got_ref_close(head_ref);
4826 	if (worktree)
4827 		got_worktree_close(worktree);
4828 	if (repo)
4829 		got_repo_close(repo);
4830 	return error;
4831 }
4832 
4833 __dead static void
4834 usage_backout(void)
4835 {
4836 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4837 	exit(1);
4838 }
4839 
4840 static const struct got_error *
4841 cmd_backout(int argc, char *argv[])
4842 {
4843 	const struct got_error *error = NULL;
4844 	struct got_worktree *worktree = NULL;
4845 	struct got_repository *repo = NULL;
4846 	char *cwd = NULL, *commit_id_str = NULL;
4847 	struct got_object_id *commit_id = NULL;
4848 	struct got_commit_object *commit = NULL;
4849 	struct got_object_qid *pid;
4850 	struct got_reference *head_ref = NULL;
4851 	int ch, did_something = 0;
4852 
4853 	while ((ch = getopt(argc, argv, "")) != -1) {
4854 		switch (ch) {
4855 		default:
4856 			usage_backout();
4857 			/* NOTREACHED */
4858 		}
4859 	}
4860 
4861 	argc -= optind;
4862 	argv += optind;
4863 
4864 #ifndef PROFILE
4865 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4866 	    "unveil", NULL) == -1)
4867 		err(1, "pledge");
4868 #endif
4869 	if (argc != 1)
4870 		usage_backout();
4871 
4872 	cwd = getcwd(NULL, 0);
4873 	if (cwd == NULL) {
4874 		error = got_error_from_errno("getcwd");
4875 		goto done;
4876 	}
4877 	error = got_worktree_open(&worktree, cwd);
4878 	if (error)
4879 		goto done;
4880 
4881 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4882 	    NULL);
4883 	if (error != NULL)
4884 		goto done;
4885 
4886 	error = apply_unveil(got_repo_get_path(repo), 0,
4887 	    got_worktree_get_root_path(worktree));
4888 	if (error)
4889 		goto done;
4890 
4891 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4892 	    GOT_OBJ_TYPE_COMMIT, repo);
4893 	if (error != NULL) {
4894 		struct got_reference *ref;
4895 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4896 			goto done;
4897 		error = got_ref_open(&ref, repo, argv[0], 0);
4898 		if (error != NULL)
4899 			goto done;
4900 		error = got_ref_resolve(&commit_id, repo, ref);
4901 		got_ref_close(ref);
4902 		if (error != NULL)
4903 			goto done;
4904 	}
4905 	error = got_object_id_str(&commit_id_str, commit_id);
4906 	if (error)
4907 		goto done;
4908 
4909 	error = got_ref_open(&head_ref, repo,
4910 	    got_worktree_get_head_ref_name(worktree), 0);
4911 	if (error != NULL)
4912 		goto done;
4913 
4914 	error = check_same_branch(commit_id, head_ref, NULL, repo);
4915 	if (error)
4916 		goto done;
4917 
4918 	error = got_object_open_as_commit(&commit, repo, commit_id);
4919 	if (error)
4920 		goto done;
4921 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4922 	if (pid == NULL) {
4923 		error = got_error(GOT_ERR_ROOT_COMMIT);
4924 		goto done;
4925 	}
4926 
4927 	error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4928 	    update_progress, &did_something, check_cancelled, NULL);
4929 	if (error != NULL)
4930 		goto done;
4931 
4932 	if (did_something)
4933 		printf("Backed out commit %s\n", commit_id_str);
4934 done:
4935 	if (commit)
4936 		got_object_commit_close(commit);
4937 	free(commit_id_str);
4938 	if (head_ref)
4939 		got_ref_close(head_ref);
4940 	if (worktree)
4941 		got_worktree_close(worktree);
4942 	if (repo)
4943 		got_repo_close(repo);
4944 	return error;
4945 }
4946 
4947 __dead static void
4948 usage_rebase(void)
4949 {
4950 	fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4951 	    getprogname());
4952 	exit(1);
4953 }
4954 
4955 void
4956 trim_logmsg(char *logmsg, int limit)
4957 {
4958 	char *nl;
4959 	size_t len;
4960 
4961 	len = strlen(logmsg);
4962 	if (len > limit)
4963 		len = limit;
4964 	logmsg[len] = '\0';
4965 	nl = strchr(logmsg, '\n');
4966 	if (nl)
4967 		*nl = '\0';
4968 }
4969 
4970 static const struct got_error *
4971 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4972 {
4973 	const struct got_error *err;
4974 	char *logmsg0 = NULL;
4975 	const char *s;
4976 
4977 	err = got_object_commit_get_logmsg(&logmsg0, commit);
4978 	if (err)
4979 		return err;
4980 
4981 	s = logmsg0;
4982 	while (isspace((unsigned char)s[0]))
4983 		s++;
4984 
4985 	*logmsg = strdup(s);
4986 	if (*logmsg == NULL) {
4987 		err = got_error_from_errno("strdup");
4988 		goto done;
4989 	}
4990 
4991 	trim_logmsg(*logmsg, limit);
4992 done:
4993 	free(logmsg0);
4994 	return err;
4995 }
4996 
4997 static const struct got_error *
4998 show_rebase_progress(struct got_commit_object *commit,
4999     struct got_object_id *old_id, struct got_object_id *new_id)
5000 {
5001 	const struct got_error *err;
5002 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5003 
5004 	err = got_object_id_str(&old_id_str, old_id);
5005 	if (err)
5006 		goto done;
5007 
5008 	if (new_id) {
5009 		err = got_object_id_str(&new_id_str, new_id);
5010 		if (err)
5011 			goto done;
5012 	}
5013 
5014 	old_id_str[12] = '\0';
5015 	if (new_id_str)
5016 		new_id_str[12] = '\0';
5017 
5018 	err = get_short_logmsg(&logmsg, 42, commit);
5019 	if (err)
5020 		goto done;
5021 
5022 	printf("%s -> %s: %s\n", old_id_str,
5023 	    new_id_str ? new_id_str : "no-op change", logmsg);
5024 done:
5025 	free(old_id_str);
5026 	free(new_id_str);
5027 	return err;
5028 }
5029 
5030 static const struct got_error *
5031 rebase_progress(void *arg, unsigned char status, const char *path)
5032 {
5033 	unsigned char *rebase_status = arg;
5034 
5035 	while (path[0] == '/')
5036 		path++;
5037 	printf("%c  %s\n", status, path);
5038 
5039 	if (*rebase_status == GOT_STATUS_CONFLICT)
5040 		return NULL;
5041 	if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5042 		*rebase_status = status;
5043 	return NULL;
5044 }
5045 
5046 static const struct got_error *
5047 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5048     struct got_reference *branch, struct got_reference *new_base_branch,
5049     struct got_reference *tmp_branch, struct got_repository *repo)
5050 {
5051 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
5052 	return got_worktree_rebase_complete(worktree, fileindex,
5053 	    new_base_branch, tmp_branch, branch, repo);
5054 }
5055 
5056 static const struct got_error *
5057 rebase_commit(struct got_pathlist_head *merged_paths,
5058     struct got_worktree *worktree, struct got_fileindex *fileindex,
5059     struct got_reference *tmp_branch,
5060     struct got_object_id *commit_id, struct got_repository *repo)
5061 {
5062 	const struct got_error *error;
5063 	struct got_commit_object *commit;
5064 	struct got_object_id *new_commit_id;
5065 
5066 	error = got_object_open_as_commit(&commit, repo, commit_id);
5067 	if (error)
5068 		return error;
5069 
5070 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5071 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
5072 	if (error) {
5073 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5074 			goto done;
5075 		error = show_rebase_progress(commit, commit_id, NULL);
5076 	} else {
5077 		error = show_rebase_progress(commit, commit_id, new_commit_id);
5078 		free(new_commit_id);
5079 	}
5080 done:
5081 	got_object_commit_close(commit);
5082 	return error;
5083 }
5084 
5085 struct check_path_prefix_arg {
5086 	const char *path_prefix;
5087 	size_t len;
5088 	int errcode;
5089 };
5090 
5091 static const struct got_error *
5092 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5093     struct got_blob_object *blob2, struct got_object_id *id1,
5094     struct got_object_id *id2, const char *path1, const char *path2,
5095     mode_t mode1, mode_t mode2, struct got_repository *repo)
5096 {
5097 	struct check_path_prefix_arg *a = arg;
5098 
5099 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5100 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5101 		return got_error(a->errcode);
5102 
5103 	return NULL;
5104 }
5105 
5106 static const struct got_error *
5107 check_path_prefix(struct got_object_id *parent_id,
5108     struct got_object_id *commit_id, const char *path_prefix,
5109     int errcode, struct got_repository *repo)
5110 {
5111 	const struct got_error *err;
5112 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5113 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
5114 	struct check_path_prefix_arg cpp_arg;
5115 
5116 	if (got_path_is_root_dir(path_prefix))
5117 		return NULL;
5118 
5119 	err = got_object_open_as_commit(&commit, repo, commit_id);
5120 	if (err)
5121 		goto done;
5122 
5123 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5124 	if (err)
5125 		goto done;
5126 
5127 	err = got_object_open_as_tree(&tree1, repo,
5128 	    got_object_commit_get_tree_id(parent_commit));
5129 	if (err)
5130 		goto done;
5131 
5132 	err = got_object_open_as_tree(&tree2, repo,
5133 	    got_object_commit_get_tree_id(commit));
5134 	if (err)
5135 		goto done;
5136 
5137 	cpp_arg.path_prefix = path_prefix;
5138 	while (cpp_arg.path_prefix[0] == '/')
5139 		cpp_arg.path_prefix++;
5140 	cpp_arg.len = strlen(cpp_arg.path_prefix);
5141 	cpp_arg.errcode = errcode;
5142 	err = got_diff_tree(tree1, tree2, "", "", repo,
5143 	    check_path_prefix_in_diff, &cpp_arg, 0);
5144 done:
5145 	if (tree1)
5146 		got_object_tree_close(tree1);
5147 	if (tree2)
5148 		got_object_tree_close(tree2);
5149 	if (commit)
5150 		got_object_commit_close(commit);
5151 	if (parent_commit)
5152 		got_object_commit_close(parent_commit);
5153 	return err;
5154 }
5155 
5156 static const struct got_error *
5157 collect_commits(struct got_object_id_queue *commits,
5158     struct got_object_id *initial_commit_id,
5159     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5160     const char *path_prefix, int path_prefix_errcode,
5161     struct got_repository *repo)
5162 {
5163 	const struct got_error *err = NULL;
5164 	struct got_commit_graph *graph = NULL;
5165 	struct got_object_id *parent_id = NULL;
5166 	struct got_object_qid *qid;
5167         struct got_object_id *commit_id = initial_commit_id;
5168 
5169 	err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5170 	if (err)
5171 		return err;
5172 
5173 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5174 	    check_cancelled, NULL);
5175 	if (err)
5176 		goto done;
5177 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5178 		err = got_commit_graph_iter_next(&parent_id, graph);
5179 		if (err) {
5180 			if (err->code == GOT_ERR_ITER_COMPLETED) {
5181 				err = got_error_msg(GOT_ERR_ANCESTRY,
5182 				    "ran out of commits to rebase before "
5183 				    "youngest common ancestor commit has "
5184 				    "been reached?!?");
5185 				goto done;
5186 			} else if (err->code != GOT_ERR_ITER_NEED_MORE)
5187 				goto done;
5188 			err = got_commit_graph_fetch_commits(graph, 1, repo,
5189 			    check_cancelled, NULL);
5190 			if (err)
5191 				goto done;
5192 		} else {
5193 			err = check_path_prefix(parent_id, commit_id,
5194 			    path_prefix, path_prefix_errcode, repo);
5195 			if (err)
5196 				goto done;
5197 
5198 			err = got_object_qid_alloc(&qid, commit_id);
5199 			if (err)
5200 				goto done;
5201 			SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5202 			commit_id = parent_id;
5203 		}
5204 	}
5205 done:
5206 	got_commit_graph_close(graph);
5207 	return err;
5208 }
5209 
5210 static const struct got_error *
5211 cmd_rebase(int argc, char *argv[])
5212 {
5213 	const struct got_error *error = NULL;
5214 	struct got_worktree *worktree = NULL;
5215 	struct got_repository *repo = NULL;
5216 	struct got_fileindex *fileindex = NULL;
5217 	char *cwd = NULL;
5218 	struct got_reference *branch = NULL;
5219 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5220 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
5221 	struct got_object_id *resume_commit_id = NULL;
5222 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5223 	struct got_commit_object *commit = NULL;
5224 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5225 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5226 	struct got_object_id_queue commits;
5227 	struct got_pathlist_head merged_paths;
5228 	const struct got_object_id_queue *parent_ids;
5229 	struct got_object_qid *qid, *pid;
5230 
5231 	SIMPLEQ_INIT(&commits);
5232 	TAILQ_INIT(&merged_paths);
5233 
5234 	while ((ch = getopt(argc, argv, "ac")) != -1) {
5235 		switch (ch) {
5236 		case 'a':
5237 			abort_rebase = 1;
5238 			break;
5239 		case 'c':
5240 			continue_rebase = 1;
5241 			break;
5242 		default:
5243 			usage_rebase();
5244 			/* NOTREACHED */
5245 		}
5246 	}
5247 
5248 	argc -= optind;
5249 	argv += optind;
5250 
5251 #ifndef PROFILE
5252 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5253 	    "unveil", NULL) == -1)
5254 		err(1, "pledge");
5255 #endif
5256 	if (abort_rebase && continue_rebase)
5257 		usage_rebase();
5258 	else if (abort_rebase || continue_rebase) {
5259 		if (argc != 0)
5260 			usage_rebase();
5261 	} else if (argc != 1)
5262 		usage_rebase();
5263 
5264 	cwd = getcwd(NULL, 0);
5265 	if (cwd == NULL) {
5266 		error = got_error_from_errno("getcwd");
5267 		goto done;
5268 	}
5269 	error = got_worktree_open(&worktree, cwd);
5270 	if (error)
5271 		goto done;
5272 
5273 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5274 	    NULL);
5275 	if (error != NULL)
5276 		goto done;
5277 
5278 	error = apply_unveil(got_repo_get_path(repo), 0,
5279 	    got_worktree_get_root_path(worktree));
5280 	if (error)
5281 		goto done;
5282 
5283 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5284 	if (error)
5285 		goto done;
5286 
5287 	if (abort_rebase) {
5288 		int did_something;
5289 		if (!rebase_in_progress) {
5290 			error = got_error(GOT_ERR_NOT_REBASING);
5291 			goto done;
5292 		}
5293 		error = got_worktree_rebase_continue(&resume_commit_id,
5294 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
5295 		    worktree, repo);
5296 		if (error)
5297 			goto done;
5298 		printf("Switching work tree to %s\n",
5299 		    got_ref_get_symref_target(new_base_branch));
5300 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
5301 		    new_base_branch, update_progress, &did_something);
5302 		if (error)
5303 			goto done;
5304 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5305 		goto done; /* nothing else to do */
5306 	}
5307 
5308 	if (continue_rebase) {
5309 		if (!rebase_in_progress) {
5310 			error = got_error(GOT_ERR_NOT_REBASING);
5311 			goto done;
5312 		}
5313 		error = got_worktree_rebase_continue(&resume_commit_id,
5314 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
5315 		    worktree, repo);
5316 		if (error)
5317 			goto done;
5318 
5319 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5320 		    resume_commit_id, repo);
5321 		if (error)
5322 			goto done;
5323 
5324 		yca_id = got_object_id_dup(resume_commit_id);
5325 		if (yca_id == NULL) {
5326 			error = got_error_from_errno("got_object_id_dup");
5327 			goto done;
5328 		}
5329 	} else {
5330 		error = got_ref_open(&branch, repo, argv[0], 0);
5331 		if (error != NULL)
5332 			goto done;
5333 	}
5334 
5335 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5336 	if (error)
5337 		goto done;
5338 
5339 	if (!continue_rebase) {
5340 		struct got_object_id *base_commit_id;
5341 
5342 		base_commit_id = got_worktree_get_base_commit_id(worktree);
5343 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5344 		    base_commit_id, branch_head_commit_id, repo,
5345 		    check_cancelled, NULL);
5346 		if (error)
5347 			goto done;
5348 		if (yca_id == NULL) {
5349 			error = got_error_msg(GOT_ERR_ANCESTRY,
5350 			    "specified branch shares no common ancestry "
5351 			    "with work tree's branch");
5352 			goto done;
5353 		}
5354 
5355 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
5356 		if (error) {
5357 			if (error->code != GOT_ERR_ANCESTRY)
5358 				goto done;
5359 			error = NULL;
5360 		} else {
5361 			error = got_error_msg(GOT_ERR_SAME_BRANCH,
5362 			    "specified branch resolves to a commit which "
5363 			    "is already contained in work tree's branch");
5364 			goto done;
5365 		}
5366 		error = got_worktree_rebase_prepare(&new_base_branch,
5367 		    &tmp_branch, &fileindex, worktree, branch, repo);
5368 		if (error)
5369 			goto done;
5370 	}
5371 
5372 	commit_id = branch_head_commit_id;
5373 	error = got_object_open_as_commit(&commit, repo, commit_id);
5374 	if (error)
5375 		goto done;
5376 
5377 	parent_ids = got_object_commit_get_parent_ids(commit);
5378 	pid = SIMPLEQ_FIRST(parent_ids);
5379 	if (pid == NULL) {
5380 		if (!continue_rebase) {
5381 			int did_something;
5382 			error = got_worktree_rebase_abort(worktree, fileindex,
5383 			    repo, new_base_branch, update_progress,
5384 			    &did_something);
5385 			if (error)
5386 				goto done;
5387 			printf("Rebase of %s aborted\n",
5388 			    got_ref_get_name(branch));
5389 		}
5390 		error = got_error(GOT_ERR_EMPTY_REBASE);
5391 		goto done;
5392 	}
5393 	error = collect_commits(&commits, commit_id, pid->id,
5394 	    yca_id, got_worktree_get_path_prefix(worktree),
5395 	    GOT_ERR_REBASE_PATH, repo);
5396 	got_object_commit_close(commit);
5397 	commit = NULL;
5398 	if (error)
5399 		goto done;
5400 
5401 	if (SIMPLEQ_EMPTY(&commits)) {
5402 		if (continue_rebase)
5403 			error = rebase_complete(worktree, fileindex,
5404 			    branch, new_base_branch, tmp_branch, repo);
5405 		else
5406 			error = got_error(GOT_ERR_EMPTY_REBASE);
5407 		goto done;
5408 	}
5409 
5410 	pid = NULL;
5411 	SIMPLEQ_FOREACH(qid, &commits, entry) {
5412 		commit_id = qid->id;
5413 		parent_id = pid ? pid->id : yca_id;
5414 		pid = qid;
5415 
5416 		error = got_worktree_rebase_merge_files(&merged_paths,
5417 		    worktree, fileindex, parent_id, commit_id, repo,
5418 		    rebase_progress, &rebase_status, check_cancelled, NULL);
5419 		if (error)
5420 			goto done;
5421 
5422 		if (rebase_status == GOT_STATUS_CONFLICT) {
5423 			got_worktree_rebase_pathlist_free(&merged_paths);
5424 			break;
5425 		}
5426 
5427 		error = rebase_commit(&merged_paths, worktree, fileindex,
5428 		    tmp_branch, commit_id, repo);
5429 		got_worktree_rebase_pathlist_free(&merged_paths);
5430 		if (error)
5431 			goto done;
5432 	}
5433 
5434 	if (rebase_status == GOT_STATUS_CONFLICT) {
5435 		error = got_worktree_rebase_postpone(worktree, fileindex);
5436 		if (error)
5437 			goto done;
5438 		error = got_error_msg(GOT_ERR_CONFLICTS,
5439 		    "conflicts must be resolved before rebasing can continue");
5440 	} else
5441 		error = rebase_complete(worktree, fileindex, branch,
5442 		    new_base_branch, tmp_branch, repo);
5443 done:
5444 	got_object_id_queue_free(&commits);
5445 	free(branch_head_commit_id);
5446 	free(resume_commit_id);
5447 	free(yca_id);
5448 	if (commit)
5449 		got_object_commit_close(commit);
5450 	if (branch)
5451 		got_ref_close(branch);
5452 	if (new_base_branch)
5453 		got_ref_close(new_base_branch);
5454 	if (tmp_branch)
5455 		got_ref_close(tmp_branch);
5456 	if (worktree)
5457 		got_worktree_close(worktree);
5458 	if (repo)
5459 		got_repo_close(repo);
5460 	return error;
5461 }
5462 
5463 __dead static void
5464 usage_histedit(void)
5465 {
5466 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5467 	    getprogname());
5468 	exit(1);
5469 }
5470 
5471 #define GOT_HISTEDIT_PICK 'p'
5472 #define GOT_HISTEDIT_EDIT 'e'
5473 #define GOT_HISTEDIT_FOLD 'f'
5474 #define GOT_HISTEDIT_DROP 'd'
5475 #define GOT_HISTEDIT_MESG 'm'
5476 
5477 static struct got_histedit_cmd {
5478 	unsigned char code;
5479 	const char *name;
5480 	const char *desc;
5481 } got_histedit_cmds[] = {
5482 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
5483 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5484 	{ GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5485 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5486 	{ GOT_HISTEDIT_MESG, "mesg",
5487 	    "single-line log message for commit above (open editor if empty)" },
5488 };
5489 
5490 struct got_histedit_list_entry {
5491 	TAILQ_ENTRY(got_histedit_list_entry) entry;
5492 	struct got_object_id *commit_id;
5493 	const struct got_histedit_cmd *cmd;
5494 	char *logmsg;
5495 };
5496 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5497 
5498 static const struct got_error *
5499 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5500     FILE *f, struct got_repository *repo)
5501 {
5502 	const struct got_error *err = NULL;
5503 	char *logmsg = NULL, *id_str = NULL;
5504 	struct got_commit_object *commit = NULL;
5505 	int n;
5506 
5507 	err = got_object_open_as_commit(&commit, repo, commit_id);
5508 	if (err)
5509 		goto done;
5510 
5511 	err = get_short_logmsg(&logmsg, 34, commit);
5512 	if (err)
5513 		goto done;
5514 
5515 	err = got_object_id_str(&id_str, commit_id);
5516 	if (err)
5517 		goto done;
5518 
5519 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5520 	if (n < 0)
5521 		err = got_ferror(f, GOT_ERR_IO);
5522 done:
5523 	if (commit)
5524 		got_object_commit_close(commit);
5525 	free(id_str);
5526 	free(logmsg);
5527 	return err;
5528 }
5529 
5530 static const struct got_error *
5531 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5532     struct got_repository *repo)
5533 {
5534 	const struct got_error *err = NULL;
5535 	struct got_object_qid *qid;
5536 
5537 	if (SIMPLEQ_EMPTY(commits))
5538 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
5539 
5540 	SIMPLEQ_FOREACH(qid, commits, entry) {
5541 		err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5542 		    f, repo);
5543 		if (err)
5544 			break;
5545 	}
5546 
5547 	return err;
5548 }
5549 
5550 static const struct got_error *
5551 write_cmd_list(FILE *f)
5552 {
5553 	const struct got_error *err = NULL;
5554 	int n, i;
5555 
5556 	n = fprintf(f, "# Available histedit commands:\n");
5557 	if (n < 0)
5558 		return got_ferror(f, GOT_ERR_IO);
5559 
5560 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
5561 		struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5562 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
5563 		    cmd->desc);
5564 		if (n < 0) {
5565 			err = got_ferror(f, GOT_ERR_IO);
5566 			break;
5567 		}
5568 	}
5569 	n = fprintf(f, "# Commits will be processed in order from top to "
5570 	    "bottom of this file.\n");
5571 	if (n < 0)
5572 		return got_ferror(f, GOT_ERR_IO);
5573 	return err;
5574 }
5575 
5576 static const struct got_error *
5577 histedit_syntax_error(int lineno)
5578 {
5579 	static char msg[42];
5580 	int ret;
5581 
5582 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5583 	    lineno);
5584 	if (ret == -1 || ret >= sizeof(msg))
5585 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5586 
5587 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5588 }
5589 
5590 static const struct got_error *
5591 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5592     char *logmsg, struct got_repository *repo)
5593 {
5594 	const struct got_error *err;
5595 	struct got_commit_object *folded_commit = NULL;
5596 	char *id_str, *folded_logmsg = NULL;
5597 
5598 	err = got_object_id_str(&id_str, hle->commit_id);
5599 	if (err)
5600 		return err;
5601 
5602 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5603 	if (err)
5604 		goto done;
5605 
5606 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5607 	if (err)
5608 		goto done;
5609 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5610 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5611 	    folded_logmsg) == -1) {
5612 		err = got_error_from_errno("asprintf");
5613 		goto done;
5614 	}
5615 done:
5616 	if (folded_commit)
5617 		got_object_commit_close(folded_commit);
5618 	free(id_str);
5619 	free(folded_logmsg);
5620 	return err;
5621 }
5622 
5623 static struct got_histedit_list_entry *
5624 get_folded_commits(struct got_histedit_list_entry *hle)
5625 {
5626 	struct got_histedit_list_entry *prev, *folded = NULL;
5627 
5628 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
5629 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5630 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
5631 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5632 			folded = prev;
5633 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
5634 	}
5635 
5636 	return folded;
5637 }
5638 
5639 static const struct got_error *
5640 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5641     struct got_repository *repo)
5642 {
5643 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5644 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5645 	const struct got_error *err = NULL;
5646 	struct got_commit_object *commit = NULL;
5647 	int fd;
5648 	struct got_histedit_list_entry *folded = NULL;
5649 
5650 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5651 	if (err)
5652 		return err;
5653 
5654 	folded = get_folded_commits(hle);
5655 	if (folded) {
5656 		while (folded != hle) {
5657 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5658 				folded = TAILQ_NEXT(folded, entry);
5659 				continue;
5660 			}
5661 			err = append_folded_commit_msg(&new_msg, folded,
5662 			    logmsg, repo);
5663 			if (err)
5664 				goto done;
5665 			free(logmsg);
5666 			logmsg = new_msg;
5667 			folded = TAILQ_NEXT(folded, entry);
5668 		}
5669 	}
5670 
5671 	err = got_object_id_str(&id_str, hle->commit_id);
5672 	if (err)
5673 		goto done;
5674 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5675 	if (err)
5676 		goto done;
5677 	if (asprintf(&new_msg,
5678 	    "%s\n# original log message of commit %s: %s",
5679 	    logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5680 		err = got_error_from_errno("asprintf");
5681 		goto done;
5682 	}
5683 	free(logmsg);
5684 	logmsg = new_msg;
5685 
5686 	err = got_object_id_str(&id_str, hle->commit_id);
5687 	if (err)
5688 		goto done;
5689 
5690 	err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5691 	if (err)
5692 		goto done;
5693 
5694 	dprintf(fd, logmsg);
5695 	close(fd);
5696 
5697 	err = get_editor(&editor);
5698 	if (err)
5699 		goto done;
5700 
5701 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5702 	if (err) {
5703 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5704 			goto done;
5705 		err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5706 	}
5707 done:
5708 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5709 		err = got_error_from_errno2("unlink", logmsg_path);
5710 	free(logmsg_path);
5711 	free(logmsg);
5712 	free(orig_logmsg);
5713 	free(editor);
5714 	if (commit)
5715 		got_object_commit_close(commit);
5716 	return err;
5717 }
5718 
5719 static const struct got_error *
5720 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5721     FILE *f, struct got_repository *repo)
5722 {
5723 	const struct got_error *err = NULL;
5724 	char *line = NULL, *p, *end;
5725 	size_t size;
5726 	ssize_t len;
5727 	int lineno = 0, i;
5728 	const struct got_histedit_cmd *cmd;
5729 	struct got_object_id *commit_id = NULL;
5730 	struct got_histedit_list_entry *hle = NULL;
5731 
5732 	for (;;) {
5733 		len = getline(&line, &size, f);
5734 		if (len == -1) {
5735 			const struct got_error *getline_err;
5736 			if (feof(f))
5737 				break;
5738 			getline_err = got_error_from_errno("getline");
5739 			err = got_ferror(f, getline_err->code);
5740 			break;
5741 		}
5742 		lineno++;
5743 		p = line;
5744 		while (isspace((unsigned char)p[0]))
5745 			p++;
5746 		if (p[0] == '#' || p[0] == '\0') {
5747 			free(line);
5748 			line = NULL;
5749 			continue;
5750 		}
5751 		cmd = NULL;
5752 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
5753 			cmd = &got_histedit_cmds[i];
5754 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5755 			    isspace((unsigned char)p[strlen(cmd->name)])) {
5756 				p += strlen(cmd->name);
5757 				break;
5758 			}
5759 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5760 				p++;
5761 				break;
5762 			}
5763 		}
5764 		if (i == nitems(got_histedit_cmds)) {
5765 			err = histedit_syntax_error(lineno);
5766 			break;
5767 		}
5768 		while (isspace((unsigned char)p[0]))
5769 			p++;
5770 		if (cmd->code == GOT_HISTEDIT_MESG) {
5771 			if (hle == NULL || hle->logmsg != NULL) {
5772 				err = got_error(GOT_ERR_HISTEDIT_CMD);
5773 				break;
5774 			}
5775 			if (p[0] == '\0') {
5776 				err = histedit_edit_logmsg(hle, repo);
5777 				if (err)
5778 					break;
5779 			} else {
5780 				hle->logmsg = strdup(p);
5781 				if (hle->logmsg == NULL) {
5782 					err = got_error_from_errno("strdup");
5783 					break;
5784 				}
5785 			}
5786 			free(line);
5787 			line = NULL;
5788 			continue;
5789 		} else {
5790 			end = p;
5791 			while (end[0] && !isspace((unsigned char)end[0]))
5792 				end++;
5793 			*end = '\0';
5794 
5795 			err = got_object_resolve_id_str(&commit_id, repo, p);
5796 			if (err) {
5797 				/* override error code */
5798 				err = histedit_syntax_error(lineno);
5799 				break;
5800 			}
5801 		}
5802 		hle = malloc(sizeof(*hle));
5803 		if (hle == NULL) {
5804 			err = got_error_from_errno("malloc");
5805 			break;
5806 		}
5807 		hle->cmd = cmd;
5808 		hle->commit_id = commit_id;
5809 		hle->logmsg = NULL;
5810 		commit_id = NULL;
5811 		free(line);
5812 		line = NULL;
5813 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5814 	}
5815 
5816 	free(line);
5817 	free(commit_id);
5818 	return err;
5819 }
5820 
5821 static const struct got_error *
5822 histedit_check_script(struct got_histedit_list *histedit_cmds,
5823     struct got_object_id_queue *commits, struct got_repository *repo)
5824 {
5825 	const struct got_error *err = NULL;
5826 	struct got_object_qid *qid;
5827 	struct got_histedit_list_entry *hle;
5828 	static char msg[80];
5829 	char *id_str;
5830 
5831 	if (TAILQ_EMPTY(histedit_cmds))
5832 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5833 		    "histedit script contains no commands");
5834 	if (SIMPLEQ_EMPTY(commits))
5835 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
5836 
5837 	SIMPLEQ_FOREACH(qid, commits, entry) {
5838 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
5839 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5840 				break;
5841 		}
5842 		if (hle == NULL) {
5843 			err = got_object_id_str(&id_str, qid->id);
5844 			if (err)
5845 				return err;
5846 			snprintf(msg, sizeof(msg),
5847 			    "commit %s missing from histedit script", id_str);
5848 			free(id_str);
5849 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5850 		}
5851 	}
5852 
5853 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5854 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5855 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5856 		    "last commit in histedit script cannot be folded");
5857 
5858 	return NULL;
5859 }
5860 
5861 static const struct got_error *
5862 histedit_run_editor(struct got_histedit_list *histedit_cmds,
5863     const char *path, struct got_object_id_queue *commits,
5864     struct got_repository *repo)
5865 {
5866 	const struct got_error *err = NULL;
5867 	char *editor;
5868 	FILE *f = NULL;
5869 
5870 	err = get_editor(&editor);
5871 	if (err)
5872 		return err;
5873 
5874 	if (spawn_editor(editor, path) == -1) {
5875 		err = got_error_from_errno("failed spawning editor");
5876 		goto done;
5877 	}
5878 
5879 	f = fopen(path, "r");
5880 	if (f == NULL) {
5881 		err = got_error_from_errno("fopen");
5882 		goto done;
5883 	}
5884 	err = histedit_parse_list(histedit_cmds, f, repo);
5885 	if (err)
5886 		goto done;
5887 
5888 	err = histedit_check_script(histedit_cmds, commits, repo);
5889 done:
5890 	if (f && fclose(f) != 0 && err == NULL)
5891 		err = got_error_from_errno("fclose");
5892 	free(editor);
5893 	return err;
5894 }
5895 
5896 static const struct got_error *
5897 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5898     struct got_object_id_queue *, const char *, struct got_repository *);
5899 
5900 static const struct got_error *
5901 histedit_edit_script(struct got_histedit_list *histedit_cmds,
5902     struct got_object_id_queue *commits, struct got_repository *repo)
5903 {
5904 	const struct got_error *err;
5905 	FILE *f = NULL;
5906 	char *path = NULL;
5907 
5908 	err = got_opentemp_named(&path, &f, "got-histedit");
5909 	if (err)
5910 		return err;
5911 
5912 	err = write_cmd_list(f);
5913 	if (err)
5914 		goto done;
5915 
5916 	err = histedit_write_commit_list(commits, f, repo);
5917 	if (err)
5918 		goto done;
5919 
5920 	if (fclose(f) != 0) {
5921 		err = got_error_from_errno("fclose");
5922 		goto done;
5923 	}
5924 	f = NULL;
5925 
5926 	err = histedit_run_editor(histedit_cmds, path, commits, repo);
5927 	if (err) {
5928 		if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5929 		    err->code != GOT_ERR_HISTEDIT_CMD)
5930 			goto done;
5931 		err = histedit_edit_list_retry(histedit_cmds, err,
5932 		    commits, path, repo);
5933 	}
5934 done:
5935 	if (f && fclose(f) != 0 && err == NULL)
5936 		err = got_error_from_errno("fclose");
5937 	if (path && unlink(path) != 0 && err == NULL)
5938 		err = got_error_from_errno2("unlink", path);
5939 	free(path);
5940 	return err;
5941 }
5942 
5943 static const struct got_error *
5944 histedit_save_list(struct got_histedit_list *histedit_cmds,
5945     struct got_worktree *worktree, struct got_repository *repo)
5946 {
5947 	const struct got_error *err = NULL;
5948 	char *path = NULL;
5949 	FILE *f = NULL;
5950 	struct got_histedit_list_entry *hle;
5951 	struct got_commit_object *commit = NULL;
5952 
5953 	err = got_worktree_get_histedit_script_path(&path, worktree);
5954 	if (err)
5955 		return err;
5956 
5957 	f = fopen(path, "w");
5958 	if (f == NULL) {
5959 		err = got_error_from_errno2("fopen", path);
5960 		goto done;
5961 	}
5962 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
5963 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5964 		    repo);
5965 		if (err)
5966 			break;
5967 
5968 		if (hle->logmsg) {
5969 			int n = fprintf(f, "%c %s\n",
5970 			    GOT_HISTEDIT_MESG, hle->logmsg);
5971 			if (n < 0) {
5972 				err = got_ferror(f, GOT_ERR_IO);
5973 				break;
5974 			}
5975 		}
5976 	}
5977 done:
5978 	if (f && fclose(f) != 0 && err == NULL)
5979 		err = got_error_from_errno("fclose");
5980 	free(path);
5981 	if (commit)
5982 		got_object_commit_close(commit);
5983 	return err;
5984 }
5985 
5986 void
5987 histedit_free_list(struct got_histedit_list *histedit_cmds)
5988 {
5989 	struct got_histedit_list_entry *hle;
5990 
5991 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
5992 		TAILQ_REMOVE(histedit_cmds, hle, entry);
5993 		free(hle);
5994 	}
5995 }
5996 
5997 static const struct got_error *
5998 histedit_load_list(struct got_histedit_list *histedit_cmds,
5999     const char *path, struct got_repository *repo)
6000 {
6001 	const struct got_error *err = NULL;
6002 	FILE *f = NULL;
6003 
6004 	f = fopen(path, "r");
6005 	if (f == NULL) {
6006 		err = got_error_from_errno2("fopen", path);
6007 		goto done;
6008 	}
6009 
6010 	err = histedit_parse_list(histedit_cmds, f, repo);
6011 done:
6012 	if (f && fclose(f) != 0 && err == NULL)
6013 		err = got_error_from_errno("fclose");
6014 	return err;
6015 }
6016 
6017 static const struct got_error *
6018 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6019     const struct got_error *edit_err, struct got_object_id_queue *commits,
6020     const char *path, struct got_repository *repo)
6021 {
6022 	const struct got_error *err = NULL, *prev_err = edit_err;
6023 	int resp = ' ';
6024 
6025 	while (resp != 'c' && resp != 'r' && resp != 'a') {
6026 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6027 		    "or (a)bort: ", getprogname(), prev_err->msg);
6028 		resp = getchar();
6029 		if (resp == '\n')
6030 			resp = getchar();
6031 		if (resp == 'c') {
6032 			histedit_free_list(histedit_cmds);
6033 			err = histedit_run_editor(histedit_cmds, path, commits,
6034 			    repo);
6035 			if (err) {
6036 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6037 				    err->code != GOT_ERR_HISTEDIT_CMD)
6038 					break;
6039 				prev_err = err;
6040 				resp = ' ';
6041 				continue;
6042 			}
6043 			break;
6044 		} else if (resp == 'r') {
6045 			histedit_free_list(histedit_cmds);
6046 			err = histedit_edit_script(histedit_cmds,
6047 			    commits, repo);
6048 			if (err) {
6049 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6050 				    err->code != GOT_ERR_HISTEDIT_CMD)
6051 					break;
6052 				prev_err = err;
6053 				resp = ' ';
6054 				continue;
6055 			}
6056 			break;
6057 		} else if (resp == 'a') {
6058 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6059 			break;
6060 		} else
6061 			printf("invalid response '%c'\n", resp);
6062 	}
6063 
6064 	return err;
6065 }
6066 
6067 static const struct got_error *
6068 histedit_complete(struct got_worktree *worktree,
6069     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6070     struct got_reference *branch, struct got_repository *repo)
6071 {
6072 	printf("Switching work tree to %s\n",
6073 	    got_ref_get_symref_target(branch));
6074 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6075 	    branch, repo);
6076 }
6077 
6078 static const struct got_error *
6079 show_histedit_progress(struct got_commit_object *commit,
6080     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6081 {
6082 	const struct got_error *err;
6083 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6084 
6085 	err = got_object_id_str(&old_id_str, hle->commit_id);
6086 	if (err)
6087 		goto done;
6088 
6089 	if (new_id) {
6090 		err = got_object_id_str(&new_id_str, new_id);
6091 		if (err)
6092 			goto done;
6093 	}
6094 
6095 	old_id_str[12] = '\0';
6096 	if (new_id_str)
6097 		new_id_str[12] = '\0';
6098 
6099 	if (hle->logmsg) {
6100 		logmsg = strdup(hle->logmsg);
6101 		if (logmsg == NULL) {
6102 			err = got_error_from_errno("strdup");
6103 			goto done;
6104 		}
6105 		trim_logmsg(logmsg, 42);
6106 	} else {
6107 		err = get_short_logmsg(&logmsg, 42, commit);
6108 		if (err)
6109 			goto done;
6110 	}
6111 
6112 	switch (hle->cmd->code) {
6113 	case GOT_HISTEDIT_PICK:
6114 	case GOT_HISTEDIT_EDIT:
6115 		printf("%s -> %s: %s\n", old_id_str,
6116 		    new_id_str ? new_id_str : "no-op change", logmsg);
6117 		break;
6118 	case GOT_HISTEDIT_DROP:
6119 	case GOT_HISTEDIT_FOLD:
6120 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
6121 		    logmsg);
6122 		break;
6123 	default:
6124 		break;
6125 	}
6126 
6127 done:
6128 	free(old_id_str);
6129 	free(new_id_str);
6130 	return err;
6131 }
6132 
6133 static const struct got_error *
6134 histedit_commit(struct got_pathlist_head *merged_paths,
6135     struct got_worktree *worktree, struct got_fileindex *fileindex,
6136     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6137     struct got_repository *repo)
6138 {
6139 	const struct got_error *err;
6140 	struct got_commit_object *commit;
6141 	struct got_object_id *new_commit_id;
6142 
6143 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6144 	    && hle->logmsg == NULL) {
6145 		err = histedit_edit_logmsg(hle, repo);
6146 		if (err)
6147 			return err;
6148 	}
6149 
6150 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6151 	if (err)
6152 		return err;
6153 
6154 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6155 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
6156 	    hle->logmsg, repo);
6157 	if (err) {
6158 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6159 			goto done;
6160 		err = show_histedit_progress(commit, hle, NULL);
6161 	} else {
6162 		err = show_histedit_progress(commit, hle, new_commit_id);
6163 		free(new_commit_id);
6164 	}
6165 done:
6166 	got_object_commit_close(commit);
6167 	return err;
6168 }
6169 
6170 static const struct got_error *
6171 histedit_skip_commit(struct got_histedit_list_entry *hle,
6172     struct got_worktree *worktree, struct got_repository *repo)
6173 {
6174 	const struct got_error *error;
6175 	struct got_commit_object *commit;
6176 
6177 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6178 	    repo);
6179 	if (error)
6180 		return error;
6181 
6182 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6183 	if (error)
6184 		return error;
6185 
6186 	error = show_histedit_progress(commit, hle, NULL);
6187 	got_object_commit_close(commit);
6188 	return error;
6189 }
6190 
6191 static const struct got_error *
6192 cmd_histedit(int argc, char *argv[])
6193 {
6194 	const struct got_error *error = NULL;
6195 	struct got_worktree *worktree = NULL;
6196 	struct got_fileindex *fileindex = NULL;
6197 	struct got_repository *repo = NULL;
6198 	char *cwd = NULL;
6199 	struct got_reference *branch = NULL;
6200 	struct got_reference *tmp_branch = NULL;
6201 	struct got_object_id *resume_commit_id = NULL;
6202 	struct got_object_id *base_commit_id = NULL;
6203 	struct got_object_id *head_commit_id = NULL;
6204 	struct got_commit_object *commit = NULL;
6205 	int ch, rebase_in_progress = 0, did_something;
6206 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6207 	const char *edit_script_path = NULL;
6208 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6209 	struct got_object_id_queue commits;
6210 	struct got_pathlist_head merged_paths;
6211 	const struct got_object_id_queue *parent_ids;
6212 	struct got_object_qid *pid;
6213 	struct got_histedit_list histedit_cmds;
6214 	struct got_histedit_list_entry *hle;
6215 
6216 	SIMPLEQ_INIT(&commits);
6217 	TAILQ_INIT(&histedit_cmds);
6218 	TAILQ_INIT(&merged_paths);
6219 
6220 	while ((ch = getopt(argc, argv, "acF:")) != -1) {
6221 		switch (ch) {
6222 		case 'a':
6223 			abort_edit = 1;
6224 			break;
6225 		case 'c':
6226 			continue_edit = 1;
6227 			break;
6228 		case 'F':
6229 			edit_script_path = optarg;
6230 			break;
6231 		default:
6232 			usage_histedit();
6233 			/* NOTREACHED */
6234 		}
6235 	}
6236 
6237 	argc -= optind;
6238 	argv += optind;
6239 
6240 #ifndef PROFILE
6241 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6242 	    "unveil", NULL) == -1)
6243 		err(1, "pledge");
6244 #endif
6245 	if (abort_edit && continue_edit)
6246 		usage_histedit();
6247 	if (argc != 0)
6248 		usage_histedit();
6249 
6250 	/*
6251 	 * This command cannot apply unveil(2) in all cases because the
6252 	 * user may choose to run an editor to edit the histedit script
6253 	 * and to edit individual commit log messages.
6254 	 * unveil(2) traverses exec(2); if an editor is used we have to
6255 	 * apply unveil after edit script and log messages have been written.
6256 	 * XXX TODO: Make use of unveil(2) where possible.
6257 	 */
6258 
6259 	cwd = getcwd(NULL, 0);
6260 	if (cwd == NULL) {
6261 		error = got_error_from_errno("getcwd");
6262 		goto done;
6263 	}
6264 	error = got_worktree_open(&worktree, cwd);
6265 	if (error)
6266 		goto done;
6267 
6268 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6269 	    NULL);
6270 	if (error != NULL)
6271 		goto done;
6272 
6273 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6274 	if (error)
6275 		goto done;
6276 	if (rebase_in_progress) {
6277 		error = got_error(GOT_ERR_REBASING);
6278 		goto done;
6279 	}
6280 
6281 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6282 	if (error)
6283 		goto done;
6284 
6285 	if (edit_in_progress && abort_edit) {
6286 		error = got_worktree_histedit_continue(&resume_commit_id,
6287 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
6288 		    worktree, repo);
6289 		if (error)
6290 			goto done;
6291 		printf("Switching work tree to %s\n",
6292 		    got_ref_get_symref_target(branch));
6293 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
6294 		    branch, base_commit_id, update_progress, &did_something);
6295 		if (error)
6296 			goto done;
6297 		printf("Histedit of %s aborted\n",
6298 		    got_ref_get_symref_target(branch));
6299 		goto done; /* nothing else to do */
6300 	} else if (abort_edit) {
6301 		error = got_error(GOT_ERR_NOT_HISTEDIT);
6302 		goto done;
6303 	}
6304 
6305 	if (continue_edit) {
6306 		char *path;
6307 
6308 		if (!edit_in_progress) {
6309 			error = got_error(GOT_ERR_NOT_HISTEDIT);
6310 			goto done;
6311 		}
6312 
6313 		error = got_worktree_get_histedit_script_path(&path, worktree);
6314 		if (error)
6315 			goto done;
6316 
6317 		error = histedit_load_list(&histedit_cmds, path, repo);
6318 		free(path);
6319 		if (error)
6320 			goto done;
6321 
6322 		error = got_worktree_histedit_continue(&resume_commit_id,
6323 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
6324 		    worktree, repo);
6325 		if (error)
6326 			goto done;
6327 
6328 		error = got_ref_resolve(&head_commit_id, repo, branch);
6329 		if (error)
6330 			goto done;
6331 
6332 		error = got_object_open_as_commit(&commit, repo,
6333 		    head_commit_id);
6334 		if (error)
6335 			goto done;
6336 		parent_ids = got_object_commit_get_parent_ids(commit);
6337 		pid = SIMPLEQ_FIRST(parent_ids);
6338 		if (pid == NULL) {
6339 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6340 			goto done;
6341 		}
6342 		error = collect_commits(&commits, head_commit_id, pid->id,
6343 		    base_commit_id, got_worktree_get_path_prefix(worktree),
6344 		    GOT_ERR_HISTEDIT_PATH, repo);
6345 		got_object_commit_close(commit);
6346 		commit = NULL;
6347 		if (error)
6348 			goto done;
6349 	} else {
6350 		if (edit_in_progress) {
6351 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
6352 			goto done;
6353 		}
6354 
6355 		error = got_ref_open(&branch, repo,
6356 		    got_worktree_get_head_ref_name(worktree), 0);
6357 		if (error != NULL)
6358 			goto done;
6359 
6360 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6361 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6362 			    "will not edit commit history of a branch outside "
6363 			    "the \"refs/heads/\" reference namespace");
6364 			goto done;
6365 		}
6366 
6367 		error = got_ref_resolve(&head_commit_id, repo, branch);
6368 		got_ref_close(branch);
6369 		branch = NULL;
6370 		if (error)
6371 			goto done;
6372 
6373 		error = got_object_open_as_commit(&commit, repo,
6374 		    head_commit_id);
6375 		if (error)
6376 			goto done;
6377 		parent_ids = got_object_commit_get_parent_ids(commit);
6378 		pid = SIMPLEQ_FIRST(parent_ids);
6379 		if (pid == NULL) {
6380 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6381 			goto done;
6382 		}
6383 		error = collect_commits(&commits, head_commit_id, pid->id,
6384 		    got_worktree_get_base_commit_id(worktree),
6385 		    got_worktree_get_path_prefix(worktree),
6386 		    GOT_ERR_HISTEDIT_PATH, repo);
6387 		got_object_commit_close(commit);
6388 		commit = NULL;
6389 		if (error)
6390 			goto done;
6391 
6392 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6393 		    &base_commit_id, &fileindex, worktree, repo);
6394 		if (error)
6395 			goto done;
6396 
6397 		if (edit_script_path) {
6398 			error = histedit_load_list(&histedit_cmds,
6399 			    edit_script_path, repo);
6400 			if (error) {
6401 				got_worktree_histedit_abort(worktree, fileindex,
6402 				    repo, branch, base_commit_id,
6403 				    update_progress, &did_something);
6404 				goto done;
6405 			}
6406 		} else {
6407 			error = histedit_edit_script(&histedit_cmds, &commits,
6408 			    repo);
6409 			if (error) {
6410 				got_worktree_histedit_abort(worktree, fileindex,
6411 				    repo, branch, base_commit_id,
6412 				    update_progress, &did_something);
6413 				goto done;
6414 			}
6415 
6416 		}
6417 
6418 		error = histedit_save_list(&histedit_cmds, worktree,
6419 		    repo);
6420 		if (error) {
6421 			got_worktree_histedit_abort(worktree, fileindex,
6422 			    repo, branch, base_commit_id,
6423 			    update_progress, &did_something);
6424 			goto done;
6425 		}
6426 
6427 	}
6428 
6429 	error = histedit_check_script(&histedit_cmds, &commits, repo);
6430 	if (error)
6431 		goto done;
6432 
6433 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6434 		if (resume_commit_id) {
6435 			if (got_object_id_cmp(hle->commit_id,
6436 			    resume_commit_id) != 0)
6437 				continue;
6438 
6439 			resume_commit_id = NULL;
6440 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6441 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
6442 				error = histedit_skip_commit(hle, worktree,
6443 				   repo);
6444 			} else {
6445 				error = histedit_commit(NULL, worktree,
6446 				    fileindex, tmp_branch, hle, repo);
6447 			}
6448 			if (error)
6449 				goto done;
6450 			continue;
6451 		}
6452 
6453 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6454 			error = histedit_skip_commit(hle, worktree, repo);
6455 			if (error)
6456 				goto done;
6457 			continue;
6458 		}
6459 
6460 		error = got_object_open_as_commit(&commit, repo,
6461 		    hle->commit_id);
6462 		if (error)
6463 			goto done;
6464 		parent_ids = got_object_commit_get_parent_ids(commit);
6465 		pid = SIMPLEQ_FIRST(parent_ids);
6466 
6467 		error = got_worktree_histedit_merge_files(&merged_paths,
6468 		    worktree, fileindex, pid->id, hle->commit_id, repo,
6469 		    rebase_progress, &rebase_status, check_cancelled, NULL);
6470 		if (error)
6471 			goto done;
6472 		got_object_commit_close(commit);
6473 		commit = NULL;
6474 
6475 		if (rebase_status == GOT_STATUS_CONFLICT) {
6476 			got_worktree_rebase_pathlist_free(&merged_paths);
6477 			break;
6478 		}
6479 
6480 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6481 			char *id_str;
6482 			error = got_object_id_str(&id_str, hle->commit_id);
6483 			if (error)
6484 				goto done;
6485 			printf("Stopping histedit for amending commit %s\n",
6486 			    id_str);
6487 			free(id_str);
6488 			got_worktree_rebase_pathlist_free(&merged_paths);
6489 			error = got_worktree_histedit_postpone(worktree,
6490 			    fileindex);
6491 			goto done;
6492 		}
6493 
6494 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6495 			error = histedit_skip_commit(hle, worktree, repo);
6496 			if (error)
6497 				goto done;
6498 			continue;
6499 		}
6500 
6501 		error = histedit_commit(&merged_paths, worktree, fileindex,
6502 		    tmp_branch, hle, repo);
6503 		got_worktree_rebase_pathlist_free(&merged_paths);
6504 		if (error)
6505 			goto done;
6506 	}
6507 
6508 	if (rebase_status == GOT_STATUS_CONFLICT) {
6509 		error = got_worktree_histedit_postpone(worktree, fileindex);
6510 		if (error)
6511 			goto done;
6512 		error = got_error_msg(GOT_ERR_CONFLICTS,
6513 		    "conflicts must be resolved before rebasing can continue");
6514 	} else
6515 		error = histedit_complete(worktree, fileindex, tmp_branch,
6516 		    branch, repo);
6517 done:
6518 	got_object_id_queue_free(&commits);
6519 	histedit_free_list(&histedit_cmds);
6520 	free(head_commit_id);
6521 	free(base_commit_id);
6522 	free(resume_commit_id);
6523 	if (commit)
6524 		got_object_commit_close(commit);
6525 	if (branch)
6526 		got_ref_close(branch);
6527 	if (tmp_branch)
6528 		got_ref_close(tmp_branch);
6529 	if (worktree)
6530 		got_worktree_close(worktree);
6531 	if (repo)
6532 		got_repo_close(repo);
6533 	return error;
6534 }
6535 
6536 __dead static void
6537 usage_integrate(void)
6538 {
6539 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6540 	exit(1);
6541 }
6542 
6543 static const struct got_error *
6544 cmd_integrate(int argc, char *argv[])
6545 {
6546 	const struct got_error *error = NULL;
6547 	struct got_repository *repo = NULL;
6548 	struct got_worktree *worktree = NULL;
6549 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6550 	const char *branch_arg = NULL;
6551 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6552 	struct got_fileindex *fileindex = NULL;
6553 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6554 	int ch, did_something = 0;
6555 
6556 	while ((ch = getopt(argc, argv, "")) != -1) {
6557 		switch (ch) {
6558 		default:
6559 			usage_integrate();
6560 			/* NOTREACHED */
6561 		}
6562 	}
6563 
6564 	argc -= optind;
6565 	argv += optind;
6566 
6567 	if (argc != 1)
6568 		usage_integrate();
6569 	branch_arg = argv[0];
6570 
6571 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6572 	    "unveil", NULL) == -1)
6573 		err(1, "pledge");
6574 
6575 	cwd = getcwd(NULL, 0);
6576 	if (cwd == NULL) {
6577 		error = got_error_from_errno("getcwd");
6578 		goto done;
6579 	}
6580 
6581 	error = got_worktree_open(&worktree, cwd);
6582 	if (error)
6583 		goto done;
6584 
6585 	error = check_rebase_or_histedit_in_progress(worktree);
6586 	if (error)
6587 		goto done;
6588 
6589 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6590 	    NULL);
6591 	if (error != NULL)
6592 		goto done;
6593 
6594 	error = apply_unveil(got_repo_get_path(repo), 0,
6595 	    got_worktree_get_root_path(worktree));
6596 	if (error)
6597 		goto done;
6598 
6599 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6600 		error = got_error_from_errno("asprintf");
6601 		goto done;
6602 	}
6603 
6604 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6605 	    &base_branch_ref, worktree, refname, repo);
6606 	if (error)
6607 		goto done;
6608 
6609 	refname = strdup(got_ref_get_name(branch_ref));
6610 	if (refname == NULL) {
6611 		error = got_error_from_errno("strdup");
6612 		got_worktree_integrate_abort(worktree, fileindex, repo,
6613 		    branch_ref, base_branch_ref);
6614 		goto done;
6615 	}
6616 	base_refname = strdup(got_ref_get_name(base_branch_ref));
6617 	if (base_refname == NULL) {
6618 		error = got_error_from_errno("strdup");
6619 		got_worktree_integrate_abort(worktree, fileindex, repo,
6620 		    branch_ref, base_branch_ref);
6621 		goto done;
6622 	}
6623 
6624 	error = got_ref_resolve(&commit_id, repo, branch_ref);
6625 	if (error)
6626 		goto done;
6627 
6628 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6629 	if (error)
6630 		goto done;
6631 
6632 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6633 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
6634 		    "specified branch has already been integrated");
6635 		got_worktree_integrate_abort(worktree, fileindex, repo,
6636 		    branch_ref, base_branch_ref);
6637 		goto done;
6638 	}
6639 
6640 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6641 	if (error) {
6642 		if (error->code == GOT_ERR_ANCESTRY)
6643 			error = got_error(GOT_ERR_REBASE_REQUIRED);
6644 		got_worktree_integrate_abort(worktree, fileindex, repo,
6645 		    branch_ref, base_branch_ref);
6646 		goto done;
6647 	}
6648 
6649 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
6650 	    branch_ref, base_branch_ref, update_progress, &did_something,
6651 	    check_cancelled, NULL);
6652 	if (error)
6653 		goto done;
6654 
6655 	printf("Integrated %s into %s\n", refname, base_refname);
6656 done:
6657 	if (repo)
6658 		got_repo_close(repo);
6659 	if (worktree)
6660 		got_worktree_close(worktree);
6661 	free(cwd);
6662 	free(base_commit_id);
6663 	free(commit_id);
6664 	free(refname);
6665 	free(base_refname);
6666 	return error;
6667 }
6668 
6669 __dead static void
6670 usage_stage(void)
6671 {
6672 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6673 	    "[file-path ...]\n",
6674 	    getprogname());
6675 	exit(1);
6676 }
6677 
6678 static const struct got_error *
6679 print_stage(void *arg, unsigned char status, unsigned char staged_status,
6680     const char *path, struct got_object_id *blob_id,
6681     struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6682 {
6683 	const struct got_error *err = NULL;
6684 	char *id_str = NULL;
6685 
6686 	if (staged_status != GOT_STATUS_ADD &&
6687 	    staged_status != GOT_STATUS_MODIFY &&
6688 	    staged_status != GOT_STATUS_DELETE)
6689 		return NULL;
6690 
6691 	if (staged_status == GOT_STATUS_ADD ||
6692 	    staged_status == GOT_STATUS_MODIFY)
6693 		err = got_object_id_str(&id_str, staged_blob_id);
6694 	else
6695 		err = got_object_id_str(&id_str, blob_id);
6696 	if (err)
6697 		return err;
6698 
6699 	printf("%s %c %s\n", id_str, staged_status, path);
6700 	free(id_str);
6701 	return NULL;
6702 }
6703 
6704 static const struct got_error *
6705 cmd_stage(int argc, char *argv[])
6706 {
6707 	const struct got_error *error = NULL;
6708 	struct got_repository *repo = NULL;
6709 	struct got_worktree *worktree = NULL;
6710 	char *cwd = NULL;
6711 	struct got_pathlist_head paths;
6712 	struct got_pathlist_entry *pe;
6713 	int ch, list_stage = 0, pflag = 0;
6714 	FILE *patch_script_file = NULL;
6715 	const char *patch_script_path = NULL;
6716 	struct choose_patch_arg cpa;
6717 
6718 	TAILQ_INIT(&paths);
6719 
6720 	while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6721 		switch (ch) {
6722 		case 'l':
6723 			list_stage = 1;
6724 			break;
6725 		case 'p':
6726 			pflag = 1;
6727 			break;
6728 		case 'F':
6729 			patch_script_path = optarg;
6730 			break;
6731 		default:
6732 			usage_stage();
6733 			/* NOTREACHED */
6734 		}
6735 	}
6736 
6737 	argc -= optind;
6738 	argv += optind;
6739 
6740 #ifndef PROFILE
6741 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6742 	    "unveil", NULL) == -1)
6743 		err(1, "pledge");
6744 #endif
6745 	if (list_stage && (pflag || patch_script_path))
6746 		errx(1, "-l option cannot be used with other options");
6747 	if (patch_script_path && !pflag)
6748 		errx(1, "-F option can only be used together with -p option");
6749 
6750 	cwd = getcwd(NULL, 0);
6751 	if (cwd == NULL) {
6752 		error = got_error_from_errno("getcwd");
6753 		goto done;
6754 	}
6755 
6756 	error = got_worktree_open(&worktree, cwd);
6757 	if (error)
6758 		goto done;
6759 
6760 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6761 	    NULL);
6762 	if (error != NULL)
6763 		goto done;
6764 
6765 	if (patch_script_path) {
6766 		patch_script_file = fopen(patch_script_path, "r");
6767 		if (patch_script_file == NULL) {
6768 			error = got_error_from_errno2("fopen",
6769 			    patch_script_path);
6770 			goto done;
6771 		}
6772 	}
6773 	error = apply_unveil(got_repo_get_path(repo), 0,
6774 	    got_worktree_get_root_path(worktree));
6775 	if (error)
6776 		goto done;
6777 
6778 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6779 	if (error)
6780 		goto done;
6781 
6782 	if (list_stage)
6783 		error = got_worktree_status(worktree, &paths, repo,
6784 		    print_stage, NULL, check_cancelled, NULL);
6785 	else {
6786 		cpa.patch_script_file = patch_script_file;
6787 		cpa.action = "stage";
6788 		error = got_worktree_stage(worktree, &paths,
6789 		    pflag ? NULL : print_status, NULL,
6790 		    pflag ? choose_patch : NULL, &cpa, repo);
6791 	}
6792 done:
6793 	if (patch_script_file && fclose(patch_script_file) == EOF &&
6794 	    error == NULL)
6795 		error = got_error_from_errno2("fclose", patch_script_path);
6796 	if (repo)
6797 		got_repo_close(repo);
6798 	if (worktree)
6799 		got_worktree_close(worktree);
6800 	TAILQ_FOREACH(pe, &paths, entry)
6801 		free((char *)pe->path);
6802 	got_pathlist_free(&paths);
6803 	free(cwd);
6804 	return error;
6805 }
6806 
6807 __dead static void
6808 usage_unstage(void)
6809 {
6810 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6811 	    "[file-path ...]\n",
6812 	    getprogname());
6813 	exit(1);
6814 }
6815 
6816 
6817 static const struct got_error *
6818 cmd_unstage(int argc, char *argv[])
6819 {
6820 	const struct got_error *error = NULL;
6821 	struct got_repository *repo = NULL;
6822 	struct got_worktree *worktree = NULL;
6823 	char *cwd = NULL;
6824 	struct got_pathlist_head paths;
6825 	struct got_pathlist_entry *pe;
6826 	int ch, did_something = 0, pflag = 0;
6827 	FILE *patch_script_file = NULL;
6828 	const char *patch_script_path = NULL;
6829 	struct choose_patch_arg cpa;
6830 
6831 	TAILQ_INIT(&paths);
6832 
6833 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
6834 		switch (ch) {
6835 		case 'p':
6836 			pflag = 1;
6837 			break;
6838 		case 'F':
6839 			patch_script_path = optarg;
6840 			break;
6841 		default:
6842 			usage_unstage();
6843 			/* NOTREACHED */
6844 		}
6845 	}
6846 
6847 	argc -= optind;
6848 	argv += optind;
6849 
6850 #ifndef PROFILE
6851 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6852 	    "unveil", NULL) == -1)
6853 		err(1, "pledge");
6854 #endif
6855 	if (patch_script_path && !pflag)
6856 		errx(1, "-F option can only be used together with -p option");
6857 
6858 	cwd = getcwd(NULL, 0);
6859 	if (cwd == NULL) {
6860 		error = got_error_from_errno("getcwd");
6861 		goto done;
6862 	}
6863 
6864 	error = got_worktree_open(&worktree, cwd);
6865 	if (error)
6866 		goto done;
6867 
6868 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6869 	    NULL);
6870 	if (error != NULL)
6871 		goto done;
6872 
6873 	if (patch_script_path) {
6874 		patch_script_file = fopen(patch_script_path, "r");
6875 		if (patch_script_file == NULL) {
6876 			error = got_error_from_errno2("fopen",
6877 			    patch_script_path);
6878 			goto done;
6879 		}
6880 	}
6881 
6882 	error = apply_unveil(got_repo_get_path(repo), 0,
6883 	    got_worktree_get_root_path(worktree));
6884 	if (error)
6885 		goto done;
6886 
6887 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6888 	if (error)
6889 		goto done;
6890 
6891 	cpa.patch_script_file = patch_script_file;
6892 	cpa.action = "unstage";
6893 	error = got_worktree_unstage(worktree, &paths, update_progress,
6894 	    &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6895 done:
6896 	if (patch_script_file && fclose(patch_script_file) == EOF &&
6897 	    error == NULL)
6898 		error = got_error_from_errno2("fclose", patch_script_path);
6899 	if (repo)
6900 		got_repo_close(repo);
6901 	if (worktree)
6902 		got_worktree_close(worktree);
6903 	TAILQ_FOREACH(pe, &paths, entry)
6904 		free((char *)pe->path);
6905 	got_pathlist_free(&paths);
6906 	free(cwd);
6907 	return error;
6908 }
6909 
6910 __dead static void
6911 usage_cat(void)
6912 {
6913 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
6914 	    "arg1 [arg2 ...]\n", getprogname());
6915 	exit(1);
6916 }
6917 
6918 static const struct got_error *
6919 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6920 {
6921 	const struct got_error *err;
6922 	struct got_blob_object *blob;
6923 
6924 	err = got_object_open_as_blob(&blob, repo, id, 8192);
6925 	if (err)
6926 		return err;
6927 
6928 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6929 	got_object_blob_close(blob);
6930 	return err;
6931 }
6932 
6933 static const struct got_error *
6934 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6935 {
6936 	const struct got_error *err;
6937 	struct got_tree_object *tree;
6938 	const struct got_tree_entries *entries;
6939 	struct got_tree_entry *te;
6940 
6941 	err = got_object_open_as_tree(&tree, repo, id);
6942 	if (err)
6943 		return err;
6944 
6945 	entries = got_object_tree_get_entries(tree);
6946 	te = SIMPLEQ_FIRST(&entries->head);
6947 	while (te) {
6948 		char *id_str;
6949 		if (sigint_received || sigpipe_received)
6950 			break;
6951 		err = got_object_id_str(&id_str, te->id);
6952 		if (err)
6953 			break;
6954 		fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6955 		free(id_str);
6956 		te = SIMPLEQ_NEXT(te, entry);
6957 	}
6958 
6959 	got_object_tree_close(tree);
6960 	return err;
6961 }
6962 
6963 static const struct got_error *
6964 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6965 {
6966 	const struct got_error *err;
6967 	struct got_commit_object *commit;
6968 	const struct got_object_id_queue *parent_ids;
6969 	struct got_object_qid *pid;
6970 	char *id_str = NULL;
6971 	const char *logmsg = NULL;
6972 
6973 	err = got_object_open_as_commit(&commit, repo, id);
6974 	if (err)
6975 		return err;
6976 
6977 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6978 	if (err)
6979 		goto done;
6980 
6981 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6982 	parent_ids = got_object_commit_get_parent_ids(commit);
6983 	fprintf(outfile, "numparents %d\n",
6984 	    got_object_commit_get_nparents(commit));
6985 	SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6986 		char *pid_str;
6987 		err = got_object_id_str(&pid_str, pid->id);
6988 		if (err)
6989 			goto done;
6990 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6991 		free(pid_str);
6992 	}
6993 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6994 	    got_object_commit_get_author(commit),
6995 	    got_object_commit_get_author_time(commit));
6996 
6997 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
6998 	    got_object_commit_get_author(commit),
6999 	    got_object_commit_get_committer_time(commit));
7000 
7001 	logmsg = got_object_commit_get_logmsg_raw(commit);
7002 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7003 	fprintf(outfile, "%s", logmsg);
7004 done:
7005 	free(id_str);
7006 	got_object_commit_close(commit);
7007 	return err;
7008 }
7009 
7010 static const struct got_error *
7011 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7012 {
7013 	const struct got_error *err;
7014 	struct got_tag_object *tag;
7015 	char *id_str = NULL;
7016 	const char *tagmsg = NULL;
7017 
7018 	err = got_object_open_as_tag(&tag, repo, id);
7019 	if (err)
7020 		return err;
7021 
7022 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7023 	if (err)
7024 		goto done;
7025 
7026 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7027 
7028 	switch (got_object_tag_get_object_type(tag)) {
7029 	case GOT_OBJ_TYPE_BLOB:
7030 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7031 		    GOT_OBJ_LABEL_BLOB);
7032 		break;
7033 	case GOT_OBJ_TYPE_TREE:
7034 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7035 		    GOT_OBJ_LABEL_TREE);
7036 		break;
7037 	case GOT_OBJ_TYPE_COMMIT:
7038 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7039 		    GOT_OBJ_LABEL_COMMIT);
7040 		break;
7041 	case GOT_OBJ_TYPE_TAG:
7042 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7043 		    GOT_OBJ_LABEL_TAG);
7044 		break;
7045 	default:
7046 		break;
7047 	}
7048 
7049 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7050 	    got_object_tag_get_name(tag));
7051 
7052 	fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7053 	    got_object_tag_get_tagger(tag),
7054 	    got_object_tag_get_tagger_time(tag));
7055 
7056 	tagmsg = got_object_tag_get_message(tag);
7057 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7058 	fprintf(outfile, "%s", tagmsg);
7059 done:
7060 	free(id_str);
7061 	got_object_tag_close(tag);
7062 	return err;
7063 }
7064 
7065 static const struct got_error *
7066 cmd_cat(int argc, char *argv[])
7067 {
7068 	const struct got_error *error;
7069 	struct got_repository *repo = NULL;
7070 	struct got_worktree *worktree = NULL;
7071 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
7072 	const char *commit_id_str = NULL;
7073 	struct got_object_id *id = NULL, *commit_id = NULL;
7074 	int ch, obj_type, i, force_path = 0;
7075 
7076 #ifndef PROFILE
7077 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7078 	    NULL) == -1)
7079 		err(1, "pledge");
7080 #endif
7081 
7082 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7083 		switch (ch) {
7084 		case 'c':
7085 			commit_id_str = optarg;
7086 			break;
7087 		case 'r':
7088 			repo_path = realpath(optarg, NULL);
7089 			if (repo_path == NULL)
7090 				return got_error_from_errno2("realpath",
7091 				    optarg);
7092 			got_path_strip_trailing_slashes(repo_path);
7093 			break;
7094 		case 'P':
7095 			force_path = 1;
7096 			break;
7097 		default:
7098 			usage_cat();
7099 			/* NOTREACHED */
7100 		}
7101 	}
7102 
7103 	argc -= optind;
7104 	argv += optind;
7105 
7106 	cwd = getcwd(NULL, 0);
7107 	if (cwd == NULL) {
7108 		error = got_error_from_errno("getcwd");
7109 		goto done;
7110 	}
7111 	error = got_worktree_open(&worktree, cwd);
7112 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
7113 		goto done;
7114 	if (worktree) {
7115 		if (repo_path == NULL) {
7116 			repo_path = strdup(
7117 			    got_worktree_get_repo_path(worktree));
7118 			if (repo_path == NULL) {
7119 				error = got_error_from_errno("strdup");
7120 				goto done;
7121 			}
7122 		}
7123 	}
7124 
7125 	if (repo_path == NULL) {
7126 		repo_path = getcwd(NULL, 0);
7127 		if (repo_path == NULL)
7128 			return got_error_from_errno("getcwd");
7129 	}
7130 
7131 	error = got_repo_open(&repo, repo_path, NULL);
7132 	free(repo_path);
7133 	if (error != NULL)
7134 		goto done;
7135 
7136 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7137 	if (error)
7138 		goto done;
7139 
7140 	if (commit_id_str == NULL)
7141 		commit_id_str = GOT_REF_HEAD;
7142 	error = resolve_commit_arg(&commit_id, commit_id_str, repo);
7143 	if (error)
7144 		goto done;
7145 
7146 	for (i = 0; i < argc; i++) {
7147 		if (force_path) {
7148 			error = got_object_id_by_path(&id, repo, commit_id,
7149 			    argv[i]);
7150 			if (error)
7151 				break;
7152 		} else {
7153 			error = match_object_id(&id, &label, argv[i],
7154 			    GOT_OBJ_TYPE_ANY, 0, repo);
7155 			if (error) {
7156 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7157 				    error->code != GOT_ERR_NOT_REF)
7158 					break;
7159 				error = got_object_id_by_path(&id, repo,
7160 				    commit_id, argv[i]);
7161 				if (error)
7162 					break;
7163 			}
7164 		}
7165 
7166 		error = got_object_get_type(&obj_type, repo, id);
7167 		if (error)
7168 			break;
7169 
7170 		switch (obj_type) {
7171 		case GOT_OBJ_TYPE_BLOB:
7172 			error = cat_blob(id, repo, stdout);
7173 			break;
7174 		case GOT_OBJ_TYPE_TREE:
7175 			error = cat_tree(id, repo, stdout);
7176 			break;
7177 		case GOT_OBJ_TYPE_COMMIT:
7178 			error = cat_commit(id, repo, stdout);
7179 			break;
7180 		case GOT_OBJ_TYPE_TAG:
7181 			error = cat_tag(id, repo, stdout);
7182 			break;
7183 		default:
7184 			error = got_error(GOT_ERR_OBJ_TYPE);
7185 			break;
7186 		}
7187 		if (error)
7188 			break;
7189 		free(label);
7190 		label = NULL;
7191 		free(id);
7192 		id = NULL;
7193 	}
7194 
7195 done:
7196 	free(label);
7197 	free(id);
7198 	free(commit_id);
7199 	if (worktree)
7200 		got_worktree_close(worktree);
7201 	if (repo) {
7202 		const struct got_error *repo_error;
7203 		repo_error = got_repo_close(repo);
7204 		if (error == NULL)
7205 			error = repo_error;
7206 	}
7207 	return error;
7208 }