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 or 'gotadmin cleanup'; making the "
2567 	    "repository 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 = STAILQ_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 = STAILQ_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 		STAILQ_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 	STAILQ_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 			STAILQ_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 		STAILQ_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 (!STAILQ_EMPTY(&reversed_commits)) {
3829 		qid = STAILQ_FIRST(&reversed_commits);
3830 		STAILQ_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, 0,
4434 		    print_diff, &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 [-I] [-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, no_ignores = 0;
5161 
5162 	TAILQ_INIT(&paths);
5163 
5164 	while ((ch = getopt(argc, argv, "Is:")) != -1) {
5165 		switch (ch) {
5166 		case 'I':
5167 			no_ignores = 1;
5168 			break;
5169 		case 's':
5170 			for (i = 0; i < strlen(optarg); i++) {
5171 				switch (optarg[i]) {
5172 				case GOT_STATUS_MODIFY:
5173 				case GOT_STATUS_ADD:
5174 				case GOT_STATUS_DELETE:
5175 				case GOT_STATUS_CONFLICT:
5176 				case GOT_STATUS_MISSING:
5177 				case GOT_STATUS_OBSTRUCTED:
5178 				case GOT_STATUS_UNVERSIONED:
5179 				case GOT_STATUS_MODE_CHANGE:
5180 				case GOT_STATUS_NONEXISTENT:
5181 					break;
5182 				default:
5183 					errx(1, "invalid status code '%c'",
5184 					    optarg[i]);
5185 				}
5186 			}
5187 			status_codes = optarg;
5188 			break;
5189 		default:
5190 			usage_status();
5191 			/* NOTREACHED */
5192 		}
5193 	}
5194 
5195 	argc -= optind;
5196 	argv += optind;
5197 
5198 #ifndef PROFILE
5199 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5200 	    NULL) == -1)
5201 		err(1, "pledge");
5202 #endif
5203 	cwd = getcwd(NULL, 0);
5204 	if (cwd == NULL) {
5205 		error = got_error_from_errno("getcwd");
5206 		goto done;
5207 	}
5208 
5209 	error = got_worktree_open(&worktree, cwd);
5210 	if (error) {
5211 		if (error->code == GOT_ERR_NOT_WORKTREE)
5212 			error = wrap_not_worktree_error(error, "status", cwd);
5213 		goto done;
5214 	}
5215 
5216 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5217 	    NULL);
5218 	if (error != NULL)
5219 		goto done;
5220 
5221 	error = apply_unveil(got_repo_get_path(repo), 1,
5222 	    got_worktree_get_root_path(worktree));
5223 	if (error)
5224 		goto done;
5225 
5226 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5227 	if (error)
5228 		goto done;
5229 
5230 	error = got_worktree_status(worktree, &paths, repo, no_ignores,
5231 	    print_status, status_codes, check_cancelled, NULL);
5232 done:
5233 	TAILQ_FOREACH(pe, &paths, entry)
5234 		free((char *)pe->path);
5235 	got_pathlist_free(&paths);
5236 	free(cwd);
5237 	return error;
5238 }
5239 
5240 __dead static void
5241 usage_ref(void)
5242 {
5243 	fprintf(stderr,
5244 	    "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5245 	        "[-d] [name]\n",
5246 	    getprogname());
5247 	exit(1);
5248 }
5249 
5250 static const struct got_error *
5251 list_refs(struct got_repository *repo, const char *refname)
5252 {
5253 	static const struct got_error *err = NULL;
5254 	struct got_reflist_head refs;
5255 	struct got_reflist_entry *re;
5256 
5257 	TAILQ_INIT(&refs);
5258 	err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5259 	if (err)
5260 		return err;
5261 
5262 	TAILQ_FOREACH(re, &refs, entry) {
5263 		char *refstr;
5264 		refstr = got_ref_to_str(re->ref);
5265 		if (refstr == NULL)
5266 			return got_error_from_errno("got_ref_to_str");
5267 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5268 		free(refstr);
5269 	}
5270 
5271 	got_ref_list_free(&refs);
5272 	return NULL;
5273 }
5274 
5275 static const struct got_error *
5276 delete_ref(struct got_repository *repo, const char *refname)
5277 {
5278 	const struct got_error *err = NULL;
5279 	struct got_reference *ref;
5280 
5281 	err = got_ref_open(&ref, repo, refname, 0);
5282 	if (err)
5283 		return err;
5284 
5285 	err = got_ref_delete(ref, repo);
5286 	got_ref_close(ref);
5287 	return err;
5288 }
5289 
5290 static const struct got_error *
5291 add_ref(struct got_repository *repo, const char *refname, const char *target)
5292 {
5293 	const struct got_error *err = NULL;
5294 	struct got_object_id *id;
5295 	struct got_reference *ref = NULL;
5296 
5297 	/*
5298 	 * Don't let the user create a reference name with a leading '-'.
5299 	 * While technically a valid reference name, this case is usually
5300 	 * an unintended typo.
5301 	 */
5302 	if (refname[0] == '-')
5303 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5304 
5305 	err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5306 	    repo);
5307 	if (err) {
5308 		struct got_reference *target_ref;
5309 
5310 		if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5311 			return err;
5312 		err = got_ref_open(&target_ref, repo, target, 0);
5313 		if (err)
5314 			return err;
5315 		err = got_ref_resolve(&id, repo, target_ref);
5316 		got_ref_close(target_ref);
5317 		if (err)
5318 			return err;
5319 	}
5320 
5321 	err = got_ref_alloc(&ref, refname, id);
5322 	if (err)
5323 		goto done;
5324 
5325 	err = got_ref_write(ref, repo);
5326 done:
5327 	if (ref)
5328 		got_ref_close(ref);
5329 	free(id);
5330 	return err;
5331 }
5332 
5333 static const struct got_error *
5334 add_symref(struct got_repository *repo, const char *refname, const char *target)
5335 {
5336 	const struct got_error *err = NULL;
5337 	struct got_reference *ref = NULL;
5338 	struct got_reference *target_ref = NULL;
5339 
5340 	/*
5341 	 * Don't let the user create a reference name with a leading '-'.
5342 	 * While technically a valid reference name, this case is usually
5343 	 * an unintended typo.
5344 	 */
5345 	if (refname[0] == '-')
5346 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5347 
5348 	err = got_ref_open(&target_ref, repo, target, 0);
5349 	if (err)
5350 		return err;
5351 
5352 	err = got_ref_alloc_symref(&ref, refname, target_ref);
5353 	if (err)
5354 		goto done;
5355 
5356 	err = got_ref_write(ref, repo);
5357 done:
5358 	if (target_ref)
5359 		got_ref_close(target_ref);
5360 	if (ref)
5361 		got_ref_close(ref);
5362 	return err;
5363 }
5364 
5365 static const struct got_error *
5366 cmd_ref(int argc, char *argv[])
5367 {
5368 	const struct got_error *error = NULL;
5369 	struct got_repository *repo = NULL;
5370 	struct got_worktree *worktree = NULL;
5371 	char *cwd = NULL, *repo_path = NULL;
5372 	int ch, do_list = 0, do_delete = 0;
5373 	const char *obj_arg = NULL, *symref_target= NULL;
5374 	char *refname = NULL;
5375 
5376 	while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5377 		switch (ch) {
5378 		case 'c':
5379 			obj_arg = optarg;
5380 			break;
5381 		case 'd':
5382 			do_delete = 1;
5383 			break;
5384 		case 'r':
5385 			repo_path = realpath(optarg, NULL);
5386 			if (repo_path == NULL)
5387 				return got_error_from_errno2("realpath",
5388 				    optarg);
5389 			got_path_strip_trailing_slashes(repo_path);
5390 			break;
5391 		case 'l':
5392 			do_list = 1;
5393 			break;
5394 		case 's':
5395 			symref_target = optarg;
5396 			break;
5397 		default:
5398 			usage_ref();
5399 			/* NOTREACHED */
5400 		}
5401 	}
5402 
5403 	if (obj_arg && do_list)
5404 		option_conflict('c', 'l');
5405 	if (obj_arg && do_delete)
5406 		option_conflict('c', 'd');
5407 	if (obj_arg && symref_target)
5408 		option_conflict('c', 's');
5409 	if (symref_target && do_delete)
5410 		option_conflict('s', 'd');
5411 	if (symref_target && do_list)
5412 		option_conflict('s', 'l');
5413 	if (do_delete && do_list)
5414 		option_conflict('d', 'l');
5415 
5416 	argc -= optind;
5417 	argv += optind;
5418 
5419 	if (do_list) {
5420 		if (argc != 0 && argc != 1)
5421 			usage_ref();
5422 		if (argc == 1) {
5423 			refname = strdup(argv[0]);
5424 			if (refname == NULL) {
5425 				error = got_error_from_errno("strdup");
5426 				goto done;
5427 			}
5428 		}
5429 	} else {
5430 		if (argc != 1)
5431 			usage_ref();
5432 		refname = strdup(argv[0]);
5433 		if (refname == NULL) {
5434 			error = got_error_from_errno("strdup");
5435 			goto done;
5436 		}
5437 	}
5438 
5439 	if (refname)
5440 		got_path_strip_trailing_slashes(refname);
5441 
5442 #ifndef PROFILE
5443 	if (do_list) {
5444 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5445 		    NULL) == -1)
5446 			err(1, "pledge");
5447 	} else {
5448 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5449 		    "sendfd unveil", NULL) == -1)
5450 			err(1, "pledge");
5451 	}
5452 #endif
5453 	cwd = getcwd(NULL, 0);
5454 	if (cwd == NULL) {
5455 		error = got_error_from_errno("getcwd");
5456 		goto done;
5457 	}
5458 
5459 	if (repo_path == NULL) {
5460 		error = got_worktree_open(&worktree, cwd);
5461 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5462 			goto done;
5463 		else
5464 			error = NULL;
5465 		if (worktree) {
5466 			repo_path =
5467 			    strdup(got_worktree_get_repo_path(worktree));
5468 			if (repo_path == NULL)
5469 				error = got_error_from_errno("strdup");
5470 			if (error)
5471 				goto done;
5472 		} else {
5473 			repo_path = strdup(cwd);
5474 			if (repo_path == NULL) {
5475 				error = got_error_from_errno("strdup");
5476 				goto done;
5477 			}
5478 		}
5479 	}
5480 
5481 	error = got_repo_open(&repo, repo_path, NULL);
5482 	if (error != NULL)
5483 		goto done;
5484 
5485 	error = apply_unveil(got_repo_get_path(repo), do_list,
5486 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
5487 	if (error)
5488 		goto done;
5489 
5490 	if (do_list)
5491 		error = list_refs(repo, refname);
5492 	else if (do_delete)
5493 		error = delete_ref(repo, refname);
5494 	else if (symref_target)
5495 		error = add_symref(repo, refname, symref_target);
5496 	else {
5497 		if (obj_arg == NULL)
5498 			usage_ref();
5499 		error = add_ref(repo, refname, obj_arg);
5500 	}
5501 done:
5502 	free(refname);
5503 	if (repo) {
5504 		const struct got_error *close_err = got_repo_close(repo);
5505 		if (error == NULL)
5506 			error = close_err;
5507 	}
5508 	if (worktree)
5509 		got_worktree_close(worktree);
5510 	free(cwd);
5511 	free(repo_path);
5512 	return error;
5513 }
5514 
5515 __dead static void
5516 usage_branch(void)
5517 {
5518 	fprintf(stderr,
5519 	    "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5520 	        "[name]\n", getprogname());
5521 	exit(1);
5522 }
5523 
5524 static const struct got_error *
5525 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5526     struct got_reference *ref)
5527 {
5528 	const struct got_error *err = NULL;
5529 	const char *refname, *marker = "  ";
5530 	char *refstr;
5531 
5532 	refname = got_ref_get_name(ref);
5533 	if (worktree && strcmp(refname,
5534 	    got_worktree_get_head_ref_name(worktree)) == 0) {
5535 		struct got_object_id *id = NULL;
5536 
5537 		err = got_ref_resolve(&id, repo, ref);
5538 		if (err)
5539 			return err;
5540 		if (got_object_id_cmp(id,
5541 		    got_worktree_get_base_commit_id(worktree)) == 0)
5542 			marker = "* ";
5543 		else
5544 			marker = "~ ";
5545 		free(id);
5546 	}
5547 
5548 	if (strncmp(refname, "refs/heads/", 11) == 0)
5549 		refname += 11;
5550 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5551 		refname += 18;
5552 	if (strncmp(refname, "refs/remotes/", 13) == 0)
5553 		refname += 13;
5554 
5555 	refstr = got_ref_to_str(ref);
5556 	if (refstr == NULL)
5557 		return got_error_from_errno("got_ref_to_str");
5558 
5559 	printf("%s%s: %s\n", marker, refname, refstr);
5560 	free(refstr);
5561 	return NULL;
5562 }
5563 
5564 static const struct got_error *
5565 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5566 {
5567 	const char *refname;
5568 
5569 	if (worktree == NULL)
5570 		return got_error(GOT_ERR_NOT_WORKTREE);
5571 
5572 	refname = got_worktree_get_head_ref_name(worktree);
5573 
5574 	if (strncmp(refname, "refs/heads/", 11) == 0)
5575 		refname += 11;
5576 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5577 		refname += 18;
5578 
5579 	printf("%s\n", refname);
5580 
5581 	return NULL;
5582 }
5583 
5584 static const struct got_error *
5585 list_branches(struct got_repository *repo, struct got_worktree *worktree)
5586 {
5587 	static const struct got_error *err = NULL;
5588 	struct got_reflist_head refs;
5589 	struct got_reflist_entry *re;
5590 	struct got_reference *temp_ref = NULL;
5591 	int rebase_in_progress, histedit_in_progress;
5592 
5593 	TAILQ_INIT(&refs);
5594 
5595 	if (worktree) {
5596 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
5597 		    worktree);
5598 		if (err)
5599 			return err;
5600 
5601 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
5602 		    worktree);
5603 		if (err)
5604 			return err;
5605 
5606 		if (rebase_in_progress || histedit_in_progress) {
5607 			err = got_ref_open(&temp_ref, repo,
5608 			    got_worktree_get_head_ref_name(worktree), 0);
5609 			if (err)
5610 				return err;
5611 			list_branch(repo, worktree, temp_ref);
5612 			got_ref_close(temp_ref);
5613 		}
5614 	}
5615 
5616 	err = got_ref_list(&refs, repo, "refs/heads",
5617 	    got_ref_cmp_by_name, NULL);
5618 	if (err)
5619 		return err;
5620 
5621 	TAILQ_FOREACH(re, &refs, entry)
5622 		list_branch(repo, worktree, re->ref);
5623 
5624 	got_ref_list_free(&refs);
5625 
5626 	err = got_ref_list(&refs, repo, "refs/remotes",
5627 	    got_ref_cmp_by_name, NULL);
5628 	if (err)
5629 		return err;
5630 
5631 	TAILQ_FOREACH(re, &refs, entry)
5632 		list_branch(repo, worktree, re->ref);
5633 
5634 	got_ref_list_free(&refs);
5635 
5636 	return NULL;
5637 }
5638 
5639 static const struct got_error *
5640 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5641     const char *branch_name)
5642 {
5643 	const struct got_error *err = NULL;
5644 	struct got_reference *ref = NULL;
5645 	char *refname;
5646 
5647 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5648 		return got_error_from_errno("asprintf");
5649 
5650 	err = got_ref_open(&ref, repo, refname, 0);
5651 	if (err)
5652 		goto done;
5653 
5654 	if (worktree &&
5655 	    strcmp(got_worktree_get_head_ref_name(worktree),
5656 	    got_ref_get_name(ref)) == 0) {
5657 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
5658 		    "will not delete this work tree's current branch");
5659 		goto done;
5660 	}
5661 
5662 	err = got_ref_delete(ref, repo);
5663 done:
5664 	if (ref)
5665 		got_ref_close(ref);
5666 	free(refname);
5667 	return err;
5668 }
5669 
5670 static const struct got_error *
5671 add_branch(struct got_repository *repo, const char *branch_name,
5672     struct got_object_id *base_commit_id)
5673 {
5674 	const struct got_error *err = NULL;
5675 	struct got_reference *ref = NULL;
5676 	char *base_refname = NULL, *refname = NULL;
5677 
5678 	/*
5679 	 * Don't let the user create a branch name with a leading '-'.
5680 	 * While technically a valid reference name, this case is usually
5681 	 * an unintended typo.
5682 	 */
5683 	if (branch_name[0] == '-')
5684 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5685 
5686 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5687 		err = got_error_from_errno("asprintf");
5688 		goto done;
5689 	}
5690 
5691 	err = got_ref_open(&ref, repo, refname, 0);
5692 	if (err == NULL) {
5693 		err = got_error(GOT_ERR_BRANCH_EXISTS);
5694 		goto done;
5695 	} else if (err->code != GOT_ERR_NOT_REF)
5696 		goto done;
5697 
5698 	err = got_ref_alloc(&ref, refname, base_commit_id);
5699 	if (err)
5700 		goto done;
5701 
5702 	err = got_ref_write(ref, repo);
5703 done:
5704 	if (ref)
5705 		got_ref_close(ref);
5706 	free(base_refname);
5707 	free(refname);
5708 	return err;
5709 }
5710 
5711 static const struct got_error *
5712 cmd_branch(int argc, char *argv[])
5713 {
5714 	const struct got_error *error = NULL;
5715 	struct got_repository *repo = NULL;
5716 	struct got_worktree *worktree = NULL;
5717 	char *cwd = NULL, *repo_path = NULL;
5718 	int ch, do_list = 0, do_show = 0, do_update = 1;
5719 	const char *delref = NULL, *commit_id_arg = NULL;
5720 	struct got_reference *ref = NULL;
5721 	struct got_pathlist_head paths;
5722 	struct got_pathlist_entry *pe;
5723 	struct got_object_id *commit_id = NULL;
5724 	char *commit_id_str = NULL;
5725 
5726 	TAILQ_INIT(&paths);
5727 
5728 	while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5729 		switch (ch) {
5730 		case 'c':
5731 			commit_id_arg = optarg;
5732 			break;
5733 		case 'd':
5734 			delref = optarg;
5735 			break;
5736 		case 'r':
5737 			repo_path = realpath(optarg, NULL);
5738 			if (repo_path == NULL)
5739 				return got_error_from_errno2("realpath",
5740 				    optarg);
5741 			got_path_strip_trailing_slashes(repo_path);
5742 			break;
5743 		case 'l':
5744 			do_list = 1;
5745 			break;
5746 		case 'n':
5747 			do_update = 0;
5748 			break;
5749 		default:
5750 			usage_branch();
5751 			/* NOTREACHED */
5752 		}
5753 	}
5754 
5755 	if (do_list && delref)
5756 		option_conflict('l', 'd');
5757 
5758 	argc -= optind;
5759 	argv += optind;
5760 
5761 	if (!do_list && !delref && argc == 0)
5762 		do_show = 1;
5763 
5764 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
5765 		errx(1, "-c option can only be used when creating a branch");
5766 
5767 	if (do_list || delref) {
5768 		if (argc > 0)
5769 			usage_branch();
5770 	} else if (!do_show && argc != 1)
5771 		usage_branch();
5772 
5773 #ifndef PROFILE
5774 	if (do_list || do_show) {
5775 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5776 		    NULL) == -1)
5777 			err(1, "pledge");
5778 	} else {
5779 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5780 		    "sendfd unveil", NULL) == -1)
5781 			err(1, "pledge");
5782 	}
5783 #endif
5784 	cwd = getcwd(NULL, 0);
5785 	if (cwd == NULL) {
5786 		error = got_error_from_errno("getcwd");
5787 		goto done;
5788 	}
5789 
5790 	if (repo_path == NULL) {
5791 		error = got_worktree_open(&worktree, cwd);
5792 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5793 			goto done;
5794 		else
5795 			error = NULL;
5796 		if (worktree) {
5797 			repo_path =
5798 			    strdup(got_worktree_get_repo_path(worktree));
5799 			if (repo_path == NULL)
5800 				error = got_error_from_errno("strdup");
5801 			if (error)
5802 				goto done;
5803 		} else {
5804 			repo_path = strdup(cwd);
5805 			if (repo_path == NULL) {
5806 				error = got_error_from_errno("strdup");
5807 				goto done;
5808 			}
5809 		}
5810 	}
5811 
5812 	error = got_repo_open(&repo, repo_path, NULL);
5813 	if (error != NULL)
5814 		goto done;
5815 
5816 	error = apply_unveil(got_repo_get_path(repo), do_list,
5817 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
5818 	if (error)
5819 		goto done;
5820 
5821 	if (do_show)
5822 		error = show_current_branch(repo, worktree);
5823 	else if (do_list)
5824 		error = list_branches(repo, worktree);
5825 	else if (delref)
5826 		error = delete_branch(repo, worktree, delref);
5827 	else {
5828 		struct got_reflist_head refs;
5829 		TAILQ_INIT(&refs);
5830 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5831 		    NULL);
5832 		if (error)
5833 			goto done;
5834 		if (commit_id_arg == NULL)
5835 			commit_id_arg = worktree ?
5836 			    got_worktree_get_head_ref_name(worktree) :
5837 			    GOT_REF_HEAD;
5838 		error = got_repo_match_object_id(&commit_id, NULL,
5839 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5840 		got_ref_list_free(&refs);
5841 		if (error)
5842 			goto done;
5843 		error = add_branch(repo, argv[0], commit_id);
5844 		if (error)
5845 			goto done;
5846 		if (worktree && do_update) {
5847 			struct got_update_progress_arg upa;
5848 			char *branch_refname = NULL;
5849 
5850 			error = got_object_id_str(&commit_id_str, commit_id);
5851 			if (error)
5852 				goto done;
5853 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
5854 			    worktree);
5855 			if (error)
5856 				goto done;
5857 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5858 			    == -1) {
5859 				error = got_error_from_errno("asprintf");
5860 				goto done;
5861 			}
5862 			error = got_ref_open(&ref, repo, branch_refname, 0);
5863 			free(branch_refname);
5864 			if (error)
5865 				goto done;
5866 			error = switch_head_ref(ref, commit_id, worktree,
5867 			    repo);
5868 			if (error)
5869 				goto done;
5870 			error = got_worktree_set_base_commit_id(worktree, repo,
5871 			    commit_id);
5872 			if (error)
5873 				goto done;
5874 			memset(&upa, 0, sizeof(upa));
5875 			error = got_worktree_checkout_files(worktree, &paths,
5876 			    repo, update_progress, &upa, check_cancelled,
5877 			    NULL);
5878 			if (error)
5879 				goto done;
5880 			if (upa.did_something)
5881 				printf("Updated to commit %s\n", commit_id_str);
5882 			print_update_progress_stats(&upa);
5883 		}
5884 	}
5885 done:
5886 	if (ref)
5887 		got_ref_close(ref);
5888 	if (repo) {
5889 		const struct got_error *close_err = got_repo_close(repo);
5890 		if (error == NULL)
5891 			error = close_err;
5892 	}
5893 	if (worktree)
5894 		got_worktree_close(worktree);
5895 	free(cwd);
5896 	free(repo_path);
5897 	free(commit_id);
5898 	free(commit_id_str);
5899 	TAILQ_FOREACH(pe, &paths, entry)
5900 		free((char *)pe->path);
5901 	got_pathlist_free(&paths);
5902 	return error;
5903 }
5904 
5905 
5906 __dead static void
5907 usage_tag(void)
5908 {
5909 	fprintf(stderr,
5910 	    "usage: %s tag [-c commit] [-r repository] [-l] "
5911 	        "[-m message] name\n", getprogname());
5912 	exit(1);
5913 }
5914 
5915 #if 0
5916 static const struct got_error *
5917 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5918 {
5919 	const struct got_error *err = NULL;
5920 	struct got_reflist_entry *re, *se, *new;
5921 	struct got_object_id *re_id, *se_id;
5922 	struct got_tag_object *re_tag, *se_tag;
5923 	time_t re_time, se_time;
5924 
5925 	STAILQ_FOREACH(re, tags, entry) {
5926 		se = STAILQ_FIRST(sorted);
5927 		if (se == NULL) {
5928 			err = got_reflist_entry_dup(&new, re);
5929 			if (err)
5930 				return err;
5931 			STAILQ_INSERT_HEAD(sorted, new, entry);
5932 			continue;
5933 		} else {
5934 			err = got_ref_resolve(&re_id, repo, re->ref);
5935 			if (err)
5936 				break;
5937 			err = got_object_open_as_tag(&re_tag, repo, re_id);
5938 			free(re_id);
5939 			if (err)
5940 				break;
5941 			re_time = got_object_tag_get_tagger_time(re_tag);
5942 			got_object_tag_close(re_tag);
5943 		}
5944 
5945 		while (se) {
5946 			err = got_ref_resolve(&se_id, repo, re->ref);
5947 			if (err)
5948 				break;
5949 			err = got_object_open_as_tag(&se_tag, repo, se_id);
5950 			free(se_id);
5951 			if (err)
5952 				break;
5953 			se_time = got_object_tag_get_tagger_time(se_tag);
5954 			got_object_tag_close(se_tag);
5955 
5956 			if (se_time > re_time) {
5957 				err = got_reflist_entry_dup(&new, re);
5958 				if (err)
5959 					return err;
5960 				STAILQ_INSERT_AFTER(sorted, se, new, entry);
5961 				break;
5962 			}
5963 			se = STAILQ_NEXT(se, entry);
5964 			continue;
5965 		}
5966 	}
5967 done:
5968 	return err;
5969 }
5970 #endif
5971 
5972 static const struct got_error *
5973 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5974 {
5975 	static const struct got_error *err = NULL;
5976 	struct got_reflist_head refs;
5977 	struct got_reflist_entry *re;
5978 
5979 	TAILQ_INIT(&refs);
5980 
5981 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5982 	if (err)
5983 		return err;
5984 
5985 	TAILQ_FOREACH(re, &refs, entry) {
5986 		const char *refname;
5987 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5988 		char datebuf[26];
5989 		const char *tagger;
5990 		time_t tagger_time;
5991 		struct got_object_id *id;
5992 		struct got_tag_object *tag;
5993 		struct got_commit_object *commit = NULL;
5994 
5995 		refname = got_ref_get_name(re->ref);
5996 		if (strncmp(refname, "refs/tags/", 10) != 0)
5997 			continue;
5998 		refname += 10;
5999 		refstr = got_ref_to_str(re->ref);
6000 		if (refstr == NULL) {
6001 			err = got_error_from_errno("got_ref_to_str");
6002 			break;
6003 		}
6004 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6005 		free(refstr);
6006 
6007 		err = got_ref_resolve(&id, repo, re->ref);
6008 		if (err)
6009 			break;
6010 		err = got_object_open_as_tag(&tag, repo, id);
6011 		if (err) {
6012 			if (err->code != GOT_ERR_OBJ_TYPE) {
6013 				free(id);
6014 				break;
6015 			}
6016 			/* "lightweight" tag */
6017 			err = got_object_open_as_commit(&commit, repo, id);
6018 			if (err) {
6019 				free(id);
6020 				break;
6021 			}
6022 			tagger = got_object_commit_get_committer(commit);
6023 			tagger_time =
6024 			    got_object_commit_get_committer_time(commit);
6025 			err = got_object_id_str(&id_str, id);
6026 			free(id);
6027 			if (err)
6028 				break;
6029 		} else {
6030 			free(id);
6031 			tagger = got_object_tag_get_tagger(tag);
6032 			tagger_time = got_object_tag_get_tagger_time(tag);
6033 			err = got_object_id_str(&id_str,
6034 			    got_object_tag_get_object_id(tag));
6035 			if (err)
6036 				break;
6037 		}
6038 		printf("from: %s\n", tagger);
6039 		datestr = get_datestr(&tagger_time, datebuf);
6040 		if (datestr)
6041 			printf("date: %s UTC\n", datestr);
6042 		if (commit)
6043 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6044 		else {
6045 			switch (got_object_tag_get_object_type(tag)) {
6046 			case GOT_OBJ_TYPE_BLOB:
6047 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6048 				    id_str);
6049 				break;
6050 			case GOT_OBJ_TYPE_TREE:
6051 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6052 				    id_str);
6053 				break;
6054 			case GOT_OBJ_TYPE_COMMIT:
6055 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6056 				    id_str);
6057 				break;
6058 			case GOT_OBJ_TYPE_TAG:
6059 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6060 				    id_str);
6061 				break;
6062 			default:
6063 				break;
6064 			}
6065 		}
6066 		free(id_str);
6067 		if (commit) {
6068 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
6069 			if (err)
6070 				break;
6071 			got_object_commit_close(commit);
6072 		} else {
6073 			tagmsg0 = strdup(got_object_tag_get_message(tag));
6074 			got_object_tag_close(tag);
6075 			if (tagmsg0 == NULL) {
6076 				err = got_error_from_errno("strdup");
6077 				break;
6078 			}
6079 		}
6080 
6081 		tagmsg = tagmsg0;
6082 		do {
6083 			line = strsep(&tagmsg, "\n");
6084 			if (line)
6085 				printf(" %s\n", line);
6086 		} while (line);
6087 		free(tagmsg0);
6088 	}
6089 
6090 	got_ref_list_free(&refs);
6091 	return NULL;
6092 }
6093 
6094 static const struct got_error *
6095 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6096     const char *tag_name, const char *repo_path)
6097 {
6098 	const struct got_error *err = NULL;
6099 	char *template = NULL, *initial_content = NULL;
6100 	char *editor = NULL;
6101 	int initial_content_len;
6102 	int fd = -1;
6103 
6104 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6105 		err = got_error_from_errno("asprintf");
6106 		goto done;
6107 	}
6108 
6109 	initial_content_len = asprintf(&initial_content,
6110 	    "\n# tagging commit %s as %s\n",
6111 	    commit_id_str, tag_name);
6112 	if (initial_content_len == -1) {
6113 		err = got_error_from_errno("asprintf");
6114 		goto done;
6115 	}
6116 
6117 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6118 	if (err)
6119 		goto done;
6120 
6121 	if (write(fd, initial_content, initial_content_len) == -1) {
6122 		err = got_error_from_errno2("write", *tagmsg_path);
6123 		goto done;
6124 	}
6125 
6126 	err = get_editor(&editor);
6127 	if (err)
6128 		goto done;
6129 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6130 	    initial_content_len, 1);
6131 done:
6132 	free(initial_content);
6133 	free(template);
6134 	free(editor);
6135 
6136 	if (fd != -1 && close(fd) == -1 && err == NULL)
6137 		err = got_error_from_errno2("close", *tagmsg_path);
6138 
6139 	/* Editor is done; we can now apply unveil(2) */
6140 	if (err == NULL)
6141 		err = apply_unveil(repo_path, 0, NULL);
6142 	if (err) {
6143 		free(*tagmsg);
6144 		*tagmsg = NULL;
6145 	}
6146 	return err;
6147 }
6148 
6149 static const struct got_error *
6150 add_tag(struct got_repository *repo, struct got_worktree *worktree,
6151     const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6152 {
6153 	const struct got_error *err = NULL;
6154 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
6155 	char *label = NULL, *commit_id_str = NULL;
6156 	struct got_reference *ref = NULL;
6157 	char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6158 	char *tagmsg_path = NULL, *tag_id_str = NULL;
6159 	int preserve_tagmsg = 0;
6160 	struct got_reflist_head refs;
6161 
6162 	TAILQ_INIT(&refs);
6163 
6164 	/*
6165 	 * Don't let the user create a tag name with a leading '-'.
6166 	 * While technically a valid reference name, this case is usually
6167 	 * an unintended typo.
6168 	 */
6169 	if (tag_name[0] == '-')
6170 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6171 
6172 	err = get_author(&tagger, repo, worktree);
6173 	if (err)
6174 		return err;
6175 
6176 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6177 	if (err)
6178 		goto done;
6179 
6180 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6181 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
6182 	if (err)
6183 		goto done;
6184 
6185 	err = got_object_id_str(&commit_id_str, commit_id);
6186 	if (err)
6187 		goto done;
6188 
6189 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
6190 		refname = strdup(tag_name);
6191 		if (refname == NULL) {
6192 			err = got_error_from_errno("strdup");
6193 			goto done;
6194 		}
6195 		tag_name += 10;
6196 	} else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6197 		err = got_error_from_errno("asprintf");
6198 		goto done;
6199 	}
6200 
6201 	err = got_ref_open(&ref, repo, refname, 0);
6202 	if (err == NULL) {
6203 		err = got_error(GOT_ERR_TAG_EXISTS);
6204 		goto done;
6205 	} else if (err->code != GOT_ERR_NOT_REF)
6206 		goto done;
6207 
6208 	if (tagmsg_arg == NULL) {
6209 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6210 		    tag_name, got_repo_get_path(repo));
6211 		if (err) {
6212 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6213 			    tagmsg_path != NULL)
6214 				preserve_tagmsg = 1;
6215 			goto done;
6216 		}
6217 	}
6218 
6219 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
6220 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6221 	if (err) {
6222 		if (tagmsg_path)
6223 			preserve_tagmsg = 1;
6224 		goto done;
6225 	}
6226 
6227 	err = got_ref_alloc(&ref, refname, tag_id);
6228 	if (err) {
6229 		if (tagmsg_path)
6230 			preserve_tagmsg = 1;
6231 		goto done;
6232 	}
6233 
6234 	err = got_ref_write(ref, repo);
6235 	if (err) {
6236 		if (tagmsg_path)
6237 			preserve_tagmsg = 1;
6238 		goto done;
6239 	}
6240 
6241 	err = got_object_id_str(&tag_id_str, tag_id);
6242 	if (err) {
6243 		if (tagmsg_path)
6244 			preserve_tagmsg = 1;
6245 		goto done;
6246 	}
6247 	printf("Created tag %s\n", tag_id_str);
6248 done:
6249 	if (preserve_tagmsg) {
6250 		fprintf(stderr, "%s: tag message preserved in %s\n",
6251 		    getprogname(), tagmsg_path);
6252 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6253 		err = got_error_from_errno2("unlink", tagmsg_path);
6254 	free(tag_id_str);
6255 	if (ref)
6256 		got_ref_close(ref);
6257 	free(commit_id);
6258 	free(commit_id_str);
6259 	free(refname);
6260 	free(tagmsg);
6261 	free(tagmsg_path);
6262 	free(tagger);
6263 	got_ref_list_free(&refs);
6264 	return err;
6265 }
6266 
6267 static const struct got_error *
6268 cmd_tag(int argc, char *argv[])
6269 {
6270 	const struct got_error *error = NULL;
6271 	struct got_repository *repo = NULL;
6272 	struct got_worktree *worktree = NULL;
6273 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6274 	char *gitconfig_path = NULL;
6275 	const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6276 	int ch, do_list = 0;
6277 
6278 	while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6279 		switch (ch) {
6280 		case 'c':
6281 			commit_id_arg = optarg;
6282 			break;
6283 		case 'm':
6284 			tagmsg = optarg;
6285 			break;
6286 		case 'r':
6287 			repo_path = realpath(optarg, NULL);
6288 			if (repo_path == NULL)
6289 				return got_error_from_errno2("realpath",
6290 				    optarg);
6291 			got_path_strip_trailing_slashes(repo_path);
6292 			break;
6293 		case 'l':
6294 			do_list = 1;
6295 			break;
6296 		default:
6297 			usage_tag();
6298 			/* NOTREACHED */
6299 		}
6300 	}
6301 
6302 	argc -= optind;
6303 	argv += optind;
6304 
6305 	if (do_list) {
6306 		if (commit_id_arg != NULL)
6307 			errx(1,
6308 			    "-c option can only be used when creating a tag");
6309 		if (tagmsg)
6310 			option_conflict('l', 'm');
6311 		if (argc > 0)
6312 			usage_tag();
6313 	} else if (argc != 1)
6314 		usage_tag();
6315 
6316 	tag_name = argv[0];
6317 
6318 #ifndef PROFILE
6319 	if (do_list) {
6320 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6321 		    NULL) == -1)
6322 			err(1, "pledge");
6323 	} else {
6324 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6325 		    "sendfd unveil", NULL) == -1)
6326 			err(1, "pledge");
6327 	}
6328 #endif
6329 	cwd = getcwd(NULL, 0);
6330 	if (cwd == NULL) {
6331 		error = got_error_from_errno("getcwd");
6332 		goto done;
6333 	}
6334 
6335 	if (repo_path == NULL) {
6336 		error = got_worktree_open(&worktree, cwd);
6337 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6338 			goto done;
6339 		else
6340 			error = NULL;
6341 		if (worktree) {
6342 			repo_path =
6343 			    strdup(got_worktree_get_repo_path(worktree));
6344 			if (repo_path == NULL)
6345 				error = got_error_from_errno("strdup");
6346 			if (error)
6347 				goto done;
6348 		} else {
6349 			repo_path = strdup(cwd);
6350 			if (repo_path == NULL) {
6351 				error = got_error_from_errno("strdup");
6352 				goto done;
6353 			}
6354 		}
6355 	}
6356 
6357 	if (do_list) {
6358 		error = got_repo_open(&repo, repo_path, NULL);
6359 		if (error != NULL)
6360 			goto done;
6361 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6362 		if (error)
6363 			goto done;
6364 		error = list_tags(repo, worktree);
6365 	} else {
6366 		error = get_gitconfig_path(&gitconfig_path);
6367 		if (error)
6368 			goto done;
6369 		error = got_repo_open(&repo, repo_path, gitconfig_path);
6370 		if (error != NULL)
6371 			goto done;
6372 
6373 		if (tagmsg) {
6374 			error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6375 			if (error)
6376 				goto done;
6377 		}
6378 
6379 		if (commit_id_arg == NULL) {
6380 			struct got_reference *head_ref;
6381 			struct got_object_id *commit_id;
6382 			error = got_ref_open(&head_ref, repo,
6383 			    worktree ? got_worktree_get_head_ref_name(worktree)
6384 			    : GOT_REF_HEAD, 0);
6385 			if (error)
6386 				goto done;
6387 			error = got_ref_resolve(&commit_id, repo, head_ref);
6388 			got_ref_close(head_ref);
6389 			if (error)
6390 				goto done;
6391 			error = got_object_id_str(&commit_id_str, commit_id);
6392 			free(commit_id);
6393 			if (error)
6394 				goto done;
6395 		}
6396 
6397 		error = add_tag(repo, worktree, tag_name,
6398 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6399 	}
6400 done:
6401 	if (repo) {
6402 		const struct got_error *close_err = got_repo_close(repo);
6403 		if (error == NULL)
6404 			error = close_err;
6405 	}
6406 	if (worktree)
6407 		got_worktree_close(worktree);
6408 	free(cwd);
6409 	free(repo_path);
6410 	free(gitconfig_path);
6411 	free(commit_id_str);
6412 	return error;
6413 }
6414 
6415 __dead static void
6416 usage_add(void)
6417 {
6418 	fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6419 	    getprogname());
6420 	exit(1);
6421 }
6422 
6423 static const struct got_error *
6424 add_progress(void *arg, unsigned char status, const char *path)
6425 {
6426 	while (path[0] == '/')
6427 		path++;
6428 	printf("%c  %s\n", status, path);
6429 	return NULL;
6430 }
6431 
6432 static const struct got_error *
6433 cmd_add(int argc, char *argv[])
6434 {
6435 	const struct got_error *error = NULL;
6436 	struct got_repository *repo = NULL;
6437 	struct got_worktree *worktree = NULL;
6438 	char *cwd = NULL;
6439 	struct got_pathlist_head paths;
6440 	struct got_pathlist_entry *pe;
6441 	int ch, can_recurse = 0, no_ignores = 0;
6442 
6443 	TAILQ_INIT(&paths);
6444 
6445 	while ((ch = getopt(argc, argv, "IR")) != -1) {
6446 		switch (ch) {
6447 		case 'I':
6448 			no_ignores = 1;
6449 			break;
6450 		case 'R':
6451 			can_recurse = 1;
6452 			break;
6453 		default:
6454 			usage_add();
6455 			/* NOTREACHED */
6456 		}
6457 	}
6458 
6459 	argc -= optind;
6460 	argv += optind;
6461 
6462 #ifndef PROFILE
6463 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6464 	    NULL) == -1)
6465 		err(1, "pledge");
6466 #endif
6467 	if (argc < 1)
6468 		usage_add();
6469 
6470 	cwd = getcwd(NULL, 0);
6471 	if (cwd == NULL) {
6472 		error = got_error_from_errno("getcwd");
6473 		goto done;
6474 	}
6475 
6476 	error = got_worktree_open(&worktree, cwd);
6477 	if (error) {
6478 		if (error->code == GOT_ERR_NOT_WORKTREE)
6479 			error = wrap_not_worktree_error(error, "add", cwd);
6480 		goto done;
6481 	}
6482 
6483 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6484 	    NULL);
6485 	if (error != NULL)
6486 		goto done;
6487 
6488 	error = apply_unveil(got_repo_get_path(repo), 1,
6489 	    got_worktree_get_root_path(worktree));
6490 	if (error)
6491 		goto done;
6492 
6493 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6494 	if (error)
6495 		goto done;
6496 
6497 	if (!can_recurse) {
6498 		char *ondisk_path;
6499 		struct stat sb;
6500 		TAILQ_FOREACH(pe, &paths, entry) {
6501 			if (asprintf(&ondisk_path, "%s/%s",
6502 			    got_worktree_get_root_path(worktree),
6503 			    pe->path) == -1) {
6504 				error = got_error_from_errno("asprintf");
6505 				goto done;
6506 			}
6507 			if (lstat(ondisk_path, &sb) == -1) {
6508 				if (errno == ENOENT) {
6509 					free(ondisk_path);
6510 					continue;
6511 				}
6512 				error = got_error_from_errno2("lstat",
6513 				    ondisk_path);
6514 				free(ondisk_path);
6515 				goto done;
6516 			}
6517 			free(ondisk_path);
6518 			if (S_ISDIR(sb.st_mode)) {
6519 				error = got_error_msg(GOT_ERR_BAD_PATH,
6520 				    "adding directories requires -R option");
6521 				goto done;
6522 			}
6523 		}
6524 	}
6525 
6526 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
6527 	    NULL, repo, no_ignores);
6528 done:
6529 	if (repo) {
6530 		const struct got_error *close_err = got_repo_close(repo);
6531 		if (error == NULL)
6532 			error = close_err;
6533 	}
6534 	if (worktree)
6535 		got_worktree_close(worktree);
6536 	TAILQ_FOREACH(pe, &paths, entry)
6537 		free((char *)pe->path);
6538 	got_pathlist_free(&paths);
6539 	free(cwd);
6540 	return error;
6541 }
6542 
6543 __dead static void
6544 usage_remove(void)
6545 {
6546 	fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6547 	    "path ...\n", getprogname());
6548 	exit(1);
6549 }
6550 
6551 static const struct got_error *
6552 print_remove_status(void *arg, unsigned char status,
6553     unsigned char staged_status, const char *path)
6554 {
6555 	while (path[0] == '/')
6556 		path++;
6557 	if (status == GOT_STATUS_NONEXISTENT)
6558 		return NULL;
6559 	if (status == staged_status && (status == GOT_STATUS_DELETE))
6560 		status = GOT_STATUS_NO_CHANGE;
6561 	printf("%c%c %s\n", status, staged_status, path);
6562 	return NULL;
6563 }
6564 
6565 static const struct got_error *
6566 cmd_remove(int argc, char *argv[])
6567 {
6568 	const struct got_error *error = NULL;
6569 	struct got_worktree *worktree = NULL;
6570 	struct got_repository *repo = NULL;
6571 	const char *status_codes = NULL;
6572 	char *cwd = NULL;
6573 	struct got_pathlist_head paths;
6574 	struct got_pathlist_entry *pe;
6575 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6576 
6577 	TAILQ_INIT(&paths);
6578 
6579 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6580 		switch (ch) {
6581 		case 'f':
6582 			delete_local_mods = 1;
6583 			break;
6584 		case 'k':
6585 			keep_on_disk = 1;
6586 			break;
6587 		case 'R':
6588 			can_recurse = 1;
6589 			break;
6590 		case 's':
6591 			for (i = 0; i < strlen(optarg); i++) {
6592 				switch (optarg[i]) {
6593 				case GOT_STATUS_MODIFY:
6594 					delete_local_mods = 1;
6595 					break;
6596 				case GOT_STATUS_MISSING:
6597 					break;
6598 				default:
6599 					errx(1, "invalid status code '%c'",
6600 					    optarg[i]);
6601 				}
6602 			}
6603 			status_codes = optarg;
6604 			break;
6605 		default:
6606 			usage_remove();
6607 			/* NOTREACHED */
6608 		}
6609 	}
6610 
6611 	argc -= optind;
6612 	argv += optind;
6613 
6614 #ifndef PROFILE
6615 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6616 	    NULL) == -1)
6617 		err(1, "pledge");
6618 #endif
6619 	if (argc < 1)
6620 		usage_remove();
6621 
6622 	cwd = getcwd(NULL, 0);
6623 	if (cwd == NULL) {
6624 		error = got_error_from_errno("getcwd");
6625 		goto done;
6626 	}
6627 	error = got_worktree_open(&worktree, cwd);
6628 	if (error) {
6629 		if (error->code == GOT_ERR_NOT_WORKTREE)
6630 			error = wrap_not_worktree_error(error, "remove", cwd);
6631 		goto done;
6632 	}
6633 
6634 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6635 	    NULL);
6636 	if (error)
6637 		goto done;
6638 
6639 	error = apply_unveil(got_repo_get_path(repo), 1,
6640 	    got_worktree_get_root_path(worktree));
6641 	if (error)
6642 		goto done;
6643 
6644 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6645 	if (error)
6646 		goto done;
6647 
6648 	if (!can_recurse) {
6649 		char *ondisk_path;
6650 		struct stat sb;
6651 		TAILQ_FOREACH(pe, &paths, entry) {
6652 			if (asprintf(&ondisk_path, "%s/%s",
6653 			    got_worktree_get_root_path(worktree),
6654 			    pe->path) == -1) {
6655 				error = got_error_from_errno("asprintf");
6656 				goto done;
6657 			}
6658 			if (lstat(ondisk_path, &sb) == -1) {
6659 				if (errno == ENOENT) {
6660 					free(ondisk_path);
6661 					continue;
6662 				}
6663 				error = got_error_from_errno2("lstat",
6664 				    ondisk_path);
6665 				free(ondisk_path);
6666 				goto done;
6667 			}
6668 			free(ondisk_path);
6669 			if (S_ISDIR(sb.st_mode)) {
6670 				error = got_error_msg(GOT_ERR_BAD_PATH,
6671 				    "removing directories requires -R option");
6672 				goto done;
6673 			}
6674 		}
6675 	}
6676 
6677 	error = got_worktree_schedule_delete(worktree, &paths,
6678 	    delete_local_mods, status_codes, print_remove_status, NULL,
6679 	    repo, keep_on_disk);
6680 done:
6681 	if (repo) {
6682 		const struct got_error *close_err = got_repo_close(repo);
6683 		if (error == NULL)
6684 			error = close_err;
6685 	}
6686 	if (worktree)
6687 		got_worktree_close(worktree);
6688 	TAILQ_FOREACH(pe, &paths, entry)
6689 		free((char *)pe->path);
6690 	got_pathlist_free(&paths);
6691 	free(cwd);
6692 	return error;
6693 }
6694 
6695 __dead static void
6696 usage_revert(void)
6697 {
6698 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6699 	    "path ...\n", getprogname());
6700 	exit(1);
6701 }
6702 
6703 static const struct got_error *
6704 revert_progress(void *arg, unsigned char status, const char *path)
6705 {
6706 	if (status == GOT_STATUS_UNVERSIONED)
6707 		return NULL;
6708 
6709 	while (path[0] == '/')
6710 		path++;
6711 	printf("%c  %s\n", status, path);
6712 	return NULL;
6713 }
6714 
6715 struct choose_patch_arg {
6716 	FILE *patch_script_file;
6717 	const char *action;
6718 };
6719 
6720 static const struct got_error *
6721 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6722     int nchanges, const char *action)
6723 {
6724 	char *line = NULL;
6725 	size_t linesize = 0;
6726 	ssize_t linelen;
6727 
6728 	switch (status) {
6729 	case GOT_STATUS_ADD:
6730 		printf("A  %s\n%s this addition? [y/n] ", path, action);
6731 		break;
6732 	case GOT_STATUS_DELETE:
6733 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
6734 		break;
6735 	case GOT_STATUS_MODIFY:
6736 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
6737 			return got_error_from_errno("fseek");
6738 		printf(GOT_COMMIT_SEP_STR);
6739 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6740 			printf("%s", line);
6741 		if (ferror(patch_file))
6742 			return got_error_from_errno("getline");
6743 		printf(GOT_COMMIT_SEP_STR);
6744 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
6745 		    path, n, nchanges, action);
6746 		break;
6747 	default:
6748 		return got_error_path(path, GOT_ERR_FILE_STATUS);
6749 	}
6750 
6751 	return NULL;
6752 }
6753 
6754 static const struct got_error *
6755 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6756     FILE *patch_file, int n, int nchanges)
6757 {
6758 	const struct got_error *err = NULL;
6759 	char *line = NULL;
6760 	size_t linesize = 0;
6761 	ssize_t linelen;
6762 	int resp = ' ';
6763 	struct choose_patch_arg *a = arg;
6764 
6765 	*choice = GOT_PATCH_CHOICE_NONE;
6766 
6767 	if (a->patch_script_file) {
6768 		char *nl;
6769 		err = show_change(status, path, patch_file, n, nchanges,
6770 		    a->action);
6771 		if (err)
6772 			return err;
6773 		linelen = getline(&line, &linesize, a->patch_script_file);
6774 		if (linelen == -1) {
6775 			if (ferror(a->patch_script_file))
6776 				return got_error_from_errno("getline");
6777 			return NULL;
6778 		}
6779 		nl = strchr(line, '\n');
6780 		if (nl)
6781 			*nl = '\0';
6782 		if (strcmp(line, "y") == 0) {
6783 			*choice = GOT_PATCH_CHOICE_YES;
6784 			printf("y\n");
6785 		} else if (strcmp(line, "n") == 0) {
6786 			*choice = GOT_PATCH_CHOICE_NO;
6787 			printf("n\n");
6788 		} else if (strcmp(line, "q") == 0 &&
6789 		    status == GOT_STATUS_MODIFY) {
6790 			*choice = GOT_PATCH_CHOICE_QUIT;
6791 			printf("q\n");
6792 		} else
6793 			printf("invalid response '%s'\n", line);
6794 		free(line);
6795 		return NULL;
6796 	}
6797 
6798 	while (resp != 'y' && resp != 'n' && resp != 'q') {
6799 		err = show_change(status, path, patch_file, n, nchanges,
6800 		    a->action);
6801 		if (err)
6802 			return err;
6803 		resp = getchar();
6804 		if (resp == '\n')
6805 			resp = getchar();
6806 		if (status == GOT_STATUS_MODIFY) {
6807 			if (resp != 'y' && resp != 'n' && resp != 'q') {
6808 				printf("invalid response '%c'\n", resp);
6809 				resp = ' ';
6810 			}
6811 		} else if (resp != 'y' && resp != 'n') {
6812 				printf("invalid response '%c'\n", resp);
6813 				resp = ' ';
6814 		}
6815 	}
6816 
6817 	if (resp == 'y')
6818 		*choice = GOT_PATCH_CHOICE_YES;
6819 	else if (resp == 'n')
6820 		*choice = GOT_PATCH_CHOICE_NO;
6821 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6822 		*choice = GOT_PATCH_CHOICE_QUIT;
6823 
6824 	return NULL;
6825 }
6826 
6827 
6828 static const struct got_error *
6829 cmd_revert(int argc, char *argv[])
6830 {
6831 	const struct got_error *error = NULL;
6832 	struct got_worktree *worktree = NULL;
6833 	struct got_repository *repo = NULL;
6834 	char *cwd = NULL, *path = NULL;
6835 	struct got_pathlist_head paths;
6836 	struct got_pathlist_entry *pe;
6837 	int ch, can_recurse = 0, pflag = 0;
6838 	FILE *patch_script_file = NULL;
6839 	const char *patch_script_path = NULL;
6840 	struct choose_patch_arg cpa;
6841 
6842 	TAILQ_INIT(&paths);
6843 
6844 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6845 		switch (ch) {
6846 		case 'p':
6847 			pflag = 1;
6848 			break;
6849 		case 'F':
6850 			patch_script_path = optarg;
6851 			break;
6852 		case 'R':
6853 			can_recurse = 1;
6854 			break;
6855 		default:
6856 			usage_revert();
6857 			/* NOTREACHED */
6858 		}
6859 	}
6860 
6861 	argc -= optind;
6862 	argv += optind;
6863 
6864 #ifndef PROFILE
6865 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6866 	    "unveil", NULL) == -1)
6867 		err(1, "pledge");
6868 #endif
6869 	if (argc < 1)
6870 		usage_revert();
6871 	if (patch_script_path && !pflag)
6872 		errx(1, "-F option can only be used together with -p option");
6873 
6874 	cwd = getcwd(NULL, 0);
6875 	if (cwd == NULL) {
6876 		error = got_error_from_errno("getcwd");
6877 		goto done;
6878 	}
6879 	error = got_worktree_open(&worktree, cwd);
6880 	if (error) {
6881 		if (error->code == GOT_ERR_NOT_WORKTREE)
6882 			error = wrap_not_worktree_error(error, "revert", cwd);
6883 		goto done;
6884 	}
6885 
6886 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6887 	    NULL);
6888 	if (error != NULL)
6889 		goto done;
6890 
6891 	if (patch_script_path) {
6892 		patch_script_file = fopen(patch_script_path, "r");
6893 		if (patch_script_file == NULL) {
6894 			error = got_error_from_errno2("fopen",
6895 			    patch_script_path);
6896 			goto done;
6897 		}
6898 	}
6899 	error = apply_unveil(got_repo_get_path(repo), 1,
6900 	    got_worktree_get_root_path(worktree));
6901 	if (error)
6902 		goto done;
6903 
6904 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6905 	if (error)
6906 		goto done;
6907 
6908 	if (!can_recurse) {
6909 		char *ondisk_path;
6910 		struct stat sb;
6911 		TAILQ_FOREACH(pe, &paths, entry) {
6912 			if (asprintf(&ondisk_path, "%s/%s",
6913 			    got_worktree_get_root_path(worktree),
6914 			    pe->path) == -1) {
6915 				error = got_error_from_errno("asprintf");
6916 				goto done;
6917 			}
6918 			if (lstat(ondisk_path, &sb) == -1) {
6919 				if (errno == ENOENT) {
6920 					free(ondisk_path);
6921 					continue;
6922 				}
6923 				error = got_error_from_errno2("lstat",
6924 				    ondisk_path);
6925 				free(ondisk_path);
6926 				goto done;
6927 			}
6928 			free(ondisk_path);
6929 			if (S_ISDIR(sb.st_mode)) {
6930 				error = got_error_msg(GOT_ERR_BAD_PATH,
6931 				    "reverting directories requires -R option");
6932 				goto done;
6933 			}
6934 		}
6935 	}
6936 
6937 	cpa.patch_script_file = patch_script_file;
6938 	cpa.action = "revert";
6939 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6940 	    pflag ? choose_patch : NULL, &cpa, repo);
6941 done:
6942 	if (patch_script_file && fclose(patch_script_file) == EOF &&
6943 	    error == NULL)
6944 		error = got_error_from_errno2("fclose", patch_script_path);
6945 	if (repo) {
6946 		const struct got_error *close_err = got_repo_close(repo);
6947 		if (error == NULL)
6948 			error = close_err;
6949 	}
6950 	if (worktree)
6951 		got_worktree_close(worktree);
6952 	free(path);
6953 	free(cwd);
6954 	return error;
6955 }
6956 
6957 __dead static void
6958 usage_commit(void)
6959 {
6960 	fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
6961 	    "[path ...]\n", getprogname());
6962 	exit(1);
6963 }
6964 
6965 struct collect_commit_logmsg_arg {
6966 	const char *cmdline_log;
6967 	const char *prepared_log;
6968 	int non_interactive;
6969 	const char *editor;
6970 	const char *worktree_path;
6971 	const char *branch_name;
6972 	const char *repo_path;
6973 	char *logmsg_path;
6974 
6975 };
6976 
6977 static const struct got_error *
6978 read_prepared_logmsg(char **logmsg, const char *path)
6979 {
6980 	const struct got_error *err = NULL;
6981 	FILE *f = NULL;
6982 	struct stat sb;
6983 	size_t r;
6984 
6985 	*logmsg = NULL;
6986 	memset(&sb, 0, sizeof(sb));
6987 
6988 	f = fopen(path, "r");
6989 	if (f == NULL)
6990 		return got_error_from_errno2("fopen", path);
6991 
6992 	if (fstat(fileno(f), &sb) == -1) {
6993 		err = got_error_from_errno2("fstat", path);
6994 		goto done;
6995 	}
6996 	if (sb.st_size == 0) {
6997 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6998 		goto done;
6999 	}
7000 
7001 	*logmsg = malloc(sb.st_size + 1);
7002 	if (*logmsg == NULL) {
7003 		err = got_error_from_errno("malloc");
7004 		goto done;
7005 	}
7006 
7007 	r = fread(*logmsg, 1, sb.st_size, f);
7008 	if (r != sb.st_size) {
7009 		if (ferror(f))
7010 			err = got_error_from_errno2("fread", path);
7011 		else
7012 			err = got_error(GOT_ERR_IO);
7013 		goto done;
7014 	}
7015 	(*logmsg)[sb.st_size] = '\0';
7016 done:
7017 	if (fclose(f) == EOF && err == NULL)
7018 		err = got_error_from_errno2("fclose", path);
7019 	if (err) {
7020 		free(*logmsg);
7021 		*logmsg = NULL;
7022 	}
7023 	return err;
7024 	
7025 }
7026 
7027 static const struct got_error *
7028 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7029     void *arg)
7030 {
7031 	char *initial_content = NULL;
7032 	struct got_pathlist_entry *pe;
7033 	const struct got_error *err = NULL;
7034 	char *template = NULL;
7035 	struct collect_commit_logmsg_arg *a = arg;
7036 	int initial_content_len;
7037 	int fd = -1;
7038 	size_t len;
7039 
7040 	/* if a message was specified on the command line, just use it */
7041 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7042 		len = strlen(a->cmdline_log) + 1;
7043 		*logmsg = malloc(len + 1);
7044 		if (*logmsg == NULL)
7045 			return got_error_from_errno("malloc");
7046 		strlcpy(*logmsg, a->cmdline_log, len);
7047 		return NULL;
7048 	} else if (a->prepared_log != NULL && a->non_interactive)
7049 		return read_prepared_logmsg(logmsg, a->prepared_log);
7050 
7051 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7052 		return got_error_from_errno("asprintf");
7053 
7054 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7055 	if (err)
7056 		goto done;
7057 
7058 	if (a->prepared_log) {
7059 		char *msg;
7060 		err = read_prepared_logmsg(&msg, a->prepared_log);
7061 		if (err)
7062 			goto done;
7063 		if (write(fd, msg, strlen(msg)) == -1) {
7064 			err = got_error_from_errno2("write", a->logmsg_path);
7065 			free(msg);
7066 			goto done;
7067 		}
7068 		free(msg);
7069 	}
7070 
7071 	initial_content_len = asprintf(&initial_content,
7072 	    "\n# changes to be committed on branch %s:\n",
7073 	    a->branch_name);
7074 	if (initial_content_len == -1) {
7075 		err = got_error_from_errno("asprintf");
7076 		goto done;
7077 	}
7078 
7079 	if (write(fd, initial_content, initial_content_len) == -1) {
7080 		err = got_error_from_errno2("write", a->logmsg_path);
7081 		goto done;
7082 	}
7083 
7084 	TAILQ_FOREACH(pe, commitable_paths, entry) {
7085 		struct got_commitable *ct = pe->data;
7086 		dprintf(fd, "#  %c  %s\n",
7087 		    got_commitable_get_status(ct),
7088 		    got_commitable_get_path(ct));
7089 	}
7090 
7091 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7092 	    initial_content_len, a->prepared_log ? 0 : 1);
7093 done:
7094 	free(initial_content);
7095 	free(template);
7096 
7097 	if (fd != -1 && close(fd) == -1 && err == NULL)
7098 		err = got_error_from_errno2("close", a->logmsg_path);
7099 
7100 	/* Editor is done; we can now apply unveil(2) */
7101 	if (err == NULL)
7102 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
7103 	if (err) {
7104 		free(*logmsg);
7105 		*logmsg = NULL;
7106 	}
7107 	return err;
7108 }
7109 
7110 static const struct got_error *
7111 cmd_commit(int argc, char *argv[])
7112 {
7113 	const struct got_error *error = NULL;
7114 	struct got_worktree *worktree = NULL;
7115 	struct got_repository *repo = NULL;
7116 	char *cwd = NULL, *id_str = NULL;
7117 	struct got_object_id *id = NULL;
7118 	const char *logmsg = NULL;
7119 	char *prepared_logmsg = NULL;
7120 	struct collect_commit_logmsg_arg cl_arg;
7121 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7122 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7123 	int allow_bad_symlinks = 0, non_interactive = 0;
7124 	struct got_pathlist_head paths;
7125 
7126 	TAILQ_INIT(&paths);
7127 	cl_arg.logmsg_path = NULL;
7128 
7129 	while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7130 		switch (ch) {
7131 		case 'F':
7132 			if (logmsg != NULL)
7133 				option_conflict('F', 'm');
7134 			prepared_logmsg = realpath(optarg, NULL);
7135 			if (prepared_logmsg == NULL)
7136 				return got_error_from_errno2("realpath",
7137 				    optarg);
7138 			break;
7139 		case 'm':
7140 			if (prepared_logmsg)
7141 				option_conflict('m', 'F');
7142 			logmsg = optarg;
7143 			break;
7144 		case 'N':
7145 			non_interactive = 1;
7146 			break;
7147 		case 'S':
7148 			allow_bad_symlinks = 1;
7149 			break;
7150 		default:
7151 			usage_commit();
7152 			/* NOTREACHED */
7153 		}
7154 	}
7155 
7156 	argc -= optind;
7157 	argv += optind;
7158 
7159 #ifndef PROFILE
7160 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7161 	    "unveil", NULL) == -1)
7162 		err(1, "pledge");
7163 #endif
7164 	cwd = getcwd(NULL, 0);
7165 	if (cwd == NULL) {
7166 		error = got_error_from_errno("getcwd");
7167 		goto done;
7168 	}
7169 	error = got_worktree_open(&worktree, cwd);
7170 	if (error) {
7171 		if (error->code == GOT_ERR_NOT_WORKTREE)
7172 			error = wrap_not_worktree_error(error, "commit", cwd);
7173 		goto done;
7174 	}
7175 
7176 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7177 	if (error)
7178 		goto done;
7179 	if (rebase_in_progress) {
7180 		error = got_error(GOT_ERR_REBASING);
7181 		goto done;
7182 	}
7183 
7184 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
7185 	    worktree);
7186 	if (error)
7187 		goto done;
7188 
7189 	error = get_gitconfig_path(&gitconfig_path);
7190 	if (error)
7191 		goto done;
7192 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7193 	    gitconfig_path);
7194 	if (error != NULL)
7195 		goto done;
7196 
7197 	error = get_author(&author, repo, worktree);
7198 	if (error)
7199 		return error;
7200 
7201 	/*
7202 	 * unveil(2) traverses exec(2); if an editor is used we have
7203 	 * to apply unveil after the log message has been written.
7204 	 */
7205 	if (logmsg == NULL || strlen(logmsg) == 0)
7206 		error = get_editor(&editor);
7207 	else
7208 		error = apply_unveil(got_repo_get_path(repo), 0,
7209 		    got_worktree_get_root_path(worktree));
7210 	if (error)
7211 		goto done;
7212 
7213 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7214 	if (error)
7215 		goto done;
7216 
7217 	cl_arg.editor = editor;
7218 	cl_arg.cmdline_log = logmsg;
7219 	cl_arg.prepared_log = prepared_logmsg;
7220 	cl_arg.non_interactive = non_interactive;
7221 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7222 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7223 	if (!histedit_in_progress) {
7224 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7225 			error = got_error(GOT_ERR_COMMIT_BRANCH);
7226 			goto done;
7227 		}
7228 		cl_arg.branch_name += 11;
7229 	}
7230 	cl_arg.repo_path = got_repo_get_path(repo);
7231 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7232 	    allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7233 	    print_status, NULL, repo);
7234 	if (error) {
7235 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7236 		    cl_arg.logmsg_path != NULL)
7237 			preserve_logmsg = 1;
7238 		goto done;
7239 	}
7240 
7241 	error = got_object_id_str(&id_str, id);
7242 	if (error)
7243 		goto done;
7244 	printf("Created commit %s\n", id_str);
7245 done:
7246 	if (preserve_logmsg) {
7247 		fprintf(stderr, "%s: log message preserved in %s\n",
7248 		    getprogname(), cl_arg.logmsg_path);
7249 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7250 	    error == NULL)
7251 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7252 	free(cl_arg.logmsg_path);
7253 	if (repo) {
7254 		const struct got_error *close_err = got_repo_close(repo);
7255 		if (error == NULL)
7256 			error = close_err;
7257 	}
7258 	if (worktree)
7259 		got_worktree_close(worktree);
7260 	free(cwd);
7261 	free(id_str);
7262 	free(gitconfig_path);
7263 	free(editor);
7264 	free(author);
7265 	free(prepared_logmsg);
7266 	return error;
7267 }
7268 
7269 __dead static void
7270 usage_cherrypick(void)
7271 {
7272 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
7273 	exit(1);
7274 }
7275 
7276 static const struct got_error *
7277 cmd_cherrypick(int argc, char *argv[])
7278 {
7279 	const struct got_error *error = NULL;
7280 	struct got_worktree *worktree = NULL;
7281 	struct got_repository *repo = NULL;
7282 	char *cwd = NULL, *commit_id_str = NULL;
7283 	struct got_object_id *commit_id = NULL;
7284 	struct got_commit_object *commit = NULL;
7285 	struct got_object_qid *pid;
7286 	struct got_reference *head_ref = NULL;
7287 	int ch;
7288 	struct got_update_progress_arg upa;
7289 
7290 	while ((ch = getopt(argc, argv, "")) != -1) {
7291 		switch (ch) {
7292 		default:
7293 			usage_cherrypick();
7294 			/* NOTREACHED */
7295 		}
7296 	}
7297 
7298 	argc -= optind;
7299 	argv += optind;
7300 
7301 #ifndef PROFILE
7302 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7303 	    "unveil", NULL) == -1)
7304 		err(1, "pledge");
7305 #endif
7306 	if (argc != 1)
7307 		usage_cherrypick();
7308 
7309 	cwd = getcwd(NULL, 0);
7310 	if (cwd == NULL) {
7311 		error = got_error_from_errno("getcwd");
7312 		goto done;
7313 	}
7314 	error = got_worktree_open(&worktree, cwd);
7315 	if (error) {
7316 		if (error->code == GOT_ERR_NOT_WORKTREE)
7317 			error = wrap_not_worktree_error(error, "cherrypick",
7318 			    cwd);
7319 		goto done;
7320 	}
7321 
7322 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7323 	    NULL);
7324 	if (error != NULL)
7325 		goto done;
7326 
7327 	error = apply_unveil(got_repo_get_path(repo), 0,
7328 	    got_worktree_get_root_path(worktree));
7329 	if (error)
7330 		goto done;
7331 
7332 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7333 	    GOT_OBJ_TYPE_COMMIT, repo);
7334 	if (error != NULL) {
7335 		struct got_reference *ref;
7336 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7337 			goto done;
7338 		error = got_ref_open(&ref, repo, argv[0], 0);
7339 		if (error != NULL)
7340 			goto done;
7341 		error = got_ref_resolve(&commit_id, repo, ref);
7342 		got_ref_close(ref);
7343 		if (error != NULL)
7344 			goto done;
7345 	}
7346 	error = got_object_id_str(&commit_id_str, commit_id);
7347 	if (error)
7348 		goto done;
7349 
7350 	error = got_ref_open(&head_ref, repo,
7351 	    got_worktree_get_head_ref_name(worktree), 0);
7352 	if (error != NULL)
7353 		goto done;
7354 
7355 	error = check_same_branch(commit_id, head_ref, NULL, repo);
7356 	if (error) {
7357 		if (error->code != GOT_ERR_ANCESTRY)
7358 			goto done;
7359 		error = NULL;
7360 	} else {
7361 		error = got_error(GOT_ERR_SAME_BRANCH);
7362 		goto done;
7363 	}
7364 
7365 	error = got_object_open_as_commit(&commit, repo, commit_id);
7366 	if (error)
7367 		goto done;
7368 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7369 	memset(&upa, 0, sizeof(upa));
7370 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7371 	    commit_id, repo, update_progress, &upa, check_cancelled,
7372 	    NULL);
7373 	if (error != NULL)
7374 		goto done;
7375 
7376 	if (upa.did_something)
7377 		printf("Merged commit %s\n", commit_id_str);
7378 	print_update_progress_stats(&upa);
7379 done:
7380 	if (commit)
7381 		got_object_commit_close(commit);
7382 	free(commit_id_str);
7383 	if (head_ref)
7384 		got_ref_close(head_ref);
7385 	if (worktree)
7386 		got_worktree_close(worktree);
7387 	if (repo) {
7388 		const struct got_error *close_err = got_repo_close(repo);
7389 		if (error == NULL)
7390 			error = close_err;
7391 	}
7392 	return error;
7393 }
7394 
7395 __dead static void
7396 usage_backout(void)
7397 {
7398 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7399 	exit(1);
7400 }
7401 
7402 static const struct got_error *
7403 cmd_backout(int argc, char *argv[])
7404 {
7405 	const struct got_error *error = NULL;
7406 	struct got_worktree *worktree = NULL;
7407 	struct got_repository *repo = NULL;
7408 	char *cwd = NULL, *commit_id_str = NULL;
7409 	struct got_object_id *commit_id = NULL;
7410 	struct got_commit_object *commit = NULL;
7411 	struct got_object_qid *pid;
7412 	struct got_reference *head_ref = NULL;
7413 	int ch;
7414 	struct got_update_progress_arg upa;
7415 
7416 	while ((ch = getopt(argc, argv, "")) != -1) {
7417 		switch (ch) {
7418 		default:
7419 			usage_backout();
7420 			/* NOTREACHED */
7421 		}
7422 	}
7423 
7424 	argc -= optind;
7425 	argv += optind;
7426 
7427 #ifndef PROFILE
7428 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7429 	    "unveil", NULL) == -1)
7430 		err(1, "pledge");
7431 #endif
7432 	if (argc != 1)
7433 		usage_backout();
7434 
7435 	cwd = getcwd(NULL, 0);
7436 	if (cwd == NULL) {
7437 		error = got_error_from_errno("getcwd");
7438 		goto done;
7439 	}
7440 	error = got_worktree_open(&worktree, cwd);
7441 	if (error) {
7442 		if (error->code == GOT_ERR_NOT_WORKTREE)
7443 			error = wrap_not_worktree_error(error, "backout", cwd);
7444 		goto done;
7445 	}
7446 
7447 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7448 	    NULL);
7449 	if (error != NULL)
7450 		goto done;
7451 
7452 	error = apply_unveil(got_repo_get_path(repo), 0,
7453 	    got_worktree_get_root_path(worktree));
7454 	if (error)
7455 		goto done;
7456 
7457 	error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7458 	    GOT_OBJ_TYPE_COMMIT, repo);
7459 	if (error != NULL) {
7460 		struct got_reference *ref;
7461 		if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7462 			goto done;
7463 		error = got_ref_open(&ref, repo, argv[0], 0);
7464 		if (error != NULL)
7465 			goto done;
7466 		error = got_ref_resolve(&commit_id, repo, ref);
7467 		got_ref_close(ref);
7468 		if (error != NULL)
7469 			goto done;
7470 	}
7471 	error = got_object_id_str(&commit_id_str, commit_id);
7472 	if (error)
7473 		goto done;
7474 
7475 	error = got_ref_open(&head_ref, repo,
7476 	    got_worktree_get_head_ref_name(worktree), 0);
7477 	if (error != NULL)
7478 		goto done;
7479 
7480 	error = check_same_branch(commit_id, head_ref, NULL, repo);
7481 	if (error)
7482 		goto done;
7483 
7484 	error = got_object_open_as_commit(&commit, repo, commit_id);
7485 	if (error)
7486 		goto done;
7487 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7488 	if (pid == NULL) {
7489 		error = got_error(GOT_ERR_ROOT_COMMIT);
7490 		goto done;
7491 	}
7492 
7493 	memset(&upa, 0, sizeof(upa));
7494 	error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7495 	    update_progress, &upa, check_cancelled, NULL);
7496 	if (error != NULL)
7497 		goto done;
7498 
7499 	if (upa.did_something)
7500 		printf("Backed out commit %s\n", commit_id_str);
7501 	print_update_progress_stats(&upa);
7502 done:
7503 	if (commit)
7504 		got_object_commit_close(commit);
7505 	free(commit_id_str);
7506 	if (head_ref)
7507 		got_ref_close(head_ref);
7508 	if (worktree)
7509 		got_worktree_close(worktree);
7510 	if (repo) {
7511 		const struct got_error *close_err = got_repo_close(repo);
7512 		if (error == NULL)
7513 			error = close_err;
7514 	}
7515 	return error;
7516 }
7517 
7518 __dead static void
7519 usage_rebase(void)
7520 {
7521 	fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [branch]\n",
7522 	    getprogname());
7523 	exit(1);
7524 }
7525 
7526 void
7527 trim_logmsg(char *logmsg, int limit)
7528 {
7529 	char *nl;
7530 	size_t len;
7531 
7532 	len = strlen(logmsg);
7533 	if (len > limit)
7534 		len = limit;
7535 	logmsg[len] = '\0';
7536 	nl = strchr(logmsg, '\n');
7537 	if (nl)
7538 		*nl = '\0';
7539 }
7540 
7541 static const struct got_error *
7542 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7543 {
7544 	const struct got_error *err;
7545 	char *logmsg0 = NULL;
7546 	const char *s;
7547 
7548 	err = got_object_commit_get_logmsg(&logmsg0, commit);
7549 	if (err)
7550 		return err;
7551 
7552 	s = logmsg0;
7553 	while (isspace((unsigned char)s[0]))
7554 		s++;
7555 
7556 	*logmsg = strdup(s);
7557 	if (*logmsg == NULL) {
7558 		err = got_error_from_errno("strdup");
7559 		goto done;
7560 	}
7561 
7562 	trim_logmsg(*logmsg, limit);
7563 done:
7564 	free(logmsg0);
7565 	return err;
7566 }
7567 
7568 static const struct got_error *
7569 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7570 {
7571 	const struct got_error *err;
7572 	struct got_commit_object *commit = NULL;
7573 	char *id_str = NULL, *logmsg = NULL;
7574 
7575 	err = got_object_open_as_commit(&commit, repo, id);
7576 	if (err)
7577 		return err;
7578 
7579 	err = got_object_id_str(&id_str, id);
7580 	if (err)
7581 		goto done;
7582 
7583 	id_str[12] = '\0';
7584 
7585 	err = get_short_logmsg(&logmsg, 42, commit);
7586 	if (err)
7587 		goto done;
7588 
7589 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
7590 done:
7591 	free(id_str);
7592 	got_object_commit_close(commit);
7593 	free(logmsg);
7594 	return err;
7595 }
7596 
7597 static const struct got_error *
7598 show_rebase_progress(struct got_commit_object *commit,
7599     struct got_object_id *old_id, struct got_object_id *new_id)
7600 {
7601 	const struct got_error *err;
7602 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7603 
7604 	err = got_object_id_str(&old_id_str, old_id);
7605 	if (err)
7606 		goto done;
7607 
7608 	if (new_id) {
7609 		err = got_object_id_str(&new_id_str, new_id);
7610 		if (err)
7611 			goto done;
7612 	}
7613 
7614 	old_id_str[12] = '\0';
7615 	if (new_id_str)
7616 		new_id_str[12] = '\0';
7617 
7618 	err = get_short_logmsg(&logmsg, 42, commit);
7619 	if (err)
7620 		goto done;
7621 
7622 	printf("%s -> %s: %s\n", old_id_str,
7623 	    new_id_str ? new_id_str : "no-op change", logmsg);
7624 done:
7625 	free(old_id_str);
7626 	free(new_id_str);
7627 	free(logmsg);
7628 	return err;
7629 }
7630 
7631 static const struct got_error *
7632 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7633     struct got_reference *branch, struct got_reference *new_base_branch,
7634     struct got_reference *tmp_branch, struct got_repository *repo,
7635     int create_backup)
7636 {
7637 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
7638 	return got_worktree_rebase_complete(worktree, fileindex,
7639 	    new_base_branch, tmp_branch, branch, repo, create_backup);
7640 }
7641 
7642 static const struct got_error *
7643 rebase_commit(struct got_pathlist_head *merged_paths,
7644     struct got_worktree *worktree, struct got_fileindex *fileindex,
7645     struct got_reference *tmp_branch,
7646     struct got_object_id *commit_id, struct got_repository *repo)
7647 {
7648 	const struct got_error *error;
7649 	struct got_commit_object *commit;
7650 	struct got_object_id *new_commit_id;
7651 
7652 	error = got_object_open_as_commit(&commit, repo, commit_id);
7653 	if (error)
7654 		return error;
7655 
7656 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7657 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
7658 	if (error) {
7659 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7660 			goto done;
7661 		error = show_rebase_progress(commit, commit_id, NULL);
7662 	} else {
7663 		error = show_rebase_progress(commit, commit_id, new_commit_id);
7664 		free(new_commit_id);
7665 	}
7666 done:
7667 	got_object_commit_close(commit);
7668 	return error;
7669 }
7670 
7671 struct check_path_prefix_arg {
7672 	const char *path_prefix;
7673 	size_t len;
7674 	int errcode;
7675 };
7676 
7677 static const struct got_error *
7678 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7679     struct got_blob_object *blob2, struct got_object_id *id1,
7680     struct got_object_id *id2, const char *path1, const char *path2,
7681     mode_t mode1, mode_t mode2, struct got_repository *repo)
7682 {
7683 	struct check_path_prefix_arg *a = arg;
7684 
7685 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7686 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7687 		return got_error(a->errcode);
7688 
7689 	return NULL;
7690 }
7691 
7692 static const struct got_error *
7693 check_path_prefix(struct got_object_id *parent_id,
7694     struct got_object_id *commit_id, const char *path_prefix,
7695     int errcode, struct got_repository *repo)
7696 {
7697 	const struct got_error *err;
7698 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7699 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
7700 	struct check_path_prefix_arg cpp_arg;
7701 
7702 	if (got_path_is_root_dir(path_prefix))
7703 		return NULL;
7704 
7705 	err = got_object_open_as_commit(&commit, repo, commit_id);
7706 	if (err)
7707 		goto done;
7708 
7709 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7710 	if (err)
7711 		goto done;
7712 
7713 	err = got_object_open_as_tree(&tree1, repo,
7714 	    got_object_commit_get_tree_id(parent_commit));
7715 	if (err)
7716 		goto done;
7717 
7718 	err = got_object_open_as_tree(&tree2, repo,
7719 	    got_object_commit_get_tree_id(commit));
7720 	if (err)
7721 		goto done;
7722 
7723 	cpp_arg.path_prefix = path_prefix;
7724 	while (cpp_arg.path_prefix[0] == '/')
7725 		cpp_arg.path_prefix++;
7726 	cpp_arg.len = strlen(cpp_arg.path_prefix);
7727 	cpp_arg.errcode = errcode;
7728 	err = got_diff_tree(tree1, tree2, "", "", repo,
7729 	    check_path_prefix_in_diff, &cpp_arg, 0);
7730 done:
7731 	if (tree1)
7732 		got_object_tree_close(tree1);
7733 	if (tree2)
7734 		got_object_tree_close(tree2);
7735 	if (commit)
7736 		got_object_commit_close(commit);
7737 	if (parent_commit)
7738 		got_object_commit_close(parent_commit);
7739 	return err;
7740 }
7741 
7742 static const struct got_error *
7743 collect_commits(struct got_object_id_queue *commits,
7744     struct got_object_id *initial_commit_id,
7745     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7746     const char *path_prefix, int path_prefix_errcode,
7747     struct got_repository *repo)
7748 {
7749 	const struct got_error *err = NULL;
7750 	struct got_commit_graph *graph = NULL;
7751 	struct got_object_id *parent_id = NULL;
7752 	struct got_object_qid *qid;
7753         struct got_object_id *commit_id = initial_commit_id;
7754 
7755 	err = got_commit_graph_open(&graph, "/", 1);
7756 	if (err)
7757 		return err;
7758 
7759 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7760 	    check_cancelled, NULL);
7761 	if (err)
7762 		goto done;
7763 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7764 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
7765 		    check_cancelled, NULL);
7766 		if (err) {
7767 			if (err->code == GOT_ERR_ITER_COMPLETED) {
7768 				err = got_error_msg(GOT_ERR_ANCESTRY,
7769 				    "ran out of commits to rebase before "
7770 				    "youngest common ancestor commit has "
7771 				    "been reached?!?");
7772 			}
7773 			goto done;
7774 		} else {
7775 			err = check_path_prefix(parent_id, commit_id,
7776 			    path_prefix, path_prefix_errcode, repo);
7777 			if (err)
7778 				goto done;
7779 
7780 			err = got_object_qid_alloc(&qid, commit_id);
7781 			if (err)
7782 				goto done;
7783 			STAILQ_INSERT_HEAD(commits, qid, entry);
7784 			commit_id = parent_id;
7785 		}
7786 	}
7787 done:
7788 	got_commit_graph_close(graph);
7789 	return err;
7790 }
7791 
7792 static const struct got_error *
7793 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
7794 {
7795 	const struct got_error *err = NULL;
7796 	time_t committer_time;
7797 	struct tm tm;
7798 	char datebuf[11]; /* YYYY-MM-DD + NUL */
7799 	char *author0 = NULL, *author, *smallerthan;
7800 	char *logmsg0 = NULL, *logmsg, *newline;
7801 
7802 	committer_time = got_object_commit_get_committer_time(commit);
7803 	if (localtime_r(&committer_time, &tm) == NULL)
7804 		return got_error_from_errno("localtime_r");
7805 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
7806 		return got_error(GOT_ERR_NO_SPACE);
7807 
7808 	author0 = strdup(got_object_commit_get_author(commit));
7809 	if (author0 == NULL)
7810 		return got_error_from_errno("strdup");
7811 	author = author0;
7812 	smallerthan = strchr(author, '<');
7813 	if (smallerthan && smallerthan[1] != '\0')
7814 		author = smallerthan + 1;
7815 	author[strcspn(author, "@>")] = '\0';
7816 
7817 	err = got_object_commit_get_logmsg(&logmsg0, commit);
7818 	if (err)
7819 		goto done;
7820 	logmsg = logmsg0;
7821 	while (*logmsg == '\n')
7822 		logmsg++;
7823 	newline = strchr(logmsg, '\n');
7824 	if (newline)
7825 		*newline = '\0';
7826 
7827 	if (asprintf(brief_str, "%s %s  %s",
7828 	    datebuf, author, logmsg) == -1)
7829 		err = got_error_from_errno("asprintf");
7830 done:
7831 	free(author0);
7832 	free(logmsg0);
7833 	return err;
7834 }
7835 
7836 static const struct got_error *
7837 print_backup_ref(const char *branch_name, const char *new_id_str,
7838     struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
7839     struct got_reflist_object_id_map *refs_idmap,
7840     struct got_repository *repo)
7841 {
7842 	const struct got_error *err = NULL;
7843 	struct got_reflist_head *refs;
7844 	char *refs_str = NULL;
7845 	struct got_object_id *new_commit_id = NULL;
7846 	struct got_commit_object *new_commit = NULL;
7847 	char *new_commit_brief_str = NULL;
7848 	struct got_object_id *yca_id = NULL;
7849 	struct got_commit_object *yca_commit = NULL;
7850 	char *yca_id_str = NULL, *yca_brief_str = NULL;
7851 	char *custom_refs_str;
7852 
7853 	if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
7854 		return got_error_from_errno("asprintf");
7855 
7856 	err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
7857 	    0, 0, refs_idmap, custom_refs_str);
7858 	if (err)
7859 		goto done;
7860 
7861 	err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
7862 	if (err)
7863 		goto done;
7864 
7865 	refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
7866 	if (refs) {
7867 		err = build_refs_str(&refs_str, refs, new_commit_id, repo);
7868 		if (err)
7869 			goto done;
7870 	}
7871 
7872 	err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
7873 	if (err)
7874 		goto done;
7875 
7876 	err = get_commit_brief_str(&new_commit_brief_str, new_commit);
7877 	if (err)
7878 		goto done;
7879 
7880 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7881 	    old_commit_id, new_commit_id, repo, check_cancelled, NULL);
7882 	if (err)
7883 		goto done;
7884 
7885 	printf("has become commit %s%s%s%s\n %s\n", new_id_str,
7886 	    refs_str ? " (" : "", refs_str ? refs_str : "",
7887 	    refs_str ? ")" : "", new_commit_brief_str);
7888 	if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
7889 	    got_object_id_cmp(yca_id, old_commit_id) != 0) {
7890 		free(refs_str);
7891 		refs_str = NULL;
7892 
7893 		err = got_object_open_as_commit(&yca_commit, repo, yca_id);
7894 		if (err)
7895 			goto done;
7896 
7897 		err = get_commit_brief_str(&yca_brief_str, yca_commit);
7898 		if (err)
7899 			goto done;
7900 
7901 		err = got_object_id_str(&yca_id_str, yca_id);
7902 		if (err)
7903 			goto done;
7904 
7905 		refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
7906 		if (refs) {
7907 			err = build_refs_str(&refs_str, refs, yca_id, repo);
7908 			if (err)
7909 				goto done;
7910 		}
7911 		printf("history forked at %s%s%s%s\n %s\n",
7912 		    yca_id_str,
7913 		    refs_str ? " (" : "", refs_str ? refs_str : "",
7914 		    refs_str ? ")" : "", yca_brief_str);
7915 	}
7916 done:
7917 	free(custom_refs_str);
7918 	free(new_commit_id);
7919 	free(refs_str);
7920 	free(yca_id);
7921 	free(yca_id_str);
7922 	free(yca_brief_str);
7923 	if (new_commit)
7924 		got_object_commit_close(new_commit);
7925 	if (yca_commit)
7926 		got_object_commit_close(yca_commit);
7927 
7928 	return NULL;
7929 }
7930 
7931 static const struct got_error *
7932 list_backup_refs(const char *backup_ref_prefix, const char *wanted_branch_name,
7933     struct got_repository *repo)
7934 {
7935 	const struct got_error *err;
7936 	struct got_reflist_head refs, backup_refs;
7937 	struct got_reflist_entry *re;
7938 	const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
7939 	struct got_object_id *old_commit_id = NULL;
7940 	char *branch_name = NULL;
7941 	struct got_commit_object *old_commit = NULL;
7942 	struct got_reflist_object_id_map *refs_idmap = NULL;
7943 	int wanted_branch_found = 0;
7944 
7945 	TAILQ_INIT(&refs);
7946 	TAILQ_INIT(&backup_refs);
7947 
7948 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7949 	if (err)
7950 		return err;
7951 
7952 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
7953 	if (err)
7954 		goto done;
7955 
7956 	if (wanted_branch_name) {
7957 		if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
7958 			wanted_branch_name += 11;
7959 	}
7960 
7961 	err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
7962 	    got_ref_cmp_by_commit_timestamp_descending, repo);
7963 	if (err)
7964 		goto done;
7965 
7966 	TAILQ_FOREACH(re, &backup_refs, entry) {
7967 		const char *refname = got_ref_get_name(re->ref);
7968 		char *slash;
7969 
7970 		err = got_ref_resolve(&old_commit_id, repo, re->ref);
7971 		if (err)
7972 			break;
7973 
7974 		err = got_object_open_as_commit(&old_commit, repo,
7975 		    old_commit_id);
7976 		if (err)
7977 			break;
7978 
7979 		if (strncmp(backup_ref_prefix, refname,
7980 		    backup_ref_prefix_len) == 0)
7981 			refname += backup_ref_prefix_len;
7982 
7983 		while (refname[0] == '/')
7984 			refname++;
7985 
7986 		branch_name = strdup(refname);
7987 		if (branch_name == NULL) {
7988 			err = got_error_from_errno("strdup");
7989 			break;
7990 		}
7991 		slash = strrchr(branch_name, '/');
7992 		if (slash) {
7993 			*slash = '\0';
7994 			refname += strlen(branch_name) + 1;
7995 		}
7996 
7997 		if (wanted_branch_name == NULL ||
7998 		    strcmp(wanted_branch_name, branch_name) == 0) {
7999 			wanted_branch_found = 1;
8000 			err = print_backup_ref(branch_name, refname,
8001 			   old_commit_id, old_commit, refs_idmap, repo);
8002 			if (err)
8003 				break;
8004 		}
8005 
8006 		free(old_commit_id);
8007 		old_commit_id = NULL;
8008 		free(branch_name);
8009 		branch_name = NULL;
8010 		got_object_commit_close(old_commit);
8011 		old_commit = NULL;
8012 	}
8013 
8014 	if (wanted_branch_name && !wanted_branch_found) {
8015 		err = got_error_fmt(GOT_ERR_NOT_REF,
8016 		    "%s/%s/", backup_ref_prefix, wanted_branch_name);
8017 	}
8018 done:
8019 	if (refs_idmap)
8020 		got_reflist_object_id_map_free(refs_idmap);
8021 	got_ref_list_free(&refs);
8022 	got_ref_list_free(&backup_refs);
8023 	free(old_commit_id);
8024 	free(branch_name);
8025 	if (old_commit)
8026 		got_object_commit_close(old_commit);
8027 	return err;
8028 }
8029 
8030 static const struct got_error *
8031 cmd_rebase(int argc, char *argv[])
8032 {
8033 	const struct got_error *error = NULL;
8034 	struct got_worktree *worktree = NULL;
8035 	struct got_repository *repo = NULL;
8036 	struct got_fileindex *fileindex = NULL;
8037 	char *cwd = NULL;
8038 	struct got_reference *branch = NULL;
8039 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
8040 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
8041 	struct got_object_id *resume_commit_id = NULL;
8042 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
8043 	struct got_commit_object *commit = NULL;
8044 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
8045 	int histedit_in_progress = 0, create_backup = 1, list_backups = 0;
8046 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8047 	struct got_object_id_queue commits;
8048 	struct got_pathlist_head merged_paths;
8049 	const struct got_object_id_queue *parent_ids;
8050 	struct got_object_qid *qid, *pid;
8051 
8052 	STAILQ_INIT(&commits);
8053 	TAILQ_INIT(&merged_paths);
8054 
8055 	while ((ch = getopt(argc, argv, "acl")) != -1) {
8056 		switch (ch) {
8057 		case 'a':
8058 			abort_rebase = 1;
8059 			break;
8060 		case 'c':
8061 			continue_rebase = 1;
8062 			break;
8063 		case 'l':
8064 			list_backups = 1;
8065 			break;
8066 		default:
8067 			usage_rebase();
8068 			/* NOTREACHED */
8069 		}
8070 	}
8071 
8072 	argc -= optind;
8073 	argv += optind;
8074 
8075 #ifndef PROFILE
8076 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8077 	    "unveil", NULL) == -1)
8078 		err(1, "pledge");
8079 #endif
8080 	if (list_backups) {
8081 		if (abort_rebase)
8082 			option_conflict('l', 'a');
8083 		if (continue_rebase)
8084 			option_conflict('l', 'c');
8085 		if (argc != 0 && argc != 1)
8086 			usage_rebase();
8087 	} else {
8088 		if (abort_rebase && continue_rebase)
8089 			usage_rebase();
8090 		else if (abort_rebase || continue_rebase) {
8091 			if (argc != 0)
8092 				usage_rebase();
8093 		} else if (argc != 1)
8094 			usage_rebase();
8095 	}
8096 
8097 	cwd = getcwd(NULL, 0);
8098 	if (cwd == NULL) {
8099 		error = got_error_from_errno("getcwd");
8100 		goto done;
8101 	}
8102 	error = got_worktree_open(&worktree, cwd);
8103 	if (error) {
8104 		if (list_backups) {
8105 			if (error->code != GOT_ERR_NOT_WORKTREE)
8106 				goto done;
8107 		} else {
8108 			if (error->code == GOT_ERR_NOT_WORKTREE)
8109 				error = wrap_not_worktree_error(error,
8110 				    "rebase", cwd);
8111 			goto done;
8112 		}
8113 	}
8114 
8115 	error = got_repo_open(&repo,
8116 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
8117 	if (error != NULL)
8118 		goto done;
8119 
8120 	error = apply_unveil(got_repo_get_path(repo), 0,
8121 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
8122 	if (error)
8123 		goto done;
8124 
8125 	if (list_backups) {
8126 		error = list_backup_refs(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
8127 		    argc == 1 ? argv[0] : NULL, repo);
8128 		goto done; /* nothing else to do */
8129 	}
8130 
8131 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
8132 	    worktree);
8133 	if (error)
8134 		goto done;
8135 	if (histedit_in_progress) {
8136 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
8137 		goto done;
8138 	}
8139 
8140 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8141 	if (error)
8142 		goto done;
8143 
8144 	if (abort_rebase) {
8145 		struct got_update_progress_arg upa;
8146 		if (!rebase_in_progress) {
8147 			error = got_error(GOT_ERR_NOT_REBASING);
8148 			goto done;
8149 		}
8150 		error = got_worktree_rebase_continue(&resume_commit_id,
8151 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
8152 		    worktree, repo);
8153 		if (error)
8154 			goto done;
8155 		printf("Switching work tree to %s\n",
8156 		    got_ref_get_symref_target(new_base_branch));
8157 		memset(&upa, 0, sizeof(upa));
8158 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
8159 		    new_base_branch, update_progress, &upa);
8160 		if (error)
8161 			goto done;
8162 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
8163 		print_update_progress_stats(&upa);
8164 		goto done; /* nothing else to do */
8165 	}
8166 
8167 	if (continue_rebase) {
8168 		if (!rebase_in_progress) {
8169 			error = got_error(GOT_ERR_NOT_REBASING);
8170 			goto done;
8171 		}
8172 		error = got_worktree_rebase_continue(&resume_commit_id,
8173 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
8174 		    worktree, repo);
8175 		if (error)
8176 			goto done;
8177 
8178 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
8179 		    resume_commit_id, repo);
8180 		if (error)
8181 			goto done;
8182 
8183 		yca_id = got_object_id_dup(resume_commit_id);
8184 		if (yca_id == NULL) {
8185 			error = got_error_from_errno("got_object_id_dup");
8186 			goto done;
8187 		}
8188 	} else {
8189 		error = got_ref_open(&branch, repo, argv[0], 0);
8190 		if (error != NULL)
8191 			goto done;
8192 	}
8193 
8194 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
8195 	if (error)
8196 		goto done;
8197 
8198 	if (!continue_rebase) {
8199 		struct got_object_id *base_commit_id;
8200 
8201 		base_commit_id = got_worktree_get_base_commit_id(worktree);
8202 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
8203 		    base_commit_id, branch_head_commit_id, repo,
8204 		    check_cancelled, NULL);
8205 		if (error)
8206 			goto done;
8207 		if (yca_id == NULL) {
8208 			error = got_error_msg(GOT_ERR_ANCESTRY,
8209 			    "specified branch shares no common ancestry "
8210 			    "with work tree's branch");
8211 			goto done;
8212 		}
8213 
8214 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
8215 		if (error) {
8216 			if (error->code != GOT_ERR_ANCESTRY)
8217 				goto done;
8218 			error = NULL;
8219 		} else {
8220 			static char msg[128];
8221 			snprintf(msg, sizeof(msg),
8222 			    "%s is already based on %s",
8223 			    got_ref_get_name(branch),
8224 			    got_worktree_get_head_ref_name(worktree));
8225 			error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
8226 			goto done;
8227 		}
8228 		error = got_worktree_rebase_prepare(&new_base_branch,
8229 		    &tmp_branch, &fileindex, worktree, branch, repo);
8230 		if (error)
8231 			goto done;
8232 	}
8233 
8234 	commit_id = branch_head_commit_id;
8235 	error = got_object_open_as_commit(&commit, repo, commit_id);
8236 	if (error)
8237 		goto done;
8238 
8239 	parent_ids = got_object_commit_get_parent_ids(commit);
8240 	pid = STAILQ_FIRST(parent_ids);
8241 	if (pid == NULL) {
8242 		if (!continue_rebase) {
8243 			struct got_update_progress_arg upa;
8244 			memset(&upa, 0, sizeof(upa));
8245 			error = got_worktree_rebase_abort(worktree, fileindex,
8246 			    repo, new_base_branch, update_progress, &upa);
8247 			if (error)
8248 				goto done;
8249 			printf("Rebase of %s aborted\n",
8250 			    got_ref_get_name(branch));
8251 			print_update_progress_stats(&upa);
8252 
8253 		}
8254 		error = got_error(GOT_ERR_EMPTY_REBASE);
8255 		goto done;
8256 	}
8257 	error = collect_commits(&commits, commit_id, pid->id,
8258 	    yca_id, got_worktree_get_path_prefix(worktree),
8259 	    GOT_ERR_REBASE_PATH, repo);
8260 	got_object_commit_close(commit);
8261 	commit = NULL;
8262 	if (error)
8263 		goto done;
8264 
8265 	if (STAILQ_EMPTY(&commits)) {
8266 		if (continue_rebase) {
8267 			error = rebase_complete(worktree, fileindex,
8268 			    branch, new_base_branch, tmp_branch, repo,
8269 			    create_backup);
8270 			goto done;
8271 		} else {
8272 			/* Fast-forward the reference of the branch. */
8273 			struct got_object_id *new_head_commit_id;
8274 			char *id_str;
8275 			error = got_ref_resolve(&new_head_commit_id, repo,
8276 			    new_base_branch);
8277 			if (error)
8278 				goto done;
8279 			error = got_object_id_str(&id_str, new_head_commit_id);
8280 			printf("Forwarding %s to commit %s\n",
8281 			    got_ref_get_name(branch), id_str);
8282 			free(id_str);
8283 			error = got_ref_change_ref(branch,
8284 			    new_head_commit_id);
8285 			if (error)
8286 				goto done;
8287 			/* No backup needed since objects did not change. */
8288 			create_backup = 0;
8289 		}
8290 	}
8291 
8292 	pid = NULL;
8293 	STAILQ_FOREACH(qid, &commits, entry) {
8294 		struct got_update_progress_arg upa;
8295 
8296 		commit_id = qid->id;
8297 		parent_id = pid ? pid->id : yca_id;
8298 		pid = qid;
8299 
8300 		memset(&upa, 0, sizeof(upa));
8301 		error = got_worktree_rebase_merge_files(&merged_paths,
8302 		    worktree, fileindex, parent_id, commit_id, repo,
8303 		    update_progress, &upa, check_cancelled, NULL);
8304 		if (error)
8305 			goto done;
8306 
8307 		print_update_progress_stats(&upa);
8308 		if (upa.conflicts > 0)
8309 			rebase_status = GOT_STATUS_CONFLICT;
8310 
8311 		if (rebase_status == GOT_STATUS_CONFLICT) {
8312 			error = show_rebase_merge_conflict(qid->id, repo);
8313 			if (error)
8314 				goto done;
8315 			got_worktree_rebase_pathlist_free(&merged_paths);
8316 			break;
8317 		}
8318 
8319 		error = rebase_commit(&merged_paths, worktree, fileindex,
8320 		    tmp_branch, commit_id, repo);
8321 		got_worktree_rebase_pathlist_free(&merged_paths);
8322 		if (error)
8323 			goto done;
8324 	}
8325 
8326 	if (rebase_status == GOT_STATUS_CONFLICT) {
8327 		error = got_worktree_rebase_postpone(worktree, fileindex);
8328 		if (error)
8329 			goto done;
8330 		error = got_error_msg(GOT_ERR_CONFLICTS,
8331 		    "conflicts must be resolved before rebasing can continue");
8332 	} else
8333 		error = rebase_complete(worktree, fileindex, branch,
8334 		    new_base_branch, tmp_branch, repo, create_backup);
8335 done:
8336 	got_object_id_queue_free(&commits);
8337 	free(branch_head_commit_id);
8338 	free(resume_commit_id);
8339 	free(yca_id);
8340 	if (commit)
8341 		got_object_commit_close(commit);
8342 	if (branch)
8343 		got_ref_close(branch);
8344 	if (new_base_branch)
8345 		got_ref_close(new_base_branch);
8346 	if (tmp_branch)
8347 		got_ref_close(tmp_branch);
8348 	if (worktree)
8349 		got_worktree_close(worktree);
8350 	if (repo) {
8351 		const struct got_error *close_err = got_repo_close(repo);
8352 		if (error == NULL)
8353 			error = close_err;
8354 	}
8355 	return error;
8356 }
8357 
8358 __dead static void
8359 usage_histedit(void)
8360 {
8361 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] "
8362 	    "[-F histedit-script] [-m] [-l] [branch]\n", getprogname());
8363 	exit(1);
8364 }
8365 
8366 #define GOT_HISTEDIT_PICK 'p'
8367 #define GOT_HISTEDIT_EDIT 'e'
8368 #define GOT_HISTEDIT_FOLD 'f'
8369 #define GOT_HISTEDIT_DROP 'd'
8370 #define GOT_HISTEDIT_MESG 'm'
8371 
8372 static struct got_histedit_cmd {
8373 	unsigned char code;
8374 	const char *name;
8375 	const char *desc;
8376 } got_histedit_cmds[] = {
8377 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
8378 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
8379 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
8380 	    "be used" },
8381 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
8382 	{ GOT_HISTEDIT_MESG, "mesg",
8383 	    "single-line log message for commit above (open editor if empty)" },
8384 };
8385 
8386 struct got_histedit_list_entry {
8387 	TAILQ_ENTRY(got_histedit_list_entry) entry;
8388 	struct got_object_id *commit_id;
8389 	const struct got_histedit_cmd *cmd;
8390 	char *logmsg;
8391 };
8392 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
8393 
8394 static const struct got_error *
8395 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
8396     FILE *f, struct got_repository *repo)
8397 {
8398 	const struct got_error *err = NULL;
8399 	char *logmsg = NULL, *id_str = NULL;
8400 	struct got_commit_object *commit = NULL;
8401 	int n;
8402 
8403 	err = got_object_open_as_commit(&commit, repo, commit_id);
8404 	if (err)
8405 		goto done;
8406 
8407 	err = get_short_logmsg(&logmsg, 34, commit);
8408 	if (err)
8409 		goto done;
8410 
8411 	err = got_object_id_str(&id_str, commit_id);
8412 	if (err)
8413 		goto done;
8414 
8415 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
8416 	if (n < 0)
8417 		err = got_ferror(f, GOT_ERR_IO);
8418 done:
8419 	if (commit)
8420 		got_object_commit_close(commit);
8421 	free(id_str);
8422 	free(logmsg);
8423 	return err;
8424 }
8425 
8426 static const struct got_error *
8427 histedit_write_commit_list(struct got_object_id_queue *commits,
8428     FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
8429 {
8430 	const struct got_error *err = NULL;
8431 	struct got_object_qid *qid;
8432 	const char *histedit_cmd = NULL;
8433 
8434 	if (STAILQ_EMPTY(commits))
8435 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
8436 
8437 	STAILQ_FOREACH(qid, commits, entry) {
8438 		histedit_cmd = got_histedit_cmds[0].name;
8439 		if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
8440 			histedit_cmd = "fold";
8441 		err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
8442 		if (err)
8443 			break;
8444 		if (edit_logmsg_only) {
8445 			int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
8446 			if (n < 0) {
8447 				err = got_ferror(f, GOT_ERR_IO);
8448 				break;
8449 			}
8450 		}
8451 	}
8452 
8453 	return err;
8454 }
8455 
8456 static const struct got_error *
8457 write_cmd_list(FILE *f, const char *branch_name,
8458     struct got_object_id_queue *commits)
8459 {
8460 	const struct got_error *err = NULL;
8461 	size_t i;
8462 	int n;
8463 	char *id_str;
8464 	struct got_object_qid *qid;
8465 
8466 	qid = STAILQ_FIRST(commits);
8467 	err = got_object_id_str(&id_str, qid->id);
8468 	if (err)
8469 		return err;
8470 
8471 	n = fprintf(f,
8472 	    "# Editing the history of branch '%s' starting at\n"
8473 	    "# commit %s\n"
8474 	    "# Commits will be processed in order from top to "
8475 	    "bottom of this file.\n", branch_name, id_str);
8476 	if (n < 0) {
8477 		err = got_ferror(f, GOT_ERR_IO);
8478 		goto done;
8479 	}
8480 
8481 	n = fprintf(f, "# Available histedit commands:\n");
8482 	if (n < 0) {
8483 		err = got_ferror(f, GOT_ERR_IO);
8484 		goto done;
8485 	}
8486 
8487 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
8488 		struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
8489 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
8490 		    cmd->desc);
8491 		if (n < 0) {
8492 			err = got_ferror(f, GOT_ERR_IO);
8493 			break;
8494 		}
8495 	}
8496 done:
8497 	free(id_str);
8498 	return err;
8499 }
8500 
8501 static const struct got_error *
8502 histedit_syntax_error(int lineno)
8503 {
8504 	static char msg[42];
8505 	int ret;
8506 
8507 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
8508 	    lineno);
8509 	if (ret == -1 || ret >= sizeof(msg))
8510 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
8511 
8512 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
8513 }
8514 
8515 static const struct got_error *
8516 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
8517     char *logmsg, struct got_repository *repo)
8518 {
8519 	const struct got_error *err;
8520 	struct got_commit_object *folded_commit = NULL;
8521 	char *id_str, *folded_logmsg = NULL;
8522 
8523 	err = got_object_id_str(&id_str, hle->commit_id);
8524 	if (err)
8525 		return err;
8526 
8527 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
8528 	if (err)
8529 		goto done;
8530 
8531 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
8532 	if (err)
8533 		goto done;
8534 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
8535 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
8536 	    folded_logmsg) == -1) {
8537 		err = got_error_from_errno("asprintf");
8538 	}
8539 done:
8540 	if (folded_commit)
8541 		got_object_commit_close(folded_commit);
8542 	free(id_str);
8543 	free(folded_logmsg);
8544 	return err;
8545 }
8546 
8547 static struct got_histedit_list_entry *
8548 get_folded_commits(struct got_histedit_list_entry *hle)
8549 {
8550 	struct got_histedit_list_entry *prev, *folded = NULL;
8551 
8552 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
8553 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
8554 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
8555 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
8556 			folded = prev;
8557 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
8558 	}
8559 
8560 	return folded;
8561 }
8562 
8563 static const struct got_error *
8564 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
8565     struct got_repository *repo)
8566 {
8567 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
8568 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
8569 	const struct got_error *err = NULL;
8570 	struct got_commit_object *commit = NULL;
8571 	int logmsg_len;
8572 	int fd;
8573 	struct got_histedit_list_entry *folded = NULL;
8574 
8575 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8576 	if (err)
8577 		return err;
8578 
8579 	folded = get_folded_commits(hle);
8580 	if (folded) {
8581 		while (folded != hle) {
8582 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
8583 				folded = TAILQ_NEXT(folded, entry);
8584 				continue;
8585 			}
8586 			err = append_folded_commit_msg(&new_msg, folded,
8587 			    logmsg, repo);
8588 			if (err)
8589 				goto done;
8590 			free(logmsg);
8591 			logmsg = new_msg;
8592 			folded = TAILQ_NEXT(folded, entry);
8593 		}
8594 	}
8595 
8596 	err = got_object_id_str(&id_str, hle->commit_id);
8597 	if (err)
8598 		goto done;
8599 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8600 	if (err)
8601 		goto done;
8602 	logmsg_len = asprintf(&new_msg,
8603 	    "%s\n# original log message of commit %s: %s",
8604 	    logmsg ? logmsg : "", id_str, orig_logmsg);
8605 	if (logmsg_len == -1) {
8606 		err = got_error_from_errno("asprintf");
8607 		goto done;
8608 	}
8609 	free(logmsg);
8610 	logmsg = new_msg;
8611 
8612 	err = got_object_id_str(&id_str, hle->commit_id);
8613 	if (err)
8614 		goto done;
8615 
8616 	err = got_opentemp_named_fd(&logmsg_path, &fd,
8617 	    GOT_TMPDIR_STR "/got-logmsg");
8618 	if (err)
8619 		goto done;
8620 
8621 	write(fd, logmsg, logmsg_len);
8622 	close(fd);
8623 
8624 	err = get_editor(&editor);
8625 	if (err)
8626 		goto done;
8627 
8628 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8629 	    logmsg_len, 0);
8630 	if (err) {
8631 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8632 			goto done;
8633 		err = NULL;
8634 		hle->logmsg = strdup(new_msg);
8635 		if (hle->logmsg == NULL)
8636 			err = got_error_from_errno("strdup");
8637 	}
8638 done:
8639 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8640 		err = got_error_from_errno2("unlink", logmsg_path);
8641 	free(logmsg_path);
8642 	free(logmsg);
8643 	free(orig_logmsg);
8644 	free(editor);
8645 	if (commit)
8646 		got_object_commit_close(commit);
8647 	return err;
8648 }
8649 
8650 static const struct got_error *
8651 histedit_parse_list(struct got_histedit_list *histedit_cmds,
8652     FILE *f, struct got_repository *repo)
8653 {
8654 	const struct got_error *err = NULL;
8655 	char *line = NULL, *p, *end;
8656 	size_t i, size;
8657 	ssize_t len;
8658 	int lineno = 0;
8659 	const struct got_histedit_cmd *cmd;
8660 	struct got_object_id *commit_id = NULL;
8661 	struct got_histedit_list_entry *hle = NULL;
8662 
8663 	for (;;) {
8664 		len = getline(&line, &size, f);
8665 		if (len == -1) {
8666 			const struct got_error *getline_err;
8667 			if (feof(f))
8668 				break;
8669 			getline_err = got_error_from_errno("getline");
8670 			err = got_ferror(f, getline_err->code);
8671 			break;
8672 		}
8673 		lineno++;
8674 		p = line;
8675 		while (isspace((unsigned char)p[0]))
8676 			p++;
8677 		if (p[0] == '#' || p[0] == '\0') {
8678 			free(line);
8679 			line = NULL;
8680 			continue;
8681 		}
8682 		cmd = NULL;
8683 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
8684 			cmd = &got_histedit_cmds[i];
8685 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8686 			    isspace((unsigned char)p[strlen(cmd->name)])) {
8687 				p += strlen(cmd->name);
8688 				break;
8689 			}
8690 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8691 				p++;
8692 				break;
8693 			}
8694 		}
8695 		if (i == nitems(got_histedit_cmds)) {
8696 			err = histedit_syntax_error(lineno);
8697 			break;
8698 		}
8699 		while (isspace((unsigned char)p[0]))
8700 			p++;
8701 		if (cmd->code == GOT_HISTEDIT_MESG) {
8702 			if (hle == NULL || hle->logmsg != NULL) {
8703 				err = got_error(GOT_ERR_HISTEDIT_CMD);
8704 				break;
8705 			}
8706 			if (p[0] == '\0') {
8707 				err = histedit_edit_logmsg(hle, repo);
8708 				if (err)
8709 					break;
8710 			} else {
8711 				hle->logmsg = strdup(p);
8712 				if (hle->logmsg == NULL) {
8713 					err = got_error_from_errno("strdup");
8714 					break;
8715 				}
8716 			}
8717 			free(line);
8718 			line = NULL;
8719 			continue;
8720 		} else {
8721 			end = p;
8722 			while (end[0] && !isspace((unsigned char)end[0]))
8723 				end++;
8724 			*end = '\0';
8725 
8726 			err = got_object_resolve_id_str(&commit_id, repo, p);
8727 			if (err) {
8728 				/* override error code */
8729 				err = histedit_syntax_error(lineno);
8730 				break;
8731 			}
8732 		}
8733 		hle = malloc(sizeof(*hle));
8734 		if (hle == NULL) {
8735 			err = got_error_from_errno("malloc");
8736 			break;
8737 		}
8738 		hle->cmd = cmd;
8739 		hle->commit_id = commit_id;
8740 		hle->logmsg = NULL;
8741 		commit_id = NULL;
8742 		free(line);
8743 		line = NULL;
8744 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8745 	}
8746 
8747 	free(line);
8748 	free(commit_id);
8749 	return err;
8750 }
8751 
8752 static const struct got_error *
8753 histedit_check_script(struct got_histedit_list *histedit_cmds,
8754     struct got_object_id_queue *commits, struct got_repository *repo)
8755 {
8756 	const struct got_error *err = NULL;
8757 	struct got_object_qid *qid;
8758 	struct got_histedit_list_entry *hle;
8759 	static char msg[92];
8760 	char *id_str;
8761 
8762 	if (TAILQ_EMPTY(histedit_cmds))
8763 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8764 		    "histedit script contains no commands");
8765 	if (STAILQ_EMPTY(commits))
8766 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
8767 
8768 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
8769 		struct got_histedit_list_entry *hle2;
8770 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8771 			if (hle == hle2)
8772 				continue;
8773 			if (got_object_id_cmp(hle->commit_id,
8774 			    hle2->commit_id) != 0)
8775 				continue;
8776 			err = got_object_id_str(&id_str, hle->commit_id);
8777 			if (err)
8778 				return err;
8779 			snprintf(msg, sizeof(msg), "commit %s is listed "
8780 			    "more than once in histedit script", id_str);
8781 			free(id_str);
8782 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8783 		}
8784 	}
8785 
8786 	STAILQ_FOREACH(qid, commits, entry) {
8787 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
8788 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8789 				break;
8790 		}
8791 		if (hle == NULL) {
8792 			err = got_object_id_str(&id_str, qid->id);
8793 			if (err)
8794 				return err;
8795 			snprintf(msg, sizeof(msg),
8796 			    "commit %s missing from histedit script", id_str);
8797 			free(id_str);
8798 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8799 		}
8800 	}
8801 
8802 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8803 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8804 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8805 		    "last commit in histedit script cannot be folded");
8806 
8807 	return NULL;
8808 }
8809 
8810 static const struct got_error *
8811 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8812     const char *path, struct got_object_id_queue *commits,
8813     struct got_repository *repo)
8814 {
8815 	const struct got_error *err = NULL;
8816 	char *editor;
8817 	FILE *f = NULL;
8818 
8819 	err = get_editor(&editor);
8820 	if (err)
8821 		return err;
8822 
8823 	if (spawn_editor(editor, path) == -1) {
8824 		err = got_error_from_errno("failed spawning editor");
8825 		goto done;
8826 	}
8827 
8828 	f = fopen(path, "r");
8829 	if (f == NULL) {
8830 		err = got_error_from_errno("fopen");
8831 		goto done;
8832 	}
8833 	err = histedit_parse_list(histedit_cmds, f, repo);
8834 	if (err)
8835 		goto done;
8836 
8837 	err = histedit_check_script(histedit_cmds, commits, repo);
8838 done:
8839 	if (f && fclose(f) == EOF && err == NULL)
8840 		err = got_error_from_errno("fclose");
8841 	free(editor);
8842 	return err;
8843 }
8844 
8845 static const struct got_error *
8846 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8847     struct got_object_id_queue *, const char *, const char *,
8848     struct got_repository *);
8849 
8850 static const struct got_error *
8851 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8852     struct got_object_id_queue *commits, const char *branch_name,
8853     int edit_logmsg_only, int fold_only, struct got_repository *repo)
8854 {
8855 	const struct got_error *err;
8856 	FILE *f = NULL;
8857 	char *path = NULL;
8858 
8859 	err = got_opentemp_named(&path, &f, "got-histedit");
8860 	if (err)
8861 		return err;
8862 
8863 	err = write_cmd_list(f, branch_name, commits);
8864 	if (err)
8865 		goto done;
8866 
8867 	err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8868 	    fold_only, repo);
8869 	if (err)
8870 		goto done;
8871 
8872 	if (edit_logmsg_only || fold_only) {
8873 		rewind(f);
8874 		err = histedit_parse_list(histedit_cmds, f, repo);
8875 	} else {
8876 		if (fclose(f) == EOF) {
8877 			err = got_error_from_errno("fclose");
8878 			goto done;
8879 		}
8880 		f = NULL;
8881 		err = histedit_run_editor(histedit_cmds, path, commits, repo);
8882 		if (err) {
8883 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8884 			    err->code != GOT_ERR_HISTEDIT_CMD)
8885 				goto done;
8886 			err = histedit_edit_list_retry(histedit_cmds, err,
8887 			    commits, path, branch_name, repo);
8888 		}
8889 	}
8890 done:
8891 	if (f && fclose(f) == EOF && err == NULL)
8892 		err = got_error_from_errno("fclose");
8893 	if (path && unlink(path) != 0 && err == NULL)
8894 		err = got_error_from_errno2("unlink", path);
8895 	free(path);
8896 	return err;
8897 }
8898 
8899 static const struct got_error *
8900 histedit_save_list(struct got_histedit_list *histedit_cmds,
8901     struct got_worktree *worktree, struct got_repository *repo)
8902 {
8903 	const struct got_error *err = NULL;
8904 	char *path = NULL;
8905 	FILE *f = NULL;
8906 	struct got_histedit_list_entry *hle;
8907 	struct got_commit_object *commit = NULL;
8908 
8909 	err = got_worktree_get_histedit_script_path(&path, worktree);
8910 	if (err)
8911 		return err;
8912 
8913 	f = fopen(path, "w");
8914 	if (f == NULL) {
8915 		err = got_error_from_errno2("fopen", path);
8916 		goto done;
8917 	}
8918 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
8919 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8920 		    repo);
8921 		if (err)
8922 			break;
8923 
8924 		if (hle->logmsg) {
8925 			int n = fprintf(f, "%c %s\n",
8926 			    GOT_HISTEDIT_MESG, hle->logmsg);
8927 			if (n < 0) {
8928 				err = got_ferror(f, GOT_ERR_IO);
8929 				break;
8930 			}
8931 		}
8932 	}
8933 done:
8934 	if (f && fclose(f) == EOF && err == NULL)
8935 		err = got_error_from_errno("fclose");
8936 	free(path);
8937 	if (commit)
8938 		got_object_commit_close(commit);
8939 	return err;
8940 }
8941 
8942 void
8943 histedit_free_list(struct got_histedit_list *histedit_cmds)
8944 {
8945 	struct got_histedit_list_entry *hle;
8946 
8947 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
8948 		TAILQ_REMOVE(histedit_cmds, hle, entry);
8949 		free(hle);
8950 	}
8951 }
8952 
8953 static const struct got_error *
8954 histedit_load_list(struct got_histedit_list *histedit_cmds,
8955     const char *path, struct got_repository *repo)
8956 {
8957 	const struct got_error *err = NULL;
8958 	FILE *f = NULL;
8959 
8960 	f = fopen(path, "r");
8961 	if (f == NULL) {
8962 		err = got_error_from_errno2("fopen", path);
8963 		goto done;
8964 	}
8965 
8966 	err = histedit_parse_list(histedit_cmds, f, repo);
8967 done:
8968 	if (f && fclose(f) == EOF && err == NULL)
8969 		err = got_error_from_errno("fclose");
8970 	return err;
8971 }
8972 
8973 static const struct got_error *
8974 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8975     const struct got_error *edit_err, struct got_object_id_queue *commits,
8976     const char *path, const char *branch_name, struct got_repository *repo)
8977 {
8978 	const struct got_error *err = NULL, *prev_err = edit_err;
8979 	int resp = ' ';
8980 
8981 	while (resp != 'c' && resp != 'r' && resp != 'a') {
8982 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8983 		    "or (a)bort: ", getprogname(), prev_err->msg);
8984 		resp = getchar();
8985 		if (resp == '\n')
8986 			resp = getchar();
8987 		if (resp == 'c') {
8988 			histedit_free_list(histedit_cmds);
8989 			err = histedit_run_editor(histedit_cmds, path, commits,
8990 			    repo);
8991 			if (err) {
8992 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8993 				    err->code != GOT_ERR_HISTEDIT_CMD)
8994 					break;
8995 				prev_err = err;
8996 				resp = ' ';
8997 				continue;
8998 			}
8999 			break;
9000 		} else if (resp == 'r') {
9001 			histedit_free_list(histedit_cmds);
9002 			err = histedit_edit_script(histedit_cmds,
9003 			    commits, branch_name, 0, 0, repo);
9004 			if (err) {
9005 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
9006 				    err->code != GOT_ERR_HISTEDIT_CMD)
9007 					break;
9008 				prev_err = err;
9009 				resp = ' ';
9010 				continue;
9011 			}
9012 			break;
9013 		} else if (resp == 'a') {
9014 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
9015 			break;
9016 		} else
9017 			printf("invalid response '%c'\n", resp);
9018 	}
9019 
9020 	return err;
9021 }
9022 
9023 static const struct got_error *
9024 histedit_complete(struct got_worktree *worktree,
9025     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
9026     struct got_reference *branch, struct got_repository *repo)
9027 {
9028 	printf("Switching work tree to %s\n",
9029 	    got_ref_get_symref_target(branch));
9030 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
9031 	    branch, repo);
9032 }
9033 
9034 static const struct got_error *
9035 show_histedit_progress(struct got_commit_object *commit,
9036     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
9037 {
9038 	const struct got_error *err;
9039 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9040 
9041 	err = got_object_id_str(&old_id_str, hle->commit_id);
9042 	if (err)
9043 		goto done;
9044 
9045 	if (new_id) {
9046 		err = got_object_id_str(&new_id_str, new_id);
9047 		if (err)
9048 			goto done;
9049 	}
9050 
9051 	old_id_str[12] = '\0';
9052 	if (new_id_str)
9053 		new_id_str[12] = '\0';
9054 
9055 	if (hle->logmsg) {
9056 		logmsg = strdup(hle->logmsg);
9057 		if (logmsg == NULL) {
9058 			err = got_error_from_errno("strdup");
9059 			goto done;
9060 		}
9061 		trim_logmsg(logmsg, 42);
9062 	} else {
9063 		err = get_short_logmsg(&logmsg, 42, commit);
9064 		if (err)
9065 			goto done;
9066 	}
9067 
9068 	switch (hle->cmd->code) {
9069 	case GOT_HISTEDIT_PICK:
9070 	case GOT_HISTEDIT_EDIT:
9071 		printf("%s -> %s: %s\n", old_id_str,
9072 		    new_id_str ? new_id_str : "no-op change", logmsg);
9073 		break;
9074 	case GOT_HISTEDIT_DROP:
9075 	case GOT_HISTEDIT_FOLD:
9076 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
9077 		    logmsg);
9078 		break;
9079 	default:
9080 		break;
9081 	}
9082 done:
9083 	free(old_id_str);
9084 	free(new_id_str);
9085 	return err;
9086 }
9087 
9088 static const struct got_error *
9089 histedit_commit(struct got_pathlist_head *merged_paths,
9090     struct got_worktree *worktree, struct got_fileindex *fileindex,
9091     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
9092     struct got_repository *repo)
9093 {
9094 	const struct got_error *err;
9095 	struct got_commit_object *commit;
9096 	struct got_object_id *new_commit_id;
9097 
9098 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
9099 	    && hle->logmsg == NULL) {
9100 		err = histedit_edit_logmsg(hle, repo);
9101 		if (err)
9102 			return err;
9103 	}
9104 
9105 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9106 	if (err)
9107 		return err;
9108 
9109 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
9110 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
9111 	    hle->logmsg, repo);
9112 	if (err) {
9113 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
9114 			goto done;
9115 		err = show_histedit_progress(commit, hle, NULL);
9116 	} else {
9117 		err = show_histedit_progress(commit, hle, new_commit_id);
9118 		free(new_commit_id);
9119 	}
9120 done:
9121 	got_object_commit_close(commit);
9122 	return err;
9123 }
9124 
9125 static const struct got_error *
9126 histedit_skip_commit(struct got_histedit_list_entry *hle,
9127     struct got_worktree *worktree, struct got_repository *repo)
9128 {
9129 	const struct got_error *error;
9130 	struct got_commit_object *commit;
9131 
9132 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
9133 	    repo);
9134 	if (error)
9135 		return error;
9136 
9137 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
9138 	if (error)
9139 		return error;
9140 
9141 	error = show_histedit_progress(commit, hle, NULL);
9142 	got_object_commit_close(commit);
9143 	return error;
9144 }
9145 
9146 static const struct got_error *
9147 check_local_changes(void *arg, unsigned char status,
9148     unsigned char staged_status, const char *path,
9149     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9150     struct got_object_id *commit_id, int dirfd, const char *de_name)
9151 {
9152 	int *have_local_changes = arg;
9153 
9154 	switch (status) {
9155 	case GOT_STATUS_ADD:
9156 	case GOT_STATUS_DELETE:
9157 	case GOT_STATUS_MODIFY:
9158 	case GOT_STATUS_CONFLICT:
9159 		*have_local_changes = 1;
9160 		return got_error(GOT_ERR_CANCELLED);
9161 	default:
9162 		break;
9163 	}
9164 
9165 	switch (staged_status) {
9166 	case GOT_STATUS_ADD:
9167 	case GOT_STATUS_DELETE:
9168 	case GOT_STATUS_MODIFY:
9169 		*have_local_changes = 1;
9170 		return got_error(GOT_ERR_CANCELLED);
9171 	default:
9172 		break;
9173 	}
9174 
9175 	return NULL;
9176 }
9177 
9178 static const struct got_error *
9179 cmd_histedit(int argc, char *argv[])
9180 {
9181 	const struct got_error *error = NULL;
9182 	struct got_worktree *worktree = NULL;
9183 	struct got_fileindex *fileindex = NULL;
9184 	struct got_repository *repo = NULL;
9185 	char *cwd = NULL;
9186 	struct got_reference *branch = NULL;
9187 	struct got_reference *tmp_branch = NULL;
9188 	struct got_object_id *resume_commit_id = NULL;
9189 	struct got_object_id *base_commit_id = NULL;
9190 	struct got_object_id *head_commit_id = NULL;
9191 	struct got_commit_object *commit = NULL;
9192 	int ch, rebase_in_progress = 0;
9193 	struct got_update_progress_arg upa;
9194 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
9195 	int edit_logmsg_only = 0, fold_only = 0;
9196 	int list_backups = 0;
9197 	const char *edit_script_path = NULL;
9198 	unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
9199 	struct got_object_id_queue commits;
9200 	struct got_pathlist_head merged_paths;
9201 	const struct got_object_id_queue *parent_ids;
9202 	struct got_object_qid *pid;
9203 	struct got_histedit_list histedit_cmds;
9204 	struct got_histedit_list_entry *hle;
9205 
9206 	STAILQ_INIT(&commits);
9207 	TAILQ_INIT(&histedit_cmds);
9208 	TAILQ_INIT(&merged_paths);
9209 	memset(&upa, 0, sizeof(upa));
9210 
9211 	while ((ch = getopt(argc, argv, "acfF:ml")) != -1) {
9212 		switch (ch) {
9213 		case 'a':
9214 			abort_edit = 1;
9215 			break;
9216 		case 'c':
9217 			continue_edit = 1;
9218 			break;
9219 		case 'f':
9220 			fold_only = 1;
9221 			break;
9222 		case 'F':
9223 			edit_script_path = optarg;
9224 			break;
9225 		case 'm':
9226 			edit_logmsg_only = 1;
9227 			break;
9228 		case 'l':
9229 			list_backups = 1;
9230 			break;
9231 		default:
9232 			usage_histedit();
9233 			/* NOTREACHED */
9234 		}
9235 	}
9236 
9237 	argc -= optind;
9238 	argv += optind;
9239 
9240 #ifndef PROFILE
9241 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9242 	    "unveil", NULL) == -1)
9243 		err(1, "pledge");
9244 #endif
9245 	if (abort_edit && continue_edit)
9246 		option_conflict('a', 'c');
9247 	if (edit_script_path && edit_logmsg_only)
9248 		option_conflict('F', 'm');
9249 	if (abort_edit && edit_logmsg_only)
9250 		option_conflict('a', 'm');
9251 	if (continue_edit && edit_logmsg_only)
9252 		option_conflict('c', 'm');
9253 	if (abort_edit && fold_only)
9254 		option_conflict('a', 'f');
9255 	if (continue_edit && fold_only)
9256 		option_conflict('c', 'f');
9257 	if (fold_only && edit_logmsg_only)
9258 		option_conflict('f', 'm');
9259 	if (edit_script_path && fold_only)
9260 		option_conflict('F', 'f');
9261 	if (list_backups) {
9262 		if (abort_edit)
9263 			option_conflict('l', 'a');
9264 		if (continue_edit)
9265 			option_conflict('l', 'c');
9266 		if (edit_script_path)
9267 			option_conflict('l', 'F');
9268 		if (edit_logmsg_only)
9269 			option_conflict('l', 'm');
9270 		if (fold_only)
9271 			option_conflict('l', 'f');
9272 		if (argc != 0 && argc != 1)
9273 			usage_histedit();
9274 	} else if (argc != 0)
9275 		usage_histedit();
9276 
9277 	/*
9278 	 * This command cannot apply unveil(2) in all cases because the
9279 	 * user may choose to run an editor to edit the histedit script
9280 	 * and to edit individual commit log messages.
9281 	 * unveil(2) traverses exec(2); if an editor is used we have to
9282 	 * apply unveil after edit script and log messages have been written.
9283 	 * XXX TODO: Make use of unveil(2) where possible.
9284 	 */
9285 
9286 	cwd = getcwd(NULL, 0);
9287 	if (cwd == NULL) {
9288 		error = got_error_from_errno("getcwd");
9289 		goto done;
9290 	}
9291 	error = got_worktree_open(&worktree, cwd);
9292 	if (error) {
9293 		if (list_backups) {
9294 			if (error->code != GOT_ERR_NOT_WORKTREE)
9295 				goto done;
9296 		} else {
9297 			if (error->code == GOT_ERR_NOT_WORKTREE)
9298 				error = wrap_not_worktree_error(error,
9299 				    "histedit", cwd);
9300 			goto done;
9301 		}
9302 	}
9303 
9304 	if (list_backups) {
9305 		error = got_repo_open(&repo,
9306 		    worktree ? got_worktree_get_repo_path(worktree) : cwd,
9307 		    NULL);
9308 		if (error != NULL)
9309 			goto done;
9310 		error = apply_unveil(got_repo_get_path(repo), 0,
9311 		    worktree ? got_worktree_get_root_path(worktree) : NULL);
9312 		if (error)
9313 			goto done;
9314 		error = list_backup_refs(
9315 		    GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
9316 		    argc == 1 ? argv[0] : NULL, repo);
9317 		goto done; /* nothing else to do */
9318 	}
9319 
9320 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9321 	    NULL);
9322 	if (error != NULL)
9323 		goto done;
9324 
9325 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9326 	if (error)
9327 		goto done;
9328 	if (rebase_in_progress) {
9329 		error = got_error(GOT_ERR_REBASING);
9330 		goto done;
9331 	}
9332 
9333 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
9334 	if (error)
9335 		goto done;
9336 
9337 	if (edit_in_progress && edit_logmsg_only) {
9338 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9339 		    "histedit operation is in progress in this "
9340 		    "work tree and must be continued or aborted "
9341 		    "before the -m option can be used");
9342 		goto done;
9343 	}
9344 	if (edit_in_progress && fold_only) {
9345 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9346 		    "histedit operation is in progress in this "
9347 		    "work tree and must be continued or aborted "
9348 		    "before the -f option can be used");
9349 		goto done;
9350 	}
9351 
9352 	if (edit_in_progress && abort_edit) {
9353 		error = got_worktree_histedit_continue(&resume_commit_id,
9354 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
9355 		    worktree, repo);
9356 		if (error)
9357 			goto done;
9358 		printf("Switching work tree to %s\n",
9359 		    got_ref_get_symref_target(branch));
9360 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
9361 		    branch, base_commit_id, update_progress, &upa);
9362 		if (error)
9363 			goto done;
9364 		printf("Histedit of %s aborted\n",
9365 		    got_ref_get_symref_target(branch));
9366 		print_update_progress_stats(&upa);
9367 		goto done; /* nothing else to do */
9368 	} else if (abort_edit) {
9369 		error = got_error(GOT_ERR_NOT_HISTEDIT);
9370 		goto done;
9371 	}
9372 
9373 	if (continue_edit) {
9374 		char *path;
9375 
9376 		if (!edit_in_progress) {
9377 			error = got_error(GOT_ERR_NOT_HISTEDIT);
9378 			goto done;
9379 		}
9380 
9381 		error = got_worktree_get_histedit_script_path(&path, worktree);
9382 		if (error)
9383 			goto done;
9384 
9385 		error = histedit_load_list(&histedit_cmds, path, repo);
9386 		free(path);
9387 		if (error)
9388 			goto done;
9389 
9390 		error = got_worktree_histedit_continue(&resume_commit_id,
9391 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
9392 		    worktree, repo);
9393 		if (error)
9394 			goto done;
9395 
9396 		error = got_ref_resolve(&head_commit_id, repo, branch);
9397 		if (error)
9398 			goto done;
9399 
9400 		error = got_object_open_as_commit(&commit, repo,
9401 		    head_commit_id);
9402 		if (error)
9403 			goto done;
9404 		parent_ids = got_object_commit_get_parent_ids(commit);
9405 		pid = STAILQ_FIRST(parent_ids);
9406 		if (pid == NULL) {
9407 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9408 			goto done;
9409 		}
9410 		error = collect_commits(&commits, head_commit_id, pid->id,
9411 		    base_commit_id, got_worktree_get_path_prefix(worktree),
9412 		    GOT_ERR_HISTEDIT_PATH, repo);
9413 		got_object_commit_close(commit);
9414 		commit = NULL;
9415 		if (error)
9416 			goto done;
9417 	} else {
9418 		if (edit_in_progress) {
9419 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
9420 			goto done;
9421 		}
9422 
9423 		error = got_ref_open(&branch, repo,
9424 		    got_worktree_get_head_ref_name(worktree), 0);
9425 		if (error != NULL)
9426 			goto done;
9427 
9428 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
9429 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
9430 			    "will not edit commit history of a branch outside "
9431 			    "the \"refs/heads/\" reference namespace");
9432 			goto done;
9433 		}
9434 
9435 		error = got_ref_resolve(&head_commit_id, repo, branch);
9436 		got_ref_close(branch);
9437 		branch = NULL;
9438 		if (error)
9439 			goto done;
9440 
9441 		error = got_object_open_as_commit(&commit, repo,
9442 		    head_commit_id);
9443 		if (error)
9444 			goto done;
9445 		parent_ids = got_object_commit_get_parent_ids(commit);
9446 		pid = STAILQ_FIRST(parent_ids);
9447 		if (pid == NULL) {
9448 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9449 			goto done;
9450 		}
9451 		error = collect_commits(&commits, head_commit_id, pid->id,
9452 		    got_worktree_get_base_commit_id(worktree),
9453 		    got_worktree_get_path_prefix(worktree),
9454 		    GOT_ERR_HISTEDIT_PATH, repo);
9455 		got_object_commit_close(commit);
9456 		commit = NULL;
9457 		if (error)
9458 			goto done;
9459 
9460 		if (STAILQ_EMPTY(&commits)) {
9461 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9462 			goto done;
9463 		}
9464 
9465 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
9466 		    &base_commit_id, &fileindex, worktree, repo);
9467 		if (error)
9468 			goto done;
9469 
9470 		if (edit_script_path) {
9471 			error = histedit_load_list(&histedit_cmds,
9472 			    edit_script_path, repo);
9473 			if (error) {
9474 				got_worktree_histedit_abort(worktree, fileindex,
9475 				    repo, branch, base_commit_id,
9476 				    update_progress, &upa);
9477 				print_update_progress_stats(&upa);
9478 				goto done;
9479 			}
9480 		} else {
9481 			const char *branch_name;
9482 			branch_name = got_ref_get_symref_target(branch);
9483 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
9484 				branch_name += 11;
9485 			error = histedit_edit_script(&histedit_cmds, &commits,
9486 			    branch_name, edit_logmsg_only, fold_only, repo);
9487 			if (error) {
9488 				got_worktree_histedit_abort(worktree, fileindex,
9489 				    repo, branch, base_commit_id,
9490 				    update_progress, &upa);
9491 				print_update_progress_stats(&upa);
9492 				goto done;
9493 			}
9494 
9495 		}
9496 
9497 		error = histedit_save_list(&histedit_cmds, worktree,
9498 		    repo);
9499 		if (error) {
9500 			got_worktree_histedit_abort(worktree, fileindex,
9501 			    repo, branch, base_commit_id,
9502 			    update_progress, &upa);
9503 			print_update_progress_stats(&upa);
9504 			goto done;
9505 		}
9506 
9507 	}
9508 
9509 	error = histedit_check_script(&histedit_cmds, &commits, repo);
9510 	if (error)
9511 		goto done;
9512 
9513 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
9514 		if (resume_commit_id) {
9515 			if (got_object_id_cmp(hle->commit_id,
9516 			    resume_commit_id) != 0)
9517 				continue;
9518 
9519 			resume_commit_id = NULL;
9520 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
9521 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
9522 				error = histedit_skip_commit(hle, worktree,
9523 				    repo);
9524 				if (error)
9525 					goto done;
9526 			} else {
9527 				struct got_pathlist_head paths;
9528 				int have_changes = 0;
9529 
9530 				TAILQ_INIT(&paths);
9531 				error = got_pathlist_append(&paths, "", NULL);
9532 				if (error)
9533 					goto done;
9534 				error = got_worktree_status(worktree, &paths,
9535 				    repo, 0, check_local_changes, &have_changes,
9536 				    check_cancelled, NULL);
9537 				got_pathlist_free(&paths);
9538 				if (error) {
9539 					if (error->code != GOT_ERR_CANCELLED)
9540 						goto done;
9541 					if (sigint_received || sigpipe_received)
9542 						goto done;
9543 				}
9544 				if (have_changes) {
9545 					error = histedit_commit(NULL, worktree,
9546 					    fileindex, tmp_branch, hle, repo);
9547 					if (error)
9548 						goto done;
9549 				} else {
9550 					error = got_object_open_as_commit(
9551 					    &commit, repo, hle->commit_id);
9552 					if (error)
9553 						goto done;
9554 					error = show_histedit_progress(commit,
9555 					    hle, NULL);
9556 					got_object_commit_close(commit);
9557 					commit = NULL;
9558 					if (error)
9559 						goto done;
9560 				}
9561 			}
9562 			continue;
9563 		}
9564 
9565 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
9566 			error = histedit_skip_commit(hle, worktree, repo);
9567 			if (error)
9568 				goto done;
9569 			continue;
9570 		}
9571 
9572 		error = got_object_open_as_commit(&commit, repo,
9573 		    hle->commit_id);
9574 		if (error)
9575 			goto done;
9576 		parent_ids = got_object_commit_get_parent_ids(commit);
9577 		pid = STAILQ_FIRST(parent_ids);
9578 
9579 		error = got_worktree_histedit_merge_files(&merged_paths,
9580 		    worktree, fileindex, pid->id, hle->commit_id, repo,
9581 		    update_progress, &upa, check_cancelled, NULL);
9582 		if (error)
9583 			goto done;
9584 		got_object_commit_close(commit);
9585 		commit = NULL;
9586 
9587 		print_update_progress_stats(&upa);
9588 		if (upa.conflicts > 0)
9589 			rebase_status = GOT_STATUS_CONFLICT;
9590 
9591 		if (rebase_status == GOT_STATUS_CONFLICT) {
9592 			error = show_rebase_merge_conflict(hle->commit_id,
9593 			    repo);
9594 			if (error)
9595 				goto done;
9596 			got_worktree_rebase_pathlist_free(&merged_paths);
9597 			break;
9598 		}
9599 
9600 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
9601 			char *id_str;
9602 			error = got_object_id_str(&id_str, hle->commit_id);
9603 			if (error)
9604 				goto done;
9605 			printf("Stopping histedit for amending commit %s\n",
9606 			    id_str);
9607 			free(id_str);
9608 			got_worktree_rebase_pathlist_free(&merged_paths);
9609 			error = got_worktree_histedit_postpone(worktree,
9610 			    fileindex);
9611 			goto done;
9612 		}
9613 
9614 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
9615 			error = histedit_skip_commit(hle, worktree, repo);
9616 			if (error)
9617 				goto done;
9618 			continue;
9619 		}
9620 
9621 		error = histedit_commit(&merged_paths, worktree, fileindex,
9622 		    tmp_branch, hle, repo);
9623 		got_worktree_rebase_pathlist_free(&merged_paths);
9624 		if (error)
9625 			goto done;
9626 	}
9627 
9628 	if (rebase_status == GOT_STATUS_CONFLICT) {
9629 		error = got_worktree_histedit_postpone(worktree, fileindex);
9630 		if (error)
9631 			goto done;
9632 		error = got_error_msg(GOT_ERR_CONFLICTS,
9633 		    "conflicts must be resolved before histedit can continue");
9634 	} else
9635 		error = histedit_complete(worktree, fileindex, tmp_branch,
9636 		    branch, repo);
9637 done:
9638 	got_object_id_queue_free(&commits);
9639 	histedit_free_list(&histedit_cmds);
9640 	free(head_commit_id);
9641 	free(base_commit_id);
9642 	free(resume_commit_id);
9643 	if (commit)
9644 		got_object_commit_close(commit);
9645 	if (branch)
9646 		got_ref_close(branch);
9647 	if (tmp_branch)
9648 		got_ref_close(tmp_branch);
9649 	if (worktree)
9650 		got_worktree_close(worktree);
9651 	if (repo) {
9652 		const struct got_error *close_err = got_repo_close(repo);
9653 		if (error == NULL)
9654 			error = close_err;
9655 	}
9656 	return error;
9657 }
9658 
9659 __dead static void
9660 usage_integrate(void)
9661 {
9662 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9663 	exit(1);
9664 }
9665 
9666 static const struct got_error *
9667 cmd_integrate(int argc, char *argv[])
9668 {
9669 	const struct got_error *error = NULL;
9670 	struct got_repository *repo = NULL;
9671 	struct got_worktree *worktree = NULL;
9672 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9673 	const char *branch_arg = NULL;
9674 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9675 	struct got_fileindex *fileindex = NULL;
9676 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9677 	int ch;
9678 	struct got_update_progress_arg upa;
9679 
9680 	while ((ch = getopt(argc, argv, "")) != -1) {
9681 		switch (ch) {
9682 		default:
9683 			usage_integrate();
9684 			/* NOTREACHED */
9685 		}
9686 	}
9687 
9688 	argc -= optind;
9689 	argv += optind;
9690 
9691 	if (argc != 1)
9692 		usage_integrate();
9693 	branch_arg = argv[0];
9694 #ifndef PROFILE
9695 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9696 	    "unveil", NULL) == -1)
9697 		err(1, "pledge");
9698 #endif
9699 	cwd = getcwd(NULL, 0);
9700 	if (cwd == NULL) {
9701 		error = got_error_from_errno("getcwd");
9702 		goto done;
9703 	}
9704 
9705 	error = got_worktree_open(&worktree, cwd);
9706 	if (error) {
9707 		if (error->code == GOT_ERR_NOT_WORKTREE)
9708 			error = wrap_not_worktree_error(error, "integrate",
9709 			    cwd);
9710 		goto done;
9711 	}
9712 
9713 	error = check_rebase_or_histedit_in_progress(worktree);
9714 	if (error)
9715 		goto done;
9716 
9717 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9718 	    NULL);
9719 	if (error != NULL)
9720 		goto done;
9721 
9722 	error = apply_unveil(got_repo_get_path(repo), 0,
9723 	    got_worktree_get_root_path(worktree));
9724 	if (error)
9725 		goto done;
9726 
9727 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9728 		error = got_error_from_errno("asprintf");
9729 		goto done;
9730 	}
9731 
9732 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9733 	    &base_branch_ref, worktree, refname, repo);
9734 	if (error)
9735 		goto done;
9736 
9737 	refname = strdup(got_ref_get_name(branch_ref));
9738 	if (refname == NULL) {
9739 		error = got_error_from_errno("strdup");
9740 		got_worktree_integrate_abort(worktree, fileindex, repo,
9741 		    branch_ref, base_branch_ref);
9742 		goto done;
9743 	}
9744 	base_refname = strdup(got_ref_get_name(base_branch_ref));
9745 	if (base_refname == NULL) {
9746 		error = got_error_from_errno("strdup");
9747 		got_worktree_integrate_abort(worktree, fileindex, repo,
9748 		    branch_ref, base_branch_ref);
9749 		goto done;
9750 	}
9751 
9752 	error = got_ref_resolve(&commit_id, repo, branch_ref);
9753 	if (error)
9754 		goto done;
9755 
9756 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9757 	if (error)
9758 		goto done;
9759 
9760 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9761 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
9762 		    "specified branch has already been integrated");
9763 		got_worktree_integrate_abort(worktree, fileindex, repo,
9764 		    branch_ref, base_branch_ref);
9765 		goto done;
9766 	}
9767 
9768 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9769 	if (error) {
9770 		if (error->code == GOT_ERR_ANCESTRY)
9771 			error = got_error(GOT_ERR_REBASE_REQUIRED);
9772 		got_worktree_integrate_abort(worktree, fileindex, repo,
9773 		    branch_ref, base_branch_ref);
9774 		goto done;
9775 	}
9776 
9777 	memset(&upa, 0, sizeof(upa));
9778 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
9779 	    branch_ref, base_branch_ref, update_progress, &upa,
9780 	    check_cancelled, NULL);
9781 	if (error)
9782 		goto done;
9783 
9784 	printf("Integrated %s into %s\n", refname, base_refname);
9785 	print_update_progress_stats(&upa);
9786 done:
9787 	if (repo) {
9788 		const struct got_error *close_err = got_repo_close(repo);
9789 		if (error == NULL)
9790 			error = close_err;
9791 	}
9792 	if (worktree)
9793 		got_worktree_close(worktree);
9794 	free(cwd);
9795 	free(base_commit_id);
9796 	free(commit_id);
9797 	free(refname);
9798 	free(base_refname);
9799 	return error;
9800 }
9801 
9802 __dead static void
9803 usage_stage(void)
9804 {
9805 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9806 	    "[-S] [file-path ...]\n",
9807 	    getprogname());
9808 	exit(1);
9809 }
9810 
9811 static const struct got_error *
9812 print_stage(void *arg, unsigned char status, unsigned char staged_status,
9813     const char *path, struct got_object_id *blob_id,
9814     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9815     int dirfd, const char *de_name)
9816 {
9817 	const struct got_error *err = NULL;
9818 	char *id_str = NULL;
9819 
9820 	if (staged_status != GOT_STATUS_ADD &&
9821 	    staged_status != GOT_STATUS_MODIFY &&
9822 	    staged_status != GOT_STATUS_DELETE)
9823 		return NULL;
9824 
9825 	if (staged_status == GOT_STATUS_ADD ||
9826 	    staged_status == GOT_STATUS_MODIFY)
9827 		err = got_object_id_str(&id_str, staged_blob_id);
9828 	else
9829 		err = got_object_id_str(&id_str, blob_id);
9830 	if (err)
9831 		return err;
9832 
9833 	printf("%s %c %s\n", id_str, staged_status, path);
9834 	free(id_str);
9835 	return NULL;
9836 }
9837 
9838 static const struct got_error *
9839 cmd_stage(int argc, char *argv[])
9840 {
9841 	const struct got_error *error = NULL;
9842 	struct got_repository *repo = NULL;
9843 	struct got_worktree *worktree = NULL;
9844 	char *cwd = NULL;
9845 	struct got_pathlist_head paths;
9846 	struct got_pathlist_entry *pe;
9847 	int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9848 	FILE *patch_script_file = NULL;
9849 	const char *patch_script_path = NULL;
9850 	struct choose_patch_arg cpa;
9851 
9852 	TAILQ_INIT(&paths);
9853 
9854 	while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9855 		switch (ch) {
9856 		case 'l':
9857 			list_stage = 1;
9858 			break;
9859 		case 'p':
9860 			pflag = 1;
9861 			break;
9862 		case 'F':
9863 			patch_script_path = optarg;
9864 			break;
9865 		case 'S':
9866 			allow_bad_symlinks = 1;
9867 			break;
9868 		default:
9869 			usage_stage();
9870 			/* NOTREACHED */
9871 		}
9872 	}
9873 
9874 	argc -= optind;
9875 	argv += optind;
9876 
9877 #ifndef PROFILE
9878 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9879 	    "unveil", NULL) == -1)
9880 		err(1, "pledge");
9881 #endif
9882 	if (list_stage && (pflag || patch_script_path))
9883 		errx(1, "-l option cannot be used with other options");
9884 	if (patch_script_path && !pflag)
9885 		errx(1, "-F option can only be used together with -p option");
9886 
9887 	cwd = getcwd(NULL, 0);
9888 	if (cwd == NULL) {
9889 		error = got_error_from_errno("getcwd");
9890 		goto done;
9891 	}
9892 
9893 	error = got_worktree_open(&worktree, cwd);
9894 	if (error) {
9895 		if (error->code == GOT_ERR_NOT_WORKTREE)
9896 			error = wrap_not_worktree_error(error, "stage", cwd);
9897 		goto done;
9898 	}
9899 
9900 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9901 	    NULL);
9902 	if (error != NULL)
9903 		goto done;
9904 
9905 	if (patch_script_path) {
9906 		patch_script_file = fopen(patch_script_path, "r");
9907 		if (patch_script_file == NULL) {
9908 			error = got_error_from_errno2("fopen",
9909 			    patch_script_path);
9910 			goto done;
9911 		}
9912 	}
9913 	error = apply_unveil(got_repo_get_path(repo), 0,
9914 	    got_worktree_get_root_path(worktree));
9915 	if (error)
9916 		goto done;
9917 
9918 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9919 	if (error)
9920 		goto done;
9921 
9922 	if (list_stage)
9923 		error = got_worktree_status(worktree, &paths, repo, 0,
9924 		    print_stage, NULL, check_cancelled, NULL);
9925 	else {
9926 		cpa.patch_script_file = patch_script_file;
9927 		cpa.action = "stage";
9928 		error = got_worktree_stage(worktree, &paths,
9929 		    pflag ? NULL : print_status, NULL,
9930 		    pflag ? choose_patch : NULL, &cpa,
9931 		    allow_bad_symlinks, repo);
9932 	}
9933 done:
9934 	if (patch_script_file && fclose(patch_script_file) == EOF &&
9935 	    error == NULL)
9936 		error = got_error_from_errno2("fclose", patch_script_path);
9937 	if (repo) {
9938 		const struct got_error *close_err = got_repo_close(repo);
9939 		if (error == NULL)
9940 			error = close_err;
9941 	}
9942 	if (worktree)
9943 		got_worktree_close(worktree);
9944 	TAILQ_FOREACH(pe, &paths, entry)
9945 		free((char *)pe->path);
9946 	got_pathlist_free(&paths);
9947 	free(cwd);
9948 	return error;
9949 }
9950 
9951 __dead static void
9952 usage_unstage(void)
9953 {
9954 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9955 	    "[file-path ...]\n",
9956 	    getprogname());
9957 	exit(1);
9958 }
9959 
9960 
9961 static const struct got_error *
9962 cmd_unstage(int argc, char *argv[])
9963 {
9964 	const struct got_error *error = NULL;
9965 	struct got_repository *repo = NULL;
9966 	struct got_worktree *worktree = NULL;
9967 	char *cwd = NULL;
9968 	struct got_pathlist_head paths;
9969 	struct got_pathlist_entry *pe;
9970 	int ch, pflag = 0;
9971 	struct got_update_progress_arg upa;
9972 	FILE *patch_script_file = NULL;
9973 	const char *patch_script_path = NULL;
9974 	struct choose_patch_arg cpa;
9975 
9976 	TAILQ_INIT(&paths);
9977 
9978 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
9979 		switch (ch) {
9980 		case 'p':
9981 			pflag = 1;
9982 			break;
9983 		case 'F':
9984 			patch_script_path = optarg;
9985 			break;
9986 		default:
9987 			usage_unstage();
9988 			/* NOTREACHED */
9989 		}
9990 	}
9991 
9992 	argc -= optind;
9993 	argv += optind;
9994 
9995 #ifndef PROFILE
9996 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9997 	    "unveil", NULL) == -1)
9998 		err(1, "pledge");
9999 #endif
10000 	if (patch_script_path && !pflag)
10001 		errx(1, "-F option can only be used together with -p option");
10002 
10003 	cwd = getcwd(NULL, 0);
10004 	if (cwd == NULL) {
10005 		error = got_error_from_errno("getcwd");
10006 		goto done;
10007 	}
10008 
10009 	error = got_worktree_open(&worktree, cwd);
10010 	if (error) {
10011 		if (error->code == GOT_ERR_NOT_WORKTREE)
10012 			error = wrap_not_worktree_error(error, "unstage", cwd);
10013 		goto done;
10014 	}
10015 
10016 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10017 	    NULL);
10018 	if (error != NULL)
10019 		goto done;
10020 
10021 	if (patch_script_path) {
10022 		patch_script_file = fopen(patch_script_path, "r");
10023 		if (patch_script_file == NULL) {
10024 			error = got_error_from_errno2("fopen",
10025 			    patch_script_path);
10026 			goto done;
10027 		}
10028 	}
10029 
10030 	error = apply_unveil(got_repo_get_path(repo), 0,
10031 	    got_worktree_get_root_path(worktree));
10032 	if (error)
10033 		goto done;
10034 
10035 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
10036 	if (error)
10037 		goto done;
10038 
10039 	cpa.patch_script_file = patch_script_file;
10040 	cpa.action = "unstage";
10041 	memset(&upa, 0, sizeof(upa));
10042 	error = got_worktree_unstage(worktree, &paths, update_progress,
10043 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
10044 	if (!error)
10045 		print_update_progress_stats(&upa);
10046 done:
10047 	if (patch_script_file && fclose(patch_script_file) == EOF &&
10048 	    error == NULL)
10049 		error = got_error_from_errno2("fclose", patch_script_path);
10050 	if (repo) {
10051 		const struct got_error *close_err = got_repo_close(repo);
10052 		if (error == NULL)
10053 			error = close_err;
10054 	}
10055 	if (worktree)
10056 		got_worktree_close(worktree);
10057 	TAILQ_FOREACH(pe, &paths, entry)
10058 		free((char *)pe->path);
10059 	got_pathlist_free(&paths);
10060 	free(cwd);
10061 	return error;
10062 }
10063 
10064 __dead static void
10065 usage_cat(void)
10066 {
10067 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
10068 	    "arg1 [arg2 ...]\n", getprogname());
10069 	exit(1);
10070 }
10071 
10072 static const struct got_error *
10073 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10074 {
10075 	const struct got_error *err;
10076 	struct got_blob_object *blob;
10077 
10078 	err = got_object_open_as_blob(&blob, repo, id, 8192);
10079 	if (err)
10080 		return err;
10081 
10082 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
10083 	got_object_blob_close(blob);
10084 	return err;
10085 }
10086 
10087 static const struct got_error *
10088 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10089 {
10090 	const struct got_error *err;
10091 	struct got_tree_object *tree;
10092 	int nentries, i;
10093 
10094 	err = got_object_open_as_tree(&tree, repo, id);
10095 	if (err)
10096 		return err;
10097 
10098 	nentries = got_object_tree_get_nentries(tree);
10099 	for (i = 0; i < nentries; i++) {
10100 		struct got_tree_entry *te;
10101 		char *id_str;
10102 		if (sigint_received || sigpipe_received)
10103 			break;
10104 		te = got_object_tree_get_entry(tree, i);
10105 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
10106 		if (err)
10107 			break;
10108 		fprintf(outfile, "%s %.7o %s\n", id_str,
10109 		    got_tree_entry_get_mode(te),
10110 		    got_tree_entry_get_name(te));
10111 		free(id_str);
10112 	}
10113 
10114 	got_object_tree_close(tree);
10115 	return err;
10116 }
10117 
10118 static const struct got_error *
10119 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10120 {
10121 	const struct got_error *err;
10122 	struct got_commit_object *commit;
10123 	const struct got_object_id_queue *parent_ids;
10124 	struct got_object_qid *pid;
10125 	char *id_str = NULL;
10126 	const char *logmsg = NULL;
10127 
10128 	err = got_object_open_as_commit(&commit, repo, id);
10129 	if (err)
10130 		return err;
10131 
10132 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
10133 	if (err)
10134 		goto done;
10135 
10136 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
10137 	parent_ids = got_object_commit_get_parent_ids(commit);
10138 	fprintf(outfile, "numparents %d\n",
10139 	    got_object_commit_get_nparents(commit));
10140 	STAILQ_FOREACH(pid, parent_ids, entry) {
10141 		char *pid_str;
10142 		err = got_object_id_str(&pid_str, pid->id);
10143 		if (err)
10144 			goto done;
10145 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
10146 		free(pid_str);
10147 	}
10148 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
10149 	    got_object_commit_get_author(commit),
10150 	    (long long)got_object_commit_get_author_time(commit));
10151 
10152 	fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
10153 	    got_object_commit_get_author(commit),
10154 	    (long long)got_object_commit_get_committer_time(commit));
10155 
10156 	logmsg = got_object_commit_get_logmsg_raw(commit);
10157 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
10158 	fprintf(outfile, "%s", logmsg);
10159 done:
10160 	free(id_str);
10161 	got_object_commit_close(commit);
10162 	return err;
10163 }
10164 
10165 static const struct got_error *
10166 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10167 {
10168 	const struct got_error *err;
10169 	struct got_tag_object *tag;
10170 	char *id_str = NULL;
10171 	const char *tagmsg = NULL;
10172 
10173 	err = got_object_open_as_tag(&tag, repo, id);
10174 	if (err)
10175 		return err;
10176 
10177 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
10178 	if (err)
10179 		goto done;
10180 
10181 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
10182 
10183 	switch (got_object_tag_get_object_type(tag)) {
10184 	case GOT_OBJ_TYPE_BLOB:
10185 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10186 		    GOT_OBJ_LABEL_BLOB);
10187 		break;
10188 	case GOT_OBJ_TYPE_TREE:
10189 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10190 		    GOT_OBJ_LABEL_TREE);
10191 		break;
10192 	case GOT_OBJ_TYPE_COMMIT:
10193 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10194 		    GOT_OBJ_LABEL_COMMIT);
10195 		break;
10196 	case GOT_OBJ_TYPE_TAG:
10197 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10198 		    GOT_OBJ_LABEL_TAG);
10199 		break;
10200 	default:
10201 		break;
10202 	}
10203 
10204 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
10205 	    got_object_tag_get_name(tag));
10206 
10207 	fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
10208 	    got_object_tag_get_tagger(tag),
10209 	    (long long)got_object_tag_get_tagger_time(tag));
10210 
10211 	tagmsg = got_object_tag_get_message(tag);
10212 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
10213 	fprintf(outfile, "%s", tagmsg);
10214 done:
10215 	free(id_str);
10216 	got_object_tag_close(tag);
10217 	return err;
10218 }
10219 
10220 static const struct got_error *
10221 cmd_cat(int argc, char *argv[])
10222 {
10223 	const struct got_error *error;
10224 	struct got_repository *repo = NULL;
10225 	struct got_worktree *worktree = NULL;
10226 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
10227 	const char *commit_id_str = NULL;
10228 	struct got_object_id *id = NULL, *commit_id = NULL;
10229 	int ch, obj_type, i, force_path = 0;
10230 	struct got_reflist_head refs;
10231 
10232 	TAILQ_INIT(&refs);
10233 
10234 #ifndef PROFILE
10235 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
10236 	    NULL) == -1)
10237 		err(1, "pledge");
10238 #endif
10239 
10240 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
10241 		switch (ch) {
10242 		case 'c':
10243 			commit_id_str = optarg;
10244 			break;
10245 		case 'r':
10246 			repo_path = realpath(optarg, NULL);
10247 			if (repo_path == NULL)
10248 				return got_error_from_errno2("realpath",
10249 				    optarg);
10250 			got_path_strip_trailing_slashes(repo_path);
10251 			break;
10252 		case 'P':
10253 			force_path = 1;
10254 			break;
10255 		default:
10256 			usage_cat();
10257 			/* NOTREACHED */
10258 		}
10259 	}
10260 
10261 	argc -= optind;
10262 	argv += optind;
10263 
10264 	cwd = getcwd(NULL, 0);
10265 	if (cwd == NULL) {
10266 		error = got_error_from_errno("getcwd");
10267 		goto done;
10268 	}
10269 	error = got_worktree_open(&worktree, cwd);
10270 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
10271 		goto done;
10272 	if (worktree) {
10273 		if (repo_path == NULL) {
10274 			repo_path = strdup(
10275 			    got_worktree_get_repo_path(worktree));
10276 			if (repo_path == NULL) {
10277 				error = got_error_from_errno("strdup");
10278 				goto done;
10279 			}
10280 		}
10281 	}
10282 
10283 	if (repo_path == NULL) {
10284 		repo_path = getcwd(NULL, 0);
10285 		if (repo_path == NULL)
10286 			return got_error_from_errno("getcwd");
10287 	}
10288 
10289 	error = got_repo_open(&repo, repo_path, NULL);
10290 	free(repo_path);
10291 	if (error != NULL)
10292 		goto done;
10293 
10294 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
10295 	if (error)
10296 		goto done;
10297 
10298 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
10299 	if (error)
10300 		goto done;
10301 
10302 	if (commit_id_str == NULL)
10303 		commit_id_str = GOT_REF_HEAD;
10304 	error = got_repo_match_object_id(&commit_id, NULL,
10305 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
10306 	if (error)
10307 		goto done;
10308 
10309 	for (i = 0; i < argc; i++) {
10310 		if (force_path) {
10311 			error = got_object_id_by_path(&id, repo, commit_id,
10312 			    argv[i]);
10313 			if (error)
10314 				break;
10315 		} else {
10316 			error = got_repo_match_object_id(&id, &label, argv[i],
10317 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
10318 			    repo);
10319 			if (error) {
10320 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
10321 				    error->code != GOT_ERR_NOT_REF)
10322 					break;
10323 				error = got_object_id_by_path(&id, repo,
10324 				    commit_id, argv[i]);
10325 				if (error)
10326 					break;
10327 			}
10328 		}
10329 
10330 		error = got_object_get_type(&obj_type, repo, id);
10331 		if (error)
10332 			break;
10333 
10334 		switch (obj_type) {
10335 		case GOT_OBJ_TYPE_BLOB:
10336 			error = cat_blob(id, repo, stdout);
10337 			break;
10338 		case GOT_OBJ_TYPE_TREE:
10339 			error = cat_tree(id, repo, stdout);
10340 			break;
10341 		case GOT_OBJ_TYPE_COMMIT:
10342 			error = cat_commit(id, repo, stdout);
10343 			break;
10344 		case GOT_OBJ_TYPE_TAG:
10345 			error = cat_tag(id, repo, stdout);
10346 			break;
10347 		default:
10348 			error = got_error(GOT_ERR_OBJ_TYPE);
10349 			break;
10350 		}
10351 		if (error)
10352 			break;
10353 		free(label);
10354 		label = NULL;
10355 		free(id);
10356 		id = NULL;
10357 	}
10358 done:
10359 	free(label);
10360 	free(id);
10361 	free(commit_id);
10362 	if (worktree)
10363 		got_worktree_close(worktree);
10364 	if (repo) {
10365 		const struct got_error *close_err = got_repo_close(repo);
10366 		if (error == NULL)
10367 			error = close_err;
10368 	}
10369 	got_ref_list_free(&refs);
10370 	return error;
10371 }
10372 
10373 __dead static void
10374 usage_info(void)
10375 {
10376 	fprintf(stderr, "usage: %s info [path ...]\n",
10377 	    getprogname());
10378 	exit(1);
10379 }
10380 
10381 static const struct got_error *
10382 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
10383     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10384     struct got_object_id *commit_id)
10385 {
10386 	const struct got_error *err = NULL;
10387 	char *id_str = NULL;
10388 	char datebuf[128];
10389 	struct tm mytm, *tm;
10390 	struct got_pathlist_head *paths = arg;
10391 	struct got_pathlist_entry *pe;
10392 
10393 	/*
10394 	 * Clear error indication from any of the path arguments which
10395 	 * would cause this file index entry to be displayed.
10396 	 */
10397 	TAILQ_FOREACH(pe, paths, entry) {
10398 		if (got_path_cmp(path, pe->path, strlen(path),
10399 		    pe->path_len) == 0 ||
10400 		    got_path_is_child(path, pe->path, pe->path_len))
10401 			pe->data = NULL; /* no error */
10402 	}
10403 
10404 	printf(GOT_COMMIT_SEP_STR);
10405 	if (S_ISLNK(mode))
10406 		printf("symlink: %s\n", path);
10407 	else if (S_ISREG(mode)) {
10408 		printf("file: %s\n", path);
10409 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
10410 	} else if (S_ISDIR(mode))
10411 		printf("directory: %s\n", path);
10412 	else
10413 		printf("something: %s\n", path);
10414 
10415 	tm = localtime_r(&mtime, &mytm);
10416 	if (tm == NULL)
10417 		return NULL;
10418 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
10419 		return got_error(GOT_ERR_NO_SPACE);
10420 	printf("timestamp: %s\n", datebuf);
10421 
10422 	if (blob_id) {
10423 		err = got_object_id_str(&id_str, blob_id);
10424 		if (err)
10425 			return err;
10426 		printf("based on blob: %s\n", id_str);
10427 		free(id_str);
10428 	}
10429 
10430 	if (staged_blob_id) {
10431 		err = got_object_id_str(&id_str, staged_blob_id);
10432 		if (err)
10433 			return err;
10434 		printf("based on staged blob: %s\n", id_str);
10435 		free(id_str);
10436 	}
10437 
10438 	if (commit_id) {
10439 		err = got_object_id_str(&id_str, commit_id);
10440 		if (err)
10441 			return err;
10442 		printf("based on commit: %s\n", id_str);
10443 		free(id_str);
10444 	}
10445 
10446 	return NULL;
10447 }
10448 
10449 static const struct got_error *
10450 cmd_info(int argc, char *argv[])
10451 {
10452 	const struct got_error *error = NULL;
10453 	struct got_worktree *worktree = NULL;
10454 	char *cwd = NULL, *id_str = NULL;
10455 	struct got_pathlist_head paths;
10456 	struct got_pathlist_entry *pe;
10457 	char *uuidstr = NULL;
10458 	int ch, show_files = 0;
10459 
10460 	TAILQ_INIT(&paths);
10461 
10462 	while ((ch = getopt(argc, argv, "")) != -1) {
10463 		switch (ch) {
10464 		default:
10465 			usage_info();
10466 			/* NOTREACHED */
10467 		}
10468 	}
10469 
10470 	argc -= optind;
10471 	argv += optind;
10472 
10473 #ifndef PROFILE
10474 	if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
10475 	    NULL) == -1)
10476 		err(1, "pledge");
10477 #endif
10478 	cwd = getcwd(NULL, 0);
10479 	if (cwd == NULL) {
10480 		error = got_error_from_errno("getcwd");
10481 		goto done;
10482 	}
10483 
10484 	error = got_worktree_open(&worktree, cwd);
10485 	if (error) {
10486 		if (error->code == GOT_ERR_NOT_WORKTREE)
10487 			error = wrap_not_worktree_error(error, "info", cwd);
10488 		goto done;
10489 	}
10490 
10491 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
10492 	if (error)
10493 		goto done;
10494 
10495 	if (argc >= 1) {
10496 		error = get_worktree_paths_from_argv(&paths, argc, argv,
10497 		    worktree);
10498 		if (error)
10499 			goto done;
10500 		show_files = 1;
10501 	}
10502 
10503 	error = got_object_id_str(&id_str,
10504 	    got_worktree_get_base_commit_id(worktree));
10505 	if (error)
10506 		goto done;
10507 
10508 	error = got_worktree_get_uuid(&uuidstr, worktree);
10509 	if (error)
10510 		goto done;
10511 
10512 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
10513 	printf("work tree base commit: %s\n", id_str);
10514 	printf("work tree path prefix: %s\n",
10515 	    got_worktree_get_path_prefix(worktree));
10516 	printf("work tree branch reference: %s\n",
10517 	    got_worktree_get_head_ref_name(worktree));
10518 	printf("work tree UUID: %s\n", uuidstr);
10519 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
10520 
10521 	if (show_files) {
10522 		struct got_pathlist_entry *pe;
10523 		TAILQ_FOREACH(pe, &paths, entry) {
10524 			if (pe->path_len == 0)
10525 				continue;
10526 			/*
10527 			 * Assume this path will fail. This will be corrected
10528 			 * in print_path_info() in case the path does suceeed.
10529 			 */
10530 			pe->data = (void *)got_error_path(pe->path,
10531 			    GOT_ERR_BAD_PATH);
10532 		}
10533 		error = got_worktree_path_info(worktree, &paths,
10534 		    print_path_info, &paths, check_cancelled, NULL);
10535 		if (error)
10536 			goto done;
10537 		TAILQ_FOREACH(pe, &paths, entry) {
10538 			if (pe->data != NULL) {
10539 				error = pe->data; /* bad path */
10540 				break;
10541 			}
10542 		}
10543 	}
10544 done:
10545 	TAILQ_FOREACH(pe, &paths, entry)
10546 		free((char *)pe->path);
10547 	got_pathlist_free(&paths);
10548 	free(cwd);
10549 	free(id_str);
10550 	free(uuidstr);
10551 	return error;
10552 }