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