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