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