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