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