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