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