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