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