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 		const struct got_error *close_err = got_repo_close(repo);
1805 		if (error == NULL)
1806 			error = close_err;
1807 	}
1808 	TAILQ_FOREACH(pe, &refs, entry) {
1809 		free((void *)pe->path);
1810 		free(pe->data);
1811 	}
1812 	got_pathlist_free(&refs);
1813 	TAILQ_FOREACH(pe, &symrefs, entry) {
1814 		free((void *)pe->path);
1815 		free(pe->data);
1816 	}
1817 	got_pathlist_free(&symrefs);
1818 	got_pathlist_free(&wanted_branches);
1819 	got_pathlist_free(&wanted_refs);
1820 	free(pack_hash);
1821 	free(proto);
1822 	free(host);
1823 	free(port);
1824 	free(server_path);
1825 	free(repo_name);
1826 	free(default_destdir);
1827 	free(git_url);
1828 	return error;
1829 }
1830 
1831 static const struct got_error *
1832 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1833     int replace_tags, int verbosity, struct got_repository *repo)
1834 {
1835 	const struct got_error *err = NULL;
1836 	char *new_id_str = NULL;
1837 	struct got_object_id *old_id = NULL;
1838 
1839 	err = got_object_id_str(&new_id_str, new_id);
1840 	if (err)
1841 		goto done;
1842 
1843 	if (!replace_tags &&
1844 	    strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1845 		err = got_ref_resolve(&old_id, repo, ref);
1846 		if (err)
1847 			goto done;
1848 		if (got_object_id_cmp(old_id, new_id) == 0)
1849 			goto done;
1850 		if (verbosity >= 0) {
1851 			printf("Rejecting update of existing tag %s: %s\n",
1852 			    got_ref_get_name(ref), new_id_str);
1853 		}
1854 		goto done;
1855 	}
1856 
1857 	if (got_ref_is_symbolic(ref)) {
1858 		if (verbosity >= 0) {
1859 			printf("Replacing reference %s: %s\n",
1860 			    got_ref_get_name(ref),
1861 			    got_ref_get_symref_target(ref));
1862 		}
1863 		err = got_ref_change_symref_to_ref(ref, new_id);
1864 		if (err)
1865 			goto done;
1866 		err = got_ref_write(ref, repo);
1867 		if (err)
1868 			goto done;
1869 	} else {
1870 		err = got_ref_resolve(&old_id, repo, ref);
1871 		if (err)
1872 			goto done;
1873 		if (got_object_id_cmp(old_id, new_id) == 0)
1874 			goto done;
1875 
1876 		err = got_ref_change_ref(ref, new_id);
1877 		if (err)
1878 			goto done;
1879 		err = got_ref_write(ref, repo);
1880 		if (err)
1881 			goto done;
1882 	}
1883 
1884 	if (verbosity >= 0)
1885 		printf("Updated %s: %s\n", got_ref_get_name(ref),
1886 		    new_id_str);
1887 done:
1888 	free(old_id);
1889 	free(new_id_str);
1890 	return err;
1891 }
1892 
1893 static const struct got_error *
1894 update_symref(const char *refname, struct got_reference *target_ref,
1895     int verbosity, struct got_repository *repo)
1896 {
1897 	const struct got_error *err = NULL, *unlock_err;
1898 	struct got_reference *symref;
1899 	int symref_is_locked = 0;
1900 
1901 	err = got_ref_open(&symref, repo, refname, 1);
1902 	if (err) {
1903 		if (err->code != GOT_ERR_NOT_REF)
1904 			return err;
1905 		err = got_ref_alloc_symref(&symref, refname, target_ref);
1906 		if (err)
1907 			goto done;
1908 
1909 		err = got_ref_write(symref, repo);
1910 		if (err)
1911 			goto done;
1912 
1913 		if (verbosity >= 0)
1914 			printf("Created reference %s: %s\n",
1915 			    got_ref_get_name(symref),
1916 			    got_ref_get_symref_target(symref));
1917 	} else {
1918 		symref_is_locked = 1;
1919 
1920 		if (strcmp(got_ref_get_symref_target(symref),
1921 		    got_ref_get_name(target_ref)) == 0)
1922 			goto done;
1923 
1924 		err = got_ref_change_symref(symref,
1925 		    got_ref_get_name(target_ref));
1926 		if (err)
1927 			goto done;
1928 
1929 		err = got_ref_write(symref, repo);
1930 		if (err)
1931 			goto done;
1932 
1933 		if (verbosity >= 0)
1934 			printf("Updated %s: %s\n", got_ref_get_name(symref),
1935 			    got_ref_get_symref_target(symref));
1936 
1937 	}
1938 done:
1939 	if (symref_is_locked) {
1940 		unlock_err = got_ref_unlock(symref);
1941 		if (unlock_err && err == NULL)
1942 			err = unlock_err;
1943 	}
1944 	got_ref_close(symref);
1945 	return err;
1946 }
1947 
1948 __dead static void
1949 usage_fetch(void)
1950 {
1951 	fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1952 	    "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1953 	    "[remote-repository-name]\n",
1954 	    getprogname());
1955 	exit(1);
1956 }
1957 
1958 static const struct got_error *
1959 delete_missing_ref(struct got_reference *ref,
1960     int verbosity, struct got_repository *repo)
1961 {
1962 	const struct got_error *err = NULL;
1963 	struct got_object_id *id = NULL;
1964 	char *id_str = NULL;
1965 
1966 	if (got_ref_is_symbolic(ref)) {
1967 		err = got_ref_delete(ref, repo);
1968 		if (err)
1969 			return err;
1970 		if (verbosity >= 0) {
1971 			printf("Deleted reference %s: %s\n",
1972 			    got_ref_get_name(ref),
1973 			    got_ref_get_symref_target(ref));
1974 		}
1975 	} else {
1976 		err = got_ref_resolve(&id, repo, ref);
1977 		if (err)
1978 			return err;
1979 		err = got_object_id_str(&id_str, id);
1980 		if (err)
1981 			goto done;
1982 
1983 		err = got_ref_delete(ref, repo);
1984 		if (err)
1985 			goto done;
1986 		if (verbosity >= 0) {
1987 			printf("Deleted reference %s: %s\n",
1988 			    got_ref_get_name(ref), id_str);
1989 		}
1990 	}
1991 done:
1992 	free(id);
1993 	free(id_str);
1994 	return NULL;
1995 }
1996 
1997 static const struct got_error *
1998 delete_missing_refs(struct got_pathlist_head *their_refs,
1999     struct got_pathlist_head *their_symrefs,
2000     const struct got_remote_repo *remote,
2001     int verbosity, struct got_repository *repo)
2002 {
2003 	const struct got_error *err = NULL, *unlock_err;
2004 	struct got_reflist_head my_refs;
2005 	struct got_reflist_entry *re;
2006 	struct got_pathlist_entry *pe;
2007 	char *remote_namespace = NULL;
2008 	char *local_refname = NULL;
2009 
2010 	TAILQ_INIT(&my_refs);
2011 
2012 	if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2013 	    == -1)
2014 		return got_error_from_errno("asprintf");
2015 
2016 	err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2017 	if (err)
2018 		goto done;
2019 
2020 	TAILQ_FOREACH(re, &my_refs, entry) {
2021 		const char *refname = got_ref_get_name(re->ref);
2022 
2023 		if (!remote->mirror_references) {
2024 			if (strncmp(refname, remote_namespace,
2025 			    strlen(remote_namespace)) == 0) {
2026 				if (strcmp(refname + strlen(remote_namespace),
2027 				    GOT_REF_HEAD) == 0)
2028 					continue;
2029 				if (asprintf(&local_refname, "refs/heads/%s",
2030 				    refname + strlen(remote_namespace)) == -1) {
2031 					err = got_error_from_errno("asprintf");
2032 					goto done;
2033 				}
2034 			} else if (strncmp(refname, "refs/tags/", 10) != 0)
2035 				continue;
2036 		}
2037 
2038 		TAILQ_FOREACH(pe, their_refs, entry) {
2039 			if (strcmp(local_refname, pe->path) == 0)
2040 				break;
2041 		}
2042 		if (pe != NULL)
2043 			continue;
2044 
2045 		TAILQ_FOREACH(pe, their_symrefs, entry) {
2046 			if (strcmp(local_refname, pe->path) == 0)
2047 				break;
2048 		}
2049 		if (pe != NULL)
2050 			continue;
2051 
2052 		err = delete_missing_ref(re->ref, verbosity, repo);
2053 		if (err)
2054 			break;
2055 
2056 		if (local_refname) {
2057 			struct got_reference *ref;
2058 			err = got_ref_open(&ref, repo, local_refname, 1);
2059 			if (err) {
2060 				if (err->code != GOT_ERR_NOT_REF)
2061 					break;
2062 				free(local_refname);
2063 				local_refname = NULL;
2064 				continue;
2065 			}
2066 			err = delete_missing_ref(ref, verbosity, repo);
2067 			if (err)
2068 				break;
2069 			unlock_err = got_ref_unlock(ref);
2070 			got_ref_close(ref);
2071 			if (unlock_err && err == NULL) {
2072 				err = unlock_err;
2073 				break;
2074 			}
2075 
2076 			free(local_refname);
2077 			local_refname = NULL;
2078 		}
2079 	}
2080 done:
2081 	free(remote_namespace);
2082 	free(local_refname);
2083 	return err;
2084 }
2085 
2086 static const struct got_error *
2087 update_wanted_ref(const char *refname, struct got_object_id *id,
2088     const char *remote_repo_name, int verbosity, struct got_repository *repo)
2089 {
2090 	const struct got_error *err, *unlock_err;
2091 	char *remote_refname;
2092 	struct got_reference *ref;
2093 
2094 	if (strncmp("refs/", refname, 5) == 0)
2095 		refname += 5;
2096 
2097 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2098 	    remote_repo_name, refname) == -1)
2099 		return got_error_from_errno("asprintf");
2100 
2101 	err = got_ref_open(&ref, repo, remote_refname, 1);
2102 	if (err) {
2103 		if (err->code != GOT_ERR_NOT_REF)
2104 			goto done;
2105 		err = create_ref(remote_refname, id, verbosity, repo);
2106 	} else {
2107 		err = update_ref(ref, id, 0, verbosity, repo);
2108 		unlock_err = got_ref_unlock(ref);
2109 		if (unlock_err && err == NULL)
2110 			err = unlock_err;
2111 		got_ref_close(ref);
2112 	}
2113 done:
2114 	free(remote_refname);
2115 	return err;
2116 }
2117 
2118 static const struct got_error *
2119 cmd_fetch(int argc, char *argv[])
2120 {
2121 	const struct got_error *error = NULL, *unlock_err;
2122 	char *cwd = NULL, *repo_path = NULL;
2123 	const char *remote_name;
2124 	char *proto = NULL, *host = NULL, *port = NULL;
2125 	char *repo_name = NULL, *server_path = NULL;
2126 	const struct got_remote_repo *remotes, *remote = NULL;
2127 	int nremotes;
2128 	char *id_str = NULL;
2129 	struct got_repository *repo = NULL;
2130 	struct got_worktree *worktree = NULL;
2131 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2132 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2133 	struct got_pathlist_entry *pe;
2134 	struct got_object_id *pack_hash = NULL;
2135 	int i, ch, fetchfd = -1, fetchstatus;
2136 	pid_t fetchpid = -1;
2137 	struct got_fetch_progress_arg fpa;
2138 	int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2139 	int delete_refs = 0, replace_tags = 0;
2140 
2141 	TAILQ_INIT(&refs);
2142 	TAILQ_INIT(&symrefs);
2143 	TAILQ_INIT(&wanted_branches);
2144 	TAILQ_INIT(&wanted_refs);
2145 
2146 	while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2147 		switch (ch) {
2148 		case 'a':
2149 			fetch_all_branches = 1;
2150 			break;
2151 		case 'b':
2152 			error = got_pathlist_append(&wanted_branches,
2153 			    optarg, NULL);
2154 			if (error)
2155 				return error;
2156 			break;
2157 		case 'd':
2158 			delete_refs = 1;
2159 			break;
2160 		case 'l':
2161 			list_refs_only = 1;
2162 			break;
2163 		case 'r':
2164 			repo_path = realpath(optarg, NULL);
2165 			if (repo_path == NULL)
2166 				return got_error_from_errno2("realpath",
2167 				    optarg);
2168 			got_path_strip_trailing_slashes(repo_path);
2169 			break;
2170 		case 't':
2171 			replace_tags = 1;
2172 			break;
2173 		case 'v':
2174 			if (verbosity < 0)
2175 				verbosity = 0;
2176 			else if (verbosity < 3)
2177 				verbosity++;
2178 			break;
2179 		case 'q':
2180 			verbosity = -1;
2181 			break;
2182 		case 'R':
2183 			error = got_pathlist_append(&wanted_refs,
2184 			    optarg, NULL);
2185 			if (error)
2186 				return error;
2187 			break;
2188 		default:
2189 			usage_fetch();
2190 			break;
2191 		}
2192 	}
2193 	argc -= optind;
2194 	argv += optind;
2195 
2196 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2197 		option_conflict('a', 'b');
2198 	if (list_refs_only) {
2199 		if (!TAILQ_EMPTY(&wanted_branches))
2200 			option_conflict('l', 'b');
2201 		if (fetch_all_branches)
2202 			option_conflict('l', 'a');
2203 		if (delete_refs)
2204 			option_conflict('l', 'd');
2205 	}
2206 
2207 	if (argc == 0)
2208 		remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2209 	else if (argc == 1)
2210 		remote_name = argv[0];
2211 	else
2212 		usage_fetch();
2213 
2214 	cwd = getcwd(NULL, 0);
2215 	if (cwd == NULL) {
2216 		error = got_error_from_errno("getcwd");
2217 		goto done;
2218 	}
2219 
2220 	if (repo_path == NULL) {
2221 		error = got_worktree_open(&worktree, cwd);
2222 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2223 			goto done;
2224 		else
2225 			error = NULL;
2226 		if (worktree) {
2227 			repo_path =
2228 			    strdup(got_worktree_get_repo_path(worktree));
2229 			if (repo_path == NULL)
2230 				error = got_error_from_errno("strdup");
2231 			if (error)
2232 				goto done;
2233 		} else {
2234 			repo_path = strdup(cwd);
2235 			if (repo_path == NULL) {
2236 				error = got_error_from_errno("strdup");
2237 				goto done;
2238 			}
2239 		}
2240 	}
2241 
2242 	error = got_repo_open(&repo, repo_path, NULL);
2243 	if (error)
2244 		goto done;
2245 
2246 	if (worktree) {
2247 		worktree_conf = got_worktree_get_gotconfig(worktree);
2248 		if (worktree_conf) {
2249 			got_gotconfig_get_remotes(&nremotes, &remotes,
2250 			    worktree_conf);
2251 			for (i = 0; i < nremotes; i++) {
2252 				if (strcmp(remotes[i].name, remote_name) == 0) {
2253 					remote = &remotes[i];
2254 					break;
2255 				}
2256 			}
2257 		}
2258 	}
2259 	if (remote == NULL) {
2260 		repo_conf = got_repo_get_gotconfig(repo);
2261 		if (repo_conf) {
2262 			got_gotconfig_get_remotes(&nremotes, &remotes,
2263 			    repo_conf);
2264 			for (i = 0; i < nremotes; i++) {
2265 				if (strcmp(remotes[i].name, remote_name) == 0) {
2266 					remote = &remotes[i];
2267 					break;
2268 				}
2269 			}
2270 		}
2271 	}
2272 	if (remote == NULL) {
2273 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2274 		for (i = 0; i < nremotes; i++) {
2275 			if (strcmp(remotes[i].name, remote_name) == 0) {
2276 				remote = &remotes[i];
2277 				break;
2278 			}
2279 		}
2280 	}
2281 	if (remote == NULL) {
2282 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2283 		goto done;
2284 	}
2285 
2286 	if (TAILQ_EMPTY(&wanted_branches)) {
2287 		if (!fetch_all_branches)
2288 			fetch_all_branches = remote->fetch_all_branches;
2289 		for (i = 0; i < remote->nbranches; i++) {
2290 			got_pathlist_append(&wanted_branches,
2291 			    remote->branches[i], NULL);
2292 		}
2293 	}
2294 	if (TAILQ_EMPTY(&wanted_refs)) {
2295 		for (i = 0; i < remote->nrefs; i++) {
2296 			got_pathlist_append(&wanted_refs,
2297 			    remote->refs[i], NULL);
2298 		}
2299 	}
2300 
2301 	error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2302 	    &repo_name, remote->url);
2303 	if (error)
2304 		goto done;
2305 
2306 	if (strcmp(proto, "git") == 0) {
2307 #ifndef PROFILE
2308 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2309 		    "sendfd dns inet unveil", NULL) == -1)
2310 			err(1, "pledge");
2311 #endif
2312 	} else if (strcmp(proto, "git+ssh") == 0 ||
2313 	    strcmp(proto, "ssh") == 0) {
2314 #ifndef PROFILE
2315 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2316 		    "sendfd unveil", NULL) == -1)
2317 			err(1, "pledge");
2318 #endif
2319 	} else if (strcmp(proto, "http") == 0 ||
2320 	    strcmp(proto, "git+http") == 0) {
2321 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2322 		goto done;
2323 	} else {
2324 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2325 		goto done;
2326 	}
2327 
2328 	if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2329 		if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2330 			error = got_error_from_errno2("unveil",
2331 			    GOT_FETCH_PATH_SSH);
2332 			goto done;
2333 		}
2334 	}
2335 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2336 	if (error)
2337 		goto done;
2338 
2339 	if (verbosity >= 0)
2340 		printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2341 		    port ? ":" : "", port ? port : "");
2342 
2343 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2344 	    server_path, verbosity);
2345 	if (error)
2346 		goto done;
2347 
2348 	fpa.last_scaled_size[0] = '\0';
2349 	fpa.last_p_indexed = -1;
2350 	fpa.last_p_resolved = -1;
2351 	fpa.verbosity = verbosity;
2352 	fpa.repo = repo;
2353 	fpa.create_configs = 0;
2354 	fpa.configs_created = 0;
2355 	memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2356 	error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2357 	    remote->mirror_references, fetch_all_branches, &wanted_branches,
2358 	    &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2359 	    fetch_progress, &fpa);
2360 	if (error)
2361 		goto done;
2362 
2363 	if (list_refs_only) {
2364 		error = list_remote_refs(&symrefs, &refs);
2365 		goto done;
2366 	}
2367 
2368 	if (pack_hash == NULL) {
2369 		if (verbosity >= 0)
2370 			printf("Already up-to-date\n");
2371 	} else if (verbosity >= 0) {
2372 		error = got_object_id_str(&id_str, pack_hash);
2373 		if (error)
2374 			goto done;
2375 		printf("\nFetched %s.pack\n", id_str);
2376 		free(id_str);
2377 		id_str = NULL;
2378 	}
2379 
2380 	/* Update references provided with the pack file. */
2381 	TAILQ_FOREACH(pe, &refs, entry) {
2382 		const char *refname = pe->path;
2383 		struct got_object_id *id = pe->data;
2384 		struct got_reference *ref;
2385 		char *remote_refname;
2386 
2387 		if (is_wanted_ref(&wanted_refs, refname) &&
2388 		    !remote->mirror_references) {
2389 			error = update_wanted_ref(refname, id,
2390 			    remote->name, verbosity, repo);
2391 			if (error)
2392 				goto done;
2393 			continue;
2394 		}
2395 
2396 		if (remote->mirror_references ||
2397 		    strncmp("refs/tags/", refname, 10) == 0) {
2398 			error = got_ref_open(&ref, repo, refname, 1);
2399 			if (error) {
2400 				if (error->code != GOT_ERR_NOT_REF)
2401 					goto done;
2402 				error = create_ref(refname, id, verbosity,
2403 				    repo);
2404 				if (error)
2405 					goto done;
2406 			} else {
2407 				error = update_ref(ref, id, replace_tags,
2408 				    verbosity, repo);
2409 				unlock_err = got_ref_unlock(ref);
2410 				if (unlock_err && error == NULL)
2411 					error = unlock_err;
2412 				got_ref_close(ref);
2413 				if (error)
2414 					goto done;
2415 			}
2416 		} else if (strncmp("refs/heads/", refname, 11) == 0) {
2417 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2418 			    remote_name, refname + 11) == -1) {
2419 				error = got_error_from_errno("asprintf");
2420 				goto done;
2421 			}
2422 
2423 			error = got_ref_open(&ref, repo, remote_refname, 1);
2424 			if (error) {
2425 				if (error->code != GOT_ERR_NOT_REF)
2426 					goto done;
2427 				error = create_ref(remote_refname, id, 
2428 				    verbosity, repo);
2429 				if (error)
2430 					goto done;
2431 			} else {
2432 				error = update_ref(ref, id, replace_tags,
2433 				    verbosity, repo);
2434 				unlock_err = got_ref_unlock(ref);
2435 				if (unlock_err && error == NULL)
2436 					error = unlock_err;
2437 				got_ref_close(ref);
2438 				if (error)
2439 					goto done;
2440 			}
2441 
2442 			/* Also create a local branch if none exists yet. */
2443 			error = got_ref_open(&ref, repo, refname, 1);
2444 			if (error) {
2445 				if (error->code != GOT_ERR_NOT_REF)
2446 					goto done;
2447 				error = create_ref(refname, id, verbosity,
2448 				    repo);
2449 				if (error)
2450 					goto done;
2451 			} else {
2452 				unlock_err = got_ref_unlock(ref);
2453 				if (unlock_err && error == NULL)
2454 					error = unlock_err;
2455 				got_ref_close(ref);
2456 			}
2457 		}
2458 	}
2459 	if (delete_refs) {
2460 		error = delete_missing_refs(&refs, &symrefs, remote,
2461 		    verbosity, repo);
2462 		if (error)
2463 			goto done;
2464 	}
2465 
2466 	if (!remote->mirror_references) {
2467 		/* Update remote HEAD reference if the server provided one. */
2468 		TAILQ_FOREACH(pe, &symrefs, entry) {
2469 			struct got_reference *target_ref;
2470 			const char *refname = pe->path;
2471 			const char *target = pe->data;
2472 			char *remote_refname = NULL, *remote_target = NULL;
2473 
2474 			if (strcmp(refname, GOT_REF_HEAD) != 0)
2475 				continue;
2476 
2477 			if (strncmp("refs/heads/", target, 11) != 0)
2478 				continue;
2479 
2480 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2481 			    remote->name, refname) == -1) {
2482 				error = got_error_from_errno("asprintf");
2483 				goto done;
2484 			}
2485 			if (asprintf(&remote_target, "refs/remotes/%s/%s",
2486 			    remote->name, target + 11) == -1) {
2487 				error = got_error_from_errno("asprintf");
2488 				free(remote_refname);
2489 				goto done;
2490 			}
2491 
2492 			error = got_ref_open(&target_ref, repo, remote_target,
2493 			    0);
2494 			if (error) {
2495 				free(remote_refname);
2496 				free(remote_target);
2497 				if (error->code == GOT_ERR_NOT_REF) {
2498 					error = NULL;
2499 					continue;
2500 				}
2501 				goto done;
2502 			}
2503 			error = update_symref(remote_refname, target_ref,
2504 			    verbosity, repo);
2505 			free(remote_refname);
2506 			free(remote_target);
2507 			got_ref_close(target_ref);
2508 			if (error)
2509 				goto done;
2510 		}
2511 	}
2512 done:
2513 	if (fetchpid > 0) {
2514 		if (kill(fetchpid, SIGTERM) == -1)
2515 			error = got_error_from_errno("kill");
2516 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2517 			error = got_error_from_errno("waitpid");
2518 	}
2519 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2520 		error = got_error_from_errno("close");
2521 	if (repo) {
2522 		const struct got_error *close_err = got_repo_close(repo);
2523 		if (error == NULL)
2524 			error = close_err;
2525 	}
2526 	if (worktree)
2527 		got_worktree_close(worktree);
2528 	TAILQ_FOREACH(pe, &refs, entry) {
2529 		free((void *)pe->path);
2530 		free(pe->data);
2531 	}
2532 	got_pathlist_free(&refs);
2533 	TAILQ_FOREACH(pe, &symrefs, entry) {
2534 		free((void *)pe->path);
2535 		free(pe->data);
2536 	}
2537 	got_pathlist_free(&symrefs);
2538 	got_pathlist_free(&wanted_branches);
2539 	got_pathlist_free(&wanted_refs);
2540 	free(id_str);
2541 	free(cwd);
2542 	free(repo_path);
2543 	free(pack_hash);
2544 	free(proto);
2545 	free(host);
2546 	free(port);
2547 	free(server_path);
2548 	free(repo_name);
2549 	return error;
2550 }
2551 
2552 
2553 __dead static void
2554 usage_checkout(void)
2555 {
2556 	fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2557 	    "[-p prefix] repository-path [worktree-path]\n", getprogname());
2558 	exit(1);
2559 }
2560 
2561 static void
2562 show_worktree_base_ref_warning(void)
2563 {
2564 	fprintf(stderr, "%s: warning: could not create a reference "
2565 	    "to the work tree's base commit; the commit could be "
2566 	    "garbage-collected by Git; making the repository "
2567 	    "writable and running 'got update' will prevent this\n",
2568 	    getprogname());
2569 }
2570 
2571 struct got_checkout_progress_arg {
2572 	const char *worktree_path;
2573 	int had_base_commit_ref_error;
2574 };
2575 
2576 static const struct got_error *
2577 checkout_progress(void *arg, unsigned char status, const char *path)
2578 {
2579 	struct got_checkout_progress_arg *a = arg;
2580 
2581 	/* Base commit bump happens silently. */
2582 	if (status == GOT_STATUS_BUMP_BASE)
2583 		return NULL;
2584 
2585 	if (status == GOT_STATUS_BASE_REF_ERR) {
2586 		a->had_base_commit_ref_error = 1;
2587 		return NULL;
2588 	}
2589 
2590 	while (path[0] == '/')
2591 		path++;
2592 
2593 	printf("%c  %s/%s\n", status, a->worktree_path, path);
2594 	return NULL;
2595 }
2596 
2597 static const struct got_error *
2598 check_cancelled(void *arg)
2599 {
2600 	if (sigint_received || sigpipe_received)
2601 		return got_error(GOT_ERR_CANCELLED);
2602 	return NULL;
2603 }
2604 
2605 static const struct got_error *
2606 check_linear_ancestry(struct got_object_id *commit_id,
2607     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2608     struct got_repository *repo)
2609 {
2610 	const struct got_error *err = NULL;
2611 	struct got_object_id *yca_id;
2612 
2613 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2614 	    commit_id, base_commit_id, repo, check_cancelled, NULL);
2615 	if (err)
2616 		return err;
2617 
2618 	if (yca_id == NULL)
2619 		return got_error(GOT_ERR_ANCESTRY);
2620 
2621 	/*
2622 	 * Require a straight line of history between the target commit
2623 	 * and the work tree's base commit.
2624 	 *
2625 	 * Non-linear situations such as this require a rebase:
2626 	 *
2627 	 * (commit) D       F (base_commit)
2628 	 *           \     /
2629 	 *            C   E
2630 	 *             \ /
2631 	 *              B (yca)
2632 	 *              |
2633 	 *              A
2634 	 *
2635 	 * 'got update' only handles linear cases:
2636 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
2637 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
2638 	 */
2639 	if (allow_forwards_in_time_only) {
2640 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2641 		return got_error(GOT_ERR_ANCESTRY);
2642 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2643 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
2644 		return got_error(GOT_ERR_ANCESTRY);
2645 
2646 	free(yca_id);
2647 	return NULL;
2648 }
2649 
2650 static const struct got_error *
2651 check_same_branch(struct got_object_id *commit_id,
2652     struct got_reference *head_ref, struct got_object_id *yca_id,
2653     struct got_repository *repo)
2654 {
2655 	const struct got_error *err = NULL;
2656 	struct got_commit_graph *graph = NULL;
2657 	struct got_object_id *head_commit_id = NULL;
2658 	int is_same_branch = 0;
2659 
2660 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
2661 	if (err)
2662 		goto done;
2663 
2664 	if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2665 		is_same_branch = 1;
2666 		goto done;
2667 	}
2668 	if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2669 		is_same_branch = 1;
2670 		goto done;
2671 	}
2672 
2673 	err = got_commit_graph_open(&graph, "/", 1);
2674 	if (err)
2675 		goto done;
2676 
2677 	err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2678 	    check_cancelled, NULL);
2679 	if (err)
2680 		goto done;
2681 
2682 	for (;;) {
2683 		struct got_object_id *id;
2684 		err = got_commit_graph_iter_next(&id, graph, repo,
2685 		    check_cancelled, NULL);
2686 		if (err) {
2687 			if (err->code == GOT_ERR_ITER_COMPLETED)
2688 				err = NULL;
2689 			break;
2690 		}
2691 
2692 		if (id) {
2693 			if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2694 				break;
2695 			if (got_object_id_cmp(id, commit_id) == 0) {
2696 				is_same_branch = 1;
2697 				break;
2698 			}
2699 		}
2700 	}
2701 done:
2702 	if (graph)
2703 		got_commit_graph_close(graph);
2704 	free(head_commit_id);
2705 	if (!err && !is_same_branch)
2706 		err = got_error(GOT_ERR_ANCESTRY);
2707 	return err;
2708 }
2709 
2710 static const struct got_error *
2711 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2712 {
2713 	static char msg[512];
2714 	const char *branch_name;
2715 
2716 	if (got_ref_is_symbolic(ref))
2717 		branch_name = got_ref_get_symref_target(ref);
2718 	else
2719 		branch_name = got_ref_get_name(ref);
2720 
2721 	if (strncmp("refs/heads/", branch_name, 11) == 0)
2722 		branch_name += 11;
2723 
2724 	snprintf(msg, sizeof(msg),
2725 	    "target commit is not contained in branch '%s'; "
2726 	    "the branch to use must be specified with -b; "
2727 	    "if necessary a new branch can be created for "
2728 	    "this commit with 'got branch -c %s BRANCH_NAME'",
2729 	    branch_name, commit_id_str);
2730 
2731 	return got_error_msg(GOT_ERR_ANCESTRY, msg);
2732 }
2733 
2734 static const struct got_error *
2735 cmd_checkout(int argc, char *argv[])
2736 {
2737 	const struct got_error *error = NULL;
2738 	struct got_repository *repo = NULL;
2739 	struct got_reference *head_ref = NULL;
2740 	struct got_worktree *worktree = NULL;
2741 	char *repo_path = NULL;
2742 	char *worktree_path = NULL;
2743 	const char *path_prefix = "";
2744 	const char *branch_name = GOT_REF_HEAD;
2745 	char *commit_id_str = NULL;
2746 	char *cwd = NULL;
2747 	int ch, same_path_prefix, allow_nonempty = 0;
2748 	struct got_pathlist_head paths;
2749 	struct got_checkout_progress_arg cpa;
2750 
2751 	TAILQ_INIT(&paths);
2752 
2753 	while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2754 		switch (ch) {
2755 		case 'b':
2756 			branch_name = optarg;
2757 			break;
2758 		case 'c':
2759 			commit_id_str = strdup(optarg);
2760 			if (commit_id_str == NULL)
2761 				return got_error_from_errno("strdup");
2762 			break;
2763 		case 'E':
2764 			allow_nonempty = 1;
2765 			break;
2766 		case 'p':
2767 			path_prefix = optarg;
2768 			break;
2769 		default:
2770 			usage_checkout();
2771 			/* NOTREACHED */
2772 		}
2773 	}
2774 
2775 	argc -= optind;
2776 	argv += optind;
2777 
2778 #ifndef PROFILE
2779 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2780 	    "unveil", NULL) == -1)
2781 		err(1, "pledge");
2782 #endif
2783 	if (argc == 1) {
2784 		char *base, *dotgit;
2785 		const char *path;
2786 		repo_path = realpath(argv[0], NULL);
2787 		if (repo_path == NULL)
2788 			return got_error_from_errno2("realpath", argv[0]);
2789 		cwd = getcwd(NULL, 0);
2790 		if (cwd == NULL) {
2791 			error = got_error_from_errno("getcwd");
2792 			goto done;
2793 		}
2794 		if (path_prefix[0])
2795 			path = path_prefix;
2796 		else
2797 			path = repo_path;
2798 		error = got_path_basename(&base, path);
2799 		if (error)
2800 			goto done;
2801 		dotgit = strstr(base, ".git");
2802 		if (dotgit)
2803 			*dotgit = '\0';
2804 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2805 			error = got_error_from_errno("asprintf");
2806 			free(base);
2807 			goto done;
2808 		}
2809 		free(base);
2810 	} else if (argc == 2) {
2811 		repo_path = realpath(argv[0], NULL);
2812 		if (repo_path == NULL) {
2813 			error = got_error_from_errno2("realpath", argv[0]);
2814 			goto done;
2815 		}
2816 		worktree_path = realpath(argv[1], NULL);
2817 		if (worktree_path == NULL) {
2818 			if (errno != ENOENT) {
2819 				error = got_error_from_errno2("realpath",
2820 				    argv[1]);
2821 				goto done;
2822 			}
2823 			worktree_path = strdup(argv[1]);
2824 			if (worktree_path == NULL) {
2825 				error = got_error_from_errno("strdup");
2826 				goto done;
2827 			}
2828 		}
2829 	} else
2830 		usage_checkout();
2831 
2832 	got_path_strip_trailing_slashes(repo_path);
2833 	got_path_strip_trailing_slashes(worktree_path);
2834 
2835 	error = got_repo_open(&repo, repo_path, NULL);
2836 	if (error != NULL)
2837 		goto done;
2838 
2839 	/* Pre-create work tree path for unveil(2) */
2840 	error = got_path_mkdir(worktree_path);
2841 	if (error) {
2842 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2843 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2844 			goto done;
2845 		if (!allow_nonempty &&
2846 		    !got_path_dir_is_empty(worktree_path)) {
2847 			error = got_error_path(worktree_path,
2848 			    GOT_ERR_DIR_NOT_EMPTY);
2849 			goto done;
2850 		}
2851 	}
2852 
2853 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2854 	if (error)
2855 		goto done;
2856 
2857 	error = got_ref_open(&head_ref, repo, branch_name, 0);
2858 	if (error != NULL)
2859 		goto done;
2860 
2861 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2862 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2863 		goto done;
2864 
2865 	error = got_worktree_open(&worktree, worktree_path);
2866 	if (error != NULL)
2867 		goto done;
2868 
2869 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2870 	    path_prefix);
2871 	if (error != NULL)
2872 		goto done;
2873 	if (!same_path_prefix) {
2874 		error = got_error(GOT_ERR_PATH_PREFIX);
2875 		goto done;
2876 	}
2877 
2878 	if (commit_id_str) {
2879 		struct got_object_id *commit_id;
2880 		struct got_reflist_head refs;
2881 		TAILQ_INIT(&refs);
2882 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2883 		    NULL);
2884 		if (error)
2885 			goto done;
2886 		error = got_repo_match_object_id(&commit_id, NULL,
2887 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2888 		got_ref_list_free(&refs);
2889 		if (error)
2890 			goto done;
2891 		error = check_linear_ancestry(commit_id,
2892 		    got_worktree_get_base_commit_id(worktree), 0, repo);
2893 		if (error != NULL) {
2894 			free(commit_id);
2895 			if (error->code == GOT_ERR_ANCESTRY) {
2896 				error = checkout_ancestry_error(
2897 				    head_ref, commit_id_str);
2898 			}
2899 			goto done;
2900 		}
2901 		error = check_same_branch(commit_id, head_ref, NULL, repo);
2902 		if (error) {
2903 			if (error->code == GOT_ERR_ANCESTRY) {
2904 				error = checkout_ancestry_error(
2905 				    head_ref, commit_id_str);
2906 			}
2907 			goto done;
2908 		}
2909 		error = got_worktree_set_base_commit_id(worktree, repo,
2910 		    commit_id);
2911 		free(commit_id);
2912 		if (error)
2913 			goto done;
2914 	}
2915 
2916 	error = got_pathlist_append(&paths, "", NULL);
2917 	if (error)
2918 		goto done;
2919 	cpa.worktree_path = worktree_path;
2920 	cpa.had_base_commit_ref_error = 0;
2921 	error = got_worktree_checkout_files(worktree, &paths, repo,
2922 	    checkout_progress, &cpa, check_cancelled, NULL);
2923 	if (error != NULL)
2924 		goto done;
2925 
2926 	printf("Now shut up and hack\n");
2927 	if (cpa.had_base_commit_ref_error)
2928 		show_worktree_base_ref_warning();
2929 done:
2930 	got_pathlist_free(&paths);
2931 	free(commit_id_str);
2932 	free(repo_path);
2933 	free(worktree_path);
2934 	free(cwd);
2935 	return error;
2936 }
2937 
2938 struct got_update_progress_arg {
2939 	int did_something;
2940 	int conflicts;
2941 	int obstructed;
2942 	int not_updated;
2943 };
2944 
2945 void
2946 print_update_progress_stats(struct got_update_progress_arg *upa)
2947 {
2948 	if (!upa->did_something)
2949 		return;
2950 
2951 	if (upa->conflicts > 0)
2952 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
2953 	if (upa->obstructed > 0)
2954 		printf("File paths obstructed by a non-regular file: %d\n",
2955 		    upa->obstructed);
2956 	if (upa->not_updated > 0)
2957 		printf("Files not updated because of existing merge "
2958 		    "conflicts: %d\n", upa->not_updated);
2959 }
2960 
2961 __dead static void
2962 usage_update(void)
2963 {
2964 	fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2965 	    getprogname());
2966 	exit(1);
2967 }
2968 
2969 static const struct got_error *
2970 update_progress(void *arg, unsigned char status, const char *path)
2971 {
2972 	struct got_update_progress_arg *upa = arg;
2973 
2974 	if (status == GOT_STATUS_EXISTS ||
2975 	    status == GOT_STATUS_BASE_REF_ERR)
2976 		return NULL;
2977 
2978 	upa->did_something = 1;
2979 
2980 	/* Base commit bump happens silently. */
2981 	if (status == GOT_STATUS_BUMP_BASE)
2982 		return NULL;
2983 
2984 	if (status == GOT_STATUS_CONFLICT)
2985 		upa->conflicts++;
2986 	if (status == GOT_STATUS_OBSTRUCTED)
2987 		upa->obstructed++;
2988 	if (status == GOT_STATUS_CANNOT_UPDATE)
2989 		upa->not_updated++;
2990 
2991 	while (path[0] == '/')
2992 		path++;
2993 	printf("%c  %s\n", status, path);
2994 	return NULL;
2995 }
2996 
2997 static const struct got_error *
2998 switch_head_ref(struct got_reference *head_ref,
2999     struct got_object_id *commit_id, struct got_worktree *worktree,
3000     struct got_repository *repo)
3001 {
3002 	const struct got_error *err = NULL;
3003 	char *base_id_str;
3004 	int ref_has_moved = 0;
3005 
3006 	/* Trivial case: switching between two different references. */
3007 	if (strcmp(got_ref_get_name(head_ref),
3008 	    got_worktree_get_head_ref_name(worktree)) != 0) {
3009 		printf("Switching work tree from %s to %s\n",
3010 		    got_worktree_get_head_ref_name(worktree),
3011 		    got_ref_get_name(head_ref));
3012 		return got_worktree_set_head_ref(worktree, head_ref);
3013 	}
3014 
3015 	err = check_linear_ancestry(commit_id,
3016 	    got_worktree_get_base_commit_id(worktree), 0, repo);
3017 	if (err) {
3018 		if (err->code != GOT_ERR_ANCESTRY)
3019 			return err;
3020 		ref_has_moved = 1;
3021 	}
3022 	if (!ref_has_moved)
3023 		return NULL;
3024 
3025 	/* Switching to a rebased branch with the same reference name. */
3026 	err = got_object_id_str(&base_id_str,
3027 	    got_worktree_get_base_commit_id(worktree));
3028 	if (err)
3029 		return err;
3030 	printf("Reference %s now points at a different branch\n",
3031 	    got_worktree_get_head_ref_name(worktree));
3032 	printf("Switching work tree from %s to %s\n", base_id_str,
3033 	    got_worktree_get_head_ref_name(worktree));
3034 	return NULL;
3035 }
3036 
3037 static const struct got_error *
3038 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3039 {
3040 	const struct got_error *err;
3041 	int in_progress;
3042 
3043 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
3044 	if (err)
3045 		return err;
3046 	if (in_progress)
3047 		return got_error(GOT_ERR_REBASING);
3048 
3049 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
3050 	if (err)
3051 		return err;
3052 	if (in_progress)
3053 		return got_error(GOT_ERR_HISTEDIT_BUSY);
3054 
3055 	return NULL;
3056 }
3057 
3058 static const struct got_error *
3059 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3060     char *argv[], struct got_worktree *worktree)
3061 {
3062 	const struct got_error *err = NULL;
3063 	char *path;
3064 	int i;
3065 
3066 	if (argc == 0) {
3067 		path = strdup("");
3068 		if (path == NULL)
3069 			return got_error_from_errno("strdup");
3070 		return got_pathlist_append(paths, path, NULL);
3071 	}
3072 
3073 	for (i = 0; i < argc; i++) {
3074 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
3075 		if (err)
3076 			break;
3077 		err = got_pathlist_append(paths, path, NULL);
3078 		if (err) {
3079 			free(path);
3080 			break;
3081 		}
3082 	}
3083 
3084 	return err;
3085 }
3086 
3087 static const struct got_error *
3088 wrap_not_worktree_error(const struct got_error *orig_err,
3089     const char *cmdname, const char *path)
3090 {
3091 	const struct got_error *err;
3092 	struct got_repository *repo;
3093 	static char msg[512];
3094 
3095 	err = got_repo_open(&repo, path, NULL);
3096 	if (err)
3097 		return orig_err;
3098 
3099 	snprintf(msg, sizeof(msg),
3100 	    "'got %s' needs a work tree in addition to a git repository\n"
3101 	    "Work trees can be checked out from this Git repository with "
3102 	    "'got checkout'.\n"
3103 	    "The got(1) manual page contains more information.", cmdname);
3104 	err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3105 	got_repo_close(repo);
3106 	return err;
3107 }
3108 
3109 static const struct got_error *
3110 cmd_update(int argc, char *argv[])
3111 {
3112 	const struct got_error *error = NULL;
3113 	struct got_repository *repo = NULL;
3114 	struct got_worktree *worktree = NULL;
3115 	char *worktree_path = NULL;
3116 	struct got_object_id *commit_id = NULL;
3117 	char *commit_id_str = NULL;
3118 	const char *branch_name = NULL;
3119 	struct got_reference *head_ref = NULL;
3120 	struct got_pathlist_head paths;
3121 	struct got_pathlist_entry *pe;
3122 	int ch;
3123 	struct got_update_progress_arg upa;
3124 
3125 	TAILQ_INIT(&paths);
3126 
3127 	while ((ch = getopt(argc, argv, "b:c:")) != -1) {
3128 		switch (ch) {
3129 		case 'b':
3130 			branch_name = optarg;
3131 			break;
3132 		case 'c':
3133 			commit_id_str = strdup(optarg);
3134 			if (commit_id_str == NULL)
3135 				return got_error_from_errno("strdup");
3136 			break;
3137 		default:
3138 			usage_update();
3139 			/* NOTREACHED */
3140 		}
3141 	}
3142 
3143 	argc -= optind;
3144 	argv += optind;
3145 
3146 #ifndef PROFILE
3147 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3148 	    "unveil", NULL) == -1)
3149 		err(1, "pledge");
3150 #endif
3151 	worktree_path = getcwd(NULL, 0);
3152 	if (worktree_path == NULL) {
3153 		error = got_error_from_errno("getcwd");
3154 		goto done;
3155 	}
3156 	error = got_worktree_open(&worktree, worktree_path);
3157 	if (error) {
3158 		if (error->code == GOT_ERR_NOT_WORKTREE)
3159 			error = wrap_not_worktree_error(error, "update",
3160 			    worktree_path);
3161 		goto done;
3162 	}
3163 
3164 	error = check_rebase_or_histedit_in_progress(worktree);
3165 	if (error)
3166 		goto done;
3167 
3168 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3169 	    NULL);
3170 	if (error != NULL)
3171 		goto done;
3172 
3173 	error = apply_unveil(got_repo_get_path(repo), 0,
3174 	    got_worktree_get_root_path(worktree));
3175 	if (error)
3176 		goto done;
3177 
3178 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3179 	if (error)
3180 		goto done;
3181 
3182 	error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3183 	    got_worktree_get_head_ref_name(worktree), 0);
3184 	if (error != NULL)
3185 		goto done;
3186 	if (commit_id_str == NULL) {
3187 		error = got_ref_resolve(&commit_id, repo, head_ref);
3188 		if (error != NULL)
3189 			goto done;
3190 		error = got_object_id_str(&commit_id_str, commit_id);
3191 		if (error != NULL)
3192 			goto done;
3193 	} else {
3194 		struct got_reflist_head refs;
3195 		TAILQ_INIT(&refs);
3196 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3197 		    NULL);
3198 		if (error)
3199 			goto done;
3200 		error = got_repo_match_object_id(&commit_id, NULL,
3201 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3202 		got_ref_list_free(&refs);
3203 		free(commit_id_str);
3204 		commit_id_str = NULL;
3205 		if (error)
3206 			goto done;
3207 		error = got_object_id_str(&commit_id_str, commit_id);
3208 		if (error)
3209 			goto done;
3210 	}
3211 
3212 	if (branch_name) {
3213 		struct got_object_id *head_commit_id;
3214 		TAILQ_FOREACH(pe, &paths, entry) {
3215 			if (pe->path_len == 0)
3216 				continue;
3217 			error = got_error_msg(GOT_ERR_BAD_PATH,
3218 			    "switching between branches requires that "
3219 			    "the entire work tree gets updated");
3220 			goto done;
3221 		}
3222 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
3223 		if (error)
3224 			goto done;
3225 		error = check_linear_ancestry(commit_id, head_commit_id, 0,
3226 		    repo);
3227 		free(head_commit_id);
3228 		if (error != NULL)
3229 			goto done;
3230 		error = check_same_branch(commit_id, head_ref, NULL, repo);
3231 		if (error)
3232 			goto done;
3233 		error = switch_head_ref(head_ref, commit_id, worktree, repo);
3234 		if (error)
3235 			goto done;
3236 	} else {
3237 		error = check_linear_ancestry(commit_id,
3238 		    got_worktree_get_base_commit_id(worktree), 0, repo);
3239 		if (error != NULL) {
3240 			if (error->code == GOT_ERR_ANCESTRY)
3241 				error = got_error(GOT_ERR_BRANCH_MOVED);
3242 			goto done;
3243 		}
3244 		error = check_same_branch(commit_id, head_ref, NULL, repo);
3245 		if (error)
3246 			goto done;
3247 	}
3248 
3249 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3250 	    commit_id) != 0) {
3251 		error = got_worktree_set_base_commit_id(worktree, repo,
3252 		    commit_id);
3253 		if (error)
3254 			goto done;
3255 	}
3256 
3257 	memset(&upa, 0, sizeof(upa));
3258 	error = got_worktree_checkout_files(worktree, &paths, repo,
3259 	    update_progress, &upa, check_cancelled, NULL);
3260 	if (error != NULL)
3261 		goto done;
3262 
3263 	if (upa.did_something)
3264 		printf("Updated to commit %s\n", commit_id_str);
3265 	else
3266 		printf("Already up-to-date\n");
3267 	print_update_progress_stats(&upa);
3268 done:
3269 	free(worktree_path);
3270 	TAILQ_FOREACH(pe, &paths, entry)
3271 		free((char *)pe->path);
3272 	got_pathlist_free(&paths);
3273 	free(commit_id);
3274 	free(commit_id_str);
3275 	return error;
3276 }
3277 
3278 static const struct got_error *
3279 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3280     const char *path, int diff_context, int ignore_whitespace,
3281     int force_text_diff, struct got_repository *repo)
3282 {
3283 	const struct got_error *err = NULL;
3284 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3285 
3286 	if (blob_id1) {
3287 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3288 		if (err)
3289 			goto done;
3290 	}
3291 
3292 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3293 	if (err)
3294 		goto done;
3295 
3296 	while (path[0] == '/')
3297 		path++;
3298 	err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3299 	    diff_context, ignore_whitespace, force_text_diff, stdout);
3300 done:
3301 	if (blob1)
3302 		got_object_blob_close(blob1);
3303 	got_object_blob_close(blob2);
3304 	return err;
3305 }
3306 
3307 static const struct got_error *
3308 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3309     const char *path, int diff_context, int ignore_whitespace,
3310     int force_text_diff, struct got_repository *repo)
3311 {
3312 	const struct got_error *err = NULL;
3313 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3314 	struct got_diff_blob_output_unidiff_arg arg;
3315 
3316 	if (tree_id1) {
3317 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3318 		if (err)
3319 			goto done;
3320 	}
3321 
3322 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3323 	if (err)
3324 		goto done;
3325 
3326 	arg.diff_context = diff_context;
3327 	arg.ignore_whitespace = ignore_whitespace;
3328 	arg.force_text_diff = force_text_diff;
3329 	arg.outfile = stdout;
3330 	arg.line_offsets = NULL;
3331 	arg.nlines = 0;
3332 	while (path[0] == '/')
3333 		path++;
3334 	err = got_diff_tree(tree1, tree2, path, path, repo,
3335 	    got_diff_blob_output_unidiff, &arg, 1);
3336 done:
3337 	if (tree1)
3338 		got_object_tree_close(tree1);
3339 	if (tree2)
3340 		got_object_tree_close(tree2);
3341 	return err;
3342 }
3343 
3344 static const struct got_error *
3345 get_changed_paths(struct got_pathlist_head *paths,
3346     struct got_commit_object *commit, struct got_repository *repo)
3347 {
3348 	const struct got_error *err = NULL;
3349 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3350 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3351 	struct got_object_qid *qid;
3352 
3353 	qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3354 	if (qid != NULL) {
3355 		struct got_commit_object *pcommit;
3356 		err = got_object_open_as_commit(&pcommit, repo,
3357 		    qid->id);
3358 		if (err)
3359 			return err;
3360 
3361 		tree_id1 = got_object_commit_get_tree_id(pcommit);
3362 		got_object_commit_close(pcommit);
3363 
3364 	}
3365 
3366 	if (tree_id1) {
3367 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3368 		if (err)
3369 			goto done;
3370 	}
3371 
3372 	tree_id2 = got_object_commit_get_tree_id(commit);
3373 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3374 	if (err)
3375 		goto done;
3376 
3377 	err = got_diff_tree(tree1, tree2, "", "", repo,
3378 	    got_diff_tree_collect_changed_paths, paths, 0);
3379 done:
3380 	if (tree1)
3381 		got_object_tree_close(tree1);
3382 	if (tree2)
3383 		got_object_tree_close(tree2);
3384 	return err;
3385 }
3386 
3387 static const struct got_error *
3388 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3389     const char *path, int diff_context, struct got_repository *repo)
3390 {
3391 	const struct got_error *err = NULL;
3392 	struct got_commit_object *pcommit = NULL;
3393 	char *id_str1 = NULL, *id_str2 = NULL;
3394 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3395 	struct got_object_qid *qid;
3396 
3397 	qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3398 	if (qid != NULL) {
3399 		err = got_object_open_as_commit(&pcommit, repo,
3400 		    qid->id);
3401 		if (err)
3402 			return err;
3403 	}
3404 
3405 	if (path && path[0] != '\0') {
3406 		int obj_type;
3407 		err = got_object_id_by_path(&obj_id2, repo, id, path);
3408 		if (err)
3409 			goto done;
3410 		err = got_object_id_str(&id_str2, obj_id2);
3411 		if (err) {
3412 			free(obj_id2);
3413 			goto done;
3414 		}
3415 		if (pcommit) {
3416 			err = got_object_id_by_path(&obj_id1, repo,
3417 			    qid->id, path);
3418 			if (err) {
3419 				if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3420 					free(obj_id2);
3421 					goto done;
3422 				}
3423 			} else {
3424 				err = got_object_id_str(&id_str1, obj_id1);
3425 				if (err) {
3426 					free(obj_id2);
3427 					goto done;
3428 				}
3429 			}
3430 		}
3431 		err = got_object_get_type(&obj_type, repo, obj_id2);
3432 		if (err) {
3433 			free(obj_id2);
3434 			goto done;
3435 		}
3436 		printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3437 		switch (obj_type) {
3438 		case GOT_OBJ_TYPE_BLOB:
3439 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3440 			    0, 0, repo);
3441 			break;
3442 		case GOT_OBJ_TYPE_TREE:
3443 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
3444 			    0, 0, repo);
3445 			break;
3446 		default:
3447 			err = got_error(GOT_ERR_OBJ_TYPE);
3448 			break;
3449 		}
3450 		free(obj_id1);
3451 		free(obj_id2);
3452 	} else {
3453 		obj_id2 = got_object_commit_get_tree_id(commit);
3454 		err = got_object_id_str(&id_str2, obj_id2);
3455 		if (err)
3456 			goto done;
3457 		if (pcommit) {
3458 			obj_id1 = got_object_commit_get_tree_id(pcommit);
3459 			err = got_object_id_str(&id_str1, obj_id1);
3460 			if (err)
3461 				goto done;
3462 		}
3463 		printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3464 		    id_str2);
3465 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3466 		    repo);
3467 	}
3468 done:
3469 	free(id_str1);
3470 	free(id_str2);
3471 	if (pcommit)
3472 		got_object_commit_close(pcommit);
3473 	return err;
3474 }
3475 
3476 static char *
3477 get_datestr(time_t *time, char *datebuf)
3478 {
3479 	struct tm mytm, *tm;
3480 	char *p, *s;
3481 
3482 	tm = gmtime_r(time, &mytm);
3483 	if (tm == NULL)
3484 		return NULL;
3485 	s = asctime_r(tm, datebuf);
3486 	if (s == NULL)
3487 		return NULL;
3488 	p = strchr(s, '\n');
3489 	if (p)
3490 		*p = '\0';
3491 	return s;
3492 }
3493 
3494 static const struct got_error *
3495 match_logmsg(int *have_match, struct got_object_id *id,
3496     struct got_commit_object *commit, regex_t *regex)
3497 {
3498 	const struct got_error *err = NULL;
3499 	regmatch_t regmatch;
3500 	char *id_str = NULL, *logmsg = NULL;
3501 
3502 	*have_match = 0;
3503 
3504 	err = got_object_id_str(&id_str, id);
3505 	if (err)
3506 		return err;
3507 
3508 	err = got_object_commit_get_logmsg(&logmsg, commit);
3509 	if (err)
3510 		goto done;
3511 
3512 	if (regexec(regex, logmsg, 1, &regmatch, 0) == 0)
3513 		*have_match = 1;
3514 done:
3515 	free(id_str);
3516 	free(logmsg);
3517 	return err;
3518 }
3519 
3520 static void
3521 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3522     regex_t *regex)
3523 {
3524 	regmatch_t regmatch;
3525 	struct got_pathlist_entry *pe;
3526 
3527 	*have_match = 0;
3528 
3529 	TAILQ_FOREACH(pe, changed_paths, entry) {
3530 		if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
3531 			*have_match = 1;
3532 			break;
3533 		}
3534 	}
3535 }
3536 
3537 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3538 
3539 static const struct got_error*
3540 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3541     struct got_object_id *id, struct got_repository *repo)
3542 {
3543 	static const struct got_error *err = NULL;
3544 	struct got_reflist_entry *re;
3545 	char *s;
3546 	const char *name;
3547 
3548 	*refs_str = NULL;
3549 
3550 	TAILQ_FOREACH(re, refs, entry) {
3551 		struct got_tag_object *tag = NULL;
3552 		struct got_object_id *ref_id;
3553 		int cmp;
3554 
3555 		name = got_ref_get_name(re->ref);
3556 		if (strcmp(name, GOT_REF_HEAD) == 0)
3557 			continue;
3558 		if (strncmp(name, "refs/", 5) == 0)
3559 			name += 5;
3560 		if (strncmp(name, "got/", 4) == 0)
3561 			continue;
3562 		if (strncmp(name, "heads/", 6) == 0)
3563 			name += 6;
3564 		if (strncmp(name, "remotes/", 8) == 0) {
3565 			name += 8;
3566 			s = strstr(name, "/" GOT_REF_HEAD);
3567 			if (s != NULL && s[strlen(s)] == '\0')
3568 				continue;
3569 		}
3570 		err = got_ref_resolve(&ref_id, repo, re->ref);
3571 		if (err)
3572 			break;
3573 		if (strncmp(name, "tags/", 5) == 0) {
3574 			err = got_object_open_as_tag(&tag, repo, ref_id);
3575 			if (err) {
3576 				if (err->code != GOT_ERR_OBJ_TYPE) {
3577 					free(ref_id);
3578 					break;
3579 				}
3580 				/* Ref points at something other than a tag. */
3581 				err = NULL;
3582 				tag = NULL;
3583 			}
3584 		}
3585 		cmp = got_object_id_cmp(tag ?
3586 		    got_object_tag_get_object_id(tag) : ref_id, id);
3587 		free(ref_id);
3588 		if (tag)
3589 			got_object_tag_close(tag);
3590 		if (cmp != 0)
3591 			continue;
3592 		s = *refs_str;
3593 		if (asprintf(refs_str, "%s%s%s", s ? s : "",
3594 		    s ? ", " : "", name) == -1) {
3595 			err = got_error_from_errno("asprintf");
3596 			free(s);
3597 			*refs_str = NULL;
3598 			break;
3599 		}
3600 		free(s);
3601 	}
3602 
3603 	return err;
3604 }
3605 
3606 static const struct got_error *
3607 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3608     struct got_repository *repo, const char *path,
3609     struct got_pathlist_head *changed_paths, int show_patch,
3610     int diff_context, struct got_reflist_object_id_map *refs_idmap,
3611     const char *custom_refs_str)
3612 {
3613 	const struct got_error *err = NULL;
3614 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
3615 	char datebuf[26];
3616 	time_t committer_time;
3617 	const char *author, *committer;
3618 	char *refs_str = NULL;
3619 
3620 	err = got_object_id_str(&id_str, id);
3621 	if (err)
3622 		return err;
3623 
3624 	if (custom_refs_str == NULL) {
3625 		struct got_reflist_head *refs;
3626 		refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3627 		if (refs) {
3628 			err = build_refs_str(&refs_str, refs, id, repo);
3629 			if (err)
3630 				goto done;
3631 		}
3632 	}
3633 
3634 	printf(GOT_COMMIT_SEP_STR);
3635 	if (custom_refs_str)
3636 		printf("commit %s (%s)\n", id_str, custom_refs_str); 
3637 	else
3638 		printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3639 		    refs_str ? refs_str : "", refs_str ? ")" : "");
3640 	free(id_str);
3641 	id_str = NULL;
3642 	free(refs_str);
3643 	refs_str = NULL;
3644 	printf("from: %s\n", got_object_commit_get_author(commit));
3645 	committer_time = got_object_commit_get_committer_time(commit);
3646 	datestr = get_datestr(&committer_time, datebuf);
3647 	if (datestr)
3648 		printf("date: %s UTC\n", datestr);
3649 	author = got_object_commit_get_author(commit);
3650 	committer = got_object_commit_get_committer(commit);
3651 	if (strcmp(author, committer) != 0)
3652 		printf("via: %s\n", committer);
3653 	if (got_object_commit_get_nparents(commit) > 1) {
3654 		const struct got_object_id_queue *parent_ids;
3655 		struct got_object_qid *qid;
3656 		int n = 1;
3657 		parent_ids = got_object_commit_get_parent_ids(commit);
3658 		SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3659 			err = got_object_id_str(&id_str, qid->id);
3660 			if (err)
3661 				goto done;
3662 			printf("parent %d: %s\n", n++, id_str);
3663 			free(id_str);
3664 			id_str = NULL;
3665 		}
3666 	}
3667 
3668 	err = got_object_commit_get_logmsg(&logmsg0, commit);
3669 	if (err)
3670 		goto done;
3671 
3672 	logmsg = logmsg0;
3673 	do {
3674 		line = strsep(&logmsg, "\n");
3675 		if (line)
3676 			printf(" %s\n", line);
3677 	} while (line);
3678 	free(logmsg0);
3679 
3680 	if (changed_paths) {
3681 		struct got_pathlist_entry *pe;
3682 		TAILQ_FOREACH(pe, changed_paths, entry) {
3683 			struct got_diff_changed_path *cp = pe->data;
3684 			printf(" %c  %s\n", cp->status, pe->path);
3685 		}
3686 		printf("\n");
3687 	}
3688 	if (show_patch) {
3689 		err = print_patch(commit, id, path, diff_context, repo);
3690 		if (err == 0)
3691 			printf("\n");
3692 	}
3693 
3694 	if (fflush(stdout) != 0 && err == NULL)
3695 		err = got_error_from_errno("fflush");
3696 done:
3697 	free(id_str);
3698 	free(refs_str);
3699 	return err;
3700 }
3701 
3702 static const struct got_error *
3703 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3704     struct got_repository *repo, const char *path, int show_changed_paths,
3705     int show_patch, const char *search_pattern, int diff_context, int limit,
3706     int log_branches, int reverse_display_order,
3707     struct got_reflist_object_id_map *refs_idmap)
3708 {
3709 	const struct got_error *err;
3710 	struct got_commit_graph *graph;
3711 	regex_t regex;
3712 	int have_match;
3713 	struct got_object_id_queue reversed_commits;
3714 	struct got_object_qid *qid;
3715 	struct got_commit_object *commit;
3716 	struct got_pathlist_head changed_paths;
3717 	struct got_pathlist_entry *pe;
3718 
3719 	SIMPLEQ_INIT(&reversed_commits);
3720 	TAILQ_INIT(&changed_paths);
3721 
3722 	if (search_pattern && regcomp(&regex, search_pattern,
3723 	    REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3724 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
3725 
3726 	err = got_commit_graph_open(&graph, path, !log_branches);
3727 	if (err)
3728 		return err;
3729 	err = got_commit_graph_iter_start(graph, root_id, repo,
3730 	    check_cancelled, NULL);
3731 	if (err)
3732 		goto done;
3733 	for (;;) {
3734 		struct got_object_id *id;
3735 
3736 		if (sigint_received || sigpipe_received)
3737 			break;
3738 
3739 		err = got_commit_graph_iter_next(&id, graph, repo,
3740 		    check_cancelled, NULL);
3741 		if (err) {
3742 			if (err->code == GOT_ERR_ITER_COMPLETED)
3743 				err = NULL;
3744 			break;
3745 		}
3746 		if (id == NULL)
3747 			break;
3748 
3749 		err = got_object_open_as_commit(&commit, repo, id);
3750 		if (err)
3751 			break;
3752 
3753 		if (show_changed_paths && !reverse_display_order) {
3754 			err = get_changed_paths(&changed_paths, commit, repo);
3755 			if (err)
3756 				break;
3757 		}
3758 
3759 		if (search_pattern) {
3760 			err = match_logmsg(&have_match, id, commit, &regex);
3761 			if (err) {
3762 				got_object_commit_close(commit);
3763 				break;
3764 			}
3765 			if (have_match == 0 && show_changed_paths)
3766 				match_changed_paths(&have_match,
3767 				    &changed_paths, &regex);
3768 			if (have_match == 0) {
3769 				got_object_commit_close(commit);
3770 				TAILQ_FOREACH(pe, &changed_paths, entry) {
3771 					free((char *)pe->path);
3772 					free(pe->data);
3773 				}
3774 				got_pathlist_free(&changed_paths);
3775 				continue;
3776 			}
3777 		}
3778 
3779 		if (reverse_display_order) {
3780 			err = got_object_qid_alloc(&qid, id);
3781 			if (err)
3782 				break;
3783 			SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3784 			got_object_commit_close(commit);
3785 		} else {
3786 			err = print_commit(commit, id, repo, path,
3787 			    show_changed_paths ? &changed_paths : NULL,
3788 			    show_patch, diff_context, refs_idmap, NULL);
3789 			got_object_commit_close(commit);
3790 			if (err)
3791 				break;
3792 		}
3793 		if ((limit && --limit == 0) ||
3794 		    (end_id && got_object_id_cmp(id, end_id) == 0))
3795 			break;
3796 
3797 		TAILQ_FOREACH(pe, &changed_paths, entry) {
3798 			free((char *)pe->path);
3799 			free(pe->data);
3800 		}
3801 		got_pathlist_free(&changed_paths);
3802 	}
3803 	if (reverse_display_order) {
3804 		SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3805 			err = got_object_open_as_commit(&commit, repo, qid->id);
3806 			if (err)
3807 				break;
3808 			if (show_changed_paths) {
3809 				err = get_changed_paths(&changed_paths,
3810 				    commit, repo);
3811 				if (err)
3812 					break;
3813 			}
3814 			err = print_commit(commit, qid->id, repo, path,
3815 			    show_changed_paths ? &changed_paths : NULL,
3816 			    show_patch, diff_context, refs_idmap, NULL);
3817 			got_object_commit_close(commit);
3818 			if (err)
3819 				break;
3820 			TAILQ_FOREACH(pe, &changed_paths, entry) {
3821 				free((char *)pe->path);
3822 				free(pe->data);
3823 			}
3824 			got_pathlist_free(&changed_paths);
3825 		}
3826 	}
3827 done:
3828 	while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3829 		qid = SIMPLEQ_FIRST(&reversed_commits);
3830 		SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3831 		got_object_qid_free(qid);
3832 	}
3833 	TAILQ_FOREACH(pe, &changed_paths, entry) {
3834 		free((char *)pe->path);
3835 		free(pe->data);
3836 	}
3837 	got_pathlist_free(&changed_paths);
3838 	if (search_pattern)
3839 		regfree(&regex);
3840 	got_commit_graph_close(graph);
3841 	return err;
3842 }
3843 
3844 __dead static void
3845 usage_log(void)
3846 {
3847 	fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3848 	    "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3849 	    "[-R] [path]\n", getprogname());
3850 	exit(1);
3851 }
3852 
3853 static int
3854 get_default_log_limit(void)
3855 {
3856 	const char *got_default_log_limit;
3857 	long long n;
3858 	const char *errstr;
3859 
3860 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3861 	if (got_default_log_limit == NULL)
3862 		return 0;
3863 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3864 	if (errstr != NULL)
3865 		return 0;
3866 	return n;
3867 }
3868 
3869 static const struct got_error *
3870 cmd_log(int argc, char *argv[])
3871 {
3872 	const struct got_error *error;
3873 	struct got_repository *repo = NULL;
3874 	struct got_worktree *worktree = NULL;
3875 	struct got_object_id *start_id = NULL, *end_id = NULL;
3876 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3877 	const char *start_commit = NULL, *end_commit = NULL;
3878 	const char *search_pattern = NULL;
3879 	int diff_context = -1, ch;
3880 	int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3881 	int reverse_display_order = 0;
3882 	const char *errstr;
3883 	struct got_reflist_head refs;
3884 	struct got_reflist_object_id_map *refs_idmap = NULL;
3885 
3886 	TAILQ_INIT(&refs);
3887 
3888 #ifndef PROFILE
3889 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3890 	    NULL)
3891 	    == -1)
3892 		err(1, "pledge");
3893 #endif
3894 
3895 	limit = get_default_log_limit();
3896 
3897 	while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3898 		switch (ch) {
3899 		case 'p':
3900 			show_patch = 1;
3901 			break;
3902 		case 'P':
3903 			show_changed_paths = 1;
3904 			break;
3905 		case 'c':
3906 			start_commit = optarg;
3907 			break;
3908 		case 'C':
3909 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3910 			    &errstr);
3911 			if (errstr != NULL)
3912 				err(1, "-C option %s", errstr);
3913 			break;
3914 		case 'l':
3915 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
3916 			if (errstr != NULL)
3917 				err(1, "-l option %s", errstr);
3918 			break;
3919 		case 'b':
3920 			log_branches = 1;
3921 			break;
3922 		case 'r':
3923 			repo_path = realpath(optarg, NULL);
3924 			if (repo_path == NULL)
3925 				return got_error_from_errno2("realpath",
3926 				    optarg);
3927 			got_path_strip_trailing_slashes(repo_path);
3928 			break;
3929 		case 'R':
3930 			reverse_display_order = 1;
3931 			break;
3932 		case 's':
3933 			search_pattern = optarg;
3934 			break;
3935 		case 'x':
3936 			end_commit = optarg;
3937 			break;
3938 		default:
3939 			usage_log();
3940 			/* NOTREACHED */
3941 		}
3942 	}
3943 
3944 	argc -= optind;
3945 	argv += optind;
3946 
3947 	if (diff_context == -1)
3948 		diff_context = 3;
3949 	else if (!show_patch)
3950 		errx(1, "-C requires -p");
3951 
3952 	cwd = getcwd(NULL, 0);
3953 	if (cwd == NULL) {
3954 		error = got_error_from_errno("getcwd");
3955 		goto done;
3956 	}
3957 
3958 	if (repo_path == NULL) {
3959 		error = got_worktree_open(&worktree, cwd);
3960 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
3961 			goto done;
3962 		error = NULL;
3963 	}
3964 
3965 	if (argc == 1) {
3966 		if (worktree) {
3967 			error = got_worktree_resolve_path(&path, worktree,
3968 			    argv[0]);
3969 			if (error)
3970 				goto done;
3971 		} else {
3972 			path = strdup(argv[0]);
3973 			if (path == NULL) {
3974 				error = got_error_from_errno("strdup");
3975 				goto done;
3976 			}
3977 		}
3978 	} else if (argc != 0)
3979 		usage_log();
3980 
3981 	if (repo_path == NULL) {
3982 		repo_path = worktree ?
3983 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3984 	}
3985 	if (repo_path == NULL) {
3986 		error = got_error_from_errno("strdup");
3987 		goto done;
3988 	}
3989 
3990 	error = got_repo_open(&repo, repo_path, NULL);
3991 	if (error != NULL)
3992 		goto done;
3993 
3994 	error = apply_unveil(got_repo_get_path(repo), 1,
3995 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
3996 	if (error)
3997 		goto done;
3998 
3999 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4000 	if (error)
4001 		goto done;
4002 
4003 	error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4004 	if (error)
4005 		goto done;
4006 
4007 	if (start_commit == NULL) {
4008 		struct got_reference *head_ref;
4009 		struct got_commit_object *commit = NULL;
4010 		error = got_ref_open(&head_ref, repo,
4011 		    worktree ? got_worktree_get_head_ref_name(worktree)
4012 		    : GOT_REF_HEAD, 0);
4013 		if (error != NULL)
4014 			goto done;
4015 		error = got_ref_resolve(&start_id, repo, head_ref);
4016 		got_ref_close(head_ref);
4017 		if (error != NULL)
4018 			goto done;
4019 		error = got_object_open_as_commit(&commit, repo,
4020 		    start_id);
4021 		if (error != NULL)
4022 			goto done;
4023 		got_object_commit_close(commit);
4024 	} else {
4025 		error = got_repo_match_object_id(&start_id, NULL,
4026 		    start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4027 		if (error != NULL)
4028 			goto done;
4029 	}
4030 	if (end_commit != NULL) {
4031 		error = got_repo_match_object_id(&end_id, NULL,
4032 		    end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4033 		if (error != NULL)
4034 			goto done;
4035 	}
4036 
4037 	if (worktree) {
4038 		/*
4039 		 * If a path was specified on the command line it was resolved
4040 		 * to a path in the work tree above. Prepend the work tree's
4041 		 * path prefix to obtain the corresponding in-repository path.
4042 		 */
4043 		if (path) {
4044 			const char *prefix;
4045 			prefix = got_worktree_get_path_prefix(worktree);
4046 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
4047 			    (path[0] != '\0') ? "/" : "", path) == -1) {
4048 				error = got_error_from_errno("asprintf");
4049 				goto done;
4050 			}
4051 		}
4052 	} else
4053 		error = got_repo_map_path(&in_repo_path, repo,
4054 		    path ? path : "");
4055 	if (error != NULL)
4056 		goto done;
4057 	if (in_repo_path) {
4058 		free(path);
4059 		path = in_repo_path;
4060 	}
4061 
4062 	error = print_commits(start_id, end_id, repo, path ? path : "",
4063 	    show_changed_paths, show_patch, search_pattern, diff_context,
4064 	    limit, log_branches, reverse_display_order, refs_idmap);
4065 done:
4066 	free(path);
4067 	free(repo_path);
4068 	free(cwd);
4069 	if (worktree)
4070 		got_worktree_close(worktree);
4071 	if (repo) {
4072 		const struct got_error *close_err = got_repo_close(repo);
4073 		if (error == NULL)
4074 			error = close_err;
4075 	}
4076 	if (refs_idmap)
4077 		got_reflist_object_id_map_free(refs_idmap);
4078 	got_ref_list_free(&refs);
4079 	return error;
4080 }
4081 
4082 __dead static void
4083 usage_diff(void)
4084 {
4085 	fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
4086 	    "[-s] [-w] [object1 object2 | path]\n", getprogname());
4087 	exit(1);
4088 }
4089 
4090 struct print_diff_arg {
4091 	struct got_repository *repo;
4092 	struct got_worktree *worktree;
4093 	int diff_context;
4094 	const char *id_str;
4095 	int header_shown;
4096 	int diff_staged;
4097 	int ignore_whitespace;
4098 	int force_text_diff;
4099 };
4100 
4101 /*
4102  * Create a file which contains the target path of a symlink so we can feed
4103  * it as content to the diff engine.
4104  */
4105 static const struct got_error *
4106 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4107     const char *abspath)
4108 {
4109 	const struct got_error *err = NULL;
4110 	char target_path[PATH_MAX];
4111 	ssize_t target_len, outlen;
4112 
4113 	*fd = -1;
4114 
4115 	if (dirfd != -1) {
4116 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4117 		if (target_len == -1)
4118 			return got_error_from_errno2("readlinkat", abspath);
4119 	} else {
4120 		target_len = readlink(abspath, target_path, PATH_MAX);
4121 		if (target_len == -1)
4122 			return got_error_from_errno2("readlink", abspath);
4123 	}
4124 
4125 	*fd = got_opentempfd();
4126 	if (*fd == -1)
4127 		return got_error_from_errno("got_opentempfd");
4128 
4129 	outlen = write(*fd, target_path, target_len);
4130 	if (outlen == -1) {
4131 		err = got_error_from_errno("got_opentempfd");
4132 		goto done;
4133 	}
4134 
4135 	if (lseek(*fd, 0, SEEK_SET) == -1) {
4136 		err = got_error_from_errno2("lseek", abspath);
4137 		goto done;
4138 	}
4139 done:
4140 	if (err) {
4141 		close(*fd);
4142 		*fd = -1;
4143 	}
4144 	return err;
4145 }
4146 
4147 static const struct got_error *
4148 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4149     const char *path, struct got_object_id *blob_id,
4150     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4151     int dirfd, const char *de_name)
4152 {
4153 	struct print_diff_arg *a = arg;
4154 	const struct got_error *err = NULL;
4155 	struct got_blob_object *blob1 = NULL;
4156 	int fd = -1;
4157 	FILE *f2 = NULL;
4158 	char *abspath = NULL, *label1 = NULL;
4159 	struct stat sb;
4160 
4161 	if (a->diff_staged) {
4162 		if (staged_status != GOT_STATUS_MODIFY &&
4163 		    staged_status != GOT_STATUS_ADD &&
4164 		    staged_status != GOT_STATUS_DELETE)
4165 			return NULL;
4166 	} else {
4167 		if (staged_status == GOT_STATUS_DELETE)
4168 			return NULL;
4169 		if (status == GOT_STATUS_NONEXISTENT)
4170 			return got_error_set_errno(ENOENT, path);
4171 		if (status != GOT_STATUS_MODIFY &&
4172 		    status != GOT_STATUS_ADD &&
4173 		    status != GOT_STATUS_DELETE &&
4174 		    status != GOT_STATUS_CONFLICT)
4175 			return NULL;
4176 	}
4177 
4178 	if (!a->header_shown) {
4179 		printf("diff %s %s%s\n", a->id_str,
4180 		    got_worktree_get_root_path(a->worktree),
4181 		    a->diff_staged ? " (staged changes)" : "");
4182 		a->header_shown = 1;
4183 	}
4184 
4185 	if (a->diff_staged) {
4186 		const char *label1 = NULL, *label2 = NULL;
4187 		switch (staged_status) {
4188 		case GOT_STATUS_MODIFY:
4189 			label1 = path;
4190 			label2 = path;
4191 			break;
4192 		case GOT_STATUS_ADD:
4193 			label2 = path;
4194 			break;
4195 		case GOT_STATUS_DELETE:
4196 			label1 = path;
4197 			break;
4198 		default:
4199 			return got_error(GOT_ERR_FILE_STATUS);
4200 		}
4201 		return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4202 		    staged_blob_id, label1, label2, a->diff_context,
4203 		    a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4204 	}
4205 
4206 	if (staged_status == GOT_STATUS_ADD ||
4207 	    staged_status == GOT_STATUS_MODIFY) {
4208 		char *id_str;
4209 		err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4210 		    8192);
4211 		if (err)
4212 			goto done;
4213 		err = got_object_id_str(&id_str, staged_blob_id);
4214 		if (err)
4215 			goto done;
4216 		if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4217 			err = got_error_from_errno("asprintf");
4218 			free(id_str);
4219 			goto done;
4220 		}
4221 		free(id_str);
4222 	} else if (status != GOT_STATUS_ADD) {
4223 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4224 		if (err)
4225 			goto done;
4226 	}
4227 
4228 	if (status != GOT_STATUS_DELETE) {
4229 		if (asprintf(&abspath, "%s/%s",
4230 		    got_worktree_get_root_path(a->worktree), path) == -1) {
4231 			err = got_error_from_errno("asprintf");
4232 			goto done;
4233 		}
4234 
4235 		if (dirfd != -1) {
4236 			fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4237 			if (fd == -1) {
4238 				if (errno != ELOOP) {
4239 					err = got_error_from_errno2("openat",
4240 					    abspath);
4241 					goto done;
4242 				}
4243 				err = get_symlink_target_file(&fd, dirfd,
4244 				    de_name, abspath);
4245 				if (err)
4246 					goto done;
4247 			}
4248 		} else {
4249 			fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4250 			if (fd == -1) {
4251 				if (errno != ELOOP) {
4252 					err = got_error_from_errno2("open",
4253 					    abspath);
4254 					goto done;
4255 				}
4256 				err = get_symlink_target_file(&fd, dirfd,
4257 				    de_name, abspath);
4258 				if (err)
4259 					goto done;
4260 			}
4261 		}
4262 		if (fstat(fd, &sb) == -1) {
4263 			err = got_error_from_errno2("fstat", abspath);
4264 			goto done;
4265 		}
4266 		f2 = fdopen(fd, "r");
4267 		if (f2 == NULL) {
4268 			err = got_error_from_errno2("fdopen", abspath);
4269 			goto done;
4270 		}
4271 		fd = -1;
4272 	} else
4273 		sb.st_size = 0;
4274 
4275 	err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4276 	    a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4277 done:
4278 	if (blob1)
4279 		got_object_blob_close(blob1);
4280 	if (f2 && fclose(f2) == EOF && err == NULL)
4281 		err = got_error_from_errno("fclose");
4282 	if (fd != -1 && close(fd) == -1 && err == NULL)
4283 		err = got_error_from_errno("close");
4284 	free(abspath);
4285 	return err;
4286 }
4287 
4288 static const struct got_error *
4289 cmd_diff(int argc, char *argv[])
4290 {
4291 	const struct got_error *error;
4292 	struct got_repository *repo = NULL;
4293 	struct got_worktree *worktree = NULL;
4294 	char *cwd = NULL, *repo_path = NULL;
4295 	struct got_object_id *id1 = NULL, *id2 = NULL;
4296 	const char *id_str1 = NULL, *id_str2 = NULL;
4297 	char *label1 = NULL, *label2 = NULL;
4298 	int type1, type2;
4299 	int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4300 	int force_text_diff = 0;
4301 	const char *errstr;
4302 	char *path = NULL;
4303 	struct got_reflist_head refs;
4304 
4305 	TAILQ_INIT(&refs);
4306 
4307 #ifndef PROFILE
4308 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4309 	    NULL) == -1)
4310 		err(1, "pledge");
4311 #endif
4312 
4313 	while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4314 		switch (ch) {
4315 		case 'a':
4316 			force_text_diff = 1;
4317 			break;
4318 		case 'C':
4319 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4320 			    &errstr);
4321 			if (errstr != NULL)
4322 				err(1, "-C option %s", errstr);
4323 			break;
4324 		case 'r':
4325 			repo_path = realpath(optarg, NULL);
4326 			if (repo_path == NULL)
4327 				return got_error_from_errno2("realpath",
4328 				    optarg);
4329 			got_path_strip_trailing_slashes(repo_path);
4330 			break;
4331 		case 's':
4332 			diff_staged = 1;
4333 			break;
4334 		case 'w':
4335 			ignore_whitespace = 1;
4336 			break;
4337 		default:
4338 			usage_diff();
4339 			/* NOTREACHED */
4340 		}
4341 	}
4342 
4343 	argc -= optind;
4344 	argv += optind;
4345 
4346 	cwd = getcwd(NULL, 0);
4347 	if (cwd == NULL) {
4348 		error = got_error_from_errno("getcwd");
4349 		goto done;
4350 	}
4351 	if (argc <= 1) {
4352 		if (repo_path)
4353 			errx(1,
4354 			    "-r option can't be used when diffing a work tree");
4355 		error = got_worktree_open(&worktree, cwd);
4356 		if (error) {
4357 			if (error->code == GOT_ERR_NOT_WORKTREE)
4358 				error = wrap_not_worktree_error(error, "diff",
4359 				    cwd);
4360 			goto done;
4361 		}
4362 		repo_path = strdup(got_worktree_get_repo_path(worktree));
4363 		if (repo_path == NULL) {
4364 			error = got_error_from_errno("strdup");
4365 			goto done;
4366 		}
4367 		if (argc == 1) {
4368 			error = got_worktree_resolve_path(&path, worktree,
4369 			    argv[0]);
4370 			if (error)
4371 				goto done;
4372 		} else {
4373 			path = strdup("");
4374 			if (path == NULL) {
4375 				error = got_error_from_errno("strdup");
4376 				goto done;
4377 			}
4378 		}
4379 	} else if (argc == 2) {
4380 		if (diff_staged)
4381 			errx(1, "-s option can't be used when diffing "
4382 			    "objects in repository");
4383 		id_str1 = argv[0];
4384 		id_str2 = argv[1];
4385 		if (repo_path == NULL) {
4386 			error = got_worktree_open(&worktree, cwd);
4387 			if (error && error->code != GOT_ERR_NOT_WORKTREE)
4388 				goto done;
4389 			repo_path = strdup(worktree ?
4390 			    got_worktree_get_repo_path(worktree) : cwd);
4391 			if (repo_path == NULL) {
4392 				error = got_error_from_errno("strdup");
4393 				goto done;
4394 			}
4395 		}
4396 	} else
4397 		usage_diff();
4398 
4399 	error = got_repo_open(&repo, repo_path, NULL);
4400 	free(repo_path);
4401 	if (error != NULL)
4402 		goto done;
4403 
4404 	error = apply_unveil(got_repo_get_path(repo), 1,
4405 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4406 	if (error)
4407 		goto done;
4408 
4409 	if (argc <= 1) {
4410 		struct print_diff_arg arg;
4411 		struct got_pathlist_head paths;
4412 		char *id_str;
4413 
4414 		TAILQ_INIT(&paths);
4415 
4416 		error = got_object_id_str(&id_str,
4417 		    got_worktree_get_base_commit_id(worktree));
4418 		if (error)
4419 			goto done;
4420 		arg.repo = repo;
4421 		arg.worktree = worktree;
4422 		arg.diff_context = diff_context;
4423 		arg.id_str = id_str;
4424 		arg.header_shown = 0;
4425 		arg.diff_staged = diff_staged;
4426 		arg.ignore_whitespace = ignore_whitespace;
4427 		arg.force_text_diff = force_text_diff;
4428 
4429 		error = got_pathlist_append(&paths, path, NULL);
4430 		if (error)
4431 			goto done;
4432 
4433 		error = got_worktree_status(worktree, &paths, repo, print_diff,
4434 		    &arg, check_cancelled, NULL);
4435 		free(id_str);
4436 		got_pathlist_free(&paths);
4437 		goto done;
4438 	}
4439 
4440 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4441 	if (error)
4442 		return error;
4443 
4444 	error = got_repo_match_object_id(&id1, &label1, id_str1,
4445 	    GOT_OBJ_TYPE_ANY, &refs, repo);
4446 	if (error)
4447 		goto done;
4448 
4449 	error = got_repo_match_object_id(&id2, &label2, id_str2,
4450 	    GOT_OBJ_TYPE_ANY, &refs, repo);
4451 	if (error)
4452 		goto done;
4453 
4454 	error = got_object_get_type(&type1, repo, id1);
4455 	if (error)
4456 		goto done;
4457 
4458 	error = got_object_get_type(&type2, repo, id2);
4459 	if (error)
4460 		goto done;
4461 
4462 	if (type1 != type2) {
4463 		error = got_error(GOT_ERR_OBJ_TYPE);
4464 		goto done;
4465 	}
4466 
4467 	switch (type1) {
4468 	case GOT_OBJ_TYPE_BLOB:
4469 		error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4470 		    NULL, NULL, diff_context, ignore_whitespace,
4471 		    force_text_diff, repo, stdout);
4472 		break;
4473 	case GOT_OBJ_TYPE_TREE:
4474 		error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4475 		    "", "", diff_context, ignore_whitespace, force_text_diff,
4476 		    repo, stdout);
4477 		break;
4478 	case GOT_OBJ_TYPE_COMMIT:
4479 		printf("diff %s %s\n", label1, label2);
4480 		error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4481 		    diff_context, ignore_whitespace, force_text_diff, repo,
4482 		    stdout);
4483 		break;
4484 	default:
4485 		error = got_error(GOT_ERR_OBJ_TYPE);
4486 	}
4487 done:
4488 	free(label1);
4489 	free(label2);
4490 	free(id1);
4491 	free(id2);
4492 	free(path);
4493 	if (worktree)
4494 		got_worktree_close(worktree);
4495 	if (repo) {
4496 		const struct got_error *close_err = got_repo_close(repo);
4497 		if (error == NULL)
4498 			error = close_err;
4499 	}
4500 	got_ref_list_free(&refs);
4501 	return error;
4502 }
4503 
4504 __dead static void
4505 usage_blame(void)
4506 {
4507 	fprintf(stderr,
4508 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
4509 	    getprogname());
4510 	exit(1);
4511 }
4512 
4513 struct blame_line {
4514 	int annotated;
4515 	char *id_str;
4516 	char *committer;
4517 	char datebuf[11]; /* YYYY-MM-DD + NUL */
4518 };
4519 
4520 struct blame_cb_args {
4521 	struct blame_line *lines;
4522 	int nlines;
4523 	int nlines_prec;
4524 	int lineno_cur;
4525 	off_t *line_offsets;
4526 	FILE *f;
4527 	struct got_repository *repo;
4528 };
4529 
4530 static const struct got_error *
4531 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4532 {
4533 	const struct got_error *err = NULL;
4534 	struct blame_cb_args *a = arg;
4535 	struct blame_line *bline;
4536 	char *line = NULL;
4537 	size_t linesize = 0;
4538 	struct got_commit_object *commit = NULL;
4539 	off_t offset;
4540 	struct tm tm;
4541 	time_t committer_time;
4542 
4543 	if (nlines != a->nlines ||
4544 	    (lineno != -1 && lineno < 1) || lineno > a->nlines)
4545 		return got_error(GOT_ERR_RANGE);
4546 
4547 	if (sigint_received)
4548 		return got_error(GOT_ERR_ITER_COMPLETED);
4549 
4550 	if (lineno == -1)
4551 		return NULL; /* no change in this commit */
4552 
4553 	/* Annotate this line. */
4554 	bline = &a->lines[lineno - 1];
4555 	if (bline->annotated)
4556 		return NULL;
4557 	err = got_object_id_str(&bline->id_str, id);
4558 	if (err)
4559 		return err;
4560 
4561 	err = got_object_open_as_commit(&commit, a->repo, id);
4562 	if (err)
4563 		goto done;
4564 
4565 	bline->committer = strdup(got_object_commit_get_committer(commit));
4566 	if (bline->committer == NULL) {
4567 		err = got_error_from_errno("strdup");
4568 		goto done;
4569 	}
4570 
4571 	committer_time = got_object_commit_get_committer_time(commit);
4572 	if (localtime_r(&committer_time, &tm) == NULL)
4573 		return got_error_from_errno("localtime_r");
4574 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4575 	    &tm) == 0) {
4576 		err = got_error(GOT_ERR_NO_SPACE);
4577 		goto done;
4578 	}
4579 	bline->annotated = 1;
4580 
4581 	/* Print lines annotated so far. */
4582 	bline = &a->lines[a->lineno_cur - 1];
4583 	if (!bline->annotated)
4584 		goto done;
4585 
4586 	offset = a->line_offsets[a->lineno_cur - 1];
4587 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
4588 		err = got_error_from_errno("fseeko");
4589 		goto done;
4590 	}
4591 
4592 	while (bline->annotated) {
4593 		char *smallerthan, *at, *nl, *committer;
4594 		size_t len;
4595 
4596 		if (getline(&line, &linesize, a->f) == -1) {
4597 			if (ferror(a->f))
4598 				err = got_error_from_errno("getline");
4599 			break;
4600 		}
4601 
4602 		committer = bline->committer;
4603 		smallerthan = strchr(committer, '<');
4604 		if (smallerthan && smallerthan[1] != '\0')
4605 			committer = smallerthan + 1;
4606 		at = strchr(committer, '@');
4607 		if (at)
4608 			*at = '\0';
4609 		len = strlen(committer);
4610 		if (len >= 9)
4611 			committer[8] = '\0';
4612 
4613 		nl = strchr(line, '\n');
4614 		if (nl)
4615 			*nl = '\0';
4616 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4617 		    bline->id_str, bline->datebuf, committer, line);
4618 
4619 		a->lineno_cur++;
4620 		bline = &a->lines[a->lineno_cur - 1];
4621 	}
4622 done:
4623 	if (commit)
4624 		got_object_commit_close(commit);
4625 	free(line);
4626 	return err;
4627 }
4628 
4629 static const struct got_error *
4630 cmd_blame(int argc, char *argv[])
4631 {
4632 	const struct got_error *error;
4633 	struct got_repository *repo = NULL;
4634 	struct got_worktree *worktree = NULL;
4635 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4636 	char *link_target = NULL;
4637 	struct got_object_id *obj_id = NULL;
4638 	struct got_object_id *commit_id = NULL;
4639 	struct got_blob_object *blob = NULL;
4640 	char *commit_id_str = NULL;
4641 	struct blame_cb_args bca;
4642 	int ch, obj_type, i;
4643 	off_t filesize;
4644 
4645 	memset(&bca, 0, sizeof(bca));
4646 
4647 #ifndef PROFILE
4648 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4649 	    NULL) == -1)
4650 		err(1, "pledge");
4651 #endif
4652 
4653 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4654 		switch (ch) {
4655 		case 'c':
4656 			commit_id_str = optarg;
4657 			break;
4658 		case 'r':
4659 			repo_path = realpath(optarg, NULL);
4660 			if (repo_path == NULL)
4661 				return got_error_from_errno2("realpath",
4662 				    optarg);
4663 			got_path_strip_trailing_slashes(repo_path);
4664 			break;
4665 		default:
4666 			usage_blame();
4667 			/* NOTREACHED */
4668 		}
4669 	}
4670 
4671 	argc -= optind;
4672 	argv += optind;
4673 
4674 	if (argc == 1)
4675 		path = argv[0];
4676 	else
4677 		usage_blame();
4678 
4679 	cwd = getcwd(NULL, 0);
4680 	if (cwd == NULL) {
4681 		error = got_error_from_errno("getcwd");
4682 		goto done;
4683 	}
4684 	if (repo_path == NULL) {
4685 		error = got_worktree_open(&worktree, cwd);
4686 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4687 			goto done;
4688 		else
4689 			error = NULL;
4690 		if (worktree) {
4691 			repo_path =
4692 			    strdup(got_worktree_get_repo_path(worktree));
4693 			if (repo_path == NULL) {
4694 				error = got_error_from_errno("strdup");
4695 				if (error)
4696 					goto done;
4697 			}
4698 		} else {
4699 			repo_path = strdup(cwd);
4700 			if (repo_path == NULL) {
4701 				error = got_error_from_errno("strdup");
4702 				goto done;
4703 			}
4704 		}
4705 	}
4706 
4707 	error = got_repo_open(&repo, repo_path, NULL);
4708 	if (error != NULL)
4709 		goto done;
4710 
4711 	if (worktree) {
4712 		const char *prefix = got_worktree_get_path_prefix(worktree);
4713 		char *p;
4714 
4715 		error = got_worktree_resolve_path(&p, worktree, path);
4716 		if (error)
4717 			goto done;
4718 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
4719 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4720 		    p) == -1) {
4721 			error = got_error_from_errno("asprintf");
4722 			free(p);
4723 			goto done;
4724 		}
4725 		free(p);
4726 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4727 	} else {
4728 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4729 		if (error)
4730 			goto done;
4731 		error = got_repo_map_path(&in_repo_path, repo, path);
4732 	}
4733 	if (error)
4734 		goto done;
4735 
4736 	if (commit_id_str == NULL) {
4737 		struct got_reference *head_ref;
4738 		error = got_ref_open(&head_ref, repo, worktree ?
4739 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4740 		if (error != NULL)
4741 			goto done;
4742 		error = got_ref_resolve(&commit_id, repo, head_ref);
4743 		got_ref_close(head_ref);
4744 		if (error != NULL)
4745 			goto done;
4746 	} else {
4747 		struct got_reflist_head refs;
4748 		TAILQ_INIT(&refs);
4749 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4750 		    NULL);
4751 		if (error)
4752 			goto done;
4753 		error = got_repo_match_object_id(&commit_id, NULL,
4754 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4755 		got_ref_list_free(&refs);
4756 		if (error)
4757 			goto done;
4758 	}
4759 
4760 	error = got_object_resolve_symlinks(&link_target, in_repo_path,
4761 	    commit_id, repo);
4762 	if (error)
4763 		goto done;
4764 
4765 	error = got_object_id_by_path(&obj_id, repo, commit_id,
4766 	    link_target ? link_target : in_repo_path);
4767 	if (error)
4768 		goto done;
4769 
4770 	error = got_object_get_type(&obj_type, repo, obj_id);
4771 	if (error)
4772 		goto done;
4773 
4774 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
4775 		error = got_error_path(link_target ? link_target : in_repo_path,
4776 		    GOT_ERR_OBJ_TYPE);
4777 		goto done;
4778 	}
4779 
4780 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4781 	if (error)
4782 		goto done;
4783 	bca.f = got_opentemp();
4784 	if (bca.f == NULL) {
4785 		error = got_error_from_errno("got_opentemp");
4786 		goto done;
4787 	}
4788 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4789 	    &bca.line_offsets, bca.f, blob);
4790 	if (error || bca.nlines == 0)
4791 		goto done;
4792 
4793 	/* Don't include \n at EOF in the blame line count. */
4794 	if (bca.line_offsets[bca.nlines - 1] == filesize)
4795 		bca.nlines--;
4796 
4797 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4798 	if (bca.lines == NULL) {
4799 		error = got_error_from_errno("calloc");
4800 		goto done;
4801 	}
4802 	bca.lineno_cur = 1;
4803 	bca.nlines_prec = 0;
4804 	i = bca.nlines;
4805 	while (i > 0) {
4806 		i /= 10;
4807 		bca.nlines_prec++;
4808 	}
4809 	bca.repo = repo;
4810 
4811 	error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4812 	    repo, blame_cb, &bca, check_cancelled, NULL);
4813 done:
4814 	free(in_repo_path);
4815 	free(link_target);
4816 	free(repo_path);
4817 	free(cwd);
4818 	free(commit_id);
4819 	free(obj_id);
4820 	if (blob)
4821 		got_object_blob_close(blob);
4822 	if (worktree)
4823 		got_worktree_close(worktree);
4824 	if (repo) {
4825 		const struct got_error *close_err = got_repo_close(repo);
4826 		if (error == NULL)
4827 			error = close_err;
4828 	}
4829 	if (bca.lines) {
4830 		for (i = 0; i < bca.nlines; i++) {
4831 			struct blame_line *bline = &bca.lines[i];
4832 			free(bline->id_str);
4833 			free(bline->committer);
4834 		}
4835 		free(bca.lines);
4836 	}
4837 	free(bca.line_offsets);
4838 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
4839 		error = got_error_from_errno("fclose");
4840 	return error;
4841 }
4842 
4843 __dead static void
4844 usage_tree(void)
4845 {
4846 	fprintf(stderr,
4847 	    "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4848 	    getprogname());
4849 	exit(1);
4850 }
4851 
4852 static const struct got_error *
4853 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4854     const char *root_path, struct got_repository *repo)
4855 {
4856 	const struct got_error *err = NULL;
4857 	int is_root_path = (strcmp(path, root_path) == 0);
4858 	const char *modestr = "";
4859 	mode_t mode = got_tree_entry_get_mode(te);
4860 	char *link_target = NULL;
4861 
4862 	path += strlen(root_path);
4863 	while (path[0] == '/')
4864 		path++;
4865 
4866 	if (got_object_tree_entry_is_submodule(te))
4867 		modestr = "$";
4868 	else if (S_ISLNK(mode)) {
4869 		int i;
4870 
4871 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4872 		if (err)
4873 			return err;
4874 		for (i = 0; i < strlen(link_target); i++) {
4875 			if (!isprint((unsigned char)link_target[i]))
4876 				link_target[i] = '?';
4877 		}
4878 
4879 		modestr = "@";
4880 	}
4881 	else if (S_ISDIR(mode))
4882 		modestr = "/";
4883 	else if (mode & S_IXUSR)
4884 		modestr = "*";
4885 
4886 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4887 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4888 	    link_target ? " -> ": "", link_target ? link_target : "");
4889 
4890 	free(link_target);
4891 	return NULL;
4892 }
4893 
4894 static const struct got_error *
4895 print_tree(const char *path, struct got_object_id *commit_id,
4896     int show_ids, int recurse, const char *root_path,
4897     struct got_repository *repo)
4898 {
4899 	const struct got_error *err = NULL;
4900 	struct got_object_id *tree_id = NULL;
4901 	struct got_tree_object *tree = NULL;
4902 	int nentries, i;
4903 
4904 	err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4905 	if (err)
4906 		goto done;
4907 
4908 	err = got_object_open_as_tree(&tree, repo, tree_id);
4909 	if (err)
4910 		goto done;
4911 	nentries = got_object_tree_get_nentries(tree);
4912 	for (i = 0; i < nentries; i++) {
4913 		struct got_tree_entry *te;
4914 		char *id = NULL;
4915 
4916 		if (sigint_received || sigpipe_received)
4917 			break;
4918 
4919 		te = got_object_tree_get_entry(tree, i);
4920 		if (show_ids) {
4921 			char *id_str;
4922 			err = got_object_id_str(&id_str,
4923 			    got_tree_entry_get_id(te));
4924 			if (err)
4925 				goto done;
4926 			if (asprintf(&id, "%s ", id_str) == -1) {
4927 				err = got_error_from_errno("asprintf");
4928 				free(id_str);
4929 				goto done;
4930 			}
4931 			free(id_str);
4932 		}
4933 		err = print_entry(te, id, path, root_path, repo);
4934 		free(id);
4935 		if (err)
4936 			goto done;
4937 
4938 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4939 			char *child_path;
4940 			if (asprintf(&child_path, "%s%s%s", path,
4941 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
4942 			    got_tree_entry_get_name(te)) == -1) {
4943 				err = got_error_from_errno("asprintf");
4944 				goto done;
4945 			}
4946 			err = print_tree(child_path, commit_id, show_ids, 1,
4947 			    root_path, repo);
4948 			free(child_path);
4949 			if (err)
4950 				goto done;
4951 		}
4952 	}
4953 done:
4954 	if (tree)
4955 		got_object_tree_close(tree);
4956 	free(tree_id);
4957 	return err;
4958 }
4959 
4960 static const struct got_error *
4961 cmd_tree(int argc, char *argv[])
4962 {
4963 	const struct got_error *error;
4964 	struct got_repository *repo = NULL;
4965 	struct got_worktree *worktree = NULL;
4966 	const char *path, *refname = NULL;
4967 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4968 	struct got_object_id *commit_id = NULL;
4969 	char *commit_id_str = NULL;
4970 	int show_ids = 0, recurse = 0;
4971 	int ch;
4972 
4973 #ifndef PROFILE
4974 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4975 	    NULL) == -1)
4976 		err(1, "pledge");
4977 #endif
4978 
4979 	while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4980 		switch (ch) {
4981 		case 'c':
4982 			commit_id_str = optarg;
4983 			break;
4984 		case 'r':
4985 			repo_path = realpath(optarg, NULL);
4986 			if (repo_path == NULL)
4987 				return got_error_from_errno2("realpath",
4988 				    optarg);
4989 			got_path_strip_trailing_slashes(repo_path);
4990 			break;
4991 		case 'i':
4992 			show_ids = 1;
4993 			break;
4994 		case 'R':
4995 			recurse = 1;
4996 			break;
4997 		default:
4998 			usage_tree();
4999 			/* NOTREACHED */
5000 		}
5001 	}
5002 
5003 	argc -= optind;
5004 	argv += optind;
5005 
5006 	if (argc == 1)
5007 		path = argv[0];
5008 	else if (argc > 1)
5009 		usage_tree();
5010 	else
5011 		path = NULL;
5012 
5013 	cwd = getcwd(NULL, 0);
5014 	if (cwd == NULL) {
5015 		error = got_error_from_errno("getcwd");
5016 		goto done;
5017 	}
5018 	if (repo_path == NULL) {
5019 		error = got_worktree_open(&worktree, cwd);
5020 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5021 			goto done;
5022 		else
5023 			error = NULL;
5024 		if (worktree) {
5025 			repo_path =
5026 			    strdup(got_worktree_get_repo_path(worktree));
5027 			if (repo_path == NULL)
5028 				error = got_error_from_errno("strdup");
5029 			if (error)
5030 				goto done;
5031 		} else {
5032 			repo_path = strdup(cwd);
5033 			if (repo_path == NULL) {
5034 				error = got_error_from_errno("strdup");
5035 				goto done;
5036 			}
5037 		}
5038 	}
5039 
5040 	error = got_repo_open(&repo, repo_path, NULL);
5041 	if (error != NULL)
5042 		goto done;
5043 
5044 	if (worktree) {
5045 		const char *prefix = got_worktree_get_path_prefix(worktree);
5046 		char *p;
5047 
5048 		if (path == NULL)
5049 			path = "";
5050 		error = got_worktree_resolve_path(&p, worktree, path);
5051 		if (error)
5052 			goto done;
5053 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5054 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ?  "/" : "",
5055 		    p) == -1) {
5056 			error = got_error_from_errno("asprintf");
5057 			free(p);
5058 			goto done;
5059 		}
5060 		free(p);
5061 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5062 		if (error)
5063 			goto done;
5064 	} else {
5065 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5066 		if (error)
5067 			goto done;
5068 		if (path == NULL)
5069 			path = "/";
5070 		error = got_repo_map_path(&in_repo_path, repo, path);
5071 		if (error != NULL)
5072 			goto done;
5073 	}
5074 
5075 	if (commit_id_str == NULL) {
5076 		struct got_reference *head_ref;
5077 		if (worktree)
5078 			refname = got_worktree_get_head_ref_name(worktree);
5079 		else
5080 			refname = GOT_REF_HEAD;
5081 		error = got_ref_open(&head_ref, repo, refname, 0);
5082 		if (error != NULL)
5083 			goto done;
5084 		error = got_ref_resolve(&commit_id, repo, head_ref);
5085 		got_ref_close(head_ref);
5086 		if (error != NULL)
5087 			goto done;
5088 	} else {
5089 		struct got_reflist_head refs;
5090 		TAILQ_INIT(&refs);
5091 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5092 		    NULL);
5093 		if (error)
5094 			goto done;
5095 		error = got_repo_match_object_id(&commit_id, NULL,
5096 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5097 		got_ref_list_free(&refs);
5098 		if (error)
5099 			goto done;
5100 	}
5101 
5102 	error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5103 	    in_repo_path, repo);
5104 done:
5105 	free(in_repo_path);
5106 	free(repo_path);
5107 	free(cwd);
5108 	free(commit_id);
5109 	if (worktree)
5110 		got_worktree_close(worktree);
5111 	if (repo) {
5112 		const struct got_error *close_err = got_repo_close(repo);
5113 		if (error == NULL)
5114 			error = close_err;
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 		const struct got_error *close_err = got_repo_close(repo);
5502 		if (error == NULL)
5503 			error = close_err;
5504 	}
5505 	if (worktree)
5506 		got_worktree_close(worktree);
5507 	free(cwd);
5508 	free(repo_path);
5509 	return error;
5510 }
5511 
5512 __dead static void
5513 usage_branch(void)
5514 {
5515 	fprintf(stderr,
5516 	    "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5517 	        "[name]\n", getprogname());
5518 	exit(1);
5519 }
5520 
5521 static const struct got_error *
5522 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5523     struct got_reference *ref)
5524 {
5525 	const struct got_error *err = NULL;
5526 	const char *refname, *marker = "  ";
5527 	char *refstr;
5528 
5529 	refname = got_ref_get_name(ref);
5530 	if (worktree && strcmp(refname,
5531 	    got_worktree_get_head_ref_name(worktree)) == 0) {
5532 		struct got_object_id *id = NULL;
5533 
5534 		err = got_ref_resolve(&id, repo, ref);
5535 		if (err)
5536 			return err;
5537 		if (got_object_id_cmp(id,
5538 		    got_worktree_get_base_commit_id(worktree)) == 0)
5539 			marker = "* ";
5540 		else
5541 			marker = "~ ";
5542 		free(id);
5543 	}
5544 
5545 	if (strncmp(refname, "refs/heads/", 11) == 0)
5546 		refname += 11;
5547 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5548 		refname += 18;
5549 	if (strncmp(refname, "refs/remotes/", 13) == 0)
5550 		refname += 13;
5551 
5552 	refstr = got_ref_to_str(ref);
5553 	if (refstr == NULL)
5554 		return got_error_from_errno("got_ref_to_str");
5555 
5556 	printf("%s%s: %s\n", marker, refname, refstr);
5557 	free(refstr);
5558 	return NULL;
5559 }
5560 
5561 static const struct got_error *
5562 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5563 {
5564 	const char *refname;
5565 
5566 	if (worktree == NULL)
5567 		return got_error(GOT_ERR_NOT_WORKTREE);
5568 
5569 	refname = got_worktree_get_head_ref_name(worktree);
5570 
5571 	if (strncmp(refname, "refs/heads/", 11) == 0)
5572 		refname += 11;
5573 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5574 		refname += 18;
5575 
5576 	printf("%s\n", refname);
5577 
5578 	return NULL;
5579 }
5580 
5581 static const struct got_error *
5582 list_branches(struct got_repository *repo, struct got_worktree *worktree)
5583 {
5584 	static const struct got_error *err = NULL;
5585 	struct got_reflist_head refs;
5586 	struct got_reflist_entry *re;
5587 	struct got_reference *temp_ref = NULL;
5588 	int rebase_in_progress, histedit_in_progress;
5589 
5590 	TAILQ_INIT(&refs);
5591 
5592 	if (worktree) {
5593 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
5594 		    worktree);
5595 		if (err)
5596 			return err;
5597 
5598 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
5599 		    worktree);
5600 		if (err)
5601 			return err;
5602 
5603 		if (rebase_in_progress || histedit_in_progress) {
5604 			err = got_ref_open(&temp_ref, repo,
5605 			    got_worktree_get_head_ref_name(worktree), 0);
5606 			if (err)
5607 				return err;
5608 			list_branch(repo, worktree, temp_ref);
5609 			got_ref_close(temp_ref);
5610 		}
5611 	}
5612 
5613 	err = got_ref_list(&refs, repo, "refs/heads",
5614 	    got_ref_cmp_by_name, NULL);
5615 	if (err)
5616 		return err;
5617 
5618 	TAILQ_FOREACH(re, &refs, entry)
5619 		list_branch(repo, worktree, re->ref);
5620 
5621 	got_ref_list_free(&refs);
5622 
5623 	err = got_ref_list(&refs, repo, "refs/remotes",
5624 	    got_ref_cmp_by_name, NULL);
5625 	if (err)
5626 		return err;
5627 
5628 	TAILQ_FOREACH(re, &refs, entry)
5629 		list_branch(repo, worktree, re->ref);
5630 
5631 	got_ref_list_free(&refs);
5632 
5633 	return NULL;
5634 }
5635 
5636 static const struct got_error *
5637 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5638     const char *branch_name)
5639 {
5640 	const struct got_error *err = NULL;
5641 	struct got_reference *ref = NULL;
5642 	char *refname;
5643 
5644 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5645 		return got_error_from_errno("asprintf");
5646 
5647 	err = got_ref_open(&ref, repo, refname, 0);
5648 	if (err)
5649 		goto done;
5650 
5651 	if (worktree &&
5652 	    strcmp(got_worktree_get_head_ref_name(worktree),
5653 	    got_ref_get_name(ref)) == 0) {
5654 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
5655 		    "will not delete this work tree's current branch");
5656 		goto done;
5657 	}
5658 
5659 	err = got_ref_delete(ref, repo);
5660 done:
5661 	if (ref)
5662 		got_ref_close(ref);
5663 	free(refname);
5664 	return err;
5665 }
5666 
5667 static const struct got_error *
5668 add_branch(struct got_repository *repo, const char *branch_name,
5669     struct got_object_id *base_commit_id)
5670 {
5671 	const struct got_error *err = NULL;
5672 	struct got_reference *ref = NULL;
5673 	char *base_refname = NULL, *refname = NULL;
5674 
5675 	/*
5676 	 * Don't let the user create a branch name with a leading '-'.
5677 	 * While technically a valid reference name, this case is usually
5678 	 * an unintended typo.
5679 	 */
5680 	if (branch_name[0] == '-')
5681 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5682 
5683 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5684 		err = got_error_from_errno("asprintf");
5685 		goto done;
5686 	}
5687 
5688 	err = got_ref_open(&ref, repo, refname, 0);
5689 	if (err == NULL) {
5690 		err = got_error(GOT_ERR_BRANCH_EXISTS);
5691 		goto done;
5692 	} else if (err->code != GOT_ERR_NOT_REF)
5693 		goto done;
5694 
5695 	err = got_ref_alloc(&ref, refname, base_commit_id);
5696 	if (err)
5697 		goto done;
5698 
5699 	err = got_ref_write(ref, repo);
5700 done:
5701 	if (ref)
5702 		got_ref_close(ref);
5703 	free(base_refname);
5704 	free(refname);
5705 	return err;
5706 }
5707 
5708 static const struct got_error *
5709 cmd_branch(int argc, char *argv[])
5710 {
5711 	const struct got_error *error = NULL;
5712 	struct got_repository *repo = NULL;
5713 	struct got_worktree *worktree = NULL;
5714 	char *cwd = NULL, *repo_path = NULL;
5715 	int ch, do_list = 0, do_show = 0, do_update = 1;
5716 	const char *delref = NULL, *commit_id_arg = NULL;
5717 	struct got_reference *ref = NULL;
5718 	struct got_pathlist_head paths;
5719 	struct got_pathlist_entry *pe;
5720 	struct got_object_id *commit_id = NULL;
5721 	char *commit_id_str = NULL;
5722 
5723 	TAILQ_INIT(&paths);
5724 
5725 	while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5726 		switch (ch) {
5727 		case 'c':
5728 			commit_id_arg = optarg;
5729 			break;
5730 		case 'd':
5731 			delref = optarg;
5732 			break;
5733 		case 'r':
5734 			repo_path = realpath(optarg, NULL);
5735 			if (repo_path == NULL)
5736 				return got_error_from_errno2("realpath",
5737 				    optarg);
5738 			got_path_strip_trailing_slashes(repo_path);
5739 			break;
5740 		case 'l':
5741 			do_list = 1;
5742 			break;
5743 		case 'n':
5744 			do_update = 0;
5745 			break;
5746 		default:
5747 			usage_branch();
5748 			/* NOTREACHED */
5749 		}
5750 	}
5751 
5752 	if (do_list && delref)
5753 		option_conflict('l', 'd');
5754 
5755 	argc -= optind;
5756 	argv += optind;
5757 
5758 	if (!do_list && !delref && argc == 0)
5759 		do_show = 1;
5760 
5761 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
5762 		errx(1, "-c option can only be used when creating a branch");
5763 
5764 	if (do_list || delref) {
5765 		if (argc > 0)
5766 			usage_branch();
5767 	} else if (!do_show && argc != 1)
5768 		usage_branch();
5769 
5770 #ifndef PROFILE
5771 	if (do_list || do_show) {
5772 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5773 		    NULL) == -1)
5774 			err(1, "pledge");
5775 	} else {
5776 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5777 		    "sendfd unveil", NULL) == -1)
5778 			err(1, "pledge");
5779 	}
5780 #endif
5781 	cwd = getcwd(NULL, 0);
5782 	if (cwd == NULL) {
5783 		error = got_error_from_errno("getcwd");
5784 		goto done;
5785 	}
5786 
5787 	if (repo_path == NULL) {
5788 		error = got_worktree_open(&worktree, cwd);
5789 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5790 			goto done;
5791 		else
5792 			error = NULL;
5793 		if (worktree) {
5794 			repo_path =
5795 			    strdup(got_worktree_get_repo_path(worktree));
5796 			if (repo_path == NULL)
5797 				error = got_error_from_errno("strdup");
5798 			if (error)
5799 				goto done;
5800 		} else {
5801 			repo_path = strdup(cwd);
5802 			if (repo_path == NULL) {
5803 				error = got_error_from_errno("strdup");
5804 				goto done;
5805 			}
5806 		}
5807 	}
5808 
5809 	error = got_repo_open(&repo, repo_path, NULL);
5810 	if (error != NULL)
5811 		goto done;
5812 
5813 	error = apply_unveil(got_repo_get_path(repo), do_list,
5814 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
5815 	if (error)
5816 		goto done;
5817 
5818 	if (do_show)
5819 		error = show_current_branch(repo, worktree);
5820 	else if (do_list)
5821 		error = list_branches(repo, worktree);
5822 	else if (delref)
5823 		error = delete_branch(repo, worktree, delref);
5824 	else {
5825 		struct got_reflist_head refs;
5826 		TAILQ_INIT(&refs);
5827 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5828 		    NULL);
5829 		if (error)
5830 			goto done;
5831 		if (commit_id_arg == NULL)
5832 			commit_id_arg = worktree ?
5833 			    got_worktree_get_head_ref_name(worktree) :
5834 			    GOT_REF_HEAD;
5835 		error = got_repo_match_object_id(&commit_id, NULL,
5836 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5837 		got_ref_list_free(&refs);
5838 		if (error)
5839 			goto done;
5840 		error = add_branch(repo, argv[0], commit_id);
5841 		if (error)
5842 			goto done;
5843 		if (worktree && do_update) {
5844 			struct got_update_progress_arg upa;
5845 			char *branch_refname = NULL;
5846 
5847 			error = got_object_id_str(&commit_id_str, commit_id);
5848 			if (error)
5849 				goto done;
5850 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
5851 			    worktree);
5852 			if (error)
5853 				goto done;
5854 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5855 			    == -1) {
5856 				error = got_error_from_errno("asprintf");
5857 				goto done;
5858 			}
5859 			error = got_ref_open(&ref, repo, branch_refname, 0);
5860 			free(branch_refname);
5861 			if (error)
5862 				goto done;
5863 			error = switch_head_ref(ref, commit_id, worktree,
5864 			    repo);
5865 			if (error)
5866 				goto done;
5867 			error = got_worktree_set_base_commit_id(worktree, repo,
5868 			    commit_id);
5869 			if (error)
5870 				goto done;
5871 			memset(&upa, 0, sizeof(upa));
5872 			error = got_worktree_checkout_files(worktree, &paths,
5873 			    repo, update_progress, &upa, check_cancelled,
5874 			    NULL);
5875 			if (error)
5876 				goto done;
5877 			if (upa.did_something)
5878 				printf("Updated to commit %s\n", commit_id_str);
5879 			print_update_progress_stats(&upa);
5880 		}
5881 	}
5882 done:
5883 	if (ref)
5884 		got_ref_close(ref);
5885 	if (repo) {
5886 		const struct got_error *close_err = got_repo_close(repo);
5887 		if (error == NULL)
5888 			error = close_err;
5889 	}
5890 	if (worktree)
5891 		got_worktree_close(worktree);
5892 	free(cwd);
5893 	free(repo_path);
5894 	free(commit_id);
5895 	free(commit_id_str);
5896 	TAILQ_FOREACH(pe, &paths, entry)
5897 		free((char *)pe->path);
5898 	got_pathlist_free(&paths);
5899 	return error;
5900 }
5901 
5902 
5903 __dead static void
5904 usage_tag(void)
5905 {
5906 	fprintf(stderr,
5907 	    "usage: %s tag [-c commit] [-r repository] [-l] "
5908 	        "[-m message] name\n", getprogname());
5909 	exit(1);
5910 }
5911 
5912 #if 0
5913 static const struct got_error *
5914 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5915 {
5916 	const struct got_error *err = NULL;
5917 	struct got_reflist_entry *re, *se, *new;
5918 	struct got_object_id *re_id, *se_id;
5919 	struct got_tag_object *re_tag, *se_tag;
5920 	time_t re_time, se_time;
5921 
5922 	SIMPLEQ_FOREACH(re, tags, entry) {
5923 		se = SIMPLEQ_FIRST(sorted);
5924 		if (se == NULL) {
5925 			err = got_reflist_entry_dup(&new, re);
5926 			if (err)
5927 				return err;
5928 			SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5929 			continue;
5930 		} else {
5931 			err = got_ref_resolve(&re_id, repo, re->ref);
5932 			if (err)
5933 				break;
5934 			err = got_object_open_as_tag(&re_tag, repo, re_id);
5935 			free(re_id);
5936 			if (err)
5937 				break;
5938 			re_time = got_object_tag_get_tagger_time(re_tag);
5939 			got_object_tag_close(re_tag);
5940 		}
5941 
5942 		while (se) {
5943 			err = got_ref_resolve(&se_id, repo, re->ref);
5944 			if (err)
5945 				break;
5946 			err = got_object_open_as_tag(&se_tag, repo, se_id);
5947 			free(se_id);
5948 			if (err)
5949 				break;
5950 			se_time = got_object_tag_get_tagger_time(se_tag);
5951 			got_object_tag_close(se_tag);
5952 
5953 			if (se_time > re_time) {
5954 				err = got_reflist_entry_dup(&new, re);
5955 				if (err)
5956 					return err;
5957 				SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5958 				break;
5959 			}
5960 			se = SIMPLEQ_NEXT(se, entry);
5961 			continue;
5962 		}
5963 	}
5964 done:
5965 	return err;
5966 }
5967 #endif
5968 
5969 static const struct got_error *
5970 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5971 {
5972 	static const struct got_error *err = NULL;
5973 	struct got_reflist_head refs;
5974 	struct got_reflist_entry *re;
5975 
5976 	TAILQ_INIT(&refs);
5977 
5978 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5979 	if (err)
5980 		return err;
5981 
5982 	TAILQ_FOREACH(re, &refs, entry) {
5983 		const char *refname;
5984 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5985 		char datebuf[26];
5986 		const char *tagger;
5987 		time_t tagger_time;
5988 		struct got_object_id *id;
5989 		struct got_tag_object *tag;
5990 		struct got_commit_object *commit = NULL;
5991 
5992 		refname = got_ref_get_name(re->ref);
5993 		if (strncmp(refname, "refs/tags/", 10) != 0)
5994 			continue;
5995 		refname += 10;
5996 		refstr = got_ref_to_str(re->ref);
5997 		if (refstr == NULL) {
5998 			err = got_error_from_errno("got_ref_to_str");
5999 			break;
6000 		}
6001 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6002 		free(refstr);
6003 
6004 		err = got_ref_resolve(&id, repo, re->ref);
6005 		if (err)
6006 			break;
6007 		err = got_object_open_as_tag(&tag, repo, id);
6008 		if (err) {
6009 			if (err->code != GOT_ERR_OBJ_TYPE) {
6010 				free(id);
6011 				break;
6012 			}
6013 			/* "lightweight" tag */
6014 			err = got_object_open_as_commit(&commit, repo, id);
6015 			if (err) {
6016 				free(id);
6017 				break;
6018 			}
6019 			tagger = got_object_commit_get_committer(commit);
6020 			tagger_time =
6021 			    got_object_commit_get_committer_time(commit);
6022 			err = got_object_id_str(&id_str, id);
6023 			free(id);
6024 			if (err)
6025 				break;
6026 		} else {
6027 			free(id);
6028 			tagger = got_object_tag_get_tagger(tag);
6029 			tagger_time = got_object_tag_get_tagger_time(tag);
6030 			err = got_object_id_str(&id_str,
6031 			    got_object_tag_get_object_id(tag));
6032 			if (err)
6033 				break;
6034 		}
6035 		printf("from: %s\n", tagger);
6036 		datestr = get_datestr(&tagger_time, datebuf);
6037 		if (datestr)
6038 			printf("date: %s UTC\n", datestr);
6039 		if (commit)
6040 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6041 		else {
6042 			switch (got_object_tag_get_object_type(tag)) {
6043 			case GOT_OBJ_TYPE_BLOB:
6044 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6045 				    id_str);
6046 				break;
6047 			case GOT_OBJ_TYPE_TREE:
6048 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6049 				    id_str);
6050 				break;
6051 			case GOT_OBJ_TYPE_COMMIT:
6052 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6053 				    id_str);
6054 				break;
6055 			case GOT_OBJ_TYPE_TAG:
6056 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6057 				    id_str);
6058 				break;
6059 			default:
6060 				break;
6061 			}
6062 		}
6063 		free(id_str);
6064 		if (commit) {
6065 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
6066 			if (err)
6067 				break;
6068 			got_object_commit_close(commit);
6069 		} else {
6070 			tagmsg0 = strdup(got_object_tag_get_message(tag));
6071 			got_object_tag_close(tag);
6072 			if (tagmsg0 == NULL) {
6073 				err = got_error_from_errno("strdup");
6074 				break;
6075 			}
6076 		}
6077 
6078 		tagmsg = tagmsg0;
6079 		do {
6080 			line = strsep(&tagmsg, "\n");
6081 			if (line)
6082 				printf(" %s\n", line);
6083 		} while (line);
6084 		free(tagmsg0);
6085 	}
6086 
6087 	got_ref_list_free(&refs);
6088 	return NULL;
6089 }
6090 
6091 static const struct got_error *
6092 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6093     const char *tag_name, const char *repo_path)
6094 {
6095 	const struct got_error *err = NULL;
6096 	char *template = NULL, *initial_content = NULL;
6097 	char *editor = NULL;
6098 	int initial_content_len;
6099 	int fd = -1;
6100 
6101 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6102 		err = got_error_from_errno("asprintf");
6103 		goto done;
6104 	}
6105 
6106 	initial_content_len = asprintf(&initial_content,
6107 	    "\n# tagging commit %s as %s\n",
6108 	    commit_id_str, tag_name);
6109 	if (initial_content_len == -1) {
6110 		err = got_error_from_errno("asprintf");
6111 		goto done;
6112 	}
6113 
6114 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6115 	if (err)
6116 		goto done;
6117 
6118 	if (write(fd, initial_content, initial_content_len) == -1) {
6119 		err = got_error_from_errno2("write", *tagmsg_path);
6120 		goto done;
6121 	}
6122 
6123 	err = get_editor(&editor);
6124 	if (err)
6125 		goto done;
6126 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6127 	    initial_content_len, 1);
6128 done:
6129 	free(initial_content);
6130 	free(template);
6131 	free(editor);
6132 
6133 	if (fd != -1 && close(fd) == -1 && err == NULL)
6134 		err = got_error_from_errno2("close", *tagmsg_path);
6135 
6136 	/* Editor is done; we can now apply unveil(2) */
6137 	if (err == NULL)
6138 		err = apply_unveil(repo_path, 0, NULL);
6139 	if (err) {
6140 		free(*tagmsg);
6141 		*tagmsg = NULL;
6142 	}
6143 	return err;
6144 }
6145 
6146 static const struct got_error *
6147 add_tag(struct got_repository *repo, struct got_worktree *worktree,
6148     const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6149 {
6150 	const struct got_error *err = NULL;
6151 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
6152 	char *label = NULL, *commit_id_str = NULL;
6153 	struct got_reference *ref = NULL;
6154 	char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6155 	char *tagmsg_path = NULL, *tag_id_str = NULL;
6156 	int preserve_tagmsg = 0;
6157 	struct got_reflist_head refs;
6158 
6159 	TAILQ_INIT(&refs);
6160 
6161 	/*
6162 	 * Don't let the user create a tag name with a leading '-'.
6163 	 * While technically a valid reference name, this case is usually
6164 	 * an unintended typo.
6165 	 */
6166 	if (tag_name[0] == '-')
6167 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6168 
6169 	err = get_author(&tagger, repo, worktree);
6170 	if (err)
6171 		return err;
6172 
6173 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6174 	if (err)
6175 		goto done;
6176 
6177 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6178 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
6179 	if (err)
6180 		goto done;
6181 
6182 	err = got_object_id_str(&commit_id_str, commit_id);
6183 	if (err)
6184 		goto done;
6185 
6186 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
6187 		refname = strdup(tag_name);
6188 		if (refname == NULL) {
6189 			err = got_error_from_errno("strdup");
6190 			goto done;
6191 		}
6192 		tag_name += 10;
6193 	} else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6194 		err = got_error_from_errno("asprintf");
6195 		goto done;
6196 	}
6197 
6198 	err = got_ref_open(&ref, repo, refname, 0);
6199 	if (err == NULL) {
6200 		err = got_error(GOT_ERR_TAG_EXISTS);
6201 		goto done;
6202 	} else if (err->code != GOT_ERR_NOT_REF)
6203 		goto done;
6204 
6205 	if (tagmsg_arg == NULL) {
6206 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6207 		    tag_name, got_repo_get_path(repo));
6208 		if (err) {
6209 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6210 			    tagmsg_path != NULL)
6211 				preserve_tagmsg = 1;
6212 			goto done;
6213 		}
6214 	}
6215 
6216 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
6217 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6218 	if (err) {
6219 		if (tagmsg_path)
6220 			preserve_tagmsg = 1;
6221 		goto done;
6222 	}
6223 
6224 	err = got_ref_alloc(&ref, refname, tag_id);
6225 	if (err) {
6226 		if (tagmsg_path)
6227 			preserve_tagmsg = 1;
6228 		goto done;
6229 	}
6230 
6231 	err = got_ref_write(ref, repo);
6232 	if (err) {
6233 		if (tagmsg_path)
6234 			preserve_tagmsg = 1;
6235 		goto done;
6236 	}
6237 
6238 	err = got_object_id_str(&tag_id_str, tag_id);
6239 	if (err) {
6240 		if (tagmsg_path)
6241 			preserve_tagmsg = 1;
6242 		goto done;
6243 	}
6244 	printf("Created tag %s\n", tag_id_str);
6245 done:
6246 	if (preserve_tagmsg) {
6247 		fprintf(stderr, "%s: tag message preserved in %s\n",
6248 		    getprogname(), tagmsg_path);
6249 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6250 		err = got_error_from_errno2("unlink", tagmsg_path);
6251 	free(tag_id_str);
6252 	if (ref)
6253 		got_ref_close(ref);
6254 	free(commit_id);
6255 	free(commit_id_str);
6256 	free(refname);
6257 	free(tagmsg);
6258 	free(tagmsg_path);
6259 	free(tagger);
6260 	got_ref_list_free(&refs);
6261 	return err;
6262 }
6263 
6264 static const struct got_error *
6265 cmd_tag(int argc, char *argv[])
6266 {
6267 	const struct got_error *error = NULL;
6268 	struct got_repository *repo = NULL;
6269 	struct got_worktree *worktree = NULL;
6270 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6271 	char *gitconfig_path = NULL;
6272 	const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6273 	int ch, do_list = 0;
6274 
6275 	while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6276 		switch (ch) {
6277 		case 'c':
6278 			commit_id_arg = optarg;
6279 			break;
6280 		case 'm':
6281 			tagmsg = optarg;
6282 			break;
6283 		case 'r':
6284 			repo_path = realpath(optarg, NULL);
6285 			if (repo_path == NULL)
6286 				return got_error_from_errno2("realpath",
6287 				    optarg);
6288 			got_path_strip_trailing_slashes(repo_path);
6289 			break;
6290 		case 'l':
6291 			do_list = 1;
6292 			break;
6293 		default:
6294 			usage_tag();
6295 			/* NOTREACHED */
6296 		}
6297 	}
6298 
6299 	argc -= optind;
6300 	argv += optind;
6301 
6302 	if (do_list) {
6303 		if (commit_id_arg != NULL)
6304 			errx(1,
6305 			    "-c option can only be used when creating a tag");
6306 		if (tagmsg)
6307 			option_conflict('l', 'm');
6308 		if (argc > 0)
6309 			usage_tag();
6310 	} else if (argc != 1)
6311 		usage_tag();
6312 
6313 	tag_name = argv[0];
6314 
6315 #ifndef PROFILE
6316 	if (do_list) {
6317 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6318 		    NULL) == -1)
6319 			err(1, "pledge");
6320 	} else {
6321 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6322 		    "sendfd unveil", NULL) == -1)
6323 			err(1, "pledge");
6324 	}
6325 #endif
6326 	cwd = getcwd(NULL, 0);
6327 	if (cwd == NULL) {
6328 		error = got_error_from_errno("getcwd");
6329 		goto done;
6330 	}
6331 
6332 	if (repo_path == NULL) {
6333 		error = got_worktree_open(&worktree, cwd);
6334 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6335 			goto done;
6336 		else
6337 			error = NULL;
6338 		if (worktree) {
6339 			repo_path =
6340 			    strdup(got_worktree_get_repo_path(worktree));
6341 			if (repo_path == NULL)
6342 				error = got_error_from_errno("strdup");
6343 			if (error)
6344 				goto done;
6345 		} else {
6346 			repo_path = strdup(cwd);
6347 			if (repo_path == NULL) {
6348 				error = got_error_from_errno("strdup");
6349 				goto done;
6350 			}
6351 		}
6352 	}
6353 
6354 	if (do_list) {
6355 		error = got_repo_open(&repo, repo_path, NULL);
6356 		if (error != NULL)
6357 			goto done;
6358 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6359 		if (error)
6360 			goto done;
6361 		error = list_tags(repo, worktree);
6362 	} else {
6363 		error = get_gitconfig_path(&gitconfig_path);
6364 		if (error)
6365 			goto done;
6366 		error = got_repo_open(&repo, repo_path, gitconfig_path);
6367 		if (error != NULL)
6368 			goto done;
6369 
6370 		if (tagmsg) {
6371 			error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6372 			if (error)
6373 				goto done;
6374 		}
6375 
6376 		if (commit_id_arg == NULL) {
6377 			struct got_reference *head_ref;
6378 			struct got_object_id *commit_id;
6379 			error = got_ref_open(&head_ref, repo,
6380 			    worktree ? got_worktree_get_head_ref_name(worktree)
6381 			    : GOT_REF_HEAD, 0);
6382 			if (error)
6383 				goto done;
6384 			error = got_ref_resolve(&commit_id, repo, head_ref);
6385 			got_ref_close(head_ref);
6386 			if (error)
6387 				goto done;
6388 			error = got_object_id_str(&commit_id_str, commit_id);
6389 			free(commit_id);
6390 			if (error)
6391 				goto done;
6392 		}
6393 
6394 		error = add_tag(repo, worktree, tag_name,
6395 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6396 	}
6397 done:
6398 	if (repo) {
6399 		const struct got_error *close_err = got_repo_close(repo);
6400 		if (error == NULL)
6401 			error = close_err;
6402 	}
6403 	if (worktree)
6404 		got_worktree_close(worktree);
6405 	free(cwd);
6406 	free(repo_path);
6407 	free(gitconfig_path);
6408 	free(commit_id_str);
6409 	return error;
6410 }
6411 
6412 __dead static void
6413 usage_add(void)
6414 {
6415 	fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6416 	    getprogname());
6417 	exit(1);
6418 }
6419 
6420 static const struct got_error *
6421 add_progress(void *arg, unsigned char status, const char *path)
6422 {
6423 	while (path[0] == '/')
6424 		path++;
6425 	printf("%c  %s\n", status, path);
6426 	return NULL;
6427 }
6428 
6429 static const struct got_error *
6430 cmd_add(int argc, char *argv[])
6431 {
6432 	const struct got_error *error = NULL;
6433 	struct got_repository *repo = NULL;
6434 	struct got_worktree *worktree = NULL;
6435 	char *cwd = NULL;
6436 	struct got_pathlist_head paths;
6437 	struct got_pathlist_entry *pe;
6438 	int ch, can_recurse = 0, no_ignores = 0;
6439 
6440 	TAILQ_INIT(&paths);
6441 
6442 	while ((ch = getopt(argc, argv, "IR")) != -1) {
6443 		switch (ch) {
6444 		case 'I':
6445 			no_ignores = 1;
6446 			break;
6447 		case 'R':
6448 			can_recurse = 1;
6449 			break;
6450 		default:
6451 			usage_add();
6452 			/* NOTREACHED */
6453 		}
6454 	}
6455 
6456 	argc -= optind;
6457 	argv += optind;
6458 
6459 #ifndef PROFILE
6460 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6461 	    NULL) == -1)
6462 		err(1, "pledge");
6463 #endif
6464 	if (argc < 1)
6465 		usage_add();
6466 
6467 	cwd = getcwd(NULL, 0);
6468 	if (cwd == NULL) {
6469 		error = got_error_from_errno("getcwd");
6470 		goto done;
6471 	}
6472 
6473 	error = got_worktree_open(&worktree, cwd);
6474 	if (error) {
6475 		if (error->code == GOT_ERR_NOT_WORKTREE)
6476 			error = wrap_not_worktree_error(error, "add", cwd);
6477 		goto done;
6478 	}
6479 
6480 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6481 	    NULL);
6482 	if (error != NULL)
6483 		goto done;
6484 
6485 	error = apply_unveil(got_repo_get_path(repo), 1,
6486 	    got_worktree_get_root_path(worktree));
6487 	if (error)
6488 		goto done;
6489 
6490 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6491 	if (error)
6492 		goto done;
6493 
6494 	if (!can_recurse && no_ignores) {
6495 		error = got_error_msg(GOT_ERR_BAD_PATH,
6496 		    "disregarding ignores requires -R option");
6497 		goto done;
6498 
6499 	}
6500 
6501 	if (!can_recurse) {
6502 		char *ondisk_path;
6503 		struct stat sb;
6504 		TAILQ_FOREACH(pe, &paths, entry) {
6505 			if (asprintf(&ondisk_path, "%s/%s",
6506 			    got_worktree_get_root_path(worktree),
6507 			    pe->path) == -1) {
6508 				error = got_error_from_errno("asprintf");
6509 				goto done;
6510 			}
6511 			if (lstat(ondisk_path, &sb) == -1) {
6512 				if (errno == ENOENT) {
6513 					free(ondisk_path);
6514 					continue;
6515 				}
6516 				error = got_error_from_errno2("lstat",
6517 				    ondisk_path);
6518 				free(ondisk_path);
6519 				goto done;
6520 			}
6521 			free(ondisk_path);
6522 			if (S_ISDIR(sb.st_mode)) {
6523 				error = got_error_msg(GOT_ERR_BAD_PATH,
6524 				    "adding directories requires -R option");
6525 				goto done;
6526 			}
6527 		}
6528 	}
6529 
6530 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
6531 	    NULL, repo, no_ignores);
6532 done:
6533 	if (repo) {
6534 		const struct got_error *close_err = got_repo_close(repo);
6535 		if (error == NULL)
6536 			error = close_err;
6537 	}
6538 	if (worktree)
6539 		got_worktree_close(worktree);
6540 	TAILQ_FOREACH(pe, &paths, entry)
6541 		free((char *)pe->path);
6542 	got_pathlist_free(&paths);
6543 	free(cwd);
6544 	return error;
6545 }
6546 
6547 __dead static void
6548 usage_remove(void)
6549 {
6550 	fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6551 	    "path ...\n", getprogname());
6552 	exit(1);
6553 }
6554 
6555 static const struct got_error *
6556 print_remove_status(void *arg, unsigned char status,
6557     unsigned char staged_status, const char *path)
6558 {
6559 	while (path[0] == '/')
6560 		path++;
6561 	if (status == GOT_STATUS_NONEXISTENT)
6562 		return NULL;
6563 	if (status == staged_status && (status == GOT_STATUS_DELETE))
6564 		status = GOT_STATUS_NO_CHANGE;
6565 	printf("%c%c %s\n", status, staged_status, path);
6566 	return NULL;
6567 }
6568 
6569 static const struct got_error *
6570 cmd_remove(int argc, char *argv[])
6571 {
6572 	const struct got_error *error = NULL;
6573 	struct got_worktree *worktree = NULL;
6574 	struct got_repository *repo = NULL;
6575 	const char *status_codes = NULL;
6576 	char *cwd = NULL;
6577 	struct got_pathlist_head paths;
6578 	struct got_pathlist_entry *pe;
6579 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6580 
6581 	TAILQ_INIT(&paths);
6582 
6583 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6584 		switch (ch) {
6585 		case 'f':
6586 			delete_local_mods = 1;
6587 			break;
6588 		case 'k':
6589 			keep_on_disk = 1;
6590 			break;
6591 		case 'R':
6592 			can_recurse = 1;
6593 			break;
6594 		case 's':
6595 			for (i = 0; i < strlen(optarg); i++) {
6596 				switch (optarg[i]) {
6597 				case GOT_STATUS_MODIFY:
6598 					delete_local_mods = 1;
6599 					break;
6600 				case GOT_STATUS_MISSING:
6601 					break;
6602 				default:
6603 					errx(1, "invalid status code '%c'",
6604 					    optarg[i]);
6605 				}
6606 			}
6607 			status_codes = optarg;
6608 			break;
6609 		default:
6610 			usage_remove();
6611 			/* NOTREACHED */
6612 		}
6613 	}
6614 
6615 	argc -= optind;
6616 	argv += optind;
6617 
6618 #ifndef PROFILE
6619 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6620 	    NULL) == -1)
6621 		err(1, "pledge");
6622 #endif
6623 	if (argc < 1)
6624 		usage_remove();
6625 
6626 	cwd = getcwd(NULL, 0);
6627 	if (cwd == NULL) {
6628 		error = got_error_from_errno("getcwd");
6629 		goto done;
6630 	}
6631 	error = got_worktree_open(&worktree, cwd);
6632 	if (error) {
6633 		if (error->code == GOT_ERR_NOT_WORKTREE)
6634 			error = wrap_not_worktree_error(error, "remove", cwd);
6635 		goto done;
6636 	}
6637 
6638 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6639 	    NULL);
6640 	if (error)
6641 		goto done;
6642 
6643 	error = apply_unveil(got_repo_get_path(repo), 1,
6644 	    got_worktree_get_root_path(worktree));
6645 	if (error)
6646 		goto done;
6647 
6648 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6649 	if (error)
6650 		goto done;
6651 
6652 	if (!can_recurse) {
6653 		char *ondisk_path;
6654 		struct stat sb;
6655 		TAILQ_FOREACH(pe, &paths, entry) {
6656 			if (asprintf(&ondisk_path, "%s/%s",
6657 			    got_worktree_get_root_path(worktree),
6658 			    pe->path) == -1) {
6659 				error = got_error_from_errno("asprintf");
6660 				goto done;
6661 			}
6662 			if (lstat(ondisk_path, &sb) == -1) {
6663 				if (errno == ENOENT) {
6664 					free(ondisk_path);
6665 					continue;
6666 				}
6667 				error = got_error_from_errno2("lstat",
6668 				    ondisk_path);
6669 				free(ondisk_path);
6670 				goto done;
6671 			}
6672 			free(ondisk_path);
6673 			if (S_ISDIR(sb.st_mode)) {
6674 				error = got_error_msg(GOT_ERR_BAD_PATH,
6675 				    "removing directories requires -R option");
6676 				goto done;
6677 			}
6678 		}
6679 	}
6680 
6681 	error = got_worktree_schedule_delete(worktree, &paths,
6682 	    delete_local_mods, status_codes, print_remove_status, NULL,
6683 	    repo, keep_on_disk);
6684 done:
6685 	if (repo) {
6686 		const struct got_error *close_err = got_repo_close(repo);
6687 		if (error == NULL)
6688 			error = close_err;
6689 	}
6690 	if (worktree)
6691 		got_worktree_close(worktree);
6692 	TAILQ_FOREACH(pe, &paths, entry)
6693 		free((char *)pe->path);
6694 	got_pathlist_free(&paths);
6695 	free(cwd);
6696 	return error;
6697 }
6698 
6699 __dead static void
6700 usage_revert(void)
6701 {
6702 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6703 	    "path ...\n", getprogname());
6704 	exit(1);
6705 }
6706 
6707 static const struct got_error *
6708 revert_progress(void *arg, unsigned char status, const char *path)
6709 {
6710 	if (status == GOT_STATUS_UNVERSIONED)
6711 		return NULL;
6712 
6713 	while (path[0] == '/')
6714 		path++;
6715 	printf("%c  %s\n", status, path);
6716 	return NULL;
6717 }
6718 
6719 struct choose_patch_arg {
6720 	FILE *patch_script_file;
6721 	const char *action;
6722 };
6723 
6724 static const struct got_error *
6725 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6726     int nchanges, const char *action)
6727 {
6728 	char *line = NULL;
6729 	size_t linesize = 0;
6730 	ssize_t linelen;
6731 
6732 	switch (status) {
6733 	case GOT_STATUS_ADD:
6734 		printf("A  %s\n%s this addition? [y/n] ", path, action);
6735 		break;
6736 	case GOT_STATUS_DELETE:
6737 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
6738 		break;
6739 	case GOT_STATUS_MODIFY:
6740 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
6741 			return got_error_from_errno("fseek");
6742 		printf(GOT_COMMIT_SEP_STR);
6743 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6744 			printf("%s", line);
6745 		if (ferror(patch_file))
6746 			return got_error_from_errno("getline");
6747 		printf(GOT_COMMIT_SEP_STR);
6748 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
6749 		    path, n, nchanges, action);
6750 		break;
6751 	default:
6752 		return got_error_path(path, GOT_ERR_FILE_STATUS);
6753 	}
6754 
6755 	return NULL;
6756 }
6757 
6758 static const struct got_error *
6759 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6760     FILE *patch_file, int n, int nchanges)
6761 {
6762 	const struct got_error *err = NULL;
6763 	char *line = NULL;
6764 	size_t linesize = 0;
6765 	ssize_t linelen;
6766 	int resp = ' ';
6767 	struct choose_patch_arg *a = arg;
6768 
6769 	*choice = GOT_PATCH_CHOICE_NONE;
6770 
6771 	if (a->patch_script_file) {
6772 		char *nl;
6773 		err = show_change(status, path, patch_file, n, nchanges,
6774 		    a->action);
6775 		if (err)
6776 			return err;
6777 		linelen = getline(&line, &linesize, a->patch_script_file);
6778 		if (linelen == -1) {
6779 			if (ferror(a->patch_script_file))
6780 				return got_error_from_errno("getline");
6781 			return NULL;
6782 		}
6783 		nl = strchr(line, '\n');
6784 		if (nl)
6785 			*nl = '\0';
6786 		if (strcmp(line, "y") == 0) {
6787 			*choice = GOT_PATCH_CHOICE_YES;
6788 			printf("y\n");
6789 		} else if (strcmp(line, "n") == 0) {
6790 			*choice = GOT_PATCH_CHOICE_NO;
6791 			printf("n\n");
6792 		} else if (strcmp(line, "q") == 0 &&
6793 		    status == GOT_STATUS_MODIFY) {
6794 			*choice = GOT_PATCH_CHOICE_QUIT;
6795 			printf("q\n");
6796 		} else
6797 			printf("invalid response '%s'\n", line);
6798 		free(line);
6799 		return NULL;
6800 	}
6801 
6802 	while (resp != 'y' && resp != 'n' && resp != 'q') {
6803 		err = show_change(status, path, patch_file, n, nchanges,
6804 		    a->action);
6805 		if (err)
6806 			return err;
6807 		resp = getchar();
6808 		if (resp == '\n')
6809 			resp = getchar();
6810 		if (status == GOT_STATUS_MODIFY) {
6811 			if (resp != 'y' && resp != 'n' && resp != 'q') {
6812 				printf("invalid response '%c'\n", resp);
6813 				resp = ' ';
6814 			}
6815 		} else if (resp != 'y' && resp != 'n') {
6816 				printf("invalid response '%c'\n", resp);
6817 				resp = ' ';
6818 		}
6819 	}
6820 
6821 	if (resp == 'y')
6822 		*choice = GOT_PATCH_CHOICE_YES;
6823 	else if (resp == 'n')
6824 		*choice = GOT_PATCH_CHOICE_NO;
6825 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6826 		*choice = GOT_PATCH_CHOICE_QUIT;
6827 
6828 	return NULL;
6829 }
6830 
6831 
6832 static const struct got_error *
6833 cmd_revert(int argc, char *argv[])
6834 {
6835 	const struct got_error *error = NULL;
6836 	struct got_worktree *worktree = NULL;
6837 	struct got_repository *repo = NULL;
6838 	char *cwd = NULL, *path = NULL;
6839 	struct got_pathlist_head paths;
6840 	struct got_pathlist_entry *pe;
6841 	int ch, can_recurse = 0, pflag = 0;
6842 	FILE *patch_script_file = NULL;
6843 	const char *patch_script_path = NULL;
6844 	struct choose_patch_arg cpa;
6845 
6846 	TAILQ_INIT(&paths);
6847 
6848 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6849 		switch (ch) {
6850 		case 'p':
6851 			pflag = 1;
6852 			break;
6853 		case 'F':
6854 			patch_script_path = optarg;
6855 			break;
6856 		case 'R':
6857 			can_recurse = 1;
6858 			break;
6859 		default:
6860 			usage_revert();
6861 			/* NOTREACHED */
6862 		}
6863 	}
6864 
6865 	argc -= optind;
6866 	argv += optind;
6867 
6868 #ifndef PROFILE
6869 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6870 	    "unveil", NULL) == -1)
6871 		err(1, "pledge");
6872 #endif
6873 	if (argc < 1)
6874 		usage_revert();
6875 	if (patch_script_path && !pflag)
6876 		errx(1, "-F option can only be used together with -p option");
6877 
6878 	cwd = getcwd(NULL, 0);
6879 	if (cwd == NULL) {
6880 		error = got_error_from_errno("getcwd");
6881 		goto done;
6882 	}
6883 	error = got_worktree_open(&worktree, cwd);
6884 	if (error) {
6885 		if (error->code == GOT_ERR_NOT_WORKTREE)
6886 			error = wrap_not_worktree_error(error, "revert", cwd);
6887 		goto done;
6888 	}
6889 
6890 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6891 	    NULL);
6892 	if (error != NULL)
6893 		goto done;
6894 
6895 	if (patch_script_path) {
6896 		patch_script_file = fopen(patch_script_path, "r");
6897 		if (patch_script_file == NULL) {
6898 			error = got_error_from_errno2("fopen",
6899 			    patch_script_path);
6900 			goto done;
6901 		}
6902 	}
6903 	error = apply_unveil(got_repo_get_path(repo), 1,
6904 	    got_worktree_get_root_path(worktree));
6905 	if (error)
6906 		goto done;
6907 
6908 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6909 	if (error)
6910 		goto done;
6911 
6912 	if (!can_recurse) {
6913 		char *ondisk_path;
6914 		struct stat sb;
6915 		TAILQ_FOREACH(pe, &paths, entry) {
6916 			if (asprintf(&ondisk_path, "%s/%s",
6917 			    got_worktree_get_root_path(worktree),
6918 			    pe->path) == -1) {
6919 				error = got_error_from_errno("asprintf");
6920 				goto done;
6921 			}
6922 			if (lstat(ondisk_path, &sb) == -1) {
6923 				if (errno == ENOENT) {
6924 					free(ondisk_path);
6925 					continue;
6926 				}
6927 				error = got_error_from_errno2("lstat",
6928 				    ondisk_path);
6929 				free(ondisk_path);
6930 				goto done;
6931 			}
6932 			free(ondisk_path);
6933 			if (S_ISDIR(sb.st_mode)) {
6934 				error = got_error_msg(GOT_ERR_BAD_PATH,
6935 				    "reverting directories requires -R option");
6936 				goto done;
6937 			}
6938 		}
6939 	}
6940 
6941 	cpa.patch_script_file = patch_script_file;
6942 	cpa.action = "revert";
6943 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6944 	    pflag ? choose_patch : NULL, &cpa, repo);
6945 done:
6946 	if (patch_script_file && fclose(patch_script_file) == EOF &&
6947 	    error == NULL)
6948 		error = got_error_from_errno2("fclose", patch_script_path);
6949 	if (repo) {
6950 		const struct got_error *close_err = got_repo_close(repo);
6951 		if (error == NULL)
6952 			error = close_err;
6953 	}
6954 	if (worktree)
6955 		got_worktree_close(worktree);
6956 	free(path);
6957 	free(cwd);
6958 	return error;
6959 }
6960 
6961 __dead static void
6962 usage_commit(void)
6963 {
6964 	fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
6965 	    "[path ...]\n", getprogname());
6966 	exit(1);
6967 }
6968 
6969 struct collect_commit_logmsg_arg {
6970 	const char *cmdline_log;
6971 	const char *prepared_log;
6972 	int non_interactive;
6973 	const char *editor;
6974 	const char *worktree_path;
6975 	const char *branch_name;
6976 	const char *repo_path;
6977 	char *logmsg_path;
6978 
6979 };
6980 
6981 static const struct got_error *
6982 read_prepared_logmsg(char **logmsg, const char *path)
6983 {
6984 	const struct got_error *err = NULL;
6985 	FILE *f = NULL;
6986 	struct stat sb;
6987 	size_t r;
6988 
6989 	*logmsg = NULL;
6990 	memset(&sb, 0, sizeof(sb));
6991 
6992 	f = fopen(path, "r");
6993 	if (f == NULL)
6994 		return got_error_from_errno2("fopen", path);
6995 
6996 	if (fstat(fileno(f), &sb) == -1) {
6997 		err = got_error_from_errno2("fstat", path);
6998 		goto done;
6999 	}
7000 	if (sb.st_size == 0) {
7001 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7002 		goto done;
7003 	}
7004 
7005 	*logmsg = malloc(sb.st_size + 1);
7006 	if (*logmsg == NULL) {
7007 		err = got_error_from_errno("malloc");
7008 		goto done;
7009 	}
7010 
7011 	r = fread(*logmsg, 1, sb.st_size, f);
7012 	if (r != sb.st_size) {
7013 		if (ferror(f))
7014 			err = got_error_from_errno2("fread", path);
7015 		else
7016 			err = got_error(GOT_ERR_IO);
7017 		goto done;
7018 	}
7019 	(*logmsg)[sb.st_size] = '\0';
7020 done:
7021 	if (fclose(f) == EOF && err == NULL)
7022 		err = got_error_from_errno2("fclose", path);
7023 	if (err) {
7024 		free(*logmsg);
7025 		*logmsg = NULL;
7026 	}
7027 	return err;
7028 	
7029 }
7030 
7031 static const struct got_error *
7032 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7033     void *arg)
7034 {
7035 	char *initial_content = NULL;
7036 	struct got_pathlist_entry *pe;
7037 	const struct got_error *err = NULL;
7038 	char *template = NULL;
7039 	struct collect_commit_logmsg_arg *a = arg;
7040 	int initial_content_len;
7041 	int fd = -1;
7042 	size_t len;
7043 
7044 	/* if a message was specified on the command line, just use it */
7045 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7046 		len = strlen(a->cmdline_log) + 1;
7047 		*logmsg = malloc(len + 1);
7048 		if (*logmsg == NULL)
7049 			return got_error_from_errno("malloc");
7050 		strlcpy(*logmsg, a->cmdline_log, len);
7051 		return NULL;
7052 	} else if (a->prepared_log != NULL && a->non_interactive)
7053 		return read_prepared_logmsg(logmsg, a->prepared_log);
7054 
7055 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7056 		return got_error_from_errno("asprintf");
7057 
7058 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7059 	if (err)
7060 		goto done;
7061 
7062 	if (a->prepared_log) {
7063 		char *msg;
7064 		err = read_prepared_logmsg(&msg, a->prepared_log);
7065 		if (err)
7066 			goto done;
7067 		if (write(fd, msg, strlen(msg)) == -1) {
7068 			err = got_error_from_errno2("write", a->logmsg_path);
7069 			free(msg);
7070 			goto done;
7071 		}
7072 		free(msg);
7073 	}
7074 
7075 	initial_content_len = asprintf(&initial_content,
7076 	    "\n# changes to be committed on branch %s:\n",
7077 	    a->branch_name);
7078 	if (initial_content_len == -1) {
7079 		err = got_error_from_errno("asprintf");
7080 		goto done;
7081 	}
7082 
7083 	if (write(fd, initial_content, initial_content_len) == -1) {
7084 		err = got_error_from_errno2("write", a->logmsg_path);
7085 		goto done;
7086 	}
7087 
7088 	TAILQ_FOREACH(pe, commitable_paths, entry) {
7089 		struct got_commitable *ct = pe->data;
7090 		dprintf(fd, "#  %c  %s\n",
7091 		    got_commitable_get_status(ct),
7092 		    got_commitable_get_path(ct));
7093 	}
7094 
7095 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7096 	    initial_content_len, a->prepared_log ? 0 : 1);
7097 done:
7098 	free(initial_content);
7099 	free(template);
7100 
7101 	if (fd != -1 && close(fd) == -1 && err == NULL)
7102 		err = got_error_from_errno2("close", a->logmsg_path);
7103 
7104 	/* Editor is done; we can now apply unveil(2) */
7105 	if (err == NULL)
7106 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
7107 	if (err) {
7108 		free(*logmsg);
7109 		*logmsg = NULL;
7110 	}
7111 	return err;
7112 }
7113 
7114 static const struct got_error *
7115 cmd_commit(int argc, char *argv[])
7116 {
7117 	const struct got_error *error = NULL;
7118 	struct got_worktree *worktree = NULL;
7119 	struct got_repository *repo = NULL;
7120 	char *cwd = NULL, *id_str = NULL;
7121 	struct got_object_id *id = NULL;
7122 	const char *logmsg = NULL;
7123 	char *prepared_logmsg = NULL;
7124 	struct collect_commit_logmsg_arg cl_arg;
7125 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7126 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7127 	int allow_bad_symlinks = 0, non_interactive = 0;
7128 	struct got_pathlist_head paths;
7129 
7130 	TAILQ_INIT(&paths);
7131 	cl_arg.logmsg_path = NULL;
7132 
7133 	while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7134 		switch (ch) {
7135 		case 'F':
7136 			if (logmsg != NULL)
7137 				option_conflict('F', 'm');
7138 			prepared_logmsg = realpath(optarg, NULL);
7139 			if (prepared_logmsg == NULL)
7140 				return got_error_from_errno2("realpath",
7141 				    optarg);
7142 			break;
7143 		case 'm':
7144 			if (prepared_logmsg)
7145 				option_conflict('m', 'F');
7146 			logmsg = optarg;
7147 			break;
7148 		case 'N':
7149 			non_interactive = 1;
7150 			break;
7151 		case 'S':
7152 			allow_bad_symlinks = 1;
7153 			break;
7154 		default:
7155 			usage_commit();
7156 			/* NOTREACHED */
7157 		}
7158 	}
7159 
7160 	argc -= optind;
7161 	argv += optind;
7162 
7163 #ifndef PROFILE
7164 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7165 	    "unveil", NULL) == -1)
7166 		err(1, "pledge");
7167 #endif
7168 	cwd = getcwd(NULL, 0);
7169 	if (cwd == NULL) {
7170 		error = got_error_from_errno("getcwd");
7171 		goto done;
7172 	}
7173 	error = got_worktree_open(&worktree, cwd);
7174 	if (error) {
7175 		if (error->code == GOT_ERR_NOT_WORKTREE)
7176 			error = wrap_not_worktree_error(error, "commit", cwd);
7177 		goto done;
7178 	}
7179 
7180 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7181 	if (error)
7182 		goto done;
7183 	if (rebase_in_progress) {
7184 		error = got_error(GOT_ERR_REBASING);
7185 		goto done;
7186 	}
7187 
7188 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
7189 	    worktree);
7190 	if (error)
7191 		goto done;
7192 
7193 	error = get_gitconfig_path(&gitconfig_path);
7194 	if (error)
7195 		goto done;
7196 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7197 	    gitconfig_path);
7198 	if (error != NULL)
7199 		goto done;
7200 
7201 	error = get_author(&author, repo, worktree);
7202 	if (error)
7203 		return error;
7204 
7205 	/*
7206 	 * unveil(2) traverses exec(2); if an editor is used we have
7207 	 * to apply unveil after the log message has been written.
7208 	 */
7209 	if (logmsg == NULL || strlen(logmsg) == 0)
7210 		error = get_editor(&editor);
7211 	else
7212 		error = apply_unveil(got_repo_get_path(repo), 0,
7213 		    got_worktree_get_root_path(worktree));
7214 	if (error)
7215 		goto done;
7216 
7217 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7218 	if (error)
7219 		goto done;
7220 
7221 	cl_arg.editor = editor;
7222 	cl_arg.cmdline_log = logmsg;
7223 	cl_arg.prepared_log = prepared_logmsg;
7224 	cl_arg.non_interactive = non_interactive;
7225 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7226 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7227 	if (!histedit_in_progress) {
7228 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7229 			error = got_error(GOT_ERR_COMMIT_BRANCH);
7230 			goto done;
7231 		}
7232 		cl_arg.branch_name += 11;
7233 	}
7234 	cl_arg.repo_path = got_repo_get_path(repo);
7235 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7236 	    allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7237 	    print_status, NULL, repo);
7238 	if (error) {
7239 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7240 		    cl_arg.logmsg_path != NULL)
7241 			preserve_logmsg = 1;
7242 		goto done;
7243 	}
7244 
7245 	error = got_object_id_str(&id_str, id);
7246 	if (error)
7247 		goto done;
7248 	printf("Created commit %s\n", id_str);
7249 done:
7250 	if (preserve_logmsg) {
7251 		fprintf(stderr, "%s: log message preserved in %s\n",
7252 		    getprogname(), cl_arg.logmsg_path);
7253 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7254 	    error == NULL)
7255 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7256 	free(cl_arg.logmsg_path);
7257 	if (repo) {
7258 		const struct got_error *close_err = got_repo_close(repo);
7259 		if (error == NULL)
7260 			error = close_err;
7261 	}
7262 	if (worktree)
7263 		got_worktree_close(worktree);
7264 	free(cwd);
7265 	free(id_str);
7266 	free(gitconfig_path);
7267 	free(editor);
7268 	free(author);
7269 	free(prepared_logmsg);
7270 	return error;
7271 }
7272 
7273 __dead static void
7274 usage_cherrypick(void)
7275 {
7276 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
7277 	exit(1);
7278 }
7279 
7280 static const struct got_error *
7281 cmd_cherrypick(int argc, char *argv[])
7282 {
7283 	const struct got_error *error = NULL;
7284 	struct got_worktree *worktree = NULL;
7285 	struct got_repository *repo = NULL;
7286 	char *cwd = NULL, *commit_id_str = NULL;
7287 	struct got_object_id *commit_id = NULL;
7288 	struct got_commit_object *commit = NULL;
7289 	struct got_object_qid *pid;
7290 	struct got_reference *head_ref = NULL;
7291 	int ch;
7292 	struct got_update_progress_arg upa;
7293 
7294 	while ((ch = getopt(argc, argv, "")) != -1) {
7295 		switch (ch) {
7296 		default:
7297 			usage_cherrypick();
7298 			/* NOTREACHED */
7299 		}
7300 	}
7301 
7302 	argc -= optind;
7303 	argv += optind;
7304 
7305 #ifndef PROFILE
7306 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7307 	    "unveil", NULL) == -1)
7308 		err(1, "pledge");
7309 #endif
7310 	if (argc != 1)
7311 		usage_cherrypick();
7312 
7313 	cwd = getcwd(NULL, 0);
7314 	if (cwd == NULL) {
7315 		error = got_error_from_errno("getcwd");
7316 		goto done;
7317 	}
7318 	error = got_worktree_open(&worktree, cwd);
7319 	if (error) {
7320 		if (error->code == GOT_ERR_NOT_WORKTREE)
7321 			error = wrap_not_worktree_error(error, "cherrypick",
7322 			    cwd);
7323 		goto done;
7324 	}
7325 
7326 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7327 	    NULL);
7328 	if (error != NULL)
7329 		goto done;
7330 
7331 	error = apply_unveil(got_repo_get_path(repo), 0,
7332 	    got_worktree_get_root_path(worktree));
7333 	if (error)
7334 		goto done;
7335 
7336 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7337 	    GOT_OBJ_TYPE_COMMIT, repo);
7338 	if (error != NULL) {
7339 		struct got_reference *ref;
7340 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7341 			goto done;
7342 		error = got_ref_open(&ref, repo, argv[0], 0);
7343 		if (error != NULL)
7344 			goto done;
7345 		error = got_ref_resolve(&commit_id, repo, ref);
7346 		got_ref_close(ref);
7347 		if (error != NULL)
7348 			goto done;
7349 	}
7350 	error = got_object_id_str(&commit_id_str, commit_id);
7351 	if (error)
7352 		goto done;
7353 
7354 	error = got_ref_open(&head_ref, repo,
7355 	    got_worktree_get_head_ref_name(worktree), 0);
7356 	if (error != NULL)
7357 		goto done;
7358 
7359 	error = check_same_branch(commit_id, head_ref, NULL, repo);
7360 	if (error) {
7361 		if (error->code != GOT_ERR_ANCESTRY)
7362 			goto done;
7363 		error = NULL;
7364 	} else {
7365 		error = got_error(GOT_ERR_SAME_BRANCH);
7366 		goto done;
7367 	}
7368 
7369 	error = got_object_open_as_commit(&commit, repo, commit_id);
7370 	if (error)
7371 		goto done;
7372 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7373 	memset(&upa, 0, sizeof(upa));
7374 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7375 	    commit_id, repo, update_progress, &upa, check_cancelled,
7376 	    NULL);
7377 	if (error != NULL)
7378 		goto done;
7379 
7380 	if (upa.did_something)
7381 		printf("Merged commit %s\n", commit_id_str);
7382 	print_update_progress_stats(&upa);
7383 done:
7384 	if (commit)
7385 		got_object_commit_close(commit);
7386 	free(commit_id_str);
7387 	if (head_ref)
7388 		got_ref_close(head_ref);
7389 	if (worktree)
7390 		got_worktree_close(worktree);
7391 	if (repo) {
7392 		const struct got_error *close_err = got_repo_close(repo);
7393 		if (error == NULL)
7394 			error = close_err;
7395 	}
7396 	return error;
7397 }
7398 
7399 __dead static void
7400 usage_backout(void)
7401 {
7402 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7403 	exit(1);
7404 }
7405 
7406 static const struct got_error *
7407 cmd_backout(int argc, char *argv[])
7408 {
7409 	const struct got_error *error = NULL;
7410 	struct got_worktree *worktree = NULL;
7411 	struct got_repository *repo = NULL;
7412 	char *cwd = NULL, *commit_id_str = NULL;
7413 	struct got_object_id *commit_id = NULL;
7414 	struct got_commit_object *commit = NULL;
7415 	struct got_object_qid *pid;
7416 	struct got_reference *head_ref = NULL;
7417 	int ch;
7418 	struct got_update_progress_arg upa;
7419 
7420 	while ((ch = getopt(argc, argv, "")) != -1) {
7421 		switch (ch) {
7422 		default:
7423 			usage_backout();
7424 			/* NOTREACHED */
7425 		}
7426 	}
7427 
7428 	argc -= optind;
7429 	argv += optind;
7430 
7431 #ifndef PROFILE
7432 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7433 	    "unveil", NULL) == -1)
7434 		err(1, "pledge");
7435 #endif
7436 	if (argc != 1)
7437 		usage_backout();
7438 
7439 	cwd = getcwd(NULL, 0);
7440 	if (cwd == NULL) {
7441 		error = got_error_from_errno("getcwd");
7442 		goto done;
7443 	}
7444 	error = got_worktree_open(&worktree, cwd);
7445 	if (error) {
7446 		if (error->code == GOT_ERR_NOT_WORKTREE)
7447 			error = wrap_not_worktree_error(error, "backout", cwd);
7448 		goto done;
7449 	}
7450 
7451 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7452 	    NULL);
7453 	if (error != NULL)
7454 		goto done;
7455 
7456 	error = apply_unveil(got_repo_get_path(repo), 0,
7457 	    got_worktree_get_root_path(worktree));
7458 	if (error)
7459 		goto done;
7460 
7461 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7462 	    GOT_OBJ_TYPE_COMMIT, repo);
7463 	if (error != NULL) {
7464 		struct got_reference *ref;
7465 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7466 			goto done;
7467 		error = got_ref_open(&ref, repo, argv[0], 0);
7468 		if (error != NULL)
7469 			goto done;
7470 		error = got_ref_resolve(&commit_id, repo, ref);
7471 		got_ref_close(ref);
7472 		if (error != NULL)
7473 			goto done;
7474 	}
7475 	error = got_object_id_str(&commit_id_str, commit_id);
7476 	if (error)
7477 		goto done;
7478 
7479 	error = got_ref_open(&head_ref, repo,
7480 	    got_worktree_get_head_ref_name(worktree), 0);
7481 	if (error != NULL)
7482 		goto done;
7483 
7484 	error = check_same_branch(commit_id, head_ref, NULL, repo);
7485 	if (error)
7486 		goto done;
7487 
7488 	error = got_object_open_as_commit(&commit, repo, commit_id);
7489 	if (error)
7490 		goto done;
7491 	pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7492 	if (pid == NULL) {
7493 		error = got_error(GOT_ERR_ROOT_COMMIT);
7494 		goto done;
7495 	}
7496 
7497 	memset(&upa, 0, sizeof(upa));
7498 	error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7499 	    update_progress, &upa, check_cancelled, NULL);
7500 	if (error != NULL)
7501 		goto done;
7502 
7503 	if (upa.did_something)
7504 		printf("Backed out commit %s\n", commit_id_str);
7505 	print_update_progress_stats(&upa);
7506 done:
7507 	if (commit)
7508 		got_object_commit_close(commit);
7509 	free(commit_id_str);
7510 	if (head_ref)
7511 		got_ref_close(head_ref);
7512 	if (worktree)
7513 		got_worktree_close(worktree);
7514 	if (repo) {
7515 		const struct got_error *close_err = got_repo_close(repo);
7516 		if (error == NULL)
7517 			error = close_err;
7518 	}
7519 	return error;
7520 }
7521 
7522 __dead static void
7523 usage_rebase(void)
7524 {
7525 	fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [branch]\n",
7526 	    getprogname());
7527 	exit(1);
7528 }
7529 
7530 void
7531 trim_logmsg(char *logmsg, int limit)
7532 {
7533 	char *nl;
7534 	size_t len;
7535 
7536 	len = strlen(logmsg);
7537 	if (len > limit)
7538 		len = limit;
7539 	logmsg[len] = '\0';
7540 	nl = strchr(logmsg, '\n');
7541 	if (nl)
7542 		*nl = '\0';
7543 }
7544 
7545 static const struct got_error *
7546 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7547 {
7548 	const struct got_error *err;
7549 	char *logmsg0 = NULL;
7550 	const char *s;
7551 
7552 	err = got_object_commit_get_logmsg(&logmsg0, commit);
7553 	if (err)
7554 		return err;
7555 
7556 	s = logmsg0;
7557 	while (isspace((unsigned char)s[0]))
7558 		s++;
7559 
7560 	*logmsg = strdup(s);
7561 	if (*logmsg == NULL) {
7562 		err = got_error_from_errno("strdup");
7563 		goto done;
7564 	}
7565 
7566 	trim_logmsg(*logmsg, limit);
7567 done:
7568 	free(logmsg0);
7569 	return err;
7570 }
7571 
7572 static const struct got_error *
7573 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7574 {
7575 	const struct got_error *err;
7576 	struct got_commit_object *commit = NULL;
7577 	char *id_str = NULL, *logmsg = NULL;
7578 
7579 	err = got_object_open_as_commit(&commit, repo, id);
7580 	if (err)
7581 		return err;
7582 
7583 	err = got_object_id_str(&id_str, id);
7584 	if (err)
7585 		goto done;
7586 
7587 	id_str[12] = '\0';
7588 
7589 	err = get_short_logmsg(&logmsg, 42, commit);
7590 	if (err)
7591 		goto done;
7592 
7593 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
7594 done:
7595 	free(id_str);
7596 	got_object_commit_close(commit);
7597 	free(logmsg);
7598 	return err;
7599 }
7600 
7601 static const struct got_error *
7602 show_rebase_progress(struct got_commit_object *commit,
7603     struct got_object_id *old_id, struct got_object_id *new_id)
7604 {
7605 	const struct got_error *err;
7606 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7607 
7608 	err = got_object_id_str(&old_id_str, old_id);
7609 	if (err)
7610 		goto done;
7611 
7612 	if (new_id) {
7613 		err = got_object_id_str(&new_id_str, new_id);
7614 		if (err)
7615 			goto done;
7616 	}
7617 
7618 	old_id_str[12] = '\0';
7619 	if (new_id_str)
7620 		new_id_str[12] = '\0';
7621 
7622 	err = get_short_logmsg(&logmsg, 42, commit);
7623 	if (err)
7624 		goto done;
7625 
7626 	printf("%s -> %s: %s\n", old_id_str,
7627 	    new_id_str ? new_id_str : "no-op change", logmsg);
7628 done:
7629 	free(old_id_str);
7630 	free(new_id_str);
7631 	free(logmsg);
7632 	return err;
7633 }
7634 
7635 static const struct got_error *
7636 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7637     struct got_reference *branch, struct got_reference *new_base_branch,
7638     struct got_reference *tmp_branch, struct got_repository *repo,
7639     int create_backup)
7640 {
7641 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
7642 	return got_worktree_rebase_complete(worktree, fileindex,
7643 	    new_base_branch, tmp_branch, branch, repo, create_backup);
7644 }
7645 
7646 static const struct got_error *
7647 rebase_commit(struct got_pathlist_head *merged_paths,
7648     struct got_worktree *worktree, struct got_fileindex *fileindex,
7649     struct got_reference *tmp_branch,
7650     struct got_object_id *commit_id, struct got_repository *repo)
7651 {
7652 	const struct got_error *error;
7653 	struct got_commit_object *commit;
7654 	struct got_object_id *new_commit_id;
7655 
7656 	error = got_object_open_as_commit(&commit, repo, commit_id);
7657 	if (error)
7658 		return error;
7659 
7660 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7661 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
7662 	if (error) {
7663 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7664 			goto done;
7665 		error = show_rebase_progress(commit, commit_id, NULL);
7666 	} else {
7667 		error = show_rebase_progress(commit, commit_id, new_commit_id);
7668 		free(new_commit_id);
7669 	}
7670 done:
7671 	got_object_commit_close(commit);
7672 	return error;
7673 }
7674 
7675 struct check_path_prefix_arg {
7676 	const char *path_prefix;
7677 	size_t len;
7678 	int errcode;
7679 };
7680 
7681 static const struct got_error *
7682 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7683     struct got_blob_object *blob2, struct got_object_id *id1,
7684     struct got_object_id *id2, const char *path1, const char *path2,
7685     mode_t mode1, mode_t mode2, struct got_repository *repo)
7686 {
7687 	struct check_path_prefix_arg *a = arg;
7688 
7689 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7690 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7691 		return got_error(a->errcode);
7692 
7693 	return NULL;
7694 }
7695 
7696 static const struct got_error *
7697 check_path_prefix(struct got_object_id *parent_id,
7698     struct got_object_id *commit_id, const char *path_prefix,
7699     int errcode, struct got_repository *repo)
7700 {
7701 	const struct got_error *err;
7702 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7703 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
7704 	struct check_path_prefix_arg cpp_arg;
7705 
7706 	if (got_path_is_root_dir(path_prefix))
7707 		return NULL;
7708 
7709 	err = got_object_open_as_commit(&commit, repo, commit_id);
7710 	if (err)
7711 		goto done;
7712 
7713 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7714 	if (err)
7715 		goto done;
7716 
7717 	err = got_object_open_as_tree(&tree1, repo,
7718 	    got_object_commit_get_tree_id(parent_commit));
7719 	if (err)
7720 		goto done;
7721 
7722 	err = got_object_open_as_tree(&tree2, repo,
7723 	    got_object_commit_get_tree_id(commit));
7724 	if (err)
7725 		goto done;
7726 
7727 	cpp_arg.path_prefix = path_prefix;
7728 	while (cpp_arg.path_prefix[0] == '/')
7729 		cpp_arg.path_prefix++;
7730 	cpp_arg.len = strlen(cpp_arg.path_prefix);
7731 	cpp_arg.errcode = errcode;
7732 	err = got_diff_tree(tree1, tree2, "", "", repo,
7733 	    check_path_prefix_in_diff, &cpp_arg, 0);
7734 done:
7735 	if (tree1)
7736 		got_object_tree_close(tree1);
7737 	if (tree2)
7738 		got_object_tree_close(tree2);
7739 	if (commit)
7740 		got_object_commit_close(commit);
7741 	if (parent_commit)
7742 		got_object_commit_close(parent_commit);
7743 	return err;
7744 }
7745 
7746 static const struct got_error *
7747 collect_commits(struct got_object_id_queue *commits,
7748     struct got_object_id *initial_commit_id,
7749     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7750     const char *path_prefix, int path_prefix_errcode,
7751     struct got_repository *repo)
7752 {
7753 	const struct got_error *err = NULL;
7754 	struct got_commit_graph *graph = NULL;
7755 	struct got_object_id *parent_id = NULL;
7756 	struct got_object_qid *qid;
7757         struct got_object_id *commit_id = initial_commit_id;
7758 
7759 	err = got_commit_graph_open(&graph, "/", 1);
7760 	if (err)
7761 		return err;
7762 
7763 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7764 	    check_cancelled, NULL);
7765 	if (err)
7766 		goto done;
7767 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7768 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
7769 		    check_cancelled, NULL);
7770 		if (err) {
7771 			if (err->code == GOT_ERR_ITER_COMPLETED) {
7772 				err = got_error_msg(GOT_ERR_ANCESTRY,
7773 				    "ran out of commits to rebase before "
7774 				    "youngest common ancestor commit has "
7775 				    "been reached?!?");
7776 			}
7777 			goto done;
7778 		} else {
7779 			err = check_path_prefix(parent_id, commit_id,
7780 			    path_prefix, path_prefix_errcode, repo);
7781 			if (err)
7782 				goto done;
7783 
7784 			err = got_object_qid_alloc(&qid, commit_id);
7785 			if (err)
7786 				goto done;
7787 			SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7788 			commit_id = parent_id;
7789 		}
7790 	}
7791 done:
7792 	got_commit_graph_close(graph);
7793 	return err;
7794 }
7795 
7796 static const struct got_error *
7797 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
7798 {
7799 	const struct got_error *err = NULL;
7800 	time_t committer_time;
7801 	struct tm tm;
7802 	char datebuf[11]; /* YYYY-MM-DD + NUL */
7803 	char *author0 = NULL, *author, *smallerthan;
7804 	char *logmsg0 = NULL, *logmsg, *newline;
7805 
7806 	committer_time = got_object_commit_get_committer_time(commit);
7807 	if (localtime_r(&committer_time, &tm) == NULL)
7808 		return got_error_from_errno("localtime_r");
7809 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
7810 		return got_error(GOT_ERR_NO_SPACE);
7811 
7812 	author0 = strdup(got_object_commit_get_author(commit));
7813 	if (author0 == NULL)
7814 		return got_error_from_errno("strdup");
7815 	author = author0;
7816 	smallerthan = strchr(author, '<');
7817 	if (smallerthan && smallerthan[1] != '\0')
7818 		author = smallerthan + 1;
7819 	author[strcspn(author, "@>")] = '\0';
7820 
7821 	err = got_object_commit_get_logmsg(&logmsg0, commit);
7822 	if (err)
7823 		goto done;
7824 	logmsg = logmsg0;
7825 	while (*logmsg == '\n')
7826 		logmsg++;
7827 	newline = strchr(logmsg, '\n');
7828 	if (newline)
7829 		*newline = '\0';
7830 
7831 	if (asprintf(brief_str, "%s %s  %s",
7832 	    datebuf, author, logmsg) == -1)
7833 		err = got_error_from_errno("asprintf");
7834 done:
7835 	free(author0);
7836 	free(logmsg0);
7837 	return err;
7838 }
7839 
7840 static const struct got_error *
7841 print_backup_ref(const char *branch_name, const char *new_id_str,
7842     struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
7843     struct got_reflist_object_id_map *refs_idmap,
7844     struct got_repository *repo)
7845 {
7846 	const struct got_error *err = NULL;
7847 	struct got_reflist_head *refs;
7848 	char *refs_str = NULL;
7849 	struct got_object_id *new_commit_id = NULL;
7850 	struct got_commit_object *new_commit = NULL;
7851 	char *new_commit_brief_str = NULL;
7852 	struct got_object_id *yca_id = NULL;
7853 	struct got_commit_object *yca_commit = NULL;
7854 	char *yca_id_str = NULL, *yca_brief_str = NULL;
7855 	char *custom_refs_str;
7856 
7857 	if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
7858 		return got_error_from_errno("asprintf");
7859 
7860 	err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
7861 	    0, 0, refs_idmap, custom_refs_str);
7862 	if (err)
7863 		goto done;
7864 
7865 	err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
7866 	if (err)
7867 		goto done;
7868 
7869 	refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
7870 	if (refs) {
7871 		err = build_refs_str(&refs_str, refs, new_commit_id, repo);
7872 		if (err)
7873 			goto done;
7874 	}
7875 
7876 	err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
7877 	if (err)
7878 		goto done;
7879 
7880 	err = get_commit_brief_str(&new_commit_brief_str, new_commit);
7881 	if (err)
7882 		goto done;
7883 
7884 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7885 	    old_commit_id, new_commit_id, repo, check_cancelled, NULL);
7886 	if (err)
7887 		goto done;
7888 
7889 	printf("has become commit %s%s%s%s\n %s\n", new_id_str,
7890 	    refs_str ? " (" : "", refs_str ? refs_str : "",
7891 	    refs_str ? ")" : "", new_commit_brief_str);
7892 	if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
7893 	    got_object_id_cmp(yca_id, old_commit_id) != 0) {
7894 		free(refs_str);
7895 		refs_str = NULL;
7896 
7897 		err = got_object_open_as_commit(&yca_commit, repo, yca_id);
7898 		if (err)
7899 			goto done;
7900 
7901 		err = get_commit_brief_str(&yca_brief_str, yca_commit);
7902 		if (err)
7903 			goto done;
7904 
7905 		err = got_object_id_str(&yca_id_str, yca_id);
7906 		if (err)
7907 			goto done;
7908 
7909 		refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
7910 		if (refs) {
7911 			err = build_refs_str(&refs_str, refs, yca_id, repo);
7912 			if (err)
7913 				goto done;
7914 		}
7915 		printf("history forked at %s%s%s%s\n %s\n",
7916 		    yca_id_str,
7917 		    refs_str ? " (" : "", refs_str ? refs_str : "",
7918 		    refs_str ? ")" : "", yca_brief_str);
7919 	}
7920 done:
7921 	free(custom_refs_str);
7922 	free(new_commit_id);
7923 	free(refs_str);
7924 	free(yca_id);
7925 	free(yca_id_str);
7926 	free(yca_brief_str);
7927 	if (new_commit)
7928 		got_object_commit_close(new_commit);
7929 	if (yca_commit)
7930 		got_object_commit_close(yca_commit);
7931 
7932 	return NULL;
7933 }
7934 
7935 static const struct got_error *
7936 list_backup_refs(const char *backup_ref_prefix, const char *wanted_branch_name,
7937     struct got_repository *repo)
7938 {
7939 	const struct got_error *err;
7940 	struct got_reflist_head refs, backup_refs;
7941 	struct got_reflist_entry *re;
7942 	const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
7943 	struct got_object_id *old_commit_id = NULL;
7944 	char *branch_name = NULL;
7945 	struct got_commit_object *old_commit = NULL;
7946 	struct got_reflist_object_id_map *refs_idmap = NULL;
7947 	int wanted_branch_found = 0;
7948 
7949 	TAILQ_INIT(&refs);
7950 	TAILQ_INIT(&backup_refs);
7951 
7952 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7953 	if (err)
7954 		return err;
7955 
7956 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
7957 	if (err)
7958 		goto done;
7959 
7960 	if (wanted_branch_name) {
7961 		if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
7962 			wanted_branch_name += 11;
7963 	}
7964 
7965 	err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
7966 	    got_ref_cmp_by_commit_timestamp_descending, repo);
7967 	if (err)
7968 		goto done;
7969 
7970 	TAILQ_FOREACH(re, &backup_refs, entry) {
7971 		const char *refname = got_ref_get_name(re->ref);
7972 		char *slash;
7973 
7974 		err = got_ref_resolve(&old_commit_id, repo, re->ref);
7975 		if (err)
7976 			break;
7977 
7978 		err = got_object_open_as_commit(&old_commit, repo,
7979 		    old_commit_id);
7980 		if (err)
7981 			break;
7982 
7983 		if (strncmp(backup_ref_prefix, refname,
7984 		    backup_ref_prefix_len) == 0)
7985 			refname += backup_ref_prefix_len;
7986 
7987 		while (refname[0] == '/')
7988 			refname++;
7989 
7990 		branch_name = strdup(refname);
7991 		if (branch_name == NULL) {
7992 			err = got_error_from_errno("strdup");
7993 			break;
7994 		}
7995 		slash = strrchr(branch_name, '/');
7996 		if (slash) {
7997 			*slash = '\0';
7998 			refname += strlen(branch_name) + 1;
7999 		}
8000 
8001 		if (wanted_branch_name == NULL ||
8002 		    strcmp(wanted_branch_name, branch_name) == 0) {
8003 			wanted_branch_found = 1;
8004 			err = print_backup_ref(branch_name, refname,
8005 			   old_commit_id, old_commit, refs_idmap, repo);
8006 			if (err)
8007 				break;
8008 		}
8009 
8010 		free(old_commit_id);
8011 		old_commit_id = NULL;
8012 		free(branch_name);
8013 		branch_name = NULL;
8014 		got_object_commit_close(old_commit);
8015 		old_commit = NULL;
8016 	}
8017 
8018 	if (wanted_branch_name && !wanted_branch_found) {
8019 		err = got_error_fmt(GOT_ERR_NOT_REF,
8020 		    "%s/%s/", backup_ref_prefix, wanted_branch_name);
8021 	}
8022 done:
8023 	if (refs_idmap)
8024 		got_reflist_object_id_map_free(refs_idmap);
8025 	got_ref_list_free(&refs);
8026 	got_ref_list_free(&backup_refs);
8027 	free(old_commit_id);
8028 	free(branch_name);
8029 	if (old_commit)
8030 		got_object_commit_close(old_commit);
8031 	return err;
8032 }
8033 
8034 static const struct got_error *
8035 cmd_rebase(int argc, char *argv[])
8036 {
8037 	const struct got_error *error = NULL;
8038 	struct got_worktree *worktree = NULL;
8039 	struct got_repository *repo = NULL;
8040 	struct got_fileindex *fileindex = NULL;
8041 	char *cwd = NULL;
8042 	struct got_reference *branch = NULL;
8043 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
8044 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
8045 	struct got_object_id *resume_commit_id = NULL;
8046 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
8047 	struct got_commit_object *commit = NULL;
8048 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
8049 	int histedit_in_progress = 0, create_backup = 1, list_backups = 0;
8050 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8051 	struct got_object_id_queue commits;
8052 	struct got_pathlist_head merged_paths;
8053 	const struct got_object_id_queue *parent_ids;
8054 	struct got_object_qid *qid, *pid;
8055 
8056 	SIMPLEQ_INIT(&commits);
8057 	TAILQ_INIT(&merged_paths);
8058 
8059 	while ((ch = getopt(argc, argv, "acl")) != -1) {
8060 		switch (ch) {
8061 		case 'a':
8062 			abort_rebase = 1;
8063 			break;
8064 		case 'c':
8065 			continue_rebase = 1;
8066 			break;
8067 		case 'l':
8068 			list_backups = 1;
8069 			break;
8070 		default:
8071 			usage_rebase();
8072 			/* NOTREACHED */
8073 		}
8074 	}
8075 
8076 	argc -= optind;
8077 	argv += optind;
8078 
8079 #ifndef PROFILE
8080 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8081 	    "unveil", NULL) == -1)
8082 		err(1, "pledge");
8083 #endif
8084 	if (list_backups) {
8085 		if (abort_rebase)
8086 			option_conflict('l', 'a');
8087 		if (continue_rebase)
8088 			option_conflict('l', 'c');
8089 		if (argc != 0 && argc != 1)
8090 			usage_rebase();
8091 	} else {
8092 		if (abort_rebase && continue_rebase)
8093 			usage_rebase();
8094 		else if (abort_rebase || continue_rebase) {
8095 			if (argc != 0)
8096 				usage_rebase();
8097 		} else if (argc != 1)
8098 			usage_rebase();
8099 	}
8100 
8101 	cwd = getcwd(NULL, 0);
8102 	if (cwd == NULL) {
8103 		error = got_error_from_errno("getcwd");
8104 		goto done;
8105 	}
8106 	error = got_worktree_open(&worktree, cwd);
8107 	if (error) {
8108 		if (list_backups) {
8109 			if (error->code != GOT_ERR_NOT_WORKTREE)
8110 				goto done;
8111 		} else {
8112 			if (error->code == GOT_ERR_NOT_WORKTREE)
8113 				error = wrap_not_worktree_error(error,
8114 				    "rebase", cwd);
8115 			goto done;
8116 		}
8117 	}
8118 
8119 	error = got_repo_open(&repo,
8120 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
8121 	if (error != NULL)
8122 		goto done;
8123 
8124 	error = apply_unveil(got_repo_get_path(repo), 0,
8125 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
8126 	if (error)
8127 		goto done;
8128 
8129 	if (list_backups) {
8130 		error = list_backup_refs(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
8131 		    argc == 1 ? argv[0] : NULL, repo);
8132 		goto done; /* nothing else to do */
8133 	}
8134 
8135 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
8136 	    worktree);
8137 	if (error)
8138 		goto done;
8139 	if (histedit_in_progress) {
8140 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
8141 		goto done;
8142 	}
8143 
8144 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8145 	if (error)
8146 		goto done;
8147 
8148 	if (abort_rebase) {
8149 		struct got_update_progress_arg upa;
8150 		if (!rebase_in_progress) {
8151 			error = got_error(GOT_ERR_NOT_REBASING);
8152 			goto done;
8153 		}
8154 		error = got_worktree_rebase_continue(&resume_commit_id,
8155 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
8156 		    worktree, repo);
8157 		if (error)
8158 			goto done;
8159 		printf("Switching work tree to %s\n",
8160 		    got_ref_get_symref_target(new_base_branch));
8161 		memset(&upa, 0, sizeof(upa));
8162 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
8163 		    new_base_branch, update_progress, &upa);
8164 		if (error)
8165 			goto done;
8166 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
8167 		print_update_progress_stats(&upa);
8168 		goto done; /* nothing else to do */
8169 	}
8170 
8171 	if (continue_rebase) {
8172 		if (!rebase_in_progress) {
8173 			error = got_error(GOT_ERR_NOT_REBASING);
8174 			goto done;
8175 		}
8176 		error = got_worktree_rebase_continue(&resume_commit_id,
8177 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
8178 		    worktree, repo);
8179 		if (error)
8180 			goto done;
8181 
8182 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
8183 		    resume_commit_id, repo);
8184 		if (error)
8185 			goto done;
8186 
8187 		yca_id = got_object_id_dup(resume_commit_id);
8188 		if (yca_id == NULL) {
8189 			error = got_error_from_errno("got_object_id_dup");
8190 			goto done;
8191 		}
8192 	} else {
8193 		error = got_ref_open(&branch, repo, argv[0], 0);
8194 		if (error != NULL)
8195 			goto done;
8196 	}
8197 
8198 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
8199 	if (error)
8200 		goto done;
8201 
8202 	if (!continue_rebase) {
8203 		struct got_object_id *base_commit_id;
8204 
8205 		base_commit_id = got_worktree_get_base_commit_id(worktree);
8206 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
8207 		    base_commit_id, branch_head_commit_id, repo,
8208 		    check_cancelled, NULL);
8209 		if (error)
8210 			goto done;
8211 		if (yca_id == NULL) {
8212 			error = got_error_msg(GOT_ERR_ANCESTRY,
8213 			    "specified branch shares no common ancestry "
8214 			    "with work tree's branch");
8215 			goto done;
8216 		}
8217 
8218 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
8219 		if (error) {
8220 			if (error->code != GOT_ERR_ANCESTRY)
8221 				goto done;
8222 			error = NULL;
8223 		} else {
8224 			static char msg[128];
8225 			snprintf(msg, sizeof(msg),
8226 			    "%s is already based on %s",
8227 			    got_ref_get_name(branch),
8228 			    got_worktree_get_head_ref_name(worktree));
8229 			error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
8230 			goto done;
8231 		}
8232 		error = got_worktree_rebase_prepare(&new_base_branch,
8233 		    &tmp_branch, &fileindex, worktree, branch, repo);
8234 		if (error)
8235 			goto done;
8236 	}
8237 
8238 	commit_id = branch_head_commit_id;
8239 	error = got_object_open_as_commit(&commit, repo, commit_id);
8240 	if (error)
8241 		goto done;
8242 
8243 	parent_ids = got_object_commit_get_parent_ids(commit);
8244 	pid = SIMPLEQ_FIRST(parent_ids);
8245 	if (pid == NULL) {
8246 		if (!continue_rebase) {
8247 			struct got_update_progress_arg upa;
8248 			memset(&upa, 0, sizeof(upa));
8249 			error = got_worktree_rebase_abort(worktree, fileindex,
8250 			    repo, new_base_branch, update_progress, &upa);
8251 			if (error)
8252 				goto done;
8253 			printf("Rebase of %s aborted\n",
8254 			    got_ref_get_name(branch));
8255 			print_update_progress_stats(&upa);
8256 
8257 		}
8258 		error = got_error(GOT_ERR_EMPTY_REBASE);
8259 		goto done;
8260 	}
8261 	error = collect_commits(&commits, commit_id, pid->id,
8262 	    yca_id, got_worktree_get_path_prefix(worktree),
8263 	    GOT_ERR_REBASE_PATH, repo);
8264 	got_object_commit_close(commit);
8265 	commit = NULL;
8266 	if (error)
8267 		goto done;
8268 
8269 	if (SIMPLEQ_EMPTY(&commits)) {
8270 		if (continue_rebase) {
8271 			error = rebase_complete(worktree, fileindex,
8272 			    branch, new_base_branch, tmp_branch, repo,
8273 			    create_backup);
8274 			goto done;
8275 		} else {
8276 			/* Fast-forward the reference of the branch. */
8277 			struct got_object_id *new_head_commit_id;
8278 			char *id_str;
8279 			error = got_ref_resolve(&new_head_commit_id, repo,
8280 			    new_base_branch);
8281 			if (error)
8282 				goto done;
8283 			error = got_object_id_str(&id_str, new_head_commit_id);
8284 			printf("Forwarding %s to commit %s\n",
8285 			    got_ref_get_name(branch), id_str);
8286 			free(id_str);
8287 			error = got_ref_change_ref(branch,
8288 			    new_head_commit_id);
8289 			if (error)
8290 				goto done;
8291 			/* No backup needed since objects did not change. */
8292 			create_backup = 0;
8293 		}
8294 	}
8295 
8296 	pid = NULL;
8297 	SIMPLEQ_FOREACH(qid, &commits, entry) {
8298 		struct got_update_progress_arg upa;
8299 
8300 		commit_id = qid->id;
8301 		parent_id = pid ? pid->id : yca_id;
8302 		pid = qid;
8303 
8304 		memset(&upa, 0, sizeof(upa));
8305 		error = got_worktree_rebase_merge_files(&merged_paths,
8306 		    worktree, fileindex, parent_id, commit_id, repo,
8307 		    update_progress, &upa, check_cancelled, NULL);
8308 		if (error)
8309 			goto done;
8310 
8311 		print_update_progress_stats(&upa);
8312 		if (upa.conflicts > 0)
8313 			rebase_status = GOT_STATUS_CONFLICT;
8314 
8315 		if (rebase_status == GOT_STATUS_CONFLICT) {
8316 			error = show_rebase_merge_conflict(qid->id, repo);
8317 			if (error)
8318 				goto done;
8319 			got_worktree_rebase_pathlist_free(&merged_paths);
8320 			break;
8321 		}
8322 
8323 		error = rebase_commit(&merged_paths, worktree, fileindex,
8324 		    tmp_branch, commit_id, repo);
8325 		got_worktree_rebase_pathlist_free(&merged_paths);
8326 		if (error)
8327 			goto done;
8328 	}
8329 
8330 	if (rebase_status == GOT_STATUS_CONFLICT) {
8331 		error = got_worktree_rebase_postpone(worktree, fileindex);
8332 		if (error)
8333 			goto done;
8334 		error = got_error_msg(GOT_ERR_CONFLICTS,
8335 		    "conflicts must be resolved before rebasing can continue");
8336 	} else
8337 		error = rebase_complete(worktree, fileindex, branch,
8338 		    new_base_branch, tmp_branch, repo, create_backup);
8339 done:
8340 	got_object_id_queue_free(&commits);
8341 	free(branch_head_commit_id);
8342 	free(resume_commit_id);
8343 	free(yca_id);
8344 	if (commit)
8345 		got_object_commit_close(commit);
8346 	if (branch)
8347 		got_ref_close(branch);
8348 	if (new_base_branch)
8349 		got_ref_close(new_base_branch);
8350 	if (tmp_branch)
8351 		got_ref_close(tmp_branch);
8352 	if (worktree)
8353 		got_worktree_close(worktree);
8354 	if (repo) {
8355 		const struct got_error *close_err = got_repo_close(repo);
8356 		if (error == NULL)
8357 			error = close_err;
8358 	}
8359 	return error;
8360 }
8361 
8362 __dead static void
8363 usage_histedit(void)
8364 {
8365 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] "
8366 	    "[-F histedit-script] [-m] [-l] [branch]\n", getprogname());
8367 	exit(1);
8368 }
8369 
8370 #define GOT_HISTEDIT_PICK 'p'
8371 #define GOT_HISTEDIT_EDIT 'e'
8372 #define GOT_HISTEDIT_FOLD 'f'
8373 #define GOT_HISTEDIT_DROP 'd'
8374 #define GOT_HISTEDIT_MESG 'm'
8375 
8376 static struct got_histedit_cmd {
8377 	unsigned char code;
8378 	const char *name;
8379 	const char *desc;
8380 } got_histedit_cmds[] = {
8381 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
8382 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
8383 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
8384 	    "be used" },
8385 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
8386 	{ GOT_HISTEDIT_MESG, "mesg",
8387 	    "single-line log message for commit above (open editor if empty)" },
8388 };
8389 
8390 struct got_histedit_list_entry {
8391 	TAILQ_ENTRY(got_histedit_list_entry) entry;
8392 	struct got_object_id *commit_id;
8393 	const struct got_histedit_cmd *cmd;
8394 	char *logmsg;
8395 };
8396 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
8397 
8398 static const struct got_error *
8399 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
8400     FILE *f, struct got_repository *repo)
8401 {
8402 	const struct got_error *err = NULL;
8403 	char *logmsg = NULL, *id_str = NULL;
8404 	struct got_commit_object *commit = NULL;
8405 	int n;
8406 
8407 	err = got_object_open_as_commit(&commit, repo, commit_id);
8408 	if (err)
8409 		goto done;
8410 
8411 	err = get_short_logmsg(&logmsg, 34, commit);
8412 	if (err)
8413 		goto done;
8414 
8415 	err = got_object_id_str(&id_str, commit_id);
8416 	if (err)
8417 		goto done;
8418 
8419 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
8420 	if (n < 0)
8421 		err = got_ferror(f, GOT_ERR_IO);
8422 done:
8423 	if (commit)
8424 		got_object_commit_close(commit);
8425 	free(id_str);
8426 	free(logmsg);
8427 	return err;
8428 }
8429 
8430 static const struct got_error *
8431 histedit_write_commit_list(struct got_object_id_queue *commits,
8432     FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
8433 {
8434 	const struct got_error *err = NULL;
8435 	struct got_object_qid *qid;
8436 	const char *histedit_cmd = NULL;
8437 
8438 	if (SIMPLEQ_EMPTY(commits))
8439 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
8440 
8441 	SIMPLEQ_FOREACH(qid, commits, entry) {
8442 		histedit_cmd = got_histedit_cmds[0].name;
8443 		if (fold_only && SIMPLEQ_NEXT(qid, entry) != NULL)
8444 			histedit_cmd = "fold";
8445 		err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
8446 		if (err)
8447 			break;
8448 		if (edit_logmsg_only) {
8449 			int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
8450 			if (n < 0) {
8451 				err = got_ferror(f, GOT_ERR_IO);
8452 				break;
8453 			}
8454 		}
8455 	}
8456 
8457 	return err;
8458 }
8459 
8460 static const struct got_error *
8461 write_cmd_list(FILE *f, const char *branch_name,
8462     struct got_object_id_queue *commits)
8463 {
8464 	const struct got_error *err = NULL;
8465 	size_t i;
8466 	int n;
8467 	char *id_str;
8468 	struct got_object_qid *qid;
8469 
8470 	qid = SIMPLEQ_FIRST(commits);
8471 	err = got_object_id_str(&id_str, qid->id);
8472 	if (err)
8473 		return err;
8474 
8475 	n = fprintf(f,
8476 	    "# Editing the history of branch '%s' starting at\n"
8477 	    "# commit %s\n"
8478 	    "# Commits will be processed in order from top to "
8479 	    "bottom of this file.\n", branch_name, id_str);
8480 	if (n < 0) {
8481 		err = got_ferror(f, GOT_ERR_IO);
8482 		goto done;
8483 	}
8484 
8485 	n = fprintf(f, "# Available histedit commands:\n");
8486 	if (n < 0) {
8487 		err = got_ferror(f, GOT_ERR_IO);
8488 		goto done;
8489 	}
8490 
8491 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
8492 		struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
8493 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
8494 		    cmd->desc);
8495 		if (n < 0) {
8496 			err = got_ferror(f, GOT_ERR_IO);
8497 			break;
8498 		}
8499 	}
8500 done:
8501 	free(id_str);
8502 	return err;
8503 }
8504 
8505 static const struct got_error *
8506 histedit_syntax_error(int lineno)
8507 {
8508 	static char msg[42];
8509 	int ret;
8510 
8511 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
8512 	    lineno);
8513 	if (ret == -1 || ret >= sizeof(msg))
8514 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
8515 
8516 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
8517 }
8518 
8519 static const struct got_error *
8520 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
8521     char *logmsg, struct got_repository *repo)
8522 {
8523 	const struct got_error *err;
8524 	struct got_commit_object *folded_commit = NULL;
8525 	char *id_str, *folded_logmsg = NULL;
8526 
8527 	err = got_object_id_str(&id_str, hle->commit_id);
8528 	if (err)
8529 		return err;
8530 
8531 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
8532 	if (err)
8533 		goto done;
8534 
8535 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
8536 	if (err)
8537 		goto done;
8538 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
8539 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
8540 	    folded_logmsg) == -1) {
8541 		err = got_error_from_errno("asprintf");
8542 	}
8543 done:
8544 	if (folded_commit)
8545 		got_object_commit_close(folded_commit);
8546 	free(id_str);
8547 	free(folded_logmsg);
8548 	return err;
8549 }
8550 
8551 static struct got_histedit_list_entry *
8552 get_folded_commits(struct got_histedit_list_entry *hle)
8553 {
8554 	struct got_histedit_list_entry *prev, *folded = NULL;
8555 
8556 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
8557 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
8558 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
8559 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
8560 			folded = prev;
8561 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
8562 	}
8563 
8564 	return folded;
8565 }
8566 
8567 static const struct got_error *
8568 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
8569     struct got_repository *repo)
8570 {
8571 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
8572 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
8573 	const struct got_error *err = NULL;
8574 	struct got_commit_object *commit = NULL;
8575 	int logmsg_len;
8576 	int fd;
8577 	struct got_histedit_list_entry *folded = NULL;
8578 
8579 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8580 	if (err)
8581 		return err;
8582 
8583 	folded = get_folded_commits(hle);
8584 	if (folded) {
8585 		while (folded != hle) {
8586 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
8587 				folded = TAILQ_NEXT(folded, entry);
8588 				continue;
8589 			}
8590 			err = append_folded_commit_msg(&new_msg, folded,
8591 			    logmsg, repo);
8592 			if (err)
8593 				goto done;
8594 			free(logmsg);
8595 			logmsg = new_msg;
8596 			folded = TAILQ_NEXT(folded, entry);
8597 		}
8598 	}
8599 
8600 	err = got_object_id_str(&id_str, hle->commit_id);
8601 	if (err)
8602 		goto done;
8603 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8604 	if (err)
8605 		goto done;
8606 	logmsg_len = asprintf(&new_msg,
8607 	    "%s\n# original log message of commit %s: %s",
8608 	    logmsg ? logmsg : "", id_str, orig_logmsg);
8609 	if (logmsg_len == -1) {
8610 		err = got_error_from_errno("asprintf");
8611 		goto done;
8612 	}
8613 	free(logmsg);
8614 	logmsg = new_msg;
8615 
8616 	err = got_object_id_str(&id_str, hle->commit_id);
8617 	if (err)
8618 		goto done;
8619 
8620 	err = got_opentemp_named_fd(&logmsg_path, &fd,
8621 	    GOT_TMPDIR_STR "/got-logmsg");
8622 	if (err)
8623 		goto done;
8624 
8625 	write(fd, logmsg, logmsg_len);
8626 	close(fd);
8627 
8628 	err = get_editor(&editor);
8629 	if (err)
8630 		goto done;
8631 
8632 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8633 	    logmsg_len, 0);
8634 	if (err) {
8635 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8636 			goto done;
8637 		err = NULL;
8638 		hle->logmsg = strdup(new_msg);
8639 		if (hle->logmsg == NULL)
8640 			err = got_error_from_errno("strdup");
8641 	}
8642 done:
8643 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8644 		err = got_error_from_errno2("unlink", logmsg_path);
8645 	free(logmsg_path);
8646 	free(logmsg);
8647 	free(orig_logmsg);
8648 	free(editor);
8649 	if (commit)
8650 		got_object_commit_close(commit);
8651 	return err;
8652 }
8653 
8654 static const struct got_error *
8655 histedit_parse_list(struct got_histedit_list *histedit_cmds,
8656     FILE *f, struct got_repository *repo)
8657 {
8658 	const struct got_error *err = NULL;
8659 	char *line = NULL, *p, *end;
8660 	size_t i, size;
8661 	ssize_t len;
8662 	int lineno = 0;
8663 	const struct got_histedit_cmd *cmd;
8664 	struct got_object_id *commit_id = NULL;
8665 	struct got_histedit_list_entry *hle = NULL;
8666 
8667 	for (;;) {
8668 		len = getline(&line, &size, f);
8669 		if (len == -1) {
8670 			const struct got_error *getline_err;
8671 			if (feof(f))
8672 				break;
8673 			getline_err = got_error_from_errno("getline");
8674 			err = got_ferror(f, getline_err->code);
8675 			break;
8676 		}
8677 		lineno++;
8678 		p = line;
8679 		while (isspace((unsigned char)p[0]))
8680 			p++;
8681 		if (p[0] == '#' || p[0] == '\0') {
8682 			free(line);
8683 			line = NULL;
8684 			continue;
8685 		}
8686 		cmd = NULL;
8687 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
8688 			cmd = &got_histedit_cmds[i];
8689 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8690 			    isspace((unsigned char)p[strlen(cmd->name)])) {
8691 				p += strlen(cmd->name);
8692 				break;
8693 			}
8694 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8695 				p++;
8696 				break;
8697 			}
8698 		}
8699 		if (i == nitems(got_histedit_cmds)) {
8700 			err = histedit_syntax_error(lineno);
8701 			break;
8702 		}
8703 		while (isspace((unsigned char)p[0]))
8704 			p++;
8705 		if (cmd->code == GOT_HISTEDIT_MESG) {
8706 			if (hle == NULL || hle->logmsg != NULL) {
8707 				err = got_error(GOT_ERR_HISTEDIT_CMD);
8708 				break;
8709 			}
8710 			if (p[0] == '\0') {
8711 				err = histedit_edit_logmsg(hle, repo);
8712 				if (err)
8713 					break;
8714 			} else {
8715 				hle->logmsg = strdup(p);
8716 				if (hle->logmsg == NULL) {
8717 					err = got_error_from_errno("strdup");
8718 					break;
8719 				}
8720 			}
8721 			free(line);
8722 			line = NULL;
8723 			continue;
8724 		} else {
8725 			end = p;
8726 			while (end[0] && !isspace((unsigned char)end[0]))
8727 				end++;
8728 			*end = '\0';
8729 
8730 			err = got_object_resolve_id_str(&commit_id, repo, p);
8731 			if (err) {
8732 				/* override error code */
8733 				err = histedit_syntax_error(lineno);
8734 				break;
8735 			}
8736 		}
8737 		hle = malloc(sizeof(*hle));
8738 		if (hle == NULL) {
8739 			err = got_error_from_errno("malloc");
8740 			break;
8741 		}
8742 		hle->cmd = cmd;
8743 		hle->commit_id = commit_id;
8744 		hle->logmsg = NULL;
8745 		commit_id = NULL;
8746 		free(line);
8747 		line = NULL;
8748 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8749 	}
8750 
8751 	free(line);
8752 	free(commit_id);
8753 	return err;
8754 }
8755 
8756 static const struct got_error *
8757 histedit_check_script(struct got_histedit_list *histedit_cmds,
8758     struct got_object_id_queue *commits, struct got_repository *repo)
8759 {
8760 	const struct got_error *err = NULL;
8761 	struct got_object_qid *qid;
8762 	struct got_histedit_list_entry *hle;
8763 	static char msg[92];
8764 	char *id_str;
8765 
8766 	if (TAILQ_EMPTY(histedit_cmds))
8767 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8768 		    "histedit script contains no commands");
8769 	if (SIMPLEQ_EMPTY(commits))
8770 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
8771 
8772 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
8773 		struct got_histedit_list_entry *hle2;
8774 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8775 			if (hle == hle2)
8776 				continue;
8777 			if (got_object_id_cmp(hle->commit_id,
8778 			    hle2->commit_id) != 0)
8779 				continue;
8780 			err = got_object_id_str(&id_str, hle->commit_id);
8781 			if (err)
8782 				return err;
8783 			snprintf(msg, sizeof(msg), "commit %s is listed "
8784 			    "more than once in histedit script", id_str);
8785 			free(id_str);
8786 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8787 		}
8788 	}
8789 
8790 	SIMPLEQ_FOREACH(qid, commits, entry) {
8791 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
8792 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8793 				break;
8794 		}
8795 		if (hle == NULL) {
8796 			err = got_object_id_str(&id_str, qid->id);
8797 			if (err)
8798 				return err;
8799 			snprintf(msg, sizeof(msg),
8800 			    "commit %s missing from histedit script", id_str);
8801 			free(id_str);
8802 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8803 		}
8804 	}
8805 
8806 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8807 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8808 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8809 		    "last commit in histedit script cannot be folded");
8810 
8811 	return NULL;
8812 }
8813 
8814 static const struct got_error *
8815 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8816     const char *path, struct got_object_id_queue *commits,
8817     struct got_repository *repo)
8818 {
8819 	const struct got_error *err = NULL;
8820 	char *editor;
8821 	FILE *f = NULL;
8822 
8823 	err = get_editor(&editor);
8824 	if (err)
8825 		return err;
8826 
8827 	if (spawn_editor(editor, path) == -1) {
8828 		err = got_error_from_errno("failed spawning editor");
8829 		goto done;
8830 	}
8831 
8832 	f = fopen(path, "r");
8833 	if (f == NULL) {
8834 		err = got_error_from_errno("fopen");
8835 		goto done;
8836 	}
8837 	err = histedit_parse_list(histedit_cmds, f, repo);
8838 	if (err)
8839 		goto done;
8840 
8841 	err = histedit_check_script(histedit_cmds, commits, repo);
8842 done:
8843 	if (f && fclose(f) == EOF && err == NULL)
8844 		err = got_error_from_errno("fclose");
8845 	free(editor);
8846 	return err;
8847 }
8848 
8849 static const struct got_error *
8850 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8851     struct got_object_id_queue *, const char *, const char *,
8852     struct got_repository *);
8853 
8854 static const struct got_error *
8855 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8856     struct got_object_id_queue *commits, const char *branch_name,
8857     int edit_logmsg_only, int fold_only, struct got_repository *repo)
8858 {
8859 	const struct got_error *err;
8860 	FILE *f = NULL;
8861 	char *path = NULL;
8862 
8863 	err = got_opentemp_named(&path, &f, "got-histedit");
8864 	if (err)
8865 		return err;
8866 
8867 	err = write_cmd_list(f, branch_name, commits);
8868 	if (err)
8869 		goto done;
8870 
8871 	err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8872 	    fold_only, repo);
8873 	if (err)
8874 		goto done;
8875 
8876 	if (edit_logmsg_only || fold_only) {
8877 		rewind(f);
8878 		err = histedit_parse_list(histedit_cmds, f, repo);
8879 	} else {
8880 		if (fclose(f) == EOF) {
8881 			err = got_error_from_errno("fclose");
8882 			goto done;
8883 		}
8884 		f = NULL;
8885 		err = histedit_run_editor(histedit_cmds, path, commits, repo);
8886 		if (err) {
8887 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8888 			    err->code != GOT_ERR_HISTEDIT_CMD)
8889 				goto done;
8890 			err = histedit_edit_list_retry(histedit_cmds, err,
8891 			    commits, path, branch_name, repo);
8892 		}
8893 	}
8894 done:
8895 	if (f && fclose(f) == EOF && err == NULL)
8896 		err = got_error_from_errno("fclose");
8897 	if (path && unlink(path) != 0 && err == NULL)
8898 		err = got_error_from_errno2("unlink", path);
8899 	free(path);
8900 	return err;
8901 }
8902 
8903 static const struct got_error *
8904 histedit_save_list(struct got_histedit_list *histedit_cmds,
8905     struct got_worktree *worktree, struct got_repository *repo)
8906 {
8907 	const struct got_error *err = NULL;
8908 	char *path = NULL;
8909 	FILE *f = NULL;
8910 	struct got_histedit_list_entry *hle;
8911 	struct got_commit_object *commit = NULL;
8912 
8913 	err = got_worktree_get_histedit_script_path(&path, worktree);
8914 	if (err)
8915 		return err;
8916 
8917 	f = fopen(path, "w");
8918 	if (f == NULL) {
8919 		err = got_error_from_errno2("fopen", path);
8920 		goto done;
8921 	}
8922 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
8923 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8924 		    repo);
8925 		if (err)
8926 			break;
8927 
8928 		if (hle->logmsg) {
8929 			int n = fprintf(f, "%c %s\n",
8930 			    GOT_HISTEDIT_MESG, hle->logmsg);
8931 			if (n < 0) {
8932 				err = got_ferror(f, GOT_ERR_IO);
8933 				break;
8934 			}
8935 		}
8936 	}
8937 done:
8938 	if (f && fclose(f) == EOF && err == NULL)
8939 		err = got_error_from_errno("fclose");
8940 	free(path);
8941 	if (commit)
8942 		got_object_commit_close(commit);
8943 	return err;
8944 }
8945 
8946 void
8947 histedit_free_list(struct got_histedit_list *histedit_cmds)
8948 {
8949 	struct got_histedit_list_entry *hle;
8950 
8951 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
8952 		TAILQ_REMOVE(histedit_cmds, hle, entry);
8953 		free(hle);
8954 	}
8955 }
8956 
8957 static const struct got_error *
8958 histedit_load_list(struct got_histedit_list *histedit_cmds,
8959     const char *path, struct got_repository *repo)
8960 {
8961 	const struct got_error *err = NULL;
8962 	FILE *f = NULL;
8963 
8964 	f = fopen(path, "r");
8965 	if (f == NULL) {
8966 		err = got_error_from_errno2("fopen", path);
8967 		goto done;
8968 	}
8969 
8970 	err = histedit_parse_list(histedit_cmds, f, repo);
8971 done:
8972 	if (f && fclose(f) == EOF && err == NULL)
8973 		err = got_error_from_errno("fclose");
8974 	return err;
8975 }
8976 
8977 static const struct got_error *
8978 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8979     const struct got_error *edit_err, struct got_object_id_queue *commits,
8980     const char *path, const char *branch_name, struct got_repository *repo)
8981 {
8982 	const struct got_error *err = NULL, *prev_err = edit_err;
8983 	int resp = ' ';
8984 
8985 	while (resp != 'c' && resp != 'r' && resp != 'a') {
8986 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8987 		    "or (a)bort: ", getprogname(), prev_err->msg);
8988 		resp = getchar();
8989 		if (resp == '\n')
8990 			resp = getchar();
8991 		if (resp == 'c') {
8992 			histedit_free_list(histedit_cmds);
8993 			err = histedit_run_editor(histedit_cmds, path, commits,
8994 			    repo);
8995 			if (err) {
8996 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8997 				    err->code != GOT_ERR_HISTEDIT_CMD)
8998 					break;
8999 				prev_err = err;
9000 				resp = ' ';
9001 				continue;
9002 			}
9003 			break;
9004 		} else if (resp == 'r') {
9005 			histedit_free_list(histedit_cmds);
9006 			err = histedit_edit_script(histedit_cmds,
9007 			    commits, branch_name, 0, 0, repo);
9008 			if (err) {
9009 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
9010 				    err->code != GOT_ERR_HISTEDIT_CMD)
9011 					break;
9012 				prev_err = err;
9013 				resp = ' ';
9014 				continue;
9015 			}
9016 			break;
9017 		} else if (resp == 'a') {
9018 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
9019 			break;
9020 		} else
9021 			printf("invalid response '%c'\n", resp);
9022 	}
9023 
9024 	return err;
9025 }
9026 
9027 static const struct got_error *
9028 histedit_complete(struct got_worktree *worktree,
9029     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
9030     struct got_reference *branch, struct got_repository *repo)
9031 {
9032 	printf("Switching work tree to %s\n",
9033 	    got_ref_get_symref_target(branch));
9034 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
9035 	    branch, repo);
9036 }
9037 
9038 static const struct got_error *
9039 show_histedit_progress(struct got_commit_object *commit,
9040     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
9041 {
9042 	const struct got_error *err;
9043 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9044 
9045 	err = got_object_id_str(&old_id_str, hle->commit_id);
9046 	if (err)
9047 		goto done;
9048 
9049 	if (new_id) {
9050 		err = got_object_id_str(&new_id_str, new_id);
9051 		if (err)
9052 			goto done;
9053 	}
9054 
9055 	old_id_str[12] = '\0';
9056 	if (new_id_str)
9057 		new_id_str[12] = '\0';
9058 
9059 	if (hle->logmsg) {
9060 		logmsg = strdup(hle->logmsg);
9061 		if (logmsg == NULL) {
9062 			err = got_error_from_errno("strdup");
9063 			goto done;
9064 		}
9065 		trim_logmsg(logmsg, 42);
9066 	} else {
9067 		err = get_short_logmsg(&logmsg, 42, commit);
9068 		if (err)
9069 			goto done;
9070 	}
9071 
9072 	switch (hle->cmd->code) {
9073 	case GOT_HISTEDIT_PICK:
9074 	case GOT_HISTEDIT_EDIT:
9075 		printf("%s -> %s: %s\n", old_id_str,
9076 		    new_id_str ? new_id_str : "no-op change", logmsg);
9077 		break;
9078 	case GOT_HISTEDIT_DROP:
9079 	case GOT_HISTEDIT_FOLD:
9080 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
9081 		    logmsg);
9082 		break;
9083 	default:
9084 		break;
9085 	}
9086 done:
9087 	free(old_id_str);
9088 	free(new_id_str);
9089 	return err;
9090 }
9091 
9092 static const struct got_error *
9093 histedit_commit(struct got_pathlist_head *merged_paths,
9094     struct got_worktree *worktree, struct got_fileindex *fileindex,
9095     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
9096     struct got_repository *repo)
9097 {
9098 	const struct got_error *err;
9099 	struct got_commit_object *commit;
9100 	struct got_object_id *new_commit_id;
9101 
9102 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
9103 	    && hle->logmsg == NULL) {
9104 		err = histedit_edit_logmsg(hle, repo);
9105 		if (err)
9106 			return err;
9107 	}
9108 
9109 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9110 	if (err)
9111 		return err;
9112 
9113 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
9114 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
9115 	    hle->logmsg, repo);
9116 	if (err) {
9117 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
9118 			goto done;
9119 		err = show_histedit_progress(commit, hle, NULL);
9120 	} else {
9121 		err = show_histedit_progress(commit, hle, new_commit_id);
9122 		free(new_commit_id);
9123 	}
9124 done:
9125 	got_object_commit_close(commit);
9126 	return err;
9127 }
9128 
9129 static const struct got_error *
9130 histedit_skip_commit(struct got_histedit_list_entry *hle,
9131     struct got_worktree *worktree, struct got_repository *repo)
9132 {
9133 	const struct got_error *error;
9134 	struct got_commit_object *commit;
9135 
9136 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
9137 	    repo);
9138 	if (error)
9139 		return error;
9140 
9141 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
9142 	if (error)
9143 		return error;
9144 
9145 	error = show_histedit_progress(commit, hle, NULL);
9146 	got_object_commit_close(commit);
9147 	return error;
9148 }
9149 
9150 static const struct got_error *
9151 check_local_changes(void *arg, unsigned char status,
9152     unsigned char staged_status, const char *path,
9153     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9154     struct got_object_id *commit_id, int dirfd, const char *de_name)
9155 {
9156 	int *have_local_changes = arg;
9157 
9158 	switch (status) {
9159 	case GOT_STATUS_ADD:
9160 	case GOT_STATUS_DELETE:
9161 	case GOT_STATUS_MODIFY:
9162 	case GOT_STATUS_CONFLICT:
9163 		*have_local_changes = 1;
9164 		return got_error(GOT_ERR_CANCELLED);
9165 	default:
9166 		break;
9167 	}
9168 
9169 	switch (staged_status) {
9170 	case GOT_STATUS_ADD:
9171 	case GOT_STATUS_DELETE:
9172 	case GOT_STATUS_MODIFY:
9173 		*have_local_changes = 1;
9174 		return got_error(GOT_ERR_CANCELLED);
9175 	default:
9176 		break;
9177 	}
9178 
9179 	return NULL;
9180 }
9181 
9182 static const struct got_error *
9183 cmd_histedit(int argc, char *argv[])
9184 {
9185 	const struct got_error *error = NULL;
9186 	struct got_worktree *worktree = NULL;
9187 	struct got_fileindex *fileindex = NULL;
9188 	struct got_repository *repo = NULL;
9189 	char *cwd = NULL;
9190 	struct got_reference *branch = NULL;
9191 	struct got_reference *tmp_branch = NULL;
9192 	struct got_object_id *resume_commit_id = NULL;
9193 	struct got_object_id *base_commit_id = NULL;
9194 	struct got_object_id *head_commit_id = NULL;
9195 	struct got_commit_object *commit = NULL;
9196 	int ch, rebase_in_progress = 0;
9197 	struct got_update_progress_arg upa;
9198 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
9199 	int edit_logmsg_only = 0, fold_only = 0;
9200 	int list_backups = 0;
9201 	const char *edit_script_path = NULL;
9202 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
9203 	struct got_object_id_queue commits;
9204 	struct got_pathlist_head merged_paths;
9205 	const struct got_object_id_queue *parent_ids;
9206 	struct got_object_qid *pid;
9207 	struct got_histedit_list histedit_cmds;
9208 	struct got_histedit_list_entry *hle;
9209 
9210 	SIMPLEQ_INIT(&commits);
9211 	TAILQ_INIT(&histedit_cmds);
9212 	TAILQ_INIT(&merged_paths);
9213 	memset(&upa, 0, sizeof(upa));
9214 
9215 	while ((ch = getopt(argc, argv, "acfF:ml")) != -1) {
9216 		switch (ch) {
9217 		case 'a':
9218 			abort_edit = 1;
9219 			break;
9220 		case 'c':
9221 			continue_edit = 1;
9222 			break;
9223 		case 'f':
9224 			fold_only = 1;
9225 			break;
9226 		case 'F':
9227 			edit_script_path = optarg;
9228 			break;
9229 		case 'm':
9230 			edit_logmsg_only = 1;
9231 			break;
9232 		case 'l':
9233 			list_backups = 1;
9234 			break;
9235 		default:
9236 			usage_histedit();
9237 			/* NOTREACHED */
9238 		}
9239 	}
9240 
9241 	argc -= optind;
9242 	argv += optind;
9243 
9244 #ifndef PROFILE
9245 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9246 	    "unveil", NULL) == -1)
9247 		err(1, "pledge");
9248 #endif
9249 	if (abort_edit && continue_edit)
9250 		option_conflict('a', 'c');
9251 	if (edit_script_path && edit_logmsg_only)
9252 		option_conflict('F', 'm');
9253 	if (abort_edit && edit_logmsg_only)
9254 		option_conflict('a', 'm');
9255 	if (continue_edit && edit_logmsg_only)
9256 		option_conflict('c', 'm');
9257 	if (abort_edit && fold_only)
9258 		option_conflict('a', 'f');
9259 	if (continue_edit && fold_only)
9260 		option_conflict('c', 'f');
9261 	if (fold_only && edit_logmsg_only)
9262 		option_conflict('f', 'm');
9263 	if (edit_script_path && fold_only)
9264 		option_conflict('F', 'f');
9265 	if (list_backups) {
9266 		if (abort_edit)
9267 			option_conflict('l', 'a');
9268 		if (continue_edit)
9269 			option_conflict('l', 'c');
9270 		if (edit_script_path)
9271 			option_conflict('l', 'F');
9272 		if (edit_logmsg_only)
9273 			option_conflict('l', 'm');
9274 		if (fold_only)
9275 			option_conflict('l', 'f');
9276 		if (argc != 0 && argc != 1)
9277 			usage_histedit();
9278 	} else if (argc != 0)
9279 		usage_histedit();
9280 
9281 	/*
9282 	 * This command cannot apply unveil(2) in all cases because the
9283 	 * user may choose to run an editor to edit the histedit script
9284 	 * and to edit individual commit log messages.
9285 	 * unveil(2) traverses exec(2); if an editor is used we have to
9286 	 * apply unveil after edit script and log messages have been written.
9287 	 * XXX TODO: Make use of unveil(2) where possible.
9288 	 */
9289 
9290 	cwd = getcwd(NULL, 0);
9291 	if (cwd == NULL) {
9292 		error = got_error_from_errno("getcwd");
9293 		goto done;
9294 	}
9295 	error = got_worktree_open(&worktree, cwd);
9296 	if (error) {
9297 		if (list_backups) {
9298 			if (error->code != GOT_ERR_NOT_WORKTREE)
9299 				goto done;
9300 		} else {
9301 			if (error->code == GOT_ERR_NOT_WORKTREE)
9302 				error = wrap_not_worktree_error(error,
9303 				    "histedit", cwd);
9304 			goto done;
9305 		}
9306 	}
9307 
9308 	if (list_backups) {
9309 		error = got_repo_open(&repo,
9310 		    worktree ? got_worktree_get_repo_path(worktree) : cwd,
9311 		    NULL);
9312 		if (error != NULL)
9313 			goto done;
9314 		error = apply_unveil(got_repo_get_path(repo), 0,
9315 		    worktree ? got_worktree_get_root_path(worktree) : NULL);
9316 		if (error)
9317 			goto done;
9318 		error = list_backup_refs(
9319 		    GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
9320 		    argc == 1 ? argv[0] : NULL, repo);
9321 		goto done; /* nothing else to do */
9322 	}
9323 
9324 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9325 	    NULL);
9326 	if (error != NULL)
9327 		goto done;
9328 
9329 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9330 	if (error)
9331 		goto done;
9332 	if (rebase_in_progress) {
9333 		error = got_error(GOT_ERR_REBASING);
9334 		goto done;
9335 	}
9336 
9337 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
9338 	if (error)
9339 		goto done;
9340 
9341 	if (edit_in_progress && edit_logmsg_only) {
9342 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9343 		    "histedit operation is in progress in this "
9344 		    "work tree and must be continued or aborted "
9345 		    "before the -m option can be used");
9346 		goto done;
9347 	}
9348 	if (edit_in_progress && fold_only) {
9349 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9350 		    "histedit operation is in progress in this "
9351 		    "work tree and must be continued or aborted "
9352 		    "before the -f option can be used");
9353 		goto done;
9354 	}
9355 
9356 	if (edit_in_progress && abort_edit) {
9357 		error = got_worktree_histedit_continue(&resume_commit_id,
9358 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
9359 		    worktree, repo);
9360 		if (error)
9361 			goto done;
9362 		printf("Switching work tree to %s\n",
9363 		    got_ref_get_symref_target(branch));
9364 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
9365 		    branch, base_commit_id, update_progress, &upa);
9366 		if (error)
9367 			goto done;
9368 		printf("Histedit of %s aborted\n",
9369 		    got_ref_get_symref_target(branch));
9370 		print_update_progress_stats(&upa);
9371 		goto done; /* nothing else to do */
9372 	} else if (abort_edit) {
9373 		error = got_error(GOT_ERR_NOT_HISTEDIT);
9374 		goto done;
9375 	}
9376 
9377 	if (continue_edit) {
9378 		char *path;
9379 
9380 		if (!edit_in_progress) {
9381 			error = got_error(GOT_ERR_NOT_HISTEDIT);
9382 			goto done;
9383 		}
9384 
9385 		error = got_worktree_get_histedit_script_path(&path, worktree);
9386 		if (error)
9387 			goto done;
9388 
9389 		error = histedit_load_list(&histedit_cmds, path, repo);
9390 		free(path);
9391 		if (error)
9392 			goto done;
9393 
9394 		error = got_worktree_histedit_continue(&resume_commit_id,
9395 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
9396 		    worktree, repo);
9397 		if (error)
9398 			goto done;
9399 
9400 		error = got_ref_resolve(&head_commit_id, repo, branch);
9401 		if (error)
9402 			goto done;
9403 
9404 		error = got_object_open_as_commit(&commit, repo,
9405 		    head_commit_id);
9406 		if (error)
9407 			goto done;
9408 		parent_ids = got_object_commit_get_parent_ids(commit);
9409 		pid = SIMPLEQ_FIRST(parent_ids);
9410 		if (pid == NULL) {
9411 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9412 			goto done;
9413 		}
9414 		error = collect_commits(&commits, head_commit_id, pid->id,
9415 		    base_commit_id, got_worktree_get_path_prefix(worktree),
9416 		    GOT_ERR_HISTEDIT_PATH, repo);
9417 		got_object_commit_close(commit);
9418 		commit = NULL;
9419 		if (error)
9420 			goto done;
9421 	} else {
9422 		if (edit_in_progress) {
9423 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
9424 			goto done;
9425 		}
9426 
9427 		error = got_ref_open(&branch, repo,
9428 		    got_worktree_get_head_ref_name(worktree), 0);
9429 		if (error != NULL)
9430 			goto done;
9431 
9432 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
9433 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
9434 			    "will not edit commit history of a branch outside "
9435 			    "the \"refs/heads/\" reference namespace");
9436 			goto done;
9437 		}
9438 
9439 		error = got_ref_resolve(&head_commit_id, repo, branch);
9440 		got_ref_close(branch);
9441 		branch = NULL;
9442 		if (error)
9443 			goto done;
9444 
9445 		error = got_object_open_as_commit(&commit, repo,
9446 		    head_commit_id);
9447 		if (error)
9448 			goto done;
9449 		parent_ids = got_object_commit_get_parent_ids(commit);
9450 		pid = SIMPLEQ_FIRST(parent_ids);
9451 		if (pid == NULL) {
9452 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9453 			goto done;
9454 		}
9455 		error = collect_commits(&commits, head_commit_id, pid->id,
9456 		    got_worktree_get_base_commit_id(worktree),
9457 		    got_worktree_get_path_prefix(worktree),
9458 		    GOT_ERR_HISTEDIT_PATH, repo);
9459 		got_object_commit_close(commit);
9460 		commit = NULL;
9461 		if (error)
9462 			goto done;
9463 
9464 		if (SIMPLEQ_EMPTY(&commits)) {
9465 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9466 			goto done;
9467 		}
9468 
9469 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
9470 		    &base_commit_id, &fileindex, worktree, repo);
9471 		if (error)
9472 			goto done;
9473 
9474 		if (edit_script_path) {
9475 			error = histedit_load_list(&histedit_cmds,
9476 			    edit_script_path, repo);
9477 			if (error) {
9478 				got_worktree_histedit_abort(worktree, fileindex,
9479 				    repo, branch, base_commit_id,
9480 				    update_progress, &upa);
9481 				print_update_progress_stats(&upa);
9482 				goto done;
9483 			}
9484 		} else {
9485 			const char *branch_name;
9486 			branch_name = got_ref_get_symref_target(branch);
9487 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
9488 				branch_name += 11;
9489 			error = histedit_edit_script(&histedit_cmds, &commits,
9490 			    branch_name, edit_logmsg_only, fold_only, repo);
9491 			if (error) {
9492 				got_worktree_histedit_abort(worktree, fileindex,
9493 				    repo, branch, base_commit_id,
9494 				    update_progress, &upa);
9495 				print_update_progress_stats(&upa);
9496 				goto done;
9497 			}
9498 
9499 		}
9500 
9501 		error = histedit_save_list(&histedit_cmds, worktree,
9502 		    repo);
9503 		if (error) {
9504 			got_worktree_histedit_abort(worktree, fileindex,
9505 			    repo, branch, base_commit_id,
9506 			    update_progress, &upa);
9507 			print_update_progress_stats(&upa);
9508 			goto done;
9509 		}
9510 
9511 	}
9512 
9513 	error = histedit_check_script(&histedit_cmds, &commits, repo);
9514 	if (error)
9515 		goto done;
9516 
9517 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
9518 		if (resume_commit_id) {
9519 			if (got_object_id_cmp(hle->commit_id,
9520 			    resume_commit_id) != 0)
9521 				continue;
9522 
9523 			resume_commit_id = NULL;
9524 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
9525 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
9526 				error = histedit_skip_commit(hle, worktree,
9527 				    repo);
9528 				if (error)
9529 					goto done;
9530 			} else {
9531 				struct got_pathlist_head paths;
9532 				int have_changes = 0;
9533 
9534 				TAILQ_INIT(&paths);
9535 				error = got_pathlist_append(&paths, "", NULL);
9536 				if (error)
9537 					goto done;
9538 				error = got_worktree_status(worktree, &paths,
9539 				    repo, check_local_changes, &have_changes,
9540 				    check_cancelled, NULL);
9541 				got_pathlist_free(&paths);
9542 				if (error) {
9543 					if (error->code != GOT_ERR_CANCELLED)
9544 						goto done;
9545 					if (sigint_received || sigpipe_received)
9546 						goto done;
9547 				}
9548 				if (have_changes) {
9549 					error = histedit_commit(NULL, worktree,
9550 					    fileindex, tmp_branch, hle, repo);
9551 					if (error)
9552 						goto done;
9553 				} else {
9554 					error = got_object_open_as_commit(
9555 					    &commit, repo, hle->commit_id);
9556 					if (error)
9557 						goto done;
9558 					error = show_histedit_progress(commit,
9559 					    hle, NULL);
9560 					got_object_commit_close(commit);
9561 					commit = NULL;
9562 					if (error)
9563 						goto done;
9564 				}
9565 			}
9566 			continue;
9567 		}
9568 
9569 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
9570 			error = histedit_skip_commit(hle, worktree, repo);
9571 			if (error)
9572 				goto done;
9573 			continue;
9574 		}
9575 
9576 		error = got_object_open_as_commit(&commit, repo,
9577 		    hle->commit_id);
9578 		if (error)
9579 			goto done;
9580 		parent_ids = got_object_commit_get_parent_ids(commit);
9581 		pid = SIMPLEQ_FIRST(parent_ids);
9582 
9583 		error = got_worktree_histedit_merge_files(&merged_paths,
9584 		    worktree, fileindex, pid->id, hle->commit_id, repo,
9585 		    update_progress, &upa, check_cancelled, NULL);
9586 		if (error)
9587 			goto done;
9588 		got_object_commit_close(commit);
9589 		commit = NULL;
9590 
9591 		print_update_progress_stats(&upa);
9592 		if (upa.conflicts > 0)
9593 			rebase_status = GOT_STATUS_CONFLICT;
9594 
9595 		if (rebase_status == GOT_STATUS_CONFLICT) {
9596 			error = show_rebase_merge_conflict(hle->commit_id,
9597 			    repo);
9598 			if (error)
9599 				goto done;
9600 			got_worktree_rebase_pathlist_free(&merged_paths);
9601 			break;
9602 		}
9603 
9604 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
9605 			char *id_str;
9606 			error = got_object_id_str(&id_str, hle->commit_id);
9607 			if (error)
9608 				goto done;
9609 			printf("Stopping histedit for amending commit %s\n",
9610 			    id_str);
9611 			free(id_str);
9612 			got_worktree_rebase_pathlist_free(&merged_paths);
9613 			error = got_worktree_histedit_postpone(worktree,
9614 			    fileindex);
9615 			goto done;
9616 		}
9617 
9618 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
9619 			error = histedit_skip_commit(hle, worktree, repo);
9620 			if (error)
9621 				goto done;
9622 			continue;
9623 		}
9624 
9625 		error = histedit_commit(&merged_paths, worktree, fileindex,
9626 		    tmp_branch, hle, repo);
9627 		got_worktree_rebase_pathlist_free(&merged_paths);
9628 		if (error)
9629 			goto done;
9630 	}
9631 
9632 	if (rebase_status == GOT_STATUS_CONFLICT) {
9633 		error = got_worktree_histedit_postpone(worktree, fileindex);
9634 		if (error)
9635 			goto done;
9636 		error = got_error_msg(GOT_ERR_CONFLICTS,
9637 		    "conflicts must be resolved before histedit can continue");
9638 	} else
9639 		error = histedit_complete(worktree, fileindex, tmp_branch,
9640 		    branch, repo);
9641 done:
9642 	got_object_id_queue_free(&commits);
9643 	histedit_free_list(&histedit_cmds);
9644 	free(head_commit_id);
9645 	free(base_commit_id);
9646 	free(resume_commit_id);
9647 	if (commit)
9648 		got_object_commit_close(commit);
9649 	if (branch)
9650 		got_ref_close(branch);
9651 	if (tmp_branch)
9652 		got_ref_close(tmp_branch);
9653 	if (worktree)
9654 		got_worktree_close(worktree);
9655 	if (repo) {
9656 		const struct got_error *close_err = got_repo_close(repo);
9657 		if (error == NULL)
9658 			error = close_err;
9659 	}
9660 	return error;
9661 }
9662 
9663 __dead static void
9664 usage_integrate(void)
9665 {
9666 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9667 	exit(1);
9668 }
9669 
9670 static const struct got_error *
9671 cmd_integrate(int argc, char *argv[])
9672 {
9673 	const struct got_error *error = NULL;
9674 	struct got_repository *repo = NULL;
9675 	struct got_worktree *worktree = NULL;
9676 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9677 	const char *branch_arg = NULL;
9678 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9679 	struct got_fileindex *fileindex = NULL;
9680 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9681 	int ch;
9682 	struct got_update_progress_arg upa;
9683 
9684 	while ((ch = getopt(argc, argv, "")) != -1) {
9685 		switch (ch) {
9686 		default:
9687 			usage_integrate();
9688 			/* NOTREACHED */
9689 		}
9690 	}
9691 
9692 	argc -= optind;
9693 	argv += optind;
9694 
9695 	if (argc != 1)
9696 		usage_integrate();
9697 	branch_arg = argv[0];
9698 #ifndef PROFILE
9699 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9700 	    "unveil", NULL) == -1)
9701 		err(1, "pledge");
9702 #endif
9703 	cwd = getcwd(NULL, 0);
9704 	if (cwd == NULL) {
9705 		error = got_error_from_errno("getcwd");
9706 		goto done;
9707 	}
9708 
9709 	error = got_worktree_open(&worktree, cwd);
9710 	if (error) {
9711 		if (error->code == GOT_ERR_NOT_WORKTREE)
9712 			error = wrap_not_worktree_error(error, "integrate",
9713 			    cwd);
9714 		goto done;
9715 	}
9716 
9717 	error = check_rebase_or_histedit_in_progress(worktree);
9718 	if (error)
9719 		goto done;
9720 
9721 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9722 	    NULL);
9723 	if (error != NULL)
9724 		goto done;
9725 
9726 	error = apply_unveil(got_repo_get_path(repo), 0,
9727 	    got_worktree_get_root_path(worktree));
9728 	if (error)
9729 		goto done;
9730 
9731 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9732 		error = got_error_from_errno("asprintf");
9733 		goto done;
9734 	}
9735 
9736 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9737 	    &base_branch_ref, worktree, refname, repo);
9738 	if (error)
9739 		goto done;
9740 
9741 	refname = strdup(got_ref_get_name(branch_ref));
9742 	if (refname == NULL) {
9743 		error = got_error_from_errno("strdup");
9744 		got_worktree_integrate_abort(worktree, fileindex, repo,
9745 		    branch_ref, base_branch_ref);
9746 		goto done;
9747 	}
9748 	base_refname = strdup(got_ref_get_name(base_branch_ref));
9749 	if (base_refname == NULL) {
9750 		error = got_error_from_errno("strdup");
9751 		got_worktree_integrate_abort(worktree, fileindex, repo,
9752 		    branch_ref, base_branch_ref);
9753 		goto done;
9754 	}
9755 
9756 	error = got_ref_resolve(&commit_id, repo, branch_ref);
9757 	if (error)
9758 		goto done;
9759 
9760 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9761 	if (error)
9762 		goto done;
9763 
9764 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9765 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
9766 		    "specified branch has already been integrated");
9767 		got_worktree_integrate_abort(worktree, fileindex, repo,
9768 		    branch_ref, base_branch_ref);
9769 		goto done;
9770 	}
9771 
9772 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9773 	if (error) {
9774 		if (error->code == GOT_ERR_ANCESTRY)
9775 			error = got_error(GOT_ERR_REBASE_REQUIRED);
9776 		got_worktree_integrate_abort(worktree, fileindex, repo,
9777 		    branch_ref, base_branch_ref);
9778 		goto done;
9779 	}
9780 
9781 	memset(&upa, 0, sizeof(upa));
9782 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
9783 	    branch_ref, base_branch_ref, update_progress, &upa,
9784 	    check_cancelled, NULL);
9785 	if (error)
9786 		goto done;
9787 
9788 	printf("Integrated %s into %s\n", refname, base_refname);
9789 	print_update_progress_stats(&upa);
9790 done:
9791 	if (repo) {
9792 		const struct got_error *close_err = got_repo_close(repo);
9793 		if (error == NULL)
9794 			error = close_err;
9795 	}
9796 	if (worktree)
9797 		got_worktree_close(worktree);
9798 	free(cwd);
9799 	free(base_commit_id);
9800 	free(commit_id);
9801 	free(refname);
9802 	free(base_refname);
9803 	return error;
9804 }
9805 
9806 __dead static void
9807 usage_stage(void)
9808 {
9809 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9810 	    "[-S] [file-path ...]\n",
9811 	    getprogname());
9812 	exit(1);
9813 }
9814 
9815 static const struct got_error *
9816 print_stage(void *arg, unsigned char status, unsigned char staged_status,
9817     const char *path, struct got_object_id *blob_id,
9818     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9819     int dirfd, const char *de_name)
9820 {
9821 	const struct got_error *err = NULL;
9822 	char *id_str = NULL;
9823 
9824 	if (staged_status != GOT_STATUS_ADD &&
9825 	    staged_status != GOT_STATUS_MODIFY &&
9826 	    staged_status != GOT_STATUS_DELETE)
9827 		return NULL;
9828 
9829 	if (staged_status == GOT_STATUS_ADD ||
9830 	    staged_status == GOT_STATUS_MODIFY)
9831 		err = got_object_id_str(&id_str, staged_blob_id);
9832 	else
9833 		err = got_object_id_str(&id_str, blob_id);
9834 	if (err)
9835 		return err;
9836 
9837 	printf("%s %c %s\n", id_str, staged_status, path);
9838 	free(id_str);
9839 	return NULL;
9840 }
9841 
9842 static const struct got_error *
9843 cmd_stage(int argc, char *argv[])
9844 {
9845 	const struct got_error *error = NULL;
9846 	struct got_repository *repo = NULL;
9847 	struct got_worktree *worktree = NULL;
9848 	char *cwd = NULL;
9849 	struct got_pathlist_head paths;
9850 	struct got_pathlist_entry *pe;
9851 	int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9852 	FILE *patch_script_file = NULL;
9853 	const char *patch_script_path = NULL;
9854 	struct choose_patch_arg cpa;
9855 
9856 	TAILQ_INIT(&paths);
9857 
9858 	while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9859 		switch (ch) {
9860 		case 'l':
9861 			list_stage = 1;
9862 			break;
9863 		case 'p':
9864 			pflag = 1;
9865 			break;
9866 		case 'F':
9867 			patch_script_path = optarg;
9868 			break;
9869 		case 'S':
9870 			allow_bad_symlinks = 1;
9871 			break;
9872 		default:
9873 			usage_stage();
9874 			/* NOTREACHED */
9875 		}
9876 	}
9877 
9878 	argc -= optind;
9879 	argv += optind;
9880 
9881 #ifndef PROFILE
9882 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9883 	    "unveil", NULL) == -1)
9884 		err(1, "pledge");
9885 #endif
9886 	if (list_stage && (pflag || patch_script_path))
9887 		errx(1, "-l option cannot be used with other options");
9888 	if (patch_script_path && !pflag)
9889 		errx(1, "-F option can only be used together with -p option");
9890 
9891 	cwd = getcwd(NULL, 0);
9892 	if (cwd == NULL) {
9893 		error = got_error_from_errno("getcwd");
9894 		goto done;
9895 	}
9896 
9897 	error = got_worktree_open(&worktree, cwd);
9898 	if (error) {
9899 		if (error->code == GOT_ERR_NOT_WORKTREE)
9900 			error = wrap_not_worktree_error(error, "stage", cwd);
9901 		goto done;
9902 	}
9903 
9904 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9905 	    NULL);
9906 	if (error != NULL)
9907 		goto done;
9908 
9909 	if (patch_script_path) {
9910 		patch_script_file = fopen(patch_script_path, "r");
9911 		if (patch_script_file == NULL) {
9912 			error = got_error_from_errno2("fopen",
9913 			    patch_script_path);
9914 			goto done;
9915 		}
9916 	}
9917 	error = apply_unveil(got_repo_get_path(repo), 0,
9918 	    got_worktree_get_root_path(worktree));
9919 	if (error)
9920 		goto done;
9921 
9922 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9923 	if (error)
9924 		goto done;
9925 
9926 	if (list_stage)
9927 		error = got_worktree_status(worktree, &paths, repo,
9928 		    print_stage, NULL, check_cancelled, NULL);
9929 	else {
9930 		cpa.patch_script_file = patch_script_file;
9931 		cpa.action = "stage";
9932 		error = got_worktree_stage(worktree, &paths,
9933 		    pflag ? NULL : print_status, NULL,
9934 		    pflag ? choose_patch : NULL, &cpa,
9935 		    allow_bad_symlinks, repo);
9936 	}
9937 done:
9938 	if (patch_script_file && fclose(patch_script_file) == EOF &&
9939 	    error == NULL)
9940 		error = got_error_from_errno2("fclose", patch_script_path);
9941 	if (repo) {
9942 		const struct got_error *close_err = got_repo_close(repo);
9943 		if (error == NULL)
9944 			error = close_err;
9945 	}
9946 	if (worktree)
9947 		got_worktree_close(worktree);
9948 	TAILQ_FOREACH(pe, &paths, entry)
9949 		free((char *)pe->path);
9950 	got_pathlist_free(&paths);
9951 	free(cwd);
9952 	return error;
9953 }
9954 
9955 __dead static void
9956 usage_unstage(void)
9957 {
9958 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9959 	    "[file-path ...]\n",
9960 	    getprogname());
9961 	exit(1);
9962 }
9963 
9964 
9965 static const struct got_error *
9966 cmd_unstage(int argc, char *argv[])
9967 {
9968 	const struct got_error *error = NULL;
9969 	struct got_repository *repo = NULL;
9970 	struct got_worktree *worktree = NULL;
9971 	char *cwd = NULL;
9972 	struct got_pathlist_head paths;
9973 	struct got_pathlist_entry *pe;
9974 	int ch, pflag = 0;
9975 	struct got_update_progress_arg upa;
9976 	FILE *patch_script_file = NULL;
9977 	const char *patch_script_path = NULL;
9978 	struct choose_patch_arg cpa;
9979 
9980 	TAILQ_INIT(&paths);
9981 
9982 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
9983 		switch (ch) {
9984 		case 'p':
9985 			pflag = 1;
9986 			break;
9987 		case 'F':
9988 			patch_script_path = optarg;
9989 			break;
9990 		default:
9991 			usage_unstage();
9992 			/* NOTREACHED */
9993 		}
9994 	}
9995 
9996 	argc -= optind;
9997 	argv += optind;
9998 
9999 #ifndef PROFILE
10000 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10001 	    "unveil", NULL) == -1)
10002 		err(1, "pledge");
10003 #endif
10004 	if (patch_script_path && !pflag)
10005 		errx(1, "-F option can only be used together with -p option");
10006 
10007 	cwd = getcwd(NULL, 0);
10008 	if (cwd == NULL) {
10009 		error = got_error_from_errno("getcwd");
10010 		goto done;
10011 	}
10012 
10013 	error = got_worktree_open(&worktree, cwd);
10014 	if (error) {
10015 		if (error->code == GOT_ERR_NOT_WORKTREE)
10016 			error = wrap_not_worktree_error(error, "unstage", cwd);
10017 		goto done;
10018 	}
10019 
10020 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10021 	    NULL);
10022 	if (error != NULL)
10023 		goto done;
10024 
10025 	if (patch_script_path) {
10026 		patch_script_file = fopen(patch_script_path, "r");
10027 		if (patch_script_file == NULL) {
10028 			error = got_error_from_errno2("fopen",
10029 			    patch_script_path);
10030 			goto done;
10031 		}
10032 	}
10033 
10034 	error = apply_unveil(got_repo_get_path(repo), 0,
10035 	    got_worktree_get_root_path(worktree));
10036 	if (error)
10037 		goto done;
10038 
10039 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
10040 	if (error)
10041 		goto done;
10042 
10043 	cpa.patch_script_file = patch_script_file;
10044 	cpa.action = "unstage";
10045 	memset(&upa, 0, sizeof(upa));
10046 	error = got_worktree_unstage(worktree, &paths, update_progress,
10047 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
10048 	if (!error)
10049 		print_update_progress_stats(&upa);
10050 done:
10051 	if (patch_script_file && fclose(patch_script_file) == EOF &&
10052 	    error == NULL)
10053 		error = got_error_from_errno2("fclose", patch_script_path);
10054 	if (repo) {
10055 		const struct got_error *close_err = got_repo_close(repo);
10056 		if (error == NULL)
10057 			error = close_err;
10058 	}
10059 	if (worktree)
10060 		got_worktree_close(worktree);
10061 	TAILQ_FOREACH(pe, &paths, entry)
10062 		free((char *)pe->path);
10063 	got_pathlist_free(&paths);
10064 	free(cwd);
10065 	return error;
10066 }
10067 
10068 __dead static void
10069 usage_cat(void)
10070 {
10071 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
10072 	    "arg1 [arg2 ...]\n", getprogname());
10073 	exit(1);
10074 }
10075 
10076 static const struct got_error *
10077 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10078 {
10079 	const struct got_error *err;
10080 	struct got_blob_object *blob;
10081 
10082 	err = got_object_open_as_blob(&blob, repo, id, 8192);
10083 	if (err)
10084 		return err;
10085 
10086 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
10087 	got_object_blob_close(blob);
10088 	return err;
10089 }
10090 
10091 static const struct got_error *
10092 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10093 {
10094 	const struct got_error *err;
10095 	struct got_tree_object *tree;
10096 	int nentries, i;
10097 
10098 	err = got_object_open_as_tree(&tree, repo, id);
10099 	if (err)
10100 		return err;
10101 
10102 	nentries = got_object_tree_get_nentries(tree);
10103 	for (i = 0; i < nentries; i++) {
10104 		struct got_tree_entry *te;
10105 		char *id_str;
10106 		if (sigint_received || sigpipe_received)
10107 			break;
10108 		te = got_object_tree_get_entry(tree, i);
10109 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
10110 		if (err)
10111 			break;
10112 		fprintf(outfile, "%s %.7o %s\n", id_str,
10113 		    got_tree_entry_get_mode(te),
10114 		    got_tree_entry_get_name(te));
10115 		free(id_str);
10116 	}
10117 
10118 	got_object_tree_close(tree);
10119 	return err;
10120 }
10121 
10122 static const struct got_error *
10123 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10124 {
10125 	const struct got_error *err;
10126 	struct got_commit_object *commit;
10127 	const struct got_object_id_queue *parent_ids;
10128 	struct got_object_qid *pid;
10129 	char *id_str = NULL;
10130 	const char *logmsg = NULL;
10131 
10132 	err = got_object_open_as_commit(&commit, repo, id);
10133 	if (err)
10134 		return err;
10135 
10136 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
10137 	if (err)
10138 		goto done;
10139 
10140 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
10141 	parent_ids = got_object_commit_get_parent_ids(commit);
10142 	fprintf(outfile, "numparents %d\n",
10143 	    got_object_commit_get_nparents(commit));
10144 	SIMPLEQ_FOREACH(pid, parent_ids, entry) {
10145 		char *pid_str;
10146 		err = got_object_id_str(&pid_str, pid->id);
10147 		if (err)
10148 			goto done;
10149 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
10150 		free(pid_str);
10151 	}
10152 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
10153 	    got_object_commit_get_author(commit),
10154 	    (long long)got_object_commit_get_author_time(commit));
10155 
10156 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
10157 	    got_object_commit_get_author(commit),
10158 	    (long long)got_object_commit_get_committer_time(commit));
10159 
10160 	logmsg = got_object_commit_get_logmsg_raw(commit);
10161 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
10162 	fprintf(outfile, "%s", logmsg);
10163 done:
10164 	free(id_str);
10165 	got_object_commit_close(commit);
10166 	return err;
10167 }
10168 
10169 static const struct got_error *
10170 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10171 {
10172 	const struct got_error *err;
10173 	struct got_tag_object *tag;
10174 	char *id_str = NULL;
10175 	const char *tagmsg = NULL;
10176 
10177 	err = got_object_open_as_tag(&tag, repo, id);
10178 	if (err)
10179 		return err;
10180 
10181 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
10182 	if (err)
10183 		goto done;
10184 
10185 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
10186 
10187 	switch (got_object_tag_get_object_type(tag)) {
10188 	case GOT_OBJ_TYPE_BLOB:
10189 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10190 		    GOT_OBJ_LABEL_BLOB);
10191 		break;
10192 	case GOT_OBJ_TYPE_TREE:
10193 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10194 		    GOT_OBJ_LABEL_TREE);
10195 		break;
10196 	case GOT_OBJ_TYPE_COMMIT:
10197 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10198 		    GOT_OBJ_LABEL_COMMIT);
10199 		break;
10200 	case GOT_OBJ_TYPE_TAG:
10201 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10202 		    GOT_OBJ_LABEL_TAG);
10203 		break;
10204 	default:
10205 		break;
10206 	}
10207 
10208 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
10209 	    got_object_tag_get_name(tag));
10210 
10211 	fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
10212 	    got_object_tag_get_tagger(tag),
10213 	    (long long)got_object_tag_get_tagger_time(tag));
10214 
10215 	tagmsg = got_object_tag_get_message(tag);
10216 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
10217 	fprintf(outfile, "%s", tagmsg);
10218 done:
10219 	free(id_str);
10220 	got_object_tag_close(tag);
10221 	return err;
10222 }
10223 
10224 static const struct got_error *
10225 cmd_cat(int argc, char *argv[])
10226 {
10227 	const struct got_error *error;
10228 	struct got_repository *repo = NULL;
10229 	struct got_worktree *worktree = NULL;
10230 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
10231 	const char *commit_id_str = NULL;
10232 	struct got_object_id *id = NULL, *commit_id = NULL;
10233 	int ch, obj_type, i, force_path = 0;
10234 	struct got_reflist_head refs;
10235 
10236 	TAILQ_INIT(&refs);
10237 
10238 #ifndef PROFILE
10239 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
10240 	    NULL) == -1)
10241 		err(1, "pledge");
10242 #endif
10243 
10244 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
10245 		switch (ch) {
10246 		case 'c':
10247 			commit_id_str = optarg;
10248 			break;
10249 		case 'r':
10250 			repo_path = realpath(optarg, NULL);
10251 			if (repo_path == NULL)
10252 				return got_error_from_errno2("realpath",
10253 				    optarg);
10254 			got_path_strip_trailing_slashes(repo_path);
10255 			break;
10256 		case 'P':
10257 			force_path = 1;
10258 			break;
10259 		default:
10260 			usage_cat();
10261 			/* NOTREACHED */
10262 		}
10263 	}
10264 
10265 	argc -= optind;
10266 	argv += optind;
10267 
10268 	cwd = getcwd(NULL, 0);
10269 	if (cwd == NULL) {
10270 		error = got_error_from_errno("getcwd");
10271 		goto done;
10272 	}
10273 	error = got_worktree_open(&worktree, cwd);
10274 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
10275 		goto done;
10276 	if (worktree) {
10277 		if (repo_path == NULL) {
10278 			repo_path = strdup(
10279 			    got_worktree_get_repo_path(worktree));
10280 			if (repo_path == NULL) {
10281 				error = got_error_from_errno("strdup");
10282 				goto done;
10283 			}
10284 		}
10285 	}
10286 
10287 	if (repo_path == NULL) {
10288 		repo_path = getcwd(NULL, 0);
10289 		if (repo_path == NULL)
10290 			return got_error_from_errno("getcwd");
10291 	}
10292 
10293 	error = got_repo_open(&repo, repo_path, NULL);
10294 	free(repo_path);
10295 	if (error != NULL)
10296 		goto done;
10297 
10298 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
10299 	if (error)
10300 		goto done;
10301 
10302 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
10303 	if (error)
10304 		goto done;
10305 
10306 	if (commit_id_str == NULL)
10307 		commit_id_str = GOT_REF_HEAD;
10308 	error = got_repo_match_object_id(&commit_id, NULL,
10309 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
10310 	if (error)
10311 		goto done;
10312 
10313 	for (i = 0; i < argc; i++) {
10314 		if (force_path) {
10315 			error = got_object_id_by_path(&id, repo, commit_id,
10316 			    argv[i]);
10317 			if (error)
10318 				break;
10319 		} else {
10320 			error = got_repo_match_object_id(&id, &label, argv[i],
10321 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
10322 			    repo);
10323 			if (error) {
10324 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
10325 				    error->code != GOT_ERR_NOT_REF)
10326 					break;
10327 				error = got_object_id_by_path(&id, repo,
10328 				    commit_id, argv[i]);
10329 				if (error)
10330 					break;
10331 			}
10332 		}
10333 
10334 		error = got_object_get_type(&obj_type, repo, id);
10335 		if (error)
10336 			break;
10337 
10338 		switch (obj_type) {
10339 		case GOT_OBJ_TYPE_BLOB:
10340 			error = cat_blob(id, repo, stdout);
10341 			break;
10342 		case GOT_OBJ_TYPE_TREE:
10343 			error = cat_tree(id, repo, stdout);
10344 			break;
10345 		case GOT_OBJ_TYPE_COMMIT:
10346 			error = cat_commit(id, repo, stdout);
10347 			break;
10348 		case GOT_OBJ_TYPE_TAG:
10349 			error = cat_tag(id, repo, stdout);
10350 			break;
10351 		default:
10352 			error = got_error(GOT_ERR_OBJ_TYPE);
10353 			break;
10354 		}
10355 		if (error)
10356 			break;
10357 		free(label);
10358 		label = NULL;
10359 		free(id);
10360 		id = NULL;
10361 	}
10362 done:
10363 	free(label);
10364 	free(id);
10365 	free(commit_id);
10366 	if (worktree)
10367 		got_worktree_close(worktree);
10368 	if (repo) {
10369 		const struct got_error *close_err = got_repo_close(repo);
10370 		if (error == NULL)
10371 			error = close_err;
10372 	}
10373 	got_ref_list_free(&refs);
10374 	return error;
10375 }
10376 
10377 __dead static void
10378 usage_info(void)
10379 {
10380 	fprintf(stderr, "usage: %s info [path ...]\n",
10381 	    getprogname());
10382 	exit(1);
10383 }
10384 
10385 static const struct got_error *
10386 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
10387     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10388     struct got_object_id *commit_id)
10389 {
10390 	const struct got_error *err = NULL;
10391 	char *id_str = NULL;
10392 	char datebuf[128];
10393 	struct tm mytm, *tm;
10394 	struct got_pathlist_head *paths = arg;
10395 	struct got_pathlist_entry *pe;
10396 
10397 	/*
10398 	 * Clear error indication from any of the path arguments which
10399 	 * would cause this file index entry to be displayed.
10400 	 */
10401 	TAILQ_FOREACH(pe, paths, entry) {
10402 		if (got_path_cmp(path, pe->path, strlen(path),
10403 		    pe->path_len) == 0 ||
10404 		    got_path_is_child(path, pe->path, pe->path_len))
10405 			pe->data = NULL; /* no error */
10406 	}
10407 
10408 	printf(GOT_COMMIT_SEP_STR);
10409 	if (S_ISLNK(mode))
10410 		printf("symlink: %s\n", path);
10411 	else if (S_ISREG(mode)) {
10412 		printf("file: %s\n", path);
10413 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
10414 	} else if (S_ISDIR(mode))
10415 		printf("directory: %s\n", path);
10416 	else
10417 		printf("something: %s\n", path);
10418 
10419 	tm = localtime_r(&mtime, &mytm);
10420 	if (tm == NULL)
10421 		return NULL;
10422 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
10423 		return got_error(GOT_ERR_NO_SPACE);
10424 	printf("timestamp: %s\n", datebuf);
10425 
10426 	if (blob_id) {
10427 		err = got_object_id_str(&id_str, blob_id);
10428 		if (err)
10429 			return err;
10430 		printf("based on blob: %s\n", id_str);
10431 		free(id_str);
10432 	}
10433 
10434 	if (staged_blob_id) {
10435 		err = got_object_id_str(&id_str, staged_blob_id);
10436 		if (err)
10437 			return err;
10438 		printf("based on staged blob: %s\n", id_str);
10439 		free(id_str);
10440 	}
10441 
10442 	if (commit_id) {
10443 		err = got_object_id_str(&id_str, commit_id);
10444 		if (err)
10445 			return err;
10446 		printf("based on commit: %s\n", id_str);
10447 		free(id_str);
10448 	}
10449 
10450 	return NULL;
10451 }
10452 
10453 static const struct got_error *
10454 cmd_info(int argc, char *argv[])
10455 {
10456 	const struct got_error *error = NULL;
10457 	struct got_worktree *worktree = NULL;
10458 	char *cwd = NULL, *id_str = NULL;
10459 	struct got_pathlist_head paths;
10460 	struct got_pathlist_entry *pe;
10461 	char *uuidstr = NULL;
10462 	int ch, show_files = 0;
10463 
10464 	TAILQ_INIT(&paths);
10465 
10466 	while ((ch = getopt(argc, argv, "")) != -1) {
10467 		switch (ch) {
10468 		default:
10469 			usage_info();
10470 			/* NOTREACHED */
10471 		}
10472 	}
10473 
10474 	argc -= optind;
10475 	argv += optind;
10476 
10477 #ifndef PROFILE
10478 	if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
10479 	    NULL) == -1)
10480 		err(1, "pledge");
10481 #endif
10482 	cwd = getcwd(NULL, 0);
10483 	if (cwd == NULL) {
10484 		error = got_error_from_errno("getcwd");
10485 		goto done;
10486 	}
10487 
10488 	error = got_worktree_open(&worktree, cwd);
10489 	if (error) {
10490 		if (error->code == GOT_ERR_NOT_WORKTREE)
10491 			error = wrap_not_worktree_error(error, "info", cwd);
10492 		goto done;
10493 	}
10494 
10495 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
10496 	if (error)
10497 		goto done;
10498 
10499 	if (argc >= 1) {
10500 		error = get_worktree_paths_from_argv(&paths, argc, argv,
10501 		    worktree);
10502 		if (error)
10503 			goto done;
10504 		show_files = 1;
10505 	}
10506 
10507 	error = got_object_id_str(&id_str,
10508 	    got_worktree_get_base_commit_id(worktree));
10509 	if (error)
10510 		goto done;
10511 
10512 	error = got_worktree_get_uuid(&uuidstr, worktree);
10513 	if (error)
10514 		goto done;
10515 
10516 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
10517 	printf("work tree base commit: %s\n", id_str);
10518 	printf("work tree path prefix: %s\n",
10519 	    got_worktree_get_path_prefix(worktree));
10520 	printf("work tree branch reference: %s\n",
10521 	    got_worktree_get_head_ref_name(worktree));
10522 	printf("work tree UUID: %s\n", uuidstr);
10523 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
10524 
10525 	if (show_files) {
10526 		struct got_pathlist_entry *pe;
10527 		TAILQ_FOREACH(pe, &paths, entry) {
10528 			if (pe->path_len == 0)
10529 				continue;
10530 			/*
10531 			 * Assume this path will fail. This will be corrected
10532 			 * in print_path_info() in case the path does suceeed.
10533 			 */
10534 			pe->data = (void *)got_error_path(pe->path,
10535 			    GOT_ERR_BAD_PATH);
10536 		}
10537 		error = got_worktree_path_info(worktree, &paths,
10538 		    print_path_info, &paths, check_cancelled, NULL);
10539 		if (error)
10540 			goto done;
10541 		TAILQ_FOREACH(pe, &paths, entry) {
10542 			if (pe->data != NULL) {
10543 				error = pe->data; /* bad path */
10544 				break;
10545 			}
10546 		}
10547 	}
10548 done:
10549 	TAILQ_FOREACH(pe, &paths, entry)
10550 		free((char *)pe->path);
10551 	got_pathlist_free(&paths);
10552 	free(cwd);
10553 	free(id_str);
10554 	free(uuidstr);
10555 	return error;
10556 }