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