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 	struct got_object_id *obj_id = NULL;
4104 	struct got_object_id *commit_id = NULL;
4105 	struct got_blob_object *blob = NULL;
4106 	char *commit_id_str = NULL;
4107 	struct blame_cb_args bca;
4108 	int ch, obj_type, i;
4109 	size_t filesize;
4110 
4111 	memset(&bca, 0, sizeof(bca));
4112 
4113 #ifndef PROFILE
4114 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4115 	    NULL) == -1)
4116 		err(1, "pledge");
4117 #endif
4118 
4119 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4120 		switch (ch) {
4121 		case 'c':
4122 			commit_id_str = optarg;
4123 			break;
4124 		case 'r':
4125 			repo_path = realpath(optarg, NULL);
4126 			if (repo_path == NULL)
4127 				return got_error_from_errno2("realpath",
4128 				    optarg);
4129 			got_path_strip_trailing_slashes(repo_path);
4130 			break;
4131 		default:
4132 			usage_blame();
4133 			/* NOTREACHED */
4134 		}
4135 	}
4136 
4137 	argc -= optind;
4138 	argv += optind;
4139 
4140 	if (argc == 1)
4141 		path = argv[0];
4142 	else
4143 		usage_blame();
4144 
4145 	cwd = getcwd(NULL, 0);
4146 	if (cwd == NULL) {
4147 		error = got_error_from_errno("getcwd");
4148 		goto done;
4149 	}
4150 	if (repo_path == NULL) {
4151 		error = got_worktree_open(&worktree, cwd);
4152 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4153 			goto done;
4154 		else
4155 			error = NULL;
4156 		if (worktree) {
4157 			repo_path =
4158 			    strdup(got_worktree_get_repo_path(worktree));
4159 			if (repo_path == NULL) {
4160 				error = got_error_from_errno("strdup");
4161 				if (error)
4162 					goto done;
4163 			}
4164 		} else {
4165 			repo_path = strdup(cwd);
4166 			if (repo_path == NULL) {
4167 				error = got_error_from_errno("strdup");
4168 				goto done;
4169 			}
4170 		}
4171 	}
4172 
4173 	error = got_repo_open(&repo, repo_path, NULL);
4174 	if (error != NULL)
4175 		goto done;
4176 
4177 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4178 	if (error)
4179 		goto done;
4180 
4181 	if (worktree) {
4182 		const char *prefix = got_worktree_get_path_prefix(worktree);
4183 		char *p, *worktree_subdir = cwd +
4184 		    strlen(got_worktree_get_root_path(worktree));
4185 		if (asprintf(&p, "%s%s%s%s%s",
4186 		    prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4187 		    worktree_subdir, worktree_subdir[0] ? "/" : "",
4188 		    path) == -1) {
4189 			error = got_error_from_errno("asprintf");
4190 			goto done;
4191 		}
4192 		error = got_repo_map_path(&in_repo_path, repo, p, 0);
4193 		free(p);
4194 	} else {
4195 		error = got_repo_map_path(&in_repo_path, repo, path, 1);
4196 	}
4197 	if (error)
4198 		goto done;
4199 
4200 	if (commit_id_str == NULL) {
4201 		struct got_reference *head_ref;
4202 		error = got_ref_open(&head_ref, repo, worktree ?
4203 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4204 		if (error != NULL)
4205 			goto done;
4206 		error = got_ref_resolve(&commit_id, repo, head_ref);
4207 		got_ref_close(head_ref);
4208 		if (error != NULL)
4209 			goto done;
4210 	} else {
4211 		error = got_repo_match_object_id(&commit_id, NULL,
4212 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4213 		if (error)
4214 			goto done;
4215 	}
4216 
4217 	error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
4218 	if (error)
4219 		goto done;
4220 
4221 	error = got_object_get_type(&obj_type, repo, obj_id);
4222 	if (error)
4223 		goto done;
4224 
4225 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
4226 		error = got_error(GOT_ERR_OBJ_TYPE);
4227 		goto done;
4228 	}
4229 
4230 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4231 	if (error)
4232 		goto done;
4233 	bca.f = got_opentemp();
4234 	if (bca.f == NULL) {
4235 		error = got_error_from_errno("got_opentemp");
4236 		goto done;
4237 	}
4238 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4239 	    &bca.line_offsets, bca.f, blob);
4240 	if (error || bca.nlines == 0)
4241 		goto done;
4242 
4243 	/* Don't include \n at EOF in the blame line count. */
4244 	if (bca.line_offsets[bca.nlines - 1] == filesize)
4245 		bca.nlines--;
4246 
4247 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4248 	if (bca.lines == NULL) {
4249 		error = got_error_from_errno("calloc");
4250 		goto done;
4251 	}
4252 	bca.lineno_cur = 1;
4253 	bca.nlines_prec = 0;
4254 	i = bca.nlines;
4255 	while (i > 0) {
4256 		i /= 10;
4257 		bca.nlines_prec++;
4258 	}
4259 	bca.repo = repo;
4260 
4261 	error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
4262 	    check_cancelled, NULL);
4263 done:
4264 	free(in_repo_path);
4265 	free(repo_path);
4266 	free(cwd);
4267 	free(commit_id);
4268 	free(obj_id);
4269 	if (blob)
4270 		got_object_blob_close(blob);
4271 	if (worktree)
4272 		got_worktree_close(worktree);
4273 	if (repo) {
4274 		const struct got_error *repo_error;
4275 		repo_error = got_repo_close(repo);
4276 		if (error == NULL)
4277 			error = repo_error;
4278 	}
4279 	if (bca.lines) {
4280 		for (i = 0; i < bca.nlines; i++) {
4281 			struct blame_line *bline = &bca.lines[i];
4282 			free(bline->id_str);
4283 			free(bline->committer);
4284 		}
4285 		free(bca.lines);
4286 	}
4287 	free(bca.line_offsets);
4288 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
4289 		error = got_error_from_errno("fclose");
4290 	return error;
4291 }
4292 
4293 __dead static void
4294 usage_tree(void)
4295 {
4296 	fprintf(stderr,
4297 	    "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4298 	    getprogname());
4299 	exit(1);
4300 }
4301 
4302 static const struct got_error *
4303 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4304     const char *root_path, struct got_repository *repo)
4305 {
4306 	const struct got_error *err = NULL;
4307 	int is_root_path = (strcmp(path, root_path) == 0);
4308 	const char *modestr = "";
4309 	mode_t mode = got_tree_entry_get_mode(te);
4310 	char *link_target = NULL;
4311 
4312 	path += strlen(root_path);
4313 	while (path[0] == '/')
4314 		path++;
4315 
4316 	if (got_object_tree_entry_is_submodule(te))
4317 		modestr = "$";
4318 	else if (S_ISLNK(mode)) {
4319 		int i;
4320 
4321 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4322 		if (err)
4323 			return err;
4324 		for (i = 0; i < strlen(link_target); i++) {
4325 			if (!isprint((unsigned char)link_target[i]))
4326 				link_target[i] = '?';
4327 		}
4328 
4329 		modestr = "@";
4330 	}
4331 	else if (S_ISDIR(mode))
4332 		modestr = "/";
4333 	else if (mode & S_IXUSR)
4334 		modestr = "*";
4335 
4336 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4337 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4338 	    link_target ? " -> ": "", link_target ? link_target : "");
4339 
4340 	free(link_target);
4341 	return NULL;
4342 }
4343 
4344 static const struct got_error *
4345 print_tree(const char *path, struct got_object_id *commit_id,
4346     int show_ids, int recurse, const char *root_path,
4347     struct got_repository *repo)
4348 {
4349 	const struct got_error *err = NULL;
4350 	struct got_object_id *tree_id = NULL;
4351 	struct got_tree_object *tree = NULL;
4352 	int nentries, i;
4353 
4354 	err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4355 	if (err)
4356 		goto done;
4357 
4358 	err = got_object_open_as_tree(&tree, repo, tree_id);
4359 	if (err)
4360 		goto done;
4361 	nentries = got_object_tree_get_nentries(tree);
4362 	for (i = 0; i < nentries; i++) {
4363 		struct got_tree_entry *te;
4364 		char *id = NULL;
4365 
4366 		if (sigint_received || sigpipe_received)
4367 			break;
4368 
4369 		te = got_object_tree_get_entry(tree, i);
4370 		if (show_ids) {
4371 			char *id_str;
4372 			err = got_object_id_str(&id_str,
4373 			    got_tree_entry_get_id(te));
4374 			if (err)
4375 				goto done;
4376 			if (asprintf(&id, "%s ", id_str) == -1) {
4377 				err = got_error_from_errno("asprintf");
4378 				free(id_str);
4379 				goto done;
4380 			}
4381 			free(id_str);
4382 		}
4383 		err = print_entry(te, id, path, root_path, repo);
4384 		free(id);
4385 		if (err)
4386 			goto done;
4387 
4388 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4389 			char *child_path;
4390 			if (asprintf(&child_path, "%s%s%s", path,
4391 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
4392 			    got_tree_entry_get_name(te)) == -1) {
4393 				err = got_error_from_errno("asprintf");
4394 				goto done;
4395 			}
4396 			err = print_tree(child_path, commit_id, show_ids, 1,
4397 			    root_path, repo);
4398 			free(child_path);
4399 			if (err)
4400 				goto done;
4401 		}
4402 	}
4403 done:
4404 	if (tree)
4405 		got_object_tree_close(tree);
4406 	free(tree_id);
4407 	return err;
4408 }
4409 
4410 static const struct got_error *
4411 cmd_tree(int argc, char *argv[])
4412 {
4413 	const struct got_error *error;
4414 	struct got_repository *repo = NULL;
4415 	struct got_worktree *worktree = NULL;
4416 	const char *path, *refname = NULL;
4417 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4418 	struct got_object_id *commit_id = NULL;
4419 	char *commit_id_str = NULL;
4420 	int show_ids = 0, recurse = 0;
4421 	int ch;
4422 
4423 #ifndef PROFILE
4424 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4425 	    NULL) == -1)
4426 		err(1, "pledge");
4427 #endif
4428 
4429 	while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4430 		switch (ch) {
4431 		case 'c':
4432 			commit_id_str = optarg;
4433 			break;
4434 		case 'r':
4435 			repo_path = realpath(optarg, NULL);
4436 			if (repo_path == NULL)
4437 				return got_error_from_errno2("realpath",
4438 				    optarg);
4439 			got_path_strip_trailing_slashes(repo_path);
4440 			break;
4441 		case 'i':
4442 			show_ids = 1;
4443 			break;
4444 		case 'R':
4445 			recurse = 1;
4446 			break;
4447 		default:
4448 			usage_tree();
4449 			/* NOTREACHED */
4450 		}
4451 	}
4452 
4453 	argc -= optind;
4454 	argv += optind;
4455 
4456 	if (argc == 1)
4457 		path = argv[0];
4458 	else if (argc > 1)
4459 		usage_tree();
4460 	else
4461 		path = NULL;
4462 
4463 	cwd = getcwd(NULL, 0);
4464 	if (cwd == NULL) {
4465 		error = got_error_from_errno("getcwd");
4466 		goto done;
4467 	}
4468 	if (repo_path == NULL) {
4469 		error = got_worktree_open(&worktree, cwd);
4470 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4471 			goto done;
4472 		else
4473 			error = NULL;
4474 		if (worktree) {
4475 			repo_path =
4476 			    strdup(got_worktree_get_repo_path(worktree));
4477 			if (repo_path == NULL)
4478 				error = got_error_from_errno("strdup");
4479 			if (error)
4480 				goto done;
4481 		} else {
4482 			repo_path = strdup(cwd);
4483 			if (repo_path == NULL) {
4484 				error = got_error_from_errno("strdup");
4485 				goto done;
4486 			}
4487 		}
4488 	}
4489 
4490 	error = got_repo_open(&repo, repo_path, NULL);
4491 	if (error != NULL)
4492 		goto done;
4493 
4494 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4495 	if (error)
4496 		goto done;
4497 
4498 	if (path == NULL) {
4499 		if (worktree) {
4500 			char *p, *worktree_subdir = cwd +
4501 			    strlen(got_worktree_get_root_path(worktree));
4502 			if (asprintf(&p, "%s/%s",
4503 			    got_worktree_get_path_prefix(worktree),
4504 			    worktree_subdir) == -1) {
4505 				error = got_error_from_errno("asprintf");
4506 				goto done;
4507 			}
4508 			error = got_repo_map_path(&in_repo_path, repo, p, 0);
4509 			free(p);
4510 			if (error)
4511 				goto done;
4512 		} else
4513 			path = "/";
4514 	}
4515 	if (in_repo_path == NULL) {
4516 		error = got_repo_map_path(&in_repo_path, repo, path, 1);
4517 		if (error != NULL)
4518 			goto done;
4519 	}
4520 
4521 	if (commit_id_str == NULL) {
4522 		struct got_reference *head_ref;
4523 		if (worktree)
4524 			refname = got_worktree_get_head_ref_name(worktree);
4525 		else
4526 			refname = GOT_REF_HEAD;
4527 		error = got_ref_open(&head_ref, repo, refname, 0);
4528 		if (error != NULL)
4529 			goto done;
4530 		error = got_ref_resolve(&commit_id, repo, head_ref);
4531 		got_ref_close(head_ref);
4532 		if (error != NULL)
4533 			goto done;
4534 	} else {
4535 		error = got_repo_match_object_id(&commit_id, NULL,
4536 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4537 		if (error)
4538 			goto done;
4539 	}
4540 
4541 	error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4542 	    in_repo_path, repo);
4543 done:
4544 	free(in_repo_path);
4545 	free(repo_path);
4546 	free(cwd);
4547 	free(commit_id);
4548 	if (worktree)
4549 		got_worktree_close(worktree);
4550 	if (repo) {
4551 		const struct got_error *repo_error;
4552 		repo_error = got_repo_close(repo);
4553 		if (error == NULL)
4554 			error = repo_error;
4555 	}
4556 	return error;
4557 }
4558 
4559 __dead static void
4560 usage_status(void)
4561 {
4562 	fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4563 	exit(1);
4564 }
4565 
4566 static const struct got_error *
4567 print_status(void *arg, unsigned char status, unsigned char staged_status,
4568     const char *path, struct got_object_id *blob_id,
4569     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4570     int dirfd, const char *de_name)
4571 {
4572 	if (status == staged_status && (status == GOT_STATUS_DELETE))
4573 		status = GOT_STATUS_NO_CHANGE;
4574 	printf("%c%c %s\n", status, staged_status, path);
4575 	return NULL;
4576 }
4577 
4578 static const struct got_error *
4579 cmd_status(int argc, char *argv[])
4580 {
4581 	const struct got_error *error = NULL;
4582 	struct got_repository *repo = NULL;
4583 	struct got_worktree *worktree = NULL;
4584 	char *cwd = NULL;
4585 	struct got_pathlist_head paths;
4586 	struct got_pathlist_entry *pe;
4587 	int ch;
4588 
4589 	TAILQ_INIT(&paths);
4590 
4591 	while ((ch = getopt(argc, argv, "")) != -1) {
4592 		switch (ch) {
4593 		default:
4594 			usage_status();
4595 			/* NOTREACHED */
4596 		}
4597 	}
4598 
4599 	argc -= optind;
4600 	argv += optind;
4601 
4602 #ifndef PROFILE
4603 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4604 	    NULL) == -1)
4605 		err(1, "pledge");
4606 #endif
4607 	cwd = getcwd(NULL, 0);
4608 	if (cwd == NULL) {
4609 		error = got_error_from_errno("getcwd");
4610 		goto done;
4611 	}
4612 
4613 	error = got_worktree_open(&worktree, cwd);
4614 	if (error) {
4615 		if (error->code == GOT_ERR_NOT_WORKTREE)
4616 			error = wrap_not_worktree_error(error, "status", cwd);
4617 		goto done;
4618 	}
4619 
4620 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4621 	    NULL);
4622 	if (error != NULL)
4623 		goto done;
4624 
4625 	error = apply_unveil(got_repo_get_path(repo), 1,
4626 	    got_worktree_get_root_path(worktree));
4627 	if (error)
4628 		goto done;
4629 
4630 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4631 	if (error)
4632 		goto done;
4633 
4634 	error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4635 	    check_cancelled, NULL);
4636 done:
4637 	TAILQ_FOREACH(pe, &paths, entry)
4638 		free((char *)pe->path);
4639 	got_pathlist_free(&paths);
4640 	free(cwd);
4641 	return error;
4642 }
4643 
4644 __dead static void
4645 usage_ref(void)
4646 {
4647 	fprintf(stderr,
4648 	    "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4649 	        "[-d] [name]\n",
4650 	    getprogname());
4651 	exit(1);
4652 }
4653 
4654 static const struct got_error *
4655 list_refs(struct got_repository *repo, const char *refname)
4656 {
4657 	static const struct got_error *err = NULL;
4658 	struct got_reflist_head refs;
4659 	struct got_reflist_entry *re;
4660 
4661 	SIMPLEQ_INIT(&refs);
4662 	err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4663 	if (err)
4664 		return err;
4665 
4666 	SIMPLEQ_FOREACH(re, &refs, entry) {
4667 		char *refstr;
4668 		refstr = got_ref_to_str(re->ref);
4669 		if (refstr == NULL)
4670 			return got_error_from_errno("got_ref_to_str");
4671 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4672 		free(refstr);
4673 	}
4674 
4675 	got_ref_list_free(&refs);
4676 	return NULL;
4677 }
4678 
4679 static const struct got_error *
4680 delete_ref(struct got_repository *repo, const char *refname)
4681 {
4682 	const struct got_error *err = NULL;
4683 	struct got_reference *ref;
4684 
4685 	err = got_ref_open(&ref, repo, refname, 0);
4686 	if (err)
4687 		return err;
4688 
4689 	err = got_ref_delete(ref, repo);
4690 	got_ref_close(ref);
4691 	return err;
4692 }
4693 
4694 static const struct got_error *
4695 add_ref(struct got_repository *repo, const char *refname, const char *target)
4696 {
4697 	const struct got_error *err = NULL;
4698 	struct got_object_id *id;
4699 	struct got_reference *ref = NULL;
4700 
4701 	/*
4702 	 * Don't let the user create a reference name with a leading '-'.
4703 	 * While technically a valid reference name, this case is usually
4704 	 * an unintended typo.
4705 	 */
4706 	if (refname[0] == '-')
4707 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4708 
4709 	err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4710 	    repo);
4711 	if (err) {
4712 		struct got_reference *target_ref;
4713 
4714 		if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4715 			return err;
4716 		err = got_ref_open(&target_ref, repo, target, 0);
4717 		if (err)
4718 			return err;
4719 		err = got_ref_resolve(&id, repo, target_ref);
4720 		got_ref_close(target_ref);
4721 		if (err)
4722 			return err;
4723 	}
4724 
4725 	err = got_ref_alloc(&ref, refname, id);
4726 	if (err)
4727 		goto done;
4728 
4729 	err = got_ref_write(ref, repo);
4730 done:
4731 	if (ref)
4732 		got_ref_close(ref);
4733 	free(id);
4734 	return err;
4735 }
4736 
4737 static const struct got_error *
4738 add_symref(struct got_repository *repo, const char *refname, const char *target)
4739 {
4740 	const struct got_error *err = NULL;
4741 	struct got_reference *ref = NULL;
4742 	struct got_reference *target_ref = NULL;
4743 
4744 	/*
4745 	 * Don't let the user create a reference name with a leading '-'.
4746 	 * While technically a valid reference name, this case is usually
4747 	 * an unintended typo.
4748 	 */
4749 	if (refname[0] == '-')
4750 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4751 
4752 	err = got_ref_open(&target_ref, repo, target, 0);
4753 	if (err)
4754 		return err;
4755 
4756 	err = got_ref_alloc_symref(&ref, refname, target_ref);
4757 	if (err)
4758 		goto done;
4759 
4760 	err = got_ref_write(ref, repo);
4761 done:
4762 	if (target_ref)
4763 		got_ref_close(target_ref);
4764 	if (ref)
4765 		got_ref_close(ref);
4766 	return err;
4767 }
4768 
4769 static const struct got_error *
4770 cmd_ref(int argc, char *argv[])
4771 {
4772 	const struct got_error *error = NULL;
4773 	struct got_repository *repo = NULL;
4774 	struct got_worktree *worktree = NULL;
4775 	char *cwd = NULL, *repo_path = NULL;
4776 	int ch, do_list = 0, do_delete = 0;
4777 	const char *obj_arg = NULL, *symref_target= NULL;
4778 	char *refname = NULL;
4779 
4780 	while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4781 		switch (ch) {
4782 		case 'c':
4783 			obj_arg = optarg;
4784 			break;
4785 		case 'd':
4786 			do_delete = 1;
4787 			break;
4788 		case 'r':
4789 			repo_path = realpath(optarg, NULL);
4790 			if (repo_path == NULL)
4791 				return got_error_from_errno2("realpath",
4792 				    optarg);
4793 			got_path_strip_trailing_slashes(repo_path);
4794 			break;
4795 		case 'l':
4796 			do_list = 1;
4797 			break;
4798 		case 's':
4799 			symref_target = optarg;
4800 			break;
4801 		default:
4802 			usage_ref();
4803 			/* NOTREACHED */
4804 		}
4805 	}
4806 
4807 	if (obj_arg && do_list)
4808 		errx(1, "-c and -l options are mutually exclusive");
4809 	if (obj_arg && do_delete)
4810 		errx(1, "-c and -d options are mutually exclusive");
4811 	if (obj_arg && symref_target)
4812 		errx(1, "-c and -s options are mutually exclusive");
4813 	if (symref_target && do_delete)
4814 		errx(1, "-s and -d options are mutually exclusive");
4815 	if (symref_target && do_list)
4816 		errx(1, "-s and -l options are mutually exclusive");
4817 	if (do_delete && do_list)
4818 		errx(1, "-d and -l options are mutually exclusive");
4819 
4820 	argc -= optind;
4821 	argv += optind;
4822 
4823 	if (do_list) {
4824 		if (argc != 0 && argc != 1)
4825 			usage_ref();
4826 		if (argc == 1) {
4827 			refname = strdup(argv[0]);
4828 			if (refname == NULL) {
4829 				error = got_error_from_errno("strdup");
4830 				goto done;
4831 			}
4832 		}
4833 	} else {
4834 		if (argc != 1)
4835 			usage_ref();
4836 		refname = strdup(argv[0]);
4837 		if (refname == NULL) {
4838 			error = got_error_from_errno("strdup");
4839 			goto done;
4840 		}
4841 	}
4842 
4843 	if (refname)
4844 		got_path_strip_trailing_slashes(refname);
4845 
4846 #ifndef PROFILE
4847 	if (do_list) {
4848 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4849 		    NULL) == -1)
4850 			err(1, "pledge");
4851 	} else {
4852 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4853 		    "sendfd unveil", NULL) == -1)
4854 			err(1, "pledge");
4855 	}
4856 #endif
4857 	cwd = getcwd(NULL, 0);
4858 	if (cwd == NULL) {
4859 		error = got_error_from_errno("getcwd");
4860 		goto done;
4861 	}
4862 
4863 	if (repo_path == NULL) {
4864 		error = got_worktree_open(&worktree, cwd);
4865 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4866 			goto done;
4867 		else
4868 			error = NULL;
4869 		if (worktree) {
4870 			repo_path =
4871 			    strdup(got_worktree_get_repo_path(worktree));
4872 			if (repo_path == NULL)
4873 				error = got_error_from_errno("strdup");
4874 			if (error)
4875 				goto done;
4876 		} else {
4877 			repo_path = strdup(cwd);
4878 			if (repo_path == NULL) {
4879 				error = got_error_from_errno("strdup");
4880 				goto done;
4881 			}
4882 		}
4883 	}
4884 
4885 	error = got_repo_open(&repo, repo_path, NULL);
4886 	if (error != NULL)
4887 		goto done;
4888 
4889 	error = apply_unveil(got_repo_get_path(repo), do_list,
4890 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4891 	if (error)
4892 		goto done;
4893 
4894 	if (do_list)
4895 		error = list_refs(repo, refname);
4896 	else if (do_delete)
4897 		error = delete_ref(repo, refname);
4898 	else if (symref_target)
4899 		error = add_symref(repo, refname, symref_target);
4900 	else {
4901 		if (obj_arg == NULL)
4902 			usage_ref();
4903 		error = add_ref(repo, refname, obj_arg);
4904 	}
4905 done:
4906 	free(refname);
4907 	if (repo)
4908 		got_repo_close(repo);
4909 	if (worktree)
4910 		got_worktree_close(worktree);
4911 	free(cwd);
4912 	free(repo_path);
4913 	return error;
4914 }
4915 
4916 __dead static void
4917 usage_branch(void)
4918 {
4919 	fprintf(stderr,
4920 	    "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4921 	        "[name]\n", getprogname());
4922 	exit(1);
4923 }
4924 
4925 static const struct got_error *
4926 list_branch(struct got_repository *repo, struct got_worktree *worktree,
4927     struct got_reference *ref)
4928 {
4929 	const struct got_error *err = NULL;
4930 	const char *refname, *marker = "  ";
4931 	char *refstr;
4932 
4933 	refname = got_ref_get_name(ref);
4934 	if (worktree && strcmp(refname,
4935 	    got_worktree_get_head_ref_name(worktree)) == 0) {
4936 		struct got_object_id *id = NULL;
4937 
4938 		err = got_ref_resolve(&id, repo, ref);
4939 		if (err)
4940 			return err;
4941 		if (got_object_id_cmp(id,
4942 		    got_worktree_get_base_commit_id(worktree)) == 0)
4943 			marker = "* ";
4944 		else
4945 			marker = "~ ";
4946 		free(id);
4947 	}
4948 
4949 	if (strncmp(refname, "refs/heads/", 11) == 0)
4950 		refname += 11;
4951 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4952 		refname += 18;
4953 
4954 	refstr = got_ref_to_str(ref);
4955 	if (refstr == NULL)
4956 		return got_error_from_errno("got_ref_to_str");
4957 
4958 	printf("%s%s: %s\n", marker, refname, refstr);
4959 	free(refstr);
4960 	return NULL;
4961 }
4962 
4963 static const struct got_error *
4964 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4965 {
4966 	const char *refname;
4967 
4968 	if (worktree == NULL)
4969 		return got_error(GOT_ERR_NOT_WORKTREE);
4970 
4971 	refname = got_worktree_get_head_ref_name(worktree);
4972 
4973 	if (strncmp(refname, "refs/heads/", 11) == 0)
4974 		refname += 11;
4975 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4976 		refname += 18;
4977 
4978 	printf("%s\n", refname);
4979 
4980 	return NULL;
4981 }
4982 
4983 static const struct got_error *
4984 list_branches(struct got_repository *repo, struct got_worktree *worktree)
4985 {
4986 	static const struct got_error *err = NULL;
4987 	struct got_reflist_head refs;
4988 	struct got_reflist_entry *re;
4989 	struct got_reference *temp_ref = NULL;
4990 	int rebase_in_progress, histedit_in_progress;
4991 
4992 	SIMPLEQ_INIT(&refs);
4993 
4994 	if (worktree) {
4995 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
4996 		    worktree);
4997 		if (err)
4998 			return err;
4999 
5000 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
5001 		    worktree);
5002 		if (err)
5003 			return err;
5004 
5005 		if (rebase_in_progress || histedit_in_progress) {
5006 			err = got_ref_open(&temp_ref, repo,
5007 			    got_worktree_get_head_ref_name(worktree), 0);
5008 			if (err)
5009 				return err;
5010 			list_branch(repo, worktree, temp_ref);
5011 			got_ref_close(temp_ref);
5012 		}
5013 	}
5014 
5015 	err = got_ref_list(&refs, repo, "refs/heads",
5016 	    got_ref_cmp_by_name, NULL);
5017 	if (err)
5018 		return err;
5019 
5020 	SIMPLEQ_FOREACH(re, &refs, entry)
5021 		list_branch(repo, worktree, re->ref);
5022 
5023 	got_ref_list_free(&refs);
5024 	return NULL;
5025 }
5026 
5027 static const struct got_error *
5028 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5029     const char *branch_name)
5030 {
5031 	const struct got_error *err = NULL;
5032 	struct got_reference *ref = NULL;
5033 	char *refname;
5034 
5035 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5036 		return got_error_from_errno("asprintf");
5037 
5038 	err = got_ref_open(&ref, repo, refname, 0);
5039 	if (err)
5040 		goto done;
5041 
5042 	if (worktree &&
5043 	    strcmp(got_worktree_get_head_ref_name(worktree),
5044 	    got_ref_get_name(ref)) == 0) {
5045 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
5046 		    "will not delete this work tree's current branch");
5047 		goto done;
5048 	}
5049 
5050 	err = got_ref_delete(ref, repo);
5051 done:
5052 	if (ref)
5053 		got_ref_close(ref);
5054 	free(refname);
5055 	return err;
5056 }
5057 
5058 static const struct got_error *
5059 add_branch(struct got_repository *repo, const char *branch_name,
5060     struct got_object_id *base_commit_id)
5061 {
5062 	const struct got_error *err = NULL;
5063 	struct got_reference *ref = NULL;
5064 	char *base_refname = NULL, *refname = NULL;
5065 
5066 	/*
5067 	 * Don't let the user create a branch name with a leading '-'.
5068 	 * While technically a valid reference name, this case is usually
5069 	 * an unintended typo.
5070 	 */
5071 	if (branch_name[0] == '-')
5072 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5073 
5074 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5075 		 err = got_error_from_errno("asprintf");
5076 		 goto done;
5077 	}
5078 
5079 	err = got_ref_open(&ref, repo, refname, 0);
5080 	if (err == NULL) {
5081 		err = got_error(GOT_ERR_BRANCH_EXISTS);
5082 		goto done;
5083 	} else if (err->code != GOT_ERR_NOT_REF)
5084 		goto done;
5085 
5086 	err = got_ref_alloc(&ref, refname, base_commit_id);
5087 	if (err)
5088 		goto done;
5089 
5090 	err = got_ref_write(ref, repo);
5091 done:
5092 	if (ref)
5093 		got_ref_close(ref);
5094 	free(base_refname);
5095 	free(refname);
5096 	return err;
5097 }
5098 
5099 static const struct got_error *
5100 cmd_branch(int argc, char *argv[])
5101 {
5102 	const struct got_error *error = NULL;
5103 	struct got_repository *repo = NULL;
5104 	struct got_worktree *worktree = NULL;
5105 	char *cwd = NULL, *repo_path = NULL;
5106 	int ch, do_list = 0, do_show = 0, do_update = 1;
5107 	const char *delref = NULL, *commit_id_arg = NULL;
5108 	struct got_reference *ref = NULL;
5109 	struct got_pathlist_head paths;
5110 	struct got_pathlist_entry *pe;
5111 	struct got_object_id *commit_id = NULL;
5112 	char *commit_id_str = NULL;
5113 
5114 	TAILQ_INIT(&paths);
5115 
5116 	while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5117 		switch (ch) {
5118 		case 'c':
5119 			commit_id_arg = optarg;
5120 			break;
5121 		case 'd':
5122 			delref = optarg;
5123 			break;
5124 		case 'r':
5125 			repo_path = realpath(optarg, NULL);
5126 			if (repo_path == NULL)
5127 				return got_error_from_errno2("realpath",
5128 				    optarg);
5129 			got_path_strip_trailing_slashes(repo_path);
5130 			break;
5131 		case 'l':
5132 			do_list = 1;
5133 			break;
5134 		case 'n':
5135 			do_update = 0;
5136 			break;
5137 		default:
5138 			usage_branch();
5139 			/* NOTREACHED */
5140 		}
5141 	}
5142 
5143 	if (do_list && delref)
5144 		errx(1, "-l and -d options are mutually exclusive");
5145 
5146 	argc -= optind;
5147 	argv += optind;
5148 
5149 	if (!do_list && !delref && argc == 0)
5150 		do_show = 1;
5151 
5152 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
5153 		errx(1, "-c option can only be used when creating a branch");
5154 
5155 	if (do_list || delref) {
5156 		if (argc > 0)
5157 			usage_branch();
5158 	} else if (!do_show && argc != 1)
5159 		usage_branch();
5160 
5161 #ifndef PROFILE
5162 	if (do_list || do_show) {
5163 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5164 		    NULL) == -1)
5165 			err(1, "pledge");
5166 	} else {
5167 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5168 		    "sendfd unveil", NULL) == -1)
5169 			err(1, "pledge");
5170 	}
5171 #endif
5172 	cwd = getcwd(NULL, 0);
5173 	if (cwd == NULL) {
5174 		error = got_error_from_errno("getcwd");
5175 		goto done;
5176 	}
5177 
5178 	if (repo_path == NULL) {
5179 		error = got_worktree_open(&worktree, cwd);
5180 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5181 			goto done;
5182 		else
5183 			error = NULL;
5184 		if (worktree) {
5185 			repo_path =
5186 			    strdup(got_worktree_get_repo_path(worktree));
5187 			if (repo_path == NULL)
5188 				error = got_error_from_errno("strdup");
5189 			if (error)
5190 				goto done;
5191 		} else {
5192 			repo_path = strdup(cwd);
5193 			if (repo_path == NULL) {
5194 				error = got_error_from_errno("strdup");
5195 				goto done;
5196 			}
5197 		}
5198 	}
5199 
5200 	error = got_repo_open(&repo, repo_path, NULL);
5201 	if (error != NULL)
5202 		goto done;
5203 
5204 	error = apply_unveil(got_repo_get_path(repo), do_list,
5205 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
5206 	if (error)
5207 		goto done;
5208 
5209 	if (do_show)
5210 		error = show_current_branch(repo, worktree);
5211 	else if (do_list)
5212 		error = list_branches(repo, worktree);
5213 	else if (delref)
5214 		error = delete_branch(repo, worktree, delref);
5215 	else {
5216 		if (commit_id_arg == NULL)
5217 			commit_id_arg = worktree ?
5218 			    got_worktree_get_head_ref_name(worktree) :
5219 			    GOT_REF_HEAD;
5220 		error = got_repo_match_object_id(&commit_id, NULL,
5221 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5222 		if (error)
5223 			goto done;
5224 		error = add_branch(repo, argv[0], commit_id);
5225 		if (error)
5226 			goto done;
5227 		if (worktree && do_update) {
5228 			struct got_update_progress_arg upa;
5229 			char *branch_refname = NULL;
5230 
5231 			error = got_object_id_str(&commit_id_str, commit_id);
5232 			if (error)
5233 				goto done;
5234 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
5235 			    worktree);
5236 			if (error)
5237 				goto done;
5238 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5239 			    == -1) {
5240 				error = got_error_from_errno("asprintf");
5241 				goto done;
5242 			}
5243 			error = got_ref_open(&ref, repo, branch_refname, 0);
5244 			free(branch_refname);
5245 			if (error)
5246 				goto done;
5247 			error = switch_head_ref(ref, commit_id, worktree,
5248 			    repo);
5249 			if (error)
5250 				goto done;
5251 			error = got_worktree_set_base_commit_id(worktree, repo,
5252 			    commit_id);
5253 			if (error)
5254 				goto done;
5255 			memset(&upa, 0, sizeof(upa));
5256 			error = got_worktree_checkout_files(worktree, &paths,
5257 			    repo, update_progress, &upa, check_cancelled,
5258 			    NULL);
5259 			if (error)
5260 				goto done;
5261 			if (upa.did_something)
5262 				printf("Updated to commit %s\n", commit_id_str);
5263 			print_update_progress_stats(&upa);
5264 		}
5265 	}
5266 done:
5267 	if (ref)
5268 		got_ref_close(ref);
5269 	if (repo)
5270 		got_repo_close(repo);
5271 	if (worktree)
5272 		got_worktree_close(worktree);
5273 	free(cwd);
5274 	free(repo_path);
5275 	free(commit_id);
5276 	free(commit_id_str);
5277 	TAILQ_FOREACH(pe, &paths, entry)
5278 		free((char *)pe->path);
5279 	got_pathlist_free(&paths);
5280 	return error;
5281 }
5282 
5283 
5284 __dead static void
5285 usage_tag(void)
5286 {
5287 	fprintf(stderr,
5288 	    "usage: %s tag [-c commit] [-r repository] [-l] "
5289 	        "[-m message] name\n", getprogname());
5290 	exit(1);
5291 }
5292 
5293 #if 0
5294 static const struct got_error *
5295 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5296 {
5297 	const struct got_error *err = NULL;
5298 	struct got_reflist_entry *re, *se, *new;
5299 	struct got_object_id *re_id, *se_id;
5300 	struct got_tag_object *re_tag, *se_tag;
5301 	time_t re_time, se_time;
5302 
5303 	SIMPLEQ_FOREACH(re, tags, entry) {
5304 		se = SIMPLEQ_FIRST(sorted);
5305 		if (se == NULL) {
5306 			err = got_reflist_entry_dup(&new, re);
5307 			if (err)
5308 				return err;
5309 			SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5310 			continue;
5311 		} else {
5312 			err = got_ref_resolve(&re_id, repo, re->ref);
5313 			if (err)
5314 				break;
5315 			err = got_object_open_as_tag(&re_tag, repo, re_id);
5316 			free(re_id);
5317 			if (err)
5318 				break;
5319 			re_time = got_object_tag_get_tagger_time(re_tag);
5320 			got_object_tag_close(re_tag);
5321 		}
5322 
5323 		while (se) {
5324 			err = got_ref_resolve(&se_id, repo, re->ref);
5325 			if (err)
5326 				break;
5327 			err = got_object_open_as_tag(&se_tag, repo, se_id);
5328 			free(se_id);
5329 			if (err)
5330 				break;
5331 			se_time = got_object_tag_get_tagger_time(se_tag);
5332 			got_object_tag_close(se_tag);
5333 
5334 			if (se_time > re_time) {
5335 				err = got_reflist_entry_dup(&new, re);
5336 				if (err)
5337 					return err;
5338 				SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5339 				break;
5340 			}
5341 			se = SIMPLEQ_NEXT(se, entry);
5342 			continue;
5343 		}
5344 	}
5345 done:
5346 	return err;
5347 }
5348 #endif
5349 
5350 static const struct got_error *
5351 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5352 {
5353 	static const struct got_error *err = NULL;
5354 	struct got_reflist_head refs;
5355 	struct got_reflist_entry *re;
5356 
5357 	SIMPLEQ_INIT(&refs);
5358 
5359 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5360 	if (err)
5361 		return err;
5362 
5363 	SIMPLEQ_FOREACH(re, &refs, entry) {
5364 		const char *refname;
5365 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5366 		char datebuf[26];
5367 		const char *tagger;
5368 		time_t tagger_time;
5369 		struct got_object_id *id;
5370 		struct got_tag_object *tag;
5371 		struct got_commit_object *commit = NULL;
5372 
5373 		refname = got_ref_get_name(re->ref);
5374 		if (strncmp(refname, "refs/tags/", 10) != 0)
5375 			continue;
5376 		refname += 10;
5377 		refstr = got_ref_to_str(re->ref);
5378 		if (refstr == NULL) {
5379 			err = got_error_from_errno("got_ref_to_str");
5380 			break;
5381 		}
5382 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5383 		free(refstr);
5384 
5385 		err = got_ref_resolve(&id, repo, re->ref);
5386 		if (err)
5387 			break;
5388 		err = got_object_open_as_tag(&tag, repo, id);
5389 		if (err) {
5390 			if (err->code != GOT_ERR_OBJ_TYPE) {
5391 				free(id);
5392 				break;
5393 			}
5394 			/* "lightweight" tag */
5395 			err = got_object_open_as_commit(&commit, repo, id);
5396 			if (err) {
5397 				free(id);
5398 				break;
5399 			}
5400 			tagger = got_object_commit_get_committer(commit);
5401 			tagger_time =
5402 			    got_object_commit_get_committer_time(commit);
5403 			err = got_object_id_str(&id_str, id);
5404 			free(id);
5405 			if (err)
5406 				break;
5407 		} else {
5408 			free(id);
5409 			tagger = got_object_tag_get_tagger(tag);
5410 			tagger_time = got_object_tag_get_tagger_time(tag);
5411 			err = got_object_id_str(&id_str,
5412 			    got_object_tag_get_object_id(tag));
5413 			if (err)
5414 				break;
5415 		}
5416 		printf("from: %s\n", tagger);
5417 		datestr = get_datestr(&tagger_time, datebuf);
5418 		if (datestr)
5419 			printf("date: %s UTC\n", datestr);
5420 		if (commit)
5421 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5422 		else {
5423 			switch (got_object_tag_get_object_type(tag)) {
5424 			case GOT_OBJ_TYPE_BLOB:
5425 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5426 				    id_str);
5427 				break;
5428 			case GOT_OBJ_TYPE_TREE:
5429 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5430 				    id_str);
5431 				break;
5432 			case GOT_OBJ_TYPE_COMMIT:
5433 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5434 				    id_str);
5435 				break;
5436 			case GOT_OBJ_TYPE_TAG:
5437 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5438 				    id_str);
5439 				break;
5440 			default:
5441 				break;
5442 			}
5443 		}
5444 		free(id_str);
5445 		if (commit) {
5446 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
5447 			if (err)
5448 				break;
5449 			got_object_commit_close(commit);
5450 		} else {
5451 			tagmsg0 = strdup(got_object_tag_get_message(tag));
5452 			got_object_tag_close(tag);
5453 			if (tagmsg0 == NULL) {
5454 				err = got_error_from_errno("strdup");
5455 				break;
5456 			}
5457 		}
5458 
5459 		tagmsg = tagmsg0;
5460 		do {
5461 			line = strsep(&tagmsg, "\n");
5462 			if (line)
5463 				printf(" %s\n", line);
5464 		} while (line);
5465 		free(tagmsg0);
5466 	}
5467 
5468 	got_ref_list_free(&refs);
5469 	return NULL;
5470 }
5471 
5472 static const struct got_error *
5473 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5474     const char *tag_name, const char *repo_path)
5475 {
5476 	const struct got_error *err = NULL;
5477 	char *template = NULL, *initial_content = NULL;
5478 	char *editor = NULL;
5479 	int fd = -1;
5480 
5481 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5482 		err = got_error_from_errno("asprintf");
5483 		goto done;
5484 	}
5485 
5486 	if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5487 	    commit_id_str, tag_name) == -1) {
5488 		err = got_error_from_errno("asprintf");
5489 		goto done;
5490 	}
5491 
5492 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5493 	if (err)
5494 		goto done;
5495 
5496 	dprintf(fd, initial_content);
5497 	close(fd);
5498 
5499 	err = get_editor(&editor);
5500 	if (err)
5501 		goto done;
5502 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5503 done:
5504 	free(initial_content);
5505 	free(template);
5506 	free(editor);
5507 
5508 	/* Editor is done; we can now apply unveil(2) */
5509 	if (err == NULL) {
5510 		err = apply_unveil(repo_path, 0, NULL);
5511 		if (err) {
5512 			free(*tagmsg);
5513 			*tagmsg = NULL;
5514 		}
5515 	}
5516 	return err;
5517 }
5518 
5519 static const struct got_error *
5520 add_tag(struct got_repository *repo, const char *tag_name,
5521     const char *commit_arg, const char *tagmsg_arg)
5522 {
5523 	const struct got_error *err = NULL;
5524 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
5525 	char *label = NULL, *commit_id_str = NULL;
5526 	struct got_reference *ref = NULL;
5527 	char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5528 	char *tagmsg_path = NULL, *tag_id_str = NULL;
5529 	int preserve_tagmsg = 0;
5530 
5531 	/*
5532 	 * Don't let the user create a tag name with a leading '-'.
5533 	 * While technically a valid reference name, this case is usually
5534 	 * an unintended typo.
5535 	 */
5536 	if (tag_name[0] == '-')
5537 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5538 
5539 	err = get_author(&tagger, repo);
5540 	if (err)
5541 		return err;
5542 
5543 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5544 	    GOT_OBJ_TYPE_COMMIT, 1, repo);
5545 	if (err)
5546 		goto done;
5547 
5548 	err = got_object_id_str(&commit_id_str, commit_id);
5549 	if (err)
5550 		goto done;
5551 
5552 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
5553 		refname = strdup(tag_name);
5554 		if (refname == NULL) {
5555 			 err = got_error_from_errno("strdup");
5556 			 goto done;
5557 		}
5558 		tag_name += 10;
5559 	} else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5560 		 err = got_error_from_errno("asprintf");
5561 		 goto done;
5562 	}
5563 
5564 	err = got_ref_open(&ref, repo, refname, 0);
5565 	if (err == NULL) {
5566 		err = got_error(GOT_ERR_TAG_EXISTS);
5567 		goto done;
5568 	} else if (err->code != GOT_ERR_NOT_REF)
5569 		goto done;
5570 
5571 	if (tagmsg_arg == NULL) {
5572 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5573 		    tag_name, got_repo_get_path(repo));
5574 		if (err) {
5575 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5576 			    tagmsg_path != NULL)
5577 				preserve_tagmsg = 1;
5578 			goto done;
5579 		}
5580 	}
5581 
5582 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
5583 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5584 	if (err) {
5585 		if (tagmsg_path)
5586 			preserve_tagmsg = 1;
5587 		goto done;
5588 	}
5589 
5590 	err = got_ref_alloc(&ref, refname, tag_id);
5591 	if (err) {
5592 		if (tagmsg_path)
5593 			preserve_tagmsg = 1;
5594 		goto done;
5595 	}
5596 
5597 	err = got_ref_write(ref, repo);
5598 	if (err) {
5599 		if (tagmsg_path)
5600 			preserve_tagmsg = 1;
5601 		goto done;
5602 	}
5603 
5604 	err = got_object_id_str(&tag_id_str, tag_id);
5605 	if (err) {
5606 		if (tagmsg_path)
5607 			preserve_tagmsg = 1;
5608 		goto done;
5609 	}
5610 	printf("Created tag %s\n", tag_id_str);
5611 done:
5612 	if (preserve_tagmsg) {
5613 		fprintf(stderr, "%s: tag message preserved in %s\n",
5614 		    getprogname(), tagmsg_path);
5615 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5616 		err = got_error_from_errno2("unlink", tagmsg_path);
5617 	free(tag_id_str);
5618 	if (ref)
5619 		got_ref_close(ref);
5620 	free(commit_id);
5621 	free(commit_id_str);
5622 	free(refname);
5623 	free(tagmsg);
5624 	free(tagmsg_path);
5625 	free(tagger);
5626 	return err;
5627 }
5628 
5629 static const struct got_error *
5630 cmd_tag(int argc, char *argv[])
5631 {
5632 	const struct got_error *error = NULL;
5633 	struct got_repository *repo = NULL;
5634 	struct got_worktree *worktree = NULL;
5635 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5636 	char *gitconfig_path = NULL;
5637 	const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5638 	int ch, do_list = 0;
5639 
5640 	while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5641 		switch (ch) {
5642 		case 'c':
5643 			commit_id_arg = optarg;
5644 			break;
5645 		case 'm':
5646 			tagmsg = optarg;
5647 			break;
5648 		case 'r':
5649 			repo_path = realpath(optarg, NULL);
5650 			if (repo_path == NULL)
5651 				return got_error_from_errno2("realpath",
5652 				    optarg);
5653 			got_path_strip_trailing_slashes(repo_path);
5654 			break;
5655 		case 'l':
5656 			do_list = 1;
5657 			break;
5658 		default:
5659 			usage_tag();
5660 			/* NOTREACHED */
5661 		}
5662 	}
5663 
5664 	argc -= optind;
5665 	argv += optind;
5666 
5667 	if (do_list) {
5668 		if (commit_id_arg != NULL)
5669 			errx(1,
5670 			    "-c option can only be used when creating a tag");
5671 		if (tagmsg)
5672 			errx(1, "-l and -m options are mutually exclusive");
5673 		if (argc > 0)
5674 			usage_tag();
5675 	} else if (argc != 1)
5676 		usage_tag();
5677 
5678 	tag_name = argv[0];
5679 
5680 #ifndef PROFILE
5681 	if (do_list) {
5682 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5683 		    NULL) == -1)
5684 			err(1, "pledge");
5685 	} else {
5686 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5687 		    "sendfd unveil", NULL) == -1)
5688 			err(1, "pledge");
5689 	}
5690 #endif
5691 	cwd = getcwd(NULL, 0);
5692 	if (cwd == NULL) {
5693 		error = got_error_from_errno("getcwd");
5694 		goto done;
5695 	}
5696 
5697 	if (repo_path == NULL) {
5698 		error = got_worktree_open(&worktree, cwd);
5699 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5700 			goto done;
5701 		else
5702 			error = NULL;
5703 		if (worktree) {
5704 			repo_path =
5705 			    strdup(got_worktree_get_repo_path(worktree));
5706 			if (repo_path == NULL)
5707 				error = got_error_from_errno("strdup");
5708 			if (error)
5709 				goto done;
5710 		} else {
5711 			repo_path = strdup(cwd);
5712 			if (repo_path == NULL) {
5713 				error = got_error_from_errno("strdup");
5714 				goto done;
5715 			}
5716 		}
5717 	}
5718 
5719 	if (do_list) {
5720 		error = got_repo_open(&repo, repo_path, NULL);
5721 		if (error != NULL)
5722 			goto done;
5723 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5724 		if (error)
5725 			goto done;
5726 		error = list_tags(repo, worktree);
5727 	} else {
5728 		error = get_gitconfig_path(&gitconfig_path);
5729 		if (error)
5730 			goto done;
5731 		error = got_repo_open(&repo, repo_path, gitconfig_path);
5732 		if (error != NULL)
5733 			goto done;
5734 
5735 		if (tagmsg) {
5736 			error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5737 			if (error)
5738 				goto done;
5739 		}
5740 
5741 		if (commit_id_arg == NULL) {
5742 			struct got_reference *head_ref;
5743 			struct got_object_id *commit_id;
5744 			error = got_ref_open(&head_ref, repo,
5745 			    worktree ? got_worktree_get_head_ref_name(worktree)
5746 			    : GOT_REF_HEAD, 0);
5747 			if (error)
5748 				goto done;
5749 			error = got_ref_resolve(&commit_id, repo, head_ref);
5750 			got_ref_close(head_ref);
5751 			if (error)
5752 				goto done;
5753 			error = got_object_id_str(&commit_id_str, commit_id);
5754 			free(commit_id);
5755 			if (error)
5756 				goto done;
5757 		}
5758 
5759 		error = add_tag(repo, tag_name,
5760 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5761 	}
5762 done:
5763 	if (repo)
5764 		got_repo_close(repo);
5765 	if (worktree)
5766 		got_worktree_close(worktree);
5767 	free(cwd);
5768 	free(repo_path);
5769 	free(gitconfig_path);
5770 	free(commit_id_str);
5771 	return error;
5772 }
5773 
5774 __dead static void
5775 usage_add(void)
5776 {
5777 	fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5778 	    getprogname());
5779 	exit(1);
5780 }
5781 
5782 static const struct got_error *
5783 add_progress(void *arg, unsigned char status, const char *path)
5784 {
5785 	while (path[0] == '/')
5786 		path++;
5787 	printf("%c  %s\n", status, path);
5788 	return NULL;
5789 }
5790 
5791 static const struct got_error *
5792 cmd_add(int argc, char *argv[])
5793 {
5794 	const struct got_error *error = NULL;
5795 	struct got_repository *repo = NULL;
5796 	struct got_worktree *worktree = NULL;
5797 	char *cwd = NULL;
5798 	struct got_pathlist_head paths;
5799 	struct got_pathlist_entry *pe;
5800 	int ch, can_recurse = 0, no_ignores = 0;
5801 
5802 	TAILQ_INIT(&paths);
5803 
5804 	while ((ch = getopt(argc, argv, "IR")) != -1) {
5805 		switch (ch) {
5806 		case 'I':
5807 			no_ignores = 1;
5808 			break;
5809 		case 'R':
5810 			can_recurse = 1;
5811 			break;
5812 		default:
5813 			usage_add();
5814 			/* NOTREACHED */
5815 		}
5816 	}
5817 
5818 	argc -= optind;
5819 	argv += optind;
5820 
5821 #ifndef PROFILE
5822 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5823 	    NULL) == -1)
5824 		err(1, "pledge");
5825 #endif
5826 	if (argc < 1)
5827 		usage_add();
5828 
5829 	cwd = getcwd(NULL, 0);
5830 	if (cwd == NULL) {
5831 		error = got_error_from_errno("getcwd");
5832 		goto done;
5833 	}
5834 
5835 	error = got_worktree_open(&worktree, cwd);
5836 	if (error) {
5837 		if (error->code == GOT_ERR_NOT_WORKTREE)
5838 			error = wrap_not_worktree_error(error, "add", cwd);
5839 		goto done;
5840 	}
5841 
5842 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5843 	    NULL);
5844 	if (error != NULL)
5845 		goto done;
5846 
5847 	error = apply_unveil(got_repo_get_path(repo), 1,
5848 	    got_worktree_get_root_path(worktree));
5849 	if (error)
5850 		goto done;
5851 
5852 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5853 	if (error)
5854 		goto done;
5855 
5856 	if (!can_recurse && no_ignores) {
5857 		error = got_error_msg(GOT_ERR_BAD_PATH,
5858 		    "disregarding ignores requires -R option");
5859 		goto done;
5860 
5861 	}
5862 
5863 	if (!can_recurse) {
5864 		char *ondisk_path;
5865 		struct stat sb;
5866 		TAILQ_FOREACH(pe, &paths, entry) {
5867 			if (asprintf(&ondisk_path, "%s/%s",
5868 			    got_worktree_get_root_path(worktree),
5869 			       pe->path) == -1) {
5870 				error = got_error_from_errno("asprintf");
5871 				goto done;
5872 			}
5873 			if (lstat(ondisk_path, &sb) == -1) {
5874 				if (errno == ENOENT) {
5875 					free(ondisk_path);
5876 					continue;
5877 				}
5878 				error = got_error_from_errno2("lstat",
5879 				    ondisk_path);
5880 				free(ondisk_path);
5881 				goto done;
5882 			}
5883 			free(ondisk_path);
5884 			if (S_ISDIR(sb.st_mode)) {
5885 				error = got_error_msg(GOT_ERR_BAD_PATH,
5886 				    "adding directories requires -R option");
5887 				goto done;
5888 			}
5889 		}
5890 	}
5891 
5892 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
5893 	    NULL, repo, no_ignores);
5894 done:
5895 	if (repo)
5896 		got_repo_close(repo);
5897 	if (worktree)
5898 		got_worktree_close(worktree);
5899 	TAILQ_FOREACH(pe, &paths, entry)
5900 		free((char *)pe->path);
5901 	got_pathlist_free(&paths);
5902 	free(cwd);
5903 	return error;
5904 }
5905 
5906 __dead static void
5907 usage_remove(void)
5908 {
5909 	fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5910 	    getprogname());
5911 	exit(1);
5912 }
5913 
5914 static const struct got_error *
5915 print_remove_status(void *arg, unsigned char status,
5916     unsigned char staged_status, const char *path)
5917 {
5918 	while (path[0] == '/')
5919 		path++;
5920 	if (status == GOT_STATUS_NONEXISTENT)
5921 		return NULL;
5922 	if (status == staged_status && (status == GOT_STATUS_DELETE))
5923 		status = GOT_STATUS_NO_CHANGE;
5924 	printf("%c%c %s\n", status, staged_status, path);
5925 	return NULL;
5926 }
5927 
5928 static const struct got_error *
5929 cmd_remove(int argc, char *argv[])
5930 {
5931 	const struct got_error *error = NULL;
5932 	struct got_worktree *worktree = NULL;
5933 	struct got_repository *repo = NULL;
5934 	char *cwd = NULL;
5935 	struct got_pathlist_head paths;
5936 	struct got_pathlist_entry *pe;
5937 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5938 
5939 	TAILQ_INIT(&paths);
5940 
5941 	while ((ch = getopt(argc, argv, "fkR")) != -1) {
5942 		switch (ch) {
5943 		case 'f':
5944 			delete_local_mods = 1;
5945 			break;
5946 		case 'k':
5947 			keep_on_disk = 1;
5948 			break;
5949 		case 'R':
5950 			can_recurse = 1;
5951 			break;
5952 		default:
5953 			usage_remove();
5954 			/* NOTREACHED */
5955 		}
5956 	}
5957 
5958 	argc -= optind;
5959 	argv += optind;
5960 
5961 #ifndef PROFILE
5962 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5963 	    NULL) == -1)
5964 		err(1, "pledge");
5965 #endif
5966 	if (argc < 1)
5967 		usage_remove();
5968 
5969 	cwd = getcwd(NULL, 0);
5970 	if (cwd == NULL) {
5971 		error = got_error_from_errno("getcwd");
5972 		goto done;
5973 	}
5974 	error = got_worktree_open(&worktree, cwd);
5975 	if (error) {
5976 		if (error->code == GOT_ERR_NOT_WORKTREE)
5977 			error = wrap_not_worktree_error(error, "remove", cwd);
5978 		goto done;
5979 	}
5980 
5981 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5982 	    NULL);
5983 	if (error)
5984 		goto done;
5985 
5986 	error = apply_unveil(got_repo_get_path(repo), 1,
5987 	    got_worktree_get_root_path(worktree));
5988 	if (error)
5989 		goto done;
5990 
5991 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5992 	if (error)
5993 		goto done;
5994 
5995 	if (!can_recurse) {
5996 		char *ondisk_path;
5997 		struct stat sb;
5998 		TAILQ_FOREACH(pe, &paths, entry) {
5999 			if (asprintf(&ondisk_path, "%s/%s",
6000 			    got_worktree_get_root_path(worktree),
6001 			       pe->path) == -1) {
6002 				error = got_error_from_errno("asprintf");
6003 				goto done;
6004 			}
6005 			if (lstat(ondisk_path, &sb) == -1) {
6006 				if (errno == ENOENT) {
6007 					free(ondisk_path);
6008 					continue;
6009 				}
6010 				error = got_error_from_errno2("lstat",
6011 				    ondisk_path);
6012 				free(ondisk_path);
6013 				goto done;
6014 			}
6015 			free(ondisk_path);
6016 			if (S_ISDIR(sb.st_mode)) {
6017 				error = got_error_msg(GOT_ERR_BAD_PATH,
6018 				    "removing directories requires -R option");
6019 				goto done;
6020 			}
6021 		}
6022 	}
6023 
6024 	error = got_worktree_schedule_delete(worktree, &paths,
6025 	    delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
6026 done:
6027 	if (repo)
6028 		got_repo_close(repo);
6029 	if (worktree)
6030 		got_worktree_close(worktree);
6031 	TAILQ_FOREACH(pe, &paths, entry)
6032 		free((char *)pe->path);
6033 	got_pathlist_free(&paths);
6034 	free(cwd);
6035 	return error;
6036 }
6037 
6038 __dead static void
6039 usage_revert(void)
6040 {
6041 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6042 	    "path ...\n", getprogname());
6043 	exit(1);
6044 }
6045 
6046 static const struct got_error *
6047 revert_progress(void *arg, unsigned char status, const char *path)
6048 {
6049 	if (status == GOT_STATUS_UNVERSIONED)
6050 		return NULL;
6051 
6052 	while (path[0] == '/')
6053 		path++;
6054 	printf("%c  %s\n", status, path);
6055 	return NULL;
6056 }
6057 
6058 struct choose_patch_arg {
6059 	FILE *patch_script_file;
6060 	const char *action;
6061 };
6062 
6063 static const struct got_error *
6064 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6065     int nchanges, const char *action)
6066 {
6067 	char *line = NULL;
6068 	size_t linesize = 0;
6069 	ssize_t linelen;
6070 
6071 	switch (status) {
6072 	case GOT_STATUS_ADD:
6073 		printf("A  %s\n%s this addition? [y/n] ", path, action);
6074 		break;
6075 	case GOT_STATUS_DELETE:
6076 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
6077 		break;
6078 	case GOT_STATUS_MODIFY:
6079 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
6080 			return got_error_from_errno("fseek");
6081 		printf(GOT_COMMIT_SEP_STR);
6082 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6083 			printf("%s", line);
6084 		if (ferror(patch_file))
6085 			return got_error_from_errno("getline");
6086 		printf(GOT_COMMIT_SEP_STR);
6087 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
6088 		    path, n, nchanges, action);
6089 		break;
6090 	default:
6091 		return got_error_path(path, GOT_ERR_FILE_STATUS);
6092 	}
6093 
6094 	return NULL;
6095 }
6096 
6097 static const struct got_error *
6098 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6099     FILE *patch_file, int n, int nchanges)
6100 {
6101 	const struct got_error *err = NULL;
6102 	char *line = NULL;
6103 	size_t linesize = 0;
6104 	ssize_t linelen;
6105 	int resp = ' ';
6106 	struct choose_patch_arg *a = arg;
6107 
6108 	*choice = GOT_PATCH_CHOICE_NONE;
6109 
6110 	if (a->patch_script_file) {
6111 		char *nl;
6112 		err = show_change(status, path, patch_file, n, nchanges,
6113 		    a->action);
6114 		if (err)
6115 			return err;
6116 		linelen = getline(&line, &linesize, a->patch_script_file);
6117 		if (linelen == -1) {
6118 			if (ferror(a->patch_script_file))
6119 				return got_error_from_errno("getline");
6120 			return NULL;
6121 		}
6122 		nl = strchr(line, '\n');
6123 		if (nl)
6124 			*nl = '\0';
6125 		if (strcmp(line, "y") == 0) {
6126 			*choice = GOT_PATCH_CHOICE_YES;
6127 			printf("y\n");
6128 		} else if (strcmp(line, "n") == 0) {
6129 			*choice = GOT_PATCH_CHOICE_NO;
6130 			printf("n\n");
6131 		} else if (strcmp(line, "q") == 0 &&
6132 		    status == GOT_STATUS_MODIFY) {
6133 			*choice = GOT_PATCH_CHOICE_QUIT;
6134 			printf("q\n");
6135 		} else
6136 			printf("invalid response '%s'\n", line);
6137 		free(line);
6138 		return NULL;
6139 	}
6140 
6141 	while (resp != 'y' && resp != 'n' && resp != 'q') {
6142 		err = show_change(status, path, patch_file, n, nchanges,
6143 		    a->action);
6144 		if (err)
6145 			return err;
6146 		resp = getchar();
6147 		if (resp == '\n')
6148 			resp = getchar();
6149 		if (status == GOT_STATUS_MODIFY) {
6150 			if (resp != 'y' && resp != 'n' && resp != 'q') {
6151 				printf("invalid response '%c'\n", resp);
6152 				resp = ' ';
6153 			}
6154 		} else if (resp != 'y' && resp != 'n') {
6155 				printf("invalid response '%c'\n", resp);
6156 				resp = ' ';
6157 		}
6158 	}
6159 
6160 	if (resp == 'y')
6161 		*choice = GOT_PATCH_CHOICE_YES;
6162 	else if (resp == 'n')
6163 		*choice = GOT_PATCH_CHOICE_NO;
6164 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6165 		*choice = GOT_PATCH_CHOICE_QUIT;
6166 
6167 	return NULL;
6168 }
6169 
6170 
6171 static const struct got_error *
6172 cmd_revert(int argc, char *argv[])
6173 {
6174 	const struct got_error *error = NULL;
6175 	struct got_worktree *worktree = NULL;
6176 	struct got_repository *repo = NULL;
6177 	char *cwd = NULL, *path = NULL;
6178 	struct got_pathlist_head paths;
6179 	struct got_pathlist_entry *pe;
6180 	int ch, can_recurse = 0, pflag = 0;
6181 	FILE *patch_script_file = NULL;
6182 	const char *patch_script_path = NULL;
6183 	struct choose_patch_arg cpa;
6184 
6185 	TAILQ_INIT(&paths);
6186 
6187 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6188 		switch (ch) {
6189 		case 'p':
6190 			pflag = 1;
6191 			break;
6192 		case 'F':
6193 			patch_script_path = optarg;
6194 			break;
6195 		case 'R':
6196 			can_recurse = 1;
6197 			break;
6198 		default:
6199 			usage_revert();
6200 			/* NOTREACHED */
6201 		}
6202 	}
6203 
6204 	argc -= optind;
6205 	argv += optind;
6206 
6207 #ifndef PROFILE
6208 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6209 	    "unveil", NULL) == -1)
6210 		err(1, "pledge");
6211 #endif
6212 	if (argc < 1)
6213 		usage_revert();
6214 	if (patch_script_path && !pflag)
6215 		errx(1, "-F option can only be used together with -p option");
6216 
6217 	cwd = getcwd(NULL, 0);
6218 	if (cwd == NULL) {
6219 		error = got_error_from_errno("getcwd");
6220 		goto done;
6221 	}
6222 	error = got_worktree_open(&worktree, cwd);
6223 	if (error) {
6224 		if (error->code == GOT_ERR_NOT_WORKTREE)
6225 			error = wrap_not_worktree_error(error, "revert", cwd);
6226 		goto done;
6227 	}
6228 
6229 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6230 	    NULL);
6231 	if (error != NULL)
6232 		goto done;
6233 
6234 	if (patch_script_path) {
6235 		patch_script_file = fopen(patch_script_path, "r");
6236 		if (patch_script_file == NULL) {
6237 			error = got_error_from_errno2("fopen",
6238 			    patch_script_path);
6239 			goto done;
6240 		}
6241 	}
6242 	error = apply_unveil(got_repo_get_path(repo), 1,
6243 	    got_worktree_get_root_path(worktree));
6244 	if (error)
6245 		goto done;
6246 
6247 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6248 	if (error)
6249 		goto done;
6250 
6251 	if (!can_recurse) {
6252 		char *ondisk_path;
6253 		struct stat sb;
6254 		TAILQ_FOREACH(pe, &paths, entry) {
6255 			if (asprintf(&ondisk_path, "%s/%s",
6256 			    got_worktree_get_root_path(worktree),
6257 			       pe->path) == -1) {
6258 				error = got_error_from_errno("asprintf");
6259 				goto done;
6260 			}
6261 			if (lstat(ondisk_path, &sb) == -1) {
6262 				if (errno == ENOENT) {
6263 					free(ondisk_path);
6264 					continue;
6265 				}
6266 				error = got_error_from_errno2("lstat",
6267 				    ondisk_path);
6268 				free(ondisk_path);
6269 				goto done;
6270 			}
6271 			free(ondisk_path);
6272 			if (S_ISDIR(sb.st_mode)) {
6273 				error = got_error_msg(GOT_ERR_BAD_PATH,
6274 				    "reverting directories requires -R option");
6275 				goto done;
6276 			}
6277 		}
6278 	}
6279 
6280 	cpa.patch_script_file = patch_script_file;
6281 	cpa.action = "revert";
6282 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6283 	    pflag ? choose_patch : NULL, &cpa, repo);
6284 done:
6285 	if (patch_script_file && fclose(patch_script_file) == EOF &&
6286 	    error == NULL)
6287 		error = got_error_from_errno2("fclose", patch_script_path);
6288 	if (repo)
6289 		got_repo_close(repo);
6290 	if (worktree)
6291 		got_worktree_close(worktree);
6292 	free(path);
6293 	free(cwd);
6294 	return error;
6295 }
6296 
6297 __dead static void
6298 usage_commit(void)
6299 {
6300 	fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6301 	    getprogname());
6302 	exit(1);
6303 }
6304 
6305 struct collect_commit_logmsg_arg {
6306 	const char *cmdline_log;
6307 	const char *editor;
6308 	const char *worktree_path;
6309 	const char *branch_name;
6310 	const char *repo_path;
6311 	char *logmsg_path;
6312 
6313 };
6314 
6315 static const struct got_error *
6316 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6317     void *arg)
6318 {
6319 	char *initial_content = NULL;
6320 	struct got_pathlist_entry *pe;
6321 	const struct got_error *err = NULL;
6322 	char *template = NULL;
6323 	struct collect_commit_logmsg_arg *a = arg;
6324 	int fd;
6325 	size_t len;
6326 
6327 	/* if a message was specified on the command line, just use it */
6328 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6329 		len = strlen(a->cmdline_log) + 1;
6330 		*logmsg = malloc(len + 1);
6331 		if (*logmsg == NULL)
6332 			return got_error_from_errno("malloc");
6333 		strlcpy(*logmsg, a->cmdline_log, len);
6334 		return NULL;
6335 	}
6336 
6337 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6338 		return got_error_from_errno("asprintf");
6339 
6340 	if (asprintf(&initial_content,
6341 	    "\n# changes to be committed on branch %s:\n",
6342 	    a->branch_name) == -1)
6343 		return got_error_from_errno("asprintf");
6344 
6345 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6346 	if (err)
6347 		goto done;
6348 
6349 	dprintf(fd, initial_content);
6350 
6351 	TAILQ_FOREACH(pe, commitable_paths, entry) {
6352 		struct got_commitable *ct = pe->data;
6353 		dprintf(fd, "#  %c  %s\n",
6354 		    got_commitable_get_status(ct),
6355 		    got_commitable_get_path(ct));
6356 	}
6357 	close(fd);
6358 
6359 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6360 done:
6361 	free(initial_content);
6362 	free(template);
6363 
6364 	/* Editor is done; we can now apply unveil(2) */
6365 	if (err == NULL) {
6366 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
6367 		if (err) {
6368 			free(*logmsg);
6369 			*logmsg = NULL;
6370 		}
6371 	}
6372 	return err;
6373 }
6374 
6375 static const struct got_error *
6376 cmd_commit(int argc, char *argv[])
6377 {
6378 	const struct got_error *error = NULL;
6379 	struct got_worktree *worktree = NULL;
6380 	struct got_repository *repo = NULL;
6381 	char *cwd = NULL, *id_str = NULL;
6382 	struct got_object_id *id = NULL;
6383 	const char *logmsg = NULL;
6384 	struct collect_commit_logmsg_arg cl_arg;
6385 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6386 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6387 	struct got_pathlist_head paths;
6388 
6389 	TAILQ_INIT(&paths);
6390 	cl_arg.logmsg_path = NULL;
6391 
6392 	while ((ch = getopt(argc, argv, "m:")) != -1) {
6393 		switch (ch) {
6394 		case 'm':
6395 			logmsg = optarg;
6396 			break;
6397 		default:
6398 			usage_commit();
6399 			/* NOTREACHED */
6400 		}
6401 	}
6402 
6403 	argc -= optind;
6404 	argv += optind;
6405 
6406 #ifndef PROFILE
6407 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6408 	    "unveil", NULL) == -1)
6409 		err(1, "pledge");
6410 #endif
6411 	cwd = getcwd(NULL, 0);
6412 	if (cwd == NULL) {
6413 		error = got_error_from_errno("getcwd");
6414 		goto done;
6415 	}
6416 	error = got_worktree_open(&worktree, cwd);
6417 	if (error) {
6418 		if (error->code == GOT_ERR_NOT_WORKTREE)
6419 			error = wrap_not_worktree_error(error, "commit", cwd);
6420 		goto done;
6421 	}
6422 
6423 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6424 	if (error)
6425 		goto done;
6426 	if (rebase_in_progress) {
6427 		error = got_error(GOT_ERR_REBASING);
6428 		goto done;
6429 	}
6430 
6431 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
6432 	    worktree);
6433 	if (error)
6434 		goto done;
6435 
6436 	error = get_gitconfig_path(&gitconfig_path);
6437 	if (error)
6438 		goto done;
6439 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6440 	    gitconfig_path);
6441 	if (error != NULL)
6442 		goto done;
6443 
6444 	error = get_author(&author, repo);
6445 	if (error)
6446 		return error;
6447 
6448 	/*
6449 	 * unveil(2) traverses exec(2); if an editor is used we have
6450 	 * to apply unveil after the log message has been written.
6451 	 */
6452 	if (logmsg == NULL || strlen(logmsg) == 0)
6453 		error = get_editor(&editor);
6454 	else
6455 		error = apply_unveil(got_repo_get_path(repo), 0,
6456 		    got_worktree_get_root_path(worktree));
6457 	if (error)
6458 		goto done;
6459 
6460 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6461 	if (error)
6462 		goto done;
6463 
6464 	cl_arg.editor = editor;
6465 	cl_arg.cmdline_log = logmsg;
6466 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6467 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6468 	if (!histedit_in_progress) {
6469 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6470 			error = got_error(GOT_ERR_COMMIT_BRANCH);
6471 			goto done;
6472 		}
6473 		cl_arg.branch_name += 11;
6474 	}
6475 	cl_arg.repo_path = got_repo_get_path(repo);
6476 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6477 	    collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6478 	if (error) {
6479 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6480 		    cl_arg.logmsg_path != NULL)
6481 			preserve_logmsg = 1;
6482 		goto done;
6483 	}
6484 
6485 	error = got_object_id_str(&id_str, id);
6486 	if (error)
6487 		goto done;
6488 	printf("Created commit %s\n", id_str);
6489 done:
6490 	if (preserve_logmsg) {
6491 		fprintf(stderr, "%s: log message preserved in %s\n",
6492 		    getprogname(), cl_arg.logmsg_path);
6493 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6494 	    error == NULL)
6495 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6496 	free(cl_arg.logmsg_path);
6497 	if (repo)
6498 		got_repo_close(repo);
6499 	if (worktree)
6500 		got_worktree_close(worktree);
6501 	free(cwd);
6502 	free(id_str);
6503 	free(gitconfig_path);
6504 	free(editor);
6505 	free(author);
6506 	return error;
6507 }
6508 
6509 __dead static void
6510 usage_cherrypick(void)
6511 {
6512 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6513 	exit(1);
6514 }
6515 
6516 static const struct got_error *
6517 cmd_cherrypick(int argc, char *argv[])
6518 {
6519 	const struct got_error *error = NULL;
6520 	struct got_worktree *worktree = NULL;
6521 	struct got_repository *repo = NULL;
6522 	char *cwd = NULL, *commit_id_str = NULL;
6523 	struct got_object_id *commit_id = NULL;
6524 	struct got_commit_object *commit = NULL;
6525 	struct got_object_qid *pid;
6526 	struct got_reference *head_ref = NULL;
6527 	int ch;
6528 	struct got_update_progress_arg upa;
6529 
6530 	while ((ch = getopt(argc, argv, "")) != -1) {
6531 		switch (ch) {
6532 		default:
6533 			usage_cherrypick();
6534 			/* NOTREACHED */
6535 		}
6536 	}
6537 
6538 	argc -= optind;
6539 	argv += optind;
6540 
6541 #ifndef PROFILE
6542 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6543 	    "unveil", NULL) == -1)
6544 		err(1, "pledge");
6545 #endif
6546 	if (argc != 1)
6547 		usage_cherrypick();
6548 
6549 	cwd = getcwd(NULL, 0);
6550 	if (cwd == NULL) {
6551 		error = got_error_from_errno("getcwd");
6552 		goto done;
6553 	}
6554 	error = got_worktree_open(&worktree, cwd);
6555 	if (error) {
6556 		if (error->code == GOT_ERR_NOT_WORKTREE)
6557 			error = wrap_not_worktree_error(error, "cherrypick",
6558 			    cwd);
6559 		goto done;
6560 	}
6561 
6562 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6563 	    NULL);
6564 	if (error != NULL)
6565 		goto done;
6566 
6567 	error = apply_unveil(got_repo_get_path(repo), 0,
6568 	    got_worktree_get_root_path(worktree));
6569 	if (error)
6570 		goto done;
6571 
6572 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6573 	    GOT_OBJ_TYPE_COMMIT, repo);
6574 	if (error != NULL) {
6575 		struct got_reference *ref;
6576 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6577 			goto done;
6578 		error = got_ref_open(&ref, repo, argv[0], 0);
6579 		if (error != NULL)
6580 			goto done;
6581 		error = got_ref_resolve(&commit_id, repo, ref);
6582 		got_ref_close(ref);
6583 		if (error != NULL)
6584 			goto done;
6585 	}
6586 	error = got_object_id_str(&commit_id_str, commit_id);
6587 	if (error)
6588 		goto done;
6589 
6590 	error = got_ref_open(&head_ref, repo,
6591 	    got_worktree_get_head_ref_name(worktree), 0);
6592 	if (error != NULL)
6593 		goto done;
6594 
6595 	error = check_same_branch(commit_id, head_ref, NULL, repo);
6596 	if (error) {
6597 		if (error->code != GOT_ERR_ANCESTRY)
6598 			goto done;
6599 		error = NULL;
6600 	} else {
6601 		error = got_error(GOT_ERR_SAME_BRANCH);
6602 		goto done;
6603 	}
6604 
6605 	error = got_object_open_as_commit(&commit, repo, commit_id);
6606 	if (error)
6607 		goto done;
6608 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6609 	memset(&upa, 0, sizeof(upa));
6610 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6611 	    commit_id, repo, update_progress, &upa, check_cancelled,
6612 	    NULL);
6613 	if (error != NULL)
6614 		goto done;
6615 
6616 	if (upa.did_something)
6617 		printf("Merged commit %s\n", commit_id_str);
6618 	print_update_progress_stats(&upa);
6619 done:
6620 	if (commit)
6621 		got_object_commit_close(commit);
6622 	free(commit_id_str);
6623 	if (head_ref)
6624 		got_ref_close(head_ref);
6625 	if (worktree)
6626 		got_worktree_close(worktree);
6627 	if (repo)
6628 		got_repo_close(repo);
6629 	return error;
6630 }
6631 
6632 __dead static void
6633 usage_backout(void)
6634 {
6635 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6636 	exit(1);
6637 }
6638 
6639 static const struct got_error *
6640 cmd_backout(int argc, char *argv[])
6641 {
6642 	const struct got_error *error = NULL;
6643 	struct got_worktree *worktree = NULL;
6644 	struct got_repository *repo = NULL;
6645 	char *cwd = NULL, *commit_id_str = NULL;
6646 	struct got_object_id *commit_id = NULL;
6647 	struct got_commit_object *commit = NULL;
6648 	struct got_object_qid *pid;
6649 	struct got_reference *head_ref = NULL;
6650 	int ch;
6651 	struct got_update_progress_arg upa;
6652 
6653 	while ((ch = getopt(argc, argv, "")) != -1) {
6654 		switch (ch) {
6655 		default:
6656 			usage_backout();
6657 			/* NOTREACHED */
6658 		}
6659 	}
6660 
6661 	argc -= optind;
6662 	argv += optind;
6663 
6664 #ifndef PROFILE
6665 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6666 	    "unveil", NULL) == -1)
6667 		err(1, "pledge");
6668 #endif
6669 	if (argc != 1)
6670 		usage_backout();
6671 
6672 	cwd = getcwd(NULL, 0);
6673 	if (cwd == NULL) {
6674 		error = got_error_from_errno("getcwd");
6675 		goto done;
6676 	}
6677 	error = got_worktree_open(&worktree, cwd);
6678 	if (error) {
6679 		if (error->code == GOT_ERR_NOT_WORKTREE)
6680 			error = wrap_not_worktree_error(error, "backout", cwd);
6681 		goto done;
6682 	}
6683 
6684 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6685 	    NULL);
6686 	if (error != NULL)
6687 		goto done;
6688 
6689 	error = apply_unveil(got_repo_get_path(repo), 0,
6690 	    got_worktree_get_root_path(worktree));
6691 	if (error)
6692 		goto done;
6693 
6694 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6695 	    GOT_OBJ_TYPE_COMMIT, repo);
6696 	if (error != NULL) {
6697 		struct got_reference *ref;
6698 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6699 			goto done;
6700 		error = got_ref_open(&ref, repo, argv[0], 0);
6701 		if (error != NULL)
6702 			goto done;
6703 		error = got_ref_resolve(&commit_id, repo, ref);
6704 		got_ref_close(ref);
6705 		if (error != NULL)
6706 			goto done;
6707 	}
6708 	error = got_object_id_str(&commit_id_str, commit_id);
6709 	if (error)
6710 		goto done;
6711 
6712 	error = got_ref_open(&head_ref, repo,
6713 	    got_worktree_get_head_ref_name(worktree), 0);
6714 	if (error != NULL)
6715 		goto done;
6716 
6717 	error = check_same_branch(commit_id, head_ref, NULL, repo);
6718 	if (error)
6719 		goto done;
6720 
6721 	error = got_object_open_as_commit(&commit, repo, commit_id);
6722 	if (error)
6723 		goto done;
6724 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6725 	if (pid == NULL) {
6726 		error = got_error(GOT_ERR_ROOT_COMMIT);
6727 		goto done;
6728 	}
6729 
6730 	memset(&upa, 0, sizeof(upa));
6731 	error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6732 	    update_progress, &upa, check_cancelled, NULL);
6733 	if (error != NULL)
6734 		goto done;
6735 
6736 	if (upa.did_something)
6737 		printf("Backed out commit %s\n", commit_id_str);
6738 	print_update_progress_stats(&upa);
6739 done:
6740 	if (commit)
6741 		got_object_commit_close(commit);
6742 	free(commit_id_str);
6743 	if (head_ref)
6744 		got_ref_close(head_ref);
6745 	if (worktree)
6746 		got_worktree_close(worktree);
6747 	if (repo)
6748 		got_repo_close(repo);
6749 	return error;
6750 }
6751 
6752 __dead static void
6753 usage_rebase(void)
6754 {
6755 	fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6756 	    getprogname());
6757 	exit(1);
6758 }
6759 
6760 void
6761 trim_logmsg(char *logmsg, int limit)
6762 {
6763 	char *nl;
6764 	size_t len;
6765 
6766 	len = strlen(logmsg);
6767 	if (len > limit)
6768 		len = limit;
6769 	logmsg[len] = '\0';
6770 	nl = strchr(logmsg, '\n');
6771 	if (nl)
6772 		*nl = '\0';
6773 }
6774 
6775 static const struct got_error *
6776 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6777 {
6778 	const struct got_error *err;
6779 	char *logmsg0 = NULL;
6780 	const char *s;
6781 
6782 	err = got_object_commit_get_logmsg(&logmsg0, commit);
6783 	if (err)
6784 		return err;
6785 
6786 	s = logmsg0;
6787 	while (isspace((unsigned char)s[0]))
6788 		s++;
6789 
6790 	*logmsg = strdup(s);
6791 	if (*logmsg == NULL) {
6792 		err = got_error_from_errno("strdup");
6793 		goto done;
6794 	}
6795 
6796 	trim_logmsg(*logmsg, limit);
6797 done:
6798 	free(logmsg0);
6799 	return err;
6800 }
6801 
6802 static const struct got_error *
6803 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6804 {
6805 	const struct got_error *err;
6806 	struct got_commit_object *commit = NULL;
6807 	char *id_str = NULL, *logmsg = NULL;
6808 
6809 	err = got_object_open_as_commit(&commit, repo, id);
6810 	if (err)
6811 		return err;
6812 
6813 	err = got_object_id_str(&id_str, id);
6814 	if (err)
6815 		goto done;
6816 
6817 	id_str[12] = '\0';
6818 
6819 	err = get_short_logmsg(&logmsg, 42, commit);
6820 	if (err)
6821 		goto done;
6822 
6823 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
6824 done:
6825 	free(id_str);
6826 	got_object_commit_close(commit);
6827 	free(logmsg);
6828 	return err;
6829 }
6830 
6831 static const struct got_error *
6832 show_rebase_progress(struct got_commit_object *commit,
6833     struct got_object_id *old_id, struct got_object_id *new_id)
6834 {
6835 	const struct got_error *err;
6836 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6837 
6838 	err = got_object_id_str(&old_id_str, old_id);
6839 	if (err)
6840 		goto done;
6841 
6842 	if (new_id) {
6843 		err = got_object_id_str(&new_id_str, new_id);
6844 		if (err)
6845 			goto done;
6846 	}
6847 
6848 	old_id_str[12] = '\0';
6849 	if (new_id_str)
6850 		new_id_str[12] = '\0';
6851 
6852 	err = get_short_logmsg(&logmsg, 42, commit);
6853 	if (err)
6854 		goto done;
6855 
6856 	printf("%s -> %s: %s\n", old_id_str,
6857 	    new_id_str ? new_id_str : "no-op change", logmsg);
6858 done:
6859 	free(old_id_str);
6860 	free(new_id_str);
6861 	free(logmsg);
6862 	return err;
6863 }
6864 
6865 static const struct got_error *
6866 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6867     struct got_reference *branch, struct got_reference *new_base_branch,
6868     struct got_reference *tmp_branch, struct got_repository *repo)
6869 {
6870 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
6871 	return got_worktree_rebase_complete(worktree, fileindex,
6872 	    new_base_branch, tmp_branch, branch, repo);
6873 }
6874 
6875 static const struct got_error *
6876 rebase_commit(struct got_pathlist_head *merged_paths,
6877     struct got_worktree *worktree, struct got_fileindex *fileindex,
6878     struct got_reference *tmp_branch,
6879     struct got_object_id *commit_id, struct got_repository *repo)
6880 {
6881 	const struct got_error *error;
6882 	struct got_commit_object *commit;
6883 	struct got_object_id *new_commit_id;
6884 
6885 	error = got_object_open_as_commit(&commit, repo, commit_id);
6886 	if (error)
6887 		return error;
6888 
6889 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6890 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
6891 	if (error) {
6892 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6893 			goto done;
6894 		error = show_rebase_progress(commit, commit_id, NULL);
6895 	} else {
6896 		error = show_rebase_progress(commit, commit_id, new_commit_id);
6897 		free(new_commit_id);
6898 	}
6899 done:
6900 	got_object_commit_close(commit);
6901 	return error;
6902 }
6903 
6904 struct check_path_prefix_arg {
6905 	const char *path_prefix;
6906 	size_t len;
6907 	int errcode;
6908 };
6909 
6910 static const struct got_error *
6911 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6912     struct got_blob_object *blob2, struct got_object_id *id1,
6913     struct got_object_id *id2, const char *path1, const char *path2,
6914     mode_t mode1, mode_t mode2, struct got_repository *repo)
6915 {
6916 	struct check_path_prefix_arg *a = arg;
6917 
6918 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6919 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6920 		return got_error(a->errcode);
6921 
6922 	return NULL;
6923 }
6924 
6925 static const struct got_error *
6926 check_path_prefix(struct got_object_id *parent_id,
6927     struct got_object_id *commit_id, const char *path_prefix,
6928     int errcode, struct got_repository *repo)
6929 {
6930 	const struct got_error *err;
6931 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6932 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
6933 	struct check_path_prefix_arg cpp_arg;
6934 
6935 	if (got_path_is_root_dir(path_prefix))
6936 		return NULL;
6937 
6938 	err = got_object_open_as_commit(&commit, repo, commit_id);
6939 	if (err)
6940 		goto done;
6941 
6942 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6943 	if (err)
6944 		goto done;
6945 
6946 	err = got_object_open_as_tree(&tree1, repo,
6947 	    got_object_commit_get_tree_id(parent_commit));
6948 	if (err)
6949 		goto done;
6950 
6951 	err = got_object_open_as_tree(&tree2, repo,
6952 	    got_object_commit_get_tree_id(commit));
6953 	if (err)
6954 		goto done;
6955 
6956 	cpp_arg.path_prefix = path_prefix;
6957 	while (cpp_arg.path_prefix[0] == '/')
6958 		cpp_arg.path_prefix++;
6959 	cpp_arg.len = strlen(cpp_arg.path_prefix);
6960 	cpp_arg.errcode = errcode;
6961 	err = got_diff_tree(tree1, tree2, "", "", repo,
6962 	    check_path_prefix_in_diff, &cpp_arg, 0);
6963 done:
6964 	if (tree1)
6965 		got_object_tree_close(tree1);
6966 	if (tree2)
6967 		got_object_tree_close(tree2);
6968 	if (commit)
6969 		got_object_commit_close(commit);
6970 	if (parent_commit)
6971 		got_object_commit_close(parent_commit);
6972 	return err;
6973 }
6974 
6975 static const struct got_error *
6976 collect_commits(struct got_object_id_queue *commits,
6977     struct got_object_id *initial_commit_id,
6978     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6979     const char *path_prefix, int path_prefix_errcode,
6980     struct got_repository *repo)
6981 {
6982 	const struct got_error *err = NULL;
6983 	struct got_commit_graph *graph = NULL;
6984 	struct got_object_id *parent_id = NULL;
6985 	struct got_object_qid *qid;
6986         struct got_object_id *commit_id = initial_commit_id;
6987 
6988 	err = got_commit_graph_open(&graph, "/", 1);
6989 	if (err)
6990 		return err;
6991 
6992 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6993 	    check_cancelled, NULL);
6994 	if (err)
6995 		goto done;
6996 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6997 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
6998 		    check_cancelled, NULL);
6999 		if (err) {
7000 			if (err->code == GOT_ERR_ITER_COMPLETED) {
7001 				err = got_error_msg(GOT_ERR_ANCESTRY,
7002 				    "ran out of commits to rebase before "
7003 				    "youngest common ancestor commit has "
7004 				    "been reached?!?");
7005 			}
7006 			goto done;
7007 		} else {
7008 			err = check_path_prefix(parent_id, commit_id,
7009 			    path_prefix, path_prefix_errcode, repo);
7010 			if (err)
7011 				goto done;
7012 
7013 			err = got_object_qid_alloc(&qid, commit_id);
7014 			if (err)
7015 				goto done;
7016 			SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7017 			commit_id = parent_id;
7018 		}
7019 	}
7020 done:
7021 	got_commit_graph_close(graph);
7022 	return err;
7023 }
7024 
7025 static const struct got_error *
7026 cmd_rebase(int argc, char *argv[])
7027 {
7028 	const struct got_error *error = NULL;
7029 	struct got_worktree *worktree = NULL;
7030 	struct got_repository *repo = NULL;
7031 	struct got_fileindex *fileindex = NULL;
7032 	char *cwd = NULL;
7033 	struct got_reference *branch = NULL;
7034 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7035 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
7036 	struct got_object_id *resume_commit_id = NULL;
7037 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7038 	struct got_commit_object *commit = NULL;
7039 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7040 	int histedit_in_progress = 0;
7041 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7042 	struct got_object_id_queue commits;
7043 	struct got_pathlist_head merged_paths;
7044 	const struct got_object_id_queue *parent_ids;
7045 	struct got_object_qid *qid, *pid;
7046 
7047 	SIMPLEQ_INIT(&commits);
7048 	TAILQ_INIT(&merged_paths);
7049 
7050 	while ((ch = getopt(argc, argv, "ac")) != -1) {
7051 		switch (ch) {
7052 		case 'a':
7053 			abort_rebase = 1;
7054 			break;
7055 		case 'c':
7056 			continue_rebase = 1;
7057 			break;
7058 		default:
7059 			usage_rebase();
7060 			/* NOTREACHED */
7061 		}
7062 	}
7063 
7064 	argc -= optind;
7065 	argv += optind;
7066 
7067 #ifndef PROFILE
7068 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7069 	    "unveil", NULL) == -1)
7070 		err(1, "pledge");
7071 #endif
7072 	if (abort_rebase && continue_rebase)
7073 		usage_rebase();
7074 	else if (abort_rebase || continue_rebase) {
7075 		if (argc != 0)
7076 			usage_rebase();
7077 	} else if (argc != 1)
7078 		usage_rebase();
7079 
7080 	cwd = getcwd(NULL, 0);
7081 	if (cwd == NULL) {
7082 		error = got_error_from_errno("getcwd");
7083 		goto done;
7084 	}
7085 	error = got_worktree_open(&worktree, cwd);
7086 	if (error) {
7087 		if (error->code == GOT_ERR_NOT_WORKTREE)
7088 			error = wrap_not_worktree_error(error, "rebase", cwd);
7089 		goto done;
7090 	}
7091 
7092 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7093 	    NULL);
7094 	if (error != NULL)
7095 		goto done;
7096 
7097 	error = apply_unveil(got_repo_get_path(repo), 0,
7098 	    got_worktree_get_root_path(worktree));
7099 	if (error)
7100 		goto done;
7101 
7102 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
7103 	    worktree);
7104 	if (error)
7105 		goto done;
7106 	if (histedit_in_progress) {
7107 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
7108 		goto done;
7109 	}
7110 
7111 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7112 	if (error)
7113 		goto done;
7114 
7115 	if (abort_rebase) {
7116 		struct got_update_progress_arg upa;
7117 		if (!rebase_in_progress) {
7118 			error = got_error(GOT_ERR_NOT_REBASING);
7119 			goto done;
7120 		}
7121 		error = got_worktree_rebase_continue(&resume_commit_id,
7122 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
7123 		    worktree, repo);
7124 		if (error)
7125 			goto done;
7126 		printf("Switching work tree to %s\n",
7127 		    got_ref_get_symref_target(new_base_branch));
7128 		memset(&upa, 0, sizeof(upa));
7129 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
7130 		    new_base_branch, update_progress, &upa);
7131 		if (error)
7132 			goto done;
7133 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7134 		print_update_progress_stats(&upa);
7135 		goto done; /* nothing else to do */
7136 	}
7137 
7138 	if (continue_rebase) {
7139 		if (!rebase_in_progress) {
7140 			error = got_error(GOT_ERR_NOT_REBASING);
7141 			goto done;
7142 		}
7143 		error = got_worktree_rebase_continue(&resume_commit_id,
7144 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
7145 		    worktree, repo);
7146 		if (error)
7147 			goto done;
7148 
7149 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7150 		    resume_commit_id, repo);
7151 		if (error)
7152 			goto done;
7153 
7154 		yca_id = got_object_id_dup(resume_commit_id);
7155 		if (yca_id == NULL) {
7156 			error = got_error_from_errno("got_object_id_dup");
7157 			goto done;
7158 		}
7159 	} else {
7160 		error = got_ref_open(&branch, repo, argv[0], 0);
7161 		if (error != NULL)
7162 			goto done;
7163 	}
7164 
7165 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7166 	if (error)
7167 		goto done;
7168 
7169 	if (!continue_rebase) {
7170 		struct got_object_id *base_commit_id;
7171 
7172 		base_commit_id = got_worktree_get_base_commit_id(worktree);
7173 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7174 		    base_commit_id, branch_head_commit_id, repo,
7175 		    check_cancelled, NULL);
7176 		if (error)
7177 			goto done;
7178 		if (yca_id == NULL) {
7179 			error = got_error_msg(GOT_ERR_ANCESTRY,
7180 			    "specified branch shares no common ancestry "
7181 			    "with work tree's branch");
7182 			goto done;
7183 		}
7184 
7185 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
7186 		if (error) {
7187 			if (error->code != GOT_ERR_ANCESTRY)
7188 				goto done;
7189 			error = NULL;
7190 		} else {
7191 			error = got_error_msg(GOT_ERR_SAME_BRANCH,
7192 			    "specified branch resolves to a commit which "
7193 			    "is already contained in work tree's branch");
7194 			goto done;
7195 		}
7196 		error = got_worktree_rebase_prepare(&new_base_branch,
7197 		    &tmp_branch, &fileindex, worktree, branch, repo);
7198 		if (error)
7199 			goto done;
7200 	}
7201 
7202 	commit_id = branch_head_commit_id;
7203 	error = got_object_open_as_commit(&commit, repo, commit_id);
7204 	if (error)
7205 		goto done;
7206 
7207 	parent_ids = got_object_commit_get_parent_ids(commit);
7208 	pid = SIMPLEQ_FIRST(parent_ids);
7209 	if (pid == NULL) {
7210 		if (!continue_rebase) {
7211 			struct got_update_progress_arg upa;
7212 			memset(&upa, 0, sizeof(upa));
7213 			error = got_worktree_rebase_abort(worktree, fileindex,
7214 			    repo, new_base_branch, update_progress, &upa);
7215 			if (error)
7216 				goto done;
7217 			printf("Rebase of %s aborted\n",
7218 			    got_ref_get_name(branch));
7219 			print_update_progress_stats(&upa);
7220 
7221 		}
7222 		error = got_error(GOT_ERR_EMPTY_REBASE);
7223 		goto done;
7224 	}
7225 	error = collect_commits(&commits, commit_id, pid->id,
7226 	    yca_id, got_worktree_get_path_prefix(worktree),
7227 	    GOT_ERR_REBASE_PATH, repo);
7228 	got_object_commit_close(commit);
7229 	commit = NULL;
7230 	if (error)
7231 		goto done;
7232 
7233 	if (SIMPLEQ_EMPTY(&commits)) {
7234 		if (continue_rebase) {
7235 			error = rebase_complete(worktree, fileindex,
7236 			    branch, new_base_branch, tmp_branch, repo);
7237 			goto done;
7238 		} else {
7239 			/* Fast-forward the reference of the branch. */
7240 			struct got_object_id *new_head_commit_id;
7241 			char *id_str;
7242 			error = got_ref_resolve(&new_head_commit_id, repo,
7243 			    new_base_branch);
7244 			if (error)
7245 				goto done;
7246 			error = got_object_id_str(&id_str, new_head_commit_id);
7247 			printf("Forwarding %s to commit %s\n",
7248 			    got_ref_get_name(branch), id_str);
7249 			free(id_str);
7250 			error = got_ref_change_ref(branch,
7251 			    new_head_commit_id);
7252 			if (error)
7253 				goto done;
7254 		}
7255 	}
7256 
7257 	pid = NULL;
7258 	SIMPLEQ_FOREACH(qid, &commits, entry) {
7259 		struct got_update_progress_arg upa;
7260 
7261 		commit_id = qid->id;
7262 		parent_id = pid ? pid->id : yca_id;
7263 		pid = qid;
7264 
7265 		memset(&upa, 0, sizeof(upa));
7266 		error = got_worktree_rebase_merge_files(&merged_paths,
7267 		    worktree, fileindex, parent_id, commit_id, repo,
7268 		    update_progress, &upa, check_cancelled, NULL);
7269 		if (error)
7270 			goto done;
7271 
7272 		print_update_progress_stats(&upa);
7273 		if (upa.conflicts > 0)
7274 			rebase_status = GOT_STATUS_CONFLICT;
7275 
7276 		if (rebase_status == GOT_STATUS_CONFLICT) {
7277 			error = show_rebase_merge_conflict(qid->id, repo);
7278 			if (error)
7279 				goto done;
7280 			got_worktree_rebase_pathlist_free(&merged_paths);
7281 			break;
7282 		}
7283 
7284 		error = rebase_commit(&merged_paths, worktree, fileindex,
7285 		    tmp_branch, commit_id, repo);
7286 		got_worktree_rebase_pathlist_free(&merged_paths);
7287 		if (error)
7288 			goto done;
7289 	}
7290 
7291 	if (rebase_status == GOT_STATUS_CONFLICT) {
7292 		error = got_worktree_rebase_postpone(worktree, fileindex);
7293 		if (error)
7294 			goto done;
7295 		error = got_error_msg(GOT_ERR_CONFLICTS,
7296 		    "conflicts must be resolved before rebasing can continue");
7297 	} else
7298 		error = rebase_complete(worktree, fileindex, branch,
7299 		    new_base_branch, tmp_branch, repo);
7300 done:
7301 	got_object_id_queue_free(&commits);
7302 	free(branch_head_commit_id);
7303 	free(resume_commit_id);
7304 	free(yca_id);
7305 	if (commit)
7306 		got_object_commit_close(commit);
7307 	if (branch)
7308 		got_ref_close(branch);
7309 	if (new_base_branch)
7310 		got_ref_close(new_base_branch);
7311 	if (tmp_branch)
7312 		got_ref_close(tmp_branch);
7313 	if (worktree)
7314 		got_worktree_close(worktree);
7315 	if (repo)
7316 		got_repo_close(repo);
7317 	return error;
7318 }
7319 
7320 __dead static void
7321 usage_histedit(void)
7322 {
7323 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7324 	    getprogname());
7325 	exit(1);
7326 }
7327 
7328 #define GOT_HISTEDIT_PICK 'p'
7329 #define GOT_HISTEDIT_EDIT 'e'
7330 #define GOT_HISTEDIT_FOLD 'f'
7331 #define GOT_HISTEDIT_DROP 'd'
7332 #define GOT_HISTEDIT_MESG 'm'
7333 
7334 static struct got_histedit_cmd {
7335 	unsigned char code;
7336 	const char *name;
7337 	const char *desc;
7338 } got_histedit_cmds[] = {
7339 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
7340 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7341 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7342 	    "be used" },
7343 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7344 	{ GOT_HISTEDIT_MESG, "mesg",
7345 	    "single-line log message for commit above (open editor if empty)" },
7346 };
7347 
7348 struct got_histedit_list_entry {
7349 	TAILQ_ENTRY(got_histedit_list_entry) entry;
7350 	struct got_object_id *commit_id;
7351 	const struct got_histedit_cmd *cmd;
7352 	char *logmsg;
7353 };
7354 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7355 
7356 static const struct got_error *
7357 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7358     FILE *f, struct got_repository *repo)
7359 {
7360 	const struct got_error *err = NULL;
7361 	char *logmsg = NULL, *id_str = NULL;
7362 	struct got_commit_object *commit = NULL;
7363 	int n;
7364 
7365 	err = got_object_open_as_commit(&commit, repo, commit_id);
7366 	if (err)
7367 		goto done;
7368 
7369 	err = get_short_logmsg(&logmsg, 34, commit);
7370 	if (err)
7371 		goto done;
7372 
7373 	err = got_object_id_str(&id_str, commit_id);
7374 	if (err)
7375 		goto done;
7376 
7377 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7378 	if (n < 0)
7379 		err = got_ferror(f, GOT_ERR_IO);
7380 done:
7381 	if (commit)
7382 		got_object_commit_close(commit);
7383 	free(id_str);
7384 	free(logmsg);
7385 	return err;
7386 }
7387 
7388 static const struct got_error *
7389 histedit_write_commit_list(struct got_object_id_queue *commits,
7390     FILE *f, int edit_logmsg_only, struct got_repository *repo)
7391 {
7392 	const struct got_error *err = NULL;
7393 	struct got_object_qid *qid;
7394 
7395 	if (SIMPLEQ_EMPTY(commits))
7396 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
7397 
7398 	SIMPLEQ_FOREACH(qid, commits, entry) {
7399 		err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7400 		    f, repo);
7401 		if (err)
7402 			break;
7403 		if (edit_logmsg_only) {
7404 			int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7405 			if (n < 0) {
7406 				err = got_ferror(f, GOT_ERR_IO);
7407 				break;
7408 			}
7409 		}
7410 	}
7411 
7412 	return err;
7413 }
7414 
7415 static const struct got_error *
7416 write_cmd_list(FILE *f, const char *branch_name,
7417     struct got_object_id_queue *commits)
7418 {
7419 	const struct got_error *err = NULL;
7420 	int n, i;
7421 	char *id_str;
7422 	struct got_object_qid *qid;
7423 
7424 	qid = SIMPLEQ_FIRST(commits);
7425 	err = got_object_id_str(&id_str, qid->id);
7426 	if (err)
7427 		return err;
7428 
7429 	n = fprintf(f,
7430 	    "# Editing the history of branch '%s' starting at\n"
7431 	    "# commit %s\n"
7432 	    "# Commits will be processed in order from top to "
7433 	    "bottom of this file.\n", branch_name, id_str);
7434 	if (n < 0) {
7435 		err = got_ferror(f, GOT_ERR_IO);
7436 		goto done;
7437 	}
7438 
7439 	n = fprintf(f, "# Available histedit commands:\n");
7440 	if (n < 0) {
7441 		err = got_ferror(f, GOT_ERR_IO);
7442 		goto done;
7443 	}
7444 
7445 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
7446 		struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7447 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
7448 		    cmd->desc);
7449 		if (n < 0) {
7450 			err = got_ferror(f, GOT_ERR_IO);
7451 			break;
7452 		}
7453 	}
7454 done:
7455 	free(id_str);
7456 	return err;
7457 }
7458 
7459 static const struct got_error *
7460 histedit_syntax_error(int lineno)
7461 {
7462 	static char msg[42];
7463 	int ret;
7464 
7465 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7466 	    lineno);
7467 	if (ret == -1 || ret >= sizeof(msg))
7468 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7469 
7470 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7471 }
7472 
7473 static const struct got_error *
7474 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7475     char *logmsg, struct got_repository *repo)
7476 {
7477 	const struct got_error *err;
7478 	struct got_commit_object *folded_commit = NULL;
7479 	char *id_str, *folded_logmsg = NULL;
7480 
7481 	err = got_object_id_str(&id_str, hle->commit_id);
7482 	if (err)
7483 		return err;
7484 
7485 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7486 	if (err)
7487 		goto done;
7488 
7489 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7490 	if (err)
7491 		goto done;
7492 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7493 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7494 	    folded_logmsg) == -1) {
7495 		err = got_error_from_errno("asprintf");
7496 	}
7497 done:
7498 	if (folded_commit)
7499 		got_object_commit_close(folded_commit);
7500 	free(id_str);
7501 	free(folded_logmsg);
7502 	return err;
7503 }
7504 
7505 static struct got_histedit_list_entry *
7506 get_folded_commits(struct got_histedit_list_entry *hle)
7507 {
7508 	struct got_histedit_list_entry *prev, *folded = NULL;
7509 
7510 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
7511 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7512 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
7513 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7514 			folded = prev;
7515 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
7516 	}
7517 
7518 	return folded;
7519 }
7520 
7521 static const struct got_error *
7522 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7523     struct got_repository *repo)
7524 {
7525 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7526 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7527 	const struct got_error *err = NULL;
7528 	struct got_commit_object *commit = NULL;
7529 	int fd;
7530 	struct got_histedit_list_entry *folded = NULL;
7531 
7532 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7533 	if (err)
7534 		return err;
7535 
7536 	folded = get_folded_commits(hle);
7537 	if (folded) {
7538 		while (folded != hle) {
7539 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7540 				folded = TAILQ_NEXT(folded, entry);
7541 				continue;
7542 			}
7543 			err = append_folded_commit_msg(&new_msg, folded,
7544 			    logmsg, repo);
7545 			if (err)
7546 				goto done;
7547 			free(logmsg);
7548 			logmsg = new_msg;
7549 			folded = TAILQ_NEXT(folded, entry);
7550 		}
7551 	}
7552 
7553 	err = got_object_id_str(&id_str, hle->commit_id);
7554 	if (err)
7555 		goto done;
7556 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7557 	if (err)
7558 		goto done;
7559 	if (asprintf(&new_msg,
7560 	    "%s\n# original log message of commit %s: %s",
7561 	    logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7562 		err = got_error_from_errno("asprintf");
7563 		goto done;
7564 	}
7565 	free(logmsg);
7566 	logmsg = new_msg;
7567 
7568 	err = got_object_id_str(&id_str, hle->commit_id);
7569 	if (err)
7570 		goto done;
7571 
7572 	err = got_opentemp_named_fd(&logmsg_path, &fd,
7573 	    GOT_TMPDIR_STR "/got-logmsg");
7574 	if (err)
7575 		goto done;
7576 
7577 	dprintf(fd, logmsg);
7578 	close(fd);
7579 
7580 	err = get_editor(&editor);
7581 	if (err)
7582 		goto done;
7583 
7584 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7585 	if (err) {
7586 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7587 			goto done;
7588 		err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7589 	}
7590 done:
7591 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7592 		err = got_error_from_errno2("unlink", logmsg_path);
7593 	free(logmsg_path);
7594 	free(logmsg);
7595 	free(orig_logmsg);
7596 	free(editor);
7597 	if (commit)
7598 		got_object_commit_close(commit);
7599 	return err;
7600 }
7601 
7602 static const struct got_error *
7603 histedit_parse_list(struct got_histedit_list *histedit_cmds,
7604     FILE *f, struct got_repository *repo)
7605 {
7606 	const struct got_error *err = NULL;
7607 	char *line = NULL, *p, *end;
7608 	size_t size;
7609 	ssize_t len;
7610 	int lineno = 0, i;
7611 	const struct got_histedit_cmd *cmd;
7612 	struct got_object_id *commit_id = NULL;
7613 	struct got_histedit_list_entry *hle = NULL;
7614 
7615 	for (;;) {
7616 		len = getline(&line, &size, f);
7617 		if (len == -1) {
7618 			const struct got_error *getline_err;
7619 			if (feof(f))
7620 				break;
7621 			getline_err = got_error_from_errno("getline");
7622 			err = got_ferror(f, getline_err->code);
7623 			break;
7624 		}
7625 		lineno++;
7626 		p = line;
7627 		while (isspace((unsigned char)p[0]))
7628 			p++;
7629 		if (p[0] == '#' || p[0] == '\0') {
7630 			free(line);
7631 			line = NULL;
7632 			continue;
7633 		}
7634 		cmd = NULL;
7635 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
7636 			cmd = &got_histedit_cmds[i];
7637 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7638 			    isspace((unsigned char)p[strlen(cmd->name)])) {
7639 				p += strlen(cmd->name);
7640 				break;
7641 			}
7642 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7643 				p++;
7644 				break;
7645 			}
7646 		}
7647 		if (i == nitems(got_histedit_cmds)) {
7648 			err = histedit_syntax_error(lineno);
7649 			break;
7650 		}
7651 		while (isspace((unsigned char)p[0]))
7652 			p++;
7653 		if (cmd->code == GOT_HISTEDIT_MESG) {
7654 			if (hle == NULL || hle->logmsg != NULL) {
7655 				err = got_error(GOT_ERR_HISTEDIT_CMD);
7656 				break;
7657 			}
7658 			if (p[0] == '\0') {
7659 				err = histedit_edit_logmsg(hle, repo);
7660 				if (err)
7661 					break;
7662 			} else {
7663 				hle->logmsg = strdup(p);
7664 				if (hle->logmsg == NULL) {
7665 					err = got_error_from_errno("strdup");
7666 					break;
7667 				}
7668 			}
7669 			free(line);
7670 			line = NULL;
7671 			continue;
7672 		} else {
7673 			end = p;
7674 			while (end[0] && !isspace((unsigned char)end[0]))
7675 				end++;
7676 			*end = '\0';
7677 
7678 			err = got_object_resolve_id_str(&commit_id, repo, p);
7679 			if (err) {
7680 				/* override error code */
7681 				err = histedit_syntax_error(lineno);
7682 				break;
7683 			}
7684 		}
7685 		hle = malloc(sizeof(*hle));
7686 		if (hle == NULL) {
7687 			err = got_error_from_errno("malloc");
7688 			break;
7689 		}
7690 		hle->cmd = cmd;
7691 		hle->commit_id = commit_id;
7692 		hle->logmsg = NULL;
7693 		commit_id = NULL;
7694 		free(line);
7695 		line = NULL;
7696 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7697 	}
7698 
7699 	free(line);
7700 	free(commit_id);
7701 	return err;
7702 }
7703 
7704 static const struct got_error *
7705 histedit_check_script(struct got_histedit_list *histedit_cmds,
7706     struct got_object_id_queue *commits, struct got_repository *repo)
7707 {
7708 	const struct got_error *err = NULL;
7709 	struct got_object_qid *qid;
7710 	struct got_histedit_list_entry *hle;
7711 	static char msg[92];
7712 	char *id_str;
7713 
7714 	if (TAILQ_EMPTY(histedit_cmds))
7715 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7716 		    "histedit script contains no commands");
7717 	if (SIMPLEQ_EMPTY(commits))
7718 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
7719 
7720 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
7721 		struct got_histedit_list_entry *hle2;
7722 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7723 			if (hle == hle2)
7724 				continue;
7725 			if (got_object_id_cmp(hle->commit_id,
7726 			    hle2->commit_id) != 0)
7727 				continue;
7728 			err = got_object_id_str(&id_str, hle->commit_id);
7729 			if (err)
7730 				return err;
7731 			snprintf(msg, sizeof(msg), "commit %s is listed "
7732 			    "more than once in histedit script", id_str);
7733 			free(id_str);
7734 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7735 		}
7736 	}
7737 
7738 	SIMPLEQ_FOREACH(qid, commits, entry) {
7739 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
7740 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7741 				break;
7742 		}
7743 		if (hle == NULL) {
7744 			err = got_object_id_str(&id_str, qid->id);
7745 			if (err)
7746 				return err;
7747 			snprintf(msg, sizeof(msg),
7748 			    "commit %s missing from histedit script", id_str);
7749 			free(id_str);
7750 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7751 		}
7752 	}
7753 
7754 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7755 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7756 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7757 		    "last commit in histedit script cannot be folded");
7758 
7759 	return NULL;
7760 }
7761 
7762 static const struct got_error *
7763 histedit_run_editor(struct got_histedit_list *histedit_cmds,
7764     const char *path, struct got_object_id_queue *commits,
7765     struct got_repository *repo)
7766 {
7767 	const struct got_error *err = NULL;
7768 	char *editor;
7769 	FILE *f = NULL;
7770 
7771 	err = get_editor(&editor);
7772 	if (err)
7773 		return err;
7774 
7775 	if (spawn_editor(editor, path) == -1) {
7776 		err = got_error_from_errno("failed spawning editor");
7777 		goto done;
7778 	}
7779 
7780 	f = fopen(path, "r");
7781 	if (f == NULL) {
7782 		err = got_error_from_errno("fopen");
7783 		goto done;
7784 	}
7785 	err = histedit_parse_list(histedit_cmds, f, repo);
7786 	if (err)
7787 		goto done;
7788 
7789 	err = histedit_check_script(histedit_cmds, commits, repo);
7790 done:
7791 	if (f && fclose(f) != 0 && err == NULL)
7792 		err = got_error_from_errno("fclose");
7793 	free(editor);
7794 	return err;
7795 }
7796 
7797 static const struct got_error *
7798 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7799     struct got_object_id_queue *, const char *, const char *,
7800     struct got_repository *);
7801 
7802 static const struct got_error *
7803 histedit_edit_script(struct got_histedit_list *histedit_cmds,
7804     struct got_object_id_queue *commits, const char *branch_name,
7805     int edit_logmsg_only, struct got_repository *repo)
7806 {
7807 	const struct got_error *err;
7808 	FILE *f = NULL;
7809 	char *path = NULL;
7810 
7811 	err = got_opentemp_named(&path, &f, "got-histedit");
7812 	if (err)
7813 		return err;
7814 
7815 	err = write_cmd_list(f, branch_name, commits);
7816 	if (err)
7817 		goto done;
7818 
7819 	err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7820 	if (err)
7821 		goto done;
7822 
7823 	if (edit_logmsg_only) {
7824 		rewind(f);
7825 		err = histedit_parse_list(histedit_cmds, f, repo);
7826 	} else {
7827 		if (fclose(f) != 0) {
7828 			err = got_error_from_errno("fclose");
7829 			goto done;
7830 		}
7831 		f = NULL;
7832 		err = histedit_run_editor(histedit_cmds, path, commits, repo);
7833 		if (err) {
7834 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7835 			    err->code != GOT_ERR_HISTEDIT_CMD)
7836 				goto done;
7837 			err = histedit_edit_list_retry(histedit_cmds, err,
7838 			    commits, path, branch_name, repo);
7839 		}
7840 	}
7841 done:
7842 	if (f && fclose(f) != 0 && err == NULL)
7843 		err = got_error_from_errno("fclose");
7844 	if (path && unlink(path) != 0 && err == NULL)
7845 		err = got_error_from_errno2("unlink", path);
7846 	free(path);
7847 	return err;
7848 }
7849 
7850 static const struct got_error *
7851 histedit_save_list(struct got_histedit_list *histedit_cmds,
7852     struct got_worktree *worktree, struct got_repository *repo)
7853 {
7854 	const struct got_error *err = NULL;
7855 	char *path = NULL;
7856 	FILE *f = NULL;
7857 	struct got_histedit_list_entry *hle;
7858 	struct got_commit_object *commit = NULL;
7859 
7860 	err = got_worktree_get_histedit_script_path(&path, worktree);
7861 	if (err)
7862 		return err;
7863 
7864 	f = fopen(path, "w");
7865 	if (f == NULL) {
7866 		err = got_error_from_errno2("fopen", path);
7867 		goto done;
7868 	}
7869 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
7870 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7871 		    repo);
7872 		if (err)
7873 			break;
7874 
7875 		if (hle->logmsg) {
7876 			int n = fprintf(f, "%c %s\n",
7877 			    GOT_HISTEDIT_MESG, hle->logmsg);
7878 			if (n < 0) {
7879 				err = got_ferror(f, GOT_ERR_IO);
7880 				break;
7881 			}
7882 		}
7883 	}
7884 done:
7885 	if (f && fclose(f) != 0 && err == NULL)
7886 		err = got_error_from_errno("fclose");
7887 	free(path);
7888 	if (commit)
7889 		got_object_commit_close(commit);
7890 	return err;
7891 }
7892 
7893 void
7894 histedit_free_list(struct got_histedit_list *histedit_cmds)
7895 {
7896 	struct got_histedit_list_entry *hle;
7897 
7898 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
7899 		TAILQ_REMOVE(histedit_cmds, hle, entry);
7900 		free(hle);
7901 	}
7902 }
7903 
7904 static const struct got_error *
7905 histedit_load_list(struct got_histedit_list *histedit_cmds,
7906     const char *path, struct got_repository *repo)
7907 {
7908 	const struct got_error *err = NULL;
7909 	FILE *f = NULL;
7910 
7911 	f = fopen(path, "r");
7912 	if (f == NULL) {
7913 		err = got_error_from_errno2("fopen", path);
7914 		goto done;
7915 	}
7916 
7917 	err = histedit_parse_list(histedit_cmds, f, repo);
7918 done:
7919 	if (f && fclose(f) != 0 && err == NULL)
7920 		err = got_error_from_errno("fclose");
7921 	return err;
7922 }
7923 
7924 static const struct got_error *
7925 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7926     const struct got_error *edit_err, struct got_object_id_queue *commits,
7927     const char *path, const char *branch_name, struct got_repository *repo)
7928 {
7929 	const struct got_error *err = NULL, *prev_err = edit_err;
7930 	int resp = ' ';
7931 
7932 	while (resp != 'c' && resp != 'r' && resp != 'a') {
7933 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7934 		    "or (a)bort: ", getprogname(), prev_err->msg);
7935 		resp = getchar();
7936 		if (resp == '\n')
7937 			resp = getchar();
7938 		if (resp == 'c') {
7939 			histedit_free_list(histedit_cmds);
7940 			err = histedit_run_editor(histedit_cmds, path, commits,
7941 			    repo);
7942 			if (err) {
7943 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7944 				    err->code != GOT_ERR_HISTEDIT_CMD)
7945 					break;
7946 				prev_err = err;
7947 				resp = ' ';
7948 				continue;
7949 			}
7950 			break;
7951 		} else if (resp == 'r') {
7952 			histedit_free_list(histedit_cmds);
7953 			err = histedit_edit_script(histedit_cmds,
7954 			    commits, branch_name, 0, repo);
7955 			if (err) {
7956 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7957 				    err->code != GOT_ERR_HISTEDIT_CMD)
7958 					break;
7959 				prev_err = err;
7960 				resp = ' ';
7961 				continue;
7962 			}
7963 			break;
7964 		} else if (resp == 'a') {
7965 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7966 			break;
7967 		} else
7968 			printf("invalid response '%c'\n", resp);
7969 	}
7970 
7971 	return err;
7972 }
7973 
7974 static const struct got_error *
7975 histedit_complete(struct got_worktree *worktree,
7976     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7977     struct got_reference *branch, struct got_repository *repo)
7978 {
7979 	printf("Switching work tree to %s\n",
7980 	    got_ref_get_symref_target(branch));
7981 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7982 	    branch, repo);
7983 }
7984 
7985 static const struct got_error *
7986 show_histedit_progress(struct got_commit_object *commit,
7987     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7988 {
7989 	const struct got_error *err;
7990 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7991 
7992 	err = got_object_id_str(&old_id_str, hle->commit_id);
7993 	if (err)
7994 		goto done;
7995 
7996 	if (new_id) {
7997 		err = got_object_id_str(&new_id_str, new_id);
7998 		if (err)
7999 			goto done;
8000 	}
8001 
8002 	old_id_str[12] = '\0';
8003 	if (new_id_str)
8004 		new_id_str[12] = '\0';
8005 
8006 	if (hle->logmsg) {
8007 		logmsg = strdup(hle->logmsg);
8008 		if (logmsg == NULL) {
8009 			err = got_error_from_errno("strdup");
8010 			goto done;
8011 		}
8012 		trim_logmsg(logmsg, 42);
8013 	} else {
8014 		err = get_short_logmsg(&logmsg, 42, commit);
8015 		if (err)
8016 			goto done;
8017 	}
8018 
8019 	switch (hle->cmd->code) {
8020 	case GOT_HISTEDIT_PICK:
8021 	case GOT_HISTEDIT_EDIT:
8022 		printf("%s -> %s: %s\n", old_id_str,
8023 		    new_id_str ? new_id_str : "no-op change", logmsg);
8024 		break;
8025 	case GOT_HISTEDIT_DROP:
8026 	case GOT_HISTEDIT_FOLD:
8027 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
8028 		    logmsg);
8029 		break;
8030 	default:
8031 		break;
8032 	}
8033 done:
8034 	free(old_id_str);
8035 	free(new_id_str);
8036 	return err;
8037 }
8038 
8039 static const struct got_error *
8040 histedit_commit(struct got_pathlist_head *merged_paths,
8041     struct got_worktree *worktree, struct got_fileindex *fileindex,
8042     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8043     struct got_repository *repo)
8044 {
8045 	const struct got_error *err;
8046 	struct got_commit_object *commit;
8047 	struct got_object_id *new_commit_id;
8048 
8049 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8050 	    && hle->logmsg == NULL) {
8051 		err = histedit_edit_logmsg(hle, repo);
8052 		if (err)
8053 			return err;
8054 	}
8055 
8056 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8057 	if (err)
8058 		return err;
8059 
8060 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8061 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
8062 	    hle->logmsg, repo);
8063 	if (err) {
8064 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8065 			goto done;
8066 		err = show_histedit_progress(commit, hle, NULL);
8067 	} else {
8068 		err = show_histedit_progress(commit, hle, new_commit_id);
8069 		free(new_commit_id);
8070 	}
8071 done:
8072 	got_object_commit_close(commit);
8073 	return err;
8074 }
8075 
8076 static const struct got_error *
8077 histedit_skip_commit(struct got_histedit_list_entry *hle,
8078     struct got_worktree *worktree, struct got_repository *repo)
8079 {
8080 	const struct got_error *error;
8081 	struct got_commit_object *commit;
8082 
8083 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8084 	    repo);
8085 	if (error)
8086 		return error;
8087 
8088 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8089 	if (error)
8090 		return error;
8091 
8092 	error = show_histedit_progress(commit, hle, NULL);
8093 	got_object_commit_close(commit);
8094 	return error;
8095 }
8096 
8097 static const struct got_error *
8098 check_local_changes(void *arg, unsigned char status,
8099     unsigned char staged_status, const char *path,
8100     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8101     struct got_object_id *commit_id, int dirfd, const char *de_name)
8102 {
8103 	int *have_local_changes = arg;
8104 
8105 	switch (status) {
8106 	case GOT_STATUS_ADD:
8107 	case GOT_STATUS_DELETE:
8108 	case GOT_STATUS_MODIFY:
8109 	case GOT_STATUS_CONFLICT:
8110 		*have_local_changes = 1;
8111 		return got_error(GOT_ERR_CANCELLED);
8112 	default:
8113 		break;
8114 	}
8115 
8116 	switch (staged_status) {
8117 	case GOT_STATUS_ADD:
8118 	case GOT_STATUS_DELETE:
8119 	case GOT_STATUS_MODIFY:
8120 		*have_local_changes = 1;
8121 		return got_error(GOT_ERR_CANCELLED);
8122 	default:
8123 		break;
8124 	}
8125 
8126 	return NULL;
8127 }
8128 
8129 static const struct got_error *
8130 cmd_histedit(int argc, char *argv[])
8131 {
8132 	const struct got_error *error = NULL;
8133 	struct got_worktree *worktree = NULL;
8134 	struct got_fileindex *fileindex = NULL;
8135 	struct got_repository *repo = NULL;
8136 	char *cwd = NULL;
8137 	struct got_reference *branch = NULL;
8138 	struct got_reference *tmp_branch = NULL;
8139 	struct got_object_id *resume_commit_id = NULL;
8140 	struct got_object_id *base_commit_id = NULL;
8141 	struct got_object_id *head_commit_id = NULL;
8142 	struct got_commit_object *commit = NULL;
8143 	int ch, rebase_in_progress = 0;
8144 	struct got_update_progress_arg upa;
8145 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8146 	int edit_logmsg_only = 0;
8147 	const char *edit_script_path = NULL;
8148 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8149 	struct got_object_id_queue commits;
8150 	struct got_pathlist_head merged_paths;
8151 	const struct got_object_id_queue *parent_ids;
8152 	struct got_object_qid *pid;
8153 	struct got_histedit_list histedit_cmds;
8154 	struct got_histedit_list_entry *hle;
8155 
8156 	SIMPLEQ_INIT(&commits);
8157 	TAILQ_INIT(&histedit_cmds);
8158 	TAILQ_INIT(&merged_paths);
8159 	memset(&upa, 0, sizeof(upa));
8160 
8161 	while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8162 		switch (ch) {
8163 		case 'a':
8164 			abort_edit = 1;
8165 			break;
8166 		case 'c':
8167 			continue_edit = 1;
8168 			break;
8169 		case 'F':
8170 			edit_script_path = optarg;
8171 			break;
8172 		case 'm':
8173 			edit_logmsg_only = 1;
8174 			break;
8175 		default:
8176 			usage_histedit();
8177 			/* NOTREACHED */
8178 		}
8179 	}
8180 
8181 	argc -= optind;
8182 	argv += optind;
8183 
8184 #ifndef PROFILE
8185 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8186 	    "unveil", NULL) == -1)
8187 		err(1, "pledge");
8188 #endif
8189 	if (abort_edit && continue_edit)
8190 		errx(1, "histedit's -a and -c options are mutually exclusive");
8191 	if (edit_script_path && edit_logmsg_only)
8192 		errx(1, "histedit's -F and -m options are mutually exclusive");
8193 	if (abort_edit && edit_logmsg_only)
8194 		errx(1, "histedit's -a and -m options are mutually exclusive");
8195 	if (continue_edit && edit_logmsg_only)
8196 		errx(1, "histedit's -c and -m options are mutually exclusive");
8197 	if (argc != 0)
8198 		usage_histedit();
8199 
8200 	/*
8201 	 * This command cannot apply unveil(2) in all cases because the
8202 	 * user may choose to run an editor to edit the histedit script
8203 	 * and to edit individual commit log messages.
8204 	 * unveil(2) traverses exec(2); if an editor is used we have to
8205 	 * apply unveil after edit script and log messages have been written.
8206 	 * XXX TODO: Make use of unveil(2) where possible.
8207 	 */
8208 
8209 	cwd = getcwd(NULL, 0);
8210 	if (cwd == NULL) {
8211 		error = got_error_from_errno("getcwd");
8212 		goto done;
8213 	}
8214 	error = got_worktree_open(&worktree, cwd);
8215 	if (error) {
8216 		if (error->code == GOT_ERR_NOT_WORKTREE)
8217 			error = wrap_not_worktree_error(error, "histedit", cwd);
8218 		goto done;
8219 	}
8220 
8221 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8222 	    NULL);
8223 	if (error != NULL)
8224 		goto done;
8225 
8226 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8227 	if (error)
8228 		goto done;
8229 	if (rebase_in_progress) {
8230 		error = got_error(GOT_ERR_REBASING);
8231 		goto done;
8232 	}
8233 
8234 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8235 	if (error)
8236 		goto done;
8237 
8238 	if (edit_in_progress && edit_logmsg_only) {
8239 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8240 		    "histedit operation is in progress in this "
8241 		    "work tree and must be continued or aborted "
8242 		    "before the -m option can be used");
8243 		goto done;
8244 	}
8245 
8246 	if (edit_in_progress && abort_edit) {
8247 		error = got_worktree_histedit_continue(&resume_commit_id,
8248 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
8249 		    worktree, repo);
8250 		if (error)
8251 			goto done;
8252 		printf("Switching work tree to %s\n",
8253 		    got_ref_get_symref_target(branch));
8254 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
8255 		    branch, base_commit_id, update_progress, &upa);
8256 		if (error)
8257 			goto done;
8258 		printf("Histedit of %s aborted\n",
8259 		    got_ref_get_symref_target(branch));
8260 		print_update_progress_stats(&upa);
8261 		goto done; /* nothing else to do */
8262 	} else if (abort_edit) {
8263 		error = got_error(GOT_ERR_NOT_HISTEDIT);
8264 		goto done;
8265 	}
8266 
8267 	if (continue_edit) {
8268 		char *path;
8269 
8270 		if (!edit_in_progress) {
8271 			error = got_error(GOT_ERR_NOT_HISTEDIT);
8272 			goto done;
8273 		}
8274 
8275 		error = got_worktree_get_histedit_script_path(&path, worktree);
8276 		if (error)
8277 			goto done;
8278 
8279 		error = histedit_load_list(&histedit_cmds, path, repo);
8280 		free(path);
8281 		if (error)
8282 			goto done;
8283 
8284 		error = got_worktree_histedit_continue(&resume_commit_id,
8285 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
8286 		    worktree, repo);
8287 		if (error)
8288 			goto done;
8289 
8290 		error = got_ref_resolve(&head_commit_id, repo, branch);
8291 		if (error)
8292 			goto done;
8293 
8294 		error = got_object_open_as_commit(&commit, repo,
8295 		    head_commit_id);
8296 		if (error)
8297 			goto done;
8298 		parent_ids = got_object_commit_get_parent_ids(commit);
8299 		pid = SIMPLEQ_FIRST(parent_ids);
8300 		if (pid == NULL) {
8301 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8302 			goto done;
8303 		}
8304 		error = collect_commits(&commits, head_commit_id, pid->id,
8305 		    base_commit_id, got_worktree_get_path_prefix(worktree),
8306 		    GOT_ERR_HISTEDIT_PATH, repo);
8307 		got_object_commit_close(commit);
8308 		commit = NULL;
8309 		if (error)
8310 			goto done;
8311 	} else {
8312 		if (edit_in_progress) {
8313 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
8314 			goto done;
8315 		}
8316 
8317 		error = got_ref_open(&branch, repo,
8318 		    got_worktree_get_head_ref_name(worktree), 0);
8319 		if (error != NULL)
8320 			goto done;
8321 
8322 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8323 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8324 			    "will not edit commit history of a branch outside "
8325 			    "the \"refs/heads/\" reference namespace");
8326 			goto done;
8327 		}
8328 
8329 		error = got_ref_resolve(&head_commit_id, repo, branch);
8330 		got_ref_close(branch);
8331 		branch = NULL;
8332 		if (error)
8333 			goto done;
8334 
8335 		error = got_object_open_as_commit(&commit, repo,
8336 		    head_commit_id);
8337 		if (error)
8338 			goto done;
8339 		parent_ids = got_object_commit_get_parent_ids(commit);
8340 		pid = SIMPLEQ_FIRST(parent_ids);
8341 		if (pid == NULL) {
8342 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8343 			goto done;
8344 		}
8345 		error = collect_commits(&commits, head_commit_id, pid->id,
8346 		    got_worktree_get_base_commit_id(worktree),
8347 		    got_worktree_get_path_prefix(worktree),
8348 		    GOT_ERR_HISTEDIT_PATH, repo);
8349 		got_object_commit_close(commit);
8350 		commit = NULL;
8351 		if (error)
8352 			goto done;
8353 
8354 		if (SIMPLEQ_EMPTY(&commits)) {
8355 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8356 			goto done;
8357 		}
8358 
8359 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8360 		    &base_commit_id, &fileindex, worktree, repo);
8361 		if (error)
8362 			goto done;
8363 
8364 		if (edit_script_path) {
8365 			error = histedit_load_list(&histedit_cmds,
8366 			    edit_script_path, repo);
8367 			if (error) {
8368 				got_worktree_histedit_abort(worktree, fileindex,
8369 				    repo, branch, base_commit_id,
8370 				    update_progress, &upa);
8371 				print_update_progress_stats(&upa);
8372 				goto done;
8373 			}
8374 		} else {
8375 			const char *branch_name;
8376 			branch_name = got_ref_get_symref_target(branch);
8377 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
8378 				branch_name += 11;
8379 			error = histedit_edit_script(&histedit_cmds, &commits,
8380 			    branch_name, edit_logmsg_only, repo);
8381 			if (error) {
8382 				got_worktree_histedit_abort(worktree, fileindex,
8383 				    repo, branch, base_commit_id,
8384 				    update_progress, &upa);
8385 				print_update_progress_stats(&upa);
8386 				goto done;
8387 			}
8388 
8389 		}
8390 
8391 		error = histedit_save_list(&histedit_cmds, worktree,
8392 		    repo);
8393 		if (error) {
8394 			got_worktree_histedit_abort(worktree, fileindex,
8395 			    repo, branch, base_commit_id,
8396 			    update_progress, &upa);
8397 			print_update_progress_stats(&upa);
8398 			goto done;
8399 		}
8400 
8401 	}
8402 
8403 	error = histedit_check_script(&histedit_cmds, &commits, repo);
8404 	if (error)
8405 		goto done;
8406 
8407 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8408 		if (resume_commit_id) {
8409 			if (got_object_id_cmp(hle->commit_id,
8410 			    resume_commit_id) != 0)
8411 				continue;
8412 
8413 			resume_commit_id = NULL;
8414 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8415 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
8416 				error = histedit_skip_commit(hle, worktree,
8417 				   repo);
8418 				if (error)
8419 					goto done;
8420 			} else {
8421 				struct got_pathlist_head paths;
8422 				int have_changes = 0;
8423 
8424 				TAILQ_INIT(&paths);
8425 				error = got_pathlist_append(&paths, "", NULL);
8426 				if (error)
8427 					goto done;
8428 				error = got_worktree_status(worktree, &paths,
8429 				    repo, check_local_changes, &have_changes,
8430 				    check_cancelled, NULL);
8431 				got_pathlist_free(&paths);
8432 				if (error) {
8433 					if (error->code != GOT_ERR_CANCELLED)
8434 						goto done;
8435 					if (sigint_received || sigpipe_received)
8436 						goto done;
8437 				}
8438 				if (have_changes) {
8439 					error = histedit_commit(NULL, worktree,
8440 					    fileindex, tmp_branch, hle, repo);
8441 					if (error)
8442 						goto done;
8443 				} else {
8444 					error = got_object_open_as_commit(
8445 					    &commit, repo, hle->commit_id);
8446 					if (error)
8447 						goto done;
8448 					error = show_histedit_progress(commit,
8449 					    hle, NULL);
8450 					got_object_commit_close(commit);
8451 					commit = NULL;
8452 					if (error)
8453 						goto done;
8454 				}
8455 			}
8456 			continue;
8457 		}
8458 
8459 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8460 			error = histedit_skip_commit(hle, worktree, repo);
8461 			if (error)
8462 				goto done;
8463 			continue;
8464 		}
8465 
8466 		error = got_object_open_as_commit(&commit, repo,
8467 		    hle->commit_id);
8468 		if (error)
8469 			goto done;
8470 		parent_ids = got_object_commit_get_parent_ids(commit);
8471 		pid = SIMPLEQ_FIRST(parent_ids);
8472 
8473 		error = got_worktree_histedit_merge_files(&merged_paths,
8474 		    worktree, fileindex, pid->id, hle->commit_id, repo,
8475 		    update_progress, &upa, check_cancelled, NULL);
8476 		if (error)
8477 			goto done;
8478 		got_object_commit_close(commit);
8479 		commit = NULL;
8480 
8481 		print_update_progress_stats(&upa);
8482 		if (upa.conflicts > 0)
8483 			rebase_status = GOT_STATUS_CONFLICT;
8484 
8485 		if (rebase_status == GOT_STATUS_CONFLICT) {
8486 			error = show_rebase_merge_conflict(hle->commit_id,
8487 			    repo);
8488 			if (error)
8489 				goto done;
8490 			got_worktree_rebase_pathlist_free(&merged_paths);
8491 			break;
8492 		}
8493 
8494 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8495 			char *id_str;
8496 			error = got_object_id_str(&id_str, hle->commit_id);
8497 			if (error)
8498 				goto done;
8499 			printf("Stopping histedit for amending commit %s\n",
8500 			    id_str);
8501 			free(id_str);
8502 			got_worktree_rebase_pathlist_free(&merged_paths);
8503 			error = got_worktree_histedit_postpone(worktree,
8504 			    fileindex);
8505 			goto done;
8506 		}
8507 
8508 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8509 			error = histedit_skip_commit(hle, worktree, repo);
8510 			if (error)
8511 				goto done;
8512 			continue;
8513 		}
8514 
8515 		error = histedit_commit(&merged_paths, worktree, fileindex,
8516 		    tmp_branch, hle, repo);
8517 		got_worktree_rebase_pathlist_free(&merged_paths);
8518 		if (error)
8519 			goto done;
8520 	}
8521 
8522 	if (rebase_status == GOT_STATUS_CONFLICT) {
8523 		error = got_worktree_histedit_postpone(worktree, fileindex);
8524 		if (error)
8525 			goto done;
8526 		error = got_error_msg(GOT_ERR_CONFLICTS,
8527 		    "conflicts must be resolved before histedit can continue");
8528 	} else
8529 		error = histedit_complete(worktree, fileindex, tmp_branch,
8530 		    branch, repo);
8531 done:
8532 	got_object_id_queue_free(&commits);
8533 	histedit_free_list(&histedit_cmds);
8534 	free(head_commit_id);
8535 	free(base_commit_id);
8536 	free(resume_commit_id);
8537 	if (commit)
8538 		got_object_commit_close(commit);
8539 	if (branch)
8540 		got_ref_close(branch);
8541 	if (tmp_branch)
8542 		got_ref_close(tmp_branch);
8543 	if (worktree)
8544 		got_worktree_close(worktree);
8545 	if (repo)
8546 		got_repo_close(repo);
8547 	return error;
8548 }
8549 
8550 __dead static void
8551 usage_integrate(void)
8552 {
8553 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8554 	exit(1);
8555 }
8556 
8557 static const struct got_error *
8558 cmd_integrate(int argc, char *argv[])
8559 {
8560 	const struct got_error *error = NULL;
8561 	struct got_repository *repo = NULL;
8562 	struct got_worktree *worktree = NULL;
8563 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8564 	const char *branch_arg = NULL;
8565 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8566 	struct got_fileindex *fileindex = NULL;
8567 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8568 	int ch;
8569 	struct got_update_progress_arg upa;
8570 
8571 	while ((ch = getopt(argc, argv, "")) != -1) {
8572 		switch (ch) {
8573 		default:
8574 			usage_integrate();
8575 			/* NOTREACHED */
8576 		}
8577 	}
8578 
8579 	argc -= optind;
8580 	argv += optind;
8581 
8582 	if (argc != 1)
8583 		usage_integrate();
8584 	branch_arg = argv[0];
8585 
8586 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8587 	    "unveil", NULL) == -1)
8588 		err(1, "pledge");
8589 
8590 	cwd = getcwd(NULL, 0);
8591 	if (cwd == NULL) {
8592 		error = got_error_from_errno("getcwd");
8593 		goto done;
8594 	}
8595 
8596 	error = got_worktree_open(&worktree, cwd);
8597 	if (error) {
8598 		if (error->code == GOT_ERR_NOT_WORKTREE)
8599 			error = wrap_not_worktree_error(error, "integrate",
8600 			    cwd);
8601 		goto done;
8602 	}
8603 
8604 	error = check_rebase_or_histedit_in_progress(worktree);
8605 	if (error)
8606 		goto done;
8607 
8608 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8609 	    NULL);
8610 	if (error != NULL)
8611 		goto done;
8612 
8613 	error = apply_unveil(got_repo_get_path(repo), 0,
8614 	    got_worktree_get_root_path(worktree));
8615 	if (error)
8616 		goto done;
8617 
8618 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8619 		error = got_error_from_errno("asprintf");
8620 		goto done;
8621 	}
8622 
8623 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8624 	    &base_branch_ref, worktree, refname, repo);
8625 	if (error)
8626 		goto done;
8627 
8628 	refname = strdup(got_ref_get_name(branch_ref));
8629 	if (refname == NULL) {
8630 		error = got_error_from_errno("strdup");
8631 		got_worktree_integrate_abort(worktree, fileindex, repo,
8632 		    branch_ref, base_branch_ref);
8633 		goto done;
8634 	}
8635 	base_refname = strdup(got_ref_get_name(base_branch_ref));
8636 	if (base_refname == NULL) {
8637 		error = got_error_from_errno("strdup");
8638 		got_worktree_integrate_abort(worktree, fileindex, repo,
8639 		    branch_ref, base_branch_ref);
8640 		goto done;
8641 	}
8642 
8643 	error = got_ref_resolve(&commit_id, repo, branch_ref);
8644 	if (error)
8645 		goto done;
8646 
8647 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8648 	if (error)
8649 		goto done;
8650 
8651 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8652 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
8653 		    "specified branch has already been integrated");
8654 		got_worktree_integrate_abort(worktree, fileindex, repo,
8655 		    branch_ref, base_branch_ref);
8656 		goto done;
8657 	}
8658 
8659 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8660 	if (error) {
8661 		if (error->code == GOT_ERR_ANCESTRY)
8662 			error = got_error(GOT_ERR_REBASE_REQUIRED);
8663 		got_worktree_integrate_abort(worktree, fileindex, repo,
8664 		    branch_ref, base_branch_ref);
8665 		goto done;
8666 	}
8667 
8668 	memset(&upa, 0, sizeof(upa));
8669 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
8670 	    branch_ref, base_branch_ref, update_progress, &upa,
8671 	    check_cancelled, NULL);
8672 	if (error)
8673 		goto done;
8674 
8675 	printf("Integrated %s into %s\n", refname, base_refname);
8676 	print_update_progress_stats(&upa);
8677 done:
8678 	if (repo)
8679 		got_repo_close(repo);
8680 	if (worktree)
8681 		got_worktree_close(worktree);
8682 	free(cwd);
8683 	free(base_commit_id);
8684 	free(commit_id);
8685 	free(refname);
8686 	free(base_refname);
8687 	return error;
8688 }
8689 
8690 __dead static void
8691 usage_stage(void)
8692 {
8693 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8694 	    "[file-path ...]\n",
8695 	    getprogname());
8696 	exit(1);
8697 }
8698 
8699 static const struct got_error *
8700 print_stage(void *arg, unsigned char status, unsigned char staged_status,
8701     const char *path, struct got_object_id *blob_id,
8702     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8703     int dirfd, const char *de_name)
8704 {
8705 	const struct got_error *err = NULL;
8706 	char *id_str = NULL;
8707 
8708 	if (staged_status != GOT_STATUS_ADD &&
8709 	    staged_status != GOT_STATUS_MODIFY &&
8710 	    staged_status != GOT_STATUS_DELETE)
8711 		return NULL;
8712 
8713 	if (staged_status == GOT_STATUS_ADD ||
8714 	    staged_status == GOT_STATUS_MODIFY)
8715 		err = got_object_id_str(&id_str, staged_blob_id);
8716 	else
8717 		err = got_object_id_str(&id_str, blob_id);
8718 	if (err)
8719 		return err;
8720 
8721 	printf("%s %c %s\n", id_str, staged_status, path);
8722 	free(id_str);
8723 	return NULL;
8724 }
8725 
8726 static const struct got_error *
8727 cmd_stage(int argc, char *argv[])
8728 {
8729 	const struct got_error *error = NULL;
8730 	struct got_repository *repo = NULL;
8731 	struct got_worktree *worktree = NULL;
8732 	char *cwd = NULL;
8733 	struct got_pathlist_head paths;
8734 	struct got_pathlist_entry *pe;
8735 	int ch, list_stage = 0, pflag = 0;
8736 	FILE *patch_script_file = NULL;
8737 	const char *patch_script_path = NULL;
8738 	struct choose_patch_arg cpa;
8739 
8740 	TAILQ_INIT(&paths);
8741 
8742 	while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8743 		switch (ch) {
8744 		case 'l':
8745 			list_stage = 1;
8746 			break;
8747 		case 'p':
8748 			pflag = 1;
8749 			break;
8750 		case 'F':
8751 			patch_script_path = optarg;
8752 			break;
8753 		default:
8754 			usage_stage();
8755 			/* NOTREACHED */
8756 		}
8757 	}
8758 
8759 	argc -= optind;
8760 	argv += optind;
8761 
8762 #ifndef PROFILE
8763 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8764 	    "unveil", NULL) == -1)
8765 		err(1, "pledge");
8766 #endif
8767 	if (list_stage && (pflag || patch_script_path))
8768 		errx(1, "-l option cannot be used with other options");
8769 	if (patch_script_path && !pflag)
8770 		errx(1, "-F option can only be used together with -p option");
8771 
8772 	cwd = getcwd(NULL, 0);
8773 	if (cwd == NULL) {
8774 		error = got_error_from_errno("getcwd");
8775 		goto done;
8776 	}
8777 
8778 	error = got_worktree_open(&worktree, cwd);
8779 	if (error) {
8780 		if (error->code == GOT_ERR_NOT_WORKTREE)
8781 			error = wrap_not_worktree_error(error, "stage", cwd);
8782 		goto done;
8783 	}
8784 
8785 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8786 	    NULL);
8787 	if (error != NULL)
8788 		goto done;
8789 
8790 	if (patch_script_path) {
8791 		patch_script_file = fopen(patch_script_path, "r");
8792 		if (patch_script_file == NULL) {
8793 			error = got_error_from_errno2("fopen",
8794 			    patch_script_path);
8795 			goto done;
8796 		}
8797 	}
8798 	error = apply_unveil(got_repo_get_path(repo), 0,
8799 	    got_worktree_get_root_path(worktree));
8800 	if (error)
8801 		goto done;
8802 
8803 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8804 	if (error)
8805 		goto done;
8806 
8807 	if (list_stage)
8808 		error = got_worktree_status(worktree, &paths, repo,
8809 		    print_stage, NULL, check_cancelled, NULL);
8810 	else {
8811 		cpa.patch_script_file = patch_script_file;
8812 		cpa.action = "stage";
8813 		error = got_worktree_stage(worktree, &paths,
8814 		    pflag ? NULL : print_status, NULL,
8815 		    pflag ? choose_patch : NULL, &cpa, repo);
8816 	}
8817 done:
8818 	if (patch_script_file && fclose(patch_script_file) == EOF &&
8819 	    error == NULL)
8820 		error = got_error_from_errno2("fclose", patch_script_path);
8821 	if (repo)
8822 		got_repo_close(repo);
8823 	if (worktree)
8824 		got_worktree_close(worktree);
8825 	TAILQ_FOREACH(pe, &paths, entry)
8826 		free((char *)pe->path);
8827 	got_pathlist_free(&paths);
8828 	free(cwd);
8829 	return error;
8830 }
8831 
8832 __dead static void
8833 usage_unstage(void)
8834 {
8835 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8836 	    "[file-path ...]\n",
8837 	    getprogname());
8838 	exit(1);
8839 }
8840 
8841 
8842 static const struct got_error *
8843 cmd_unstage(int argc, char *argv[])
8844 {
8845 	const struct got_error *error = NULL;
8846 	struct got_repository *repo = NULL;
8847 	struct got_worktree *worktree = NULL;
8848 	char *cwd = NULL;
8849 	struct got_pathlist_head paths;
8850 	struct got_pathlist_entry *pe;
8851 	int ch, pflag = 0;
8852 	struct got_update_progress_arg upa;
8853 	FILE *patch_script_file = NULL;
8854 	const char *patch_script_path = NULL;
8855 	struct choose_patch_arg cpa;
8856 
8857 	TAILQ_INIT(&paths);
8858 
8859 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
8860 		switch (ch) {
8861 		case 'p':
8862 			pflag = 1;
8863 			break;
8864 		case 'F':
8865 			patch_script_path = optarg;
8866 			break;
8867 		default:
8868 			usage_unstage();
8869 			/* NOTREACHED */
8870 		}
8871 	}
8872 
8873 	argc -= optind;
8874 	argv += optind;
8875 
8876 #ifndef PROFILE
8877 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8878 	    "unveil", NULL) == -1)
8879 		err(1, "pledge");
8880 #endif
8881 	if (patch_script_path && !pflag)
8882 		errx(1, "-F option can only be used together with -p option");
8883 
8884 	cwd = getcwd(NULL, 0);
8885 	if (cwd == NULL) {
8886 		error = got_error_from_errno("getcwd");
8887 		goto done;
8888 	}
8889 
8890 	error = got_worktree_open(&worktree, cwd);
8891 	if (error) {
8892 		if (error->code == GOT_ERR_NOT_WORKTREE)
8893 			error = wrap_not_worktree_error(error, "unstage", cwd);
8894 		goto done;
8895 	}
8896 
8897 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8898 	    NULL);
8899 	if (error != NULL)
8900 		goto done;
8901 
8902 	if (patch_script_path) {
8903 		patch_script_file = fopen(patch_script_path, "r");
8904 		if (patch_script_file == NULL) {
8905 			error = got_error_from_errno2("fopen",
8906 			    patch_script_path);
8907 			goto done;
8908 		}
8909 	}
8910 
8911 	error = apply_unveil(got_repo_get_path(repo), 0,
8912 	    got_worktree_get_root_path(worktree));
8913 	if (error)
8914 		goto done;
8915 
8916 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8917 	if (error)
8918 		goto done;
8919 
8920 	cpa.patch_script_file = patch_script_file;
8921 	cpa.action = "unstage";
8922 	memset(&upa, 0, sizeof(upa));
8923 	error = got_worktree_unstage(worktree, &paths, update_progress,
8924 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
8925 	if (!error)
8926 		print_update_progress_stats(&upa);
8927 done:
8928 	if (patch_script_file && fclose(patch_script_file) == EOF &&
8929 	    error == NULL)
8930 		error = got_error_from_errno2("fclose", patch_script_path);
8931 	if (repo)
8932 		got_repo_close(repo);
8933 	if (worktree)
8934 		got_worktree_close(worktree);
8935 	TAILQ_FOREACH(pe, &paths, entry)
8936 		free((char *)pe->path);
8937 	got_pathlist_free(&paths);
8938 	free(cwd);
8939 	return error;
8940 }
8941 
8942 __dead static void
8943 usage_cat(void)
8944 {
8945 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8946 	    "arg1 [arg2 ...]\n", getprogname());
8947 	exit(1);
8948 }
8949 
8950 static const struct got_error *
8951 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8952 {
8953 	const struct got_error *err;
8954 	struct got_blob_object *blob;
8955 
8956 	err = got_object_open_as_blob(&blob, repo, id, 8192);
8957 	if (err)
8958 		return err;
8959 
8960 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8961 	got_object_blob_close(blob);
8962 	return err;
8963 }
8964 
8965 static const struct got_error *
8966 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8967 {
8968 	const struct got_error *err;
8969 	struct got_tree_object *tree;
8970 	int nentries, i;
8971 
8972 	err = got_object_open_as_tree(&tree, repo, id);
8973 	if (err)
8974 		return err;
8975 
8976 	nentries = got_object_tree_get_nentries(tree);
8977 	for (i = 0; i < nentries; i++) {
8978 		struct got_tree_entry *te;
8979 		char *id_str;
8980 		if (sigint_received || sigpipe_received)
8981 			break;
8982 		te = got_object_tree_get_entry(tree, i);
8983 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8984 		if (err)
8985 			break;
8986 		fprintf(outfile, "%s %.7o %s\n", id_str,
8987 		    got_tree_entry_get_mode(te),
8988 		    got_tree_entry_get_name(te));
8989 		free(id_str);
8990 	}
8991 
8992 	got_object_tree_close(tree);
8993 	return err;
8994 }
8995 
8996 static const struct got_error *
8997 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8998 {
8999 	const struct got_error *err;
9000 	struct got_commit_object *commit;
9001 	const struct got_object_id_queue *parent_ids;
9002 	struct got_object_qid *pid;
9003 	char *id_str = NULL;
9004 	const char *logmsg = NULL;
9005 
9006 	err = got_object_open_as_commit(&commit, repo, id);
9007 	if (err)
9008 		return err;
9009 
9010 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9011 	if (err)
9012 		goto done;
9013 
9014 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9015 	parent_ids = got_object_commit_get_parent_ids(commit);
9016 	fprintf(outfile, "numparents %d\n",
9017 	    got_object_commit_get_nparents(commit));
9018 	SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9019 		char *pid_str;
9020 		err = got_object_id_str(&pid_str, pid->id);
9021 		if (err)
9022 			goto done;
9023 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9024 		free(pid_str);
9025 	}
9026 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9027 	    got_object_commit_get_author(commit),
9028 	    got_object_commit_get_author_time(commit));
9029 
9030 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9031 	    got_object_commit_get_author(commit),
9032 	    got_object_commit_get_committer_time(commit));
9033 
9034 	logmsg = got_object_commit_get_logmsg_raw(commit);
9035 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9036 	fprintf(outfile, "%s", logmsg);
9037 done:
9038 	free(id_str);
9039 	got_object_commit_close(commit);
9040 	return err;
9041 }
9042 
9043 static const struct got_error *
9044 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9045 {
9046 	const struct got_error *err;
9047 	struct got_tag_object *tag;
9048 	char *id_str = NULL;
9049 	const char *tagmsg = NULL;
9050 
9051 	err = got_object_open_as_tag(&tag, repo, id);
9052 	if (err)
9053 		return err;
9054 
9055 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9056 	if (err)
9057 		goto done;
9058 
9059 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9060 
9061 	switch (got_object_tag_get_object_type(tag)) {
9062 	case GOT_OBJ_TYPE_BLOB:
9063 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9064 		    GOT_OBJ_LABEL_BLOB);
9065 		break;
9066 	case GOT_OBJ_TYPE_TREE:
9067 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9068 		    GOT_OBJ_LABEL_TREE);
9069 		break;
9070 	case GOT_OBJ_TYPE_COMMIT:
9071 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9072 		    GOT_OBJ_LABEL_COMMIT);
9073 		break;
9074 	case GOT_OBJ_TYPE_TAG:
9075 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9076 		    GOT_OBJ_LABEL_TAG);
9077 		break;
9078 	default:
9079 		break;
9080 	}
9081 
9082 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9083 	    got_object_tag_get_name(tag));
9084 
9085 	fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9086 	    got_object_tag_get_tagger(tag),
9087 	    got_object_tag_get_tagger_time(tag));
9088 
9089 	tagmsg = got_object_tag_get_message(tag);
9090 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9091 	fprintf(outfile, "%s", tagmsg);
9092 done:
9093 	free(id_str);
9094 	got_object_tag_close(tag);
9095 	return err;
9096 }
9097 
9098 static const struct got_error *
9099 cmd_cat(int argc, char *argv[])
9100 {
9101 	const struct got_error *error;
9102 	struct got_repository *repo = NULL;
9103 	struct got_worktree *worktree = NULL;
9104 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
9105 	const char *commit_id_str = NULL;
9106 	struct got_object_id *id = NULL, *commit_id = NULL;
9107 	int ch, obj_type, i, force_path = 0;
9108 
9109 #ifndef PROFILE
9110 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9111 	    NULL) == -1)
9112 		err(1, "pledge");
9113 #endif
9114 
9115 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9116 		switch (ch) {
9117 		case 'c':
9118 			commit_id_str = optarg;
9119 			break;
9120 		case 'r':
9121 			repo_path = realpath(optarg, NULL);
9122 			if (repo_path == NULL)
9123 				return got_error_from_errno2("realpath",
9124 				    optarg);
9125 			got_path_strip_trailing_slashes(repo_path);
9126 			break;
9127 		case 'P':
9128 			force_path = 1;
9129 			break;
9130 		default:
9131 			usage_cat();
9132 			/* NOTREACHED */
9133 		}
9134 	}
9135 
9136 	argc -= optind;
9137 	argv += optind;
9138 
9139 	cwd = getcwd(NULL, 0);
9140 	if (cwd == NULL) {
9141 		error = got_error_from_errno("getcwd");
9142 		goto done;
9143 	}
9144 	error = got_worktree_open(&worktree, cwd);
9145 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
9146 		goto done;
9147 	if (worktree) {
9148 		if (repo_path == NULL) {
9149 			repo_path = strdup(
9150 			    got_worktree_get_repo_path(worktree));
9151 			if (repo_path == NULL) {
9152 				error = got_error_from_errno("strdup");
9153 				goto done;
9154 			}
9155 		}
9156 	}
9157 
9158 	if (repo_path == NULL) {
9159 		repo_path = getcwd(NULL, 0);
9160 		if (repo_path == NULL)
9161 			return got_error_from_errno("getcwd");
9162 	}
9163 
9164 	error = got_repo_open(&repo, repo_path, NULL);
9165 	free(repo_path);
9166 	if (error != NULL)
9167 		goto done;
9168 
9169 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9170 	if (error)
9171 		goto done;
9172 
9173 	if (commit_id_str == NULL)
9174 		commit_id_str = GOT_REF_HEAD;
9175 	error = got_repo_match_object_id(&commit_id, NULL,
9176 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9177 	if (error)
9178 		goto done;
9179 
9180 	for (i = 0; i < argc; i++) {
9181 		if (force_path) {
9182 			error = got_object_id_by_path(&id, repo, commit_id,
9183 			    argv[i]);
9184 			if (error)
9185 				break;
9186 		} else {
9187 			error = got_repo_match_object_id(&id, &label, argv[i],
9188 			    GOT_OBJ_TYPE_ANY, 0, repo);
9189 			if (error) {
9190 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9191 				    error->code != GOT_ERR_NOT_REF)
9192 					break;
9193 				error = got_object_id_by_path(&id, repo,
9194 				    commit_id, argv[i]);
9195 				if (error)
9196 					break;
9197 			}
9198 		}
9199 
9200 		error = got_object_get_type(&obj_type, repo, id);
9201 		if (error)
9202 			break;
9203 
9204 		switch (obj_type) {
9205 		case GOT_OBJ_TYPE_BLOB:
9206 			error = cat_blob(id, repo, stdout);
9207 			break;
9208 		case GOT_OBJ_TYPE_TREE:
9209 			error = cat_tree(id, repo, stdout);
9210 			break;
9211 		case GOT_OBJ_TYPE_COMMIT:
9212 			error = cat_commit(id, repo, stdout);
9213 			break;
9214 		case GOT_OBJ_TYPE_TAG:
9215 			error = cat_tag(id, repo, stdout);
9216 			break;
9217 		default:
9218 			error = got_error(GOT_ERR_OBJ_TYPE);
9219 			break;
9220 		}
9221 		if (error)
9222 			break;
9223 		free(label);
9224 		label = NULL;
9225 		free(id);
9226 		id = NULL;
9227 	}
9228 done:
9229 	free(label);
9230 	free(id);
9231 	free(commit_id);
9232 	if (worktree)
9233 		got_worktree_close(worktree);
9234 	if (repo) {
9235 		const struct got_error *repo_error;
9236 		repo_error = got_repo_close(repo);
9237 		if (error == NULL)
9238 			error = repo_error;
9239 	}
9240 	return error;
9241 }