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