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 <sha1.h>
32 #include <sha2.h>
33 #include <signal.h>
34 #include <stdio.h>
35 #include <stdlib.h>
36 #include <string.h>
37 #include <unistd.h>
38 #include <libgen.h>
39 #include <time.h>
40 #include <paths.h>
41 #include <regex.h>
42 #include <getopt.h>
43 #include <util.h>
44 
45 #include "got_version.h"
46 #include "got_error.h"
47 #include "got_object.h"
48 #include "got_reference.h"
49 #include "got_repository.h"
50 #include "got_path.h"
51 #include "got_cancel.h"
52 #include "got_worktree.h"
53 #include "got_diff.h"
54 #include "got_commit_graph.h"
55 #include "got_fetch.h"
56 #include "got_send.h"
57 #include "got_blame.h"
58 #include "got_privsep.h"
59 #include "got_opentemp.h"
60 #include "got_gotconfig.h"
61 #include "got_dial.h"
62 #include "got_patch.h"
63 #include "got_sigs.h"
64 #include "got_date.h"
65 #include "got_keyword.h"
66 
67 #ifndef nitems
68 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
69 #endif
70 
71 #ifndef GOT_DEFAULT_EDITOR
72 #define GOT_DEFAULT_EDITOR "/usr/bin/vi"
73 #endif
74 
75 static volatile sig_atomic_t sigint_received;
76 static volatile sig_atomic_t sigpipe_received;
77 
78 static void
79 catch_sigint(int signo)
80 {
81 	sigint_received = 1;
82 }
83 
84 static void
85 catch_sigpipe(int signo)
86 {
87 	sigpipe_received = 1;
88 }
89 
90 
91 struct got_cmd {
92 	const char	*cmd_name;
93 	const struct got_error *(*cmd_main)(int, char *[]);
94 	void		(*cmd_usage)(void);
95 	const char	*cmd_alias;
96 };
97 
98 __dead static void	usage(int, int);
99 __dead static void	usage_import(void);
100 __dead static void	usage_clone(void);
101 __dead static void	usage_fetch(void);
102 __dead static void	usage_checkout(void);
103 __dead static void	usage_update(void);
104 __dead static void	usage_log(void);
105 __dead static void	usage_diff(void);
106 __dead static void	usage_blame(void);
107 __dead static void	usage_tree(void);
108 __dead static void	usage_status(void);
109 __dead static void	usage_ref(void);
110 __dead static void	usage_branch(void);
111 __dead static void	usage_tag(void);
112 __dead static void	usage_add(void);
113 __dead static void	usage_remove(void);
114 __dead static void	usage_patch(void);
115 __dead static void	usage_revert(void);
116 __dead static void	usage_commit(void);
117 __dead static void	usage_send(void);
118 __dead static void	usage_cherrypick(void);
119 __dead static void	usage_backout(void);
120 __dead static void	usage_rebase(void);
121 __dead static void	usage_histedit(void);
122 __dead static void	usage_integrate(void);
123 __dead static void	usage_merge(void);
124 __dead static void	usage_stage(void);
125 __dead static void	usage_unstage(void);
126 __dead static void	usage_cat(void);
127 __dead static void	usage_info(void);
128 
129 static const struct got_error*		cmd_import(int, char *[]);
130 static const struct got_error*		cmd_clone(int, char *[]);
131 static const struct got_error*		cmd_fetch(int, char *[]);
132 static const struct got_error*		cmd_checkout(int, char *[]);
133 static const struct got_error*		cmd_update(int, char *[]);
134 static const struct got_error*		cmd_log(int, char *[]);
135 static const struct got_error*		cmd_diff(int, char *[]);
136 static const struct got_error*		cmd_blame(int, char *[]);
137 static const struct got_error*		cmd_tree(int, char *[]);
138 static const struct got_error*		cmd_status(int, char *[]);
139 static const struct got_error*		cmd_ref(int, char *[]);
140 static const struct got_error*		cmd_branch(int, char *[]);
141 static const struct got_error*		cmd_tag(int, char *[]);
142 static const struct got_error*		cmd_add(int, char *[]);
143 static const struct got_error*		cmd_remove(int, char *[]);
144 static const struct got_error*		cmd_patch(int, char *[]);
145 static const struct got_error*		cmd_revert(int, char *[]);
146 static const struct got_error*		cmd_commit(int, char *[]);
147 static const struct got_error*		cmd_send(int, char *[]);
148 static const struct got_error*		cmd_cherrypick(int, char *[]);
149 static const struct got_error*		cmd_backout(int, char *[]);
150 static const struct got_error*		cmd_rebase(int, char *[]);
151 static const struct got_error*		cmd_histedit(int, char *[]);
152 static const struct got_error*		cmd_integrate(int, char *[]);
153 static const struct got_error*		cmd_merge(int, char *[]);
154 static const struct got_error*		cmd_stage(int, char *[]);
155 static const struct got_error*		cmd_unstage(int, char *[]);
156 static const struct got_error*		cmd_cat(int, char *[]);
157 static const struct got_error*		cmd_info(int, char *[]);
158 
159 static const struct got_cmd got_commands[] = {
160 	{ "import",	cmd_import,	usage_import,	"im" },
161 	{ "clone",	cmd_clone,	usage_clone,	"cl" },
162 	{ "fetch",	cmd_fetch,	usage_fetch,	"fe" },
163 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
164 	{ "update",	cmd_update,	usage_update,	"up" },
165 	{ "log",	cmd_log,	usage_log,	"" },
166 	{ "diff",	cmd_diff,	usage_diff,	"di" },
167 	{ "blame",	cmd_blame,	usage_blame,	"bl" },
168 	{ "tree",	cmd_tree,	usage_tree,	"tr" },
169 	{ "status",	cmd_status,	usage_status,	"st" },
170 	{ "ref",	cmd_ref,	usage_ref,	"" },
171 	{ "branch",	cmd_branch,	usage_branch,	"br" },
172 	{ "tag",	cmd_tag,	usage_tag,	"" },
173 	{ "add",	cmd_add,	usage_add,	"" },
174 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
175 	{ "patch",	cmd_patch,	usage_patch,	"pa" },
176 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
177 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
178 	{ "send",	cmd_send,	usage_send,	"se" },
179 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
180 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
181 	{ "rebase",	cmd_rebase,	usage_rebase,	"rb" },
182 	{ "histedit",	cmd_histedit,	usage_histedit,	"he" },
183 	{ "integrate",  cmd_integrate,  usage_integrate,"ig" },
184 	{ "merge",	cmd_merge,	usage_merge,	"mg" },
185 	{ "stage",	cmd_stage,	usage_stage,	"sg" },
186 	{ "unstage",	cmd_unstage,	usage_unstage,	"ug" },
187 	{ "cat",	cmd_cat,	usage_cat,	"" },
188 	{ "info",	cmd_info,	usage_info,	"" },
189 };
190 
191 static void
192 list_commands(FILE *fp)
193 {
194 	size_t i;
195 
196 	fprintf(fp, "commands:");
197 	for (i = 0; i < nitems(got_commands); i++) {
198 		const struct got_cmd *cmd = &got_commands[i];
199 		fprintf(fp, " %s", cmd->cmd_name);
200 	}
201 	fputc('\n', fp);
202 }
203 
204 __dead static void
205 option_conflict(char a, char b)
206 {
207 	errx(1, "-%c and -%c options are mutually exclusive", a, b);
208 }
209 
210 int
211 main(int argc, char *argv[])
212 {
213 	const struct got_cmd *cmd;
214 	size_t i;
215 	int ch;
216 	int hflag = 0, Vflag = 0;
217 	static const struct option longopts[] = {
218 	    { "version", no_argument, NULL, 'V' },
219 	    { NULL, 0, NULL, 0 }
220 	};
221 
222 	setlocale(LC_CTYPE, "");
223 
224 	while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
225 		switch (ch) {
226 		case 'h':
227 			hflag = 1;
228 			break;
229 		case 'V':
230 			Vflag = 1;
231 			break;
232 		default:
233 			usage(hflag, 1);
234 			/* NOTREACHED */
235 		}
236 	}
237 
238 	argc -= optind;
239 	argv += optind;
240 	optind = 1;
241 	optreset = 1;
242 
243 	if (Vflag) {
244 		got_version_print_str();
245 		return 0;
246 	}
247 
248 	if (argc <= 0)
249 		usage(hflag, hflag ? 0 : 1);
250 
251 	signal(SIGINT, catch_sigint);
252 	signal(SIGPIPE, catch_sigpipe);
253 
254 	for (i = 0; i < nitems(got_commands); i++) {
255 		const struct got_error *error;
256 
257 		cmd = &got_commands[i];
258 
259 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
260 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
261 			continue;
262 
263 		if (hflag)
264 			cmd->cmd_usage();
265 
266 		error = cmd->cmd_main(argc, argv);
267 		if (error && error->code != GOT_ERR_CANCELLED &&
268 		    error->code != GOT_ERR_PRIVSEP_EXIT &&
269 		    !(sigpipe_received &&
270 		      error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
271 		    !(sigint_received &&
272 		      error->code == GOT_ERR_ERRNO && errno == EINTR)) {
273 			fflush(stdout);
274 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
275 			return 1;
276 		}
277 
278 		return 0;
279 	}
280 
281 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
282 	list_commands(stderr);
283 	return 1;
284 }
285 
286 __dead static void
287 usage(int hflag, int status)
288 {
289 	FILE *fp = (status == 0) ? stdout : stderr;
290 
291 	fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
292 	    getprogname());
293 	if (hflag)
294 		list_commands(fp);
295 	exit(status);
296 }
297 
298 static const struct got_error *
299 get_editor(char **abspath)
300 {
301 	const struct got_error *err = NULL;
302 	const char *editor;
303 
304 	*abspath = NULL;
305 
306 	editor = getenv("VISUAL");
307 	if (editor == NULL)
308 		editor = getenv("EDITOR");
309 
310 	if (editor) {
311 		err = got_path_find_prog(abspath, editor);
312 		if (err)
313 			return err;
314 	}
315 
316 	if (*abspath == NULL) {
317 		*abspath = strdup(GOT_DEFAULT_EDITOR);
318 		if (*abspath == NULL)
319 			return got_error_from_errno("strdup");
320 	}
321 
322 	return NULL;
323 }
324 
325 static const struct got_error *
326 apply_unveil(const char *repo_path, int repo_read_only,
327     const char *worktree_path)
328 {
329 	const struct got_error *err;
330 
331 #ifdef PROFILE
332 	if (unveil("gmon.out", "rwc") != 0)
333 		return got_error_from_errno2("unveil", "gmon.out");
334 #endif
335 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
336 		return got_error_from_errno2("unveil", repo_path);
337 
338 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
339 		return got_error_from_errno2("unveil", worktree_path);
340 
341 	if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
342 		return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
343 
344 	err = got_privsep_unveil_exec_helpers();
345 	if (err != NULL)
346 		return err;
347 
348 	if (unveil(NULL, NULL) != 0)
349 		return got_error_from_errno("unveil");
350 
351 	return NULL;
352 }
353 
354 __dead static void
355 usage_import(void)
356 {
357 	fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
358 	    "[-r repository-path] directory\n", getprogname());
359 	exit(1);
360 }
361 
362 static int
363 spawn_editor(const char *editor, const char *file)
364 {
365 	pid_t pid;
366 	sig_t sighup, sigint, sigquit;
367 	int st = -1;
368 
369 	sighup = signal(SIGHUP, SIG_IGN);
370 	sigint = signal(SIGINT, SIG_IGN);
371 	sigquit = signal(SIGQUIT, SIG_IGN);
372 
373 	switch (pid = fork()) {
374 	case -1:
375 		goto doneediting;
376 	case 0:
377 		execl(editor, editor, file, (char *)NULL);
378 		_exit(127);
379 	}
380 
381 	while (waitpid(pid, &st, 0) == -1)
382 		if (errno != EINTR)
383 			break;
384 
385 doneediting:
386 	(void)signal(SIGHUP, sighup);
387 	(void)signal(SIGINT, sigint);
388 	(void)signal(SIGQUIT, sigquit);
389 
390 	if (!WIFEXITED(st)) {
391 		errno = EINTR;
392 		return -1;
393 	}
394 
395 	return WEXITSTATUS(st);
396 }
397 
398 static const struct got_error *
399 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
400 {
401 	const struct got_error *err = NULL;
402 	char *line = NULL;
403 	size_t linesize = 0;
404 
405 	*logmsg = NULL;
406 	*len = 0;
407 
408 	if (fseeko(fp, 0L, SEEK_SET) == -1)
409 		return got_error_from_errno("fseeko");
410 
411 	*logmsg = malloc(filesize + 1);
412 	if (*logmsg == NULL)
413 		return got_error_from_errno("malloc");
414 	(*logmsg)[0] = '\0';
415 
416 	while (getline(&line, &linesize, fp) != -1) {
417 		if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
418 			continue; /* remove comments and leading empty lines */
419 		*len = strlcat(*logmsg, line, filesize + 1);
420 		if (*len >= filesize + 1) {
421 			err = got_error(GOT_ERR_NO_SPACE);
422 			goto done;
423 		}
424 	}
425 	if (ferror(fp)) {
426 		err = got_ferror(fp, GOT_ERR_IO);
427 		goto done;
428 	}
429 
430 	while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
431 		(*logmsg)[*len - 1] = '\0';
432 		(*len)--;
433 	}
434 done:
435 	free(line);
436 	if (err) {
437 		free(*logmsg);
438 		*logmsg = NULL;
439 		*len = 0;
440 	}
441 	return err;
442 }
443 
444 static const struct got_error *
445 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
446     const char *initial_content, size_t initial_content_len,
447     int require_modification)
448 {
449 	const struct got_error *err = NULL;
450 	struct stat st, st2;
451 	FILE *fp = NULL;
452 	size_t logmsg_len;
453 
454 	*logmsg = NULL;
455 
456 	if (stat(logmsg_path, &st) == -1)
457 		return got_error_from_errno2("stat", logmsg_path);
458 
459 	if (spawn_editor(editor, logmsg_path) == -1)
460 		return got_error_from_errno("failed spawning editor");
461 
462 	if (require_modification) {
463 		struct timespec timeout;
464 
465 		timeout.tv_sec = 0;
466 		timeout.tv_nsec = 1;
467 		nanosleep(&timeout,  NULL);
468 	}
469 
470 	if (stat(logmsg_path, &st2) == -1)
471 		return got_error_from_errno2("stat", logmsg_path);
472 
473 	if (require_modification && st.st_size == st2.st_size &&
474 	    timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
475 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
476 		    "no changes made to commit message, aborting");
477 
478 	fp = fopen(logmsg_path, "re");
479 	if (fp == NULL) {
480 		err = got_error_from_errno("fopen");
481 		goto done;
482 	}
483 
484 	/* strip comments and leading/trailing newlines */
485 	err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
486 	if (err)
487 		goto done;
488 	if (logmsg_len == 0) {
489 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
490 		    "commit message cannot be empty, aborting");
491 		goto done;
492 	}
493 done:
494 	if (fp && fclose(fp) == EOF && err == NULL)
495 		err = got_error_from_errno("fclose");
496 	if (err) {
497 		free(*logmsg);
498 		*logmsg = NULL;
499 	}
500 	return err;
501 }
502 
503 static const struct got_error *
504 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
505     const char *path_dir, const char *branch_name)
506 {
507 	char *initial_content = NULL;
508 	const struct got_error *err = NULL;
509 	int initial_content_len;
510 	int fd = -1;
511 
512 	initial_content_len = asprintf(&initial_content,
513 	    "\n# %s to be imported to branch %s\n", path_dir,
514 	    branch_name);
515 	if (initial_content_len == -1)
516 		return got_error_from_errno("asprintf");
517 
518 	err = got_opentemp_named_fd(logmsg_path, &fd,
519 	    GOT_TMPDIR_STR "/got-importmsg", "");
520 	if (err)
521 		goto done;
522 
523 	if (write(fd, initial_content, initial_content_len) == -1) {
524 		err = got_error_from_errno2("write", *logmsg_path);
525 		goto done;
526 	}
527 	if (close(fd) == -1) {
528 		err = got_error_from_errno2("close", *logmsg_path);
529 		goto done;
530 	}
531 	fd = -1;
532 
533 	err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
534 	    initial_content_len, 1);
535 done:
536 	if (fd != -1 && close(fd) == -1 && err == NULL)
537 		err = got_error_from_errno2("close", *logmsg_path);
538 	free(initial_content);
539 	if (err) {
540 		free(*logmsg_path);
541 		*logmsg_path = NULL;
542 	}
543 	return err;
544 }
545 
546 static const struct got_error *
547 import_progress(void *arg, const char *path)
548 {
549 	printf("A  %s\n", path);
550 	return NULL;
551 }
552 
553 static const struct got_error *
554 valid_author(const char *author)
555 {
556 	const char *email = author;
557 
558 	/*
559 	 * Git' expects the author (or committer) to be in the form
560 	 * "name <email>", which are mostly free form (see the
561 	 * "committer" description in git-fast-import(1)).  We're only
562 	 * doing this to avoid git's object parser breaking on commits
563 	 * we create.
564 	 */
565 
566 	while (*author && *author != '\n' && *author != '<' && *author != '>')
567 		author++;
568 	if (author != email && *author == '<' && *(author - 1) != ' ')
569 		return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
570 		    "between author name and email required", email);
571 	if (*author++ != '<')
572 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
573 	while (*author && *author != '\n' && *author != '<' && *author != '>')
574 		author++;
575 	if (strcmp(author, ">") != 0)
576 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
577 	return NULL;
578 }
579 
580 static const struct got_error *
581 get_author(char **author, struct got_repository *repo,
582     struct got_worktree *worktree)
583 {
584 	const struct got_error *err = NULL;
585 	const char *got_author = NULL, *name, *email;
586 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
587 
588 	*author = NULL;
589 
590 	if (worktree)
591 		worktree_conf = got_worktree_get_gotconfig(worktree);
592 	repo_conf = got_repo_get_gotconfig(repo);
593 
594 	/*
595 	 * Priority of potential author information sources, from most
596 	 * significant to least significant:
597 	 * 1) work tree's .got/got.conf file
598 	 * 2) repository's got.conf file
599 	 * 3) repository's git config file
600 	 * 4) environment variables
601 	 * 5) global git config files (in user's home directory or /etc)
602 	 */
603 
604 	if (worktree_conf)
605 		got_author = got_gotconfig_get_author(worktree_conf);
606 	if (got_author == NULL)
607 		got_author = got_gotconfig_get_author(repo_conf);
608 	if (got_author == NULL) {
609 		name = got_repo_get_gitconfig_author_name(repo);
610 		email = got_repo_get_gitconfig_author_email(repo);
611 		if (name && email) {
612 			if (asprintf(author, "%s <%s>", name, email) == -1)
613 				return got_error_from_errno("asprintf");
614 			return NULL;
615 		}
616 
617 		got_author = getenv("GOT_AUTHOR");
618 		if (got_author == NULL) {
619 			name = got_repo_get_global_gitconfig_author_name(repo);
620 			email = got_repo_get_global_gitconfig_author_email(
621 			    repo);
622 			if (name && email) {
623 				if (asprintf(author, "%s <%s>", name, email)
624 				    == -1)
625 					return got_error_from_errno("asprintf");
626 				return NULL;
627 			}
628 			/* TODO: Look up user in password database? */
629 			return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
630 		}
631 	}
632 
633 	*author = strdup(got_author);
634 	if (*author == NULL)
635 		return got_error_from_errno("strdup");
636 
637 	err = valid_author(*author);
638 	if (err) {
639 		free(*author);
640 		*author = NULL;
641 	}
642 	return err;
643 }
644 
645 static const struct got_error *
646 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
647     struct got_worktree *worktree)
648 {
649 	const char *got_allowed_signers = NULL;
650 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
651 
652 	*allowed_signers = NULL;
653 
654 	if (worktree)
655 		worktree_conf = got_worktree_get_gotconfig(worktree);
656 	repo_conf = got_repo_get_gotconfig(repo);
657 
658 	/*
659 	 * Priority of potential author information sources, from most
660 	 * significant to least significant:
661 	 * 1) work tree's .got/got.conf file
662 	 * 2) repository's got.conf file
663 	 */
664 
665 	if (worktree_conf)
666 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
667 		    worktree_conf);
668 	if (got_allowed_signers == NULL)
669 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
670 		    repo_conf);
671 
672 	if (got_allowed_signers) {
673 		*allowed_signers = strdup(got_allowed_signers);
674 		if (*allowed_signers == NULL)
675 			return got_error_from_errno("strdup");
676 	}
677 	return NULL;
678 }
679 
680 static const struct got_error *
681 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
682     struct got_worktree *worktree)
683 {
684 	const char *got_revoked_signers = NULL;
685 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
686 
687 	*revoked_signers = NULL;
688 
689 	if (worktree)
690 		worktree_conf = got_worktree_get_gotconfig(worktree);
691 	repo_conf = got_repo_get_gotconfig(repo);
692 
693 	/*
694 	 * Priority of potential author information sources, from most
695 	 * significant to least significant:
696 	 * 1) work tree's .got/got.conf file
697 	 * 2) repository's got.conf file
698 	 */
699 
700 	if (worktree_conf)
701 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
702 		    worktree_conf);
703 	if (got_revoked_signers == NULL)
704 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
705 		    repo_conf);
706 
707 	if (got_revoked_signers) {
708 		*revoked_signers = strdup(got_revoked_signers);
709 		if (*revoked_signers == NULL)
710 			return got_error_from_errno("strdup");
711 	}
712 	return NULL;
713 }
714 
715 static const char *
716 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
717 {
718 	const char *got_signer_id = NULL;
719 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
720 
721 	if (worktree)
722 		worktree_conf = got_worktree_get_gotconfig(worktree);
723 	repo_conf = got_repo_get_gotconfig(repo);
724 
725 	/*
726 	 * Priority of potential author information sources, from most
727 	 * significant to least significant:
728 	 * 1) work tree's .got/got.conf file
729 	 * 2) repository's got.conf file
730 	 */
731 
732 	if (worktree_conf)
733 		got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
734 	if (got_signer_id == NULL)
735 		got_signer_id = got_gotconfig_get_signer_id(repo_conf);
736 
737 	return got_signer_id;
738 }
739 
740 static const struct got_error *
741 get_gitconfig_path(char **gitconfig_path)
742 {
743 	const char *homedir = getenv("HOME");
744 
745 	*gitconfig_path = NULL;
746 	if (homedir) {
747 		if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
748 			return got_error_from_errno("asprintf");
749 
750 	}
751 	return NULL;
752 }
753 
754 static const struct got_error *
755 cmd_import(int argc, char *argv[])
756 {
757 	const struct got_error *error = NULL;
758 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
759 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
760 	const char *branch_name = NULL;
761 	char *id_str = NULL, *logmsg_path = NULL;
762 	char refname[PATH_MAX] = "refs/heads/";
763 	struct got_repository *repo = NULL;
764 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
765 	struct got_object_id *new_commit_id = NULL;
766 	int ch, n = 0;
767 	struct got_pathlist_head ignores;
768 	struct got_pathlist_entry *pe;
769 	int preserve_logmsg = 0;
770 	int *pack_fds = NULL;
771 
772 	TAILQ_INIT(&ignores);
773 
774 #ifndef PROFILE
775 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
776 	    "unveil",
777 	    NULL) == -1)
778 		err(1, "pledge");
779 #endif
780 
781 	while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
782 		switch (ch) {
783 		case 'b':
784 			branch_name = optarg;
785 			break;
786 		case 'I':
787 			if (optarg[0] == '\0')
788 				break;
789 			error = got_pathlist_insert(&pe, &ignores, optarg,
790 			    NULL);
791 			if (error)
792 				goto done;
793 			break;
794 		case 'm':
795 			logmsg = strdup(optarg);
796 			if (logmsg == NULL) {
797 				error = got_error_from_errno("strdup");
798 				goto done;
799 			}
800 			break;
801 		case 'r':
802 			repo_path = realpath(optarg, NULL);
803 			if (repo_path == NULL) {
804 				error = got_error_from_errno2("realpath",
805 				    optarg);
806 				goto done;
807 			}
808 			break;
809 		default:
810 			usage_import();
811 			/* NOTREACHED */
812 		}
813 	}
814 
815 	argc -= optind;
816 	argv += optind;
817 
818 	if (argc != 1)
819 		usage_import();
820 
821 	if (repo_path == NULL) {
822 		repo_path = getcwd(NULL, 0);
823 		if (repo_path == NULL)
824 			return got_error_from_errno("getcwd");
825 	}
826 	got_path_strip_trailing_slashes(repo_path);
827 	error = get_gitconfig_path(&gitconfig_path);
828 	if (error)
829 		goto done;
830 	error = got_repo_pack_fds_open(&pack_fds);
831 	if (error != NULL)
832 		goto done;
833 	error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
834 	if (error)
835 		goto done;
836 
837 	path_dir = realpath(argv[0], NULL);
838 	if (path_dir == NULL) {
839 		error = got_error_from_errno2("realpath", argv[0]);
840 		goto done;
841 	}
842 	got_path_strip_trailing_slashes(path_dir);
843 
844 	error = get_editor(&editor);
845 	if (error)
846 		goto done;
847 
848 	if (unveil(path_dir, "r") != 0) {
849 		error = got_error_from_errno2("unveil", path_dir);
850 		goto done;
851 	}
852 	if (unveil(editor, "x") != 0) {
853 		error = got_error_from_errno2("unveil", editor);
854 		goto done;
855 	}
856 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
857 	if (error)
858 		goto done;
859 
860 	error = get_author(&author, repo, NULL);
861 	if (error)
862 		return error;
863 
864 	/*
865 	 * Don't let the user create a branch name with a leading '-'.
866 	 * While technically a valid reference name, this case is usually
867 	 * an unintended typo.
868 	 */
869 	if (branch_name && branch_name[0] == '-')
870 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
871 
872 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
873 	if (error && error->code != GOT_ERR_NOT_REF)
874 		goto done;
875 
876 	if (branch_name)
877 		n = strlcat(refname, branch_name, sizeof(refname));
878 	else if (head_ref && got_ref_is_symbolic(head_ref))
879 		n = strlcpy(refname, got_ref_get_symref_target(head_ref),
880 		    sizeof(refname));
881 	else
882 		n = strlcat(refname, "main", sizeof(refname));
883 	if (n >= sizeof(refname)) {
884 		error = got_error(GOT_ERR_NO_SPACE);
885 		goto done;
886 	}
887 
888 	error = got_ref_open(&branch_ref, repo, refname, 0);
889 	if (error) {
890 		if (error->code != GOT_ERR_NOT_REF)
891 			goto done;
892 	} else {
893 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
894 		    "import target branch already exists");
895 		goto done;
896 	}
897 
898 	if (logmsg == NULL || *logmsg == '\0') {
899 		free(logmsg);
900 		error = collect_import_msg(&logmsg, &logmsg_path, editor,
901 		    path_dir, refname);
902 		if (error) {
903 			if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
904 			    logmsg_path != NULL)
905 				preserve_logmsg = 1;
906 			goto done;
907 		}
908 	}
909 
910 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
911 	    author, &ignores, repo, import_progress, NULL);
912 	if (error) {
913 		if (logmsg_path)
914 			preserve_logmsg = 1;
915 		goto done;
916 	}
917 
918 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
919 	if (error) {
920 		if (logmsg_path)
921 			preserve_logmsg = 1;
922 		goto done;
923 	}
924 
925 	error = got_ref_write(branch_ref, repo);
926 	if (error) {
927 		if (logmsg_path)
928 			preserve_logmsg = 1;
929 		goto done;
930 	}
931 
932 	error = got_object_id_str(&id_str, new_commit_id);
933 	if (error) {
934 		if (logmsg_path)
935 			preserve_logmsg = 1;
936 		goto done;
937 	}
938 
939 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
940 	if (error) {
941 		if (error->code != GOT_ERR_NOT_REF) {
942 			if (logmsg_path)
943 				preserve_logmsg = 1;
944 			goto done;
945 		}
946 
947 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
948 		    branch_ref);
949 		if (error) {
950 			if (logmsg_path)
951 				preserve_logmsg = 1;
952 			goto done;
953 		}
954 
955 		error = got_ref_write(head_ref, repo);
956 		if (error) {
957 			if (logmsg_path)
958 				preserve_logmsg = 1;
959 			goto done;
960 		}
961 	}
962 
963 	printf("Created branch %s with commit %s\n",
964 	    got_ref_get_name(branch_ref), id_str);
965 done:
966 	if (pack_fds) {
967 		const struct got_error *pack_err =
968 		    got_repo_pack_fds_close(pack_fds);
969 		if (error == NULL)
970 			error = pack_err;
971 	}
972 	if (repo) {
973 		const struct got_error *close_err = got_repo_close(repo);
974 		if (error == NULL)
975 			error = close_err;
976 	}
977 	if (preserve_logmsg) {
978 		fprintf(stderr, "%s: log message preserved in %s\n",
979 		    getprogname(), logmsg_path);
980 	} else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
981 		error = got_error_from_errno2("unlink", logmsg_path);
982 	free(logmsg);
983 	free(logmsg_path);
984 	free(repo_path);
985 	free(editor);
986 	free(new_commit_id);
987 	free(id_str);
988 	free(author);
989 	free(gitconfig_path);
990 	if (branch_ref)
991 		got_ref_close(branch_ref);
992 	if (head_ref)
993 		got_ref_close(head_ref);
994 	return error;
995 }
996 
997 __dead static void
998 usage_clone(void)
999 {
1000 	fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
1001 	    "repository-URL [directory]\n", getprogname());
1002 	exit(1);
1003 }
1004 
1005 struct got_fetch_progress_arg {
1006 	char last_scaled_size[FMT_SCALED_STRSIZE];
1007 	int last_p_indexed;
1008 	int last_p_resolved;
1009 	int verbosity;
1010 
1011 	struct got_repository *repo;
1012 
1013 	int create_configs;
1014 	int configs_created;
1015 	struct {
1016 		struct got_pathlist_head *symrefs;
1017 		struct got_pathlist_head *wanted_branches;
1018 		struct got_pathlist_head *wanted_refs;
1019 		const char *proto;
1020 		const char *host;
1021 		const char *port;
1022 		const char *remote_repo_path;
1023 		const char *git_url;
1024 		int fetch_all_branches;
1025 		int mirror_references;
1026 	} config_info;
1027 };
1028 
1029 /* XXX forward declaration */
1030 static const struct got_error *
1031 create_config_files(const char *proto, const char *host, const char *port,
1032     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1033     int mirror_references, struct got_pathlist_head *symrefs,
1034     struct got_pathlist_head *wanted_branches,
1035     struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1036 
1037 static const struct got_error *
1038 fetch_progress(void *arg, const char *message, off_t packfile_size,
1039     int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1040 {
1041 	const struct got_error *err = NULL;
1042 	struct got_fetch_progress_arg *a = arg;
1043 	char scaled_size[FMT_SCALED_STRSIZE];
1044 	int p_indexed, p_resolved;
1045 	int print_size = 0, print_indexed = 0, print_resolved = 0;
1046 
1047 	/*
1048 	 * In order to allow a failed clone to be resumed with 'got fetch'
1049 	 * we try to create configuration files as soon as possible.
1050 	 * Once the server has sent information about its default branch
1051 	 * we have all required information.
1052 	 */
1053 	if (a->create_configs && !a->configs_created &&
1054 	    !TAILQ_EMPTY(a->config_info.symrefs)) {
1055 		err = create_config_files(a->config_info.proto,
1056 		    a->config_info.host, a->config_info.port,
1057 		    a->config_info.remote_repo_path,
1058 		    a->config_info.git_url,
1059 		    a->config_info.fetch_all_branches,
1060 		    a->config_info.mirror_references,
1061 		    a->config_info.symrefs,
1062 		    a->config_info.wanted_branches,
1063 		    a->config_info.wanted_refs, a->repo);
1064 		if (err)
1065 			return err;
1066 		a->configs_created = 1;
1067 	}
1068 
1069 	if (a->verbosity < 0)
1070 		return NULL;
1071 
1072 	if (message && message[0] != '\0') {
1073 		printf("\rserver: %s", message);
1074 		fflush(stdout);
1075 		return NULL;
1076 	}
1077 
1078 	if (packfile_size > 0 || nobj_indexed > 0) {
1079 		if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1080 		    (a->last_scaled_size[0] == '\0' ||
1081 		    strcmp(scaled_size, a->last_scaled_size)) != 0) {
1082 			print_size = 1;
1083 			if (strlcpy(a->last_scaled_size, scaled_size,
1084 			    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1085 				return got_error(GOT_ERR_NO_SPACE);
1086 		}
1087 		if (nobj_indexed > 0) {
1088 			p_indexed = (nobj_indexed * 100) / nobj_total;
1089 			if (p_indexed != a->last_p_indexed) {
1090 				a->last_p_indexed = p_indexed;
1091 				print_indexed = 1;
1092 				print_size = 1;
1093 			}
1094 		}
1095 		if (nobj_resolved > 0) {
1096 			p_resolved = (nobj_resolved * 100) /
1097 			    (nobj_total - nobj_loose);
1098 			if (p_resolved != a->last_p_resolved) {
1099 				a->last_p_resolved = p_resolved;
1100 				print_resolved = 1;
1101 				print_indexed = 1;
1102 				print_size = 1;
1103 			}
1104 		}
1105 
1106 	}
1107 	if (print_size || print_indexed || print_resolved)
1108 		printf("\r");
1109 	if (print_size)
1110 		printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1111 	if (print_indexed)
1112 		printf("; indexing %d%%", p_indexed);
1113 	if (print_resolved)
1114 		printf("; resolving deltas %d%%", p_resolved);
1115 	if (print_size || print_indexed || print_resolved)
1116 		fflush(stdout);
1117 
1118 	return NULL;
1119 }
1120 
1121 static const struct got_error *
1122 create_symref(const char *refname, struct got_reference *target_ref,
1123     int verbosity, struct got_repository *repo)
1124 {
1125 	const struct got_error *err;
1126 	struct got_reference *head_symref;
1127 
1128 	err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1129 	if (err)
1130 		return err;
1131 
1132 	err = got_ref_write(head_symref, repo);
1133 	if (err == NULL && verbosity > 0) {
1134 		printf("Created reference %s: %s\n", GOT_REF_HEAD,
1135 		    got_ref_get_name(target_ref));
1136 	}
1137 	got_ref_close(head_symref);
1138 	return err;
1139 }
1140 
1141 static const struct got_error *
1142 list_remote_refs(struct got_pathlist_head *symrefs,
1143     struct got_pathlist_head *refs)
1144 {
1145 	const struct got_error *err;
1146 	struct got_pathlist_entry *pe;
1147 
1148 	TAILQ_FOREACH(pe, symrefs, entry) {
1149 		const char *refname = pe->path;
1150 		const char *targetref = pe->data;
1151 
1152 		printf("%s: %s\n", refname, targetref);
1153 	}
1154 
1155 	TAILQ_FOREACH(pe, refs, entry) {
1156 		const char *refname = pe->path;
1157 		struct got_object_id *id = pe->data;
1158 		char *id_str;
1159 
1160 		err = got_object_id_str(&id_str, id);
1161 		if (err)
1162 			return err;
1163 		printf("%s: %s\n", refname, id_str);
1164 		free(id_str);
1165 	}
1166 
1167 	return NULL;
1168 }
1169 
1170 static const struct got_error *
1171 create_ref(const char *refname, struct got_object_id *id,
1172     int verbosity, struct got_repository *repo)
1173 {
1174 	const struct got_error *err = NULL;
1175 	struct got_reference *ref;
1176 	char *id_str;
1177 
1178 	err = got_object_id_str(&id_str, id);
1179 	if (err)
1180 		return err;
1181 
1182 	err = got_ref_alloc(&ref, refname, id);
1183 	if (err)
1184 		goto done;
1185 
1186 	err = got_ref_write(ref, repo);
1187 	got_ref_close(ref);
1188 
1189 	if (err == NULL && verbosity >= 0)
1190 		printf("Created reference %s: %s\n", refname, id_str);
1191 done:
1192 	free(id_str);
1193 	return err;
1194 }
1195 
1196 static int
1197 match_wanted_ref(const char *refname, const char *wanted_ref)
1198 {
1199 	if (strncmp(refname, "refs/", 5) != 0)
1200 		return 0;
1201 	refname += 5;
1202 
1203 	/*
1204 	 * Prevent fetching of references that won't make any
1205 	 * sense outside of the remote repository's context.
1206 	 */
1207 	if (strncmp(refname, "got/", 4) == 0)
1208 		return 0;
1209 	if (strncmp(refname, "remotes/", 8) == 0)
1210 		return 0;
1211 
1212 	if (strncmp(wanted_ref, "refs/", 5) == 0)
1213 		wanted_ref += 5;
1214 
1215 	/* Allow prefix match. */
1216 	if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1217 		return 1;
1218 
1219 	/* Allow exact match. */
1220 	return (strcmp(refname, wanted_ref) == 0);
1221 }
1222 
1223 static int
1224 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1225 {
1226 	struct got_pathlist_entry *pe;
1227 
1228 	TAILQ_FOREACH(pe, wanted_refs, entry) {
1229 		if (match_wanted_ref(refname, pe->path))
1230 			return 1;
1231 	}
1232 
1233 	return 0;
1234 }
1235 
1236 static const struct got_error *
1237 create_wanted_ref(const char *refname, struct got_object_id *id,
1238     const char *remote_repo_name, int verbosity, struct got_repository *repo)
1239 {
1240 	const struct got_error *err;
1241 	char *remote_refname;
1242 
1243 	if (strncmp("refs/", refname, 5) == 0)
1244 		refname += 5;
1245 
1246 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1247 	    remote_repo_name, refname) == -1)
1248 		return got_error_from_errno("asprintf");
1249 
1250 	err = create_ref(remote_refname, id, verbosity, repo);
1251 	free(remote_refname);
1252 	return err;
1253 }
1254 
1255 static const struct got_error *
1256 create_gotconfig(const char *proto, const char *host, const char *port,
1257     const char *remote_repo_path, const char *default_branch,
1258     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1259     struct got_pathlist_head *wanted_refs, int mirror_references,
1260     struct got_repository *repo)
1261 {
1262 	const struct got_error *err = NULL;
1263 	char *gotconfig_path = NULL;
1264 	char *gotconfig = NULL;
1265 	FILE *gotconfig_file = NULL;
1266 	const char *branchname = NULL;
1267 	char *branches = NULL, *refs = NULL;
1268 	ssize_t n;
1269 
1270 	if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1271 		struct got_pathlist_entry *pe;
1272 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1273 			char *s;
1274 			branchname = pe->path;
1275 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1276 				branchname += 11;
1277 			if (asprintf(&s, "%s\"%s\" ",
1278 			    branches ? branches : "", branchname) == -1) {
1279 				err = got_error_from_errno("asprintf");
1280 				goto done;
1281 			}
1282 			free(branches);
1283 			branches = s;
1284 		}
1285 	} else if (!fetch_all_branches && default_branch) {
1286 		branchname = default_branch;
1287 		if (strncmp(branchname, "refs/heads/", 11) == 0)
1288 			branchname += 11;
1289 		if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1290 			err = got_error_from_errno("asprintf");
1291 			goto done;
1292 		}
1293 	}
1294 	if (!TAILQ_EMPTY(wanted_refs)) {
1295 		struct got_pathlist_entry *pe;
1296 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1297 			char *s;
1298 			const char *refname = pe->path;
1299 			if (strncmp(refname, "refs/", 5) == 0)
1300 				branchname += 5;
1301 			if (asprintf(&s, "%s\"%s\" ",
1302 			    refs ? refs : "", refname) == -1) {
1303 				err = got_error_from_errno("asprintf");
1304 				goto done;
1305 			}
1306 			free(refs);
1307 			refs = s;
1308 		}
1309 	}
1310 
1311 	/* Create got.conf(5). */
1312 	gotconfig_path = got_repo_get_path_gotconfig(repo);
1313 	if (gotconfig_path == NULL) {
1314 		err = got_error_from_errno("got_repo_get_path_gotconfig");
1315 		goto done;
1316 	}
1317 	gotconfig_file = fopen(gotconfig_path, "ae");
1318 	if (gotconfig_file == NULL) {
1319 		err = got_error_from_errno2("fopen", gotconfig_path);
1320 		goto done;
1321 	}
1322 	if (asprintf(&gotconfig,
1323 	    "remote \"%s\" {\n"
1324 	    "\tserver %s\n"
1325 	    "\tprotocol %s\n"
1326 	    "%s%s%s"
1327 	    "\trepository \"%s\"\n"
1328 	    "%s%s%s"
1329 	    "%s%s%s"
1330 	    "%s"
1331 	    "%s"
1332 	    "}\n",
1333 	    GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1334 	    port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1335 	    remote_repo_path, branches ? "\tbranch { " : "",
1336 	    branches ? branches : "", branches ? "}\n" : "",
1337 	    refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1338 	    mirror_references ? "\tmirror_references yes\n" : "",
1339 	    fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1340 		err = got_error_from_errno("asprintf");
1341 		goto done;
1342 	}
1343 	n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1344 	if (n != strlen(gotconfig)) {
1345 		err = got_ferror(gotconfig_file, GOT_ERR_IO);
1346 		goto done;
1347 	}
1348 
1349 done:
1350 	if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1351 		err = got_error_from_errno2("fclose", gotconfig_path);
1352 	free(gotconfig_path);
1353 	free(branches);
1354 	return err;
1355 }
1356 
1357 static const struct got_error *
1358 create_gitconfig(const char *git_url, const char *default_branch,
1359     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1360     struct got_pathlist_head *wanted_refs, int mirror_references,
1361     struct got_repository *repo)
1362 {
1363 	const struct got_error *err = NULL;
1364 	char *gitconfig_path = NULL;
1365 	char *gitconfig = NULL;
1366 	FILE *gitconfig_file = NULL;
1367 	char *branches = NULL, *refs = NULL;
1368 	const char *branchname;
1369 	ssize_t n;
1370 
1371 	/* Create a config file Git can understand. */
1372 	gitconfig_path = got_repo_get_path_gitconfig(repo);
1373 	if (gitconfig_path == NULL) {
1374 		err = got_error_from_errno("got_repo_get_path_gitconfig");
1375 		goto done;
1376 	}
1377 	gitconfig_file = fopen(gitconfig_path, "ae");
1378 	if (gitconfig_file == NULL) {
1379 		err = got_error_from_errno2("fopen", gitconfig_path);
1380 		goto done;
1381 	}
1382 	if (fetch_all_branches) {
1383 		if (mirror_references) {
1384 			if (asprintf(&branches,
1385 			    "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1386 				err = got_error_from_errno("asprintf");
1387 				goto done;
1388 			}
1389 		} else if (asprintf(&branches,
1390 		    "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1391 		    GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1392 			err = got_error_from_errno("asprintf");
1393 			goto done;
1394 		}
1395 	} else if (!TAILQ_EMPTY(wanted_branches)) {
1396 		struct got_pathlist_entry *pe;
1397 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1398 			char *s;
1399 			branchname = pe->path;
1400 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1401 				branchname += 11;
1402 			if (mirror_references) {
1403 				if (asprintf(&s,
1404 				    "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1405 				    branches ? branches : "",
1406 				    branchname, branchname) == -1) {
1407 					err = got_error_from_errno("asprintf");
1408 					goto done;
1409 				}
1410 			} else if (asprintf(&s,
1411 			    "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1412 			    branches ? branches : "",
1413 			    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1414 			    branchname) == -1) {
1415 				err = got_error_from_errno("asprintf");
1416 				goto done;
1417 			}
1418 			free(branches);
1419 			branches = s;
1420 		}
1421 	} else {
1422 		/*
1423 		 * If the server specified a default branch, use just that one.
1424 		 * Otherwise fall back to fetching all branches on next fetch.
1425 		 */
1426 		if (default_branch) {
1427 			branchname = default_branch;
1428 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1429 				branchname += 11;
1430 		} else
1431 			branchname = "*"; /* fall back to all branches */
1432 		if (mirror_references) {
1433 			if (asprintf(&branches,
1434 			    "\tfetch = refs/heads/%s:refs/heads/%s\n",
1435 			    branchname, branchname) == -1) {
1436 				err = got_error_from_errno("asprintf");
1437 				goto done;
1438 			}
1439 		} else if (asprintf(&branches,
1440 		    "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1441 		    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1442 		    branchname) == -1) {
1443 			err = got_error_from_errno("asprintf");
1444 			goto done;
1445 		}
1446 	}
1447 	if (!TAILQ_EMPTY(wanted_refs)) {
1448 		struct got_pathlist_entry *pe;
1449 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1450 			char *s;
1451 			const char *refname = pe->path;
1452 			if (strncmp(refname, "refs/", 5) == 0)
1453 				refname += 5;
1454 			if (mirror_references) {
1455 				if (asprintf(&s,
1456 				    "%s\tfetch = refs/%s:refs/%s\n",
1457 				    refs ? refs : "", refname, refname) == -1) {
1458 					err = got_error_from_errno("asprintf");
1459 					goto done;
1460 				}
1461 			} else if (asprintf(&s,
1462 			    "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1463 			    refs ? refs : "",
1464 			    refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1465 			    refname) == -1) {
1466 				err = got_error_from_errno("asprintf");
1467 				goto done;
1468 			}
1469 			free(refs);
1470 			refs = s;
1471 		}
1472 	}
1473 
1474 	if (asprintf(&gitconfig,
1475 	    "[remote \"%s\"]\n"
1476 	    "\turl = %s\n"
1477 	    "%s"
1478 	    "%s"
1479 	    "\tfetch = refs/tags/*:refs/tags/*\n",
1480 	    GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1481 	    refs ? refs : "") == -1) {
1482 		err = got_error_from_errno("asprintf");
1483 		goto done;
1484 	}
1485 	n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1486 	if (n != strlen(gitconfig)) {
1487 		err = got_ferror(gitconfig_file, GOT_ERR_IO);
1488 		goto done;
1489 	}
1490 done:
1491 	if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1492 		err = got_error_from_errno2("fclose", gitconfig_path);
1493 	free(gitconfig_path);
1494 	free(branches);
1495 	return err;
1496 }
1497 
1498 static const struct got_error *
1499 create_config_files(const char *proto, const char *host, const char *port,
1500     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1501     int mirror_references, struct got_pathlist_head *symrefs,
1502     struct got_pathlist_head *wanted_branches,
1503     struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1504 {
1505 	const struct got_error *err = NULL;
1506 	const char *default_branch = NULL;
1507 	struct got_pathlist_entry *pe;
1508 
1509 	/*
1510 	 * If we asked for a set of wanted branches then use the first
1511 	 * one of those.
1512 	 */
1513 	if (!TAILQ_EMPTY(wanted_branches)) {
1514 		pe = TAILQ_FIRST(wanted_branches);
1515 		default_branch = pe->path;
1516 	} else {
1517 		/* First HEAD ref listed by server is the default branch. */
1518 		TAILQ_FOREACH(pe, symrefs, entry) {
1519 			const char *refname = pe->path;
1520 			const char *target = pe->data;
1521 
1522 			if (strcmp(refname, GOT_REF_HEAD) != 0)
1523 				continue;
1524 
1525 			default_branch = target;
1526 			break;
1527 		}
1528 	}
1529 
1530 	/* Create got.conf(5). */
1531 	err = create_gotconfig(proto, host, port, remote_repo_path,
1532 	    default_branch, fetch_all_branches, wanted_branches,
1533 	    wanted_refs, mirror_references, repo);
1534 	if (err)
1535 		return err;
1536 
1537 	/* Create a config file Git can understand. */
1538 	return create_gitconfig(git_url, default_branch, fetch_all_branches,
1539 	    wanted_branches, wanted_refs, mirror_references, repo);
1540 }
1541 
1542 static const struct got_error *
1543 cmd_clone(int argc, char *argv[])
1544 {
1545 	const struct got_error *error = NULL;
1546 	const char *uri, *dirname;
1547 	char *proto, *host, *port, *repo_name, *server_path;
1548 	char *default_destdir = NULL, *id_str = NULL;
1549 	const char *repo_path;
1550 	struct got_repository *repo = NULL;
1551 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1552 	struct got_pathlist_entry *pe;
1553 	struct got_object_id *pack_hash = NULL;
1554 	int ch, fetchfd = -1, fetchstatus;
1555 	pid_t fetchpid = -1;
1556 	struct got_fetch_progress_arg fpa;
1557 	char *git_url = NULL;
1558 	int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1559 	int bflag = 0, list_refs_only = 0;
1560 	int *pack_fds = NULL;
1561 
1562 	TAILQ_INIT(&refs);
1563 	TAILQ_INIT(&symrefs);
1564 	TAILQ_INIT(&wanted_branches);
1565 	TAILQ_INIT(&wanted_refs);
1566 
1567 	while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1568 		switch (ch) {
1569 		case 'a':
1570 			fetch_all_branches = 1;
1571 			break;
1572 		case 'b':
1573 			error = got_pathlist_append(&wanted_branches,
1574 			    optarg, NULL);
1575 			if (error)
1576 				return error;
1577 			bflag = 1;
1578 			break;
1579 		case 'l':
1580 			list_refs_only = 1;
1581 			break;
1582 		case 'm':
1583 			mirror_references = 1;
1584 			break;
1585 		case 'q':
1586 			verbosity = -1;
1587 			break;
1588 		case 'R':
1589 			error = got_pathlist_append(&wanted_refs,
1590 			    optarg, NULL);
1591 			if (error)
1592 				return error;
1593 			break;
1594 		case 'v':
1595 			if (verbosity < 0)
1596 				verbosity = 0;
1597 			else if (verbosity < 3)
1598 				verbosity++;
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 	    strcmp(proto, "git+http") == 0 ||
1651 	    strcmp(proto, "http") == 0 ||
1652 	    strcmp(proto, "git+https") == 0 ||
1653 	    strcmp(proto, "https") == 0) {
1654 #ifndef PROFILE
1655 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1656 		    "sendfd unveil", NULL) == -1)
1657 			err(1, "pledge");
1658 #endif
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\n", git_url);
1695 
1696 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1697 	    server_path, verbosity);
1698 	if (error)
1699 		goto done;
1700 
1701 #ifndef PROFILE
1702 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd",
1703 	     NULL) == -1)
1704 		err(1, "pledge");
1705 #endif
1706 	if (!list_refs_only) {
1707 		error = got_repo_init(repo_path, NULL);
1708 		if (error)
1709 			goto done;
1710 		error = got_repo_pack_fds_open(&pack_fds);
1711 		if (error != NULL)
1712 			goto done;
1713 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1714 		if (error)
1715 			goto done;
1716 	}
1717 
1718 	fpa.last_scaled_size[0] = '\0';
1719 	fpa.last_p_indexed = -1;
1720 	fpa.last_p_resolved = -1;
1721 	fpa.verbosity = verbosity;
1722 	fpa.create_configs = 1;
1723 	fpa.configs_created = 0;
1724 	fpa.repo = repo;
1725 	fpa.config_info.symrefs = &symrefs;
1726 	fpa.config_info.wanted_branches = &wanted_branches;
1727 	fpa.config_info.wanted_refs = &wanted_refs;
1728 	fpa.config_info.proto = proto;
1729 	fpa.config_info.host = host;
1730 	fpa.config_info.port = port;
1731 	fpa.config_info.remote_repo_path = server_path;
1732 	fpa.config_info.git_url = git_url;
1733 	fpa.config_info.fetch_all_branches = fetch_all_branches;
1734 	fpa.config_info.mirror_references = mirror_references;
1735 	error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1736 	    GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1737 	    fetch_all_branches, &wanted_branches, &wanted_refs,
1738 	    list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1739 	    fetch_progress, &fpa);
1740 	if (error)
1741 		goto done;
1742 
1743 	if (list_refs_only) {
1744 		error = list_remote_refs(&symrefs, &refs);
1745 		goto done;
1746 	}
1747 
1748 	if (pack_hash == NULL) {
1749 		error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1750 		    "server sent an empty pack file");
1751 		goto done;
1752 	}
1753 	error = got_object_id_str(&id_str, pack_hash);
1754 	if (error)
1755 		goto done;
1756 	if (verbosity >= 0)
1757 		printf("\nFetched %s.pack\n", id_str);
1758 	free(id_str);
1759 
1760 	/* Set up references provided with the pack file. */
1761 	TAILQ_FOREACH(pe, &refs, entry) {
1762 		const char *refname = pe->path;
1763 		struct got_object_id *id = pe->data;
1764 		char *remote_refname;
1765 
1766 		if (is_wanted_ref(&wanted_refs, refname) &&
1767 		    !mirror_references) {
1768 			error = create_wanted_ref(refname, id,
1769 			    GOT_FETCH_DEFAULT_REMOTE_NAME,
1770 			    verbosity - 1, repo);
1771 			if (error)
1772 				goto done;
1773 			continue;
1774 		}
1775 
1776 		error = create_ref(refname, id, verbosity - 1, repo);
1777 		if (error)
1778 			goto done;
1779 
1780 		if (mirror_references)
1781 			continue;
1782 
1783 		if (strncmp("refs/heads/", refname, 11) != 0)
1784 			continue;
1785 
1786 		if (asprintf(&remote_refname,
1787 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1788 		    refname + 11) == -1) {
1789 			error = got_error_from_errno("asprintf");
1790 			goto done;
1791 		}
1792 		error = create_ref(remote_refname, id, verbosity - 1, repo);
1793 		free(remote_refname);
1794 		if (error)
1795 			goto done;
1796 	}
1797 
1798 	/* Set the HEAD reference if the server provided one. */
1799 	TAILQ_FOREACH(pe, &symrefs, entry) {
1800 		struct got_reference *target_ref;
1801 		const char *refname = pe->path;
1802 		const char *target = pe->data;
1803 		char *remote_refname = NULL, *remote_target = NULL;
1804 
1805 		if (strcmp(refname, GOT_REF_HEAD) != 0)
1806 			continue;
1807 
1808 		error = got_ref_open(&target_ref, repo, target, 0);
1809 		if (error) {
1810 			if (error->code == GOT_ERR_NOT_REF) {
1811 				error = NULL;
1812 				continue;
1813 			}
1814 			goto done;
1815 		}
1816 
1817 		error = create_symref(refname, target_ref, verbosity, repo);
1818 		got_ref_close(target_ref);
1819 		if (error)
1820 			goto done;
1821 
1822 		if (mirror_references)
1823 			continue;
1824 
1825 		if (strncmp("refs/heads/", target, 11) != 0)
1826 			continue;
1827 
1828 		if (asprintf(&remote_refname,
1829 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1830 		    refname) == -1) {
1831 			error = got_error_from_errno("asprintf");
1832 			goto done;
1833 		}
1834 		if (asprintf(&remote_target,
1835 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1836 		    target + 11) == -1) {
1837 			error = got_error_from_errno("asprintf");
1838 			free(remote_refname);
1839 			goto done;
1840 		}
1841 		error = got_ref_open(&target_ref, repo, remote_target, 0);
1842 		if (error) {
1843 			free(remote_refname);
1844 			free(remote_target);
1845 			if (error->code == GOT_ERR_NOT_REF) {
1846 				error = NULL;
1847 				continue;
1848 			}
1849 			goto done;
1850 		}
1851 		error = create_symref(remote_refname, target_ref,
1852 		    verbosity - 1, repo);
1853 		free(remote_refname);
1854 		free(remote_target);
1855 		got_ref_close(target_ref);
1856 		if (error)
1857 			goto done;
1858 	}
1859 	if (pe == NULL) {
1860 		/*
1861 		 * We failed to set the HEAD reference. If we asked for
1862 		 * a set of wanted branches use the first of one of those
1863 		 * which could be fetched instead.
1864 		 */
1865 		TAILQ_FOREACH(pe, &wanted_branches, entry) {
1866 			const char *target = pe->path;
1867 			struct got_reference *target_ref;
1868 
1869 			error = got_ref_open(&target_ref, repo, target, 0);
1870 			if (error) {
1871 				if (error->code == GOT_ERR_NOT_REF) {
1872 					error = NULL;
1873 					continue;
1874 				}
1875 				goto done;
1876 			}
1877 
1878 			error = create_symref(GOT_REF_HEAD, target_ref,
1879 			    verbosity, repo);
1880 			got_ref_close(target_ref);
1881 			if (error)
1882 				goto done;
1883 			break;
1884 		}
1885 
1886 		if (!fpa.configs_created && pe != NULL) {
1887 			error = create_config_files(fpa.config_info.proto,
1888 			    fpa.config_info.host, fpa.config_info.port,
1889 			    fpa.config_info.remote_repo_path,
1890 			    fpa.config_info.git_url,
1891 			    fpa.config_info.fetch_all_branches,
1892 			    fpa.config_info.mirror_references,
1893 			    fpa.config_info.symrefs,
1894 			    fpa.config_info.wanted_branches,
1895 			    fpa.config_info.wanted_refs, fpa.repo);
1896 			if (error)
1897 				goto done;
1898 		}
1899 	}
1900 
1901 	if (verbosity >= 0)
1902 		printf("Created %s repository '%s'\n",
1903 		    mirror_references ? "mirrored" : "cloned", repo_path);
1904 done:
1905 	if (pack_fds) {
1906 		const struct got_error *pack_err =
1907 		    got_repo_pack_fds_close(pack_fds);
1908 		if (error == NULL)
1909 			error = pack_err;
1910 	}
1911 	if (fetchpid > 0) {
1912 		if (kill(fetchpid, SIGTERM) == -1)
1913 			error = got_error_from_errno("kill");
1914 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1915 			error = got_error_from_errno("waitpid");
1916 	}
1917 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1918 		error = got_error_from_errno("close");
1919 	if (repo) {
1920 		const struct got_error *close_err = got_repo_close(repo);
1921 		if (error == NULL)
1922 			error = close_err;
1923 	}
1924 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1925 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1926 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1927 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1928 	free(pack_hash);
1929 	free(proto);
1930 	free(host);
1931 	free(port);
1932 	free(server_path);
1933 	free(repo_name);
1934 	free(default_destdir);
1935 	free(git_url);
1936 	return error;
1937 }
1938 
1939 static const struct got_error *
1940 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1941     int replace_tags, int verbosity, struct got_repository *repo)
1942 {
1943 	const struct got_error *err = NULL;
1944 	char *new_id_str = NULL;
1945 	struct got_object_id *old_id = NULL;
1946 
1947 	err = got_object_id_str(&new_id_str, new_id);
1948 	if (err)
1949 		goto done;
1950 
1951 	if (!replace_tags &&
1952 	    strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1953 		err = got_ref_resolve(&old_id, repo, ref);
1954 		if (err)
1955 			goto done;
1956 		if (got_object_id_cmp(old_id, new_id) == 0)
1957 			goto done;
1958 		if (verbosity >= 0) {
1959 			printf("Rejecting update of existing tag %s: %s\n",
1960 			    got_ref_get_name(ref), new_id_str);
1961 		}
1962 		goto done;
1963 	}
1964 
1965 	if (got_ref_is_symbolic(ref)) {
1966 		if (verbosity >= 0) {
1967 			printf("Replacing reference %s: %s\n",
1968 			    got_ref_get_name(ref),
1969 			    got_ref_get_symref_target(ref));
1970 		}
1971 		err = got_ref_change_symref_to_ref(ref, new_id);
1972 		if (err)
1973 			goto done;
1974 		err = got_ref_write(ref, repo);
1975 		if (err)
1976 			goto done;
1977 	} else {
1978 		err = got_ref_resolve(&old_id, repo, ref);
1979 		if (err)
1980 			goto done;
1981 		if (got_object_id_cmp(old_id, new_id) == 0)
1982 			goto done;
1983 
1984 		err = got_ref_change_ref(ref, new_id);
1985 		if (err)
1986 			goto done;
1987 		err = got_ref_write(ref, repo);
1988 		if (err)
1989 			goto done;
1990 	}
1991 
1992 	if (verbosity >= 0)
1993 		printf("Updated %s: %s\n", got_ref_get_name(ref),
1994 		    new_id_str);
1995 done:
1996 	free(old_id);
1997 	free(new_id_str);
1998 	return err;
1999 }
2000 
2001 static const struct got_error *
2002 update_symref(const char *refname, struct got_reference *target_ref,
2003     int verbosity, struct got_repository *repo)
2004 {
2005 	const struct got_error *err = NULL, *unlock_err;
2006 	struct got_reference *symref;
2007 	int symref_is_locked = 0;
2008 
2009 	err = got_ref_open(&symref, repo, refname, 1);
2010 	if (err) {
2011 		if (err->code != GOT_ERR_NOT_REF)
2012 			return err;
2013 		err = got_ref_alloc_symref(&symref, refname, target_ref);
2014 		if (err)
2015 			goto done;
2016 
2017 		err = got_ref_write(symref, repo);
2018 		if (err)
2019 			goto done;
2020 
2021 		if (verbosity >= 0)
2022 			printf("Created reference %s: %s\n",
2023 			    got_ref_get_name(symref),
2024 			    got_ref_get_symref_target(symref));
2025 	} else {
2026 		symref_is_locked = 1;
2027 
2028 		if (strcmp(got_ref_get_symref_target(symref),
2029 		    got_ref_get_name(target_ref)) == 0)
2030 			goto done;
2031 
2032 		err = got_ref_change_symref(symref,
2033 		    got_ref_get_name(target_ref));
2034 		if (err)
2035 			goto done;
2036 
2037 		err = got_ref_write(symref, repo);
2038 		if (err)
2039 			goto done;
2040 
2041 		if (verbosity >= 0)
2042 			printf("Updated %s: %s\n", got_ref_get_name(symref),
2043 			    got_ref_get_symref_target(symref));
2044 
2045 	}
2046 done:
2047 	if (symref_is_locked) {
2048 		unlock_err = got_ref_unlock(symref);
2049 		if (unlock_err && err == NULL)
2050 			err = unlock_err;
2051 	}
2052 	got_ref_close(symref);
2053 	return err;
2054 }
2055 
2056 __dead static void
2057 usage_fetch(void)
2058 {
2059 	fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2060 	    "[-R reference] [-r repository-path] [remote-repository]\n",
2061 	    getprogname());
2062 	exit(1);
2063 }
2064 
2065 static const struct got_error *
2066 delete_missing_ref(struct got_reference *ref,
2067     int verbosity, struct got_repository *repo)
2068 {
2069 	const struct got_error *err = NULL;
2070 	struct got_object_id *id = NULL;
2071 	char *id_str = NULL;
2072 
2073 	if (got_ref_is_symbolic(ref)) {
2074 		err = got_ref_delete(ref, repo);
2075 		if (err)
2076 			return err;
2077 		if (verbosity >= 0) {
2078 			printf("Deleted %s: %s\n",
2079 			    got_ref_get_name(ref),
2080 			    got_ref_get_symref_target(ref));
2081 		}
2082 	} else {
2083 		err = got_ref_resolve(&id, repo, ref);
2084 		if (err)
2085 			return err;
2086 		err = got_object_id_str(&id_str, id);
2087 		if (err)
2088 			goto done;
2089 
2090 		err = got_ref_delete(ref, repo);
2091 		if (err)
2092 			goto done;
2093 		if (verbosity >= 0) {
2094 			printf("Deleted %s: %s\n",
2095 			    got_ref_get_name(ref), id_str);
2096 		}
2097 	}
2098 done:
2099 	free(id);
2100 	free(id_str);
2101 	return err;
2102 }
2103 
2104 static const struct got_error *
2105 delete_missing_refs(struct got_pathlist_head *their_refs,
2106     struct got_pathlist_head *their_symrefs,
2107     const struct got_remote_repo *remote,
2108     int verbosity, struct got_repository *repo)
2109 {
2110 	const struct got_error *err = NULL, *unlock_err;
2111 	struct got_reflist_head my_refs;
2112 	struct got_reflist_entry *re;
2113 	struct got_pathlist_entry *pe;
2114 	char *remote_namespace = NULL;
2115 	char *local_refname = NULL;
2116 
2117 	TAILQ_INIT(&my_refs);
2118 
2119 	if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2120 	    == -1)
2121 		return got_error_from_errno("asprintf");
2122 
2123 	err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2124 	if (err)
2125 		goto done;
2126 
2127 	TAILQ_FOREACH(re, &my_refs, entry) {
2128 		const char *refname = got_ref_get_name(re->ref);
2129 		const char *their_refname;
2130 
2131 		if (remote->mirror_references) {
2132 			their_refname = refname;
2133 		} else {
2134 			if (strncmp(refname, remote_namespace,
2135 			    strlen(remote_namespace)) == 0) {
2136 				if (strcmp(refname + strlen(remote_namespace),
2137 				    GOT_REF_HEAD) == 0)
2138 					continue;
2139 				if (asprintf(&local_refname, "refs/heads/%s",
2140 				    refname + strlen(remote_namespace)) == -1) {
2141 					err = got_error_from_errno("asprintf");
2142 					goto done;
2143 				}
2144 			} else if (strncmp(refname, "refs/tags/", 10) != 0)
2145 				continue;
2146 
2147 			their_refname = local_refname;
2148 		}
2149 
2150 		TAILQ_FOREACH(pe, their_refs, entry) {
2151 			if (strcmp(their_refname, pe->path) == 0)
2152 				break;
2153 		}
2154 		if (pe != NULL)
2155 			continue;
2156 
2157 		TAILQ_FOREACH(pe, their_symrefs, entry) {
2158 			if (strcmp(their_refname, pe->path) == 0)
2159 				break;
2160 		}
2161 		if (pe != NULL)
2162 			continue;
2163 
2164 		err = delete_missing_ref(re->ref, verbosity, repo);
2165 		if (err)
2166 			break;
2167 
2168 		if (local_refname) {
2169 			struct got_reference *ref;
2170 			err = got_ref_open(&ref, repo, local_refname, 1);
2171 			if (err) {
2172 				if (err->code != GOT_ERR_NOT_REF)
2173 					break;
2174 				free(local_refname);
2175 				local_refname = NULL;
2176 				continue;
2177 			}
2178 			err = delete_missing_ref(ref, verbosity, repo);
2179 			if (err)
2180 				break;
2181 			unlock_err = got_ref_unlock(ref);
2182 			got_ref_close(ref);
2183 			if (unlock_err && err == NULL) {
2184 				err = unlock_err;
2185 				break;
2186 			}
2187 
2188 			free(local_refname);
2189 			local_refname = NULL;
2190 		}
2191 	}
2192 done:
2193 	got_ref_list_free(&my_refs);
2194 	free(remote_namespace);
2195 	free(local_refname);
2196 	return err;
2197 }
2198 
2199 static const struct got_error *
2200 update_wanted_ref(const char *refname, struct got_object_id *id,
2201     const char *remote_repo_name, int verbosity, struct got_repository *repo)
2202 {
2203 	const struct got_error *err, *unlock_err;
2204 	char *remote_refname;
2205 	struct got_reference *ref;
2206 
2207 	if (strncmp("refs/", refname, 5) == 0)
2208 		refname += 5;
2209 
2210 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2211 	    remote_repo_name, refname) == -1)
2212 		return got_error_from_errno("asprintf");
2213 
2214 	err = got_ref_open(&ref, repo, remote_refname, 1);
2215 	if (err) {
2216 		if (err->code != GOT_ERR_NOT_REF)
2217 			goto done;
2218 		err = create_ref(remote_refname, id, verbosity, repo);
2219 	} else {
2220 		err = update_ref(ref, id, 0, verbosity, repo);
2221 		unlock_err = got_ref_unlock(ref);
2222 		if (unlock_err && err == NULL)
2223 			err = unlock_err;
2224 		got_ref_close(ref);
2225 	}
2226 done:
2227 	free(remote_refname);
2228 	return err;
2229 }
2230 
2231 static const struct got_error *
2232 delete_ref(struct got_repository *repo, struct got_reference *ref)
2233 {
2234 	const struct got_error *err = NULL;
2235 	struct got_object_id *id = NULL;
2236 	char *id_str = NULL;
2237 	const char *target;
2238 
2239 	if (got_ref_is_symbolic(ref)) {
2240 		target = got_ref_get_symref_target(ref);
2241 	} else {
2242 		err = got_ref_resolve(&id, repo, ref);
2243 		if (err)
2244 			goto done;
2245 		err = got_object_id_str(&id_str, id);
2246 		if (err)
2247 			goto done;
2248 		target = id_str;
2249 	}
2250 
2251 	err = got_ref_delete(ref, repo);
2252 	if (err)
2253 		goto done;
2254 
2255 	printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2256 done:
2257 	free(id);
2258 	free(id_str);
2259 	return err;
2260 }
2261 
2262 static const struct got_error *
2263 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2264 {
2265 	const struct got_error *err = NULL;
2266 	struct got_reflist_head refs;
2267 	struct got_reflist_entry *re;
2268 	char *prefix;
2269 
2270 	TAILQ_INIT(&refs);
2271 
2272 	if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2273 		err = got_error_from_errno("asprintf");
2274 		goto done;
2275 	}
2276 	err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2277 	if (err)
2278 		goto done;
2279 
2280 	TAILQ_FOREACH(re, &refs, entry)
2281 		delete_ref(repo, re->ref);
2282 done:
2283 	got_ref_list_free(&refs);
2284 	return err;
2285 }
2286 
2287 static const struct got_error *
2288 cmd_fetch(int argc, char *argv[])
2289 {
2290 	const struct got_error *error = NULL, *unlock_err;
2291 	char *cwd = NULL, *repo_path = NULL;
2292 	const char *remote_name;
2293 	char *proto = NULL, *host = NULL, *port = NULL;
2294 	char *repo_name = NULL, *server_path = NULL;
2295 	const struct got_remote_repo *remotes;
2296 	struct got_remote_repo *remote = NULL;
2297 	int nremotes;
2298 	char *id_str = NULL;
2299 	struct got_repository *repo = NULL;
2300 	struct got_worktree *worktree = NULL;
2301 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2302 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2303 	char *head_refname = NULL;
2304 	struct got_pathlist_entry *pe;
2305 	struct got_reflist_head remote_refs;
2306 	struct got_reflist_entry *re;
2307 	struct got_object_id *pack_hash = NULL;
2308 	int i, ch, fetchfd = -1, fetchstatus;
2309 	pid_t fetchpid = -1;
2310 	struct got_fetch_progress_arg fpa;
2311 	int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2312 	int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2313 	int *pack_fds = NULL, have_bflag = 0;
2314 	const char *remote_head = NULL, *worktree_branch = NULL;
2315 
2316 	TAILQ_INIT(&refs);
2317 	TAILQ_INIT(&symrefs);
2318 	TAILQ_INIT(&remote_refs);
2319 	TAILQ_INIT(&wanted_branches);
2320 	TAILQ_INIT(&wanted_refs);
2321 
2322 	while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2323 		switch (ch) {
2324 		case 'a':
2325 			fetch_all_branches = 1;
2326 			break;
2327 		case 'b':
2328 			error = got_pathlist_append(&wanted_branches,
2329 			    optarg, NULL);
2330 			if (error)
2331 				return error;
2332 			have_bflag = 1;
2333 			break;
2334 		case 'd':
2335 			delete_refs = 1;
2336 			break;
2337 		case 'l':
2338 			list_refs_only = 1;
2339 			break;
2340 		case 'q':
2341 			verbosity = -1;
2342 			break;
2343 		case 'R':
2344 			error = got_pathlist_append(&wanted_refs,
2345 			    optarg, NULL);
2346 			if (error)
2347 				return error;
2348 			break;
2349 		case 'r':
2350 			repo_path = realpath(optarg, NULL);
2351 			if (repo_path == NULL)
2352 				return got_error_from_errno2("realpath",
2353 				    optarg);
2354 			got_path_strip_trailing_slashes(repo_path);
2355 			break;
2356 		case 't':
2357 			replace_tags = 1;
2358 			break;
2359 		case 'v':
2360 			if (verbosity < 0)
2361 				verbosity = 0;
2362 			else if (verbosity < 3)
2363 				verbosity++;
2364 			break;
2365 		case 'X':
2366 			delete_remote = 1;
2367 			break;
2368 		default:
2369 			usage_fetch();
2370 			break;
2371 		}
2372 	}
2373 	argc -= optind;
2374 	argv += optind;
2375 
2376 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2377 		option_conflict('a', 'b');
2378 	if (list_refs_only) {
2379 		if (!TAILQ_EMPTY(&wanted_branches))
2380 			option_conflict('l', 'b');
2381 		if (fetch_all_branches)
2382 			option_conflict('l', 'a');
2383 		if (delete_refs)
2384 			option_conflict('l', 'd');
2385 		if (delete_remote)
2386 			option_conflict('l', 'X');
2387 	}
2388 	if (delete_remote) {
2389 		if (fetch_all_branches)
2390 			option_conflict('X', 'a');
2391 		if (!TAILQ_EMPTY(&wanted_branches))
2392 			option_conflict('X', 'b');
2393 		if (delete_refs)
2394 			option_conflict('X', 'd');
2395 		if (replace_tags)
2396 			option_conflict('X', 't');
2397 		if (!TAILQ_EMPTY(&wanted_refs))
2398 			option_conflict('X', 'R');
2399 	}
2400 
2401 	if (argc == 0) {
2402 		if (delete_remote)
2403 			errx(1, "-X option requires a remote name");
2404 		remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2405 	} else if (argc == 1)
2406 		remote_name = argv[0];
2407 	else
2408 		usage_fetch();
2409 
2410 	cwd = getcwd(NULL, 0);
2411 	if (cwd == NULL) {
2412 		error = got_error_from_errno("getcwd");
2413 		goto done;
2414 	}
2415 
2416 	error = got_repo_pack_fds_open(&pack_fds);
2417 	if (error != NULL)
2418 		goto done;
2419 
2420 	if (repo_path == NULL) {
2421 		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
2422 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2423 			goto done;
2424 		else
2425 			error = NULL;
2426 		if (worktree) {
2427 			repo_path =
2428 			    strdup(got_worktree_get_repo_path(worktree));
2429 			if (repo_path == NULL)
2430 				error = got_error_from_errno("strdup");
2431 			if (error)
2432 				goto done;
2433 		} else {
2434 			repo_path = strdup(cwd);
2435 			if (repo_path == NULL) {
2436 				error = got_error_from_errno("strdup");
2437 				goto done;
2438 			}
2439 		}
2440 	}
2441 
2442 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2443 	if (error)
2444 		goto done;
2445 
2446 	if (delete_remote) {
2447 		error = delete_refs_for_remote(repo, remote_name);
2448 		goto done; /* nothing else to do */
2449 	}
2450 
2451 	if (worktree) {
2452 		worktree_conf = got_worktree_get_gotconfig(worktree);
2453 		if (worktree_conf) {
2454 			got_gotconfig_get_remotes(&nremotes, &remotes,
2455 			    worktree_conf);
2456 			for (i = 0; i < nremotes; i++) {
2457 				if (strcmp(remotes[i].name, remote_name) == 0) {
2458 					error = got_repo_remote_repo_dup(&remote,
2459 					    &remotes[i]);
2460 					if (error)
2461 						goto done;
2462 					break;
2463 				}
2464 			}
2465 		}
2466 	}
2467 	if (remote == NULL) {
2468 		repo_conf = got_repo_get_gotconfig(repo);
2469 		if (repo_conf) {
2470 			got_gotconfig_get_remotes(&nremotes, &remotes,
2471 			    repo_conf);
2472 			for (i = 0; i < nremotes; i++) {
2473 				if (strcmp(remotes[i].name, remote_name) == 0) {
2474 					error = got_repo_remote_repo_dup(&remote,
2475 					    &remotes[i]);
2476 					if (error)
2477 						goto done;
2478 					break;
2479 				}
2480 			}
2481 		}
2482 	}
2483 	if (remote == NULL) {
2484 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2485 		for (i = 0; i < nremotes; i++) {
2486 			if (strcmp(remotes[i].name, remote_name) == 0) {
2487 				error = got_repo_remote_repo_dup(&remote,
2488 				    &remotes[i]);
2489 				if (error)
2490 					goto done;
2491 				break;
2492 			}
2493 		}
2494 	}
2495 	if (remote == NULL) {
2496 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2497 		goto done;
2498 	}
2499 
2500 	if (TAILQ_EMPTY(&wanted_branches)) {
2501 		if (!fetch_all_branches)
2502 			fetch_all_branches = remote->fetch_all_branches;
2503 		for (i = 0; i < remote->nfetch_branches; i++) {
2504 			error = got_pathlist_append(&wanted_branches,
2505 			    remote->fetch_branches[i], NULL);
2506 			if (error)
2507 				goto done;
2508 		}
2509 	}
2510 	if (TAILQ_EMPTY(&wanted_refs)) {
2511 		for (i = 0; i < remote->nfetch_refs; i++) {
2512 			error = got_pathlist_append(&wanted_refs,
2513 			    remote->fetch_refs[i], NULL);
2514 			if (error)
2515 				goto done;
2516 		}
2517 	}
2518 
2519 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2520 	    &repo_name, remote->fetch_url);
2521 	if (error)
2522 		goto done;
2523 
2524 	if (strcmp(proto, "git") == 0) {
2525 #ifndef PROFILE
2526 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2527 		    "sendfd dns inet unveil", NULL) == -1)
2528 			err(1, "pledge");
2529 #endif
2530 	} else if (strcmp(proto, "git+ssh") == 0 ||
2531 	    strcmp(proto, "ssh") == 0 ||
2532 	    strcmp(proto, "git+http") == 0 ||
2533 	    strcmp(proto, "http") == 0 ||
2534 	    strcmp(proto, "git+https") == 0 ||
2535 	    strcmp(proto, "https") == 0) {
2536 #ifndef PROFILE
2537 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2538 		    "sendfd unveil", NULL) == -1)
2539 			err(1, "pledge");
2540 #endif
2541 	} else {
2542 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2543 		goto done;
2544 	}
2545 
2546 	error = got_dial_apply_unveil(proto);
2547 	if (error)
2548 		goto done;
2549 
2550 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2551 	if (error)
2552 		goto done;
2553 
2554 	if (worktree) {
2555 		head_refname = strdup(got_worktree_get_head_ref_name(worktree));
2556 		if (head_refname == NULL) {
2557 			error = got_error_from_errno("strdup");
2558 			goto done;
2559 		}
2560 
2561 		/* Release work tree lock. */
2562 		got_worktree_close(worktree);
2563 		worktree = NULL;
2564 	}
2565 
2566 	if (verbosity >= 0) {
2567 		printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2568 		    remote->name, proto, host,
2569 		    port ? ":" : "", port ? port : "",
2570 		    *server_path == '/' ? "" : "/", server_path);
2571 	}
2572 
2573 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2574 	    server_path, verbosity);
2575 	if (error)
2576 		goto done;
2577 #ifndef PROFILE
2578 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd",
2579 	     NULL) == -1)
2580 		err(1, "pledge");
2581 #endif
2582 	if (!have_bflag) {
2583 		/*
2584 		 * If set, get this remote's HEAD ref target so
2585 		 * if it has changed on the server we can fetch it.
2586 		 */
2587 		error = got_ref_list(&remote_refs, repo, "refs/remotes",
2588 		    got_ref_cmp_by_name, repo);
2589 		if (error)
2590 			goto done;
2591 
2592 		TAILQ_FOREACH(re, &remote_refs, entry) {
2593 			const char	*remote_refname, *remote_target;
2594 			size_t		 remote_name_len;
2595 
2596 			if (!got_ref_is_symbolic(re->ref))
2597 				continue;
2598 
2599 			remote_name_len = strlen(remote->name);
2600 			remote_refname = got_ref_get_name(re->ref);
2601 
2602 			/* we only want refs/remotes/$remote->name/HEAD */
2603 			if (strncmp(remote_refname + 13, remote->name,
2604 			    remote_name_len) != 0)
2605 				continue;
2606 
2607 			if (strcmp(remote_refname + remote_name_len + 14,
2608 			    GOT_REF_HEAD) != 0)
2609 				continue;
2610 
2611 			/*
2612 			 * Take the name itself because we already
2613 			 * only match with refs/heads/ in fetch_pack().
2614 			 */
2615 			remote_target = got_ref_get_symref_target(re->ref);
2616 			remote_head = remote_target + remote_name_len + 14;
2617 			break;
2618 		}
2619 
2620 		if (head_refname &&
2621 		    strncmp(head_refname, "refs/heads/", 11) == 0)
2622 			worktree_branch = head_refname;
2623 	}
2624 
2625 	fpa.last_scaled_size[0] = '\0';
2626 	fpa.last_p_indexed = -1;
2627 	fpa.last_p_resolved = -1;
2628 	fpa.verbosity = verbosity;
2629 	fpa.repo = repo;
2630 	fpa.create_configs = 0;
2631 	fpa.configs_created = 0;
2632 	memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2633 
2634 	error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2635 	    remote->mirror_references, fetch_all_branches, &wanted_branches,
2636 	    &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2637 	    worktree_branch, remote_head, have_bflag, fetch_progress, &fpa);
2638 	if (error)
2639 		goto done;
2640 
2641 	if (list_refs_only) {
2642 		error = list_remote_refs(&symrefs, &refs);
2643 		goto done;
2644 	}
2645 
2646 	if (pack_hash == NULL) {
2647 		if (verbosity >= 0)
2648 			printf("Already up-to-date\n");
2649 	} else if (verbosity >= 0) {
2650 		error = got_object_id_str(&id_str, pack_hash);
2651 		if (error)
2652 			goto done;
2653 		printf("\nFetched %s.pack\n", id_str);
2654 		free(id_str);
2655 		id_str = NULL;
2656 	}
2657 
2658 	/* Update references provided with the pack file. */
2659 	TAILQ_FOREACH(pe, &refs, entry) {
2660 		const char *refname = pe->path;
2661 		struct got_object_id *id = pe->data;
2662 		struct got_reference *ref;
2663 		char *remote_refname;
2664 
2665 		if (is_wanted_ref(&wanted_refs, refname) &&
2666 		    !remote->mirror_references) {
2667 			error = update_wanted_ref(refname, id,
2668 			    remote->name, verbosity, repo);
2669 			if (error)
2670 				goto done;
2671 			continue;
2672 		}
2673 
2674 		if (remote->mirror_references ||
2675 		    strncmp("refs/tags/", refname, 10) == 0) {
2676 			error = got_ref_open(&ref, repo, refname, 1);
2677 			if (error) {
2678 				if (error->code != GOT_ERR_NOT_REF)
2679 					goto done;
2680 				error = create_ref(refname, id, verbosity,
2681 				    repo);
2682 				if (error)
2683 					goto done;
2684 			} else {
2685 				error = update_ref(ref, id, replace_tags,
2686 				    verbosity, repo);
2687 				unlock_err = got_ref_unlock(ref);
2688 				if (unlock_err && error == NULL)
2689 					error = unlock_err;
2690 				got_ref_close(ref);
2691 				if (error)
2692 					goto done;
2693 			}
2694 		} else if (strncmp("refs/heads/", refname, 11) == 0) {
2695 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2696 			    remote_name, refname + 11) == -1) {
2697 				error = got_error_from_errno("asprintf");
2698 				goto done;
2699 			}
2700 
2701 			error = got_ref_open(&ref, repo, remote_refname, 1);
2702 			if (error) {
2703 				if (error->code != GOT_ERR_NOT_REF)
2704 					goto done;
2705 				error = create_ref(remote_refname, id,
2706 				    verbosity, repo);
2707 				if (error)
2708 					goto done;
2709 			} else {
2710 				error = update_ref(ref, id, replace_tags,
2711 				    verbosity, repo);
2712 				unlock_err = got_ref_unlock(ref);
2713 				if (unlock_err && error == NULL)
2714 					error = unlock_err;
2715 				got_ref_close(ref);
2716 				if (error)
2717 					goto done;
2718 			}
2719 
2720 			/* Also create a local branch if none exists yet. */
2721 			error = got_ref_open(&ref, repo, refname, 1);
2722 			if (error) {
2723 				if (error->code != GOT_ERR_NOT_REF)
2724 					goto done;
2725 				error = create_ref(refname, id, verbosity,
2726 				    repo);
2727 				if (error)
2728 					goto done;
2729 			} else {
2730 				unlock_err = got_ref_unlock(ref);
2731 				if (unlock_err && error == NULL)
2732 					error = unlock_err;
2733 				got_ref_close(ref);
2734 			}
2735 		}
2736 	}
2737 	if (delete_refs) {
2738 		error = delete_missing_refs(&refs, &symrefs, remote,
2739 		    verbosity, repo);
2740 		if (error)
2741 			goto done;
2742 	}
2743 
2744 	if (!remote->mirror_references) {
2745 		/* Update remote HEAD reference if the server provided one. */
2746 		TAILQ_FOREACH(pe, &symrefs, entry) {
2747 			struct got_reference *target_ref;
2748 			const char *refname = pe->path;
2749 			const char *target = pe->data;
2750 			char *remote_refname = NULL, *remote_target = NULL;
2751 
2752 			if (strcmp(refname, GOT_REF_HEAD) != 0)
2753 				continue;
2754 
2755 			if (strncmp("refs/heads/", target, 11) != 0)
2756 				continue;
2757 
2758 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2759 			    remote->name, refname) == -1) {
2760 				error = got_error_from_errno("asprintf");
2761 				goto done;
2762 			}
2763 			if (asprintf(&remote_target, "refs/remotes/%s/%s",
2764 			    remote->name, target + 11) == -1) {
2765 				error = got_error_from_errno("asprintf");
2766 				free(remote_refname);
2767 				goto done;
2768 			}
2769 
2770 			error = got_ref_open(&target_ref, repo, remote_target,
2771 			    0);
2772 			if (error) {
2773 				free(remote_refname);
2774 				free(remote_target);
2775 				if (error->code == GOT_ERR_NOT_REF) {
2776 					error = NULL;
2777 					continue;
2778 				}
2779 				goto done;
2780 			}
2781 			error = update_symref(remote_refname, target_ref,
2782 			    verbosity, repo);
2783 			free(remote_refname);
2784 			free(remote_target);
2785 			got_ref_close(target_ref);
2786 			if (error)
2787 				goto done;
2788 		}
2789 	}
2790 done:
2791 	if (fetchpid > 0) {
2792 		if (kill(fetchpid, SIGTERM) == -1)
2793 			error = got_error_from_errno("kill");
2794 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2795 			error = got_error_from_errno("waitpid");
2796 	}
2797 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2798 		error = got_error_from_errno("close");
2799 	if (repo) {
2800 		const struct got_error *close_err = got_repo_close(repo);
2801 		if (error == NULL)
2802 			error = close_err;
2803 	}
2804 	if (worktree)
2805 		got_worktree_close(worktree);
2806 	if (pack_fds) {
2807 		const struct got_error *pack_err =
2808 		    got_repo_pack_fds_close(pack_fds);
2809 		if (error == NULL)
2810 			error = pack_err;
2811 	}
2812 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
2813 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
2814 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2815 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2816 	got_ref_list_free(&remote_refs);
2817 	got_repo_free_remote_repo_data(remote);
2818 	free(remote);
2819 	free(head_refname);
2820 	free(id_str);
2821 	free(cwd);
2822 	free(repo_path);
2823 	free(pack_hash);
2824 	free(proto);
2825 	free(host);
2826 	free(port);
2827 	free(server_path);
2828 	free(repo_name);
2829 	return error;
2830 }
2831 
2832 
2833 __dead static void
2834 usage_checkout(void)
2835 {
2836 	fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2837 	    "[-p path-prefix] repository-path [work-tree-path]\n",
2838 	    getprogname());
2839 	exit(1);
2840 }
2841 
2842 static void
2843 show_worktree_base_ref_warning(void)
2844 {
2845 	fprintf(stderr, "%s: warning: could not create a reference "
2846 	    "to the work tree's base commit; the commit could be "
2847 	    "garbage-collected by Git or 'gotadmin cleanup'; making the "
2848 	    "repository writable and running 'got update' will prevent this\n",
2849 	    getprogname());
2850 }
2851 
2852 struct got_checkout_progress_arg {
2853 	const char *worktree_path;
2854 	int had_base_commit_ref_error;
2855 	int verbosity;
2856 };
2857 
2858 static const struct got_error *
2859 checkout_progress(void *arg, unsigned char status, const char *path)
2860 {
2861 	struct got_checkout_progress_arg *a = arg;
2862 
2863 	/* Base commit bump happens silently. */
2864 	if (status == GOT_STATUS_BUMP_BASE)
2865 		return NULL;
2866 
2867 	if (status == GOT_STATUS_BASE_REF_ERR) {
2868 		a->had_base_commit_ref_error = 1;
2869 		return NULL;
2870 	}
2871 
2872 	while (path[0] == '/')
2873 		path++;
2874 
2875 	if (a->verbosity >= 0)
2876 		printf("%c  %s/%s\n", status, a->worktree_path, path);
2877 
2878 	return NULL;
2879 }
2880 
2881 static const struct got_error *
2882 check_cancelled(void *arg)
2883 {
2884 	if (sigint_received || sigpipe_received)
2885 		return got_error(GOT_ERR_CANCELLED);
2886 	return NULL;
2887 }
2888 
2889 static const struct got_error *
2890 check_linear_ancestry(struct got_object_id *commit_id,
2891     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2892     struct got_repository *repo)
2893 {
2894 	const struct got_error *err = NULL;
2895 	struct got_object_id *yca_id;
2896 
2897 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2898 	    commit_id, base_commit_id, 1, 0, repo, check_cancelled, NULL);
2899 	if (err)
2900 		return err;
2901 
2902 	if (yca_id == NULL)
2903 		return got_error(GOT_ERR_ANCESTRY);
2904 
2905 	/*
2906 	 * Require a straight line of history between the target commit
2907 	 * and the work tree's base commit.
2908 	 *
2909 	 * Non-linear situations such as this require a rebase:
2910 	 *
2911 	 * (commit) D       F (base_commit)
2912 	 *           \     /
2913 	 *            C   E
2914 	 *             \ /
2915 	 *              B (yca)
2916 	 *              |
2917 	 *              A
2918 	 *
2919 	 * 'got update' only handles linear cases:
2920 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
2921 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
2922 	 */
2923 	if (allow_forwards_in_time_only) {
2924 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2925 		return got_error(GOT_ERR_ANCESTRY);
2926 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2927 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
2928 		return got_error(GOT_ERR_ANCESTRY);
2929 
2930 	free(yca_id);
2931 	return NULL;
2932 }
2933 
2934 static const struct got_error *
2935 check_same_branch(struct got_object_id *commit_id,
2936     struct got_reference *head_ref, struct got_repository *repo)
2937 {
2938 	const struct got_error *err = NULL;
2939 	struct got_commit_graph *graph = NULL;
2940 	struct got_object_id *head_commit_id = NULL;
2941 
2942 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
2943 	if (err)
2944 		goto done;
2945 
2946 	if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2947 		goto done;
2948 
2949 	err = got_commit_graph_open(&graph, "/", 1);
2950 	if (err)
2951 		goto done;
2952 
2953 	err = got_commit_graph_bfsort(graph, head_commit_id, repo,
2954 	    check_cancelled, NULL);
2955 	if (err)
2956 		goto done;
2957 
2958 	for (;;) {
2959 		struct got_object_id id;
2960 
2961 		err = got_commit_graph_iter_next(&id, graph, repo,
2962 		    check_cancelled, NULL);
2963 		if (err) {
2964 			if (err->code == GOT_ERR_ITER_COMPLETED)
2965 				err = got_error(GOT_ERR_ANCESTRY);
2966 			break;
2967 		}
2968 
2969 		if (got_object_id_cmp(&id, commit_id) == 0)
2970 			break;
2971 	}
2972 done:
2973 	if (graph)
2974 		got_commit_graph_close(graph);
2975 	free(head_commit_id);
2976 	return err;
2977 }
2978 
2979 static const struct got_error *
2980 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2981 {
2982 	static char msg[512];
2983 	const char *branch_name;
2984 
2985 	if (got_ref_is_symbolic(ref))
2986 		branch_name = got_ref_get_symref_target(ref);
2987 	else
2988 		branch_name = got_ref_get_name(ref);
2989 
2990 	if (strncmp("refs/heads/", branch_name, 11) == 0)
2991 		branch_name += 11;
2992 
2993 	snprintf(msg, sizeof(msg),
2994 	    "target commit is not contained in branch '%s'; "
2995 	    "the branch to use must be specified with -b; "
2996 	    "if necessary a new branch can be created for "
2997 	    "this commit with 'got branch -c %s BRANCH_NAME'",
2998 	    branch_name, commit_id_str);
2999 
3000 	return got_error_msg(GOT_ERR_ANCESTRY, msg);
3001 }
3002 
3003 static const struct got_error *
3004 cmd_checkout(int argc, char *argv[])
3005 {
3006 	const struct got_error *close_err, *error = NULL;
3007 	struct got_repository *repo = NULL;
3008 	struct got_reference *head_ref = NULL, *ref = NULL;
3009 	struct got_worktree *worktree = NULL;
3010 	char *repo_path = NULL;
3011 	char *worktree_path = NULL;
3012 	const char *path_prefix = "";
3013 	const char *branch_name = GOT_REF_HEAD, *refname = NULL;
3014 	char *commit_id_str = NULL, *keyword_idstr = NULL;
3015 	struct got_object_id *commit_id = NULL;
3016 	char *cwd = NULL;
3017 	int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
3018 	struct got_pathlist_head paths;
3019 	struct got_checkout_progress_arg cpa;
3020 	int *pack_fds = NULL;
3021 
3022 	TAILQ_INIT(&paths);
3023 
3024 #ifndef PROFILE
3025 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3026 	    "unveil", NULL) == -1)
3027 		err(1, "pledge");
3028 #endif
3029 
3030 	while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
3031 		switch (ch) {
3032 		case 'b':
3033 			branch_name = optarg;
3034 			break;
3035 		case 'c':
3036 			commit_id_str = strdup(optarg);
3037 			if (commit_id_str == NULL)
3038 				return got_error_from_errno("strdup");
3039 			break;
3040 		case 'E':
3041 			allow_nonempty = 1;
3042 			break;
3043 		case 'p':
3044 			path_prefix = optarg;
3045 			break;
3046 		case 'q':
3047 			verbosity = -1;
3048 			break;
3049 		default:
3050 			usage_checkout();
3051 			/* NOTREACHED */
3052 		}
3053 	}
3054 
3055 	argc -= optind;
3056 	argv += optind;
3057 
3058 	if (argc == 1) {
3059 		char *base, *dotgit;
3060 		const char *path;
3061 		repo_path = realpath(argv[0], NULL);
3062 		if (repo_path == NULL)
3063 			return got_error_from_errno2("realpath", argv[0]);
3064 		cwd = getcwd(NULL, 0);
3065 		if (cwd == NULL) {
3066 			error = got_error_from_errno("getcwd");
3067 			goto done;
3068 		}
3069 		if (path_prefix[0])
3070 			path = path_prefix;
3071 		else
3072 			path = repo_path;
3073 		error = got_path_basename(&base, path);
3074 		if (error)
3075 			goto done;
3076 		dotgit = strstr(base, ".git");
3077 		if (dotgit)
3078 			*dotgit = '\0';
3079 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3080 			error = got_error_from_errno("asprintf");
3081 			free(base);
3082 			goto done;
3083 		}
3084 		free(base);
3085 	} else if (argc == 2) {
3086 		repo_path = realpath(argv[0], NULL);
3087 		if (repo_path == NULL) {
3088 			error = got_error_from_errno2("realpath", argv[0]);
3089 			goto done;
3090 		}
3091 		worktree_path = realpath(argv[1], NULL);
3092 		if (worktree_path == NULL) {
3093 			if (errno != ENOENT) {
3094 				error = got_error_from_errno2("realpath",
3095 				    argv[1]);
3096 				goto done;
3097 			}
3098 			worktree_path = strdup(argv[1]);
3099 			if (worktree_path == NULL) {
3100 				error = got_error_from_errno("strdup");
3101 				goto done;
3102 			}
3103 		}
3104 	} else
3105 		usage_checkout();
3106 
3107 	got_path_strip_trailing_slashes(repo_path);
3108 	got_path_strip_trailing_slashes(worktree_path);
3109 
3110 	if (got_path_is_child(worktree_path, repo_path, strlen(repo_path)) ||
3111 	    got_path_is_child(repo_path, worktree_path,
3112 	    strlen(worktree_path))) {
3113 		error = got_error_fmt(GOT_ERR_BAD_PATH,
3114 		    "work tree and repository paths may not overlap: %s",
3115 		    worktree_path);
3116 		goto done;
3117 	}
3118 
3119 	error = got_repo_pack_fds_open(&pack_fds);
3120 	if (error != NULL)
3121 		goto done;
3122 
3123 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3124 	if (error != NULL)
3125 		goto done;
3126 
3127 	/* Pre-create work tree path for unveil(2) */
3128 	error = got_path_mkdir(worktree_path);
3129 	if (error) {
3130 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3131 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3132 			goto done;
3133 		if (!allow_nonempty &&
3134 		    !got_path_dir_is_empty(worktree_path)) {
3135 			error = got_error_path(worktree_path,
3136 			    GOT_ERR_DIR_NOT_EMPTY);
3137 			goto done;
3138 		}
3139 	}
3140 
3141 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3142 	if (error)
3143 		goto done;
3144 
3145 	error = got_ref_open(&head_ref, repo, branch_name, 0);
3146 	if (error != NULL)
3147 		goto done;
3148 
3149 	error = got_worktree_init(worktree_path, head_ref, path_prefix,
3150 	    GOT_WORKTREE_GOT_DIR, repo);
3151 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3152 		goto done;
3153 
3154 	error = got_worktree_open(&worktree, worktree_path,
3155 	    GOT_WORKTREE_GOT_DIR);
3156 	if (error != NULL)
3157 		goto done;
3158 
3159 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3160 	    path_prefix);
3161 	if (error != NULL)
3162 		goto done;
3163 	if (!same_path_prefix) {
3164 		error = got_error(GOT_ERR_PATH_PREFIX);
3165 		goto done;
3166 	}
3167 
3168 	if (commit_id_str) {
3169 		struct got_reflist_head refs;
3170 		TAILQ_INIT(&refs);
3171 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3172 		    NULL);
3173 		if (error)
3174 			goto done;
3175 
3176 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3177 		    repo, worktree);
3178 		if (error != NULL)
3179 			goto done;
3180 		if (keyword_idstr != NULL) {
3181 			free(commit_id_str);
3182 			commit_id_str = keyword_idstr;
3183 		}
3184 
3185 		error = got_repo_match_object_id(&commit_id, NULL,
3186 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3187 		got_ref_list_free(&refs);
3188 		if (error)
3189 			goto done;
3190 		error = check_linear_ancestry(commit_id,
3191 		    got_worktree_get_base_commit_id(worktree), 0, repo);
3192 		if (error != NULL) {
3193 			if (error->code == GOT_ERR_ANCESTRY) {
3194 				error = checkout_ancestry_error(
3195 				    head_ref, commit_id_str);
3196 			}
3197 			goto done;
3198 		}
3199 		error = check_same_branch(commit_id, head_ref, repo);
3200 		if (error) {
3201 			if (error->code == GOT_ERR_ANCESTRY) {
3202 				error = checkout_ancestry_error(
3203 				    head_ref, commit_id_str);
3204 			}
3205 			goto done;
3206 		}
3207 		error = got_worktree_set_base_commit_id(worktree, repo,
3208 		    commit_id);
3209 		if (error)
3210 			goto done;
3211 		/* Expand potentially abbreviated commit ID string. */
3212 		free(commit_id_str);
3213 		error = got_object_id_str(&commit_id_str, commit_id);
3214 		if (error)
3215 			goto done;
3216 	} else {
3217 		commit_id = got_object_id_dup(
3218 		    got_worktree_get_base_commit_id(worktree));
3219 		if (commit_id == NULL) {
3220 			error = got_error_from_errno("got_object_id_dup");
3221 			goto done;
3222 		}
3223 		error = got_object_id_str(&commit_id_str, commit_id);
3224 		if (error)
3225 			goto done;
3226 	}
3227 
3228 	error = got_pathlist_append(&paths, "", NULL);
3229 	if (error)
3230 		goto done;
3231 	cpa.worktree_path = worktree_path;
3232 	cpa.had_base_commit_ref_error = 0;
3233 	cpa.verbosity = verbosity;
3234 	error = got_worktree_checkout_files(worktree, &paths, repo,
3235 	    checkout_progress, &cpa, check_cancelled, NULL);
3236 	if (error != NULL)
3237 		goto done;
3238 
3239 	if (got_ref_is_symbolic(head_ref)) {
3240 		error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3241 		if (error)
3242 			goto done;
3243 		refname = got_ref_get_name(ref);
3244 	} else
3245 		refname = got_ref_get_name(head_ref);
3246 	printf("Checked out %s: %s\n", refname, commit_id_str);
3247 	printf("Now shut up and hack\n");
3248 	if (cpa.had_base_commit_ref_error)
3249 		show_worktree_base_ref_warning();
3250 done:
3251 	if (pack_fds) {
3252 		const struct got_error *pack_err =
3253 		    got_repo_pack_fds_close(pack_fds);
3254 		if (error == NULL)
3255 			error = pack_err;
3256 	}
3257 	if (head_ref)
3258 		got_ref_close(head_ref);
3259 	if (ref)
3260 		got_ref_close(ref);
3261 	if (repo) {
3262 		close_err = got_repo_close(repo);
3263 		if (error == NULL)
3264 			error = close_err;
3265 	}
3266 	if (worktree != NULL) {
3267 		close_err = got_worktree_close(worktree);
3268 		if (error == NULL)
3269 			error = close_err;
3270 	}
3271 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
3272 	free(commit_id_str);
3273 	free(commit_id);
3274 	free(repo_path);
3275 	free(worktree_path);
3276 	free(cwd);
3277 	return error;
3278 }
3279 
3280 struct got_update_progress_arg {
3281 	int did_something;
3282 	int conflicts;
3283 	int obstructed;
3284 	int not_updated;
3285 	int missing;
3286 	int not_deleted;
3287 	int unversioned;
3288 	int verbosity;
3289 };
3290 
3291 static void
3292 print_update_progress_stats(struct got_update_progress_arg *upa)
3293 {
3294 	if (!upa->did_something)
3295 		return;
3296 
3297 	if (upa->conflicts > 0)
3298 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
3299 	if (upa->obstructed > 0)
3300 		printf("File paths obstructed by a non-regular file: %d\n",
3301 		    upa->obstructed);
3302 	if (upa->not_updated > 0)
3303 		printf("Files not updated because of existing merge "
3304 		    "conflicts: %d\n", upa->not_updated);
3305 }
3306 
3307 /*
3308  * The meaning of some status codes differs between merge-style operations and
3309  * update operations. For example, the ! status code means "file was missing"
3310  * if changes were merged into the work tree, and "missing file was restored"
3311  * if the work tree was updated. This function should be used by any operation
3312  * which merges changes into the work tree without updating the work tree.
3313  */
3314 static void
3315 print_merge_progress_stats(struct got_update_progress_arg *upa)
3316 {
3317 	if (!upa->did_something)
3318 		return;
3319 
3320 	if (upa->conflicts > 0)
3321 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
3322 	if (upa->obstructed > 0)
3323 		printf("File paths obstructed by a non-regular file: %d\n",
3324 		    upa->obstructed);
3325 	if (upa->missing > 0)
3326 		printf("Files which had incoming changes but could not be "
3327 		    "found in the work tree: %d\n", upa->missing);
3328 	if (upa->not_deleted > 0)
3329 		printf("Files not deleted due to differences in deleted "
3330 		    "content: %d\n", upa->not_deleted);
3331 	if (upa->unversioned > 0)
3332 		printf("Files not merged because an unversioned file was "
3333 		    "found in the work tree: %d\n", upa->unversioned);
3334 }
3335 
3336 __dead static void
3337 usage_update(void)
3338 {
3339 	fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3340 	    "[path ...]\n", getprogname());
3341 	exit(1);
3342 }
3343 
3344 static const struct got_error *
3345 update_progress(void *arg, unsigned char status, const char *path)
3346 {
3347 	struct got_update_progress_arg *upa = arg;
3348 
3349 	if (status == GOT_STATUS_EXISTS ||
3350 	    status == GOT_STATUS_BASE_REF_ERR)
3351 		return NULL;
3352 
3353 	upa->did_something = 1;
3354 
3355 	/* Base commit bump happens silently. */
3356 	if (status == GOT_STATUS_BUMP_BASE)
3357 		return NULL;
3358 
3359 	if (status == GOT_STATUS_CONFLICT)
3360 		upa->conflicts++;
3361 	if (status == GOT_STATUS_OBSTRUCTED)
3362 		upa->obstructed++;
3363 	if (status == GOT_STATUS_CANNOT_UPDATE)
3364 		upa->not_updated++;
3365 	if (status == GOT_STATUS_MISSING)
3366 		upa->missing++;
3367 	if (status == GOT_STATUS_CANNOT_DELETE)
3368 		upa->not_deleted++;
3369 	if (status == GOT_STATUS_UNVERSIONED)
3370 		upa->unversioned++;
3371 
3372 	while (path[0] == '/')
3373 		path++;
3374 	if (upa->verbosity >= 0)
3375 		printf("%c  %s\n", status, path);
3376 
3377 	return NULL;
3378 }
3379 
3380 static const struct got_error *
3381 switch_head_ref(struct got_reference *head_ref,
3382     struct got_object_id *commit_id, struct got_worktree *worktree,
3383     struct got_repository *repo)
3384 {
3385 	const struct got_error *err = NULL;
3386 	char *base_id_str;
3387 	int ref_has_moved = 0;
3388 
3389 	/* Trivial case: switching between two different references. */
3390 	if (strcmp(got_ref_get_name(head_ref),
3391 	    got_worktree_get_head_ref_name(worktree)) != 0) {
3392 		printf("Switching work tree from %s to %s\n",
3393 		    got_worktree_get_head_ref_name(worktree),
3394 		    got_ref_get_name(head_ref));
3395 		return got_worktree_set_head_ref(worktree, head_ref);
3396 	}
3397 
3398 	err = check_linear_ancestry(commit_id,
3399 	    got_worktree_get_base_commit_id(worktree), 0, repo);
3400 	if (err) {
3401 		if (err->code != GOT_ERR_ANCESTRY)
3402 			return err;
3403 		ref_has_moved = 1;
3404 	}
3405 	if (!ref_has_moved)
3406 		return NULL;
3407 
3408 	/* Switching to a rebased branch with the same reference name. */
3409 	err = got_object_id_str(&base_id_str,
3410 	    got_worktree_get_base_commit_id(worktree));
3411 	if (err)
3412 		return err;
3413 	printf("Reference %s now points at a different branch\n",
3414 	    got_worktree_get_head_ref_name(worktree));
3415 	printf("Switching work tree from %s to %s\n", base_id_str,
3416 	    got_worktree_get_head_ref_name(worktree));
3417 	return NULL;
3418 }
3419 
3420 static const struct got_error *
3421 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3422 {
3423 	const struct got_error *err;
3424 	int in_progress;
3425 
3426 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
3427 	if (err)
3428 		return err;
3429 	if (in_progress)
3430 		return got_error(GOT_ERR_REBASING);
3431 
3432 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
3433 	if (err)
3434 		return err;
3435 	if (in_progress)
3436 		return got_error(GOT_ERR_HISTEDIT_BUSY);
3437 
3438 	return NULL;
3439 }
3440 
3441 static const struct got_error *
3442 check_merge_in_progress(struct got_worktree *worktree,
3443     struct got_repository *repo)
3444 {
3445 	const struct got_error *err;
3446 	int in_progress;
3447 
3448 	err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3449 	if (err)
3450 		return err;
3451 	if (in_progress)
3452 		return got_error(GOT_ERR_MERGE_BUSY);
3453 
3454 	return NULL;
3455 }
3456 
3457 static const struct got_error *
3458 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3459     char *argv[], struct got_worktree *worktree)
3460 {
3461 	const struct got_error *err = NULL;
3462 	char *path;
3463 	struct got_pathlist_entry *new;
3464 	int i;
3465 
3466 	if (argc == 0) {
3467 		path = strdup("");
3468 		if (path == NULL)
3469 			return got_error_from_errno("strdup");
3470 		return got_pathlist_append(paths, path, NULL);
3471 	}
3472 
3473 	for (i = 0; i < argc; i++) {
3474 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
3475 		if (err)
3476 			break;
3477 		err = got_pathlist_insert(&new, paths, path, NULL);
3478 		if (err || new == NULL /* duplicate */) {
3479 			free(path);
3480 			if (err)
3481 				break;
3482 		}
3483 	}
3484 
3485 	return err;
3486 }
3487 
3488 static const struct got_error *
3489 wrap_not_worktree_error(const struct got_error *orig_err,
3490     const char *cmdname, const char *path)
3491 {
3492 	const struct got_error *err;
3493 	struct got_repository *repo;
3494 	static char msg[512];
3495 	int *pack_fds = NULL;
3496 
3497 	err = got_repo_pack_fds_open(&pack_fds);
3498 	if (err)
3499 		return err;
3500 
3501 	err = got_repo_open(&repo, path, NULL, pack_fds);
3502 	if (err)
3503 		return orig_err;
3504 
3505 	snprintf(msg, sizeof(msg),
3506 	    "'got %s' needs a work tree in addition to a git repository\n"
3507 	    "Work trees can be checked out from this Git repository with "
3508 	    "'got checkout'.\n"
3509 	    "The got(1) manual page contains more information.", cmdname);
3510 	err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3511 	if (repo) {
3512 		const struct got_error *close_err = got_repo_close(repo);
3513 		if (err == NULL)
3514 			err = close_err;
3515 	}
3516 	if (pack_fds) {
3517 		const struct got_error *pack_err =
3518 		    got_repo_pack_fds_close(pack_fds);
3519 		if (err == NULL)
3520 			err = pack_err;
3521 	}
3522 	return err;
3523 }
3524 
3525 static const struct got_error *
3526 cmd_update(int argc, char *argv[])
3527 {
3528 	const struct got_error *close_err, *error = NULL;
3529 	struct got_repository *repo = NULL;
3530 	struct got_worktree *worktree = NULL;
3531 	char *worktree_path = NULL;
3532 	struct got_object_id *commit_id = NULL;
3533 	char *commit_id_str = NULL;
3534 	const char *branch_name = NULL;
3535 	struct got_reference *head_ref = NULL;
3536 	struct got_pathlist_head paths;
3537 	struct got_pathlist_entry *pe;
3538 	int ch, verbosity = 0;
3539 	struct got_update_progress_arg upa;
3540 	int *pack_fds = NULL;
3541 
3542 	TAILQ_INIT(&paths);
3543 
3544 #ifndef PROFILE
3545 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3546 	    "unveil", NULL) == -1)
3547 		err(1, "pledge");
3548 #endif
3549 
3550 	while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3551 		switch (ch) {
3552 		case 'b':
3553 			branch_name = optarg;
3554 			break;
3555 		case 'c':
3556 			commit_id_str = strdup(optarg);
3557 			if (commit_id_str == NULL)
3558 				return got_error_from_errno("strdup");
3559 			break;
3560 		case 'q':
3561 			verbosity = -1;
3562 			break;
3563 		default:
3564 			usage_update();
3565 			/* NOTREACHED */
3566 		}
3567 	}
3568 
3569 	argc -= optind;
3570 	argv += optind;
3571 
3572 	worktree_path = getcwd(NULL, 0);
3573 	if (worktree_path == NULL) {
3574 		error = got_error_from_errno("getcwd");
3575 		goto done;
3576 	}
3577 
3578 	error = got_repo_pack_fds_open(&pack_fds);
3579 	if (error != NULL)
3580 		goto done;
3581 
3582 	error = got_worktree_open(&worktree, worktree_path,
3583 	    GOT_WORKTREE_GOT_DIR);
3584 	if (error) {
3585 		if (error->code == GOT_ERR_NOT_WORKTREE)
3586 			error = wrap_not_worktree_error(error, "update",
3587 			    worktree_path);
3588 		goto done;
3589 	}
3590 
3591 	error = check_rebase_or_histedit_in_progress(worktree);
3592 	if (error)
3593 		goto done;
3594 
3595 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3596 	    NULL, pack_fds);
3597 	if (error != NULL)
3598 		goto done;
3599 
3600 	error = apply_unveil(got_repo_get_path(repo), 0,
3601 	    got_worktree_get_root_path(worktree));
3602 	if (error)
3603 		goto done;
3604 
3605 	error = check_merge_in_progress(worktree, repo);
3606 	if (error)
3607 		goto done;
3608 
3609 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3610 	if (error)
3611 		goto done;
3612 
3613 	error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3614 	    got_worktree_get_head_ref_name(worktree), 0);
3615 	if (error != NULL)
3616 		goto done;
3617 	if (commit_id_str == NULL) {
3618 		error = got_ref_resolve(&commit_id, repo, head_ref);
3619 		if (error != NULL)
3620 			goto done;
3621 		error = got_object_id_str(&commit_id_str, commit_id);
3622 		if (error != NULL)
3623 			goto done;
3624 	} else {
3625 		struct got_reflist_head refs;
3626 		char *keyword_idstr = NULL;
3627 
3628 		TAILQ_INIT(&refs);
3629 
3630 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3631 		    NULL);
3632 		if (error)
3633 			goto done;
3634 
3635 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3636 		    repo, worktree);
3637 		if (error != NULL)
3638 			goto done;
3639 		if (keyword_idstr != NULL) {
3640 			free(commit_id_str);
3641 			commit_id_str = keyword_idstr;
3642 		}
3643 
3644 		error = got_repo_match_object_id(&commit_id, NULL,
3645 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3646 		got_ref_list_free(&refs);
3647 		free(commit_id_str);
3648 		commit_id_str = NULL;
3649 		if (error)
3650 			goto done;
3651 		error = got_object_id_str(&commit_id_str, commit_id);
3652 		if (error)
3653 			goto done;
3654 	}
3655 
3656 	if (branch_name) {
3657 		struct got_object_id *head_commit_id;
3658 		TAILQ_FOREACH(pe, &paths, entry) {
3659 			if (pe->path_len == 0)
3660 				continue;
3661 			error = got_error_msg(GOT_ERR_BAD_PATH,
3662 			    "switching between branches requires that "
3663 			    "the entire work tree gets updated");
3664 			goto done;
3665 		}
3666 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
3667 		if (error)
3668 			goto done;
3669 		error = check_linear_ancestry(commit_id, head_commit_id, 0,
3670 		    repo);
3671 		free(head_commit_id);
3672 		if (error != NULL)
3673 			goto done;
3674 		error = check_same_branch(commit_id, head_ref, repo);
3675 		if (error)
3676 			goto done;
3677 		error = switch_head_ref(head_ref, commit_id, worktree, repo);
3678 		if (error)
3679 			goto done;
3680 	} else {
3681 		error = check_linear_ancestry(commit_id,
3682 		    got_worktree_get_base_commit_id(worktree), 0, repo);
3683 		if (error != NULL) {
3684 			if (error->code == GOT_ERR_ANCESTRY)
3685 				error = got_error(GOT_ERR_BRANCH_MOVED);
3686 			goto done;
3687 		}
3688 		error = check_same_branch(commit_id, head_ref, repo);
3689 		if (error)
3690 			goto done;
3691 	}
3692 
3693 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3694 	    commit_id) != 0) {
3695 		error = got_worktree_set_base_commit_id(worktree, repo,
3696 		    commit_id);
3697 		if (error)
3698 			goto done;
3699 	}
3700 
3701 	memset(&upa, 0, sizeof(upa));
3702 	upa.verbosity = verbosity;
3703 	error = got_worktree_checkout_files(worktree, &paths, repo,
3704 	    update_progress, &upa, check_cancelled, NULL);
3705 	if (error != NULL)
3706 		goto done;
3707 
3708 	if (upa.did_something) {
3709 		printf("Updated to %s: %s\n",
3710 		    got_worktree_get_head_ref_name(worktree), commit_id_str);
3711 	} else
3712 		printf("Already up-to-date\n");
3713 
3714 	print_update_progress_stats(&upa);
3715 done:
3716 	if (pack_fds) {
3717 		const struct got_error *pack_err =
3718 		    got_repo_pack_fds_close(pack_fds);
3719 		if (error == NULL)
3720 			error = pack_err;
3721 	}
3722 	if (repo) {
3723 		close_err = got_repo_close(repo);
3724 		if (error == NULL)
3725 			error = close_err;
3726 	}
3727 	if (worktree != NULL) {
3728 		close_err = got_worktree_close(worktree);
3729 		if (error == NULL)
3730 			error = close_err;
3731 	}
3732 	if (head_ref != NULL)
3733 		got_ref_close(head_ref);
3734 	free(worktree_path);
3735 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3736 	free(commit_id);
3737 	free(commit_id_str);
3738 	return error;
3739 }
3740 
3741 static const struct got_error *
3742 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3743     const char *path, int diff_context, int ignore_whitespace,
3744     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3745     struct got_repository *repo, FILE *outfile)
3746 {
3747 	const struct got_error *err = NULL;
3748 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3749 	FILE *f1 = NULL, *f2 = NULL;
3750 	int fd1 = -1, fd2 = -1;
3751 
3752 	fd1 = got_opentempfd();
3753 	if (fd1 == -1)
3754 		return got_error_from_errno("got_opentempfd");
3755 	fd2 = got_opentempfd();
3756 	if (fd2 == -1) {
3757 		err = got_error_from_errno("got_opentempfd");
3758 		goto done;
3759 	}
3760 
3761 	if (blob_id1) {
3762 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3763 		    fd1);
3764 		if (err)
3765 			goto done;
3766 	}
3767 
3768 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3769 	if (err)
3770 		goto done;
3771 
3772 	f1 = got_opentemp();
3773 	if (f1 == NULL) {
3774 		err = got_error_from_errno("got_opentemp");
3775 		goto done;
3776 	}
3777 	f2 = got_opentemp();
3778 	if (f2 == NULL) {
3779 		err = got_error_from_errno("got_opentemp");
3780 		goto done;
3781 	}
3782 
3783 	while (path[0] == '/')
3784 		path++;
3785 	err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3786 	    GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3787 	    force_text_diff, dsa, outfile);
3788 done:
3789 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3790 		err = got_error_from_errno("close");
3791 	if (blob1)
3792 		got_object_blob_close(blob1);
3793 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3794 		err = got_error_from_errno("close");
3795 	if (blob2)
3796 		got_object_blob_close(blob2);
3797 	if (f1 && fclose(f1) == EOF && err == NULL)
3798 		err = got_error_from_errno("fclose");
3799 	if (f2 && fclose(f2) == EOF && err == NULL)
3800 		err = got_error_from_errno("fclose");
3801 	return err;
3802 }
3803 
3804 static const struct got_error *
3805 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3806     const char *path, int diff_context, int ignore_whitespace,
3807     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3808     struct got_repository *repo, FILE *outfile)
3809 {
3810 	const struct got_error *err = NULL;
3811 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3812 	struct got_diff_blob_output_unidiff_arg arg;
3813 	FILE *f1 = NULL, *f2 = NULL;
3814 	int fd1 = -1, fd2 = -1;
3815 
3816 	if (tree_id1) {
3817 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3818 		if (err)
3819 			goto done;
3820 		fd1 = got_opentempfd();
3821 		if (fd1 == -1) {
3822 			err = got_error_from_errno("got_opentempfd");
3823 			goto done;
3824 		}
3825 	}
3826 
3827 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3828 	if (err)
3829 		goto done;
3830 
3831 	f1 = got_opentemp();
3832 	if (f1 == NULL) {
3833 		err = got_error_from_errno("got_opentemp");
3834 		goto done;
3835 	}
3836 
3837 	f2 = got_opentemp();
3838 	if (f2 == NULL) {
3839 		err = got_error_from_errno("got_opentemp");
3840 		goto done;
3841 	}
3842 	fd2 = got_opentempfd();
3843 	if (fd2 == -1) {
3844 		err = got_error_from_errno("got_opentempfd");
3845 		goto done;
3846 	}
3847 	arg.diff_context = diff_context;
3848 	arg.ignore_whitespace = ignore_whitespace;
3849 	arg.force_text_diff = force_text_diff;
3850 	arg.diffstat = dsa;
3851 	arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3852 	arg.outfile = outfile;
3853 	arg.lines = NULL;
3854 	arg.nlines = 0;
3855 	while (path[0] == '/')
3856 		path++;
3857 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3858 	    got_diff_blob_output_unidiff, &arg, 1);
3859 done:
3860 	if (tree1)
3861 		got_object_tree_close(tree1);
3862 	if (tree2)
3863 		got_object_tree_close(tree2);
3864 	if (f1 && fclose(f1) == EOF && err == NULL)
3865 		err = got_error_from_errno("fclose");
3866 	if (f2 && fclose(f2) == EOF && err == NULL)
3867 		err = got_error_from_errno("fclose");
3868 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3869 		err = got_error_from_errno("close");
3870 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3871 		err = got_error_from_errno("close");
3872 	return err;
3873 }
3874 
3875 static const struct got_error *
3876 get_changed_paths(struct got_pathlist_head *paths,
3877     struct got_commit_object *commit, struct got_repository *repo,
3878     struct got_diffstat_cb_arg *dsa)
3879 {
3880 	const struct got_error *err = NULL;
3881 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3882 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3883 	struct got_object_qid *qid;
3884 	got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3885 	FILE *f1 = NULL, *f2 = NULL;
3886 	int fd1 = -1, fd2 = -1;
3887 
3888 	if (dsa) {
3889 		cb = got_diff_tree_compute_diffstat;
3890 
3891 		f1 = got_opentemp();
3892 		if (f1 == NULL) {
3893 			err = got_error_from_errno("got_opentemp");
3894 			goto done;
3895 		}
3896 		f2 = got_opentemp();
3897 		if (f2 == NULL) {
3898 			err = got_error_from_errno("got_opentemp");
3899 			goto done;
3900 		}
3901 		fd1 = got_opentempfd();
3902 		if (fd1 == -1) {
3903 			err = got_error_from_errno("got_opentempfd");
3904 			goto done;
3905 		}
3906 		fd2 = got_opentempfd();
3907 		if (fd2 == -1) {
3908 			err = got_error_from_errno("got_opentempfd");
3909 			goto done;
3910 		}
3911 	}
3912 
3913 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3914 	if (qid != NULL) {
3915 		struct got_commit_object *pcommit;
3916 		err = got_object_open_as_commit(&pcommit, repo,
3917 		    &qid->id);
3918 		if (err)
3919 			return err;
3920 
3921 		tree_id1 = got_object_id_dup(
3922 		    got_object_commit_get_tree_id(pcommit));
3923 		if (tree_id1 == NULL) {
3924 			got_object_commit_close(pcommit);
3925 			return got_error_from_errno("got_object_id_dup");
3926 		}
3927 		got_object_commit_close(pcommit);
3928 
3929 	}
3930 
3931 	if (tree_id1) {
3932 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3933 		if (err)
3934 			goto done;
3935 	}
3936 
3937 	tree_id2 = got_object_commit_get_tree_id(commit);
3938 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3939 	if (err)
3940 		goto done;
3941 
3942 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3943 	    cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3944 done:
3945 	if (tree1)
3946 		got_object_tree_close(tree1);
3947 	if (tree2)
3948 		got_object_tree_close(tree2);
3949 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3950 		err = got_error_from_errno("close");
3951 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3952 		err = got_error_from_errno("close");
3953 	if (f1 && fclose(f1) == EOF && err == NULL)
3954 		err = got_error_from_errno("fclose");
3955 	if (f2 && fclose(f2) == EOF && err == NULL)
3956 		err = got_error_from_errno("fclose");
3957 	free(tree_id1);
3958 	return err;
3959 }
3960 
3961 static const struct got_error *
3962 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3963     const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3964     struct got_repository *repo, FILE *outfile)
3965 {
3966 	const struct got_error *err = NULL;
3967 	struct got_commit_object *pcommit = NULL;
3968 	char *id_str1 = NULL, *id_str2 = NULL;
3969 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3970 	struct got_object_qid *qid;
3971 
3972 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3973 	if (qid != NULL) {
3974 		err = got_object_open_as_commit(&pcommit, repo,
3975 		    &qid->id);
3976 		if (err)
3977 			return err;
3978 		err = got_object_id_str(&id_str1, &qid->id);
3979 		if (err)
3980 			goto done;
3981 	}
3982 
3983 	err = got_object_id_str(&id_str2, id);
3984 	if (err)
3985 		goto done;
3986 
3987 	if (path && path[0] != '\0') {
3988 		int obj_type;
3989 		err = got_object_id_by_path(&obj_id2, repo, commit, path);
3990 		if (err)
3991 			goto done;
3992 		if (pcommit) {
3993 			err = got_object_id_by_path(&obj_id1, repo,
3994 			    pcommit, path);
3995 			if (err) {
3996 				if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3997 					free(obj_id2);
3998 					goto done;
3999 				}
4000 			}
4001 		}
4002 		err = got_object_get_type(&obj_type, repo, obj_id2);
4003 		if (err) {
4004 			free(obj_id2);
4005 			goto done;
4006 		}
4007 		fprintf(outfile,
4008 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
4009 		fprintf(outfile, "commit - %s\n",
4010 		    id_str1 ? id_str1 : "/dev/null");
4011 		fprintf(outfile, "commit + %s\n", id_str2);
4012 		switch (obj_type) {
4013 		case GOT_OBJ_TYPE_BLOB:
4014 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
4015 			    0, 0, dsa, repo, outfile);
4016 			break;
4017 		case GOT_OBJ_TYPE_TREE:
4018 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
4019 			    0, 0, dsa, repo, outfile);
4020 			break;
4021 		default:
4022 			err = got_error(GOT_ERR_OBJ_TYPE);
4023 			break;
4024 		}
4025 		free(obj_id1);
4026 		free(obj_id2);
4027 	} else {
4028 		obj_id2 = got_object_commit_get_tree_id(commit);
4029 		if (pcommit)
4030 			obj_id1 = got_object_commit_get_tree_id(pcommit);
4031 		fprintf(outfile,
4032 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
4033 		fprintf(outfile, "commit - %s\n",
4034 		    id_str1 ? id_str1 : "/dev/null");
4035 		fprintf(outfile, "commit + %s\n", id_str2);
4036 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
4037 		    dsa, repo, outfile);
4038 	}
4039 done:
4040 	free(id_str1);
4041 	free(id_str2);
4042 	if (pcommit)
4043 		got_object_commit_close(pcommit);
4044 	return err;
4045 }
4046 
4047 static char *
4048 get_datestr(time_t *time, char *datebuf)
4049 {
4050 	struct tm mytm, *tm;
4051 	char *p, *s;
4052 
4053 	tm = gmtime_r(time, &mytm);
4054 	if (tm == NULL)
4055 		return NULL;
4056 	s = asctime_r(tm, datebuf);
4057 	if (s == NULL)
4058 		return NULL;
4059 	p = strchr(s, '\n');
4060 	if (p)
4061 		*p = '\0';
4062 	return s;
4063 }
4064 
4065 static const struct got_error *
4066 match_commit(int *have_match, struct got_object_id *id,
4067     struct got_commit_object *commit, regex_t *regex)
4068 {
4069 	const struct got_error *err = NULL;
4070 	regmatch_t regmatch;
4071 	char *id_str = NULL, *logmsg = NULL;
4072 
4073 	*have_match = 0;
4074 
4075 	err = got_object_id_str(&id_str, id);
4076 	if (err)
4077 		return err;
4078 
4079 	err = got_object_commit_get_logmsg(&logmsg, commit);
4080 	if (err)
4081 		goto done;
4082 
4083 	if (regexec(regex, got_object_commit_get_author(commit), 1,
4084 	    &regmatch, 0) == 0 ||
4085 	    regexec(regex, got_object_commit_get_committer(commit), 1,
4086 	    &regmatch, 0) == 0 ||
4087 	    regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
4088 	    regexec(regex, logmsg, 1, &regmatch, 0) == 0)
4089 		*have_match = 1;
4090 done:
4091 	free(id_str);
4092 	free(logmsg);
4093 	return err;
4094 }
4095 
4096 static void
4097 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
4098     regex_t *regex)
4099 {
4100 	regmatch_t regmatch;
4101 	struct got_pathlist_entry *pe;
4102 
4103 	*have_match = 0;
4104 
4105 	TAILQ_FOREACH(pe, changed_paths, entry) {
4106 		if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
4107 			*have_match = 1;
4108 			break;
4109 		}
4110 	}
4111 }
4112 
4113 static const struct got_error *
4114 match_patch(int *have_match, struct got_commit_object *commit,
4115     struct got_object_id *id, const char *path, int diff_context,
4116     struct got_repository *repo, regex_t *regex, FILE *f)
4117 {
4118 	const struct got_error *err = NULL;
4119 	char *line = NULL;
4120 	size_t linesize = 0;
4121 	regmatch_t regmatch;
4122 
4123 	*have_match = 0;
4124 
4125 	err = got_opentemp_truncate(f);
4126 	if (err)
4127 		return err;
4128 
4129 	err = print_patch(commit, id, path, diff_context, NULL, repo, f);
4130 	if (err)
4131 		goto done;
4132 
4133 	if (fseeko(f, 0L, SEEK_SET) == -1) {
4134 		err = got_error_from_errno("fseeko");
4135 		goto done;
4136 	}
4137 
4138 	while (getline(&line, &linesize, f) != -1) {
4139 		if (regexec(regex, line, 1, &regmatch, 0) == 0) {
4140 			*have_match = 1;
4141 			break;
4142 		}
4143 	}
4144 done:
4145 	free(line);
4146 	return err;
4147 }
4148 
4149 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
4150 
4151 static const struct got_error*
4152 build_refs_str(char **refs_str, struct got_reflist_head *refs,
4153     struct got_object_id *id, struct got_repository *repo,
4154     int local_only)
4155 {
4156 	static const struct got_error *err = NULL;
4157 	struct got_reflist_entry *re;
4158 	char *s;
4159 	const char *name;
4160 
4161 	*refs_str = NULL;
4162 
4163 	TAILQ_FOREACH(re, refs, entry) {
4164 		struct got_tag_object *tag = NULL;
4165 		struct got_object_id *ref_id;
4166 		int cmp;
4167 
4168 		name = got_ref_get_name(re->ref);
4169 		if (strcmp(name, GOT_REF_HEAD) == 0)
4170 			continue;
4171 		if (strncmp(name, "refs/", 5) == 0)
4172 			name += 5;
4173 		if (strncmp(name, "got/", 4) == 0)
4174 			continue;
4175 		if (strncmp(name, "heads/", 6) == 0)
4176 			name += 6;
4177 		if (strncmp(name, "remotes/", 8) == 0) {
4178 			if (local_only)
4179 				continue;
4180 			name += 8;
4181 			s = strstr(name, "/" GOT_REF_HEAD);
4182 			if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
4183 				continue;
4184 		}
4185 		err = got_ref_resolve(&ref_id, repo, re->ref);
4186 		if (err)
4187 			break;
4188 		if (strncmp(name, "tags/", 5) == 0) {
4189 			err = got_object_open_as_tag(&tag, repo, ref_id);
4190 			if (err) {
4191 				if (err->code != GOT_ERR_OBJ_TYPE) {
4192 					free(ref_id);
4193 					break;
4194 				}
4195 				/* Ref points at something other than a tag. */
4196 				err = NULL;
4197 				tag = NULL;
4198 			}
4199 		}
4200 		cmp = got_object_id_cmp(tag ?
4201 		    got_object_tag_get_object_id(tag) : ref_id, id);
4202 		free(ref_id);
4203 		if (tag)
4204 			got_object_tag_close(tag);
4205 		if (cmp != 0)
4206 			continue;
4207 		s = *refs_str;
4208 		if (asprintf(refs_str, "%s%s%s", s ? s : "",
4209 		    s ? ", " : "", name) == -1) {
4210 			err = got_error_from_errno("asprintf");
4211 			free(s);
4212 			*refs_str = NULL;
4213 			break;
4214 		}
4215 		free(s);
4216 	}
4217 
4218 	return err;
4219 }
4220 
4221 static const struct got_error *
4222 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4223     struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4224 {
4225 	const struct got_error *err = NULL;
4226 	char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4227 	char *comma, *s, *nl;
4228 	struct got_reflist_head *refs;
4229 	char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4230 	struct tm tm;
4231 	time_t committer_time;
4232 
4233 	refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4234 	if (refs) {
4235 		err = build_refs_str(&ref_str, refs, id, repo, 1);
4236 		if (err)
4237 			return err;
4238 
4239 		/* Display the first matching ref only. */
4240 		if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4241 			*comma = '\0';
4242 	}
4243 
4244 	if (ref_str == NULL) {
4245 		err = got_object_id_str(&id_str, id);
4246 		if (err)
4247 			return err;
4248 	}
4249 
4250 	committer_time = got_object_commit_get_committer_time(commit);
4251 	if (gmtime_r(&committer_time, &tm) == NULL) {
4252 		err = got_error_from_errno("gmtime_r");
4253 		goto done;
4254 	}
4255 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4256 		err = got_error(GOT_ERR_NO_SPACE);
4257 		goto done;
4258 	}
4259 
4260 	err = got_object_commit_get_logmsg(&logmsg0, commit);
4261 	if (err)
4262 		goto done;
4263 
4264 	s = logmsg0;
4265 	while (isspace((unsigned char)s[0]))
4266 		s++;
4267 
4268 	nl = strchr(s, '\n');
4269 	if (nl) {
4270 		*nl = '\0';
4271 	}
4272 
4273 	if (ref_str)
4274 		printf("%s%-7s %s\n", datebuf, ref_str, s);
4275 	else
4276 		printf("%s%.7s %s\n", datebuf, id_str, s);
4277 
4278 	if (fflush(stdout) != 0 && err == NULL)
4279 		err = got_error_from_errno("fflush");
4280 done:
4281 	free(id_str);
4282 	free(ref_str);
4283 	free(logmsg0);
4284 	return err;
4285 }
4286 
4287 static const struct got_error *
4288 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
4289 {
4290 	struct got_pathlist_entry *pe;
4291 
4292 	if (header != NULL)
4293 		printf("%s\n", header);
4294 
4295 	TAILQ_FOREACH(pe, dsa->paths, entry) {
4296 		struct got_diff_changed_path *cp = pe->data;
4297 		int pad = dsa->max_path_len - pe->path_len + 1;
4298 
4299 		printf(" %c  %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
4300 		    ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
4301 	}
4302 	printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
4303 	    dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
4304 	    dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
4305 
4306 	if (fflush(stdout) != 0)
4307 		return got_error_from_errno("fflush");
4308 
4309 	return NULL;
4310 }
4311 
4312 static const struct got_error *
4313 printfile(FILE *f)
4314 {
4315 	char	buf[8192];
4316 	size_t	r;
4317 
4318 	if (fseeko(f, 0L, SEEK_SET) == -1)
4319 		return got_error_from_errno("fseek");
4320 
4321 	for (;;) {
4322 		r = fread(buf, 1, sizeof(buf), f);
4323 		if (r == 0) {
4324 			if (ferror(f))
4325 				return got_error_from_errno("fread");
4326 			if (feof(f))
4327 				break;
4328 		}
4329 		if (fwrite(buf, 1, r, stdout) != r)
4330 			return got_ferror(stdout, GOT_ERR_IO);
4331 	}
4332 
4333 	return NULL;
4334 }
4335 
4336 static const struct got_error *
4337 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4338     struct got_repository *repo, const char *path,
4339     struct got_pathlist_head *changed_paths,
4340     struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
4341     struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
4342     const char *prefix)
4343 {
4344 	const struct got_error *err = NULL;
4345 	FILE *f = NULL;
4346 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
4347 	char datebuf[26];
4348 	time_t committer_time;
4349 	const char *author, *committer;
4350 	char *refs_str = NULL;
4351 
4352 	err = got_object_id_str(&id_str, id);
4353 	if (err)
4354 		return err;
4355 
4356 	if (custom_refs_str == NULL) {
4357 		struct got_reflist_head *refs;
4358 		refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4359 		if (refs) {
4360 			err = build_refs_str(&refs_str, refs, id, repo, 0);
4361 			if (err)
4362 				goto done;
4363 		}
4364 	}
4365 
4366 	printf(GOT_COMMIT_SEP_STR);
4367 	if (custom_refs_str)
4368 		printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
4369 		    custom_refs_str);
4370 	else
4371 		printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
4372 		    refs_str ? " (" : "", refs_str ? refs_str : "",
4373 		    refs_str ? ")" : "");
4374 	free(id_str);
4375 	id_str = NULL;
4376 	free(refs_str);
4377 	refs_str = NULL;
4378 	printf("from: %s\n", got_object_commit_get_author(commit));
4379 	author = got_object_commit_get_author(commit);
4380 	committer = got_object_commit_get_committer(commit);
4381 	if (strcmp(author, committer) != 0)
4382 		printf("via: %s\n", committer);
4383 	committer_time = got_object_commit_get_committer_time(commit);
4384 	datestr = get_datestr(&committer_time, datebuf);
4385 	if (datestr)
4386 		printf("date: %s UTC\n", datestr);
4387 	if (got_object_commit_get_nparents(commit) > 1) {
4388 		const struct got_object_id_queue *parent_ids;
4389 		struct got_object_qid *qid;
4390 		int n = 1;
4391 		parent_ids = got_object_commit_get_parent_ids(commit);
4392 		STAILQ_FOREACH(qid, parent_ids, entry) {
4393 			err = got_object_id_str(&id_str, &qid->id);
4394 			if (err)
4395 				goto done;
4396 			printf("parent %d: %s\n", n++, id_str);
4397 			free(id_str);
4398 			id_str = NULL;
4399 		}
4400 	}
4401 
4402 	err = got_object_commit_get_logmsg(&logmsg0, commit);
4403 	if (err)
4404 		goto done;
4405 
4406 	logmsg = logmsg0;
4407 	do {
4408 		line = strsep(&logmsg, "\n");
4409 		if (line)
4410 			printf(" %s\n", line);
4411 	} while (line);
4412 	free(logmsg0);
4413 
4414 	if (changed_paths && diffstat == NULL) {
4415 		struct got_pathlist_entry *pe;
4416 
4417 		TAILQ_FOREACH(pe, changed_paths, entry) {
4418 			struct got_diff_changed_path *cp = pe->data;
4419 
4420 			printf(" %c  %s\n", cp->status, pe->path);
4421 		}
4422 		printf("\n");
4423 	}
4424 	if (show_patch) {
4425 		if (diffstat) {
4426 			f = got_opentemp();
4427 			if (f == NULL) {
4428 				err = got_error_from_errno("got_opentemp");
4429 				goto done;
4430 			}
4431 		}
4432 
4433 		err = print_patch(commit, id, path, diff_context, diffstat,
4434 		    repo, diffstat == NULL ? stdout : f);
4435 		if (err)
4436 			goto done;
4437 	}
4438 	if (diffstat) {
4439 		err = print_diffstat(diffstat, NULL);
4440 		if (err)
4441 			goto done;
4442 		if (show_patch) {
4443 			err = printfile(f);
4444 			if (err)
4445 				goto done;
4446 		}
4447 	}
4448 	if (show_patch)
4449 		printf("\n");
4450 
4451 	if (fflush(stdout) != 0 && err == NULL)
4452 		err = got_error_from_errno("fflush");
4453 done:
4454 	if (f && fclose(f) == EOF && err == NULL)
4455 		err = got_error_from_errno("fclose");
4456 	free(id_str);
4457 	free(refs_str);
4458 	return err;
4459 }
4460 
4461 static const struct got_error *
4462 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4463     struct got_repository *repo, const char *path, int show_changed_paths,
4464     int show_diffstat, int show_patch, const char *search_pattern,
4465     int diff_context, int limit, int log_branches, int reverse_display_order,
4466     struct got_reflist_object_id_map *refs_idmap, int one_line, int toposort,
4467     FILE *tmpfile)
4468 {
4469 	const struct got_error *err;
4470 	struct got_commit_graph *graph;
4471 	regex_t regex;
4472 	int have_match;
4473 	struct got_object_id_queue reversed_commits;
4474 	struct got_object_qid *qid;
4475 	struct got_commit_object *commit;
4476 	struct got_pathlist_head changed_paths;
4477 
4478 	STAILQ_INIT(&reversed_commits);
4479 	TAILQ_INIT(&changed_paths);
4480 
4481 	if (search_pattern && regcomp(&regex, search_pattern,
4482 	    REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4483 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
4484 
4485 	err = got_commit_graph_open(&graph, path, !log_branches);
4486 	if (err)
4487 		return err;
4488 	if (log_branches && toposort) {
4489 		err = got_commit_graph_toposort(graph, root_id, repo,
4490 		    check_cancelled, NULL);
4491 	} else {
4492 		err = got_commit_graph_bfsort(graph, root_id, repo,
4493 		    check_cancelled, NULL);
4494 	}
4495 	if (err)
4496 		goto done;
4497 	for (;;) {
4498 		struct got_object_id id;
4499 		struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4500 		    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4501 
4502 		if (sigint_received || sigpipe_received)
4503 			break;
4504 
4505 		err = got_commit_graph_iter_next(&id, graph, repo,
4506 		    check_cancelled, NULL);
4507 		if (err) {
4508 			if (err->code == GOT_ERR_ITER_COMPLETED)
4509 				err = NULL;
4510 			break;
4511 		}
4512 
4513 		err = got_object_open_as_commit(&commit, repo, &id);
4514 		if (err)
4515 			break;
4516 
4517 		if (((show_changed_paths && !show_diffstat) ||
4518 		    (show_diffstat && !show_patch))
4519 		    && !reverse_display_order) {
4520 			err = get_changed_paths(&changed_paths, commit, repo,
4521 			    show_diffstat ? &dsa : NULL);
4522 			if (err)
4523 				break;
4524 		}
4525 
4526 		if (search_pattern) {
4527 			err = match_commit(&have_match, &id, commit, &regex);
4528 			if (err) {
4529 				got_object_commit_close(commit);
4530 				break;
4531 			}
4532 			if (have_match == 0 && show_changed_paths)
4533 				match_changed_paths(&have_match,
4534 				    &changed_paths, &regex);
4535 			if (have_match == 0 && show_patch) {
4536 				err = match_patch(&have_match, commit, &id,
4537 				    path, diff_context, repo, &regex, tmpfile);
4538 				if (err)
4539 					break;
4540 			}
4541 			if (have_match == 0) {
4542 				got_object_commit_close(commit);
4543 				got_pathlist_free(&changed_paths,
4544 				    GOT_PATHLIST_FREE_ALL);
4545 				continue;
4546 			}
4547 		}
4548 
4549 		if (reverse_display_order) {
4550 			err = got_object_qid_alloc(&qid, &id);
4551 			if (err)
4552 				break;
4553 			STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4554 			got_object_commit_close(commit);
4555 		} else {
4556 			if (one_line)
4557 				err = print_commit_oneline(commit, &id,
4558 				    repo, refs_idmap);
4559 			else
4560 				err = print_commit(commit, &id, repo, path,
4561 				    (show_changed_paths || show_diffstat) ?
4562 				    &changed_paths : NULL,
4563 				    show_diffstat ? &dsa : NULL, show_patch,
4564 				    diff_context, refs_idmap, NULL, NULL);
4565 			got_object_commit_close(commit);
4566 			if (err)
4567 				break;
4568 		}
4569 		if ((limit && --limit == 0) ||
4570 		    (end_id && got_object_id_cmp(&id, end_id) == 0))
4571 			break;
4572 
4573 		got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4574 	}
4575 	if (reverse_display_order) {
4576 		STAILQ_FOREACH(qid, &reversed_commits, entry) {
4577 			struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4578 			    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4579 
4580 			err = got_object_open_as_commit(&commit, repo,
4581 			    &qid->id);
4582 			if (err)
4583 				break;
4584 			if ((show_changed_paths && !show_diffstat) ||
4585 			    (show_diffstat && !show_patch)) {
4586 				err = get_changed_paths(&changed_paths, commit,
4587 				    repo, show_diffstat ? &dsa : NULL);
4588 				if (err)
4589 					break;
4590 			}
4591 			if (one_line)
4592 				err = print_commit_oneline(commit, &qid->id,
4593 				    repo, refs_idmap);
4594 			else
4595 				err = print_commit(commit, &qid->id, repo, path,
4596 				    (show_changed_paths || show_diffstat) ?
4597 				    &changed_paths : NULL,
4598 				    show_diffstat ? &dsa : NULL, show_patch,
4599 				    diff_context, refs_idmap, NULL, NULL);
4600 			got_object_commit_close(commit);
4601 			if (err)
4602 				break;
4603 			got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4604 		}
4605 	}
4606 done:
4607 	while (!STAILQ_EMPTY(&reversed_commits)) {
4608 		qid = STAILQ_FIRST(&reversed_commits);
4609 		STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4610 		got_object_qid_free(qid);
4611 	}
4612 	got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4613 	if (search_pattern)
4614 		regfree(&regex);
4615 	got_commit_graph_close(graph);
4616 	return err;
4617 }
4618 
4619 __dead static void
4620 usage_log(void)
4621 {
4622 	fprintf(stderr, "usage: %s log [-bdPpRst] [-C number] [-c commit] "
4623 	    "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4624 	    "[path]\n", getprogname());
4625 	exit(1);
4626 }
4627 
4628 static int
4629 get_default_log_limit(void)
4630 {
4631 	const char *got_default_log_limit;
4632 	long long n;
4633 	const char *errstr;
4634 
4635 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4636 	if (got_default_log_limit == NULL)
4637 		return 0;
4638 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4639 	if (errstr != NULL)
4640 		return 0;
4641 	return n;
4642 }
4643 
4644 static const struct got_error *
4645 cmd_log(int argc, char *argv[])
4646 {
4647 	const struct got_error *error;
4648 	struct got_repository *repo = NULL;
4649 	struct got_worktree *worktree = NULL;
4650 	struct got_object_id *start_id = NULL, *end_id = NULL;
4651 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4652 	char *keyword_idstr = NULL;
4653 	const char *start_commit = NULL, *end_commit = NULL;
4654 	const char *search_pattern = NULL;
4655 	int diff_context = -1, ch;
4656 	int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4657 	int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4658 	int toposort = 0;
4659 	const char *errstr;
4660 	struct got_reflist_head refs;
4661 	struct got_reflist_object_id_map *refs_idmap = NULL;
4662 	FILE *tmpfile = NULL;
4663 	int *pack_fds = NULL;
4664 
4665 	TAILQ_INIT(&refs);
4666 
4667 #ifndef PROFILE
4668 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4669 	    NULL)
4670 	    == -1)
4671 		err(1, "pledge");
4672 #endif
4673 
4674 	limit = get_default_log_limit();
4675 
4676 	while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:stx:")) != -1) {
4677 		switch (ch) {
4678 		case 'b':
4679 			log_branches = 1;
4680 			break;
4681 		case 'C':
4682 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4683 			    &errstr);
4684 			if (errstr != NULL)
4685 				errx(1, "number of context lines is %s: %s",
4686 				    errstr, optarg);
4687 			break;
4688 		case 'c':
4689 			start_commit = optarg;
4690 			break;
4691 		case 'd':
4692 			show_diffstat = 1;
4693 			break;
4694 		case 'l':
4695 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
4696 			if (errstr != NULL)
4697 				errx(1, "number of commits is %s: %s",
4698 				    errstr, optarg);
4699 			break;
4700 		case 'P':
4701 			show_changed_paths = 1;
4702 			break;
4703 		case 'p':
4704 			show_patch = 1;
4705 			break;
4706 		case 'R':
4707 			reverse_display_order = 1;
4708 			break;
4709 		case 'r':
4710 			repo_path = realpath(optarg, NULL);
4711 			if (repo_path == NULL)
4712 				return got_error_from_errno2("realpath",
4713 				    optarg);
4714 			got_path_strip_trailing_slashes(repo_path);
4715 			break;
4716 		case 'S':
4717 			search_pattern = optarg;
4718 			break;
4719 		case 's':
4720 			one_line = 1;
4721 			break;
4722 		case 't':
4723 			toposort = 1;
4724 			break;
4725 		case 'x':
4726 			end_commit = optarg;
4727 			break;
4728 		default:
4729 			usage_log();
4730 			/* NOTREACHED */
4731 		}
4732 	}
4733 
4734 	argc -= optind;
4735 	argv += optind;
4736 
4737 	if (diff_context == -1)
4738 		diff_context = 3;
4739 	else if (!show_patch)
4740 		errx(1, "-C requires -p");
4741 
4742 	if (one_line && (show_patch || show_changed_paths || show_diffstat))
4743 		errx(1, "cannot use -s with -d, -p or -P");
4744 
4745 	cwd = getcwd(NULL, 0);
4746 	if (cwd == NULL) {
4747 		error = got_error_from_errno("getcwd");
4748 		goto done;
4749 	}
4750 
4751 	error = got_repo_pack_fds_open(&pack_fds);
4752 	if (error != NULL)
4753 		goto done;
4754 
4755 	if (repo_path == NULL) {
4756 		error = got_worktree_open(&worktree, cwd,
4757 		    GOT_WORKTREE_GOT_DIR);
4758 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4759 			goto done;
4760 		error = NULL;
4761 	}
4762 
4763 	if (argc == 1) {
4764 		if (worktree) {
4765 			error = got_worktree_resolve_path(&path, worktree,
4766 			    argv[0]);
4767 			if (error)
4768 				goto done;
4769 		} else {
4770 			path = strdup(argv[0]);
4771 			if (path == NULL) {
4772 				error = got_error_from_errno("strdup");
4773 				goto done;
4774 			}
4775 		}
4776 	} else if (argc != 0)
4777 		usage_log();
4778 
4779 	if (repo_path == NULL) {
4780 		repo_path = worktree ?
4781 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4782 	}
4783 	if (repo_path == NULL) {
4784 		error = got_error_from_errno("strdup");
4785 		goto done;
4786 	}
4787 
4788 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4789 	if (error != NULL)
4790 		goto done;
4791 
4792 	error = apply_unveil(got_repo_get_path(repo), 1,
4793 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4794 	if (error)
4795 		goto done;
4796 
4797 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4798 	if (error)
4799 		goto done;
4800 
4801 	error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4802 	if (error)
4803 		goto done;
4804 
4805 	if (start_commit == NULL) {
4806 		struct got_reference *head_ref;
4807 		struct got_commit_object *commit = NULL;
4808 		error = got_ref_open(&head_ref, repo,
4809 		    worktree ? got_worktree_get_head_ref_name(worktree)
4810 		    : GOT_REF_HEAD, 0);
4811 		if (error != NULL)
4812 			goto done;
4813 		error = got_ref_resolve(&start_id, repo, head_ref);
4814 		got_ref_close(head_ref);
4815 		if (error != NULL)
4816 			goto done;
4817 		error = got_object_open_as_commit(&commit, repo,
4818 		    start_id);
4819 		if (error != NULL)
4820 			goto done;
4821 		got_object_commit_close(commit);
4822 	} else {
4823 		error = got_keyword_to_idstr(&keyword_idstr, start_commit,
4824 		    repo, worktree);
4825 		if (error != NULL)
4826 			goto done;
4827 		if (keyword_idstr != NULL)
4828 			start_commit = keyword_idstr;
4829 
4830 		error = got_repo_match_object_id(&start_id, NULL,
4831 		    start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4832 		if (error != NULL)
4833 			goto done;
4834 	}
4835 	if (end_commit != NULL) {
4836 		error = got_keyword_to_idstr(&keyword_idstr, end_commit,
4837 		    repo, worktree);
4838 		if (error != NULL)
4839 			goto done;
4840 		if (keyword_idstr != NULL)
4841 			end_commit = keyword_idstr;
4842 
4843 		error = got_repo_match_object_id(&end_id, NULL,
4844 		    end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4845 		if (error != NULL)
4846 			goto done;
4847 	}
4848 
4849 	if (worktree) {
4850 		/*
4851 		 * If a path was specified on the command line it was resolved
4852 		 * to a path in the work tree above. Prepend the work tree's
4853 		 * path prefix to obtain the corresponding in-repository path.
4854 		 */
4855 		if (path) {
4856 			const char *prefix;
4857 			prefix = got_worktree_get_path_prefix(worktree);
4858 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
4859 			    (path[0] != '\0') ? "/" : "", path) == -1) {
4860 				error = got_error_from_errno("asprintf");
4861 				goto done;
4862 			}
4863 		}
4864 	} else
4865 		error = got_repo_map_path(&in_repo_path, repo,
4866 		    path ? path : "");
4867 	if (error != NULL)
4868 		goto done;
4869 	if (in_repo_path) {
4870 		free(path);
4871 		path = in_repo_path;
4872 	}
4873 
4874 	if (worktree) {
4875 		/* Release work tree lock. */
4876 		got_worktree_close(worktree);
4877 		worktree = NULL;
4878 	}
4879 
4880 	if (search_pattern && show_patch) {
4881 		tmpfile = got_opentemp();
4882 		if (tmpfile == NULL) {
4883 			error = got_error_from_errno("got_opentemp");
4884 			goto done;
4885 		}
4886 	}
4887 
4888 	error = print_commits(start_id, end_id, repo, path ? path : "",
4889 	    show_changed_paths, show_diffstat, show_patch, search_pattern,
4890 	    diff_context, limit, log_branches, reverse_display_order,
4891 	    refs_idmap, one_line, toposort, tmpfile);
4892 done:
4893 	free(path);
4894 	free(repo_path);
4895 	free(cwd);
4896 	free(start_id);
4897 	free(end_id);
4898 	free(keyword_idstr);
4899 	if (worktree)
4900 		got_worktree_close(worktree);
4901 	if (repo) {
4902 		const struct got_error *close_err = got_repo_close(repo);
4903 		if (error == NULL)
4904 			error = close_err;
4905 	}
4906 	if (pack_fds) {
4907 		const struct got_error *pack_err =
4908 		    got_repo_pack_fds_close(pack_fds);
4909 		if (error == NULL)
4910 			error = pack_err;
4911 	}
4912 	if (refs_idmap)
4913 		got_reflist_object_id_map_free(refs_idmap);
4914 	if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4915 		error = got_error_from_errno("fclose");
4916 	got_ref_list_free(&refs);
4917 	return error;
4918 }
4919 
4920 __dead static void
4921 usage_diff(void)
4922 {
4923 	fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4924 	    "[-r repository-path] [object1 object2 | path ...]\n",
4925 	    getprogname());
4926 	exit(1);
4927 }
4928 
4929 struct print_diff_arg {
4930 	struct got_repository *repo;
4931 	struct got_worktree *worktree;
4932 	struct got_diffstat_cb_arg *diffstat;
4933 	int diff_context;
4934 	const char *id_str;
4935 	int header_shown;
4936 	int diff_staged;
4937 	enum got_diff_algorithm diff_algo;
4938 	int ignore_whitespace;
4939 	int force_text_diff;
4940 	FILE *f1;
4941 	FILE *f2;
4942 	FILE *outfile;
4943 };
4944 
4945 /*
4946  * Create a file which contains the target path of a symlink so we can feed
4947  * it as content to the diff engine.
4948  */
4949 static const struct got_error *
4950 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4951     const char *abspath)
4952 {
4953 	const struct got_error *err = NULL;
4954 	char target_path[PATH_MAX];
4955 	ssize_t target_len, outlen;
4956 
4957 	*fd = -1;
4958 
4959 	if (dirfd != -1) {
4960 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4961 		if (target_len == -1)
4962 			return got_error_from_errno2("readlinkat", abspath);
4963 	} else {
4964 		target_len = readlink(abspath, target_path, PATH_MAX);
4965 		if (target_len == -1)
4966 			return got_error_from_errno2("readlink", abspath);
4967 	}
4968 
4969 	*fd = got_opentempfd();
4970 	if (*fd == -1)
4971 		return got_error_from_errno("got_opentempfd");
4972 
4973 	outlen = write(*fd, target_path, target_len);
4974 	if (outlen == -1) {
4975 		err = got_error_from_errno("got_opentempfd");
4976 		goto done;
4977 	}
4978 
4979 	if (lseek(*fd, 0, SEEK_SET) == -1) {
4980 		err = got_error_from_errno2("lseek", abspath);
4981 		goto done;
4982 	}
4983 done:
4984 	if (err) {
4985 		close(*fd);
4986 		*fd = -1;
4987 	}
4988 	return err;
4989 }
4990 
4991 static const struct got_error *
4992 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4993     const char *path, struct got_object_id *blob_id,
4994     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4995     int dirfd, const char *de_name)
4996 {
4997 	struct print_diff_arg *a = arg;
4998 	const struct got_error *err = NULL;
4999 	struct got_blob_object *blob1 = NULL;
5000 	int fd = -1, fd1 = -1, fd2 = -1;
5001 	FILE *f2 = NULL;
5002 	char *abspath = NULL, *label1 = NULL;
5003 	struct stat sb;
5004 	off_t size1 = 0;
5005 	int f2_exists = 0;
5006 
5007 	memset(&sb, 0, sizeof(sb));
5008 
5009 	if (a->diff_staged) {
5010 		if (staged_status != GOT_STATUS_MODIFY &&
5011 		    staged_status != GOT_STATUS_ADD &&
5012 		    staged_status != GOT_STATUS_DELETE)
5013 			return NULL;
5014 	} else {
5015 		if (staged_status == GOT_STATUS_DELETE)
5016 			return NULL;
5017 		if (status == GOT_STATUS_NONEXISTENT)
5018 			return got_error_set_errno(ENOENT, path);
5019 		if (status != GOT_STATUS_MODIFY &&
5020 		    status != GOT_STATUS_ADD &&
5021 		    status != GOT_STATUS_DELETE &&
5022 		    status != GOT_STATUS_CONFLICT)
5023 			return NULL;
5024 	}
5025 
5026 	err = got_opentemp_truncate(a->f1);
5027 	if (err)
5028 		return got_error_from_errno("got_opentemp_truncate");
5029 	err = got_opentemp_truncate(a->f2);
5030 	if (err)
5031 		return got_error_from_errno("got_opentemp_truncate");
5032 
5033 	if (!a->header_shown) {
5034 		if (fprintf(a->outfile, "diff %s%s\n",
5035 		    a->diff_staged ? "-s " : "",
5036 		    got_worktree_get_root_path(a->worktree)) < 0) {
5037 			err = got_error_from_errno("fprintf");
5038 			goto done;
5039 		}
5040 		if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
5041 			err = got_error_from_errno("fprintf");
5042 			goto done;
5043 		}
5044 		if (fprintf(a->outfile, "path + %s%s\n",
5045 		    got_worktree_get_root_path(a->worktree),
5046 		    a->diff_staged ? " (staged changes)" : "") < 0) {
5047 			err = got_error_from_errno("fprintf");
5048 			goto done;
5049 		}
5050 		a->header_shown = 1;
5051 	}
5052 
5053 	if (a->diff_staged) {
5054 		const char *label1 = NULL, *label2 = NULL;
5055 		switch (staged_status) {
5056 		case GOT_STATUS_MODIFY:
5057 			label1 = path;
5058 			label2 = path;
5059 			break;
5060 		case GOT_STATUS_ADD:
5061 			label2 = path;
5062 			break;
5063 		case GOT_STATUS_DELETE:
5064 			label1 = path;
5065 			break;
5066 		default:
5067 			return got_error(GOT_ERR_FILE_STATUS);
5068 		}
5069 		fd1 = got_opentempfd();
5070 		if (fd1 == -1) {
5071 			err = got_error_from_errno("got_opentempfd");
5072 			goto done;
5073 		}
5074 		fd2 = got_opentempfd();
5075 		if (fd2 == -1) {
5076 			err = got_error_from_errno("got_opentempfd");
5077 			goto done;
5078 		}
5079 		err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
5080 		    fd1, fd2, blob_id, staged_blob_id, label1, label2,
5081 		    a->diff_algo, a->diff_context, a->ignore_whitespace,
5082 		    a->force_text_diff, a->diffstat, a->repo, a->outfile);
5083 		goto done;
5084 	}
5085 
5086 	fd1 = got_opentempfd();
5087 	if (fd1 == -1) {
5088 		err = got_error_from_errno("got_opentempfd");
5089 		goto done;
5090 	}
5091 
5092 	if (staged_status == GOT_STATUS_ADD ||
5093 	    staged_status == GOT_STATUS_MODIFY) {
5094 		char *id_str;
5095 		err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
5096 		    8192, fd1);
5097 		if (err)
5098 			goto done;
5099 		err = got_object_id_str(&id_str, staged_blob_id);
5100 		if (err)
5101 			goto done;
5102 		if (asprintf(&label1, "%s (staged)", id_str) == -1) {
5103 			err = got_error_from_errno("asprintf");
5104 			free(id_str);
5105 			goto done;
5106 		}
5107 		free(id_str);
5108 	} else if (status != GOT_STATUS_ADD) {
5109 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
5110 		    fd1);
5111 		if (err)
5112 			goto done;
5113 	}
5114 
5115 	if (status != GOT_STATUS_DELETE) {
5116 		if (asprintf(&abspath, "%s/%s",
5117 		    got_worktree_get_root_path(a->worktree), path) == -1) {
5118 			err = got_error_from_errno("asprintf");
5119 			goto done;
5120 		}
5121 
5122 		if (dirfd != -1) {
5123 			fd = openat(dirfd, de_name,
5124 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5125 			if (fd == -1) {
5126 				if (!got_err_open_nofollow_on_symlink()) {
5127 					err = got_error_from_errno2("openat",
5128 					    abspath);
5129 					goto done;
5130 				}
5131 				err = get_symlink_target_file(&fd, dirfd,
5132 				    de_name, abspath);
5133 				if (err)
5134 					goto done;
5135 			}
5136 		} else {
5137 			fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5138 			if (fd == -1) {
5139 				if (!got_err_open_nofollow_on_symlink()) {
5140 					err = got_error_from_errno2("open",
5141 					    abspath);
5142 					goto done;
5143 				}
5144 				err = get_symlink_target_file(&fd, dirfd,
5145 				    de_name, abspath);
5146 				if (err)
5147 					goto done;
5148 			}
5149 		}
5150 		if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
5151 			err = got_error_from_errno2("fstatat", abspath);
5152 			goto done;
5153 		}
5154 		f2 = fdopen(fd, "r");
5155 		if (f2 == NULL) {
5156 			err = got_error_from_errno2("fdopen", abspath);
5157 			goto done;
5158 		}
5159 		fd = -1;
5160 		f2_exists = 1;
5161 	}
5162 
5163 	if (blob1) {
5164 		err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5165 		    a->f1, blob1);
5166 		if (err)
5167 			goto done;
5168 	}
5169 
5170 	err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
5171 	    f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
5172 	    a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
5173 done:
5174 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5175 		err = got_error_from_errno("close");
5176 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5177 		err = got_error_from_errno("close");
5178 	if (blob1)
5179 		got_object_blob_close(blob1);
5180 	if (fd != -1 && close(fd) == -1 && err == NULL)
5181 		err = got_error_from_errno("close");
5182 	if (f2 && fclose(f2) == EOF && err == NULL)
5183 		err = got_error_from_errno("fclose");
5184 	free(abspath);
5185 	return err;
5186 }
5187 
5188 static const struct got_error *
5189 cmd_diff(int argc, char *argv[])
5190 {
5191 	const struct got_error *error;
5192 	struct got_repository *repo = NULL;
5193 	struct got_worktree *worktree = NULL;
5194 	char *cwd = NULL, *repo_path = NULL;
5195 	const char *commit_args[2] = { NULL, NULL };
5196 	int ncommit_args = 0;
5197 	struct got_object_id *ids[2] = { NULL, NULL };
5198 	char *labels[2] = { NULL, NULL };
5199 	int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5200 	int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5201 	int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5202 	const char *errstr;
5203 	struct got_reflist_head refs;
5204 	struct got_pathlist_head diffstat_paths, paths;
5205 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5206 	int fd1 = -1, fd2 = -1;
5207 	int *pack_fds = NULL;
5208 	struct got_diffstat_cb_arg dsa;
5209 
5210 	memset(&dsa, 0, sizeof(dsa));
5211 
5212 	TAILQ_INIT(&refs);
5213 	TAILQ_INIT(&paths);
5214 	TAILQ_INIT(&diffstat_paths);
5215 
5216 #ifndef PROFILE
5217 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5218 	    NULL) == -1)
5219 		err(1, "pledge");
5220 #endif
5221 
5222 	while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5223 		switch (ch) {
5224 		case 'a':
5225 			force_text_diff = 1;
5226 			break;
5227 		case 'C':
5228 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5229 			    &errstr);
5230 			if (errstr != NULL)
5231 				errx(1, "number of context lines is %s: %s",
5232 				    errstr, optarg);
5233 			break;
5234 		case 'c':
5235 			if (ncommit_args >= 2)
5236 				errx(1, "too many -c options used");
5237 			commit_args[ncommit_args++] = optarg;
5238 			break;
5239 		case 'd':
5240 			show_diffstat = 1;
5241 			break;
5242 		case 'P':
5243 			force_path = 1;
5244 			break;
5245 		case 'r':
5246 			repo_path = realpath(optarg, NULL);
5247 			if (repo_path == NULL)
5248 				return got_error_from_errno2("realpath",
5249 				    optarg);
5250 			got_path_strip_trailing_slashes(repo_path);
5251 			rflag = 1;
5252 			break;
5253 		case 's':
5254 			diff_staged = 1;
5255 			break;
5256 		case 'w':
5257 			ignore_whitespace = 1;
5258 			break;
5259 		default:
5260 			usage_diff();
5261 			/* NOTREACHED */
5262 		}
5263 	}
5264 
5265 	argc -= optind;
5266 	argv += optind;
5267 
5268 	cwd = getcwd(NULL, 0);
5269 	if (cwd == NULL) {
5270 		error = got_error_from_errno("getcwd");
5271 		goto done;
5272 	}
5273 
5274 	error = got_repo_pack_fds_open(&pack_fds);
5275 	if (error != NULL)
5276 		goto done;
5277 
5278 	if (repo_path == NULL) {
5279 		error = got_worktree_open(&worktree, cwd,
5280 		    GOT_WORKTREE_GOT_DIR);
5281 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5282 			goto done;
5283 		else
5284 			error = NULL;
5285 		if (worktree) {
5286 			repo_path =
5287 			    strdup(got_worktree_get_repo_path(worktree));
5288 			if (repo_path == NULL) {
5289 				error = got_error_from_errno("strdup");
5290 				goto done;
5291 			}
5292 		} else {
5293 			repo_path = strdup(cwd);
5294 			if (repo_path == NULL) {
5295 				error = got_error_from_errno("strdup");
5296 				goto done;
5297 			}
5298 		}
5299 	}
5300 
5301 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5302 	free(repo_path);
5303 	if (error != NULL)
5304 		goto done;
5305 
5306 	if (show_diffstat) {
5307 		dsa.paths = &diffstat_paths;
5308 		dsa.force_text = force_text_diff;
5309 		dsa.ignore_ws = ignore_whitespace;
5310 		dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5311 	}
5312 
5313 	if (rflag || worktree == NULL || ncommit_args > 0) {
5314 		if (force_path) {
5315 			error = got_error_msg(GOT_ERR_NOT_IMPL,
5316 			    "-P option can only be used when diffing "
5317 			    "a work tree");
5318 			goto done;
5319 		}
5320 		if (diff_staged) {
5321 			error = got_error_msg(GOT_ERR_NOT_IMPL,
5322 			    "-s option can only be used when diffing "
5323 			    "a work tree");
5324 			goto done;
5325 		}
5326 	}
5327 
5328 	error = apply_unveil(got_repo_get_path(repo), 1,
5329 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
5330 	if (error)
5331 		goto done;
5332 
5333 	if ((!force_path && argc == 2) || ncommit_args > 0) {
5334 		int obj_type = (ncommit_args > 0 ?
5335 		    GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5336 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5337 		    NULL);
5338 		if (error)
5339 			goto done;
5340 		for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5341 			const char	*arg;
5342 			char		*keyword_idstr = NULL;
5343 
5344 			if (ncommit_args > 0)
5345 				arg = commit_args[i];
5346 			else
5347 				arg = argv[i];
5348 
5349 			error = got_keyword_to_idstr(&keyword_idstr, arg,
5350 			    repo, worktree);
5351 			if (error != NULL)
5352 				goto done;
5353 			if (keyword_idstr != NULL)
5354 				arg = keyword_idstr;
5355 
5356 			error = got_repo_match_object_id(&ids[i], &labels[i],
5357 			    arg, obj_type, &refs, repo);
5358 			free(keyword_idstr);
5359 			if (error) {
5360 				if (error->code != GOT_ERR_NOT_REF &&
5361 				    error->code != GOT_ERR_NO_OBJ)
5362 					goto done;
5363 				if (ncommit_args > 0)
5364 					goto done;
5365 				error = NULL;
5366 				break;
5367 			}
5368 		}
5369 	}
5370 
5371 	f1 = got_opentemp();
5372 	if (f1 == NULL) {
5373 		error = got_error_from_errno("got_opentemp");
5374 		goto done;
5375 	}
5376 
5377 	f2 = got_opentemp();
5378 	if (f2 == NULL) {
5379 		error = got_error_from_errno("got_opentemp");
5380 		goto done;
5381 	}
5382 
5383 	outfile = got_opentemp();
5384 	if (outfile == NULL) {
5385 		error = got_error_from_errno("got_opentemp");
5386 		goto done;
5387 	}
5388 
5389 	if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5390 		struct print_diff_arg arg;
5391 		char *id_str;
5392 
5393 		if (worktree == NULL) {
5394 			if (argc == 2 && ids[0] == NULL) {
5395 				error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5396 				goto done;
5397 			} else if (argc == 2 && ids[1] == NULL) {
5398 				error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5399 				goto done;
5400 			} else if (argc > 0) {
5401 				error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5402 				    "%s", "specified paths cannot be resolved");
5403 				goto done;
5404 			} else {
5405 				error = got_error(GOT_ERR_NOT_WORKTREE);
5406 				goto done;
5407 			}
5408 		}
5409 
5410 		error = get_worktree_paths_from_argv(&paths, argc, argv,
5411 		    worktree);
5412 		if (error)
5413 			goto done;
5414 
5415 		error = got_object_id_str(&id_str,
5416 		    got_worktree_get_base_commit_id(worktree));
5417 		if (error)
5418 			goto done;
5419 		arg.repo = repo;
5420 		arg.worktree = worktree;
5421 		arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5422 		arg.diff_context = diff_context;
5423 		arg.id_str = id_str;
5424 		arg.header_shown = 0;
5425 		arg.diff_staged = diff_staged;
5426 		arg.ignore_whitespace = ignore_whitespace;
5427 		arg.force_text_diff = force_text_diff;
5428 		arg.diffstat = show_diffstat ? &dsa : NULL;
5429 		arg.f1 = f1;
5430 		arg.f2 = f2;
5431 		arg.outfile = outfile;
5432 
5433 		error = got_worktree_status(worktree, &paths, repo, 0,
5434 		    print_diff, &arg, check_cancelled, NULL);
5435 		free(id_str);
5436 		if (error)
5437 			goto done;
5438 
5439 		if (show_diffstat && dsa.nfiles > 0) {
5440 			char *header;
5441 
5442 			if (asprintf(&header, "diffstat %s%s",
5443 			    diff_staged ? "-s " : "",
5444 			    got_worktree_get_root_path(worktree)) == -1) {
5445 				error = got_error_from_errno("asprintf");
5446 				goto done;
5447 			}
5448 
5449 			error = print_diffstat(&dsa, header);
5450 			free(header);
5451 			if (error)
5452 				goto done;
5453 		}
5454 
5455 		error = printfile(outfile);
5456 		goto done;
5457 	}
5458 
5459 	if (ncommit_args == 1) {
5460 		struct got_commit_object *commit;
5461 		error = got_object_open_as_commit(&commit, repo, ids[0]);
5462 		if (error)
5463 			goto done;
5464 
5465 		labels[1] = labels[0];
5466 		ids[1] = ids[0];
5467 		if (got_object_commit_get_nparents(commit) > 0) {
5468 			const struct got_object_id_queue *pids;
5469 			struct got_object_qid *pid;
5470 			pids = got_object_commit_get_parent_ids(commit);
5471 			pid = STAILQ_FIRST(pids);
5472 			ids[0] = got_object_id_dup(&pid->id);
5473 			if (ids[0] == NULL) {
5474 				error = got_error_from_errno(
5475 				    "got_object_id_dup");
5476 				got_object_commit_close(commit);
5477 				goto done;
5478 			}
5479 			error = got_object_id_str(&labels[0], ids[0]);
5480 			if (error) {
5481 				got_object_commit_close(commit);
5482 				goto done;
5483 			}
5484 		} else {
5485 			ids[0] = NULL;
5486 			labels[0] = strdup("/dev/null");
5487 			if (labels[0] == NULL) {
5488 				error = got_error_from_errno("strdup");
5489 				got_object_commit_close(commit);
5490 				goto done;
5491 			}
5492 		}
5493 
5494 		got_object_commit_close(commit);
5495 	}
5496 
5497 	if (ncommit_args == 0 && argc > 2) {
5498 		error = got_error_msg(GOT_ERR_BAD_PATH,
5499 		    "path arguments cannot be used when diffing two objects");
5500 		goto done;
5501 	}
5502 
5503 	if (ids[0]) {
5504 		error = got_object_get_type(&type1, repo, ids[0]);
5505 		if (error)
5506 			goto done;
5507 	}
5508 
5509 	error = got_object_get_type(&type2, repo, ids[1]);
5510 	if (error)
5511 		goto done;
5512 	if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5513 		error = got_error(GOT_ERR_OBJ_TYPE);
5514 		goto done;
5515 	}
5516 	if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5517 		error = got_error_msg(GOT_ERR_OBJ_TYPE,
5518 		    "path arguments cannot be used when diffing blobs");
5519 		goto done;
5520 	}
5521 
5522 	for (i = 0; ncommit_args > 0 && i < argc; i++) {
5523 		char *in_repo_path;
5524 		struct got_pathlist_entry *new;
5525 		if (worktree) {
5526 			const char *prefix;
5527 			char *p;
5528 			error = got_worktree_resolve_path(&p, worktree,
5529 			    argv[i]);
5530 			if (error)
5531 				goto done;
5532 			prefix = got_worktree_get_path_prefix(worktree);
5533 			while (prefix[0] == '/')
5534 				prefix++;
5535 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
5536 			    (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5537 			    p) == -1) {
5538 				error = got_error_from_errno("asprintf");
5539 				free(p);
5540 				goto done;
5541 			}
5542 			free(p);
5543 		} else {
5544 			char *mapped_path, *s;
5545 			error = got_repo_map_path(&mapped_path, repo, argv[i]);
5546 			if (error)
5547 				goto done;
5548 			s = mapped_path;
5549 			while (s[0] == '/')
5550 				s++;
5551 			in_repo_path = strdup(s);
5552 			if (in_repo_path == NULL) {
5553 				error = got_error_from_errno("asprintf");
5554 				free(mapped_path);
5555 				goto done;
5556 			}
5557 			free(mapped_path);
5558 
5559 		}
5560 		error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5561 		if (error || new == NULL /* duplicate */)
5562 			free(in_repo_path);
5563 		if (error)
5564 			goto done;
5565 	}
5566 
5567 	if (worktree) {
5568 		/* Release work tree lock. */
5569 		got_worktree_close(worktree);
5570 		worktree = NULL;
5571 	}
5572 
5573 	fd1 = got_opentempfd();
5574 	if (fd1 == -1) {
5575 		error = got_error_from_errno("got_opentempfd");
5576 		goto done;
5577 	}
5578 
5579 	fd2 = got_opentempfd();
5580 	if (fd2 == -1) {
5581 		error = got_error_from_errno("got_opentempfd");
5582 		goto done;
5583 	}
5584 
5585 	switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5586 	case GOT_OBJ_TYPE_BLOB:
5587 		error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5588 		    fd1, fd2, ids[0], ids[1], NULL, NULL,
5589 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5590 		    ignore_whitespace, force_text_diff,
5591 		    show_diffstat ? &dsa : NULL, repo, outfile);
5592 		break;
5593 	case GOT_OBJ_TYPE_TREE:
5594 		error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5595 		    ids[0], ids[1], &paths, "", "",
5596 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5597 		    ignore_whitespace, force_text_diff,
5598 		    show_diffstat ? &dsa : NULL, repo, outfile);
5599 		break;
5600 	case GOT_OBJ_TYPE_COMMIT:
5601 		fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5602 		error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5603 		    fd1, fd2, ids[0], ids[1], &paths,
5604 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5605 		    ignore_whitespace, force_text_diff,
5606 		    show_diffstat ? &dsa : NULL, repo, outfile);
5607 		break;
5608 	default:
5609 		error = got_error(GOT_ERR_OBJ_TYPE);
5610 	}
5611 	if (error)
5612 		goto done;
5613 
5614 	if (show_diffstat && dsa.nfiles > 0) {
5615 		char *header = NULL;
5616 
5617 		if (asprintf(&header, "diffstat %s %s",
5618 		    labels[0], labels[1]) == -1) {
5619 			error = got_error_from_errno("asprintf");
5620 			goto done;
5621 		}
5622 
5623 		error = print_diffstat(&dsa, header);
5624 		free(header);
5625 		if (error)
5626 			goto done;
5627 	}
5628 
5629 	error = printfile(outfile);
5630 
5631 done:
5632 	free(labels[0]);
5633 	free(labels[1]);
5634 	free(ids[0]);
5635 	free(ids[1]);
5636 	if (worktree)
5637 		got_worktree_close(worktree);
5638 	if (repo) {
5639 		const struct got_error *close_err = got_repo_close(repo);
5640 		if (error == NULL)
5641 			error = close_err;
5642 	}
5643 	if (pack_fds) {
5644 		const struct got_error *pack_err =
5645 		    got_repo_pack_fds_close(pack_fds);
5646 		if (error == NULL)
5647 			error = pack_err;
5648 	}
5649 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5650 	got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5651 	got_ref_list_free(&refs);
5652 	if (outfile && fclose(outfile) == EOF && error == NULL)
5653 		error = got_error_from_errno("fclose");
5654 	if (f1 && fclose(f1) == EOF && error == NULL)
5655 		error = got_error_from_errno("fclose");
5656 	if (f2 && fclose(f2) == EOF && error == NULL)
5657 		error = got_error_from_errno("fclose");
5658 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5659 		error = got_error_from_errno("close");
5660 	if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5661 		error = got_error_from_errno("close");
5662 	return error;
5663 }
5664 
5665 __dead static void
5666 usage_blame(void)
5667 {
5668 	fprintf(stderr,
5669 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
5670 	    getprogname());
5671 	exit(1);
5672 }
5673 
5674 struct blame_line {
5675 	int annotated;
5676 	char *id_str;
5677 	char *committer;
5678 	char datebuf[11]; /* YYYY-MM-DD + NUL */
5679 };
5680 
5681 struct blame_cb_args {
5682 	struct blame_line *lines;
5683 	int nlines;
5684 	int nlines_prec;
5685 	int lineno_cur;
5686 	off_t *line_offsets;
5687 	FILE *f;
5688 	struct got_repository *repo;
5689 };
5690 
5691 static const struct got_error *
5692 blame_cb(void *arg, int nlines, int lineno,
5693     struct got_commit_object *commit, struct got_object_id *id)
5694 {
5695 	const struct got_error *err = NULL;
5696 	struct blame_cb_args *a = arg;
5697 	struct blame_line *bline;
5698 	char *line = NULL;
5699 	size_t linesize = 0;
5700 	off_t offset;
5701 	struct tm tm;
5702 	time_t committer_time;
5703 
5704 	if (nlines != a->nlines ||
5705 	    (lineno != -1 && lineno < 1) || lineno > a->nlines)
5706 		return got_error(GOT_ERR_RANGE);
5707 
5708 	if (sigint_received)
5709 		return got_error(GOT_ERR_ITER_COMPLETED);
5710 
5711 	if (lineno == -1)
5712 		return NULL; /* no change in this commit */
5713 
5714 	/* Annotate this line. */
5715 	bline = &a->lines[lineno - 1];
5716 	if (bline->annotated)
5717 		return NULL;
5718 	err = got_object_id_str(&bline->id_str, id);
5719 	if (err)
5720 		return err;
5721 
5722 	bline->committer = strdup(got_object_commit_get_committer(commit));
5723 	if (bline->committer == NULL) {
5724 		err = got_error_from_errno("strdup");
5725 		goto done;
5726 	}
5727 
5728 	committer_time = got_object_commit_get_committer_time(commit);
5729 	if (gmtime_r(&committer_time, &tm) == NULL)
5730 		return got_error_from_errno("gmtime_r");
5731 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5732 	    &tm) == 0) {
5733 		err = got_error(GOT_ERR_NO_SPACE);
5734 		goto done;
5735 	}
5736 	bline->annotated = 1;
5737 
5738 	/* Print lines annotated so far. */
5739 	bline = &a->lines[a->lineno_cur - 1];
5740 	if (!bline->annotated)
5741 		goto done;
5742 
5743 	offset = a->line_offsets[a->lineno_cur - 1];
5744 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
5745 		err = got_error_from_errno("fseeko");
5746 		goto done;
5747 	}
5748 
5749 	while (a->lineno_cur <= a->nlines && bline->annotated) {
5750 		char *smallerthan, *at, *nl, *committer;
5751 		size_t len;
5752 
5753 		if (getline(&line, &linesize, a->f) == -1) {
5754 			if (ferror(a->f))
5755 				err = got_error_from_errno("getline");
5756 			break;
5757 		}
5758 
5759 		committer = bline->committer;
5760 		smallerthan = strchr(committer, '<');
5761 		if (smallerthan && smallerthan[1] != '\0')
5762 			committer = smallerthan + 1;
5763 		at = strchr(committer, '@');
5764 		if (at)
5765 			*at = '\0';
5766 		len = strlen(committer);
5767 		if (len >= 9)
5768 			committer[8] = '\0';
5769 
5770 		nl = strchr(line, '\n');
5771 		if (nl)
5772 			*nl = '\0';
5773 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5774 		    bline->id_str, bline->datebuf, committer, line);
5775 
5776 		a->lineno_cur++;
5777 		bline = &a->lines[a->lineno_cur - 1];
5778 	}
5779 done:
5780 	free(line);
5781 	return err;
5782 }
5783 
5784 static const struct got_error *
5785 cmd_blame(int argc, char *argv[])
5786 {
5787 	const struct got_error *error;
5788 	struct got_repository *repo = NULL;
5789 	struct got_worktree *worktree = NULL;
5790 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5791 	char *link_target = NULL;
5792 	struct got_object_id *obj_id = NULL;
5793 	struct got_object_id *commit_id = NULL;
5794 	struct got_commit_object *commit = NULL;
5795 	struct got_blob_object *blob = NULL;
5796 	char *commit_id_str = NULL, *keyword_idstr = NULL;
5797 	struct blame_cb_args bca;
5798 	int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5799 	off_t filesize;
5800 	int *pack_fds = NULL;
5801 	FILE *f1 = NULL, *f2 = NULL;
5802 
5803 	fd1 = got_opentempfd();
5804 	if (fd1 == -1)
5805 		return got_error_from_errno("got_opentempfd");
5806 
5807 	memset(&bca, 0, sizeof(bca));
5808 
5809 #ifndef PROFILE
5810 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5811 	    NULL) == -1)
5812 		err(1, "pledge");
5813 #endif
5814 
5815 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5816 		switch (ch) {
5817 		case 'c':
5818 			commit_id_str = optarg;
5819 			break;
5820 		case 'r':
5821 			repo_path = realpath(optarg, NULL);
5822 			if (repo_path == NULL)
5823 				return got_error_from_errno2("realpath",
5824 				    optarg);
5825 			got_path_strip_trailing_slashes(repo_path);
5826 			break;
5827 		default:
5828 			usage_blame();
5829 			/* NOTREACHED */
5830 		}
5831 	}
5832 
5833 	argc -= optind;
5834 	argv += optind;
5835 
5836 	if (argc == 1)
5837 		path = argv[0];
5838 	else
5839 		usage_blame();
5840 
5841 	cwd = getcwd(NULL, 0);
5842 	if (cwd == NULL) {
5843 		error = got_error_from_errno("getcwd");
5844 		goto done;
5845 	}
5846 
5847 	error = got_repo_pack_fds_open(&pack_fds);
5848 	if (error != NULL)
5849 		goto done;
5850 
5851 	if (repo_path == NULL) {
5852 		error = got_worktree_open(&worktree, cwd,
5853 		    GOT_WORKTREE_GOT_DIR);
5854 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5855 			goto done;
5856 		else
5857 			error = NULL;
5858 		if (worktree) {
5859 			repo_path =
5860 			    strdup(got_worktree_get_repo_path(worktree));
5861 			if (repo_path == NULL) {
5862 				error = got_error_from_errno("strdup");
5863 				if (error)
5864 					goto done;
5865 			}
5866 		} else {
5867 			repo_path = strdup(cwd);
5868 			if (repo_path == NULL) {
5869 				error = got_error_from_errno("strdup");
5870 				goto done;
5871 			}
5872 		}
5873 	}
5874 
5875 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5876 	if (error != NULL)
5877 		goto done;
5878 
5879 	if (worktree) {
5880 		const char *prefix = got_worktree_get_path_prefix(worktree);
5881 		char *p;
5882 
5883 		error = got_worktree_resolve_path(&p, worktree, path);
5884 		if (error)
5885 			goto done;
5886 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5887 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5888 		    p) == -1) {
5889 			error = got_error_from_errno("asprintf");
5890 			free(p);
5891 			goto done;
5892 		}
5893 		free(p);
5894 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5895 	} else {
5896 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5897 		if (error)
5898 			goto done;
5899 		error = got_repo_map_path(&in_repo_path, repo, path);
5900 	}
5901 	if (error)
5902 		goto done;
5903 
5904 	if (commit_id_str == NULL) {
5905 		struct got_reference *head_ref;
5906 		error = got_ref_open(&head_ref, repo, worktree ?
5907 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5908 		if (error != NULL)
5909 			goto done;
5910 		error = got_ref_resolve(&commit_id, repo, head_ref);
5911 		got_ref_close(head_ref);
5912 		if (error != NULL)
5913 			goto done;
5914 	} else {
5915 		struct got_reflist_head refs;
5916 
5917 		TAILQ_INIT(&refs);
5918 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5919 		    NULL);
5920 		if (error)
5921 			goto done;
5922 
5923 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
5924 		    repo, worktree);
5925 		if (error != NULL)
5926 			goto done;
5927 		if (keyword_idstr != NULL)
5928 			commit_id_str = keyword_idstr;
5929 
5930 		error = got_repo_match_object_id(&commit_id, NULL,
5931 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5932 		got_ref_list_free(&refs);
5933 		if (error)
5934 			goto done;
5935 	}
5936 
5937 	if (worktree) {
5938 		/* Release work tree lock. */
5939 		got_worktree_close(worktree);
5940 		worktree = NULL;
5941 	}
5942 
5943 	error = got_object_open_as_commit(&commit, repo, commit_id);
5944 	if (error)
5945 		goto done;
5946 
5947 	error = got_object_resolve_symlinks(&link_target, in_repo_path,
5948 	    commit, repo);
5949 	if (error)
5950 		goto done;
5951 
5952 	error = got_object_id_by_path(&obj_id, repo, commit,
5953 	    link_target ? link_target : in_repo_path);
5954 	if (error)
5955 		goto done;
5956 
5957 	error = got_object_get_type(&obj_type, repo, obj_id);
5958 	if (error)
5959 		goto done;
5960 
5961 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
5962 		error = got_error_path(link_target ? link_target : in_repo_path,
5963 		    GOT_ERR_OBJ_TYPE);
5964 		goto done;
5965 	}
5966 
5967 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5968 	if (error)
5969 		goto done;
5970 	bca.f = got_opentemp();
5971 	if (bca.f == NULL) {
5972 		error = got_error_from_errno("got_opentemp");
5973 		goto done;
5974 	}
5975 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5976 	    &bca.line_offsets, bca.f, blob);
5977 	if (error || bca.nlines == 0)
5978 		goto done;
5979 
5980 	/* Don't include \n at EOF in the blame line count. */
5981 	if (bca.line_offsets[bca.nlines - 1] == filesize)
5982 		bca.nlines--;
5983 
5984 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5985 	if (bca.lines == NULL) {
5986 		error = got_error_from_errno("calloc");
5987 		goto done;
5988 	}
5989 	bca.lineno_cur = 1;
5990 	bca.nlines_prec = 0;
5991 	i = bca.nlines;
5992 	while (i > 0) {
5993 		i /= 10;
5994 		bca.nlines_prec++;
5995 	}
5996 	bca.repo = repo;
5997 
5998 	fd2 = got_opentempfd();
5999 	if (fd2 == -1) {
6000 		error = got_error_from_errno("got_opentempfd");
6001 		goto done;
6002 	}
6003 	fd3 = got_opentempfd();
6004 	if (fd3 == -1) {
6005 		error = got_error_from_errno("got_opentempfd");
6006 		goto done;
6007 	}
6008 	f1 = got_opentemp();
6009 	if (f1 == NULL) {
6010 		error = got_error_from_errno("got_opentemp");
6011 		goto done;
6012 	}
6013 	f2 = got_opentemp();
6014 	if (f2 == NULL) {
6015 		error = got_error_from_errno("got_opentemp");
6016 		goto done;
6017 	}
6018 	error = got_blame(link_target ? link_target : in_repo_path, commit_id,
6019 	    repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
6020 	    check_cancelled, NULL, fd2, fd3, f1, f2);
6021 done:
6022 	free(keyword_idstr);
6023 	free(in_repo_path);
6024 	free(link_target);
6025 	free(repo_path);
6026 	free(cwd);
6027 	free(commit_id);
6028 	free(obj_id);
6029 	if (commit)
6030 		got_object_commit_close(commit);
6031 
6032 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
6033 		error = got_error_from_errno("close");
6034 	if (fd2 != -1 && close(fd2) == -1 && error == NULL)
6035 		error = got_error_from_errno("close");
6036 	if (fd3 != -1 && close(fd3) == -1 && error == NULL)
6037 		error = got_error_from_errno("close");
6038 	if (f1 && fclose(f1) == EOF && error == NULL)
6039 		error = got_error_from_errno("fclose");
6040 	if (f2 && fclose(f2) == EOF && error == NULL)
6041 		error = got_error_from_errno("fclose");
6042 
6043 	if (blob)
6044 		got_object_blob_close(blob);
6045 	if (worktree)
6046 		got_worktree_close(worktree);
6047 	if (repo) {
6048 		const struct got_error *close_err = got_repo_close(repo);
6049 		if (error == NULL)
6050 			error = close_err;
6051 	}
6052 	if (pack_fds) {
6053 		const struct got_error *pack_err =
6054 		    got_repo_pack_fds_close(pack_fds);
6055 		if (error == NULL)
6056 			error = pack_err;
6057 	}
6058 	if (bca.lines) {
6059 		for (i = 0; i < bca.nlines; i++) {
6060 			struct blame_line *bline = &bca.lines[i];
6061 			free(bline->id_str);
6062 			free(bline->committer);
6063 		}
6064 		free(bca.lines);
6065 	}
6066 	free(bca.line_offsets);
6067 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
6068 		error = got_error_from_errno("fclose");
6069 	return error;
6070 }
6071 
6072 __dead static void
6073 usage_tree(void)
6074 {
6075 	fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
6076 	    "[path]\n", getprogname());
6077 	exit(1);
6078 }
6079 
6080 static const struct got_error *
6081 print_entry(struct got_tree_entry *te, const char *id, const char *path,
6082     const char *root_path, struct got_repository *repo)
6083 {
6084 	const struct got_error *err = NULL;
6085 	int is_root_path = (strcmp(path, root_path) == 0);
6086 	const char *modestr = "";
6087 	mode_t mode = got_tree_entry_get_mode(te);
6088 	char *link_target = NULL;
6089 
6090 	path += strlen(root_path);
6091 	while (path[0] == '/')
6092 		path++;
6093 
6094 	if (got_object_tree_entry_is_submodule(te))
6095 		modestr = "$";
6096 	else if (S_ISLNK(mode)) {
6097 		int i;
6098 
6099 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
6100 		if (err)
6101 			return err;
6102 		for (i = 0; link_target[i] != '\0'; i++) {
6103 			if (!isprint((unsigned char)link_target[i]))
6104 				link_target[i] = '?';
6105 		}
6106 
6107 		modestr = "@";
6108 	}
6109 	else if (S_ISDIR(mode))
6110 		modestr = "/";
6111 	else if (mode & S_IXUSR)
6112 		modestr = "*";
6113 
6114 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
6115 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
6116 	    link_target ? " -> ": "", link_target ? link_target : "");
6117 
6118 	free(link_target);
6119 	return NULL;
6120 }
6121 
6122 static const struct got_error *
6123 print_tree(const char *path, struct got_commit_object *commit,
6124     int show_ids, int recurse, const char *root_path,
6125     struct got_repository *repo)
6126 {
6127 	const struct got_error *err = NULL;
6128 	struct got_object_id *tree_id = NULL;
6129 	struct got_tree_object *tree = NULL;
6130 	int nentries, i;
6131 
6132 	err = got_object_id_by_path(&tree_id, repo, commit, path);
6133 	if (err)
6134 		goto done;
6135 
6136 	err = got_object_open_as_tree(&tree, repo, tree_id);
6137 	if (err)
6138 		goto done;
6139 	nentries = got_object_tree_get_nentries(tree);
6140 	for (i = 0; i < nentries; i++) {
6141 		struct got_tree_entry *te;
6142 		char *id = NULL;
6143 
6144 		if (sigint_received || sigpipe_received)
6145 			break;
6146 
6147 		te = got_object_tree_get_entry(tree, i);
6148 		if (show_ids) {
6149 			char *id_str;
6150 			err = got_object_id_str(&id_str,
6151 			    got_tree_entry_get_id(te));
6152 			if (err)
6153 				goto done;
6154 			if (asprintf(&id, "%s ", id_str) == -1) {
6155 				err = got_error_from_errno("asprintf");
6156 				free(id_str);
6157 				goto done;
6158 			}
6159 			free(id_str);
6160 		}
6161 		err = print_entry(te, id, path, root_path, repo);
6162 		free(id);
6163 		if (err)
6164 			goto done;
6165 
6166 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
6167 			char *child_path;
6168 			if (asprintf(&child_path, "%s%s%s", path,
6169 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
6170 			    got_tree_entry_get_name(te)) == -1) {
6171 				err = got_error_from_errno("asprintf");
6172 				goto done;
6173 			}
6174 			err = print_tree(child_path, commit, show_ids, 1,
6175 			    root_path, repo);
6176 			free(child_path);
6177 			if (err)
6178 				goto done;
6179 		}
6180 	}
6181 done:
6182 	if (tree)
6183 		got_object_tree_close(tree);
6184 	free(tree_id);
6185 	return err;
6186 }
6187 
6188 static const struct got_error *
6189 cmd_tree(int argc, char *argv[])
6190 {
6191 	const struct got_error *error;
6192 	struct got_repository *repo = NULL;
6193 	struct got_worktree *worktree = NULL;
6194 	const char *path, *refname = NULL;
6195 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6196 	struct got_object_id *commit_id = NULL;
6197 	struct got_commit_object *commit = NULL;
6198 	char *commit_id_str = NULL, *keyword_idstr = NULL;
6199 	int show_ids = 0, recurse = 0;
6200 	int ch;
6201 	int *pack_fds = NULL;
6202 
6203 #ifndef PROFILE
6204 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6205 	    NULL) == -1)
6206 		err(1, "pledge");
6207 #endif
6208 
6209 	while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6210 		switch (ch) {
6211 		case 'c':
6212 			commit_id_str = optarg;
6213 			break;
6214 		case 'i':
6215 			show_ids = 1;
6216 			break;
6217 		case 'R':
6218 			recurse = 1;
6219 			break;
6220 		case 'r':
6221 			repo_path = realpath(optarg, NULL);
6222 			if (repo_path == NULL)
6223 				return got_error_from_errno2("realpath",
6224 				    optarg);
6225 			got_path_strip_trailing_slashes(repo_path);
6226 			break;
6227 		default:
6228 			usage_tree();
6229 			/* NOTREACHED */
6230 		}
6231 	}
6232 
6233 	argc -= optind;
6234 	argv += optind;
6235 
6236 	if (argc == 1)
6237 		path = argv[0];
6238 	else if (argc > 1)
6239 		usage_tree();
6240 	else
6241 		path = NULL;
6242 
6243 	cwd = getcwd(NULL, 0);
6244 	if (cwd == NULL) {
6245 		error = got_error_from_errno("getcwd");
6246 		goto done;
6247 	}
6248 
6249 	error = got_repo_pack_fds_open(&pack_fds);
6250 	if (error != NULL)
6251 		goto done;
6252 
6253 	if (repo_path == NULL) {
6254 		error = got_worktree_open(&worktree, cwd,
6255 		    GOT_WORKTREE_GOT_DIR);
6256 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6257 			goto done;
6258 		else
6259 			error = NULL;
6260 		if (worktree) {
6261 			repo_path =
6262 			    strdup(got_worktree_get_repo_path(worktree));
6263 			if (repo_path == NULL)
6264 				error = got_error_from_errno("strdup");
6265 			if (error)
6266 				goto done;
6267 		} else {
6268 			repo_path = strdup(cwd);
6269 			if (repo_path == NULL) {
6270 				error = got_error_from_errno("strdup");
6271 				goto done;
6272 			}
6273 		}
6274 	}
6275 
6276 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6277 	if (error != NULL)
6278 		goto done;
6279 
6280 	if (worktree) {
6281 		const char *prefix = got_worktree_get_path_prefix(worktree);
6282 		char *p;
6283 
6284 		if (path == NULL || got_path_is_root_dir(path))
6285 			path = "";
6286 		error = got_worktree_resolve_path(&p, worktree, path);
6287 		if (error)
6288 			goto done;
6289 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
6290 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ?  "/" : "",
6291 		    p) == -1) {
6292 			error = got_error_from_errno("asprintf");
6293 			free(p);
6294 			goto done;
6295 		}
6296 		free(p);
6297 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6298 		if (error)
6299 			goto done;
6300 	} else {
6301 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6302 		if (error)
6303 			goto done;
6304 		if (path == NULL)
6305 			path = "/";
6306 		error = got_repo_map_path(&in_repo_path, repo, path);
6307 		if (error != NULL)
6308 			goto done;
6309 	}
6310 
6311 	if (commit_id_str == NULL) {
6312 		struct got_reference *head_ref;
6313 		if (worktree)
6314 			refname = got_worktree_get_head_ref_name(worktree);
6315 		else
6316 			refname = GOT_REF_HEAD;
6317 		error = got_ref_open(&head_ref, repo, refname, 0);
6318 		if (error != NULL)
6319 			goto done;
6320 		error = got_ref_resolve(&commit_id, repo, head_ref);
6321 		got_ref_close(head_ref);
6322 		if (error != NULL)
6323 			goto done;
6324 	} else {
6325 		struct got_reflist_head refs;
6326 
6327 		TAILQ_INIT(&refs);
6328 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6329 		    NULL);
6330 		if (error)
6331 			goto done;
6332 
6333 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
6334 		    repo, worktree);
6335 		if (error != NULL)
6336 			goto done;
6337 		if (keyword_idstr != NULL)
6338 			commit_id_str = keyword_idstr;
6339 
6340 		error = got_repo_match_object_id(&commit_id, NULL,
6341 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6342 		got_ref_list_free(&refs);
6343 		if (error)
6344 			goto done;
6345 	}
6346 
6347 	if (worktree) {
6348 		/* Release work tree lock. */
6349 		got_worktree_close(worktree);
6350 		worktree = NULL;
6351 	}
6352 
6353 	error = got_object_open_as_commit(&commit, repo, commit_id);
6354 	if (error)
6355 		goto done;
6356 
6357 	error = print_tree(in_repo_path, commit, show_ids, recurse,
6358 	    in_repo_path, repo);
6359 done:
6360 	free(keyword_idstr);
6361 	free(in_repo_path);
6362 	free(repo_path);
6363 	free(cwd);
6364 	free(commit_id);
6365 	if (commit)
6366 		got_object_commit_close(commit);
6367 	if (worktree)
6368 		got_worktree_close(worktree);
6369 	if (repo) {
6370 		const struct got_error *close_err = got_repo_close(repo);
6371 		if (error == NULL)
6372 			error = close_err;
6373 	}
6374 	if (pack_fds) {
6375 		const struct got_error *pack_err =
6376 		    got_repo_pack_fds_close(pack_fds);
6377 		if (error == NULL)
6378 			error = pack_err;
6379 	}
6380 	return error;
6381 }
6382 
6383 __dead static void
6384 usage_status(void)
6385 {
6386 	fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6387 	    "[-s status-codes] [path ...]\n", getprogname());
6388 	exit(1);
6389 }
6390 
6391 struct got_status_arg {
6392 	char *status_codes;
6393 	int suppress;
6394 };
6395 
6396 static const struct got_error *
6397 print_status(void *arg, unsigned char status, unsigned char staged_status,
6398     const char *path, struct got_object_id *blob_id,
6399     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6400     int dirfd, const char *de_name)
6401 {
6402 	struct got_status_arg *st = arg;
6403 
6404 	if (status == staged_status && (status == GOT_STATUS_DELETE))
6405 		status = GOT_STATUS_NO_CHANGE;
6406 	if (st != NULL && st->status_codes) {
6407 		size_t ncodes = strlen(st->status_codes);
6408 		int i, j = 0;
6409 
6410 		for (i = 0; i < ncodes ; i++) {
6411 			if (st->suppress) {
6412 				if (status == st->status_codes[i] ||
6413 				    staged_status == st->status_codes[i]) {
6414 					j++;
6415 					continue;
6416 				}
6417 			} else {
6418 				if (status == st->status_codes[i] ||
6419 				    staged_status == st->status_codes[i])
6420 					break;
6421 			}
6422 		}
6423 
6424 		if (st->suppress && j == 0)
6425 			goto print;
6426 
6427 		if (i == ncodes)
6428 			return NULL;
6429 	}
6430 print:
6431 	printf("%c%c %s\n", status, staged_status, path);
6432 	return NULL;
6433 }
6434 
6435 static const struct got_error *
6436 show_operation_in_progress(struct got_worktree *worktree,
6437     struct got_repository *repo)
6438 {
6439 	const struct got_error *err;
6440 	char *new_base_branch_name = NULL;
6441 	char *branch_name = NULL;
6442 	int rebase_in_progress, histedit_in_progress, merge_in_progress;
6443 
6444 	err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6445 	if (err)
6446 		return err;
6447 	if (rebase_in_progress) {
6448 		err = got_worktree_rebase_info(&new_base_branch_name,
6449 		    &branch_name, worktree, repo);
6450 		if (err)
6451 			return err;
6452 		printf("Work tree is rebasing %s onto %s\n",
6453 		    branch_name, new_base_branch_name);
6454 	}
6455 
6456 	err = got_worktree_histedit_in_progress(&histedit_in_progress,
6457 	    worktree);
6458 	if (err)
6459 		return err;
6460 	if (histedit_in_progress) {
6461 		err = got_worktree_histedit_info(&branch_name, worktree, repo);
6462 		if (err)
6463 			return err;
6464 		printf("Work tree is editing the history of %s\n", branch_name);
6465 	}
6466 
6467 	err = got_worktree_merge_in_progress(&merge_in_progress,
6468 	    worktree, repo);
6469 	if (err)
6470 		return err;
6471 	if (merge_in_progress) {
6472 		err = got_worktree_merge_info(&branch_name, worktree,
6473 		    repo);
6474 		if (err)
6475 			return err;
6476 		printf("Work tree is merging %s into %s\n", branch_name,
6477 		    got_worktree_get_head_ref_name(worktree));
6478 	}
6479 
6480 	free(new_base_branch_name);
6481 	free(branch_name);
6482 	return NULL;
6483 }
6484 
6485 static const struct got_error *
6486 cmd_status(int argc, char *argv[])
6487 {
6488 	const struct got_error *close_err, *error = NULL;
6489 	struct got_repository *repo = NULL;
6490 	struct got_worktree *worktree = NULL;
6491 	struct got_status_arg st;
6492 	char *cwd = NULL;
6493 	struct got_pathlist_head paths;
6494 	int ch, i, no_ignores = 0;
6495 	int *pack_fds = NULL;
6496 
6497 	TAILQ_INIT(&paths);
6498 
6499 	memset(&st, 0, sizeof(st));
6500 	st.status_codes = NULL;
6501 	st.suppress = 0;
6502 
6503 #ifndef PROFILE
6504 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6505 	    NULL) == -1)
6506 		err(1, "pledge");
6507 #endif
6508 
6509 	while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6510 		switch (ch) {
6511 		case 'I':
6512 			no_ignores = 1;
6513 			break;
6514 		case 'S':
6515 			if (st.status_codes != NULL && st.suppress == 0)
6516 				option_conflict('S', 's');
6517 			st.suppress = 1;
6518 			/* fallthrough */
6519 		case 's':
6520 			for (i = 0; optarg[i] != '\0'; i++) {
6521 				switch (optarg[i]) {
6522 				case GOT_STATUS_MODIFY:
6523 				case GOT_STATUS_ADD:
6524 				case GOT_STATUS_DELETE:
6525 				case GOT_STATUS_CONFLICT:
6526 				case GOT_STATUS_MISSING:
6527 				case GOT_STATUS_OBSTRUCTED:
6528 				case GOT_STATUS_UNVERSIONED:
6529 				case GOT_STATUS_MODE_CHANGE:
6530 				case GOT_STATUS_NONEXISTENT:
6531 					break;
6532 				default:
6533 					errx(1, "invalid status code '%c'",
6534 					    optarg[i]);
6535 				}
6536 			}
6537 			if (ch == 's' && st.suppress)
6538 				option_conflict('s', 'S');
6539 			st.status_codes = optarg;
6540 			break;
6541 		default:
6542 			usage_status();
6543 			/* NOTREACHED */
6544 		}
6545 	}
6546 
6547 	argc -= optind;
6548 	argv += optind;
6549 
6550 	cwd = getcwd(NULL, 0);
6551 	if (cwd == NULL) {
6552 		error = got_error_from_errno("getcwd");
6553 		goto done;
6554 	}
6555 
6556 	error = got_repo_pack_fds_open(&pack_fds);
6557 	if (error != NULL)
6558 		goto done;
6559 
6560 	error = got_worktree_open(&worktree, cwd,
6561 	    GOT_WORKTREE_GOT_DIR);
6562 	if (error) {
6563 		if (error->code == GOT_ERR_NOT_WORKTREE)
6564 			error = wrap_not_worktree_error(error, "status", cwd);
6565 		goto done;
6566 	}
6567 
6568 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6569 	    NULL, pack_fds);
6570 	if (error != NULL)
6571 		goto done;
6572 
6573 	error = apply_unveil(got_repo_get_path(repo), 1,
6574 	    got_worktree_get_root_path(worktree));
6575 	if (error)
6576 		goto done;
6577 
6578 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6579 	if (error)
6580 		goto done;
6581 
6582 	error = got_worktree_status(worktree, &paths, repo, no_ignores,
6583 	    print_status, &st, check_cancelled, NULL);
6584 	if (error)
6585 		goto done;
6586 
6587 	error = show_operation_in_progress(worktree, repo);
6588 done:
6589 	if (pack_fds) {
6590 		const struct got_error *pack_err =
6591 		    got_repo_pack_fds_close(pack_fds);
6592 		if (error == NULL)
6593 			error = pack_err;
6594 	}
6595 	if (repo) {
6596 		close_err = got_repo_close(repo);
6597 		if (error == NULL)
6598 			error = close_err;
6599 	}
6600 	if (worktree != NULL) {
6601 		close_err = got_worktree_close(worktree);
6602 		if (error == NULL)
6603 			error = close_err;
6604 	}
6605 
6606 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6607 	free(cwd);
6608 	return error;
6609 }
6610 
6611 __dead static void
6612 usage_ref(void)
6613 {
6614 	fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6615 	    "[-s reference] [name]\n", getprogname());
6616 	exit(1);
6617 }
6618 
6619 static const struct got_error *
6620 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6621 {
6622 	static const struct got_error *err = NULL;
6623 	struct got_reflist_head refs;
6624 	struct got_reflist_entry *re;
6625 
6626 	TAILQ_INIT(&refs);
6627 	err = got_ref_list(&refs, repo, refname, sort_by_time ?
6628 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6629 	    repo);
6630 	if (err)
6631 		return err;
6632 
6633 	TAILQ_FOREACH(re, &refs, entry) {
6634 		char *refstr;
6635 		refstr = got_ref_to_str(re->ref);
6636 		if (refstr == NULL) {
6637 			err = got_error_from_errno("got_ref_to_str");
6638 			break;
6639 		}
6640 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6641 		free(refstr);
6642 	}
6643 
6644 	got_ref_list_free(&refs);
6645 	return err;
6646 }
6647 
6648 static const struct got_error *
6649 delete_ref_by_name(struct got_repository *repo, const char *refname)
6650 {
6651 	const struct got_error *err;
6652 	struct got_reference *ref;
6653 
6654 	err = got_ref_open(&ref, repo, refname, 0);
6655 	if (err)
6656 		return err;
6657 
6658 	err = delete_ref(repo, ref);
6659 	got_ref_close(ref);
6660 	return err;
6661 }
6662 
6663 static const struct got_error *
6664 add_ref(struct got_repository *repo, const char *refname, const char *target)
6665 {
6666 	const struct got_error *err = NULL;
6667 	struct got_object_id *id = NULL;
6668 	struct got_reference *ref = NULL;
6669 	struct got_reflist_head refs;
6670 
6671 	/*
6672 	 * Don't let the user create a reference name with a leading '-'.
6673 	 * While technically a valid reference name, this case is usually
6674 	 * an unintended typo.
6675 	 */
6676 	if (refname[0] == '-')
6677 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6678 
6679 	TAILQ_INIT(&refs);
6680 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6681 	if (err)
6682 		goto done;
6683 	err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6684 	    &refs, repo);
6685 	got_ref_list_free(&refs);
6686 	if (err)
6687 		goto done;
6688 
6689 	err = got_ref_alloc(&ref, refname, id);
6690 	if (err)
6691 		goto done;
6692 
6693 	err = got_ref_write(ref, repo);
6694 done:
6695 	if (ref)
6696 		got_ref_close(ref);
6697 	free(id);
6698 	return err;
6699 }
6700 
6701 static const struct got_error *
6702 add_symref(struct got_repository *repo, const char *refname, const char *target)
6703 {
6704 	const struct got_error *err = NULL;
6705 	struct got_reference *ref = NULL;
6706 	struct got_reference *target_ref = NULL;
6707 
6708 	/*
6709 	 * Don't let the user create a reference name with a leading '-'.
6710 	 * While technically a valid reference name, this case is usually
6711 	 * an unintended typo.
6712 	 */
6713 	if (refname[0] == '-')
6714 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6715 
6716 	err = got_ref_open(&target_ref, repo, target, 0);
6717 	if (err)
6718 		return err;
6719 
6720 	err = got_ref_alloc_symref(&ref, refname, target_ref);
6721 	if (err)
6722 		goto done;
6723 
6724 	err = got_ref_write(ref, repo);
6725 done:
6726 	if (target_ref)
6727 		got_ref_close(target_ref);
6728 	if (ref)
6729 		got_ref_close(ref);
6730 	return err;
6731 }
6732 
6733 static const struct got_error *
6734 cmd_ref(int argc, char *argv[])
6735 {
6736 	const struct got_error *error = NULL;
6737 	struct got_repository *repo = NULL;
6738 	struct got_worktree *worktree = NULL;
6739 	char *cwd = NULL, *repo_path = NULL;
6740 	int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6741 	const char *obj_arg = NULL, *symref_target= NULL;
6742 	char *refname = NULL, *keyword_idstr = NULL;
6743 	int *pack_fds = NULL;
6744 
6745 #ifndef PROFILE
6746 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6747 	    "sendfd unveil", NULL) == -1)
6748 		err(1, "pledge");
6749 #endif
6750 
6751 	while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6752 		switch (ch) {
6753 		case 'c':
6754 			obj_arg = optarg;
6755 			break;
6756 		case 'd':
6757 			do_delete = 1;
6758 			break;
6759 		case 'l':
6760 			do_list = 1;
6761 			break;
6762 		case 'r':
6763 			repo_path = realpath(optarg, NULL);
6764 			if (repo_path == NULL)
6765 				return got_error_from_errno2("realpath",
6766 				    optarg);
6767 			got_path_strip_trailing_slashes(repo_path);
6768 			break;
6769 		case 's':
6770 			symref_target = optarg;
6771 			break;
6772 		case 't':
6773 			sort_by_time = 1;
6774 			break;
6775 		default:
6776 			usage_ref();
6777 			/* NOTREACHED */
6778 		}
6779 	}
6780 
6781 	if (obj_arg && do_list)
6782 		option_conflict('c', 'l');
6783 	if (obj_arg && do_delete)
6784 		option_conflict('c', 'd');
6785 	if (obj_arg && symref_target)
6786 		option_conflict('c', 's');
6787 	if (symref_target && do_delete)
6788 		option_conflict('s', 'd');
6789 	if (symref_target && do_list)
6790 		option_conflict('s', 'l');
6791 	if (do_delete && do_list)
6792 		option_conflict('d', 'l');
6793 	if (sort_by_time && !do_list)
6794 		errx(1, "-t option requires -l option");
6795 
6796 	argc -= optind;
6797 	argv += optind;
6798 
6799 	if (do_list) {
6800 		if (argc != 0 && argc != 1)
6801 			usage_ref();
6802 		if (argc == 1) {
6803 			refname = strdup(argv[0]);
6804 			if (refname == NULL) {
6805 				error = got_error_from_errno("strdup");
6806 				goto done;
6807 			}
6808 		}
6809 	} else {
6810 		if (argc != 1)
6811 			usage_ref();
6812 		refname = strdup(argv[0]);
6813 		if (refname == NULL) {
6814 			error = got_error_from_errno("strdup");
6815 			goto done;
6816 		}
6817 	}
6818 
6819 	if (refname)
6820 		got_path_strip_trailing_slashes(refname);
6821 
6822 	cwd = getcwd(NULL, 0);
6823 	if (cwd == NULL) {
6824 		error = got_error_from_errno("getcwd");
6825 		goto done;
6826 	}
6827 
6828 	error = got_repo_pack_fds_open(&pack_fds);
6829 	if (error != NULL)
6830 		goto done;
6831 
6832 	if (repo_path == NULL) {
6833 		error = got_worktree_open(&worktree, cwd,
6834 		    GOT_WORKTREE_GOT_DIR);
6835 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6836 			goto done;
6837 		else
6838 			error = NULL;
6839 		if (worktree) {
6840 			repo_path =
6841 			    strdup(got_worktree_get_repo_path(worktree));
6842 			if (repo_path == NULL)
6843 				error = got_error_from_errno("strdup");
6844 			if (error)
6845 				goto done;
6846 		} else {
6847 			repo_path = strdup(cwd);
6848 			if (repo_path == NULL) {
6849 				error = got_error_from_errno("strdup");
6850 				goto done;
6851 			}
6852 		}
6853 	}
6854 
6855 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6856 	if (error != NULL)
6857 		goto done;
6858 
6859 #ifndef PROFILE
6860 	if (do_list) {
6861 		/* Remove "cpath" promise. */
6862 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6863 		    NULL) == -1)
6864 			err(1, "pledge");
6865 	}
6866 #endif
6867 
6868 	error = apply_unveil(got_repo_get_path(repo), do_list,
6869 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
6870 	if (error)
6871 		goto done;
6872 
6873 	if (do_list)
6874 		error = list_refs(repo, refname, sort_by_time);
6875 	else if (do_delete)
6876 		error = delete_ref_by_name(repo, refname);
6877 	else if (symref_target)
6878 		error = add_symref(repo, refname, symref_target);
6879 	else {
6880 		if (obj_arg == NULL)
6881 			usage_ref();
6882 
6883 		error = got_keyword_to_idstr(&keyword_idstr, obj_arg,
6884 		    repo, worktree);
6885 		if (error != NULL)
6886 			goto done;
6887 		if (keyword_idstr != NULL)
6888 			obj_arg = keyword_idstr;
6889 
6890 		error = add_ref(repo, refname, obj_arg);
6891 	}
6892 done:
6893 	free(refname);
6894 	if (repo) {
6895 		const struct got_error *close_err = got_repo_close(repo);
6896 		if (error == NULL)
6897 			error = close_err;
6898 	}
6899 	if (worktree)
6900 		got_worktree_close(worktree);
6901 	if (pack_fds) {
6902 		const struct got_error *pack_err =
6903 		    got_repo_pack_fds_close(pack_fds);
6904 		if (error == NULL)
6905 			error = pack_err;
6906 	}
6907 	free(cwd);
6908 	free(repo_path);
6909 	free(keyword_idstr);
6910 	return error;
6911 }
6912 
6913 __dead static void
6914 usage_branch(void)
6915 {
6916 	fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6917 	    "[-r repository-path] [name]\n", getprogname());
6918 	exit(1);
6919 }
6920 
6921 static const struct got_error *
6922 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6923     struct got_reference *ref)
6924 {
6925 	const struct got_error *err = NULL;
6926 	const char *refname;
6927 	char *refstr;
6928 	char marker = ' ';
6929 
6930 	refname = got_ref_get_name(ref);
6931 	if (worktree && strcmp(refname,
6932 	    got_worktree_get_head_ref_name(worktree)) == 0) {
6933 		err = got_worktree_get_state(&marker, repo, worktree,
6934 		    check_cancelled, NULL);
6935 		if (err != NULL)
6936 			return err;
6937 	}
6938 
6939 	if (strncmp(refname, "refs/heads/", 11) == 0)
6940 		refname += 11;
6941 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6942 		refname += 18;
6943 	if (strncmp(refname, "refs/remotes/", 13) == 0)
6944 		refname += 13;
6945 
6946 	refstr = got_ref_to_str(ref);
6947 	if (refstr == NULL)
6948 		return got_error_from_errno("got_ref_to_str");
6949 
6950 	printf("%c %s: %s\n", marker, refname, refstr);
6951 	free(refstr);
6952 	return NULL;
6953 }
6954 
6955 static const struct got_error *
6956 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6957 {
6958 	const char *refname;
6959 
6960 	if (worktree == NULL)
6961 		return got_error(GOT_ERR_NOT_WORKTREE);
6962 
6963 	refname = got_worktree_get_head_ref_name(worktree);
6964 
6965 	if (strncmp(refname, "refs/heads/", 11) == 0)
6966 		refname += 11;
6967 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6968 		refname += 18;
6969 
6970 	printf("%s\n", refname);
6971 
6972 	return NULL;
6973 }
6974 
6975 static const struct got_error *
6976 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6977     int sort_by_time)
6978 {
6979 	static const struct got_error *err = NULL;
6980 	struct got_reflist_head refs;
6981 	struct got_reflist_entry *re;
6982 	struct got_reference *temp_ref = NULL;
6983 	int rebase_in_progress, histedit_in_progress;
6984 
6985 	TAILQ_INIT(&refs);
6986 
6987 	if (worktree) {
6988 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
6989 		    worktree);
6990 		if (err)
6991 			return err;
6992 
6993 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
6994 		    worktree);
6995 		if (err)
6996 			return err;
6997 
6998 		if (rebase_in_progress || histedit_in_progress) {
6999 			err = got_ref_open(&temp_ref, repo,
7000 			    got_worktree_get_head_ref_name(worktree), 0);
7001 			if (err)
7002 				return err;
7003 			list_branch(repo, worktree, temp_ref);
7004 			got_ref_close(temp_ref);
7005 		}
7006 	}
7007 
7008 	err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
7009 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
7010 	    repo);
7011 	if (err)
7012 		return err;
7013 
7014 	TAILQ_FOREACH(re, &refs, entry)
7015 		list_branch(repo, worktree, re->ref);
7016 
7017 	got_ref_list_free(&refs);
7018 
7019 	err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
7020 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
7021 	    repo);
7022 	if (err)
7023 		return err;
7024 
7025 	TAILQ_FOREACH(re, &refs, entry)
7026 		list_branch(repo, worktree, re->ref);
7027 
7028 	got_ref_list_free(&refs);
7029 
7030 	return NULL;
7031 }
7032 
7033 static const struct got_error *
7034 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
7035     const char *branch_name)
7036 {
7037 	const struct got_error *err = NULL;
7038 	struct got_reference *ref = NULL;
7039 	char *refname, *remote_refname = NULL;
7040 
7041 	if (strncmp(branch_name, "refs/", 5) == 0)
7042 		branch_name += 5;
7043 	if (strncmp(branch_name, "heads/", 6) == 0)
7044 		branch_name += 6;
7045 	else if (strncmp(branch_name, "remotes/", 8) == 0)
7046 		branch_name += 8;
7047 
7048 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
7049 		return got_error_from_errno("asprintf");
7050 
7051 	if (asprintf(&remote_refname, "refs/remotes/%s",
7052 	    branch_name) == -1) {
7053 		err = got_error_from_errno("asprintf");
7054 		goto done;
7055 	}
7056 
7057 	err = got_ref_open(&ref, repo, refname, 0);
7058 	if (err) {
7059 		const struct got_error *err2;
7060 		if (err->code != GOT_ERR_NOT_REF)
7061 			goto done;
7062 		/*
7063 		 * Keep 'err' intact such that if neither branch exists
7064 		 * we report "refs/heads" rather than "refs/remotes" in
7065 		 * our error message.
7066 		 */
7067 		err2 = got_ref_open(&ref, repo, remote_refname, 0);
7068 		if (err2)
7069 			goto done;
7070 		err = NULL;
7071 	}
7072 
7073 	if (worktree &&
7074 	    strcmp(got_worktree_get_head_ref_name(worktree),
7075 	    got_ref_get_name(ref)) == 0) {
7076 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
7077 		    "will not delete this work tree's current branch");
7078 		goto done;
7079 	}
7080 
7081 	err = delete_ref(repo, ref);
7082 done:
7083 	if (ref)
7084 		got_ref_close(ref);
7085 	free(refname);
7086 	free(remote_refname);
7087 	return err;
7088 }
7089 
7090 static const struct got_error *
7091 add_branch(struct got_repository *repo, const char *branch_name,
7092     struct got_object_id *base_commit_id)
7093 {
7094 	const struct got_error *err = NULL;
7095 	struct got_reference *ref = NULL;
7096 	char *refname = NULL;
7097 
7098 	/*
7099 	 * Don't let the user create a branch name with a leading '-'.
7100 	 * While technically a valid reference name, this case is usually
7101 	 * an unintended typo.
7102 	 */
7103 	if (branch_name[0] == '-')
7104 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
7105 
7106 	if (strncmp(branch_name, "refs/heads/", 11) == 0)
7107 		branch_name += 11;
7108 
7109 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
7110 		err = got_error_from_errno("asprintf");
7111 		goto done;
7112 	}
7113 
7114 	err = got_ref_open(&ref, repo, refname, 0);
7115 	if (err == NULL) {
7116 		err = got_error(GOT_ERR_BRANCH_EXISTS);
7117 		goto done;
7118 	} else if (err->code != GOT_ERR_NOT_REF)
7119 		goto done;
7120 
7121 	err = got_ref_alloc(&ref, refname, base_commit_id);
7122 	if (err)
7123 		goto done;
7124 
7125 	err = got_ref_write(ref, repo);
7126 done:
7127 	if (ref)
7128 		got_ref_close(ref);
7129 	free(refname);
7130 	return err;
7131 }
7132 
7133 static const struct got_error *
7134 cmd_branch(int argc, char *argv[])
7135 {
7136 	const struct got_error *error = NULL;
7137 	struct got_repository *repo = NULL;
7138 	struct got_worktree *worktree = NULL;
7139 	char *cwd = NULL, *repo_path = NULL;
7140 	int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
7141 	const char *delref = NULL, *commit_id_arg = NULL;
7142 	struct got_reference *ref = NULL;
7143 	struct got_pathlist_head paths;
7144 	struct got_object_id *commit_id = NULL;
7145 	char *commit_id_str = NULL, *keyword_idstr = NULL;;
7146 	int *pack_fds = NULL;
7147 
7148 	TAILQ_INIT(&paths);
7149 
7150 #ifndef PROFILE
7151 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7152 	    "sendfd unveil", NULL) == -1)
7153 		err(1, "pledge");
7154 #endif
7155 
7156 	while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
7157 		switch (ch) {
7158 		case 'c':
7159 			commit_id_arg = optarg;
7160 			break;
7161 		case 'd':
7162 			delref = optarg;
7163 			break;
7164 		case 'l':
7165 			do_list = 1;
7166 			break;
7167 		case 'n':
7168 			do_update = 0;
7169 			break;
7170 		case 'r':
7171 			repo_path = realpath(optarg, NULL);
7172 			if (repo_path == NULL)
7173 				return got_error_from_errno2("realpath",
7174 				    optarg);
7175 			got_path_strip_trailing_slashes(repo_path);
7176 			break;
7177 		case 't':
7178 			sort_by_time = 1;
7179 			break;
7180 		default:
7181 			usage_branch();
7182 			/* NOTREACHED */
7183 		}
7184 	}
7185 
7186 	if (do_list && delref)
7187 		option_conflict('l', 'd');
7188 	if (sort_by_time && !do_list)
7189 		errx(1, "-t option requires -l option");
7190 
7191 	argc -= optind;
7192 	argv += optind;
7193 
7194 	if (!do_list && !delref && argc == 0)
7195 		do_show = 1;
7196 
7197 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
7198 		errx(1, "-c option can only be used when creating a branch");
7199 
7200 	if (do_list || delref) {
7201 		if (argc > 0)
7202 			usage_branch();
7203 	} else if (!do_show && argc != 1)
7204 		usage_branch();
7205 
7206 	cwd = getcwd(NULL, 0);
7207 	if (cwd == NULL) {
7208 		error = got_error_from_errno("getcwd");
7209 		goto done;
7210 	}
7211 
7212 	error = got_repo_pack_fds_open(&pack_fds);
7213 	if (error != NULL)
7214 		goto done;
7215 
7216 	if (repo_path == NULL) {
7217 		error = got_worktree_open(&worktree, cwd,
7218 		    GOT_WORKTREE_GOT_DIR);
7219 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
7220 			goto done;
7221 		else
7222 			error = NULL;
7223 		if (worktree) {
7224 			repo_path =
7225 			    strdup(got_worktree_get_repo_path(worktree));
7226 			if (repo_path == NULL)
7227 				error = got_error_from_errno("strdup");
7228 			if (error)
7229 				goto done;
7230 		} else {
7231 			repo_path = strdup(cwd);
7232 			if (repo_path == NULL) {
7233 				error = got_error_from_errno("strdup");
7234 				goto done;
7235 			}
7236 		}
7237 	}
7238 
7239 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7240 	if (error != NULL)
7241 		goto done;
7242 
7243 #ifndef PROFILE
7244 	if (do_list || do_show) {
7245 		/* Remove "cpath" promise. */
7246 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7247 		    NULL) == -1)
7248 			err(1, "pledge");
7249 	}
7250 #endif
7251 
7252 	error = apply_unveil(got_repo_get_path(repo), do_list,
7253 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
7254 	if (error)
7255 		goto done;
7256 
7257 	if (do_show)
7258 		error = show_current_branch(repo, worktree);
7259 	else if (do_list)
7260 		error = list_branches(repo, worktree, sort_by_time);
7261 	else if (delref)
7262 		error = delete_branch(repo, worktree, delref);
7263 	else {
7264 		struct got_reflist_head refs;
7265 		TAILQ_INIT(&refs);
7266 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
7267 		    NULL);
7268 		if (error)
7269 			goto done;
7270 		if (commit_id_arg == NULL)
7271 			commit_id_arg = worktree ?
7272 			    got_worktree_get_head_ref_name(worktree) :
7273 			    GOT_REF_HEAD;
7274 		else {
7275 			error = got_keyword_to_idstr(&keyword_idstr,
7276 			    commit_id_arg, repo, worktree);
7277 			if (error != NULL)
7278 				goto done;
7279 			if (keyword_idstr != NULL)
7280 				commit_id_arg = keyword_idstr;
7281 		}
7282 		error = got_repo_match_object_id(&commit_id, NULL,
7283 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
7284 		got_ref_list_free(&refs);
7285 		if (error)
7286 			goto done;
7287 		error = add_branch(repo, argv[0], commit_id);
7288 		if (error)
7289 			goto done;
7290 		if (worktree && do_update) {
7291 			struct got_update_progress_arg upa;
7292 			char *branch_refname = NULL;
7293 
7294 			error = got_object_id_str(&commit_id_str, commit_id);
7295 			if (error)
7296 				goto done;
7297 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
7298 			    worktree);
7299 			if (error)
7300 				goto done;
7301 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7302 			    == -1) {
7303 				error = got_error_from_errno("asprintf");
7304 				goto done;
7305 			}
7306 			error = got_ref_open(&ref, repo, branch_refname, 0);
7307 			free(branch_refname);
7308 			if (error)
7309 				goto done;
7310 			error = switch_head_ref(ref, commit_id, worktree,
7311 			    repo);
7312 			if (error)
7313 				goto done;
7314 			error = got_worktree_set_base_commit_id(worktree, repo,
7315 			    commit_id);
7316 			if (error)
7317 				goto done;
7318 			memset(&upa, 0, sizeof(upa));
7319 			error = got_worktree_checkout_files(worktree, &paths,
7320 			    repo, update_progress, &upa, check_cancelled,
7321 			    NULL);
7322 			if (error)
7323 				goto done;
7324 			if (upa.did_something) {
7325 				printf("Updated to %s: %s\n",
7326 				    got_worktree_get_head_ref_name(worktree),
7327 				    commit_id_str);
7328 			}
7329 			print_update_progress_stats(&upa);
7330 		}
7331 	}
7332 done:
7333 	free(keyword_idstr);
7334 	if (ref)
7335 		got_ref_close(ref);
7336 	if (repo) {
7337 		const struct got_error *close_err = got_repo_close(repo);
7338 		if (error == NULL)
7339 			error = close_err;
7340 	}
7341 	if (worktree)
7342 		got_worktree_close(worktree);
7343 	if (pack_fds) {
7344 		const struct got_error *pack_err =
7345 		    got_repo_pack_fds_close(pack_fds);
7346 		if (error == NULL)
7347 			error = pack_err;
7348 	}
7349 	free(cwd);
7350 	free(repo_path);
7351 	free(commit_id);
7352 	free(commit_id_str);
7353 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7354 	return error;
7355 }
7356 
7357 
7358 __dead static void
7359 usage_tag(void)
7360 {
7361 	fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7362 	    "[-r repository-path] [-s signer-id] name\n", getprogname());
7363 	exit(1);
7364 }
7365 
7366 #if 0
7367 static const struct got_error *
7368 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7369 {
7370 	const struct got_error *err = NULL;
7371 	struct got_reflist_entry *re, *se, *new;
7372 	struct got_object_id *re_id, *se_id;
7373 	struct got_tag_object *re_tag, *se_tag;
7374 	time_t re_time, se_time;
7375 
7376 	STAILQ_FOREACH(re, tags, entry) {
7377 		se = STAILQ_FIRST(sorted);
7378 		if (se == NULL) {
7379 			err = got_reflist_entry_dup(&new, re);
7380 			if (err)
7381 				return err;
7382 			STAILQ_INSERT_HEAD(sorted, new, entry);
7383 			continue;
7384 		} else {
7385 			err = got_ref_resolve(&re_id, repo, re->ref);
7386 			if (err)
7387 				break;
7388 			err = got_object_open_as_tag(&re_tag, repo, re_id);
7389 			free(re_id);
7390 			if (err)
7391 				break;
7392 			re_time = got_object_tag_get_tagger_time(re_tag);
7393 			got_object_tag_close(re_tag);
7394 		}
7395 
7396 		while (se) {
7397 			err = got_ref_resolve(&se_id, repo, re->ref);
7398 			if (err)
7399 				break;
7400 			err = got_object_open_as_tag(&se_tag, repo, se_id);
7401 			free(se_id);
7402 			if (err)
7403 				break;
7404 			se_time = got_object_tag_get_tagger_time(se_tag);
7405 			got_object_tag_close(se_tag);
7406 
7407 			if (se_time > re_time) {
7408 				err = got_reflist_entry_dup(&new, re);
7409 				if (err)
7410 					return err;
7411 				STAILQ_INSERT_AFTER(sorted, se, new, entry);
7412 				break;
7413 			}
7414 			se = STAILQ_NEXT(se, entry);
7415 			continue;
7416 		}
7417 	}
7418 done:
7419 	return err;
7420 }
7421 #endif
7422 
7423 static const struct got_error *
7424 get_tag_refname(char **refname, const char *tag_name)
7425 {
7426 	const struct got_error *err;
7427 
7428 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
7429 		*refname = strdup(tag_name);
7430 		if (*refname == NULL)
7431 			return got_error_from_errno("strdup");
7432 	} else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7433 		err = got_error_from_errno("asprintf");
7434 		*refname = NULL;
7435 		return err;
7436 	}
7437 
7438 	return NULL;
7439 }
7440 
7441 static const struct got_error *
7442 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7443     const char *allowed_signers, const char *revoked_signers, int verbosity)
7444 {
7445 	static const struct got_error *err = NULL;
7446 	struct got_reflist_head refs;
7447 	struct got_reflist_entry *re;
7448 	char *wanted_refname = NULL;
7449 	int bad_sigs = 0;
7450 
7451 	TAILQ_INIT(&refs);
7452 
7453 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7454 	if (err)
7455 		return err;
7456 
7457 	if (tag_name) {
7458 		struct got_reference *ref;
7459 		err = get_tag_refname(&wanted_refname, tag_name);
7460 		if (err)
7461 			goto done;
7462 		/* Wanted tag reference should exist. */
7463 		err = got_ref_open(&ref, repo, wanted_refname, 0);
7464 		if (err)
7465 			goto done;
7466 		got_ref_close(ref);
7467 	}
7468 
7469 	TAILQ_FOREACH(re, &refs, entry) {
7470 		const char *refname;
7471 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7472 		char datebuf[26];
7473 		const char *tagger, *ssh_sig = NULL;
7474 		char *sig_msg = NULL;
7475 		time_t tagger_time;
7476 		struct got_object_id *id;
7477 		struct got_tag_object *tag;
7478 		struct got_commit_object *commit = NULL;
7479 
7480 		refname = got_ref_get_name(re->ref);
7481 		if (strncmp(refname, "refs/tags/", 10) != 0 ||
7482 		    (wanted_refname && strcmp(refname, wanted_refname) != 0))
7483 			continue;
7484 		refname += 10;
7485 		refstr = got_ref_to_str(re->ref);
7486 		if (refstr == NULL) {
7487 			err = got_error_from_errno("got_ref_to_str");
7488 			break;
7489 		}
7490 
7491 		err = got_ref_resolve(&id, repo, re->ref);
7492 		if (err)
7493 			break;
7494 		err = got_object_open_as_tag(&tag, repo, id);
7495 		if (err) {
7496 			if (err->code != GOT_ERR_OBJ_TYPE) {
7497 				free(id);
7498 				break;
7499 			}
7500 			/* "lightweight" tag */
7501 			err = got_object_open_as_commit(&commit, repo, id);
7502 			if (err) {
7503 				free(id);
7504 				break;
7505 			}
7506 			tagger = got_object_commit_get_committer(commit);
7507 			tagger_time =
7508 			    got_object_commit_get_committer_time(commit);
7509 			err = got_object_id_str(&id_str, id);
7510 			free(id);
7511 			if (err)
7512 				break;
7513 		} else {
7514 			free(id);
7515 			tagger = got_object_tag_get_tagger(tag);
7516 			tagger_time = got_object_tag_get_tagger_time(tag);
7517 			err = got_object_id_str(&id_str,
7518 			    got_object_tag_get_object_id(tag));
7519 			if (err)
7520 				break;
7521 		}
7522 
7523 		if (tag && verify_tags) {
7524 			ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7525 			    got_object_tag_get_message(tag));
7526 			if (ssh_sig && allowed_signers == NULL) {
7527 				err = got_error_msg(
7528 				    GOT_ERR_VERIFY_TAG_SIGNATURE,
7529 				    "SSH signature verification requires "
7530 				        "setting allowed_signers in "
7531 				        "got.conf(5)");
7532 				break;
7533 			}
7534 		}
7535 
7536 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7537 		free(refstr);
7538 		printf("from: %s\n", tagger);
7539 		datestr = get_datestr(&tagger_time, datebuf);
7540 		if (datestr)
7541 			printf("date: %s UTC\n", datestr);
7542 		if (commit)
7543 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7544 		else {
7545 			switch (got_object_tag_get_object_type(tag)) {
7546 			case GOT_OBJ_TYPE_BLOB:
7547 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7548 				    id_str);
7549 				break;
7550 			case GOT_OBJ_TYPE_TREE:
7551 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7552 				    id_str);
7553 				break;
7554 			case GOT_OBJ_TYPE_COMMIT:
7555 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7556 				    id_str);
7557 				break;
7558 			case GOT_OBJ_TYPE_TAG:
7559 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7560 				    id_str);
7561 				break;
7562 			default:
7563 				break;
7564 			}
7565 		}
7566 		free(id_str);
7567 
7568 		if (ssh_sig) {
7569 			err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7570 				allowed_signers, revoked_signers, verbosity);
7571 			if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7572 				bad_sigs = 1;
7573 			else if (err)
7574 				break;
7575 			printf("signature: %s", sig_msg);
7576 			free(sig_msg);
7577 			sig_msg = NULL;
7578 		}
7579 
7580 		if (commit) {
7581 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
7582 			if (err)
7583 				break;
7584 			got_object_commit_close(commit);
7585 		} else {
7586 			tagmsg0 = strdup(got_object_tag_get_message(tag));
7587 			got_object_tag_close(tag);
7588 			if (tagmsg0 == NULL) {
7589 				err = got_error_from_errno("strdup");
7590 				break;
7591 			}
7592 		}
7593 
7594 		tagmsg = tagmsg0;
7595 		do {
7596 			line = strsep(&tagmsg, "\n");
7597 			if (line)
7598 				printf(" %s\n", line);
7599 		} while (line);
7600 		free(tagmsg0);
7601 	}
7602 done:
7603 	got_ref_list_free(&refs);
7604 	free(wanted_refname);
7605 
7606 	if (err == NULL && bad_sigs)
7607 		err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7608 	return err;
7609 }
7610 
7611 static const struct got_error *
7612 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7613     const char *tag_name, const char *editor, const char *repo_path)
7614 {
7615 	const struct got_error *err = NULL;
7616 	char *template = NULL, *initial_content = NULL;
7617 	int initial_content_len;
7618 	int fd = -1;
7619 
7620 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7621 		err = got_error_from_errno("asprintf");
7622 		goto done;
7623 	}
7624 
7625 	initial_content_len = asprintf(&initial_content,
7626 	    "\n# tagging commit %s as %s\n",
7627 	    commit_id_str, tag_name);
7628 	if (initial_content_len == -1) {
7629 		err = got_error_from_errno("asprintf");
7630 		goto done;
7631 	}
7632 
7633 	err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7634 	if (err)
7635 		goto done;
7636 
7637 	if (write(fd, initial_content, initial_content_len) == -1) {
7638 		err = got_error_from_errno2("write", *tagmsg_path);
7639 		goto done;
7640 	}
7641 	if (close(fd) == -1) {
7642 		err = got_error_from_errno2("close", *tagmsg_path);
7643 		goto done;
7644 	}
7645 	fd = -1;
7646 
7647 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7648 	    initial_content_len, 1);
7649 done:
7650 	free(initial_content);
7651 	free(template);
7652 
7653 	if (fd != -1 && close(fd) == -1 && err == NULL)
7654 		err = got_error_from_errno2("close", *tagmsg_path);
7655 
7656 	if (err) {
7657 		free(*tagmsg);
7658 		*tagmsg = NULL;
7659 	}
7660 	return err;
7661 }
7662 
7663 static const struct got_error *
7664 add_tag(struct got_repository *repo, const char *tagger,
7665     const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7666     const char *signer_id, const char *editor, int verbosity)
7667 {
7668 	const struct got_error *err = NULL;
7669 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
7670 	char *label = NULL, *commit_id_str = NULL;
7671 	struct got_reference *ref = NULL;
7672 	char *refname = NULL, *tagmsg = NULL;
7673 	char *tagmsg_path = NULL, *tag_id_str = NULL;
7674 	int preserve_tagmsg = 0;
7675 	struct got_reflist_head refs;
7676 
7677 	TAILQ_INIT(&refs);
7678 
7679 	/*
7680 	 * Don't let the user create a tag name with a leading '-'.
7681 	 * While technically a valid reference name, this case is usually
7682 	 * an unintended typo.
7683 	 */
7684 	if (tag_name[0] == '-')
7685 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7686 
7687 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7688 	if (err)
7689 		goto done;
7690 
7691 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7692 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
7693 	if (err)
7694 		goto done;
7695 
7696 	err = got_object_id_str(&commit_id_str, commit_id);
7697 	if (err)
7698 		goto done;
7699 
7700 	err = get_tag_refname(&refname, tag_name);
7701 	if (err)
7702 		goto done;
7703 	if (strncmp("refs/tags/", tag_name, 10) == 0)
7704 		tag_name += 10;
7705 
7706 	err = got_ref_open(&ref, repo, refname, 0);
7707 	if (err == NULL) {
7708 		err = got_error(GOT_ERR_TAG_EXISTS);
7709 		goto done;
7710 	} else if (err->code != GOT_ERR_NOT_REF)
7711 		goto done;
7712 
7713 	if (tagmsg_arg == NULL) {
7714 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7715 		    tag_name, editor, got_repo_get_path(repo));
7716 		if (err) {
7717 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7718 			    tagmsg_path != NULL)
7719 				preserve_tagmsg = 1;
7720 			goto done;
7721 		}
7722 	}
7723 
7724 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
7725 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7726 	    verbosity);
7727 	if (err) {
7728 		if (tagmsg_path)
7729 			preserve_tagmsg = 1;
7730 		goto done;
7731 	}
7732 
7733 	err = got_ref_alloc(&ref, refname, tag_id);
7734 	if (err) {
7735 		if (tagmsg_path)
7736 			preserve_tagmsg = 1;
7737 		goto done;
7738 	}
7739 
7740 	err = got_ref_write(ref, repo);
7741 	if (err) {
7742 		if (tagmsg_path)
7743 			preserve_tagmsg = 1;
7744 		goto done;
7745 	}
7746 
7747 	err = got_object_id_str(&tag_id_str, tag_id);
7748 	if (err) {
7749 		if (tagmsg_path)
7750 			preserve_tagmsg = 1;
7751 		goto done;
7752 	}
7753 	printf("Created tag %s\n", tag_id_str);
7754 done:
7755 	if (preserve_tagmsg) {
7756 		fprintf(stderr, "%s: tag message preserved in %s\n",
7757 		    getprogname(), tagmsg_path);
7758 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7759 		err = got_error_from_errno2("unlink", tagmsg_path);
7760 	free(tag_id_str);
7761 	if (ref)
7762 		got_ref_close(ref);
7763 	free(commit_id);
7764 	free(commit_id_str);
7765 	free(refname);
7766 	free(tagmsg);
7767 	free(tagmsg_path);
7768 	got_ref_list_free(&refs);
7769 	return err;
7770 }
7771 
7772 static const struct got_error *
7773 cmd_tag(int argc, char *argv[])
7774 {
7775 	const struct got_error *error = NULL;
7776 	struct got_repository *repo = NULL;
7777 	struct got_worktree *worktree = NULL;
7778 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7779 	char *gitconfig_path = NULL, *tagger = NULL, *keyword_idstr = NULL;
7780 	char *allowed_signers = NULL, *revoked_signers = NULL, *editor = NULL;
7781 	const char *signer_id = NULL;
7782 	const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7783 	int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7784 	int *pack_fds = NULL;
7785 
7786 #ifndef PROFILE
7787 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7788 	    "sendfd unveil", NULL) == -1)
7789 		err(1, "pledge");
7790 #endif
7791 
7792 	while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7793 		switch (ch) {
7794 		case 'c':
7795 			commit_id_arg = optarg;
7796 			break;
7797 		case 'l':
7798 			do_list = 1;
7799 			break;
7800 		case 'm':
7801 			tagmsg = optarg;
7802 			break;
7803 		case 'r':
7804 			repo_path = realpath(optarg, NULL);
7805 			if (repo_path == NULL) {
7806 				error = got_error_from_errno2("realpath",
7807 				    optarg);
7808 				goto done;
7809 			}
7810 			got_path_strip_trailing_slashes(repo_path);
7811 			break;
7812 		case 's':
7813 			signer_id = optarg;
7814 			break;
7815 		case 'V':
7816 			verify_tags = 1;
7817 			break;
7818 		case 'v':
7819 			if (verbosity < 0)
7820 				verbosity = 0;
7821 			else if (verbosity < 3)
7822 				verbosity++;
7823 			break;
7824 		default:
7825 			usage_tag();
7826 			/* NOTREACHED */
7827 		}
7828 	}
7829 
7830 	argc -= optind;
7831 	argv += optind;
7832 
7833 	if (do_list || verify_tags) {
7834 		if (commit_id_arg != NULL)
7835 			errx(1,
7836 			    "-c option can only be used when creating a tag");
7837 		if (tagmsg) {
7838 			if (do_list)
7839 				option_conflict('l', 'm');
7840 			else
7841 				option_conflict('V', 'm');
7842 		}
7843 		if (signer_id) {
7844 			if (do_list)
7845 				option_conflict('l', 's');
7846 			else
7847 				option_conflict('V', 's');
7848 		}
7849 		if (argc > 1)
7850 			usage_tag();
7851 	} else if (argc != 1)
7852 		usage_tag();
7853 
7854 	if (argc == 1)
7855 		tag_name = argv[0];
7856 
7857 	cwd = getcwd(NULL, 0);
7858 	if (cwd == NULL) {
7859 		error = got_error_from_errno("getcwd");
7860 		goto done;
7861 	}
7862 
7863 	error = got_repo_pack_fds_open(&pack_fds);
7864 	if (error != NULL)
7865 		goto done;
7866 
7867 	if (repo_path == NULL) {
7868 		error = got_worktree_open(&worktree, cwd,
7869 		    GOT_WORKTREE_GOT_DIR);
7870 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
7871 			goto done;
7872 		else
7873 			error = NULL;
7874 		if (worktree) {
7875 			repo_path =
7876 			    strdup(got_worktree_get_repo_path(worktree));
7877 			if (repo_path == NULL)
7878 				error = got_error_from_errno("strdup");
7879 			if (error)
7880 				goto done;
7881 		} else {
7882 			repo_path = strdup(cwd);
7883 			if (repo_path == NULL) {
7884 				error = got_error_from_errno("strdup");
7885 				goto done;
7886 			}
7887 		}
7888 	}
7889 
7890 	if (do_list || verify_tags) {
7891 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7892 		if (error != NULL)
7893 			goto done;
7894 		error = get_allowed_signers(&allowed_signers, repo, worktree);
7895 		if (error)
7896 			goto done;
7897 		error = get_revoked_signers(&revoked_signers, repo, worktree);
7898 		if (error)
7899 			goto done;
7900 		if (worktree) {
7901 			/* Release work tree lock. */
7902 			got_worktree_close(worktree);
7903 			worktree = NULL;
7904 		}
7905 
7906 		/*
7907 		 * Remove "cpath" promise unless needed for signature tmpfile
7908 		 * creation.
7909 		 */
7910 		if (verify_tags)
7911 		 	got_sigs_apply_unveil();
7912 		else {
7913 #ifndef PROFILE
7914 			if (pledge("stdio rpath wpath flock proc exec sendfd "
7915 			    "unveil", NULL) == -1)
7916 				err(1, "pledge");
7917 #endif
7918 		}
7919 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7920 		if (error)
7921 			goto done;
7922 		error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7923 		    revoked_signers, verbosity);
7924 	} else {
7925 		error = get_gitconfig_path(&gitconfig_path);
7926 		if (error)
7927 			goto done;
7928 		error = got_repo_open(&repo, repo_path, gitconfig_path,
7929 		    pack_fds);
7930 		if (error != NULL)
7931 			goto done;
7932 
7933 		error = get_author(&tagger, repo, worktree);
7934 		if (error)
7935 			goto done;
7936 		if (signer_id == NULL)
7937 			signer_id = get_signer_id(repo, worktree);
7938 
7939 		if (tagmsg == NULL) {
7940 			error = get_editor(&editor);
7941 			if (error)
7942 				goto done;
7943 			if (unveil(editor, "x") != 0) {
7944 				error = got_error_from_errno2("unveil", editor);
7945 				goto done;
7946 			}
7947 		}
7948 		if (signer_id) {
7949 			error = got_sigs_apply_unveil();
7950 			if (error)
7951 				goto done;
7952 		}
7953 		error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7954 		if (error)
7955 			goto done;
7956 
7957 		if (commit_id_arg == NULL) {
7958 			struct got_reference *head_ref;
7959 			struct got_object_id *commit_id;
7960 			error = got_ref_open(&head_ref, repo,
7961 			    worktree ? got_worktree_get_head_ref_name(worktree)
7962 			    : GOT_REF_HEAD, 0);
7963 			if (error)
7964 				goto done;
7965 			error = got_ref_resolve(&commit_id, repo, head_ref);
7966 			got_ref_close(head_ref);
7967 			if (error)
7968 				goto done;
7969 			error = got_object_id_str(&commit_id_str, commit_id);
7970 			free(commit_id);
7971 			if (error)
7972 				goto done;
7973 		} else {
7974 			error = got_keyword_to_idstr(&keyword_idstr,
7975 			    commit_id_arg, repo, worktree);
7976 			if (error != NULL)
7977 				goto done;
7978 			commit_id_str = keyword_idstr;
7979 		}
7980 
7981 		if (worktree) {
7982 			/* Release work tree lock. */
7983 			got_worktree_close(worktree);
7984 			worktree = NULL;
7985 		}
7986 
7987 		error = add_tag(repo, tagger, tag_name,
7988 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7989 		    signer_id, editor, verbosity);
7990 	}
7991 done:
7992 	if (repo) {
7993 		const struct got_error *close_err = got_repo_close(repo);
7994 		if (error == NULL)
7995 			error = close_err;
7996 	}
7997 	if (worktree)
7998 		got_worktree_close(worktree);
7999 	if (pack_fds) {
8000 		const struct got_error *pack_err =
8001 		    got_repo_pack_fds_close(pack_fds);
8002 		if (error == NULL)
8003 			error = pack_err;
8004 	}
8005 	free(cwd);
8006 	free(editor);
8007 	free(repo_path);
8008 	free(gitconfig_path);
8009 	free(commit_id_str);
8010 	free(tagger);
8011 	free(allowed_signers);
8012 	free(revoked_signers);
8013 	return error;
8014 }
8015 
8016 __dead static void
8017 usage_add(void)
8018 {
8019 	fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
8020 	exit(1);
8021 }
8022 
8023 static const struct got_error *
8024 add_progress(void *arg, unsigned char status, const char *path)
8025 {
8026 	while (path[0] == '/')
8027 		path++;
8028 	printf("%c  %s\n", status, path);
8029 	return NULL;
8030 }
8031 
8032 static const struct got_error *
8033 pathlist_contains_directory(int *contains_dir, struct got_worktree *worktree,
8034     struct got_pathlist_head *paths)
8035 {
8036 	const struct got_error *error = NULL;
8037 	struct got_pathlist_entry *pe;
8038 	struct stat sb;
8039 	char *ondisk_path;
8040 
8041 	*contains_dir = 0;
8042 
8043 	TAILQ_FOREACH(pe, paths, entry) {
8044 		if (asprintf(&ondisk_path, "%s/%s",
8045 		    got_worktree_get_root_path(worktree),
8046 		    pe->path) == -1) {
8047 			return got_error_from_errno("asprintf");
8048 		}
8049 		if (lstat(ondisk_path, &sb) == -1) {
8050 			if (errno == ENOENT) {
8051 				free(ondisk_path);
8052 				continue;
8053 			}
8054 			error = got_error_from_errno2("lstat",
8055 			    ondisk_path);
8056 			free(ondisk_path);
8057 			return error;
8058 		}
8059 		free(ondisk_path);
8060 		if (S_ISDIR(sb.st_mode)) {
8061 			*contains_dir = 1;
8062 			return NULL;
8063 		}
8064 	}
8065 	return NULL;
8066 }
8067 
8068 static const struct got_error *
8069 cmd_add(int argc, char *argv[])
8070 {
8071 	const struct got_error *error = NULL;
8072 	struct got_repository *repo = NULL;
8073 	struct got_worktree *worktree = NULL;
8074 	char *cwd = NULL;
8075 	struct got_pathlist_head paths;
8076 	int ch, contains_dir, can_recurse = 0, no_ignores = 0;
8077 	int *pack_fds = NULL;
8078 
8079 	TAILQ_INIT(&paths);
8080 
8081 #ifndef PROFILE
8082 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8083 	    NULL) == -1)
8084 		err(1, "pledge");
8085 #endif
8086 
8087 	while ((ch = getopt(argc, argv, "IR")) != -1) {
8088 		switch (ch) {
8089 		case 'I':
8090 			no_ignores = 1;
8091 			break;
8092 		case 'R':
8093 			can_recurse = 1;
8094 			break;
8095 		default:
8096 			usage_add();
8097 			/* NOTREACHED */
8098 		}
8099 	}
8100 
8101 	argc -= optind;
8102 	argv += optind;
8103 
8104 	if (argc < 1)
8105 		usage_add();
8106 
8107 	cwd = getcwd(NULL, 0);
8108 	if (cwd == NULL) {
8109 		error = got_error_from_errno("getcwd");
8110 		goto done;
8111 	}
8112 
8113 	error = got_repo_pack_fds_open(&pack_fds);
8114 	if (error != NULL)
8115 		goto done;
8116 
8117 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8118 	if (error) {
8119 		if (error->code == GOT_ERR_NOT_WORKTREE)
8120 			error = wrap_not_worktree_error(error, "add", cwd);
8121 		goto done;
8122 	}
8123 
8124 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8125 	    NULL, pack_fds);
8126 	if (error != NULL)
8127 		goto done;
8128 
8129 	error = apply_unveil(got_repo_get_path(repo), 1,
8130 	    got_worktree_get_root_path(worktree));
8131 	if (error)
8132 		goto done;
8133 
8134 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8135 	if (error)
8136 		goto done;
8137 
8138 	if (!can_recurse) {
8139 		error = pathlist_contains_directory(&contains_dir, worktree,
8140 		    &paths);
8141 		if (error != NULL)
8142 			goto done;
8143 
8144 		if (contains_dir) {
8145 			error = got_error_msg(GOT_ERR_BAD_PATH,
8146 			    "adding directories requires -R option");
8147 			goto done;
8148 		}
8149 	}
8150 
8151 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
8152 	    NULL, repo, no_ignores);
8153 done:
8154 	if (repo) {
8155 		const struct got_error *close_err = got_repo_close(repo);
8156 		if (error == NULL)
8157 			error = close_err;
8158 	}
8159 	if (worktree)
8160 		got_worktree_close(worktree);
8161 	if (pack_fds) {
8162 		const struct got_error *pack_err =
8163 		    got_repo_pack_fds_close(pack_fds);
8164 		if (error == NULL)
8165 			error = pack_err;
8166 	}
8167 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8168 	free(cwd);
8169 	return error;
8170 }
8171 
8172 __dead static void
8173 usage_remove(void)
8174 {
8175 	fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
8176 	    getprogname());
8177 	exit(1);
8178 }
8179 
8180 static const struct got_error *
8181 print_remove_status(void *arg, unsigned char status,
8182     unsigned char staged_status, const char *path)
8183 {
8184 	while (path[0] == '/')
8185 		path++;
8186 	if (status == GOT_STATUS_NONEXISTENT)
8187 		return NULL;
8188 	if (status == staged_status && (status == GOT_STATUS_DELETE))
8189 		status = GOT_STATUS_NO_CHANGE;
8190 	printf("%c%c %s\n", status, staged_status, path);
8191 	return NULL;
8192 }
8193 
8194 static const struct got_error *
8195 cmd_remove(int argc, char *argv[])
8196 {
8197 	const struct got_error *error = NULL;
8198 	struct got_worktree *worktree = NULL;
8199 	struct got_repository *repo = NULL;
8200 	const char *status_codes = NULL;
8201 	char *cwd = NULL;
8202 	struct got_pathlist_head paths;
8203 	int contains_dir, ch, i, delete_local_mods = 0, can_recurse = 0;
8204 	int ignore_missing_paths = 0, keep_on_disk = 0;
8205 	int *pack_fds = NULL;
8206 
8207 	TAILQ_INIT(&paths);
8208 
8209 #ifndef PROFILE
8210 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8211 	    NULL) == -1)
8212 		err(1, "pledge");
8213 #endif
8214 
8215 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
8216 		switch (ch) {
8217 		case 'f':
8218 			delete_local_mods = 1;
8219 			ignore_missing_paths = 1;
8220 			break;
8221 		case 'k':
8222 			keep_on_disk = 1;
8223 			break;
8224 		case 'R':
8225 			can_recurse = 1;
8226 			break;
8227 		case 's':
8228 			for (i = 0; optarg[i] != '\0'; i++) {
8229 				switch (optarg[i]) {
8230 				case GOT_STATUS_MODIFY:
8231 					delete_local_mods = 1;
8232 					break;
8233 				case GOT_STATUS_MISSING:
8234 					ignore_missing_paths = 1;
8235 					break;
8236 				default:
8237 					errx(1, "invalid status code '%c'",
8238 					    optarg[i]);
8239 				}
8240 			}
8241 			status_codes = optarg;
8242 			break;
8243 		default:
8244 			usage_remove();
8245 			/* NOTREACHED */
8246 		}
8247 	}
8248 
8249 	argc -= optind;
8250 	argv += optind;
8251 
8252 	if (argc < 1)
8253 		usage_remove();
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, GOT_WORKTREE_GOT_DIR);
8266 	if (error) {
8267 		if (error->code == GOT_ERR_NOT_WORKTREE)
8268 			error = wrap_not_worktree_error(error, "remove", 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)
8275 		goto done;
8276 
8277 	error = apply_unveil(got_repo_get_path(repo), 1,
8278 	    got_worktree_get_root_path(worktree));
8279 	if (error)
8280 		goto done;
8281 
8282 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8283 	if (error)
8284 		goto done;
8285 
8286 	if (!can_recurse) {
8287 		error = pathlist_contains_directory(&contains_dir, worktree,
8288 		    &paths);
8289 		if (error != NULL)
8290 			goto done;
8291 
8292 		if (contains_dir) {
8293 			error = got_error_msg(GOT_ERR_BAD_PATH,
8294 			    "removing directories requires -R option");
8295 			goto done;
8296 		}
8297 	}
8298 
8299 	error = got_worktree_schedule_delete(worktree, &paths,
8300 	    delete_local_mods, status_codes, print_remove_status, NULL,
8301 	    repo, keep_on_disk, ignore_missing_paths);
8302 done:
8303 	if (repo) {
8304 		const struct got_error *close_err = got_repo_close(repo);
8305 		if (error == NULL)
8306 			error = close_err;
8307 	}
8308 	if (worktree)
8309 		got_worktree_close(worktree);
8310 	if (pack_fds) {
8311 		const struct got_error *pack_err =
8312 		    got_repo_pack_fds_close(pack_fds);
8313 		if (error == NULL)
8314 			error = pack_err;
8315 	}
8316 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8317 	free(cwd);
8318 	return error;
8319 }
8320 
8321 __dead static void
8322 usage_patch(void)
8323 {
8324 	fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8325 	    "[patchfile]\n", getprogname());
8326 	exit(1);
8327 }
8328 
8329 static const struct got_error *
8330 patch_from_stdin(int *patchfd)
8331 {
8332 	const struct got_error *err = NULL;
8333 	ssize_t r;
8334 	char buf[BUFSIZ];
8335 	sig_t sighup, sigint, sigquit;
8336 
8337 	*patchfd = got_opentempfd();
8338 	if (*patchfd == -1)
8339 		return got_error_from_errno("got_opentempfd");
8340 
8341 	sighup = signal(SIGHUP, SIG_DFL);
8342 	sigint = signal(SIGINT, SIG_DFL);
8343 	sigquit = signal(SIGQUIT, SIG_DFL);
8344 
8345 	for (;;) {
8346 		r = read(0, buf, sizeof(buf));
8347 		if (r == -1) {
8348 			err = got_error_from_errno("read");
8349 			break;
8350 		}
8351 		if (r == 0)
8352 			break;
8353 		if (write(*patchfd, buf, r) == -1) {
8354 			err = got_error_from_errno("write");
8355 			break;
8356 		}
8357 	}
8358 
8359 	signal(SIGHUP, sighup);
8360 	signal(SIGINT, sigint);
8361 	signal(SIGQUIT, sigquit);
8362 
8363 	if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8364 		err = got_error_from_errno("lseek");
8365 
8366 	if (err != NULL) {
8367 		close(*patchfd);
8368 		*patchfd = -1;
8369 	}
8370 
8371 	return err;
8372 }
8373 
8374 struct got_patch_progress_arg {
8375 	int did_something;
8376 	int conflicts;
8377 	int rejects;
8378 };
8379 
8380 static const struct got_error *
8381 patch_progress(void *arg, const char *old, const char *new,
8382     unsigned char status, const struct got_error *error, int old_from,
8383     int old_lines, int new_from, int new_lines, int offset,
8384     int ws_mangled, const struct got_error *hunk_err)
8385 {
8386 	const char *path = new == NULL ? old : new;
8387 	struct got_patch_progress_arg *a = arg;
8388 
8389 	while (*path == '/')
8390 		path++;
8391 
8392 	if (status != GOT_STATUS_NO_CHANGE &&
8393 	    status != 0 /* per-hunk progress */) {
8394 		printf("%c  %s\n", status, path);
8395 		a->did_something = 1;
8396 	}
8397 
8398 	if (hunk_err == NULL) {
8399 		if (status == GOT_STATUS_CANNOT_UPDATE)
8400 			a->rejects++;
8401 		else if (status == GOT_STATUS_CONFLICT)
8402 			a->conflicts++;
8403 	}
8404 
8405 	if (error != NULL)
8406 		fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8407 
8408 	if (offset != 0 || hunk_err != NULL || ws_mangled) {
8409 		printf("@@ -%d,%d +%d,%d @@ ", old_from,
8410 		    old_lines, new_from, new_lines);
8411 		if (hunk_err != NULL)
8412 			printf("%s\n", hunk_err->msg);
8413 		else if (offset != 0)
8414 			printf("applied with offset %d\n", offset);
8415 		else
8416 			printf("hunk contains mangled whitespace\n");
8417 	}
8418 
8419 	return NULL;
8420 }
8421 
8422 static void
8423 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
8424 {
8425 	if (!ppa->did_something)
8426 		return;
8427 
8428 	if (ppa->conflicts > 0)
8429 		printf("Files with merge conflicts: %d\n", ppa->conflicts);
8430 
8431 	if (ppa->rejects > 0) {
8432 		printf("Files where patch failed to apply: %d\n",
8433 		    ppa->rejects);
8434 	}
8435 }
8436 
8437 static const struct got_error *
8438 cmd_patch(int argc, char *argv[])
8439 {
8440 	const struct got_error *error = NULL, *close_error = NULL;
8441 	struct got_worktree *worktree = NULL;
8442 	struct got_repository *repo = NULL;
8443 	struct got_reflist_head refs;
8444 	struct got_object_id *commit_id = NULL;
8445 	const char *commit_id_str = NULL;
8446 	struct stat sb;
8447 	const char *errstr;
8448 	char *cwd = NULL, *keyword_idstr = NULL;
8449 	int ch, nop = 0, strip = -1, reverse = 0;
8450 	int patchfd;
8451 	int *pack_fds = NULL;
8452 	struct got_patch_progress_arg ppa;
8453 
8454 	TAILQ_INIT(&refs);
8455 
8456 #ifndef PROFILE
8457 	if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8458 	    "unveil", NULL) == -1)
8459 		err(1, "pledge");
8460 #endif
8461 
8462 	while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8463 		switch (ch) {
8464 		case 'c':
8465 			commit_id_str = optarg;
8466 			break;
8467 		case 'n':
8468 			nop = 1;
8469 			break;
8470 		case 'p':
8471 			strip = strtonum(optarg, 0, INT_MAX, &errstr);
8472 			if (errstr != NULL)
8473 				errx(1, "pathname strip count is %s: %s",
8474 				     errstr, optarg);
8475 			break;
8476 		case 'R':
8477 			reverse = 1;
8478 			break;
8479 		default:
8480 			usage_patch();
8481 			/* NOTREACHED */
8482 		}
8483 	}
8484 
8485 	argc -= optind;
8486 	argv += optind;
8487 
8488 	if (argc == 0) {
8489 		error = patch_from_stdin(&patchfd);
8490 		if (error)
8491 			return error;
8492 	} else if (argc == 1) {
8493 		patchfd = open(argv[0], O_RDONLY);
8494 		if (patchfd == -1) {
8495 			error = got_error_from_errno2("open", argv[0]);
8496 			return error;
8497 		}
8498 		if (fstat(patchfd, &sb) == -1) {
8499 			error = got_error_from_errno2("fstat", argv[0]);
8500 			goto done;
8501 		}
8502 		if (!S_ISREG(sb.st_mode)) {
8503 			error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8504 			goto done;
8505 		}
8506 	} else
8507 		usage_patch();
8508 
8509 	if ((cwd = getcwd(NULL, 0)) == NULL) {
8510 		error = got_error_from_errno("getcwd");
8511 		goto done;
8512 	}
8513 
8514 	error = got_repo_pack_fds_open(&pack_fds);
8515 	if (error != NULL)
8516 		goto done;
8517 
8518 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8519 	if (error != NULL)
8520 		goto done;
8521 
8522 	const char *repo_path = got_worktree_get_repo_path(worktree);
8523 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8524 	if (error != NULL)
8525 		goto done;
8526 
8527 	error = apply_unveil(got_repo_get_path(repo), 0,
8528 	    got_worktree_get_root_path(worktree));
8529 	if (error != NULL)
8530 		goto done;
8531 
8532 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8533 	if (error)
8534 		goto done;
8535 
8536 	if (commit_id_str != NULL) {
8537 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
8538 		    repo, worktree);
8539 		if (error != NULL)
8540 			goto done;
8541 
8542 		error = got_repo_match_object_id(&commit_id, NULL,
8543 		    keyword_idstr != NULL ? keyword_idstr : commit_id_str,
8544 		    GOT_OBJ_TYPE_COMMIT, &refs, repo);
8545 		if (error)
8546 			goto done;
8547 	}
8548 
8549 	memset(&ppa, 0, sizeof(ppa));
8550 	error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8551 	    commit_id, patch_progress, &ppa, check_cancelled, NULL);
8552 	print_patch_progress_stats(&ppa);
8553 done:
8554 	got_ref_list_free(&refs);
8555 	free(keyword_idstr);
8556 	free(commit_id);
8557 	if (repo) {
8558 		close_error = got_repo_close(repo);
8559 		if (error == NULL)
8560 			error = close_error;
8561 	}
8562 	if (worktree != NULL) {
8563 		close_error = got_worktree_close(worktree);
8564 		if (error == NULL)
8565 			error = close_error;
8566 	}
8567 	if (pack_fds) {
8568 		const struct got_error *pack_err =
8569 		    got_repo_pack_fds_close(pack_fds);
8570 		if (error == NULL)
8571 			error = pack_err;
8572 	}
8573 	free(cwd);
8574 	return error;
8575 }
8576 
8577 __dead static void
8578 usage_revert(void)
8579 {
8580 	fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8581 	    getprogname());
8582 	exit(1);
8583 }
8584 
8585 static const struct got_error *
8586 revert_progress(void *arg, unsigned char status, const char *path)
8587 {
8588 	if (status == GOT_STATUS_UNVERSIONED)
8589 		return NULL;
8590 
8591 	while (path[0] == '/')
8592 		path++;
8593 	printf("%c  %s\n", status, path);
8594 	return NULL;
8595 }
8596 
8597 struct choose_patch_arg {
8598 	FILE *patch_script_file;
8599 	const char *action;
8600 };
8601 
8602 static const struct got_error *
8603 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8604     int nchanges, const char *action)
8605 {
8606 	const struct got_error *err;
8607 	char *line = NULL;
8608 	size_t linesize = 0;
8609 	ssize_t linelen;
8610 
8611 	switch (status) {
8612 	case GOT_STATUS_ADD:
8613 		printf("A  %s\n%s this addition? [y/n] ", path, action);
8614 		break;
8615 	case GOT_STATUS_DELETE:
8616 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
8617 		break;
8618 	case GOT_STATUS_MODIFY:
8619 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
8620 			return got_error_from_errno("fseek");
8621 		printf(GOT_COMMIT_SEP_STR);
8622 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8623 			printf("%s", line);
8624 		if (linelen == -1 && ferror(patch_file)) {
8625 			err = got_error_from_errno("getline");
8626 			free(line);
8627 			return err;
8628 		}
8629 		free(line);
8630 		printf(GOT_COMMIT_SEP_STR);
8631 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
8632 		    path, n, nchanges, action);
8633 		break;
8634 	default:
8635 		return got_error_path(path, GOT_ERR_FILE_STATUS);
8636 	}
8637 
8638 	fflush(stdout);
8639 	return NULL;
8640 }
8641 
8642 static const struct got_error *
8643 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8644     FILE *patch_file, int n, int nchanges)
8645 {
8646 	const struct got_error *err = NULL;
8647 	char *line = NULL;
8648 	size_t linesize = 0;
8649 	ssize_t linelen;
8650 	int resp = ' ';
8651 	struct choose_patch_arg *a = arg;
8652 
8653 	*choice = GOT_PATCH_CHOICE_NONE;
8654 
8655 	if (a->patch_script_file) {
8656 		char *nl;
8657 		err = show_change(status, path, patch_file, n, nchanges,
8658 		    a->action);
8659 		if (err)
8660 			return err;
8661 		linelen = getline(&line, &linesize, a->patch_script_file);
8662 		if (linelen == -1) {
8663 			if (ferror(a->patch_script_file))
8664 				return got_error_from_errno("getline");
8665 			return NULL;
8666 		}
8667 		nl = strchr(line, '\n');
8668 		if (nl)
8669 			*nl = '\0';
8670 		if (strcmp(line, "y") == 0) {
8671 			*choice = GOT_PATCH_CHOICE_YES;
8672 			printf("y\n");
8673 		} else if (strcmp(line, "n") == 0) {
8674 			*choice = GOT_PATCH_CHOICE_NO;
8675 			printf("n\n");
8676 		} else if (strcmp(line, "q") == 0 &&
8677 		    status == GOT_STATUS_MODIFY) {
8678 			*choice = GOT_PATCH_CHOICE_QUIT;
8679 			printf("q\n");
8680 		} else
8681 			printf("invalid response '%s'\n", line);
8682 		free(line);
8683 		return NULL;
8684 	}
8685 
8686 	while (resp != 'y' && resp != 'n' && resp != 'q') {
8687 		err = show_change(status, path, patch_file, n, nchanges,
8688 		    a->action);
8689 		if (err)
8690 			return err;
8691 		resp = getchar();
8692 		if (resp == '\n')
8693 			resp = getchar();
8694 		if (status == GOT_STATUS_MODIFY) {
8695 			if (resp != 'y' && resp != 'n' && resp != 'q') {
8696 				printf("invalid response '%c'\n", resp);
8697 				resp = ' ';
8698 			}
8699 		} else if (resp != 'y' && resp != 'n') {
8700 				printf("invalid response '%c'\n", resp);
8701 				resp = ' ';
8702 		}
8703 	}
8704 
8705 	if (resp == 'y')
8706 		*choice = GOT_PATCH_CHOICE_YES;
8707 	else if (resp == 'n')
8708 		*choice = GOT_PATCH_CHOICE_NO;
8709 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8710 		*choice = GOT_PATCH_CHOICE_QUIT;
8711 
8712 	return NULL;
8713 }
8714 
8715 struct wt_commitable_path_arg {
8716 	struct got_pathlist_head	*commit_paths;
8717 	int				*has_changes;
8718 };
8719 
8720 /*
8721  * Shortcut work tree status callback to determine if the set of paths scanned
8722  * has at least one versioned path that is being modified and, if not NULL, is
8723  * in the arg->commit_paths list.  Set arg and return GOT_ERR_FILE_MODIFIED as
8724  * soon as a path is passed with a status that satisfies this criteria.
8725  */
8726 static const struct got_error *
8727 worktree_has_commitable_path(void *arg, unsigned char status,
8728     unsigned char staged_status, const char *path,
8729     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8730     struct got_object_id *commit_id, int dirfd, const char *de_name)
8731 {
8732 	struct wt_commitable_path_arg *a = arg;
8733 
8734 	if (status == staged_status && (status == GOT_STATUS_DELETE))
8735 		status = GOT_STATUS_NO_CHANGE;
8736 
8737 	if (!(status == GOT_STATUS_NO_CHANGE ||
8738 	    status == GOT_STATUS_UNVERSIONED) ||
8739 	    staged_status != GOT_STATUS_NO_CHANGE) {
8740 		if (a->commit_paths != NULL) {
8741 			struct got_pathlist_entry *pe;
8742 
8743 			TAILQ_FOREACH(pe, a->commit_paths, entry) {
8744 				if (strncmp(path, pe->path,
8745 				    pe->path_len) == 0) {
8746 					*a->has_changes = 1;
8747 					break;
8748 				}
8749 			}
8750 		} else
8751 			*a->has_changes = 1;
8752 
8753 		if (*a->has_changes)
8754 			return got_error(GOT_ERR_FILE_MODIFIED);
8755 	}
8756 
8757 	return NULL;
8758 }
8759 
8760 /*
8761  * Check that the changeset of the commit identified by id is
8762  * comprised of at least one modified path that is being committed.
8763  */
8764 static const struct got_error *
8765 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
8766     struct got_object_id *id, struct got_worktree *worktree,
8767     struct got_repository *repo)
8768 {
8769 	const struct got_error		*err;
8770 	struct got_pathlist_head	 paths;
8771 	struct got_commit_object	*commit = NULL, *pcommit = NULL;
8772 	struct got_tree_object		*tree = NULL, *ptree = NULL;
8773 	struct got_object_qid		*pid;
8774 
8775 	TAILQ_INIT(&paths);
8776 
8777 	err = got_object_open_as_commit(&commit, repo, id);
8778 	if (err)
8779 		goto done;
8780 
8781 	err = got_object_open_as_tree(&tree, repo,
8782 	    got_object_commit_get_tree_id(commit));
8783 	if (err)
8784 		goto done;
8785 
8786 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8787 	if (pid != NULL) {
8788 		err = got_object_open_as_commit(&pcommit, repo, &pid->id);
8789 		if (err)
8790 			goto done;
8791 
8792 		err = got_object_open_as_tree(&ptree, repo,
8793 		    got_object_commit_get_tree_id(pcommit));
8794 		if (err)
8795 			goto done;
8796 	}
8797 
8798 	err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
8799 	    got_diff_tree_collect_changed_paths, &paths, 0);
8800 	if (err)
8801 		goto done;
8802 
8803 	err = got_worktree_status(worktree, &paths, repo, 0,
8804 	    worktree_has_commitable_path, wcpa, check_cancelled, NULL);
8805 	if (err && err->code == GOT_ERR_FILE_MODIFIED) {
8806 		/*
8807 		 * At least one changed path in the referenced commit is
8808 		 * modified in the work tree, that's all we need to know!
8809 		 */
8810 		err = NULL;
8811 	}
8812 
8813 done:
8814 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8815 	if (commit)
8816 		got_object_commit_close(commit);
8817 	if (pcommit)
8818 		got_object_commit_close(pcommit);
8819 	if (tree)
8820 		got_object_tree_close(tree);
8821 	if (ptree)
8822 		got_object_tree_close(ptree);
8823 	return err;
8824 }
8825 
8826 /*
8827  * Remove any "logmsg" reference comprised entirely of paths that have
8828  * been reverted in this work tree. If any path in the logmsg ref changeset
8829  * remains in a changed state in the worktree, do not remove the reference.
8830  */
8831 static const struct got_error *
8832 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
8833 {
8834 	const struct got_error		*err;
8835 	struct got_reflist_head		 refs;
8836 	struct got_reflist_entry	*re;
8837 	struct got_commit_object	*commit = NULL;
8838 	struct got_object_id		*commit_id = NULL;
8839 	struct wt_commitable_path_arg	 wcpa;
8840 	char				*uuidstr = NULL;
8841 
8842 	TAILQ_INIT(&refs);
8843 
8844 	err = got_worktree_get_uuid(&uuidstr, worktree);
8845 	if (err)
8846 		goto done;
8847 
8848 	err = got_ref_list(&refs, repo, "refs/got/worktree",
8849 	    got_ref_cmp_by_name, repo);
8850 	if (err)
8851 		goto done;
8852 
8853 	TAILQ_FOREACH(re, &refs, entry) {
8854 		const char	*refname;
8855 		int		 has_changes = 0;
8856 
8857 		refname = got_ref_get_name(re->ref);
8858 
8859 		if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8860 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
8861 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
8862 		else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8863 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
8864 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
8865 		else
8866 			continue;
8867 
8868 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
8869 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8870 		else
8871 			continue;
8872 
8873 		err = got_repo_match_object_id(&commit_id, NULL, refname,
8874 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
8875 		if (err)
8876 			goto done;
8877 
8878 		err = got_object_open_as_commit(&commit, repo, commit_id);
8879 		if (err)
8880 			goto done;
8881 
8882 		wcpa.commit_paths = NULL;
8883 		wcpa.has_changes = &has_changes;
8884 
8885 		err = commit_path_changed_in_worktree(&wcpa, commit_id,
8886 		    worktree, repo);
8887 		if (err)
8888 			goto done;
8889 
8890 		if (!has_changes) {
8891 			err = got_ref_delete(re->ref, repo);
8892 			if (err)
8893 				goto done;
8894 		}
8895 
8896 		got_object_commit_close(commit);
8897 		commit = NULL;
8898 		free(commit_id);
8899 		commit_id = NULL;
8900 	}
8901 
8902 done:
8903 	free(uuidstr);
8904 	free(commit_id);
8905 	got_ref_list_free(&refs);
8906 	if (commit)
8907 		got_object_commit_close(commit);
8908 	return err;
8909 }
8910 
8911 static const struct got_error *
8912 cmd_revert(int argc, char *argv[])
8913 {
8914 	const struct got_error *error = NULL;
8915 	struct got_worktree *worktree = NULL;
8916 	struct got_repository *repo = NULL;
8917 	char *cwd = NULL, *path = NULL;
8918 	struct got_pathlist_head paths;
8919 	int ch, contains_dir, can_recurse = 0, pflag = 0;
8920 	FILE *patch_script_file = NULL;
8921 	const char *patch_script_path = NULL;
8922 	struct choose_patch_arg cpa;
8923 	int *pack_fds = NULL;
8924 
8925 	TAILQ_INIT(&paths);
8926 
8927 #ifndef PROFILE
8928 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8929 	    "unveil", NULL) == -1)
8930 		err(1, "pledge");
8931 #endif
8932 
8933 	while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8934 		switch (ch) {
8935 		case 'F':
8936 			patch_script_path = optarg;
8937 			break;
8938 		case 'p':
8939 			pflag = 1;
8940 			break;
8941 		case 'R':
8942 			can_recurse = 1;
8943 			break;
8944 		default:
8945 			usage_revert();
8946 			/* NOTREACHED */
8947 		}
8948 	}
8949 
8950 	argc -= optind;
8951 	argv += optind;
8952 
8953 	if (argc < 1)
8954 		usage_revert();
8955 	if (patch_script_path && !pflag)
8956 		errx(1, "-F option can only be used together with -p option");
8957 
8958 	cwd = getcwd(NULL, 0);
8959 	if (cwd == NULL) {
8960 		error = got_error_from_errno("getcwd");
8961 		goto done;
8962 	}
8963 
8964 	error = got_repo_pack_fds_open(&pack_fds);
8965 	if (error != NULL)
8966 		goto done;
8967 
8968 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8969 	if (error) {
8970 		if (error->code == GOT_ERR_NOT_WORKTREE)
8971 			error = wrap_not_worktree_error(error, "revert", cwd);
8972 		goto done;
8973 	}
8974 
8975 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8976 	    NULL, pack_fds);
8977 	if (error != NULL)
8978 		goto done;
8979 
8980 	if (patch_script_path) {
8981 		patch_script_file = fopen(patch_script_path, "re");
8982 		if (patch_script_file == NULL) {
8983 			error = got_error_from_errno2("fopen",
8984 			    patch_script_path);
8985 			goto done;
8986 		}
8987 	}
8988 
8989 	/*
8990 	 * XXX "c" perm needed on repo dir to delete merge references.
8991 	 */
8992 	error = apply_unveil(got_repo_get_path(repo), 0,
8993 	    got_worktree_get_root_path(worktree));
8994 	if (error)
8995 		goto done;
8996 
8997 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8998 	if (error)
8999 		goto done;
9000 
9001 	if (!can_recurse) {
9002 		error = pathlist_contains_directory(&contains_dir, worktree,
9003 		    &paths);
9004 		if (error != NULL)
9005 			goto done;
9006 
9007 		if (contains_dir) {
9008 			error = got_error_msg(GOT_ERR_BAD_PATH,
9009 			    "reverting directories requires -R option");
9010 			goto done;
9011 		}
9012 	}
9013 
9014 	cpa.patch_script_file = patch_script_file;
9015 	cpa.action = "revert";
9016 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
9017 	    pflag ? choose_patch : NULL, &cpa, repo);
9018 
9019 	error = rm_logmsg_ref(worktree, repo);
9020 done:
9021 	if (patch_script_file && fclose(patch_script_file) == EOF &&
9022 	    error == NULL)
9023 		error = got_error_from_errno2("fclose", patch_script_path);
9024 	if (repo) {
9025 		const struct got_error *close_err = got_repo_close(repo);
9026 		if (error == NULL)
9027 			error = close_err;
9028 	}
9029 	if (worktree)
9030 		got_worktree_close(worktree);
9031 	if (pack_fds) {
9032 		const struct got_error *pack_err =
9033 		    got_repo_pack_fds_close(pack_fds);
9034 		if (error == NULL)
9035 			error = pack_err;
9036 	}
9037 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9038 	free(path);
9039 	free(cwd);
9040 	return error;
9041 }
9042 
9043 __dead static void
9044 usage_commit(void)
9045 {
9046 	fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
9047 	    "[-m message] [path ...]\n", getprogname());
9048 	exit(1);
9049 }
9050 
9051 struct collect_commit_logmsg_arg {
9052 	const char *cmdline_log;
9053 	const char *prepared_log;
9054 	const char *merged_log;
9055 	int non_interactive;
9056 	const char *editor;
9057 	const char *worktree_path;
9058 	const char *branch_name;
9059 	const char *repo_path;
9060 	char *logmsg_path;
9061 
9062 };
9063 
9064 static const struct got_error *
9065 read_prepared_logmsg(char **logmsg, const char *path)
9066 {
9067 	const struct got_error *err = NULL;
9068 	FILE *f = NULL;
9069 	struct stat sb;
9070 	size_t r;
9071 
9072 	*logmsg = NULL;
9073 	memset(&sb, 0, sizeof(sb));
9074 
9075 	f = fopen(path, "re");
9076 	if (f == NULL)
9077 		return got_error_from_errno2("fopen", path);
9078 
9079 	if (fstat(fileno(f), &sb) == -1) {
9080 		err = got_error_from_errno2("fstat", path);
9081 		goto done;
9082 	}
9083 	if (sb.st_size == 0) {
9084 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
9085 		goto done;
9086 	}
9087 
9088 	*logmsg = malloc(sb.st_size + 1);
9089 	if (*logmsg == NULL) {
9090 		err = got_error_from_errno("malloc");
9091 		goto done;
9092 	}
9093 
9094 	r = fread(*logmsg, 1, sb.st_size, f);
9095 	if (r != sb.st_size) {
9096 		if (ferror(f))
9097 			err = got_error_from_errno2("fread", path);
9098 		else
9099 			err = got_error(GOT_ERR_IO);
9100 		goto done;
9101 	}
9102 	(*logmsg)[sb.st_size] = '\0';
9103 done:
9104 	if (fclose(f) == EOF && err == NULL)
9105 		err = got_error_from_errno2("fclose", path);
9106 	if (err) {
9107 		free(*logmsg);
9108 		*logmsg = NULL;
9109 	}
9110 	return err;
9111 }
9112 
9113 static const struct got_error *
9114 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
9115     const char *diff_path, char **logmsg, void *arg)
9116 {
9117 	char *initial_content = NULL;
9118 	struct got_pathlist_entry *pe;
9119 	const struct got_error *err = NULL;
9120 	char *template = NULL;
9121 	char *prepared_msg = NULL, *merged_msg = NULL;
9122 	struct collect_commit_logmsg_arg *a = arg;
9123 	int initial_content_len;
9124 	int fd = -1;
9125 	size_t len;
9126 
9127 	/* if a message was specified on the command line, just use it */
9128 	if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
9129 		len = strlen(a->cmdline_log) + 1;
9130 		*logmsg = malloc(len + 1);
9131 		if (*logmsg == NULL)
9132 			return got_error_from_errno("malloc");
9133 		strlcpy(*logmsg, a->cmdline_log, len);
9134 		return NULL;
9135 	} else if (a->prepared_log != NULL && a->non_interactive)
9136 		return read_prepared_logmsg(logmsg, a->prepared_log);
9137 
9138 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
9139 		return got_error_from_errno("asprintf");
9140 
9141 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
9142 	if (err)
9143 		goto done;
9144 
9145 	if (a->prepared_log) {
9146 		err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
9147 		if (err)
9148 			goto done;
9149 	} else if (a->merged_log) {
9150 		err = read_prepared_logmsg(&merged_msg, a->merged_log);
9151 		if (err)
9152 			goto done;
9153 	}
9154 
9155 	initial_content_len = asprintf(&initial_content,
9156 	    "%s%s\n# changes to be committed on branch %s:\n",
9157 	    prepared_msg ? prepared_msg : "",
9158 	    merged_msg ? merged_msg : "", a->branch_name);
9159 	if (initial_content_len == -1) {
9160 		err = got_error_from_errno("asprintf");
9161 		goto done;
9162 	}
9163 
9164 	if (write(fd, initial_content, initial_content_len) == -1) {
9165 		err = got_error_from_errno2("write", a->logmsg_path);
9166 		goto done;
9167 	}
9168 
9169 	TAILQ_FOREACH(pe, commitable_paths, entry) {
9170 		struct got_commitable *ct = pe->data;
9171 		dprintf(fd, "#  %c  %s\n",
9172 		    got_commitable_get_status(ct),
9173 		    got_commitable_get_path(ct));
9174 	}
9175 
9176 	if (diff_path) {
9177 		dprintf(fd, "# detailed changes can be viewed in %s\n",
9178 		    diff_path);
9179 	}
9180 
9181 	if (close(fd) == -1) {
9182 		err = got_error_from_errno2("close", a->logmsg_path);
9183 		goto done;
9184 	}
9185 	fd = -1;
9186 
9187 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
9188 	    initial_content_len, a->prepared_log ? 0 : 1);
9189 done:
9190 	free(initial_content);
9191 	free(template);
9192 	free(prepared_msg);
9193 	free(merged_msg);
9194 
9195 	if (fd != -1 && close(fd) == -1 && err == NULL)
9196 		err = got_error_from_errno2("close", a->logmsg_path);
9197 	if (err) {
9198 		free(*logmsg);
9199 		*logmsg = NULL;
9200 	}
9201 	return err;
9202 }
9203 
9204 static const struct got_error *
9205 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
9206     const char *type, int has_content)
9207 {
9208 	const struct got_error	*err = NULL;
9209 	char			*logmsg = NULL;
9210 
9211 	err = got_object_commit_get_logmsg(&logmsg, commit);
9212 	if (err)
9213 		return err;
9214 
9215 	if (fprintf(f, "%s# log message of %s commit %s:%s",
9216 	    has_content ? "\n" : "", type, idstr, logmsg) < 0)
9217 		err = got_ferror(f, GOT_ERR_IO);
9218 
9219 	free(logmsg);
9220 	return err;
9221 }
9222 
9223 /*
9224  * Lookup "logmsg" references of backed-out and cherrypicked commits
9225  * belonging to the current work tree. If found, and the worktree has
9226  * at least one modified file that was changed in the referenced commit,
9227  * add its log message to a new temporary file at *logmsg_path.
9228  * Add all refs found to matched_refs to be scheduled for removal on
9229  * successful commit.
9230  */
9231 static const struct got_error *
9232 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
9233     struct got_reflist_head *matched_refs, struct got_worktree *worktree,
9234     struct got_repository *repo)
9235 {
9236 	const struct got_error		*err;
9237 	struct got_commit_object	*commit = NULL;
9238 	struct got_object_id		*id = NULL;
9239 	struct got_reflist_head		 refs;
9240 	struct got_reflist_entry	*re, *re_match;
9241 	FILE				*f = NULL;
9242 	char				*uuidstr = NULL;
9243 	int				 added_logmsg = 0;
9244 
9245 	TAILQ_INIT(&refs);
9246 
9247 	*logmsg_path = NULL;
9248 
9249 	err = got_worktree_get_uuid(&uuidstr, worktree);
9250 	if (err)
9251 		goto done;
9252 
9253 	err = got_ref_list(&refs, repo, "refs/got/worktree",
9254 	    got_ref_cmp_by_name, repo);
9255 	if (err)
9256 		goto done;
9257 
9258 	TAILQ_FOREACH(re, &refs, entry) {
9259 		const char			*refname, *type;
9260 		struct wt_commitable_path_arg	 wcpa;
9261 		int				 add_logmsg = 0;
9262 
9263 		refname = got_ref_get_name(re->ref);
9264 
9265 		if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
9266 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
9267 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
9268 			type = "cherrypicked";
9269 		} else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
9270 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
9271 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
9272 			type = "backed-out";
9273 		} else
9274 			continue;
9275 
9276 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
9277 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
9278 		else
9279 			continue;
9280 
9281 		err = got_repo_match_object_id(&id, NULL, refname,
9282 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
9283 		if (err)
9284 			goto done;
9285 
9286 		err = got_object_open_as_commit(&commit, repo, id);
9287 		if (err)
9288 			goto done;
9289 
9290 		wcpa.commit_paths = paths;
9291 		wcpa.has_changes = &add_logmsg;
9292 
9293 		err = commit_path_changed_in_worktree(&wcpa, id,
9294 		    worktree, repo);
9295 		if (err)
9296 			goto done;
9297 
9298 		if (add_logmsg) {
9299 			if (f == NULL) {
9300 				err = got_opentemp_named(logmsg_path, &f,
9301 				    "got-commit-logmsg", "");
9302 				if (err)
9303 					goto done;
9304 			}
9305 			err = cat_logmsg(f, commit, refname, type,
9306 			    added_logmsg);
9307 			if (err)
9308 				goto done;
9309 			if (!added_logmsg)
9310 				++added_logmsg;
9311 
9312 			err = got_reflist_entry_dup(&re_match, re);
9313 			if (err)
9314 				goto done;
9315 			TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
9316 		}
9317 
9318 		got_object_commit_close(commit);
9319 		commit = NULL;
9320 		free(id);
9321 		id = NULL;
9322 	}
9323 
9324 done:
9325 	free(id);
9326 	free(uuidstr);
9327 	got_ref_list_free(&refs);
9328 	if (commit)
9329 		got_object_commit_close(commit);
9330 	if (f && fclose(f) == EOF && err == NULL)
9331 		err = got_error_from_errno("fclose");
9332 	if (!added_logmsg) {
9333 		if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
9334 			err = got_error_from_errno2("unlink", *logmsg_path);
9335 		*logmsg_path = NULL;
9336 	}
9337 	return err;
9338 }
9339 
9340 static const struct got_error *
9341 cmd_commit(int argc, char *argv[])
9342 {
9343 	const struct got_error *error = NULL;
9344 	struct got_worktree *worktree = NULL;
9345 	struct got_repository *repo = NULL;
9346 	char *cwd = NULL, *id_str = NULL;
9347 	struct got_object_id *id = NULL;
9348 	const char *logmsg = NULL;
9349 	char *prepared_logmsg = NULL, *merged_logmsg = NULL;
9350 	struct collect_commit_logmsg_arg cl_arg;
9351 	const char *author = NULL;
9352 	char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
9353 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
9354 	int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
9355 	int show_diff = 1, commit_conflicts = 0;
9356 	struct got_pathlist_head paths;
9357 	struct got_reflist_head refs;
9358 	struct got_reflist_entry *re;
9359 	int *pack_fds = NULL;
9360 
9361 	TAILQ_INIT(&refs);
9362 	TAILQ_INIT(&paths);
9363 	cl_arg.logmsg_path = NULL;
9364 
9365 #ifndef PROFILE
9366 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9367 	    "unveil", NULL) == -1)
9368 		err(1, "pledge");
9369 #endif
9370 
9371 	while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
9372 		switch (ch) {
9373 		case 'A':
9374 			author = optarg;
9375 			error = valid_author(author);
9376 			if (error)
9377 				return error;
9378 			break;
9379 		case 'C':
9380 			commit_conflicts = 1;
9381 			break;
9382 		case 'F':
9383 			if (logmsg != NULL)
9384 				option_conflict('F', 'm');
9385 			prepared_logmsg = realpath(optarg, NULL);
9386 			if (prepared_logmsg == NULL)
9387 				return got_error_from_errno2("realpath",
9388 				    optarg);
9389 			break;
9390 		case 'm':
9391 			if (prepared_logmsg)
9392 				option_conflict('m', 'F');
9393 			logmsg = optarg;
9394 			break;
9395 		case 'N':
9396 			non_interactive = 1;
9397 			break;
9398 		case 'n':
9399 			show_diff = 0;
9400 			break;
9401 		case 'S':
9402 			allow_bad_symlinks = 1;
9403 			break;
9404 		default:
9405 			usage_commit();
9406 			/* NOTREACHED */
9407 		}
9408 	}
9409 
9410 	argc -= optind;
9411 	argv += optind;
9412 
9413 	cwd = getcwd(NULL, 0);
9414 	if (cwd == NULL) {
9415 		error = got_error_from_errno("getcwd");
9416 		goto done;
9417 	}
9418 
9419 	error = got_repo_pack_fds_open(&pack_fds);
9420 	if (error != NULL)
9421 		goto done;
9422 
9423 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9424 	if (error) {
9425 		if (error->code == GOT_ERR_NOT_WORKTREE)
9426 			error = wrap_not_worktree_error(error, "commit", cwd);
9427 		goto done;
9428 	}
9429 
9430 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9431 	if (error)
9432 		goto done;
9433 	if (rebase_in_progress) {
9434 		error = got_error(GOT_ERR_REBASING);
9435 		goto done;
9436 	}
9437 
9438 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
9439 	    worktree);
9440 	if (error)
9441 		goto done;
9442 
9443 	error = get_gitconfig_path(&gitconfig_path);
9444 	if (error)
9445 		goto done;
9446 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9447 	    gitconfig_path, pack_fds);
9448 	if (error != NULL)
9449 		goto done;
9450 
9451 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
9452 	if (error)
9453 		goto done;
9454 	if (merge_in_progress) {
9455 		error = got_error(GOT_ERR_MERGE_BUSY);
9456 		goto done;
9457 	}
9458 
9459 	error = get_author(&committer, repo, worktree);
9460 	if (error)
9461 		goto done;
9462 
9463 	if (author == NULL)
9464 		author = committer;
9465 
9466 	if (logmsg == NULL || strlen(logmsg) == 0) {
9467 		error = get_editor(&editor);
9468 		if (error)
9469 			goto done;
9470 		if (unveil(editor, "x") != 0) {
9471 			error = got_error_from_errno2("unveil", editor);
9472 			goto done;
9473 		}
9474 	}
9475 	if (prepared_logmsg) {
9476 		if (unveil(prepared_logmsg, "r") != 0) {
9477 			error = got_error_from_errno2("unveil",
9478 			    prepared_logmsg);
9479 			goto done;
9480 		}
9481 	}
9482 
9483 	error = apply_unveil(got_repo_get_path(repo), 0,
9484 	    got_worktree_get_root_path(worktree));
9485 	if (error)
9486 		goto done;
9487 
9488 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9489 	if (error)
9490 		goto done;
9491 
9492 	if (prepared_logmsg == NULL) {
9493 		error = lookup_logmsg_ref(&merged_logmsg,
9494 		    argc > 0 ? &paths : NULL, &refs, worktree, repo);
9495 		if (error)
9496 			goto done;
9497 	}
9498 
9499 	cl_arg.editor = editor;
9500 	cl_arg.cmdline_log = logmsg;
9501 	cl_arg.prepared_log = prepared_logmsg;
9502 	cl_arg.merged_log = merged_logmsg;
9503 	cl_arg.non_interactive = non_interactive;
9504 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
9505 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
9506 	if (!histedit_in_progress) {
9507 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
9508 			error = got_error(GOT_ERR_COMMIT_BRANCH);
9509 			goto done;
9510 		}
9511 		cl_arg.branch_name += 11;
9512 	}
9513 	cl_arg.repo_path = got_repo_get_path(repo);
9514 	error = got_worktree_commit(&id, worktree, &paths, author, committer,
9515 	    allow_bad_symlinks, show_diff, commit_conflicts,
9516 	    collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
9517 	if (error) {
9518 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
9519 		    cl_arg.logmsg_path != NULL)
9520 			preserve_logmsg = 1;
9521 		goto done;
9522 	}
9523 
9524 	error = got_object_id_str(&id_str, id);
9525 	if (error)
9526 		goto done;
9527 	printf("Created commit %s\n", id_str);
9528 
9529 	TAILQ_FOREACH(re, &refs, entry) {
9530 		error = got_ref_delete(re->ref, repo);
9531 		if (error)
9532 			goto done;
9533 	}
9534 
9535 done:
9536 	if (preserve_logmsg) {
9537 		fprintf(stderr, "%s: log message preserved in %s\n",
9538 		    getprogname(), cl_arg.logmsg_path);
9539 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
9540 	    error == NULL)
9541 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
9542 	free(cl_arg.logmsg_path);
9543 	if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
9544 		error = got_error_from_errno2("unlink", merged_logmsg);
9545 	free(merged_logmsg);
9546 	if (repo) {
9547 		const struct got_error *close_err = got_repo_close(repo);
9548 		if (error == NULL)
9549 			error = close_err;
9550 	}
9551 	if (worktree)
9552 		got_worktree_close(worktree);
9553 	if (pack_fds) {
9554 		const struct got_error *pack_err =
9555 		    got_repo_pack_fds_close(pack_fds);
9556 		if (error == NULL)
9557 			error = pack_err;
9558 	}
9559 	got_ref_list_free(&refs);
9560 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9561 	free(cwd);
9562 	free(id_str);
9563 	free(gitconfig_path);
9564 	free(editor);
9565 	free(committer);
9566 	free(prepared_logmsg);
9567 	return error;
9568 }
9569 
9570 __dead static void
9571 usage_send(void)
9572 {
9573 	fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
9574 	    "[-r repository-path] [-t tag] [remote-repository]\n",
9575 	    getprogname());
9576 	exit(1);
9577 }
9578 
9579 static void
9580 print_load_info(int print_colored, int print_found, int print_trees,
9581     int ncolored, int nfound, int ntrees)
9582 {
9583 	if (print_colored) {
9584 		printf("%d commit%s colored", ncolored,
9585 		    ncolored == 1 ? "" : "s");
9586 	}
9587 	if (print_found) {
9588 		printf("%s%d object%s found",
9589 		    ncolored > 0 ? "; " : "",
9590 		    nfound, nfound == 1 ? "" : "s");
9591 	}
9592 	if (print_trees) {
9593 		printf("; %d tree%s scanned", ntrees,
9594 		    ntrees == 1 ? "" : "s");
9595 	}
9596 }
9597 
9598 struct got_send_progress_arg {
9599 	char last_scaled_packsize[FMT_SCALED_STRSIZE];
9600 	int verbosity;
9601 	int last_ncolored;
9602 	int last_nfound;
9603 	int last_ntrees;
9604 	int loading_done;
9605 	int last_ncommits;
9606 	int last_nobj_total;
9607 	int last_p_deltify;
9608 	int last_p_written;
9609 	int last_p_sent;
9610 	int printed_something;
9611 	int sent_something;
9612 	struct got_pathlist_head *delete_branches;
9613 };
9614 
9615 static const struct got_error *
9616 send_progress(void *arg, int ncolored, int nfound, int ntrees,
9617     off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
9618     int nobj_written, off_t bytes_sent, const char *refname,
9619     const char *errmsg, int success)
9620 {
9621 	struct got_send_progress_arg *a = arg;
9622 	char scaled_packsize[FMT_SCALED_STRSIZE];
9623 	char scaled_sent[FMT_SCALED_STRSIZE];
9624 	int p_deltify = 0, p_written = 0, p_sent = 0;
9625 	int print_colored = 0, print_found = 0, print_trees = 0;
9626 	int print_searching = 0, print_total = 0;
9627 	int print_deltify = 0, print_written = 0, print_sent = 0;
9628 
9629 	if (a->verbosity < 0)
9630 		return NULL;
9631 
9632 	if (refname) {
9633 		const char *status = success ? "accepted" : "rejected";
9634 
9635 		if (success) {
9636 			struct got_pathlist_entry *pe;
9637 			TAILQ_FOREACH(pe, a->delete_branches, entry) {
9638 				const char *branchname = pe->path;
9639 				if (got_path_cmp(branchname, refname,
9640 				    strlen(branchname), strlen(refname)) == 0) {
9641 					status = "deleted";
9642 					a->sent_something = 1;
9643 					break;
9644 				}
9645 			}
9646 		}
9647 
9648 		if (a->printed_something)
9649 			putchar('\n');
9650 		printf("Server has %s %s", status, refname);
9651 		if (errmsg)
9652 			printf(": %s", errmsg);
9653 		a->printed_something = 1;
9654 		return NULL;
9655 	}
9656 
9657 	if (a->last_ncolored != ncolored) {
9658 		print_colored = 1;
9659 		a->last_ncolored = ncolored;
9660 	}
9661 
9662 	if (a->last_nfound != nfound) {
9663 		print_colored = 1;
9664 		print_found = 1;
9665 		a->last_nfound = nfound;
9666 	}
9667 
9668 	if (a->last_ntrees != ntrees) {
9669 		print_colored = 1;
9670 		print_found = 1;
9671 		print_trees = 1;
9672 		a->last_ntrees = ntrees;
9673 	}
9674 
9675 	if ((print_colored || print_found || print_trees) &&
9676 	    !a->loading_done) {
9677 		printf("\r");
9678 		print_load_info(print_colored, print_found, print_trees,
9679 		    ncolored, nfound, ntrees);
9680 		a->printed_something = 1;
9681 		fflush(stdout);
9682 		return NULL;
9683 	} else if (!a->loading_done) {
9684 		printf("\r");
9685 		print_load_info(1, 1, 1, ncolored, nfound, ntrees);
9686 		printf("\n");
9687 		a->loading_done = 1;
9688 	}
9689 
9690 	if (fmt_scaled(packfile_size, scaled_packsize) == -1)
9691 		return got_error_from_errno("fmt_scaled");
9692 	if (fmt_scaled(bytes_sent, scaled_sent) == -1)
9693 		return got_error_from_errno("fmt_scaled");
9694 
9695 	if (a->last_ncommits != ncommits) {
9696 		print_searching = 1;
9697 		a->last_ncommits = ncommits;
9698 	}
9699 
9700 	if (a->last_nobj_total != nobj_total) {
9701 		print_searching = 1;
9702 		print_total = 1;
9703 		a->last_nobj_total = nobj_total;
9704 	}
9705 
9706 	if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9707 	    strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9708 		if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9709 		    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9710 			return got_error(GOT_ERR_NO_SPACE);
9711 	}
9712 
9713 	if (nobj_deltify > 0 || nobj_written > 0) {
9714 		if (nobj_deltify > 0) {
9715 			p_deltify = (nobj_deltify * 100) / nobj_total;
9716 			if (p_deltify != a->last_p_deltify) {
9717 				a->last_p_deltify = p_deltify;
9718 				print_searching = 1;
9719 				print_total = 1;
9720 				print_deltify = 1;
9721 			}
9722 		}
9723 		if (nobj_written > 0) {
9724 			p_written = (nobj_written * 100) / nobj_total;
9725 			if (p_written != a->last_p_written) {
9726 				a->last_p_written = p_written;
9727 				print_searching = 1;
9728 				print_total = 1;
9729 				print_deltify = 1;
9730 				print_written = 1;
9731 			}
9732 		}
9733 	}
9734 
9735 	if (bytes_sent > 0) {
9736 		p_sent = (bytes_sent * 100) / packfile_size;
9737 		if (p_sent != a->last_p_sent) {
9738 			a->last_p_sent = p_sent;
9739 			print_searching = 1;
9740 			print_total = 1;
9741 			print_deltify = 1;
9742 			print_written = 1;
9743 			print_sent = 1;
9744 		}
9745 		a->sent_something = 1;
9746 	}
9747 
9748 	if (print_searching || print_total || print_deltify || print_written ||
9749 	    print_sent)
9750 		printf("\r");
9751 	if (print_searching)
9752 		printf("packing %d reference%s", ncommits,
9753 		    ncommits == 1 ? "" : "s");
9754 	if (print_total)
9755 		printf("; %d object%s", nobj_total,
9756 		    nobj_total == 1 ? "" : "s");
9757 	if (print_deltify)
9758 		printf("; deltify: %d%%", p_deltify);
9759 	if (print_sent)
9760 		printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9761 		    scaled_packsize, p_sent);
9762 	else if (print_written)
9763 		printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9764 		    scaled_packsize, p_written);
9765 	if (print_searching || print_total || print_deltify ||
9766 	    print_written || print_sent) {
9767 		a->printed_something = 1;
9768 		fflush(stdout);
9769 	}
9770 	return NULL;
9771 }
9772 
9773 static const struct got_error *
9774 cmd_send(int argc, char *argv[])
9775 {
9776 	const struct got_error *error = NULL;
9777 	char *cwd = NULL, *repo_path = NULL;
9778 	const char *remote_name;
9779 	char *proto = NULL, *host = NULL, *port = NULL;
9780 	char *repo_name = NULL, *server_path = NULL;
9781 	const struct got_remote_repo *remotes;
9782 	struct got_remote_repo *remote = NULL;
9783 	int nremotes, nbranches = 0, ndelete_branches = 0;
9784 	struct got_repository *repo = NULL;
9785 	struct got_worktree *worktree = NULL;
9786 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9787 	struct got_pathlist_head branches;
9788 	struct got_pathlist_head tags;
9789 	struct got_reflist_head all_branches;
9790 	struct got_reflist_head all_tags;
9791 	struct got_pathlist_head delete_args;
9792 	struct got_pathlist_head delete_branches;
9793 	struct got_reflist_entry *re;
9794 	struct got_pathlist_entry *pe;
9795 	int i, ch, sendfd = -1, sendstatus;
9796 	pid_t sendpid = -1;
9797 	struct got_send_progress_arg spa;
9798 	int verbosity = 0, overwrite_refs = 0;
9799 	int send_all_branches = 0, send_all_tags = 0;
9800 	struct got_reference *ref = NULL;
9801 	int *pack_fds = NULL;
9802 
9803 	TAILQ_INIT(&branches);
9804 	TAILQ_INIT(&tags);
9805 	TAILQ_INIT(&all_branches);
9806 	TAILQ_INIT(&all_tags);
9807 	TAILQ_INIT(&delete_args);
9808 	TAILQ_INIT(&delete_branches);
9809 
9810 	while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9811 		switch (ch) {
9812 		case 'a':
9813 			send_all_branches = 1;
9814 			break;
9815 		case 'b':
9816 			error = got_pathlist_append(&branches, optarg, NULL);
9817 			if (error)
9818 				return error;
9819 			nbranches++;
9820 			break;
9821 		case 'd':
9822 			error = got_pathlist_append(&delete_args, optarg, NULL);
9823 			if (error)
9824 				return error;
9825 			break;
9826 		case 'f':
9827 			overwrite_refs = 1;
9828 			break;
9829 		case 'q':
9830 			verbosity = -1;
9831 			break;
9832 		case 'r':
9833 			repo_path = realpath(optarg, NULL);
9834 			if (repo_path == NULL)
9835 				return got_error_from_errno2("realpath",
9836 				    optarg);
9837 			got_path_strip_trailing_slashes(repo_path);
9838 			break;
9839 		case 'T':
9840 			send_all_tags = 1;
9841 			break;
9842 		case 't':
9843 			error = got_pathlist_append(&tags, optarg, NULL);
9844 			if (error)
9845 				return error;
9846 			break;
9847 		case 'v':
9848 			if (verbosity < 0)
9849 				verbosity = 0;
9850 			else if (verbosity < 3)
9851 				verbosity++;
9852 			break;
9853 		default:
9854 			usage_send();
9855 			/* NOTREACHED */
9856 		}
9857 	}
9858 	argc -= optind;
9859 	argv += optind;
9860 
9861 	if (send_all_branches && !TAILQ_EMPTY(&branches))
9862 		option_conflict('a', 'b');
9863 	if (send_all_tags && !TAILQ_EMPTY(&tags))
9864 		option_conflict('T', 't');
9865 
9866 
9867 	if (argc == 0)
9868 		remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9869 	else if (argc == 1)
9870 		remote_name = argv[0];
9871 	else
9872 		usage_send();
9873 
9874 	cwd = getcwd(NULL, 0);
9875 	if (cwd == NULL) {
9876 		error = got_error_from_errno("getcwd");
9877 		goto done;
9878 	}
9879 
9880 	error = got_repo_pack_fds_open(&pack_fds);
9881 	if (error != NULL)
9882 		goto done;
9883 
9884 	if (repo_path == NULL) {
9885 		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9886 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
9887 			goto done;
9888 		else
9889 			error = NULL;
9890 		if (worktree) {
9891 			repo_path =
9892 			    strdup(got_worktree_get_repo_path(worktree));
9893 			if (repo_path == NULL)
9894 				error = got_error_from_errno("strdup");
9895 			if (error)
9896 				goto done;
9897 		} else {
9898 			repo_path = strdup(cwd);
9899 			if (repo_path == NULL) {
9900 				error = got_error_from_errno("strdup");
9901 				goto done;
9902 			}
9903 		}
9904 	}
9905 
9906 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9907 	if (error)
9908 		goto done;
9909 
9910 	if (worktree) {
9911 		worktree_conf = got_worktree_get_gotconfig(worktree);
9912 		if (worktree_conf) {
9913 			got_gotconfig_get_remotes(&nremotes, &remotes,
9914 			    worktree_conf);
9915 			for (i = 0; i < nremotes; i++) {
9916 				if (strcmp(remotes[i].name, remote_name) == 0) {
9917 					error = got_repo_remote_repo_dup(&remote,
9918 					    &remotes[i]);
9919 					if (error)
9920 						goto done;
9921 					break;
9922 				}
9923 			}
9924 		}
9925 	}
9926 	if (remote == NULL) {
9927 		repo_conf = got_repo_get_gotconfig(repo);
9928 		if (repo_conf) {
9929 			got_gotconfig_get_remotes(&nremotes, &remotes,
9930 			    repo_conf);
9931 			for (i = 0; i < nremotes; i++) {
9932 				if (strcmp(remotes[i].name, remote_name) == 0) {
9933 					error = got_repo_remote_repo_dup(&remote,
9934 					    &remotes[i]);
9935 					if (error)
9936 						goto done;
9937 					break;
9938 				}
9939 			}
9940 		}
9941 	}
9942 	if (remote == NULL) {
9943 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9944 		for (i = 0; i < nremotes; i++) {
9945 			if (strcmp(remotes[i].name, remote_name) == 0) {
9946 				error = got_repo_remote_repo_dup(&remote,
9947 				    &remotes[i]);
9948 				if (error)
9949 					goto done;
9950 				break;
9951 			}
9952 		}
9953 	}
9954 	if (remote == NULL) {
9955 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9956 		goto done;
9957 	}
9958 
9959 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9960 	    &repo_name, remote->send_url);
9961 	if (error)
9962 		goto done;
9963 
9964 	if (strcmp(proto, "git") == 0) {
9965 #ifndef PROFILE
9966 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9967 		    "sendfd dns inet unveil", NULL) == -1)
9968 			err(1, "pledge");
9969 #endif
9970 	} else if (strcmp(proto, "git+ssh") == 0 ||
9971 	    strcmp(proto, "ssh") == 0) {
9972 #ifndef PROFILE
9973 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9974 		    "sendfd unveil", NULL) == -1)
9975 			err(1, "pledge");
9976 #endif
9977 	} else if (strcmp(proto, "http") == 0 ||
9978 	    strcmp(proto, "git+http") == 0) {
9979 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9980 		goto done;
9981 	} else {
9982 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9983 		goto done;
9984 	}
9985 
9986 	error = got_dial_apply_unveil(proto);
9987 	if (error)
9988 		goto done;
9989 
9990 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9991 	if (error)
9992 		goto done;
9993 
9994 	if (send_all_branches) {
9995 		error = got_ref_list(&all_branches, repo, "refs/heads",
9996 		    got_ref_cmp_by_name, NULL);
9997 		if (error)
9998 			goto done;
9999 		TAILQ_FOREACH(re, &all_branches, entry) {
10000 			const char *branchname = got_ref_get_name(re->ref);
10001 			error = got_pathlist_append(&branches,
10002 			    branchname, NULL);
10003 			if (error)
10004 				goto done;
10005 			nbranches++;
10006 		}
10007 	} else if (nbranches == 0) {
10008 		for (i = 0; i < remote->nsend_branches; i++) {
10009 			error = got_pathlist_append(&branches,
10010 			    remote->send_branches[i], NULL);
10011 			if (error)
10012 				goto done;
10013 		}
10014 	}
10015 
10016 	if (send_all_tags) {
10017 		error = got_ref_list(&all_tags, repo, "refs/tags",
10018 		    got_ref_cmp_by_name, NULL);
10019 		if (error)
10020 			goto done;
10021 		TAILQ_FOREACH(re, &all_tags, entry) {
10022 			const char *tagname = got_ref_get_name(re->ref);
10023 			error = got_pathlist_append(&tags,
10024 			    tagname, NULL);
10025 			if (error)
10026 				goto done;
10027 		}
10028 	}
10029 
10030 	/*
10031 	 * To prevent accidents only branches in refs/heads/ can be deleted
10032 	 * with 'got send -d'.
10033 	 * Deleting anything else requires local repository access or Git.
10034 	 */
10035 	TAILQ_FOREACH(pe, &delete_args, entry) {
10036 		const char *branchname = pe->path;
10037 		char *s;
10038 		struct got_pathlist_entry *new;
10039 		if (strncmp(branchname, "refs/heads/", 11) == 0) {
10040 			s = strdup(branchname);
10041 			if (s == NULL) {
10042 				error = got_error_from_errno("strdup");
10043 				goto done;
10044 			}
10045 		} else {
10046 			if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
10047 				error = got_error_from_errno("asprintf");
10048 				goto done;
10049 			}
10050 		}
10051 		error = got_pathlist_insert(&new, &delete_branches, s, NULL);
10052 		if (error || new == NULL /* duplicate */)
10053 			free(s);
10054 		if (error)
10055 			goto done;
10056 		ndelete_branches++;
10057 	}
10058 
10059 	if (nbranches == 0 && ndelete_branches == 0) {
10060 		struct got_reference *head_ref;
10061 		if (worktree)
10062 			error = got_ref_open(&head_ref, repo,
10063 			    got_worktree_get_head_ref_name(worktree), 0);
10064 		else
10065 			error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
10066 		if (error)
10067 			goto done;
10068 		if (got_ref_is_symbolic(head_ref)) {
10069 			error = got_ref_resolve_symbolic(&ref, repo, head_ref);
10070 			got_ref_close(head_ref);
10071 			if (error)
10072 				goto done;
10073 		} else
10074 			ref = head_ref;
10075 		error = got_pathlist_append(&branches, got_ref_get_name(ref),
10076 		    NULL);
10077 		if (error)
10078 			goto done;
10079 		nbranches++;
10080 	}
10081 
10082 	if (worktree) {
10083 		/* Release work tree lock. */
10084 		got_worktree_close(worktree);
10085 		worktree = NULL;
10086 	}
10087 
10088 	if (verbosity >= 0) {
10089 		printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
10090 		    remote->name, proto, host,
10091 		    port ? ":" : "", port ? port : "",
10092 		    *server_path == '/' ? "" : "/", server_path);
10093 	}
10094 
10095 	error = got_send_connect(&sendpid, &sendfd, proto, host, port,
10096 	    server_path, verbosity);
10097 	if (error)
10098 		goto done;
10099 
10100 	memset(&spa, 0, sizeof(spa));
10101 	spa.last_scaled_packsize[0] = '\0';
10102 	spa.last_p_deltify = -1;
10103 	spa.last_p_written = -1;
10104 	spa.verbosity = verbosity;
10105 	spa.delete_branches = &delete_branches;
10106 	error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
10107 	    verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
10108 	    check_cancelled, NULL);
10109 	if (spa.printed_something)
10110 		putchar('\n');
10111 	if (error)
10112 		goto done;
10113 	if (!spa.sent_something && verbosity >= 0)
10114 		printf("Already up-to-date\n");
10115 done:
10116 	if (sendpid > 0) {
10117 		if (kill(sendpid, SIGTERM) == -1)
10118 			error = got_error_from_errno("kill");
10119 		if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
10120 			error = got_error_from_errno("waitpid");
10121 	}
10122 	if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
10123 		error = got_error_from_errno("close");
10124 	if (repo) {
10125 		const struct got_error *close_err = got_repo_close(repo);
10126 		if (error == NULL)
10127 			error = close_err;
10128 	}
10129 	if (worktree)
10130 		got_worktree_close(worktree);
10131 	if (pack_fds) {
10132 		const struct got_error *pack_err =
10133 		    got_repo_pack_fds_close(pack_fds);
10134 		if (error == NULL)
10135 			error = pack_err;
10136 	}
10137 	if (ref)
10138 		got_ref_close(ref);
10139 	got_repo_free_remote_repo_data(remote);
10140 	free(remote);
10141 	got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
10142 	got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
10143 	got_ref_list_free(&all_branches);
10144 	got_ref_list_free(&all_tags);
10145 	got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
10146 	got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
10147 	free(cwd);
10148 	free(repo_path);
10149 	free(proto);
10150 	free(host);
10151 	free(port);
10152 	free(server_path);
10153 	free(repo_name);
10154 	return error;
10155 }
10156 
10157 /*
10158  * Print and if delete is set delete all ref_prefix references.
10159  * If wanted_ref is not NULL, only print or delete this reference.
10160  */
10161 static const struct got_error *
10162 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
10163     const char *wanted_ref, int delete, struct got_worktree *worktree,
10164     struct got_repository *repo)
10165 {
10166 	const struct got_error			*err;
10167 	struct got_pathlist_head		 paths;
10168 	struct got_reflist_head			 refs;
10169 	struct got_reflist_entry		*re;
10170 	struct got_reflist_object_id_map	*refs_idmap = NULL;
10171 	struct got_commit_object		*commit = NULL;
10172 	struct got_object_id			*id = NULL;
10173 	const char				*header_prefix;
10174 	char					*uuidstr = NULL;
10175 	int					 found = 0;
10176 
10177 	TAILQ_INIT(&refs);
10178 	TAILQ_INIT(&paths);
10179 
10180 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
10181 	if (err)
10182 		goto done;
10183 
10184 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10185 	if (err)
10186 		goto done;
10187 
10188 	if (worktree != NULL) {
10189 		err = got_worktree_get_uuid(&uuidstr, worktree);
10190 		if (err)
10191 			goto done;
10192 	}
10193 
10194 	if (wanted_ref) {
10195 		if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
10196 			wanted_ref += 11;
10197 	}
10198 
10199 	if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
10200 		header_prefix = "backout";
10201 	else
10202 		header_prefix = "cherrypick";
10203 
10204 	TAILQ_FOREACH(re, &refs, entry) {
10205 		const char *refname, *wt;
10206 
10207 		refname = got_ref_get_name(re->ref);
10208 
10209 		err = check_cancelled(NULL);
10210 		if (err)
10211 			goto done;
10212 
10213 		if (strncmp(refname, ref_prefix, prefix_len) == 0)
10214 			refname += prefix_len + 1;  /* skip '-' delimiter */
10215 		else
10216 			continue;
10217 
10218 		wt = refname;
10219 
10220 		if (worktree == NULL || strncmp(refname, uuidstr,
10221 		    GOT_WORKTREE_UUID_STRLEN) == 0)
10222 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
10223 		else
10224 			continue;
10225 
10226 		err = got_repo_match_object_id(&id, NULL, refname,
10227 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
10228 		if (err)
10229 			goto done;
10230 
10231 		err = got_object_open_as_commit(&commit, repo, id);
10232 		if (err)
10233 			goto done;
10234 
10235 		if (wanted_ref)
10236 			found = strncmp(wanted_ref, refname,
10237 			    strlen(wanted_ref)) == 0;
10238 		if (wanted_ref && !found) {
10239 			struct got_reflist_head	*ci_refs;
10240 
10241 			ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
10242 			    id);
10243 
10244 			if (ci_refs) {
10245 				char		*refs_str = NULL;
10246 				char const	*r = NULL;
10247 
10248 				err = build_refs_str(&refs_str, ci_refs, id,
10249 				    repo, 1);
10250 				if (err)
10251 					goto done;
10252 
10253 				r = refs_str;
10254 				while (r) {
10255 					if (strncmp(r, wanted_ref,
10256 					    strlen(wanted_ref)) == 0) {
10257 						found = 1;
10258 						break;
10259 					}
10260 					r = strchr(r, ' ');
10261 					if (r)
10262 						++r;
10263 				}
10264 				free(refs_str);
10265 			}
10266 		}
10267 
10268 		if (wanted_ref == NULL || found) {
10269 			if (delete) {
10270 				err = got_ref_delete(re->ref, repo);
10271 				if (err)
10272 					goto done;
10273 				printf("Deleted: ");
10274 				err = print_commit_oneline(commit, id, repo,
10275 				    refs_idmap);
10276 			} else {
10277 				/*
10278 				 * Print paths modified by commit to help
10279 				 * associate commits with worktree changes.
10280 				 */
10281 				err = get_changed_paths(&paths, commit,
10282 				    repo, NULL);
10283 				if (err)
10284 					goto done;
10285 
10286 				err = print_commit(commit, id, repo, NULL,
10287 				    &paths, NULL, 0, 0, refs_idmap, NULL,
10288 				    header_prefix);
10289 				got_pathlist_free(&paths,
10290 				    GOT_PATHLIST_FREE_ALL);
10291 
10292 				if (worktree == NULL)
10293 					printf("work tree: %.*s\n\n",
10294 					    GOT_WORKTREE_UUID_STRLEN, wt);
10295 			}
10296 			if (err || found)
10297 				goto done;
10298 		}
10299 
10300 		got_object_commit_close(commit);
10301 		commit = NULL;
10302 		free(id);
10303 		id = NULL;
10304 	}
10305 
10306 	if (wanted_ref != NULL && !found)
10307 		err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
10308 
10309 done:
10310 	free(id);
10311 	free(uuidstr);
10312 	got_ref_list_free(&refs);
10313 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
10314 	if (refs_idmap)
10315 		got_reflist_object_id_map_free(refs_idmap);
10316 	if (commit)
10317 		got_object_commit_close(commit);
10318 	return err;
10319 }
10320 
10321 /*
10322  * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
10323  * identified by id for log messages to prepopulate the editor on commit.
10324  */
10325 static const struct got_error *
10326 logmsg_ref(struct got_object_id *id, const char *prefix,
10327     struct got_worktree *worktree, struct got_repository *repo)
10328 {
10329 	const struct got_error	*err = NULL;
10330 	char			*idstr, *ref = NULL, *refname = NULL;
10331 	int			 histedit_in_progress;
10332 	int			 rebase_in_progress, merge_in_progress;
10333 
10334 	/*
10335 	 * Silenty refuse to create merge reference if any histedit, merge,
10336 	 * or rebase operation is in progress.
10337 	 */
10338 	err = got_worktree_histedit_in_progress(&histedit_in_progress,
10339 	    worktree);
10340 	if (err)
10341 		return err;
10342 	if (histedit_in_progress)
10343 		return NULL;
10344 
10345 	err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10346 	if (err)
10347 		return err;
10348 	if (rebase_in_progress)
10349 		return NULL;
10350 
10351 	err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10352 	    repo);
10353 	if (err)
10354 		return err;
10355 	if (merge_in_progress)
10356 		return NULL;
10357 
10358 	err = got_object_id_str(&idstr, id);
10359 	if (err)
10360 		return err;
10361 
10362 	err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
10363 	if (err)
10364 		goto done;
10365 
10366 	if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
10367 		err = got_error_from_errno("asprintf");
10368 		goto done;
10369 	}
10370 
10371 	err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
10372 	    -1, repo);
10373 done:
10374 	free(ref);
10375 	free(idstr);
10376 	free(refname);
10377 	return err;
10378 }
10379 
10380 __dead static void
10381 usage_cherrypick(void)
10382 {
10383 	fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
10384 	    getprogname());
10385 	exit(1);
10386 }
10387 
10388 static const struct got_error *
10389 cmd_cherrypick(int argc, char *argv[])
10390 {
10391 	const struct got_error *error = NULL;
10392 	struct got_worktree *worktree = NULL;
10393 	struct got_repository *repo = NULL;
10394 	char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10395 	struct got_object_id *commit_id = NULL;
10396 	struct got_commit_object *commit = NULL;
10397 	struct got_object_qid *pid;
10398 	int ch, list_refs = 0, remove_refs = 0;
10399 	struct got_update_progress_arg upa;
10400 	int *pack_fds = NULL;
10401 
10402 #ifndef PROFILE
10403 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10404 	    "unveil", NULL) == -1)
10405 		err(1, "pledge");
10406 #endif
10407 
10408 	while ((ch = getopt(argc, argv, "lX")) != -1) {
10409 		switch (ch) {
10410 		case 'l':
10411 			list_refs = 1;
10412 			break;
10413 		case 'X':
10414 			remove_refs = 1;
10415 			break;
10416 		default:
10417 			usage_cherrypick();
10418 			/* NOTREACHED */
10419 		}
10420 	}
10421 
10422 	argc -= optind;
10423 	argv += optind;
10424 
10425 	if (list_refs || remove_refs) {
10426 		if (argc != 0 && argc != 1)
10427 			usage_cherrypick();
10428 	} else if (argc != 1)
10429 		usage_cherrypick();
10430 	if (list_refs && remove_refs)
10431 		option_conflict('l', 'X');
10432 
10433 	cwd = getcwd(NULL, 0);
10434 	if (cwd == NULL) {
10435 		error = got_error_from_errno("getcwd");
10436 		goto done;
10437 	}
10438 
10439 	error = got_repo_pack_fds_open(&pack_fds);
10440 	if (error != NULL)
10441 		goto done;
10442 
10443 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10444 	if (error) {
10445 		if (list_refs || remove_refs) {
10446 			if (error->code != GOT_ERR_NOT_WORKTREE)
10447 				goto done;
10448 		} else {
10449 			if (error->code == GOT_ERR_NOT_WORKTREE)
10450 				error = wrap_not_worktree_error(error,
10451 				    "cherrypick", cwd);
10452 			goto done;
10453 		}
10454 	}
10455 
10456 	error = got_repo_open(&repo,
10457 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
10458 	    NULL, pack_fds);
10459 	if (error != NULL)
10460 		goto done;
10461 
10462 	error = apply_unveil(got_repo_get_path(repo), 0,
10463 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
10464 	if (error)
10465 		goto done;
10466 
10467 	if (list_refs || remove_refs) {
10468 		error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
10469 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
10470 		    argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10471 		goto done;
10472 	}
10473 
10474 	error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10475 	if (error != NULL)
10476 		goto done;
10477 
10478 	error = got_repo_match_object_id(&commit_id, NULL,
10479 	    keyword_idstr != NULL ? keyword_idstr : argv[0],
10480 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
10481 	if (error)
10482 		goto done;
10483 	error = got_object_id_str(&commit_id_str, commit_id);
10484 	if (error)
10485 		goto done;
10486 
10487 	error = got_object_open_as_commit(&commit, repo, commit_id);
10488 	if (error)
10489 		goto done;
10490 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10491 	memset(&upa, 0, sizeof(upa));
10492 	error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
10493 	    commit_id, repo, update_progress, &upa, check_cancelled,
10494 	    NULL);
10495 	if (error != NULL)
10496 		goto done;
10497 
10498 	if (upa.did_something) {
10499 		error = logmsg_ref(commit_id,
10500 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
10501 		if (error)
10502 			goto done;
10503 		printf("Merged commit %s\n", commit_id_str);
10504 	}
10505 	print_merge_progress_stats(&upa);
10506 done:
10507 	free(cwd);
10508 	free(keyword_idstr);
10509 	if (commit)
10510 		got_object_commit_close(commit);
10511 	free(commit_id_str);
10512 	if (worktree)
10513 		got_worktree_close(worktree);
10514 	if (repo) {
10515 		const struct got_error *close_err = got_repo_close(repo);
10516 		if (error == NULL)
10517 			error = close_err;
10518 	}
10519 	if (pack_fds) {
10520 		const struct got_error *pack_err =
10521 		    got_repo_pack_fds_close(pack_fds);
10522 		if (error == NULL)
10523 			error = pack_err;
10524 	}
10525 
10526 	return error;
10527 }
10528 
10529 __dead static void
10530 usage_backout(void)
10531 {
10532 	fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
10533 	exit(1);
10534 }
10535 
10536 static const struct got_error *
10537 cmd_backout(int argc, char *argv[])
10538 {
10539 	const struct got_error *error = NULL;
10540 	struct got_worktree *worktree = NULL;
10541 	struct got_repository *repo = NULL;
10542 	char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10543 	struct got_object_id *commit_id = NULL;
10544 	struct got_commit_object *commit = NULL;
10545 	struct got_object_qid *pid;
10546 	int ch, list_refs = 0, remove_refs = 0;
10547 	struct got_update_progress_arg upa;
10548 	int *pack_fds = NULL;
10549 
10550 #ifndef PROFILE
10551 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10552 	    "unveil", NULL) == -1)
10553 		err(1, "pledge");
10554 #endif
10555 
10556 	while ((ch = getopt(argc, argv, "lX")) != -1) {
10557 		switch (ch) {
10558 		case 'l':
10559 			list_refs = 1;
10560 			break;
10561 		case 'X':
10562 			remove_refs = 1;
10563 			break;
10564 		default:
10565 			usage_backout();
10566 			/* NOTREACHED */
10567 		}
10568 	}
10569 
10570 	argc -= optind;
10571 	argv += optind;
10572 
10573 	if (list_refs || remove_refs) {
10574 		if (argc != 0 && argc != 1)
10575 			usage_backout();
10576 	} else if (argc != 1)
10577 		usage_backout();
10578 	if (list_refs && remove_refs)
10579 		option_conflict('l', 'X');
10580 
10581 	cwd = getcwd(NULL, 0);
10582 	if (cwd == NULL) {
10583 		error = got_error_from_errno("getcwd");
10584 		goto done;
10585 	}
10586 
10587 	error = got_repo_pack_fds_open(&pack_fds);
10588 	if (error != NULL)
10589 		goto done;
10590 
10591 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10592 	if (error) {
10593 		if (list_refs || remove_refs) {
10594 			if (error->code != GOT_ERR_NOT_WORKTREE)
10595 				goto done;
10596 		} else {
10597 			if (error->code == GOT_ERR_NOT_WORKTREE)
10598 				error = wrap_not_worktree_error(error,
10599 				    "backout", cwd);
10600 			goto done;
10601 		}
10602 	}
10603 
10604 	error = got_repo_open(&repo,
10605 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
10606 	    NULL, pack_fds);
10607 	if (error != NULL)
10608 		goto done;
10609 
10610 	error = apply_unveil(got_repo_get_path(repo), 0,
10611 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
10612 	if (error)
10613 		goto done;
10614 
10615 	if (list_refs || remove_refs) {
10616 		error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
10617 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
10618 		    argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10619 		goto done;
10620 	}
10621 
10622 	error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10623 	if (error != NULL)
10624 		goto done;
10625 
10626 	error = got_repo_match_object_id(&commit_id, NULL,
10627 	    keyword_idstr != NULL ? keyword_idstr : argv[0],
10628 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
10629 	if (error)
10630 		goto done;
10631 	error = got_object_id_str(&commit_id_str, commit_id);
10632 	if (error)
10633 		goto done;
10634 
10635 	error = got_object_open_as_commit(&commit, repo, commit_id);
10636 	if (error)
10637 		goto done;
10638 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10639 	if (pid == NULL) {
10640 		error = got_error(GOT_ERR_ROOT_COMMIT);
10641 		goto done;
10642 	}
10643 
10644 	memset(&upa, 0, sizeof(upa));
10645 	error = got_worktree_merge_files(worktree, commit_id, &pid->id,
10646 	    repo, update_progress, &upa, check_cancelled, NULL);
10647 	if (error != NULL)
10648 		goto done;
10649 
10650 	if (upa.did_something) {
10651 		error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
10652 		    worktree, repo);
10653 		if (error)
10654 			goto done;
10655 		printf("Backed out commit %s\n", commit_id_str);
10656 	}
10657 	print_merge_progress_stats(&upa);
10658 done:
10659 	free(cwd);
10660 	free(keyword_idstr);
10661 	if (commit)
10662 		got_object_commit_close(commit);
10663 	free(commit_id_str);
10664 	if (worktree)
10665 		got_worktree_close(worktree);
10666 	if (repo) {
10667 		const struct got_error *close_err = got_repo_close(repo);
10668 		if (error == NULL)
10669 			error = close_err;
10670 	}
10671 	if (pack_fds) {
10672 		const struct got_error *pack_err =
10673 		    got_repo_pack_fds_close(pack_fds);
10674 		if (error == NULL)
10675 			error = pack_err;
10676 	}
10677 	return error;
10678 }
10679 
10680 __dead static void
10681 usage_rebase(void)
10682 {
10683 	fprintf(stderr, "usage: %s rebase [-aCclX] [branch]\n", getprogname());
10684 	exit(1);
10685 }
10686 
10687 static void
10688 trim_logmsg(char *logmsg, int limit)
10689 {
10690 	char *nl;
10691 	size_t len;
10692 
10693 	len = strlen(logmsg);
10694 	if (len > limit)
10695 		len = limit;
10696 	logmsg[len] = '\0';
10697 	nl = strchr(logmsg, '\n');
10698 	if (nl)
10699 		*nl = '\0';
10700 }
10701 
10702 static const struct got_error *
10703 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
10704 {
10705 	const struct got_error *err;
10706 	char *logmsg0 = NULL;
10707 	const char *s;
10708 
10709 	err = got_object_commit_get_logmsg(&logmsg0, commit);
10710 	if (err)
10711 		return err;
10712 
10713 	s = logmsg0;
10714 	while (isspace((unsigned char)s[0]))
10715 		s++;
10716 
10717 	*logmsg = strdup(s);
10718 	if (*logmsg == NULL) {
10719 		err = got_error_from_errno("strdup");
10720 		goto done;
10721 	}
10722 
10723 	trim_logmsg(*logmsg, limit);
10724 done:
10725 	free(logmsg0);
10726 	return err;
10727 }
10728 
10729 static const struct got_error *
10730 show_rebase_merge_conflict(struct got_object_id *id,
10731     struct got_repository *repo)
10732 {
10733 	const struct got_error *err;
10734 	struct got_commit_object *commit = NULL;
10735 	char *id_str = NULL, *logmsg = NULL;
10736 
10737 	err = got_object_open_as_commit(&commit, repo, id);
10738 	if (err)
10739 		return err;
10740 
10741 	err = got_object_id_str(&id_str, id);
10742 	if (err)
10743 		goto done;
10744 
10745 	id_str[12] = '\0';
10746 
10747 	err = get_short_logmsg(&logmsg, 42, commit);
10748 	if (err)
10749 		goto done;
10750 
10751 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
10752 done:
10753 	free(id_str);
10754 	got_object_commit_close(commit);
10755 	free(logmsg);
10756 	return err;
10757 }
10758 
10759 static const struct got_error *
10760 show_rebase_progress(struct got_commit_object *commit,
10761     struct got_object_id *old_id, struct got_object_id *new_id)
10762 {
10763 	const struct got_error *err;
10764 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10765 
10766 	err = got_object_id_str(&old_id_str, old_id);
10767 	if (err)
10768 		goto done;
10769 
10770 	if (new_id) {
10771 		err = got_object_id_str(&new_id_str, new_id);
10772 		if (err)
10773 			goto done;
10774 	}
10775 
10776 	old_id_str[12] = '\0';
10777 	if (new_id_str)
10778 		new_id_str[12] = '\0';
10779 
10780 	err = get_short_logmsg(&logmsg, 42, commit);
10781 	if (err)
10782 		goto done;
10783 
10784 	printf("%s -> %s: %s\n", old_id_str,
10785 	    new_id_str ? new_id_str : "no-op change", logmsg);
10786 done:
10787 	free(old_id_str);
10788 	free(new_id_str);
10789 	free(logmsg);
10790 	return err;
10791 }
10792 
10793 static const struct got_error *
10794 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
10795     struct got_reference *branch, struct got_reference *tmp_branch,
10796     struct got_repository *repo, int create_backup)
10797 {
10798 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
10799 	return got_worktree_rebase_complete(worktree, fileindex,
10800 	    tmp_branch, branch, repo, create_backup);
10801 }
10802 
10803 static const struct got_error *
10804 rebase_commit(struct got_pathlist_head *merged_paths,
10805     struct got_worktree *worktree, struct got_fileindex *fileindex,
10806     struct got_reference *tmp_branch, const char *committer,
10807     struct got_object_id *commit_id, int allow_conflict,
10808     struct got_repository *repo)
10809 {
10810 	const struct got_error *error;
10811 	struct got_commit_object *commit;
10812 	struct got_object_id *new_commit_id;
10813 
10814 	error = got_object_open_as_commit(&commit, repo, commit_id);
10815 	if (error)
10816 		return error;
10817 
10818 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
10819 	    worktree, fileindex, tmp_branch, committer, commit, commit_id,
10820 	    allow_conflict, repo);
10821 	if (error) {
10822 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
10823 			goto done;
10824 		error = show_rebase_progress(commit, commit_id, NULL);
10825 	} else {
10826 		error = show_rebase_progress(commit, commit_id, new_commit_id);
10827 		free(new_commit_id);
10828 	}
10829 done:
10830 	got_object_commit_close(commit);
10831 	return error;
10832 }
10833 
10834 struct check_path_prefix_arg {
10835 	const char *path_prefix;
10836 	size_t len;
10837 	int errcode;
10838 };
10839 
10840 static const struct got_error *
10841 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
10842     struct got_blob_object *blob2, FILE *f1, FILE *f2,
10843     struct got_object_id *id1, struct got_object_id *id2,
10844     const char *path1, const char *path2,
10845     mode_t mode1, mode_t mode2, struct got_repository *repo)
10846 {
10847 	struct check_path_prefix_arg *a = arg;
10848 
10849 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
10850 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
10851 		return got_error(a->errcode);
10852 
10853 	return NULL;
10854 }
10855 
10856 static const struct got_error *
10857 check_path_prefix(struct got_object_id *parent_id,
10858     struct got_object_id *commit_id, const char *path_prefix,
10859     int errcode, struct got_repository *repo)
10860 {
10861 	const struct got_error *err;
10862 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
10863 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
10864 	struct check_path_prefix_arg cpp_arg;
10865 
10866 	if (got_path_is_root_dir(path_prefix))
10867 		return NULL;
10868 
10869 	err = got_object_open_as_commit(&commit, repo, commit_id);
10870 	if (err)
10871 		goto done;
10872 
10873 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
10874 	if (err)
10875 		goto done;
10876 
10877 	err = got_object_open_as_tree(&tree1, repo,
10878 	    got_object_commit_get_tree_id(parent_commit));
10879 	if (err)
10880 		goto done;
10881 
10882 	err = got_object_open_as_tree(&tree2, repo,
10883 	    got_object_commit_get_tree_id(commit));
10884 	if (err)
10885 		goto done;
10886 
10887 	cpp_arg.path_prefix = path_prefix;
10888 	while (cpp_arg.path_prefix[0] == '/')
10889 		cpp_arg.path_prefix++;
10890 	cpp_arg.len = strlen(cpp_arg.path_prefix);
10891 	cpp_arg.errcode = errcode;
10892 	err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
10893 	    check_path_prefix_in_diff, &cpp_arg, 0);
10894 done:
10895 	if (tree1)
10896 		got_object_tree_close(tree1);
10897 	if (tree2)
10898 		got_object_tree_close(tree2);
10899 	if (commit)
10900 		got_object_commit_close(commit);
10901 	if (parent_commit)
10902 		got_object_commit_close(parent_commit);
10903 	return err;
10904 }
10905 
10906 static const struct got_error *
10907 collect_commits(struct got_object_id_queue *commits,
10908     struct got_object_id *initial_commit_id,
10909     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
10910     const char *path_prefix, int path_prefix_errcode,
10911     struct got_repository *repo)
10912 {
10913 	const struct got_error *err = NULL;
10914 	struct got_commit_graph *graph = NULL;
10915 	struct got_object_id parent_id, commit_id;
10916 	struct got_object_qid *qid;
10917 
10918 	err = got_commit_graph_open(&graph, "/", 1);
10919 	if (err)
10920 		return err;
10921 
10922 	err = got_commit_graph_bfsort(graph, iter_start_id, repo,
10923 	    check_cancelled, NULL);
10924 	if (err)
10925 		goto done;
10926 
10927 	memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
10928 	while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
10929 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
10930 		    check_cancelled, NULL);
10931 		if (err) {
10932 			if (err->code == GOT_ERR_ITER_COMPLETED) {
10933 				err = got_error_msg(GOT_ERR_ANCESTRY,
10934 				    "ran out of commits to rebase before "
10935 				    "youngest common ancestor commit has "
10936 				    "been reached?!?");
10937 			}
10938 			goto done;
10939 		} else {
10940 			err = check_path_prefix(&parent_id, &commit_id,
10941 			    path_prefix, path_prefix_errcode, repo);
10942 			if (err)
10943 				goto done;
10944 
10945 			err = got_object_qid_alloc(&qid, &commit_id);
10946 			if (err)
10947 				goto done;
10948 			STAILQ_INSERT_HEAD(commits, qid, entry);
10949 
10950 			memcpy(&commit_id, &parent_id, sizeof(commit_id));
10951 		}
10952 	}
10953 done:
10954 	got_commit_graph_close(graph);
10955 	return err;
10956 }
10957 
10958 static const struct got_error *
10959 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
10960 {
10961 	const struct got_error *err = NULL;
10962 	time_t committer_time;
10963 	struct tm tm;
10964 	char datebuf[11]; /* YYYY-MM-DD + NUL */
10965 	char *author0 = NULL, *author, *smallerthan;
10966 	char *logmsg0 = NULL, *logmsg, *newline;
10967 
10968 	committer_time = got_object_commit_get_committer_time(commit);
10969 	if (gmtime_r(&committer_time, &tm) == NULL)
10970 		return got_error_from_errno("gmtime_r");
10971 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
10972 		return got_error(GOT_ERR_NO_SPACE);
10973 
10974 	author0 = strdup(got_object_commit_get_author(commit));
10975 	if (author0 == NULL)
10976 		return got_error_from_errno("strdup");
10977 	author = author0;
10978 	smallerthan = strchr(author, '<');
10979 	if (smallerthan && smallerthan[1] != '\0')
10980 		author = smallerthan + 1;
10981 	author[strcspn(author, "@>")] = '\0';
10982 
10983 	err = got_object_commit_get_logmsg(&logmsg0, commit);
10984 	if (err)
10985 		goto done;
10986 	logmsg = logmsg0;
10987 	while (*logmsg == '\n')
10988 		logmsg++;
10989 	newline = strchr(logmsg, '\n');
10990 	if (newline)
10991 		*newline = '\0';
10992 
10993 	if (asprintf(brief_str, "%s %s  %s",
10994 	    datebuf, author, logmsg) == -1)
10995 		err = got_error_from_errno("asprintf");
10996 done:
10997 	free(author0);
10998 	free(logmsg0);
10999 	return err;
11000 }
11001 
11002 static const struct got_error *
11003 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
11004     struct got_repository *repo)
11005 {
11006 	const struct got_error *err;
11007 	char *id_str;
11008 
11009 	err = got_object_id_str(&id_str, id);
11010 	if (err)
11011 		return err;
11012 
11013 	err = got_ref_delete(ref, repo);
11014 	if (err)
11015 		goto done;
11016 
11017 	printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
11018 done:
11019 	free(id_str);
11020 	return err;
11021 }
11022 
11023 static const struct got_error *
11024 print_backup_ref(const char *branch_name, const char *new_id_str,
11025     struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
11026     struct got_reflist_object_id_map *refs_idmap,
11027     struct got_repository *repo)
11028 {
11029 	const struct got_error *err = NULL;
11030 	struct got_reflist_head *refs;
11031 	char *refs_str = NULL;
11032 	struct got_object_id *new_commit_id = NULL;
11033 	struct got_commit_object *new_commit = NULL;
11034 	char *new_commit_brief_str = NULL;
11035 	struct got_object_id *yca_id = NULL;
11036 	struct got_commit_object *yca_commit = NULL;
11037 	char *yca_id_str = NULL, *yca_brief_str = NULL;
11038 	char *custom_refs_str;
11039 
11040 	if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
11041 		return got_error_from_errno("asprintf");
11042 
11043 	err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
11044 	    0, 0, refs_idmap, custom_refs_str, NULL);
11045 	if (err)
11046 		goto done;
11047 
11048 	err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
11049 	if (err)
11050 		goto done;
11051 
11052 	refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
11053 	if (refs) {
11054 		err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
11055 		if (err)
11056 			goto done;
11057 	}
11058 
11059 	err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
11060 	if (err)
11061 		goto done;
11062 
11063 	err = get_commit_brief_str(&new_commit_brief_str, new_commit);
11064 	if (err)
11065 		goto done;
11066 
11067 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11068 	    old_commit_id, new_commit_id, 1, 0, repo, check_cancelled, NULL);
11069 	if (err)
11070 		goto done;
11071 
11072 	printf("has become commit %s%s%s%s\n %s\n", new_id_str,
11073 	    refs_str ? " (" : "", refs_str ? refs_str : "",
11074 	    refs_str ? ")" : "", new_commit_brief_str);
11075 	if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
11076 	    got_object_id_cmp(yca_id, old_commit_id) != 0) {
11077 		free(refs_str);
11078 		refs_str = NULL;
11079 
11080 		err = got_object_open_as_commit(&yca_commit, repo, yca_id);
11081 		if (err)
11082 			goto done;
11083 
11084 		err = get_commit_brief_str(&yca_brief_str, yca_commit);
11085 		if (err)
11086 			goto done;
11087 
11088 		err = got_object_id_str(&yca_id_str, yca_id);
11089 		if (err)
11090 			goto done;
11091 
11092 		refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
11093 		if (refs) {
11094 			err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
11095 			if (err)
11096 				goto done;
11097 		}
11098 		printf("history forked at %s%s%s%s\n %s\n",
11099 		    yca_id_str,
11100 		    refs_str ? " (" : "", refs_str ? refs_str : "",
11101 		    refs_str ? ")" : "", yca_brief_str);
11102 	}
11103 done:
11104 	free(custom_refs_str);
11105 	free(new_commit_id);
11106 	free(refs_str);
11107 	free(yca_id);
11108 	free(yca_id_str);
11109 	free(yca_brief_str);
11110 	if (new_commit)
11111 		got_object_commit_close(new_commit);
11112 	if (yca_commit)
11113 		got_object_commit_close(yca_commit);
11114 
11115 	return err;
11116 }
11117 
11118 static const struct got_error *
11119 worktree_has_logmsg_ref(const char *caller, struct got_worktree *worktree,
11120     struct got_repository *repo)
11121 {
11122 	const struct got_error		*err;
11123 	struct got_reflist_head		 refs;
11124 	struct got_reflist_entry	*re;
11125 	char				*uuidstr = NULL;
11126 	static char			 msg[160];
11127 
11128 	TAILQ_INIT(&refs);
11129 
11130 	err = got_worktree_get_uuid(&uuidstr, worktree);
11131 	if (err)
11132 		goto done;
11133 
11134 	err = got_ref_list(&refs, repo, "refs/got/worktree",
11135 	    got_ref_cmp_by_name, repo);
11136 	if (err)
11137 		goto done;
11138 
11139 	TAILQ_FOREACH(re, &refs, entry) {
11140 		const char *cmd, *refname, *type;
11141 
11142 		refname = got_ref_get_name(re->ref);
11143 
11144 		if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
11145 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
11146 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
11147 			cmd = "cherrypick";
11148 			type = "cherrypicked";
11149 		} else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
11150 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
11151 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
11152 			cmd = "backout";
11153 			type = "backed-out";
11154 		} else
11155 			continue;
11156 
11157 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) != 0)
11158 			continue;
11159 
11160 		snprintf(msg, sizeof(msg),
11161 		    "work tree has references created by %s commits which "
11162 		    "must be removed with 'got %s -X' before running the %s "
11163 		    "command", type, cmd, caller);
11164 		err = got_error_msg(GOT_ERR_WORKTREE_META, msg);
11165 		goto done;
11166 	}
11167 
11168 done:
11169 	free(uuidstr);
11170 	got_ref_list_free(&refs);
11171 	return err;
11172 }
11173 
11174 static const struct got_error *
11175 process_backup_refs(const char *backup_ref_prefix,
11176     const char *wanted_branch_name,
11177     int delete, struct got_repository *repo)
11178 {
11179 	const struct got_error *err;
11180 	struct got_reflist_head refs, backup_refs;
11181 	struct got_reflist_entry *re;
11182 	const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
11183 	struct got_object_id *old_commit_id = NULL;
11184 	char *branch_name = NULL;
11185 	struct got_commit_object *old_commit = NULL;
11186 	struct got_reflist_object_id_map *refs_idmap = NULL;
11187 	int wanted_branch_found = 0;
11188 
11189 	TAILQ_INIT(&refs);
11190 	TAILQ_INIT(&backup_refs);
11191 
11192 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11193 	if (err)
11194 		return err;
11195 
11196 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
11197 	if (err)
11198 		goto done;
11199 
11200 	if (wanted_branch_name) {
11201 		if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
11202 			wanted_branch_name += 11;
11203 	}
11204 
11205 	err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
11206 	    got_ref_cmp_by_commit_timestamp_descending, repo);
11207 	if (err)
11208 		goto done;
11209 
11210 	TAILQ_FOREACH(re, &backup_refs, entry) {
11211 		const char *refname = got_ref_get_name(re->ref);
11212 		char *slash;
11213 
11214 		err = check_cancelled(NULL);
11215 		if (err)
11216 			break;
11217 
11218 		err = got_ref_resolve(&old_commit_id, repo, re->ref);
11219 		if (err)
11220 			break;
11221 
11222 		err = got_object_open_as_commit(&old_commit, repo,
11223 		    old_commit_id);
11224 		if (err)
11225 			break;
11226 
11227 		if (strncmp(backup_ref_prefix, refname,
11228 		    backup_ref_prefix_len) == 0)
11229 			refname += backup_ref_prefix_len;
11230 
11231 		while (refname[0] == '/')
11232 			refname++;
11233 
11234 		branch_name = strdup(refname);
11235 		if (branch_name == NULL) {
11236 			err = got_error_from_errno("strdup");
11237 			break;
11238 		}
11239 		slash = strrchr(branch_name, '/');
11240 		if (slash) {
11241 			*slash = '\0';
11242 			refname += strlen(branch_name) + 1;
11243 		}
11244 
11245 		if (wanted_branch_name == NULL ||
11246 		    strcmp(wanted_branch_name, branch_name) == 0) {
11247 			wanted_branch_found = 1;
11248 			if (delete) {
11249 				err = delete_backup_ref(re->ref,
11250 				    old_commit_id, repo);
11251 			} else {
11252 				err = print_backup_ref(branch_name, refname,
11253 				    old_commit_id, old_commit, refs_idmap,
11254 				    repo);
11255 			}
11256 			if (err)
11257 				break;
11258 		}
11259 
11260 		free(old_commit_id);
11261 		old_commit_id = NULL;
11262 		free(branch_name);
11263 		branch_name = NULL;
11264 		got_object_commit_close(old_commit);
11265 		old_commit = NULL;
11266 	}
11267 
11268 	if (wanted_branch_name && !wanted_branch_found) {
11269 		err = got_error_fmt(GOT_ERR_NOT_REF,
11270 		    "%s/%s/", backup_ref_prefix, wanted_branch_name);
11271 	}
11272 done:
11273 	if (refs_idmap)
11274 		got_reflist_object_id_map_free(refs_idmap);
11275 	got_ref_list_free(&refs);
11276 	got_ref_list_free(&backup_refs);
11277 	free(old_commit_id);
11278 	free(branch_name);
11279 	if (old_commit)
11280 		got_object_commit_close(old_commit);
11281 	return err;
11282 }
11283 
11284 static const struct got_error *
11285 abort_progress(void *arg, unsigned char status, const char *path)
11286 {
11287 	/*
11288 	 * Unversioned files should not clutter progress output when
11289 	 * an operation is aborted.
11290 	 */
11291 	if (status == GOT_STATUS_UNVERSIONED)
11292 		return NULL;
11293 
11294 	return update_progress(arg, status, path);
11295 }
11296 
11297 static const struct got_error *
11298 find_merge_commit_yca(struct got_object_id **new_yca_id,
11299     struct got_object_id *branch_head_commit_id,
11300     struct got_object_id *yca_id,
11301     struct got_object_id *base_commit_id,
11302     struct got_repository *repo)
11303 {
11304 	const struct got_error *err = NULL;
11305 	struct got_commit_graph *graph = NULL;
11306 	struct got_commit_object *commit = NULL;
11307 
11308 	*new_yca_id = NULL;
11309 
11310 	err = got_commit_graph_open(&graph, "/", 1);
11311 	if (err)
11312 		return err;
11313 
11314 	err = got_commit_graph_bfsort(graph, base_commit_id,
11315 	    repo, check_cancelled, NULL);
11316 	if (err)
11317 		goto done;
11318 
11319 	for (;;) {
11320 		struct got_object_id id;
11321 
11322 		err = got_commit_graph_iter_next(&id, graph, repo,
11323 		    check_cancelled, NULL);
11324 		if (err) {
11325 			if (err->code == GOT_ERR_ITER_COMPLETED)
11326 				err = NULL;
11327 			break;
11328 		}
11329 
11330 		err = got_object_open_as_commit(&commit, repo, &id);
11331 		if (err)
11332 			break;
11333 
11334 		if (got_object_commit_get_nparents(commit) > 1) {
11335 			/* Search for a better YCA using toposort. */
11336 			err = got_commit_graph_find_youngest_common_ancestor(
11337 			    new_yca_id, base_commit_id, branch_head_commit_id,
11338 			    0, 1, repo, check_cancelled, NULL);
11339 			break;
11340 		}
11341 
11342 		if (got_object_id_cmp(&id, yca_id) == 0)
11343 			break;
11344 		got_object_commit_close(commit);
11345 		commit = NULL;
11346 	}
11347 done:
11348 	got_commit_graph_close(graph);
11349 	if (commit)
11350 		got_object_commit_close(commit);
11351 	return err;
11352 }
11353 
11354 static const struct got_error *
11355 cmd_rebase(int argc, char *argv[])
11356 {
11357 	const struct got_error *error = NULL;
11358 	struct got_worktree *worktree = NULL;
11359 	struct got_repository *repo = NULL;
11360 	struct got_fileindex *fileindex = NULL;
11361 	char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11362 	struct got_reference *branch = NULL;
11363 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
11364 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
11365 	struct got_object_id *resume_commit_id = NULL;
11366 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
11367 	struct got_object_id *head_commit_id = NULL;
11368 	struct got_reference *head_ref = NULL;
11369 	struct got_commit_object *commit = NULL;
11370 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
11371 	int histedit_in_progress = 0, merge_in_progress = 0;
11372 	int create_backup = 1, list_backups = 0, delete_backups = 0;
11373 	int allow_conflict = 0;
11374 	struct got_object_id_queue commits;
11375 	struct got_pathlist_head merged_paths;
11376 	const struct got_object_id_queue *parent_ids;
11377 	struct got_object_qid *qid, *pid;
11378 	struct got_update_progress_arg upa;
11379 	int *pack_fds = NULL;
11380 
11381 	STAILQ_INIT(&commits);
11382 	TAILQ_INIT(&merged_paths);
11383 	memset(&upa, 0, sizeof(upa));
11384 
11385 #ifndef PROFILE
11386 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11387 	    "unveil", NULL) == -1)
11388 		err(1, "pledge");
11389 #endif
11390 
11391 	while ((ch = getopt(argc, argv, "aCclX")) != -1) {
11392 		switch (ch) {
11393 		case 'a':
11394 			abort_rebase = 1;
11395 			break;
11396 		case 'C':
11397 			allow_conflict = 1;
11398 			break;
11399 		case 'c':
11400 			continue_rebase = 1;
11401 			break;
11402 		case 'l':
11403 			list_backups = 1;
11404 			break;
11405 		case 'X':
11406 			delete_backups = 1;
11407 			break;
11408 		default:
11409 			usage_rebase();
11410 			/* NOTREACHED */
11411 		}
11412 	}
11413 
11414 	argc -= optind;
11415 	argv += optind;
11416 
11417 	if (list_backups) {
11418 		if (abort_rebase)
11419 			option_conflict('l', 'a');
11420 		if (allow_conflict)
11421 			option_conflict('l', 'C');
11422 		if (continue_rebase)
11423 			option_conflict('l', 'c');
11424 		if (delete_backups)
11425 			option_conflict('l', 'X');
11426 		if (argc != 0 && argc != 1)
11427 			usage_rebase();
11428 	} else if (delete_backups) {
11429 		if (abort_rebase)
11430 			option_conflict('X', 'a');
11431 		if (allow_conflict)
11432 			option_conflict('X', 'C');
11433 		if (continue_rebase)
11434 			option_conflict('X', 'c');
11435 		if (list_backups)
11436 			option_conflict('l', 'X');
11437 		if (argc != 0 && argc != 1)
11438 			usage_rebase();
11439 	} else if (allow_conflict) {
11440 		if (abort_rebase)
11441 			option_conflict('C', 'a');
11442 		if (!continue_rebase)
11443 			errx(1, "-C option requires -c");
11444 	} else {
11445 		if (abort_rebase && continue_rebase)
11446 			usage_rebase();
11447 		else if (abort_rebase || continue_rebase) {
11448 			if (argc != 0)
11449 				usage_rebase();
11450 		} else if (argc != 1)
11451 			usage_rebase();
11452 	}
11453 
11454 	cwd = getcwd(NULL, 0);
11455 	if (cwd == NULL) {
11456 		error = got_error_from_errno("getcwd");
11457 		goto done;
11458 	}
11459 
11460 	error = got_repo_pack_fds_open(&pack_fds);
11461 	if (error != NULL)
11462 		goto done;
11463 
11464 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
11465 	if (error) {
11466 		if (list_backups || delete_backups) {
11467 			if (error->code != GOT_ERR_NOT_WORKTREE)
11468 				goto done;
11469 		} else {
11470 			if (error->code == GOT_ERR_NOT_WORKTREE)
11471 				error = wrap_not_worktree_error(error,
11472 				    "rebase", cwd);
11473 			goto done;
11474 		}
11475 	}
11476 
11477 	error = get_gitconfig_path(&gitconfig_path);
11478 	if (error)
11479 		goto done;
11480 	error = got_repo_open(&repo,
11481 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
11482 	    gitconfig_path, pack_fds);
11483 	if (error != NULL)
11484 		goto done;
11485 
11486 	if (worktree != NULL && !list_backups && !delete_backups) {
11487 		error = worktree_has_logmsg_ref("rebase", worktree, repo);
11488 		if (error)
11489 			goto done;
11490 	}
11491 
11492 	error = get_author(&committer, repo, worktree);
11493 	if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
11494 		goto done;
11495 
11496 	error = apply_unveil(got_repo_get_path(repo), 0,
11497 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
11498 	if (error)
11499 		goto done;
11500 
11501 	if (list_backups || delete_backups) {
11502 		error = process_backup_refs(
11503 		    GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
11504 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
11505 		goto done; /* nothing else to do */
11506 	}
11507 
11508 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
11509 	    worktree);
11510 	if (error)
11511 		goto done;
11512 	if (histedit_in_progress) {
11513 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
11514 		goto done;
11515 	}
11516 
11517 	error = got_worktree_merge_in_progress(&merge_in_progress,
11518 	    worktree, repo);
11519 	if (error)
11520 		goto done;
11521 	if (merge_in_progress) {
11522 		error = got_error(GOT_ERR_MERGE_BUSY);
11523 		goto done;
11524 	}
11525 
11526 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11527 	if (error)
11528 		goto done;
11529 
11530 	if (abort_rebase) {
11531 		if (!rebase_in_progress) {
11532 			error = got_error(GOT_ERR_NOT_REBASING);
11533 			goto done;
11534 		}
11535 		error = got_worktree_rebase_continue(&resume_commit_id,
11536 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
11537 		    worktree, repo);
11538 		if (error)
11539 			goto done;
11540 		printf("Switching work tree to %s\n",
11541 		    got_ref_get_symref_target(new_base_branch));
11542 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
11543 		    new_base_branch, abort_progress, &upa);
11544 		if (error)
11545 			goto done;
11546 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
11547 		print_merge_progress_stats(&upa);
11548 		goto done; /* nothing else to do */
11549 	}
11550 
11551 	if (continue_rebase) {
11552 		if (!rebase_in_progress) {
11553 			error = got_error(GOT_ERR_NOT_REBASING);
11554 			goto done;
11555 		}
11556 		error = got_worktree_rebase_continue(&resume_commit_id,
11557 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
11558 		    worktree, repo);
11559 		if (error)
11560 			goto done;
11561 
11562 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
11563 		    committer, resume_commit_id, allow_conflict, repo);
11564 		if (error)
11565 			goto done;
11566 
11567 		yca_id = got_object_id_dup(resume_commit_id);
11568 		if (yca_id == NULL) {
11569 			error = got_error_from_errno("got_object_id_dup");
11570 			goto done;
11571 		}
11572 	} else {
11573 		error = got_ref_open(&branch, repo, argv[0], 0);
11574 		if (error != NULL)
11575 			goto done;
11576 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11577 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11578 			    "will not rebase a branch which lives outside "
11579 			    "the \"refs/heads/\" reference namespace");
11580 			goto done;
11581 		}
11582 	}
11583 
11584 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
11585 	if (error)
11586 		goto done;
11587 
11588 	if (!continue_rebase) {
11589 		struct got_object_id *base_commit_id;
11590 
11591 		error = got_ref_open(&head_ref, repo,
11592 		    got_worktree_get_head_ref_name(worktree), 0);
11593 		if (error)
11594 			goto done;
11595 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
11596 		if (error)
11597 			goto done;
11598 		base_commit_id = got_worktree_get_base_commit_id(worktree);
11599 		if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
11600 			error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
11601 			goto done;
11602 		}
11603 
11604 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11605 		    base_commit_id, branch_head_commit_id, 1, 0,
11606 		    repo, check_cancelled, NULL);
11607 		if (error) {
11608 			if (error->code == GOT_ERR_ANCESTRY) {
11609 				error = got_error_msg(GOT_ERR_ANCESTRY,
11610 				    "specified branch shares no common "
11611 				    "ancestry with work tree's branch");
11612 			}
11613 			goto done;
11614 		}
11615 
11616 		/*
11617 		 * If a merge commit appears between the new base branch tip
11618 		 * and a YCA found via first-parent traversal then we might
11619 		 * find a better YCA using topologically sorted commits.
11620 		 */
11621 		if (got_object_id_cmp(base_commit_id, yca_id) != 0) {
11622 			struct got_object_id *better_yca_id;
11623 			error = find_merge_commit_yca(&better_yca_id,
11624 			    branch_head_commit_id, yca_id,
11625 			    base_commit_id, repo);
11626 			if (error)
11627 				goto done;
11628 			if (better_yca_id) {
11629 				free(yca_id);
11630 				yca_id = better_yca_id;
11631 			}
11632 		}
11633 
11634 		if (got_object_id_cmp(base_commit_id, yca_id) == 0) {
11635 			struct got_pathlist_head paths;
11636 			printf("%s is already based on %s\n",
11637 			    got_ref_get_name(branch),
11638 			    got_worktree_get_head_ref_name(worktree));
11639 			error = switch_head_ref(branch, branch_head_commit_id,
11640 			    worktree, repo);
11641 			if (error)
11642 				goto done;
11643 			error = got_worktree_set_base_commit_id(worktree, repo,
11644 			    branch_head_commit_id);
11645 			if (error)
11646 				goto done;
11647 			TAILQ_INIT(&paths);
11648 			error = got_pathlist_append(&paths, "", NULL);
11649 			if (error)
11650 				goto done;
11651 			error = got_worktree_checkout_files(worktree,
11652 			    &paths, repo, update_progress, &upa,
11653 			    check_cancelled, NULL);
11654 			got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
11655 			if (error)
11656 				goto done;
11657 			if (upa.did_something) {
11658 				char *id_str;
11659 				error = got_object_id_str(&id_str,
11660 				    branch_head_commit_id);
11661 				if (error)
11662 					goto done;
11663 				printf("Updated to %s: %s\n",
11664 				    got_worktree_get_head_ref_name(worktree),
11665 				    id_str);
11666 				free(id_str);
11667 			} else
11668 				printf("Already up-to-date\n");
11669 			print_update_progress_stats(&upa);
11670 			goto done;
11671 		}
11672 	}
11673 
11674 	commit_id = branch_head_commit_id;
11675 	error = got_object_open_as_commit(&commit, repo, commit_id);
11676 	if (error)
11677 		goto done;
11678 
11679 	parent_ids = got_object_commit_get_parent_ids(commit);
11680 	pid = STAILQ_FIRST(parent_ids);
11681 	if (pid) {
11682 		error = collect_commits(&commits, commit_id, &pid->id,
11683 		    yca_id, got_worktree_get_path_prefix(worktree),
11684 		    GOT_ERR_REBASE_PATH, repo);
11685 		if (error)
11686 			goto done;
11687 	}
11688 
11689 	got_object_commit_close(commit);
11690 	commit = NULL;
11691 
11692 	if (!continue_rebase) {
11693 		error = got_worktree_rebase_prepare(&new_base_branch,
11694 		    &tmp_branch, &fileindex, worktree, branch, repo);
11695 		if (error)
11696 			goto done;
11697 	}
11698 
11699 	if (STAILQ_EMPTY(&commits)) {
11700 		if (continue_rebase) {
11701 			error = rebase_complete(worktree, fileindex,
11702 			    branch, tmp_branch, repo, create_backup);
11703 			goto done;
11704 		} else {
11705 			/* Fast-forward the reference of the branch. */
11706 			struct got_object_id *new_head_commit_id;
11707 			char *id_str;
11708 			error = got_ref_resolve(&new_head_commit_id, repo,
11709 			    new_base_branch);
11710 			if (error)
11711 				goto done;
11712 			error = got_object_id_str(&id_str, new_head_commit_id);
11713 			if (error)
11714 				goto done;
11715 			printf("Forwarding %s to commit %s\n",
11716 			    got_ref_get_name(branch), id_str);
11717 			free(id_str);
11718 			error = got_ref_change_ref(branch,
11719 			    new_head_commit_id);
11720 			if (error)
11721 				goto done;
11722 			/* No backup needed since objects did not change. */
11723 			create_backup = 0;
11724 		}
11725 	}
11726 
11727 	pid = NULL;
11728 	STAILQ_FOREACH(qid, &commits, entry) {
11729 
11730 		commit_id = &qid->id;
11731 		parent_id = pid ? &pid->id : yca_id;
11732 		pid = qid;
11733 
11734 		memset(&upa, 0, sizeof(upa));
11735 		error = got_worktree_rebase_merge_files(&merged_paths,
11736 		    worktree, fileindex, parent_id, commit_id, repo,
11737 		    update_progress, &upa, check_cancelled, NULL);
11738 		if (error)
11739 			goto done;
11740 
11741 		print_merge_progress_stats(&upa);
11742 		if (upa.conflicts > 0 || upa.missing > 0 ||
11743 		    upa.not_deleted > 0 || upa.unversioned > 0) {
11744 			if (upa.conflicts > 0) {
11745 				error = show_rebase_merge_conflict(&qid->id,
11746 				    repo);
11747 				if (error)
11748 					goto done;
11749 			}
11750 			got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11751 			break;
11752 		}
11753 
11754 		error = rebase_commit(&merged_paths, worktree, fileindex,
11755 		    tmp_branch, committer, commit_id, 0, repo);
11756 		got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11757 		if (error)
11758 			goto done;
11759 	}
11760 
11761 	if (upa.conflicts > 0 || upa.missing > 0 ||
11762 	    upa.not_deleted > 0 || upa.unversioned > 0) {
11763 		error = got_worktree_rebase_postpone(worktree, fileindex);
11764 		if (error)
11765 			goto done;
11766 		if (upa.conflicts > 0 && upa.missing == 0 &&
11767 		    upa.not_deleted == 0 && upa.unversioned == 0) {
11768 			error = got_error_msg(GOT_ERR_CONFLICTS,
11769 			    "conflicts must be resolved before rebasing "
11770 			    "can continue");
11771 		} else if (upa.conflicts > 0) {
11772 			error = got_error_msg(GOT_ERR_CONFLICTS,
11773 			    "conflicts must be resolved before rebasing "
11774 			    "can continue; changes destined for some "
11775 			    "files were not yet merged and should be "
11776 			    "merged manually if required before the "
11777 			    "rebase operation is continued");
11778 		} else {
11779 			error = got_error_msg(GOT_ERR_CONFLICTS,
11780 			    "changes destined for some files were not "
11781 			    "yet merged and should be merged manually "
11782 			    "if required before the rebase operation "
11783 			    "is continued");
11784 		}
11785 	} else
11786 		error = rebase_complete(worktree, fileindex, branch,
11787 		    tmp_branch, repo, create_backup);
11788 done:
11789 	free(cwd);
11790 	free(committer);
11791 	free(gitconfig_path);
11792 	got_object_id_queue_free(&commits);
11793 	free(branch_head_commit_id);
11794 	free(resume_commit_id);
11795 	free(head_commit_id);
11796 	free(yca_id);
11797 	if (commit)
11798 		got_object_commit_close(commit);
11799 	if (branch)
11800 		got_ref_close(branch);
11801 	if (new_base_branch)
11802 		got_ref_close(new_base_branch);
11803 	if (tmp_branch)
11804 		got_ref_close(tmp_branch);
11805 	if (head_ref)
11806 		got_ref_close(head_ref);
11807 	if (worktree)
11808 		got_worktree_close(worktree);
11809 	if (repo) {
11810 		const struct got_error *close_err = got_repo_close(repo);
11811 		if (error == NULL)
11812 			error = close_err;
11813 	}
11814 	if (pack_fds) {
11815 		const struct got_error *pack_err =
11816 		    got_repo_pack_fds_close(pack_fds);
11817 		if (error == NULL)
11818 			error = pack_err;
11819 	}
11820 	return error;
11821 }
11822 
11823 __dead static void
11824 usage_histedit(void)
11825 {
11826 	fprintf(stderr, "usage: %s histedit [-aCcdeflmX] [-F histedit-script] "
11827 	    "[branch]\n", getprogname());
11828 	exit(1);
11829 }
11830 
11831 #define GOT_HISTEDIT_PICK 'p'
11832 #define GOT_HISTEDIT_EDIT 'e'
11833 #define GOT_HISTEDIT_FOLD 'f'
11834 #define GOT_HISTEDIT_DROP 'd'
11835 #define GOT_HISTEDIT_MESG 'm'
11836 
11837 static const struct got_histedit_cmd {
11838 	unsigned char code;
11839 	const char *name;
11840 	const char *desc;
11841 } got_histedit_cmds[] = {
11842 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
11843 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
11844 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
11845 	    "be used" },
11846 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
11847 	{ GOT_HISTEDIT_MESG, "mesg", "open editor to edit the log message" },
11848 };
11849 
11850 struct got_histedit_list_entry {
11851 	TAILQ_ENTRY(got_histedit_list_entry) entry;
11852 	struct got_object_id *commit_id;
11853 	const struct got_histedit_cmd *cmd;
11854 	char *logmsg;
11855 };
11856 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
11857 
11858 static const struct got_error *
11859 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
11860     FILE *f, struct got_repository *repo)
11861 {
11862 	const struct got_error *err = NULL;
11863 	char *logmsg = NULL, *id_str = NULL;
11864 	struct got_commit_object *commit = NULL;
11865 	int n;
11866 
11867 	err = got_object_open_as_commit(&commit, repo, commit_id);
11868 	if (err)
11869 		goto done;
11870 
11871 	err = get_short_logmsg(&logmsg, 34, commit);
11872 	if (err)
11873 		goto done;
11874 
11875 	err = got_object_id_str(&id_str, commit_id);
11876 	if (err)
11877 		goto done;
11878 
11879 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
11880 	if (n < 0)
11881 		err = got_ferror(f, GOT_ERR_IO);
11882 done:
11883 	if (commit)
11884 		got_object_commit_close(commit);
11885 	free(id_str);
11886 	free(logmsg);
11887 	return err;
11888 }
11889 
11890 static const struct got_error *
11891 histedit_write_commit_list(struct got_object_id_queue *commits,
11892     FILE *f, int edit_logmsg_only, int fold_only, int drop_only,
11893     int edit_only, struct got_repository *repo)
11894 {
11895 	const struct got_error *err = NULL;
11896 	struct got_object_qid *qid;
11897 	const char *histedit_cmd = NULL;
11898 
11899 	if (STAILQ_EMPTY(commits))
11900 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
11901 
11902 	STAILQ_FOREACH(qid, commits, entry) {
11903 		histedit_cmd = got_histedit_cmds[0].name;
11904 		if (drop_only)
11905 			histedit_cmd = "drop";
11906 		else if (edit_only)
11907 			histedit_cmd = "edit";
11908 		else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
11909 			histedit_cmd = "fold";
11910 		else if (edit_logmsg_only)
11911 			histedit_cmd = "mesg";
11912 		err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
11913 		if (err)
11914 			break;
11915 	}
11916 
11917 	return err;
11918 }
11919 
11920 static const struct got_error *
11921 write_cmd_list(FILE *f, const char *branch_name,
11922     struct got_object_id_queue *commits)
11923 {
11924 	const struct got_error *err = NULL;
11925 	size_t i;
11926 	int n;
11927 	char *id_str;
11928 	struct got_object_qid *qid;
11929 
11930 	qid = STAILQ_FIRST(commits);
11931 	err = got_object_id_str(&id_str, &qid->id);
11932 	if (err)
11933 		return err;
11934 
11935 	n = fprintf(f,
11936 	    "# Editing the history of branch '%s' starting at\n"
11937 	    "# commit %s\n"
11938 	    "# Commits will be processed in order from top to "
11939 	    "bottom of this file.\n", branch_name, id_str);
11940 	if (n < 0) {
11941 		err = got_ferror(f, GOT_ERR_IO);
11942 		goto done;
11943 	}
11944 
11945 	n = fprintf(f, "# Available histedit commands:\n");
11946 	if (n < 0) {
11947 		err = got_ferror(f, GOT_ERR_IO);
11948 		goto done;
11949 	}
11950 
11951 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
11952 		const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
11953 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
11954 		    cmd->desc);
11955 		if (n < 0) {
11956 			err = got_ferror(f, GOT_ERR_IO);
11957 			break;
11958 		}
11959 	}
11960 done:
11961 	free(id_str);
11962 	return err;
11963 }
11964 
11965 static const struct got_error *
11966 histedit_syntax_error(int lineno)
11967 {
11968 	static char msg[42];
11969 	int ret;
11970 
11971 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
11972 	    lineno);
11973 	if (ret < 0 || (size_t)ret >= sizeof(msg))
11974 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
11975 
11976 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
11977 }
11978 
11979 static const struct got_error *
11980 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
11981     char *logmsg, struct got_repository *repo)
11982 {
11983 	const struct got_error *err;
11984 	struct got_commit_object *folded_commit = NULL;
11985 	char *id_str, *folded_logmsg = NULL;
11986 
11987 	err = got_object_id_str(&id_str, hle->commit_id);
11988 	if (err)
11989 		return err;
11990 
11991 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
11992 	if (err)
11993 		goto done;
11994 
11995 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
11996 	if (err)
11997 		goto done;
11998 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
11999 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
12000 	    folded_logmsg) == -1) {
12001 		err = got_error_from_errno("asprintf");
12002 	}
12003 done:
12004 	if (folded_commit)
12005 		got_object_commit_close(folded_commit);
12006 	free(id_str);
12007 	free(folded_logmsg);
12008 	return err;
12009 }
12010 
12011 static struct got_histedit_list_entry *
12012 get_folded_commits(struct got_histedit_list_entry *hle)
12013 {
12014 	struct got_histedit_list_entry *prev, *folded = NULL;
12015 
12016 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
12017 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
12018 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
12019 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
12020 			folded = prev;
12021 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
12022 	}
12023 
12024 	return folded;
12025 }
12026 
12027 static const struct got_error *
12028 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
12029     const char *editor, struct got_repository *repo)
12030 {
12031 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
12032 	char *logmsg = NULL, *new_msg = NULL;
12033 	const struct got_error *err = NULL;
12034 	struct got_commit_object *commit = NULL;
12035 	int logmsg_len;
12036 	int fd = -1;
12037 	struct got_histedit_list_entry *folded = NULL;
12038 
12039 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12040 	if (err)
12041 		return err;
12042 
12043 	folded = get_folded_commits(hle);
12044 	if (folded) {
12045 		while (folded != hle) {
12046 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
12047 				folded = TAILQ_NEXT(folded, entry);
12048 				continue;
12049 			}
12050 			err = append_folded_commit_msg(&new_msg, folded,
12051 			    logmsg, repo);
12052 			if (err)
12053 				goto done;
12054 			free(logmsg);
12055 			logmsg = new_msg;
12056 			folded = TAILQ_NEXT(folded, entry);
12057 		}
12058 	}
12059 
12060 	err = got_object_id_str(&id_str, hle->commit_id);
12061 	if (err)
12062 		goto done;
12063 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
12064 	if (err)
12065 		goto done;
12066 	logmsg_len = asprintf(&new_msg,
12067 	    "%s\n# original log message of commit %s: %s",
12068 	    logmsg ? logmsg : "", id_str, orig_logmsg);
12069 	if (logmsg_len == -1) {
12070 		err = got_error_from_errno("asprintf");
12071 		goto done;
12072 	}
12073 	free(logmsg);
12074 	logmsg = new_msg;
12075 
12076 	err = got_object_id_str(&id_str, hle->commit_id);
12077 	if (err)
12078 		goto done;
12079 
12080 	err = got_opentemp_named_fd(&logmsg_path, &fd,
12081 	    GOT_TMPDIR_STR "/got-logmsg", "");
12082 	if (err)
12083 		goto done;
12084 
12085 	if (write(fd, logmsg, logmsg_len) == -1) {
12086 		err = got_error_from_errno2("write", logmsg_path);
12087 		goto done;
12088 	}
12089 	if (close(fd) == -1) {
12090 		err = got_error_from_errno2("close", logmsg_path);
12091 		goto done;
12092 	}
12093 	fd = -1;
12094 
12095 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
12096 	    logmsg_len, 0);
12097 	if (err) {
12098 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
12099 			goto done;
12100 		err = NULL;
12101 		hle->logmsg = strdup(new_msg);
12102 		if (hle->logmsg == NULL)
12103 			err = got_error_from_errno("strdup");
12104 	}
12105 done:
12106 	if (fd != -1 && close(fd) == -1 && err == NULL)
12107 		err = got_error_from_errno2("close", logmsg_path);
12108 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
12109 		err = got_error_from_errno2("unlink", logmsg_path);
12110 	free(logmsg_path);
12111 	free(logmsg);
12112 	free(orig_logmsg);
12113 	if (commit)
12114 		got_object_commit_close(commit);
12115 	return err;
12116 }
12117 
12118 static const struct got_error *
12119 histedit_parse_list(struct got_histedit_list *histedit_cmds,
12120     FILE *f, struct got_repository *repo)
12121 {
12122 	const struct got_error *err = NULL;
12123 	char *line = NULL, *p, *end;
12124 	size_t i, linesize = 0;
12125 	ssize_t linelen;
12126 	int lineno = 0;
12127 	const struct got_histedit_cmd *cmd;
12128 	struct got_object_id *commit_id = NULL;
12129 	struct got_histedit_list_entry *hle = NULL;
12130 
12131 	for (;;) {
12132 		linelen = getline(&line, &linesize, f);
12133 		if (linelen == -1) {
12134 			const struct got_error *getline_err;
12135 			if (feof(f))
12136 				break;
12137 			getline_err = got_error_from_errno("getline");
12138 			err = got_ferror(f, getline_err->code);
12139 			break;
12140 		}
12141 		lineno++;
12142 		p = line;
12143 		while (isspace((unsigned char)p[0]))
12144 			p++;
12145 		if (p[0] == '#' || p[0] == '\0')
12146 			continue;
12147 		cmd = NULL;
12148 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
12149 			cmd = &got_histedit_cmds[i];
12150 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
12151 			    isspace((unsigned char)p[strlen(cmd->name)])) {
12152 				p += strlen(cmd->name);
12153 				break;
12154 			}
12155 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
12156 				p++;
12157 				break;
12158 			}
12159 		}
12160 		if (i == nitems(got_histedit_cmds)) {
12161 			err = histedit_syntax_error(lineno);
12162 			break;
12163 		}
12164 		while (isspace((unsigned char)p[0]))
12165 			p++;
12166 		end = p;
12167 		while (end[0] && !isspace((unsigned char)end[0]))
12168 			end++;
12169 		*end = '\0';
12170 		err = got_object_resolve_id_str(&commit_id, repo, p);
12171 		if (err) {
12172 			/* override error code */
12173 			err = histedit_syntax_error(lineno);
12174 			break;
12175 		}
12176 		hle = malloc(sizeof(*hle));
12177 		if (hle == NULL) {
12178 			err = got_error_from_errno("malloc");
12179 			break;
12180 		}
12181 		hle->cmd = cmd;
12182 		hle->commit_id = commit_id;
12183 		hle->logmsg = NULL;
12184 		commit_id = NULL;
12185 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
12186 	}
12187 
12188 	free(line);
12189 	free(commit_id);
12190 	return err;
12191 }
12192 
12193 static const struct got_error *
12194 histedit_check_script(struct got_histedit_list *histedit_cmds,
12195     struct got_object_id_queue *commits, struct got_repository *repo)
12196 {
12197 	const struct got_error *err = NULL;
12198 	struct got_object_qid *qid;
12199 	struct got_histedit_list_entry *hle;
12200 	static char msg[92];
12201 	char *id_str;
12202 
12203 	if (TAILQ_EMPTY(histedit_cmds))
12204 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12205 		    "histedit script contains no commands");
12206 	if (STAILQ_EMPTY(commits))
12207 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
12208 
12209 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
12210 		struct got_histedit_list_entry *hle2;
12211 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
12212 			if (hle == hle2)
12213 				continue;
12214 			if (got_object_id_cmp(hle->commit_id,
12215 			    hle2->commit_id) != 0)
12216 				continue;
12217 			err = got_object_id_str(&id_str, hle->commit_id);
12218 			if (err)
12219 				return err;
12220 			snprintf(msg, sizeof(msg), "commit %s is listed "
12221 			    "more than once in histedit script", id_str);
12222 			free(id_str);
12223 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12224 		}
12225 	}
12226 
12227 	STAILQ_FOREACH(qid, commits, entry) {
12228 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
12229 			if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
12230 				break;
12231 		}
12232 		if (hle == NULL) {
12233 			err = got_object_id_str(&id_str, &qid->id);
12234 			if (err)
12235 				return err;
12236 			snprintf(msg, sizeof(msg),
12237 			    "commit %s missing from histedit script", id_str);
12238 			free(id_str);
12239 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12240 		}
12241 	}
12242 
12243 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
12244 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
12245 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
12246 		    "last commit in histedit script cannot be folded");
12247 
12248 	return NULL;
12249 }
12250 
12251 static const struct got_error *
12252 histedit_run_editor(struct got_histedit_list *histedit_cmds,
12253     const char *editor, const char *path,
12254     struct got_object_id_queue *commits, struct got_repository *repo)
12255 {
12256 	const struct got_error *err = NULL;
12257 	struct stat st, st2;
12258 	struct timespec timeout;
12259 	FILE *f = NULL;
12260 
12261 	if (stat(path, &st) == -1) {
12262 		err = got_error_from_errno2("stat", path);
12263 		goto done;
12264 	}
12265 
12266 	if (spawn_editor(editor, path) == -1) {
12267 		err = got_error_from_errno("failed spawning editor");
12268 		goto done;
12269 	}
12270 
12271 	timeout.tv_sec = 0;
12272 	timeout.tv_nsec = 1;
12273 	nanosleep(&timeout,  NULL);
12274 
12275 	if (stat(path, &st2) == -1) {
12276 		err = got_error_from_errno2("stat", path);
12277 		goto done;
12278 	}
12279 
12280 	if (st.st_size == st2.st_size &&
12281 	    timespeccmp(&st.st_mtim, &st2.st_mtim, ==)) {
12282 		err = got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12283                     "no changes made to histedit script, aborting");
12284 		goto done;
12285 	}
12286 
12287 	f = fopen(path, "re");
12288 	if (f == NULL) {
12289 		err = got_error_from_errno("fopen");
12290 		goto done;
12291 	}
12292 	err = histedit_parse_list(histedit_cmds, f, repo);
12293 	if (err)
12294 		goto done;
12295 
12296 	err = histedit_check_script(histedit_cmds, commits, repo);
12297 done:
12298 	if (f && fclose(f) == EOF && err == NULL)
12299 		err = got_error_from_errno("fclose");
12300 	return err;
12301 }
12302 
12303 static const struct got_error *
12304 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
12305     struct got_object_id_queue *, const char *, const char *, const char *,
12306     struct got_repository *);
12307 
12308 static const struct got_error *
12309 histedit_edit_script(struct got_histedit_list *histedit_cmds,
12310     struct got_object_id_queue *commits, const char *branch_name,
12311     int edit_logmsg_only, int fold_only, int drop_only, int edit_only,
12312     const char *editor, struct got_repository *repo)
12313 {
12314 	const struct got_error *err;
12315 	FILE *f = NULL;
12316 	char *path = NULL;
12317 
12318 	err = got_opentemp_named(&path, &f, "got-histedit", "");
12319 	if (err)
12320 		return err;
12321 
12322 	err = write_cmd_list(f, branch_name, commits);
12323 	if (err)
12324 		goto done;
12325 
12326 	err = histedit_write_commit_list(commits, f, edit_logmsg_only,
12327 	    fold_only, drop_only, edit_only, repo);
12328 	if (err)
12329 		goto done;
12330 
12331 	if (drop_only || edit_logmsg_only || fold_only || edit_only) {
12332 		rewind(f);
12333 		err = histedit_parse_list(histedit_cmds, f, repo);
12334 	} else {
12335 		if (fclose(f) == EOF) {
12336 			err = got_error_from_errno("fclose");
12337 			goto done;
12338 		}
12339 		f = NULL;
12340 		err = histedit_run_editor(histedit_cmds, editor, path,
12341 		    commits, repo);
12342 		if (err) {
12343 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12344 			    err->code != GOT_ERR_HISTEDIT_CMD)
12345 				goto done;
12346 			err = histedit_edit_list_retry(histedit_cmds, err,
12347 			    commits, editor, path, branch_name, repo);
12348 		}
12349 	}
12350 done:
12351 	if (f && fclose(f) == EOF && err == NULL)
12352 		err = got_error_from_errno("fclose");
12353 	if (path && unlink(path) != 0 && err == NULL)
12354 		err = got_error_from_errno2("unlink", path);
12355 	free(path);
12356 	return err;
12357 }
12358 
12359 static const struct got_error *
12360 histedit_save_list(struct got_histedit_list *histedit_cmds,
12361     struct got_worktree *worktree, struct got_repository *repo)
12362 {
12363 	const struct got_error *err = NULL;
12364 	char *path = NULL;
12365 	FILE *f = NULL;
12366 	struct got_histedit_list_entry *hle;
12367 
12368 	err = got_worktree_get_histedit_script_path(&path, worktree);
12369 	if (err)
12370 		return err;
12371 
12372 	f = fopen(path, "we");
12373 	if (f == NULL) {
12374 		err = got_error_from_errno2("fopen", path);
12375 		goto done;
12376 	}
12377 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
12378 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
12379 		    repo);
12380 		if (err)
12381 			break;
12382 	}
12383 done:
12384 	if (f && fclose(f) == EOF && err == NULL)
12385 		err = got_error_from_errno("fclose");
12386 	free(path);
12387 	return err;
12388 }
12389 
12390 static void
12391 histedit_free_list(struct got_histedit_list *histedit_cmds)
12392 {
12393 	struct got_histedit_list_entry *hle;
12394 
12395 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
12396 		TAILQ_REMOVE(histedit_cmds, hle, entry);
12397 		free(hle);
12398 	}
12399 }
12400 
12401 static const struct got_error *
12402 histedit_load_list(struct got_histedit_list *histedit_cmds,
12403     const char *path, struct got_repository *repo)
12404 {
12405 	const struct got_error *err = NULL;
12406 	FILE *f = NULL;
12407 
12408 	f = fopen(path, "re");
12409 	if (f == NULL) {
12410 		err = got_error_from_errno2("fopen", path);
12411 		goto done;
12412 	}
12413 
12414 	err = histedit_parse_list(histedit_cmds, f, repo);
12415 done:
12416 	if (f && fclose(f) == EOF && err == NULL)
12417 		err = got_error_from_errno("fclose");
12418 	return err;
12419 }
12420 
12421 static const struct got_error *
12422 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
12423     const struct got_error *edit_err, struct got_object_id_queue *commits,
12424     const char *editor, const char *path, const char *branch_name,
12425     struct got_repository *repo)
12426 {
12427 	const struct got_error *err = NULL, *prev_err = edit_err;
12428 	int resp = ' ';
12429 
12430 	while (resp != 'c' && resp != 'r' && resp != 'a') {
12431 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
12432 		    "or (a)bort: ", getprogname(), prev_err->msg);
12433 		resp = getchar();
12434 		if (resp == '\n')
12435 			resp = getchar();
12436 		if (resp == 'c') {
12437 			histedit_free_list(histedit_cmds);
12438 			err = histedit_run_editor(histedit_cmds, editor, path,
12439 			    commits, repo);
12440 			if (err) {
12441 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12442 				    err->code != GOT_ERR_HISTEDIT_CMD)
12443 					break;
12444 				prev_err = err;
12445 				resp = ' ';
12446 				continue;
12447 			}
12448 			break;
12449 		} else if (resp == 'r') {
12450 			histedit_free_list(histedit_cmds);
12451 			err = histedit_edit_script(histedit_cmds,
12452 			    commits, branch_name, 0, 0, 0, 0, editor, repo);
12453 			if (err) {
12454 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12455 				    err->code != GOT_ERR_HISTEDIT_CMD)
12456 					break;
12457 				prev_err = err;
12458 				resp = ' ';
12459 				continue;
12460 			}
12461 			break;
12462 		} else if (resp == 'a') {
12463 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
12464 			break;
12465 		} else
12466 			printf("invalid response '%c'\n", resp);
12467 	}
12468 
12469 	return err;
12470 }
12471 
12472 static const struct got_error *
12473 histedit_complete(struct got_worktree *worktree,
12474     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
12475     struct got_reference *branch, struct got_repository *repo)
12476 {
12477 	printf("Switching work tree to %s\n",
12478 	    got_ref_get_symref_target(branch));
12479 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
12480 	    branch, repo);
12481 }
12482 
12483 static const struct got_error *
12484 show_histedit_progress(struct got_commit_object *commit,
12485     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
12486 {
12487 	const struct got_error *err;
12488 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
12489 
12490 	err = got_object_id_str(&old_id_str, hle->commit_id);
12491 	if (err)
12492 		goto done;
12493 
12494 	if (new_id) {
12495 		err = got_object_id_str(&new_id_str, new_id);
12496 		if (err)
12497 			goto done;
12498 	}
12499 
12500 	old_id_str[12] = '\0';
12501 	if (new_id_str)
12502 		new_id_str[12] = '\0';
12503 
12504 	if (hle->logmsg) {
12505 		logmsg = strdup(hle->logmsg);
12506 		if (logmsg == NULL) {
12507 			err = got_error_from_errno("strdup");
12508 			goto done;
12509 		}
12510 		trim_logmsg(logmsg, 42);
12511 	} else {
12512 		err = get_short_logmsg(&logmsg, 42, commit);
12513 		if (err)
12514 			goto done;
12515 	}
12516 
12517 	switch (hle->cmd->code) {
12518 	case GOT_HISTEDIT_PICK:
12519 	case GOT_HISTEDIT_EDIT:
12520 	case GOT_HISTEDIT_MESG:
12521 		printf("%s -> %s: %s\n", old_id_str,
12522 		    new_id_str ? new_id_str : "no-op change", logmsg);
12523 		break;
12524 	case GOT_HISTEDIT_DROP:
12525 	case GOT_HISTEDIT_FOLD:
12526 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
12527 		    logmsg);
12528 		break;
12529 	default:
12530 		break;
12531 	}
12532 done:
12533 	free(old_id_str);
12534 	free(new_id_str);
12535 	return err;
12536 }
12537 
12538 static const struct got_error *
12539 histedit_commit(struct got_pathlist_head *merged_paths,
12540     struct got_worktree *worktree, struct got_fileindex *fileindex,
12541     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
12542     const char *committer, int allow_conflict, const char *editor,
12543     struct got_repository *repo)
12544 {
12545 	const struct got_error *err;
12546 	struct got_commit_object *commit;
12547 	struct got_object_id *new_commit_id;
12548 
12549 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
12550 	    && hle->logmsg == NULL) {
12551 		err = histedit_edit_logmsg(hle, editor, repo);
12552 		if (err)
12553 			return err;
12554 	}
12555 
12556 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12557 	if (err)
12558 		return err;
12559 
12560 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
12561 	    worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
12562 	    hle->logmsg, allow_conflict, repo);
12563 	if (err) {
12564 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
12565 			goto done;
12566 		err = show_histedit_progress(commit, hle, NULL);
12567 	} else {
12568 		err = show_histedit_progress(commit, hle, new_commit_id);
12569 		free(new_commit_id);
12570 	}
12571 done:
12572 	got_object_commit_close(commit);
12573 	return err;
12574 }
12575 
12576 static const struct got_error *
12577 histedit_skip_commit(struct got_histedit_list_entry *hle,
12578     struct got_worktree *worktree, struct got_repository *repo)
12579 {
12580 	const struct got_error *error;
12581 	struct got_commit_object *commit;
12582 
12583 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
12584 	    repo);
12585 	if (error)
12586 		return error;
12587 
12588 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
12589 	if (error)
12590 		return error;
12591 
12592 	error = show_histedit_progress(commit, hle, NULL);
12593 	got_object_commit_close(commit);
12594 	return error;
12595 }
12596 
12597 static const struct got_error *
12598 check_local_changes(void *arg, unsigned char status,
12599     unsigned char staged_status, const char *path,
12600     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12601     struct got_object_id *commit_id, int dirfd, const char *de_name)
12602 {
12603 	int *have_local_changes = arg;
12604 
12605 	switch (status) {
12606 	case GOT_STATUS_ADD:
12607 	case GOT_STATUS_DELETE:
12608 	case GOT_STATUS_MODIFY:
12609 	case GOT_STATUS_CONFLICT:
12610 		*have_local_changes = 1;
12611 		return got_error(GOT_ERR_CANCELLED);
12612 	default:
12613 		break;
12614 	}
12615 
12616 	switch (staged_status) {
12617 	case GOT_STATUS_ADD:
12618 	case GOT_STATUS_DELETE:
12619 	case GOT_STATUS_MODIFY:
12620 		*have_local_changes = 1;
12621 		return got_error(GOT_ERR_CANCELLED);
12622 	default:
12623 		break;
12624 	}
12625 
12626 	return NULL;
12627 }
12628 
12629 static const struct got_error *
12630 cmd_histedit(int argc, char *argv[])
12631 {
12632 	const struct got_error *error = NULL;
12633 	struct got_worktree *worktree = NULL;
12634 	struct got_fileindex *fileindex = NULL;
12635 	struct got_repository *repo = NULL;
12636 	char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
12637 	struct got_reference *branch = NULL;
12638 	struct got_reference *tmp_branch = NULL;
12639 	struct got_object_id *resume_commit_id = NULL;
12640 	struct got_object_id *base_commit_id = NULL;
12641 	struct got_object_id *head_commit_id = NULL;
12642 	struct got_commit_object *commit = NULL;
12643 	int ch, rebase_in_progress = 0, merge_in_progress = 0;
12644 	struct got_update_progress_arg upa;
12645 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
12646 	int drop_only = 0, edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
12647 	int allow_conflict = 0, list_backups = 0, delete_backups = 0;
12648 	const char *edit_script_path = NULL;
12649 	char *editor = NULL;
12650 	struct got_object_id_queue commits;
12651 	struct got_pathlist_head merged_paths;
12652 	const struct got_object_id_queue *parent_ids;
12653 	struct got_object_qid *pid;
12654 	struct got_histedit_list histedit_cmds;
12655 	struct got_histedit_list_entry *hle;
12656 	int *pack_fds = NULL;
12657 
12658 	STAILQ_INIT(&commits);
12659 	TAILQ_INIT(&histedit_cmds);
12660 	TAILQ_INIT(&merged_paths);
12661 	memset(&upa, 0, sizeof(upa));
12662 
12663 #ifndef PROFILE
12664 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12665 	    "unveil", NULL) == -1)
12666 		err(1, "pledge");
12667 #endif
12668 
12669 	while ((ch = getopt(argc, argv, "aCcdeF:flmX")) != -1) {
12670 		switch (ch) {
12671 		case 'a':
12672 			abort_edit = 1;
12673 			break;
12674 		case 'C':
12675 			allow_conflict = 1;
12676 			break;
12677 		case 'c':
12678 			continue_edit = 1;
12679 			break;
12680 		case 'd':
12681 			drop_only = 1;
12682 			break;
12683 		case 'e':
12684 			edit_only = 1;
12685 			break;
12686 		case 'F':
12687 			edit_script_path = optarg;
12688 			break;
12689 		case 'f':
12690 			fold_only = 1;
12691 			break;
12692 		case 'l':
12693 			list_backups = 1;
12694 			break;
12695 		case 'm':
12696 			edit_logmsg_only = 1;
12697 			break;
12698 		case 'X':
12699 			delete_backups = 1;
12700 			break;
12701 		default:
12702 			usage_histedit();
12703 			/* NOTREACHED */
12704 		}
12705 	}
12706 
12707 	argc -= optind;
12708 	argv += optind;
12709 
12710 	if (abort_edit && allow_conflict)
12711 		option_conflict('a', 'C');
12712 	if (abort_edit && continue_edit)
12713 		option_conflict('a', 'c');
12714 	if (edit_script_path && allow_conflict)
12715 		option_conflict('F', 'C');
12716 	if (edit_script_path && edit_logmsg_only)
12717 		option_conflict('F', 'm');
12718 	if (abort_edit && edit_logmsg_only)
12719 		option_conflict('a', 'm');
12720 	if (edit_logmsg_only && allow_conflict)
12721 		option_conflict('m', 'C');
12722 	if (continue_edit && edit_logmsg_only)
12723 		option_conflict('c', 'm');
12724 	if (abort_edit && fold_only)
12725 		option_conflict('a', 'f');
12726 	if (fold_only && allow_conflict)
12727 		option_conflict('f', 'C');
12728 	if (continue_edit && fold_only)
12729 		option_conflict('c', 'f');
12730 	if (fold_only && edit_logmsg_only)
12731 		option_conflict('f', 'm');
12732 	if (edit_script_path && fold_only)
12733 		option_conflict('F', 'f');
12734 	if (abort_edit && edit_only)
12735 		option_conflict('a', 'e');
12736 	if (continue_edit && edit_only)
12737 		option_conflict('c', 'e');
12738 	if (edit_only && edit_logmsg_only)
12739 		option_conflict('e', 'm');
12740 	if (edit_script_path && edit_only)
12741 		option_conflict('F', 'e');
12742 	if (fold_only && edit_only)
12743 		option_conflict('f', 'e');
12744 	if (drop_only && abort_edit)
12745 		option_conflict('d', 'a');
12746 	if (drop_only && allow_conflict)
12747 		option_conflict('d', 'C');
12748 	if (drop_only && continue_edit)
12749 		option_conflict('d', 'c');
12750 	if (drop_only && edit_logmsg_only)
12751 		option_conflict('d', 'm');
12752 	if (drop_only && edit_only)
12753 		option_conflict('d', 'e');
12754 	if (drop_only && edit_script_path)
12755 		option_conflict('d', 'F');
12756 	if (drop_only && fold_only)
12757 		option_conflict('d', 'f');
12758 	if (list_backups) {
12759 		if (abort_edit)
12760 			option_conflict('l', 'a');
12761 		if (allow_conflict)
12762 			option_conflict('l', 'C');
12763 		if (continue_edit)
12764 			option_conflict('l', 'c');
12765 		if (edit_script_path)
12766 			option_conflict('l', 'F');
12767 		if (edit_logmsg_only)
12768 			option_conflict('l', 'm');
12769 		if (drop_only)
12770 			option_conflict('l', 'd');
12771 		if (fold_only)
12772 			option_conflict('l', 'f');
12773 		if (edit_only)
12774 			option_conflict('l', 'e');
12775 		if (delete_backups)
12776 			option_conflict('l', 'X');
12777 		if (argc != 0 && argc != 1)
12778 			usage_histedit();
12779 	} else if (delete_backups) {
12780 		if (abort_edit)
12781 			option_conflict('X', 'a');
12782 		if (allow_conflict)
12783 			option_conflict('X', 'C');
12784 		if (continue_edit)
12785 			option_conflict('X', 'c');
12786 		if (drop_only)
12787 			option_conflict('X', 'd');
12788 		if (edit_script_path)
12789 			option_conflict('X', 'F');
12790 		if (edit_logmsg_only)
12791 			option_conflict('X', 'm');
12792 		if (fold_only)
12793 			option_conflict('X', 'f');
12794 		if (edit_only)
12795 			option_conflict('X', 'e');
12796 		if (list_backups)
12797 			option_conflict('X', 'l');
12798 		if (argc != 0 && argc != 1)
12799 			usage_histedit();
12800 	} else if (allow_conflict && !continue_edit)
12801 		errx(1, "-C option requires -c");
12802 	else if (argc != 0)
12803 		usage_histedit();
12804 
12805 	cwd = getcwd(NULL, 0);
12806 	if (cwd == NULL) {
12807 		error = got_error_from_errno("getcwd");
12808 		goto done;
12809 	}
12810 
12811 	error = got_repo_pack_fds_open(&pack_fds);
12812 	if (error != NULL)
12813 		goto done;
12814 
12815 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
12816 	if (error) {
12817 		if (list_backups || delete_backups) {
12818 			if (error->code != GOT_ERR_NOT_WORKTREE)
12819 				goto done;
12820 		} else {
12821 			if (error->code == GOT_ERR_NOT_WORKTREE)
12822 				error = wrap_not_worktree_error(error,
12823 				    "histedit", cwd);
12824 			goto done;
12825 		}
12826 	}
12827 
12828 	if (list_backups || delete_backups) {
12829 		error = got_repo_open(&repo,
12830 		    worktree ? got_worktree_get_repo_path(worktree) : cwd,
12831 		    NULL, pack_fds);
12832 		if (error != NULL)
12833 			goto done;
12834 		error = apply_unveil(got_repo_get_path(repo), 0,
12835 		    worktree ? got_worktree_get_root_path(worktree) : NULL);
12836 		if (error)
12837 			goto done;
12838 		error = process_backup_refs(
12839 		    GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
12840 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
12841 		goto done; /* nothing else to do */
12842 	} else {
12843 		error = get_gitconfig_path(&gitconfig_path);
12844 		if (error)
12845 			goto done;
12846 		error = got_repo_open(&repo,
12847 		    got_worktree_get_repo_path(worktree), gitconfig_path,
12848 		    pack_fds);
12849 		if (error != NULL)
12850 			goto done;
12851 		error = get_editor(&editor);
12852 		if (error)
12853 			goto done;
12854 		if (unveil(editor, "x") != 0) {
12855 			error = got_error_from_errno2("unveil", editor);
12856 			goto done;
12857 		}
12858 		if (edit_script_path) {
12859 			if (unveil(edit_script_path, "r") != 0) {
12860 				error = got_error_from_errno2("unveil",
12861 				    edit_script_path);
12862 				goto done;
12863 			}
12864 		}
12865 		error = apply_unveil(got_repo_get_path(repo), 0,
12866 		    got_worktree_get_root_path(worktree));
12867 		if (error)
12868 			goto done;
12869 	}
12870 
12871 	if (worktree != NULL && !list_backups && !delete_backups) {
12872 		error = worktree_has_logmsg_ref("histedit", worktree, repo);
12873 		if (error)
12874 			goto done;
12875 	}
12876 
12877 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
12878 	if (error)
12879 		goto done;
12880 	if (rebase_in_progress) {
12881 		error = got_error(GOT_ERR_REBASING);
12882 		goto done;
12883 	}
12884 
12885 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12886 	    repo);
12887 	if (error)
12888 		goto done;
12889 	if (merge_in_progress) {
12890 		error = got_error(GOT_ERR_MERGE_BUSY);
12891 		goto done;
12892 	}
12893 
12894 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
12895 	if (error)
12896 		goto done;
12897 
12898 	if (edit_in_progress && edit_logmsg_only) {
12899 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12900 		    "histedit operation is in progress in this "
12901 		    "work tree and must be continued or aborted "
12902 		    "before the -m option can be used");
12903 		goto done;
12904 	}
12905 	if (edit_in_progress && drop_only) {
12906 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12907 		    "histedit operation is in progress in this "
12908 		    "work tree and must be continued or aborted "
12909 		    "before the -d option can be used");
12910 		goto done;
12911 	}
12912 	if (edit_in_progress && fold_only) {
12913 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12914 		    "histedit operation is in progress in this "
12915 		    "work tree and must be continued or aborted "
12916 		    "before the -f option can be used");
12917 		goto done;
12918 	}
12919 	if (edit_in_progress && edit_only) {
12920 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12921 		    "histedit operation is in progress in this "
12922 		    "work tree and must be continued or aborted "
12923 		    "before the -e option can be used");
12924 		goto done;
12925 	}
12926 
12927 	if (edit_in_progress && abort_edit) {
12928 		error = got_worktree_histedit_continue(&resume_commit_id,
12929 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
12930 		    worktree, repo);
12931 		if (error)
12932 			goto done;
12933 		printf("Switching work tree to %s\n",
12934 		    got_ref_get_symref_target(branch));
12935 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
12936 		    branch, base_commit_id, abort_progress, &upa);
12937 		if (error)
12938 			goto done;
12939 		printf("Histedit of %s aborted\n",
12940 		    got_ref_get_symref_target(branch));
12941 		print_merge_progress_stats(&upa);
12942 		goto done; /* nothing else to do */
12943 	} else if (abort_edit) {
12944 		error = got_error(GOT_ERR_NOT_HISTEDIT);
12945 		goto done;
12946 	}
12947 
12948 	error = get_author(&committer, repo, worktree);
12949 	if (error)
12950 		goto done;
12951 
12952 	if (continue_edit) {
12953 		char *path;
12954 
12955 		if (!edit_in_progress) {
12956 			error = got_error(GOT_ERR_NOT_HISTEDIT);
12957 			goto done;
12958 		}
12959 
12960 		error = got_worktree_get_histedit_script_path(&path, worktree);
12961 		if (error)
12962 			goto done;
12963 
12964 		error = histedit_load_list(&histedit_cmds, path, repo);
12965 		free(path);
12966 		if (error)
12967 			goto done;
12968 
12969 		error = got_worktree_histedit_continue(&resume_commit_id,
12970 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
12971 		    worktree, repo);
12972 		if (error)
12973 			goto done;
12974 
12975 		error = got_ref_resolve(&head_commit_id, repo, branch);
12976 		if (error)
12977 			goto done;
12978 
12979 		error = got_object_open_as_commit(&commit, repo,
12980 		    head_commit_id);
12981 		if (error)
12982 			goto done;
12983 		parent_ids = got_object_commit_get_parent_ids(commit);
12984 		pid = STAILQ_FIRST(parent_ids);
12985 		if (pid == NULL) {
12986 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12987 			goto done;
12988 		}
12989 		error = collect_commits(&commits, head_commit_id, &pid->id,
12990 		    base_commit_id, got_worktree_get_path_prefix(worktree),
12991 		    GOT_ERR_HISTEDIT_PATH, repo);
12992 		got_object_commit_close(commit);
12993 		commit = NULL;
12994 		if (error)
12995 			goto done;
12996 	} else {
12997 		if (edit_in_progress) {
12998 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
12999 			goto done;
13000 		}
13001 
13002 		error = got_ref_open(&branch, repo,
13003 		    got_worktree_get_head_ref_name(worktree), 0);
13004 		if (error != NULL)
13005 			goto done;
13006 
13007 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
13008 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
13009 			    "will not edit commit history of a branch outside "
13010 			    "the \"refs/heads/\" reference namespace");
13011 			goto done;
13012 		}
13013 
13014 		error = got_ref_resolve(&head_commit_id, repo, branch);
13015 		got_ref_close(branch);
13016 		branch = NULL;
13017 		if (error)
13018 			goto done;
13019 
13020 		error = got_object_open_as_commit(&commit, repo,
13021 		    head_commit_id);
13022 		if (error)
13023 			goto done;
13024 		parent_ids = got_object_commit_get_parent_ids(commit);
13025 		pid = STAILQ_FIRST(parent_ids);
13026 		if (pid == NULL) {
13027 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13028 			goto done;
13029 		}
13030 		error = collect_commits(&commits, head_commit_id, &pid->id,
13031 		    got_worktree_get_base_commit_id(worktree),
13032 		    got_worktree_get_path_prefix(worktree),
13033 		    GOT_ERR_HISTEDIT_PATH, repo);
13034 		got_object_commit_close(commit);
13035 		commit = NULL;
13036 		if (error)
13037 			goto done;
13038 
13039 		if (STAILQ_EMPTY(&commits)) {
13040 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13041 			goto done;
13042 		}
13043 
13044 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
13045 		    &base_commit_id, &fileindex, worktree, repo);
13046 		if (error)
13047 			goto done;
13048 
13049 		if (edit_script_path) {
13050 			error = histedit_load_list(&histedit_cmds,
13051 			    edit_script_path, repo);
13052 			if (error) {
13053 				got_worktree_histedit_abort(worktree, fileindex,
13054 				    repo, branch, base_commit_id,
13055 				    abort_progress, &upa);
13056 				print_merge_progress_stats(&upa);
13057 				goto done;
13058 			}
13059 		} else {
13060 			const char *branch_name;
13061 			branch_name = got_ref_get_symref_target(branch);
13062 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
13063 				branch_name += 11;
13064 			error = histedit_edit_script(&histedit_cmds, &commits,
13065 			    branch_name, edit_logmsg_only, fold_only,
13066 			    drop_only, edit_only, editor, repo);
13067 			if (error) {
13068 				got_worktree_histedit_abort(worktree, fileindex,
13069 				    repo, branch, base_commit_id,
13070 				    abort_progress, &upa);
13071 				print_merge_progress_stats(&upa);
13072 				goto done;
13073 			}
13074 
13075 		}
13076 
13077 		error = histedit_save_list(&histedit_cmds, worktree,
13078 		    repo);
13079 		if (error) {
13080 			got_worktree_histedit_abort(worktree, fileindex,
13081 			    repo, branch, base_commit_id,
13082 			    abort_progress, &upa);
13083 			print_merge_progress_stats(&upa);
13084 			goto done;
13085 		}
13086 
13087 	}
13088 
13089 	error = histedit_check_script(&histedit_cmds, &commits, repo);
13090 	if (error)
13091 		goto done;
13092 
13093 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
13094 		if (resume_commit_id) {
13095 			if (got_object_id_cmp(hle->commit_id,
13096 			    resume_commit_id) != 0)
13097 				continue;
13098 
13099 			resume_commit_id = NULL;
13100 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
13101 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
13102 				error = histedit_skip_commit(hle, worktree,
13103 				    repo);
13104 				if (error)
13105 					goto done;
13106 			} else {
13107 				struct got_pathlist_head paths;
13108 				int have_changes = 0;
13109 
13110 				TAILQ_INIT(&paths);
13111 				error = got_pathlist_append(&paths, "", NULL);
13112 				if (error)
13113 					goto done;
13114 				error = got_worktree_status(worktree, &paths,
13115 				    repo, 0, check_local_changes, &have_changes,
13116 				    check_cancelled, NULL);
13117 				got_pathlist_free(&paths,
13118 				    GOT_PATHLIST_FREE_NONE);
13119 				if (error) {
13120 					if (error->code != GOT_ERR_CANCELLED)
13121 						goto done;
13122 					if (sigint_received || sigpipe_received)
13123 						goto done;
13124 				}
13125 				if (have_changes) {
13126 					error = histedit_commit(NULL, worktree,
13127 					    fileindex, tmp_branch, hle,
13128 					    committer, allow_conflict, editor,
13129 					    repo);
13130 					if (error)
13131 						goto done;
13132 				} else {
13133 					error = got_object_open_as_commit(
13134 					    &commit, repo, hle->commit_id);
13135 					if (error)
13136 						goto done;
13137 					error = show_histedit_progress(commit,
13138 					    hle, NULL);
13139 					got_object_commit_close(commit);
13140 					commit = NULL;
13141 					if (error)
13142 						goto done;
13143 				}
13144 			}
13145 			continue;
13146 		}
13147 
13148 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
13149 			error = histedit_skip_commit(hle, worktree, repo);
13150 			if (error)
13151 				goto done;
13152 			continue;
13153 		}
13154 		error = got_object_open_as_commit(&commit, repo,
13155 		    hle->commit_id);
13156 		if (error)
13157 			goto done;
13158 		parent_ids = got_object_commit_get_parent_ids(commit);
13159 		pid = STAILQ_FIRST(parent_ids);
13160 
13161 		error = got_worktree_histedit_merge_files(&merged_paths,
13162 		    worktree, fileindex, &pid->id, hle->commit_id, repo,
13163 		    update_progress, &upa, check_cancelled, NULL);
13164 		if (error)
13165 			goto done;
13166 		got_object_commit_close(commit);
13167 		commit = NULL;
13168 
13169 		print_merge_progress_stats(&upa);
13170 		if (upa.conflicts > 0 || upa.missing > 0 ||
13171 		    upa.not_deleted > 0 || upa.unversioned > 0) {
13172 			if (upa.conflicts > 0) {
13173 				error = show_rebase_merge_conflict(
13174 				    hle->commit_id, repo);
13175 				if (error)
13176 					goto done;
13177 			}
13178 			got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13179 			break;
13180 		}
13181 
13182 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
13183 			char *id_str;
13184 			error = got_object_id_str(&id_str, hle->commit_id);
13185 			if (error)
13186 				goto done;
13187 			printf("Stopping histedit for amending commit %s\n",
13188 			    id_str);
13189 			free(id_str);
13190 			got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13191 			error = got_worktree_histedit_postpone(worktree,
13192 			    fileindex);
13193 			goto done;
13194 		} else if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
13195 			error = histedit_skip_commit(hle, worktree, repo);
13196 			if (error)
13197 				goto done;
13198 			continue;
13199 		} else if (hle->cmd->code == GOT_HISTEDIT_MESG) {
13200 			error = histedit_edit_logmsg(hle, editor, repo);
13201 			if (error)
13202 				goto done;
13203 		}
13204 
13205 		error = histedit_commit(&merged_paths, worktree, fileindex,
13206 		    tmp_branch, hle, committer, allow_conflict, editor, repo);
13207 		got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13208 		if (error)
13209 			goto done;
13210 	}
13211 
13212 	if (upa.conflicts > 0 || upa.missing > 0 ||
13213 	    upa.not_deleted > 0 || upa.unversioned > 0) {
13214 		error = got_worktree_histedit_postpone(worktree, fileindex);
13215 		if (error)
13216 			goto done;
13217 		if (upa.conflicts > 0 && upa.missing == 0 &&
13218 		    upa.not_deleted == 0 && upa.unversioned == 0) {
13219 			error = got_error_msg(GOT_ERR_CONFLICTS,
13220 			    "conflicts must be resolved before histedit "
13221 			    "can continue");
13222 		} else if (upa.conflicts > 0) {
13223 			error = got_error_msg(GOT_ERR_CONFLICTS,
13224 			    "conflicts must be resolved before histedit "
13225 			    "can continue; changes destined for some "
13226 			    "files were not yet merged and should be "
13227 			    "merged manually if required before the "
13228 			    "histedit operation is continued");
13229 		} else {
13230 			error = got_error_msg(GOT_ERR_CONFLICTS,
13231 			    "changes destined for some files were not "
13232 			    "yet merged and should be merged manually "
13233 			    "if required before the histedit operation "
13234 			    "is continued");
13235 		}
13236 	} else
13237 		error = histedit_complete(worktree, fileindex, tmp_branch,
13238 		    branch, repo);
13239 done:
13240 	free(cwd);
13241 	free(editor);
13242 	free(committer);
13243 	free(gitconfig_path);
13244 	got_object_id_queue_free(&commits);
13245 	histedit_free_list(&histedit_cmds);
13246 	free(head_commit_id);
13247 	free(base_commit_id);
13248 	free(resume_commit_id);
13249 	if (commit)
13250 		got_object_commit_close(commit);
13251 	if (branch)
13252 		got_ref_close(branch);
13253 	if (tmp_branch)
13254 		got_ref_close(tmp_branch);
13255 	if (worktree)
13256 		got_worktree_close(worktree);
13257 	if (repo) {
13258 		const struct got_error *close_err = got_repo_close(repo);
13259 		if (error == NULL)
13260 			error = close_err;
13261 	}
13262 	if (pack_fds) {
13263 		const struct got_error *pack_err =
13264 		    got_repo_pack_fds_close(pack_fds);
13265 		if (error == NULL)
13266 			error = pack_err;
13267 	}
13268 	return error;
13269 }
13270 
13271 __dead static void
13272 usage_integrate(void)
13273 {
13274 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
13275 	exit(1);
13276 }
13277 
13278 static const struct got_error *
13279 cmd_integrate(int argc, char *argv[])
13280 {
13281 	const struct got_error *error = NULL;
13282 	struct got_repository *repo = NULL;
13283 	struct got_worktree *worktree = NULL;
13284 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
13285 	const char *branch_arg = NULL;
13286 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
13287 	struct got_fileindex *fileindex = NULL;
13288 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
13289 	int ch;
13290 	struct got_update_progress_arg upa;
13291 	int *pack_fds = NULL;
13292 
13293 #ifndef PROFILE
13294 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13295 	    "unveil", NULL) == -1)
13296 		err(1, "pledge");
13297 #endif
13298 
13299 	while ((ch = getopt(argc, argv, "")) != -1) {
13300 		switch (ch) {
13301 		default:
13302 			usage_integrate();
13303 			/* NOTREACHED */
13304 		}
13305 	}
13306 
13307 	argc -= optind;
13308 	argv += optind;
13309 
13310 	if (argc != 1)
13311 		usage_integrate();
13312 	branch_arg = argv[0];
13313 
13314 	cwd = getcwd(NULL, 0);
13315 	if (cwd == NULL) {
13316 		error = got_error_from_errno("getcwd");
13317 		goto done;
13318 	}
13319 
13320 	error = got_repo_pack_fds_open(&pack_fds);
13321 	if (error != NULL)
13322 		goto done;
13323 
13324 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13325 	if (error) {
13326 		if (error->code == GOT_ERR_NOT_WORKTREE)
13327 			error = wrap_not_worktree_error(error, "integrate",
13328 			    cwd);
13329 		goto done;
13330 	}
13331 
13332 	error = check_rebase_or_histedit_in_progress(worktree);
13333 	if (error)
13334 		goto done;
13335 
13336 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13337 	    NULL, pack_fds);
13338 	if (error != NULL)
13339 		goto done;
13340 
13341 	error = apply_unveil(got_repo_get_path(repo), 0,
13342 	    got_worktree_get_root_path(worktree));
13343 	if (error)
13344 		goto done;
13345 
13346 	error = check_merge_in_progress(worktree, repo);
13347 	if (error)
13348 		goto done;
13349 
13350 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
13351 		error = got_error_from_errno("asprintf");
13352 		goto done;
13353 	}
13354 
13355 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
13356 	    &base_branch_ref, worktree, refname, repo);
13357 	if (error)
13358 		goto done;
13359 
13360 	refname = strdup(got_ref_get_name(branch_ref));
13361 	if (refname == NULL) {
13362 		error = got_error_from_errno("strdup");
13363 		got_worktree_integrate_abort(worktree, fileindex, repo,
13364 		    branch_ref, base_branch_ref);
13365 		goto done;
13366 	}
13367 	base_refname = strdup(got_ref_get_name(base_branch_ref));
13368 	if (base_refname == NULL) {
13369 		error = got_error_from_errno("strdup");
13370 		got_worktree_integrate_abort(worktree, fileindex, repo,
13371 		    branch_ref, base_branch_ref);
13372 		goto done;
13373 	}
13374 	if (strncmp(base_refname, "refs/heads/", 11) != 0) {
13375 		error = got_error(GOT_ERR_INTEGRATE_BRANCH);
13376 		got_worktree_integrate_abort(worktree, fileindex, repo,
13377 		    branch_ref, base_branch_ref);
13378 		goto done;
13379 	}
13380 
13381 	error = got_ref_resolve(&commit_id, repo, branch_ref);
13382 	if (error)
13383 		goto done;
13384 
13385 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
13386 	if (error)
13387 		goto done;
13388 
13389 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
13390 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
13391 		    "specified branch has already been integrated");
13392 		got_worktree_integrate_abort(worktree, fileindex, repo,
13393 		    branch_ref, base_branch_ref);
13394 		goto done;
13395 	}
13396 
13397 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
13398 	if (error) {
13399 		if (error->code == GOT_ERR_ANCESTRY)
13400 			error = got_error(GOT_ERR_REBASE_REQUIRED);
13401 		got_worktree_integrate_abort(worktree, fileindex, repo,
13402 		    branch_ref, base_branch_ref);
13403 		goto done;
13404 	}
13405 
13406 	memset(&upa, 0, sizeof(upa));
13407 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
13408 	    branch_ref, base_branch_ref, update_progress, &upa,
13409 	    check_cancelled, NULL);
13410 	if (error)
13411 		goto done;
13412 
13413 	printf("Integrated %s into %s\n", refname, base_refname);
13414 	print_update_progress_stats(&upa);
13415 done:
13416 	if (repo) {
13417 		const struct got_error *close_err = got_repo_close(repo);
13418 		if (error == NULL)
13419 			error = close_err;
13420 	}
13421 	if (worktree)
13422 		got_worktree_close(worktree);
13423 	if (pack_fds) {
13424 		const struct got_error *pack_err =
13425 		    got_repo_pack_fds_close(pack_fds);
13426 		if (error == NULL)
13427 			error = pack_err;
13428 	}
13429 	free(cwd);
13430 	free(base_commit_id);
13431 	free(commit_id);
13432 	free(refname);
13433 	free(base_refname);
13434 	return error;
13435 }
13436 
13437 __dead static void
13438 usage_merge(void)
13439 {
13440 	fprintf(stderr, "usage: %s merge [-aCcn] [branch]\n", getprogname());
13441 	exit(1);
13442 }
13443 
13444 static const struct got_error *
13445 cmd_merge(int argc, char *argv[])
13446 {
13447 	const struct got_error *error = NULL;
13448 	struct got_worktree *worktree = NULL;
13449 	struct got_repository *repo = NULL;
13450 	struct got_fileindex *fileindex = NULL;
13451 	char *cwd = NULL, *id_str = NULL, *author = NULL;
13452 	char *gitconfig_path = NULL;
13453 	struct got_reference *branch = NULL, *wt_branch = NULL;
13454 	struct got_object_id *branch_tip = NULL, *yca_id = NULL;
13455 	struct got_object_id *wt_branch_tip = NULL;
13456 	int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
13457 	int allow_conflict = 0, prefer_fast_forward = 1, interrupt_merge = 0;
13458 	struct got_update_progress_arg upa;
13459 	struct got_object_id *merge_commit_id = NULL;
13460 	char *branch_name = NULL;
13461 	int *pack_fds = NULL;
13462 
13463 	memset(&upa, 0, sizeof(upa));
13464 
13465 #ifndef PROFILE
13466 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13467 	    "unveil", NULL) == -1)
13468 		err(1, "pledge");
13469 #endif
13470 
13471 	while ((ch = getopt(argc, argv, "aCcMn")) != -1) {
13472 		switch (ch) {
13473 		case 'a':
13474 			abort_merge = 1;
13475 			break;
13476 		case 'C':
13477 			allow_conflict = 1;
13478 			break;
13479 		case 'c':
13480 			continue_merge = 1;
13481 			break;
13482 		case 'M':
13483 			prefer_fast_forward = 0;
13484 			break;
13485 		case 'n':
13486 			interrupt_merge = 1;
13487 			break;
13488 		default:
13489 			usage_merge();
13490 			/* NOTREACHED */
13491 		}
13492 	}
13493 
13494 	argc -= optind;
13495 	argv += optind;
13496 
13497 	if (abort_merge) {
13498 		if (continue_merge)
13499 			option_conflict('a', 'c');
13500 		if (!prefer_fast_forward)
13501 			option_conflict('a', 'M');
13502 		if (interrupt_merge)
13503 			option_conflict('a', 'n');
13504 	} else if (continue_merge) {
13505 		if (!prefer_fast_forward)
13506 			option_conflict('c', 'M');
13507 		if (interrupt_merge)
13508 			option_conflict('c', 'n');
13509 	}
13510 	if (allow_conflict) {
13511 		if (!continue_merge)
13512 			errx(1, "-C option requires -c");
13513 	}
13514 	if (abort_merge || continue_merge) {
13515 		if (argc != 0)
13516 			usage_merge();
13517 	} else if (argc != 1)
13518 		usage_merge();
13519 
13520 	cwd = getcwd(NULL, 0);
13521 	if (cwd == NULL) {
13522 		error = got_error_from_errno("getcwd");
13523 		goto done;
13524 	}
13525 
13526 	error = got_repo_pack_fds_open(&pack_fds);
13527 	if (error != NULL)
13528 		goto done;
13529 
13530 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13531 	if (error) {
13532 		if (error->code == GOT_ERR_NOT_WORKTREE)
13533 			error = wrap_not_worktree_error(error,
13534 			    "merge", cwd);
13535 		goto done;
13536 	}
13537 
13538 	error = get_gitconfig_path(&gitconfig_path);
13539 	if (error)
13540 		goto done;
13541 	error = got_repo_open(&repo,
13542 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
13543 	    gitconfig_path, pack_fds);
13544 	if (error != NULL)
13545 		goto done;
13546 
13547 	if (worktree != NULL) {
13548 		error = worktree_has_logmsg_ref("merge", worktree, repo);
13549 		if (error)
13550 			goto done;
13551 	}
13552 
13553 	error = apply_unveil(got_repo_get_path(repo), 0,
13554 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
13555 	if (error)
13556 		goto done;
13557 
13558 	error = check_rebase_or_histedit_in_progress(worktree);
13559 	if (error)
13560 		goto done;
13561 
13562 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
13563 	    repo);
13564 	if (error)
13565 		goto done;
13566 
13567 	if (merge_in_progress && !(abort_merge || continue_merge)) {
13568 		error = got_error(GOT_ERR_MERGE_BUSY);
13569 		goto done;
13570 	}
13571 
13572 	if (!merge_in_progress && (abort_merge || continue_merge)) {
13573 		error = got_error(GOT_ERR_NOT_MERGING);
13574 		goto done;
13575 	}
13576 
13577 	if (abort_merge) {
13578 		error = got_worktree_merge_continue(&branch_name,
13579 		    &branch_tip, &fileindex, worktree, repo);
13580 		if (error)
13581 			goto done;
13582 		error = got_worktree_merge_abort(worktree, fileindex, repo,
13583 		    abort_progress, &upa);
13584 		if (error)
13585 			goto done;
13586 		printf("Merge of %s aborted\n", branch_name);
13587 		goto done; /* nothing else to do */
13588 	}
13589 
13590 	if (strncmp(got_worktree_get_head_ref_name(worktree),
13591 	    "refs/heads/", 11) != 0) {
13592 		error = got_error_fmt(GOT_ERR_COMMIT_BRANCH,
13593 		    "work tree's current branch %s is outside the "
13594 		    "\"refs/heads/\" reference namespace; "
13595 		    "update -b required",
13596 		    got_worktree_get_head_ref_name(worktree));
13597 		goto done;
13598 	}
13599 
13600 	error = get_author(&author, repo, worktree);
13601 	if (error)
13602 		goto done;
13603 
13604 	error = got_ref_open(&wt_branch, repo,
13605 	    got_worktree_get_head_ref_name(worktree), 0);
13606 	if (error)
13607 		goto done;
13608 	error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
13609 	if (error)
13610 		goto done;
13611 
13612 	if (continue_merge) {
13613 		struct got_object_id *base_commit_id;
13614 		base_commit_id = got_worktree_get_base_commit_id(worktree);
13615 		if (got_object_id_cmp(wt_branch_tip, base_commit_id) != 0) {
13616 			error = got_error(GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
13617 			goto done;
13618 		}
13619 		error = got_worktree_merge_continue(&branch_name,
13620 		    &branch_tip, &fileindex, worktree, repo);
13621 		if (error)
13622 			goto done;
13623 	} else {
13624 		error = got_ref_open(&branch, repo, argv[0], 0);
13625 		if (error != NULL)
13626 			goto done;
13627 		branch_name = strdup(got_ref_get_name(branch));
13628 		if (branch_name == NULL) {
13629 			error = got_error_from_errno("strdup");
13630 			goto done;
13631 		}
13632 		error = got_ref_resolve(&branch_tip, repo, branch);
13633 		if (error)
13634 			goto done;
13635 	}
13636 
13637 	error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
13638 	    wt_branch_tip, branch_tip, 0, 0, repo,
13639 	    check_cancelled, NULL);
13640 	if (error && error->code != GOT_ERR_ANCESTRY)
13641 		goto done;
13642 
13643 	if (!continue_merge) {
13644 		error = check_path_prefix(wt_branch_tip, branch_tip,
13645 		    got_worktree_get_path_prefix(worktree),
13646 		    GOT_ERR_MERGE_PATH, repo);
13647 		if (error)
13648 			goto done;
13649 		error = got_worktree_merge_prepare(&fileindex, worktree, repo);
13650 		if (error)
13651 			goto done;
13652 		if (prefer_fast_forward && yca_id &&
13653 		    got_object_id_cmp(wt_branch_tip, yca_id) == 0) {
13654 			struct got_pathlist_head paths;
13655 			if (interrupt_merge) {
13656 				error = got_error_fmt(GOT_ERR_BAD_OPTION,
13657 				    "there are no changes to merge since %s "
13658 				    "is already based on %s; merge cannot be "
13659 				    "interrupted for amending; -n",
13660 				    branch_name, got_ref_get_name(wt_branch));
13661 				goto done;
13662 			}
13663 			printf("Forwarding %s to %s\n",
13664 				got_ref_get_name(wt_branch), branch_name);
13665 			error = got_ref_change_ref(wt_branch, branch_tip);
13666 			if (error)
13667 				goto done;
13668 			error = got_ref_write(wt_branch, repo);
13669 			if (error)
13670 				goto done;
13671 			error = got_worktree_set_base_commit_id(worktree, repo,
13672 			    branch_tip);
13673 			if (error)
13674 				goto done;
13675 			TAILQ_INIT(&paths);
13676 			error = got_pathlist_append(&paths, "", NULL);
13677 			if (error)
13678 				goto done;
13679 			error = got_worktree_checkout_files(worktree,
13680 			    &paths, repo, update_progress, &upa,
13681 			    check_cancelled, NULL);
13682 			got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
13683 			if (error)
13684 				goto done;
13685 			if (upa.did_something) {
13686 				char *id_str;
13687 				error = got_object_id_str(&id_str, branch_tip);
13688 				if (error)
13689 					goto done;
13690 				printf("Updated to commit %s\n", id_str);
13691 				free(id_str);
13692 			} else
13693 				printf("Already up-to-date\n");
13694 			print_update_progress_stats(&upa);
13695 			goto done;
13696 		}
13697 		error = got_worktree_merge_write_refs(worktree, branch, repo);
13698 		if (error)
13699 			goto done;
13700 
13701 		error = got_worktree_merge_branch(worktree, fileindex,
13702 		    yca_id, branch_tip, repo, update_progress, &upa,
13703 		    check_cancelled, NULL);
13704 		if (error)
13705 			goto done;
13706 		print_merge_progress_stats(&upa);
13707 		if (!upa.did_something) {
13708 			error = got_worktree_merge_abort(worktree, fileindex,
13709 			    repo, abort_progress, &upa);
13710 			if (error)
13711 				goto done;
13712 			printf("Already up-to-date\n");
13713 			goto done;
13714 		}
13715 	}
13716 
13717 	if (interrupt_merge) {
13718 		error = got_worktree_merge_postpone(worktree, fileindex);
13719 		if (error)
13720 			goto done;
13721 		printf("Merge of %s interrupted on request\n", branch_name);
13722 	} else if (upa.conflicts > 0 || upa.missing > 0 ||
13723 	    upa.not_deleted > 0 || upa.unversioned > 0) {
13724 		error = got_worktree_merge_postpone(worktree, fileindex);
13725 		if (error)
13726 			goto done;
13727 		if (upa.conflicts > 0 && upa.missing == 0 &&
13728 		    upa.not_deleted == 0 && upa.unversioned == 0) {
13729 			error = got_error_msg(GOT_ERR_CONFLICTS,
13730 			    "conflicts must be resolved before merging "
13731 			    "can continue");
13732 		} else if (upa.conflicts > 0) {
13733 			error = got_error_msg(GOT_ERR_CONFLICTS,
13734 			    "conflicts must be resolved before merging "
13735 			    "can continue; changes destined for some "
13736 			    "files were not yet merged and "
13737 			    "should be merged manually if required before the "
13738 			    "merge operation is continued");
13739 		} else {
13740 			error = got_error_msg(GOT_ERR_CONFLICTS,
13741 			    "changes destined for some "
13742 			    "files were not yet merged and should be "
13743 			    "merged manually if required before the "
13744 			    "merge operation is continued");
13745 		}
13746 		goto done;
13747 	} else {
13748 		error = got_worktree_merge_commit(&merge_commit_id, worktree,
13749 		    fileindex, author, NULL, 1, branch_tip, branch_name,
13750 		    allow_conflict, repo, continue_merge ? print_status : NULL,
13751 		    NULL);
13752 		if (error)
13753 			goto done;
13754 		error = got_worktree_merge_complete(worktree, fileindex, repo);
13755 		if (error)
13756 			goto done;
13757 		error = got_object_id_str(&id_str, merge_commit_id);
13758 		if (error)
13759 			goto done;
13760 		printf("Merged %s into %s: %s\n", branch_name,
13761 		    got_worktree_get_head_ref_name(worktree),
13762 		    id_str);
13763 
13764 	}
13765 done:
13766 	free(gitconfig_path);
13767 	free(id_str);
13768 	free(merge_commit_id);
13769 	free(author);
13770 	free(branch_tip);
13771 	free(branch_name);
13772 	free(yca_id);
13773 	if (branch)
13774 		got_ref_close(branch);
13775 	if (wt_branch)
13776 		got_ref_close(wt_branch);
13777 	if (worktree)
13778 		got_worktree_close(worktree);
13779 	if (repo) {
13780 		const struct got_error *close_err = got_repo_close(repo);
13781 		if (error == NULL)
13782 			error = close_err;
13783 	}
13784 	if (pack_fds) {
13785 		const struct got_error *pack_err =
13786 		    got_repo_pack_fds_close(pack_fds);
13787 		if (error == NULL)
13788 			error = pack_err;
13789 	}
13790 	return error;
13791 }
13792 
13793 __dead static void
13794 usage_stage(void)
13795 {
13796 	fprintf(stderr, "usage: %s stage [-lpRS] [-F response-script] "
13797 	    "[path ...]\n", getprogname());
13798 	exit(1);
13799 }
13800 
13801 static const struct got_error *
13802 print_stage(void *arg, unsigned char status, unsigned char staged_status,
13803     const char *path, struct got_object_id *blob_id,
13804     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
13805     int dirfd, const char *de_name)
13806 {
13807 	const struct got_error *err = NULL;
13808 	char *id_str = NULL;
13809 
13810 	if (staged_status != GOT_STATUS_ADD &&
13811 	    staged_status != GOT_STATUS_MODIFY &&
13812 	    staged_status != GOT_STATUS_DELETE)
13813 		return NULL;
13814 
13815 	if (staged_status == GOT_STATUS_ADD ||
13816 	    staged_status == GOT_STATUS_MODIFY)
13817 		err = got_object_id_str(&id_str, staged_blob_id);
13818 	else
13819 		err = got_object_id_str(&id_str, blob_id);
13820 	if (err)
13821 		return err;
13822 
13823 	printf("%s %c %s\n", id_str, staged_status, path);
13824 	free(id_str);
13825 	return NULL;
13826 }
13827 
13828 static const struct got_error *
13829 cmd_stage(int argc, char *argv[])
13830 {
13831 	const struct got_error *error = NULL;
13832 	struct got_repository *repo = NULL;
13833 	struct got_worktree *worktree = NULL;
13834 	char *cwd = NULL;
13835 	struct got_pathlist_head paths;
13836 	int ch, contains_dir;
13837 	int can_recurse = 0, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
13838 	FILE *patch_script_file = NULL;
13839 	const char *patch_script_path = NULL;
13840 	struct choose_patch_arg cpa;
13841 	int *pack_fds = NULL;
13842 
13843 	TAILQ_INIT(&paths);
13844 
13845 #ifndef PROFILE
13846 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13847 	    "unveil", NULL) == -1)
13848 		err(1, "pledge");
13849 #endif
13850 
13851 	while ((ch = getopt(argc, argv, "F:lpRS")) != -1) {
13852 		switch (ch) {
13853 		case 'F':
13854 			patch_script_path = optarg;
13855 			break;
13856 		case 'l':
13857 			list_stage = 1;
13858 			break;
13859 		case 'p':
13860 			pflag = 1;
13861 			break;
13862 		case 'R':
13863 			can_recurse = 1;
13864 			break;
13865 		case 'S':
13866 			allow_bad_symlinks = 1;
13867 			break;
13868 		default:
13869 			usage_stage();
13870 			/* NOTREACHED */
13871 		}
13872 	}
13873 
13874 	argc -= optind;
13875 	argv += optind;
13876 
13877 	if (list_stage && (pflag || patch_script_path))
13878 		errx(1, "-l option cannot be used with other options");
13879 	if (patch_script_path && !pflag)
13880 		errx(1, "-F option can only be used together with -p option");
13881 
13882 	cwd = getcwd(NULL, 0);
13883 	if (cwd == NULL) {
13884 		error = got_error_from_errno("getcwd");
13885 		goto done;
13886 	}
13887 
13888 	error = got_repo_pack_fds_open(&pack_fds);
13889 	if (error != NULL)
13890 		goto done;
13891 
13892 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13893 	if (error) {
13894 		if (error->code == GOT_ERR_NOT_WORKTREE)
13895 			error = wrap_not_worktree_error(error, "stage", cwd);
13896 		goto done;
13897 	}
13898 
13899 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13900 	    NULL, pack_fds);
13901 	if (error != NULL)
13902 		goto done;
13903 
13904 	if (patch_script_path) {
13905 		patch_script_file = fopen(patch_script_path, "re");
13906 		if (patch_script_file == NULL) {
13907 			error = got_error_from_errno2("fopen",
13908 			    patch_script_path);
13909 			goto done;
13910 		}
13911 	}
13912 	error = apply_unveil(got_repo_get_path(repo), 0,
13913 	    got_worktree_get_root_path(worktree));
13914 	if (error)
13915 		goto done;
13916 
13917 	error = check_merge_in_progress(worktree, repo);
13918 	if (error)
13919 		goto done;
13920 
13921 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13922 	if (error)
13923 		goto done;
13924 
13925 	if (list_stage)
13926 		error = got_worktree_status(worktree, &paths, repo, 0,
13927 		    print_stage, NULL, check_cancelled, NULL);
13928 	else {
13929 		if (!can_recurse) {
13930 			error = pathlist_contains_directory(&contains_dir,
13931 			    worktree, &paths);
13932 			if (error != NULL)
13933 				goto done;
13934 
13935 			if (contains_dir) {
13936 				error = got_error_msg(GOT_ERR_BAD_PATH,
13937 				    "staging directories requires -R option");
13938 				goto done;
13939 			}
13940 		}
13941 		cpa.patch_script_file = patch_script_file;
13942 		cpa.action = "stage";
13943 		error = got_worktree_stage(worktree, &paths,
13944 		    pflag ? NULL : print_status, NULL,
13945 		    pflag ? choose_patch : NULL, &cpa,
13946 		    allow_bad_symlinks, repo);
13947 	}
13948 done:
13949 	if (patch_script_file && fclose(patch_script_file) == EOF &&
13950 	    error == NULL)
13951 		error = got_error_from_errno2("fclose", patch_script_path);
13952 	if (repo) {
13953 		const struct got_error *close_err = got_repo_close(repo);
13954 		if (error == NULL)
13955 			error = close_err;
13956 	}
13957 	if (worktree)
13958 		got_worktree_close(worktree);
13959 	if (pack_fds) {
13960 		const struct got_error *pack_err =
13961 		    got_repo_pack_fds_close(pack_fds);
13962 		if (error == NULL)
13963 			error = pack_err;
13964 	}
13965 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13966 	free(cwd);
13967 	return error;
13968 }
13969 
13970 __dead static void
13971 usage_unstage(void)
13972 {
13973 	fprintf(stderr, "usage: %s unstage [-pR] [-F response-script] "
13974 	    "[path ...]\n", getprogname());
13975 	exit(1);
13976 }
13977 
13978 
13979 static const struct got_error *
13980 cmd_unstage(int argc, char *argv[])
13981 {
13982 	const struct got_error *error = NULL;
13983 	struct got_repository *repo = NULL;
13984 	struct got_worktree *worktree = NULL;
13985 	char *cwd = NULL;
13986 	struct got_pathlist_head paths;
13987 	int ch, contains_dir, can_recurse = 0, pflag = 0;
13988 	struct got_update_progress_arg upa;
13989 	FILE *patch_script_file = NULL;
13990 	const char *patch_script_path = NULL;
13991 	struct choose_patch_arg cpa;
13992 	int *pack_fds = NULL;
13993 
13994 	TAILQ_INIT(&paths);
13995 
13996 #ifndef PROFILE
13997 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13998 	    "unveil", NULL) == -1)
13999 		err(1, "pledge");
14000 #endif
14001 
14002 	while ((ch = getopt(argc, argv, "F:Rp")) != -1) {
14003 		switch (ch) {
14004 		case 'F':
14005 			patch_script_path = optarg;
14006 			break;
14007 		case 'R':
14008 			can_recurse = 1;
14009 			break;
14010 		case 'p':
14011 			pflag = 1;
14012 			break;
14013 		default:
14014 			usage_unstage();
14015 			/* NOTREACHED */
14016 		}
14017 	}
14018 
14019 	argc -= optind;
14020 	argv += optind;
14021 
14022 	if (patch_script_path && !pflag)
14023 		errx(1, "-F option can only be used together with -p option");
14024 
14025 	cwd = getcwd(NULL, 0);
14026 	if (cwd == NULL) {
14027 		error = got_error_from_errno("getcwd");
14028 		goto done;
14029 	}
14030 
14031 	error = got_repo_pack_fds_open(&pack_fds);
14032 	if (error != NULL)
14033 		goto done;
14034 
14035 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14036 	if (error) {
14037 		if (error->code == GOT_ERR_NOT_WORKTREE)
14038 			error = wrap_not_worktree_error(error, "unstage", cwd);
14039 		goto done;
14040 	}
14041 
14042 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
14043 	    NULL, pack_fds);
14044 	if (error != NULL)
14045 		goto done;
14046 
14047 	if (patch_script_path) {
14048 		patch_script_file = fopen(patch_script_path, "re");
14049 		if (patch_script_file == NULL) {
14050 			error = got_error_from_errno2("fopen",
14051 			    patch_script_path);
14052 			goto done;
14053 		}
14054 	}
14055 
14056 	error = apply_unveil(got_repo_get_path(repo), 0,
14057 	    got_worktree_get_root_path(worktree));
14058 	if (error)
14059 		goto done;
14060 
14061 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
14062 	if (error)
14063 		goto done;
14064 
14065 	if (!can_recurse) {
14066 		error = pathlist_contains_directory(&contains_dir,
14067 		    worktree, &paths);
14068 		if (error != NULL)
14069 			goto done;
14070 
14071 		if (contains_dir) {
14072 			error = got_error_msg(GOT_ERR_BAD_PATH,
14073 			    "unstaging directories requires -R option");
14074 			goto done;
14075 		}
14076 	}
14077 
14078 	cpa.patch_script_file = patch_script_file;
14079 	cpa.action = "unstage";
14080 	memset(&upa, 0, sizeof(upa));
14081 	error = got_worktree_unstage(worktree, &paths, update_progress,
14082 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
14083 	if (!error)
14084 		print_merge_progress_stats(&upa);
14085 done:
14086 	if (patch_script_file && fclose(patch_script_file) == EOF &&
14087 	    error == NULL)
14088 		error = got_error_from_errno2("fclose", patch_script_path);
14089 	if (repo) {
14090 		const struct got_error *close_err = got_repo_close(repo);
14091 		if (error == NULL)
14092 			error = close_err;
14093 	}
14094 	if (worktree)
14095 		got_worktree_close(worktree);
14096 	if (pack_fds) {
14097 		const struct got_error *pack_err =
14098 		    got_repo_pack_fds_close(pack_fds);
14099 		if (error == NULL)
14100 			error = pack_err;
14101 	}
14102 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
14103 	free(cwd);
14104 	return error;
14105 }
14106 
14107 __dead static void
14108 usage_cat(void)
14109 {
14110 	fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
14111 	    "arg ...\n", getprogname());
14112 	exit(1);
14113 }
14114 
14115 static const struct got_error *
14116 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14117 {
14118 	const struct got_error *err;
14119 	struct got_blob_object *blob;
14120 	int fd = -1;
14121 
14122 	fd = got_opentempfd();
14123 	if (fd == -1)
14124 		return got_error_from_errno("got_opentempfd");
14125 
14126 	err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
14127 	if (err)
14128 		goto done;
14129 
14130 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
14131 done:
14132 	if (fd != -1 && close(fd) == -1 && err == NULL)
14133 		err = got_error_from_errno("close");
14134 	if (blob)
14135 		got_object_blob_close(blob);
14136 	return err;
14137 }
14138 
14139 static const struct got_error *
14140 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14141 {
14142 	const struct got_error *err;
14143 	struct got_tree_object *tree;
14144 	int nentries, i;
14145 
14146 	err = got_object_open_as_tree(&tree, repo, id);
14147 	if (err)
14148 		return err;
14149 
14150 	nentries = got_object_tree_get_nentries(tree);
14151 	for (i = 0; i < nentries; i++) {
14152 		struct got_tree_entry *te;
14153 		char *id_str;
14154 		if (sigint_received || sigpipe_received)
14155 			break;
14156 		te = got_object_tree_get_entry(tree, i);
14157 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
14158 		if (err)
14159 			break;
14160 		fprintf(outfile, "%s %.7o %s\n", id_str,
14161 		    got_tree_entry_get_mode(te),
14162 		    got_tree_entry_get_name(te));
14163 		free(id_str);
14164 	}
14165 
14166 	got_object_tree_close(tree);
14167 	return err;
14168 }
14169 
14170 static const struct got_error *
14171 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14172 {
14173 	const struct got_error *err;
14174 	struct got_commit_object *commit;
14175 	const struct got_object_id_queue *parent_ids;
14176 	struct got_object_qid *pid;
14177 	char *id_str = NULL;
14178 	const char *logmsg = NULL;
14179 	char gmtoff[6];
14180 
14181 	err = got_object_open_as_commit(&commit, repo, id);
14182 	if (err)
14183 		return err;
14184 
14185 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
14186 	if (err)
14187 		goto done;
14188 
14189 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
14190 	parent_ids = got_object_commit_get_parent_ids(commit);
14191 	fprintf(outfile, "numparents %d\n",
14192 	    got_object_commit_get_nparents(commit));
14193 	STAILQ_FOREACH(pid, parent_ids, entry) {
14194 		char *pid_str;
14195 		err = got_object_id_str(&pid_str, &pid->id);
14196 		if (err)
14197 			goto done;
14198 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
14199 		free(pid_str);
14200 	}
14201 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14202 	    got_object_commit_get_author_gmtoff(commit));
14203 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
14204 	    got_object_commit_get_author(commit),
14205 	    (long long)got_object_commit_get_author_time(commit),
14206 	    gmtoff);
14207 
14208 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14209 	    got_object_commit_get_committer_gmtoff(commit));
14210 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
14211 	    got_object_commit_get_committer(commit),
14212 	    (long long)got_object_commit_get_committer_time(commit),
14213 	    gmtoff);
14214 
14215 	logmsg = got_object_commit_get_logmsg_raw(commit);
14216 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
14217 	fprintf(outfile, "%s", logmsg);
14218 done:
14219 	free(id_str);
14220 	got_object_commit_close(commit);
14221 	return err;
14222 }
14223 
14224 static const struct got_error *
14225 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14226 {
14227 	const struct got_error *err;
14228 	struct got_tag_object *tag;
14229 	char *id_str = NULL;
14230 	const char *tagmsg = NULL;
14231 	char gmtoff[6];
14232 
14233 	err = got_object_open_as_tag(&tag, repo, id);
14234 	if (err)
14235 		return err;
14236 
14237 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
14238 	if (err)
14239 		goto done;
14240 
14241 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
14242 
14243 	switch (got_object_tag_get_object_type(tag)) {
14244 	case GOT_OBJ_TYPE_BLOB:
14245 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14246 		    GOT_OBJ_LABEL_BLOB);
14247 		break;
14248 	case GOT_OBJ_TYPE_TREE:
14249 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14250 		    GOT_OBJ_LABEL_TREE);
14251 		break;
14252 	case GOT_OBJ_TYPE_COMMIT:
14253 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14254 		    GOT_OBJ_LABEL_COMMIT);
14255 		break;
14256 	case GOT_OBJ_TYPE_TAG:
14257 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14258 		    GOT_OBJ_LABEL_TAG);
14259 		break;
14260 	default:
14261 		break;
14262 	}
14263 
14264 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
14265 	    got_object_tag_get_name(tag));
14266 
14267 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14268 	    got_object_tag_get_tagger_gmtoff(tag));
14269 	fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
14270 	    got_object_tag_get_tagger(tag),
14271 	    (long long)got_object_tag_get_tagger_time(tag),
14272 	    gmtoff);
14273 
14274 	tagmsg = got_object_tag_get_message(tag);
14275 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
14276 	fprintf(outfile, "%s", tagmsg);
14277 done:
14278 	free(id_str);
14279 	got_object_tag_close(tag);
14280 	return err;
14281 }
14282 
14283 static const struct got_error *
14284 cmd_cat(int argc, char *argv[])
14285 {
14286 	const struct got_error *error;
14287 	struct got_repository *repo = NULL;
14288 	struct got_worktree *worktree = NULL;
14289 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
14290 	char *keyword_idstr = NULL;
14291 	const char *commit_id_str = NULL;
14292 	struct got_object_id *id = NULL, *commit_id = NULL;
14293 	struct got_commit_object *commit = NULL;
14294 	int ch, obj_type, i, force_path = 0;
14295 	struct got_reflist_head refs;
14296 	int *pack_fds = NULL;
14297 
14298 	TAILQ_INIT(&refs);
14299 
14300 #ifndef PROFILE
14301 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14302 	    NULL) == -1)
14303 		err(1, "pledge");
14304 #endif
14305 
14306 	while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
14307 		switch (ch) {
14308 		case 'c':
14309 			commit_id_str = optarg;
14310 			break;
14311 		case 'P':
14312 			force_path = 1;
14313 			break;
14314 		case 'r':
14315 			repo_path = realpath(optarg, NULL);
14316 			if (repo_path == NULL)
14317 				return got_error_from_errno2("realpath",
14318 				    optarg);
14319 			got_path_strip_trailing_slashes(repo_path);
14320 			break;
14321 		default:
14322 			usage_cat();
14323 			/* NOTREACHED */
14324 		}
14325 	}
14326 
14327 	argc -= optind;
14328 	argv += optind;
14329 
14330 	cwd = getcwd(NULL, 0);
14331 	if (cwd == NULL) {
14332 		error = got_error_from_errno("getcwd");
14333 		goto done;
14334 	}
14335 
14336 	error = got_repo_pack_fds_open(&pack_fds);
14337 	if (error != NULL)
14338 		goto done;
14339 
14340 	if (repo_path == NULL) {
14341 		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14342 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
14343 			goto done;
14344 		if (worktree) {
14345 			repo_path = strdup(
14346 			    got_worktree_get_repo_path(worktree));
14347 			if (repo_path == NULL) {
14348 				error = got_error_from_errno("strdup");
14349 				goto done;
14350 			}
14351 
14352 			if (commit_id_str == NULL) {
14353 				/* Release work tree lock. */
14354 				got_worktree_close(worktree);
14355 				worktree = NULL;
14356 			}
14357 		}
14358 	}
14359 
14360 	if (repo_path == NULL) {
14361 		repo_path = strdup(cwd);
14362 		if (repo_path == NULL)
14363 			return got_error_from_errno("strdup");
14364 	}
14365 
14366 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
14367 	free(repo_path);
14368 	if (error != NULL)
14369 		goto done;
14370 
14371 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
14372 	if (error)
14373 		goto done;
14374 
14375 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
14376 	if (error)
14377 		goto done;
14378 
14379 	if (commit_id_str != NULL) {
14380 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
14381 		    repo, worktree);
14382 		if (error != NULL)
14383 			goto done;
14384 		if (keyword_idstr != NULL)
14385 			commit_id_str = keyword_idstr;
14386 		if (worktree != NULL) {
14387 			got_worktree_close(worktree);
14388 			worktree = NULL;
14389 		}
14390 	} else
14391 		commit_id_str = GOT_REF_HEAD;
14392 	error = got_repo_match_object_id(&commit_id, NULL,
14393 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
14394 	if (error)
14395 		goto done;
14396 
14397 	error = got_object_open_as_commit(&commit, repo, commit_id);
14398 	if (error)
14399 		goto done;
14400 
14401 	for (i = 0; i < argc; i++) {
14402 		if (force_path) {
14403 			error = got_object_id_by_path(&id, repo, commit,
14404 			    argv[i]);
14405 			if (error)
14406 				break;
14407 		} else {
14408 			error = got_repo_match_object_id(&id, &label, argv[i],
14409 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
14410 			    repo);
14411 			if (error) {
14412 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
14413 				    error->code != GOT_ERR_NOT_REF)
14414 					break;
14415 				error = got_object_id_by_path(&id, repo,
14416 				    commit, argv[i]);
14417 				if (error)
14418 					break;
14419 			}
14420 		}
14421 
14422 		error = got_object_get_type(&obj_type, repo, id);
14423 		if (error)
14424 			break;
14425 
14426 		switch (obj_type) {
14427 		case GOT_OBJ_TYPE_BLOB:
14428 			error = cat_blob(id, repo, stdout);
14429 			break;
14430 		case GOT_OBJ_TYPE_TREE:
14431 			error = cat_tree(id, repo, stdout);
14432 			break;
14433 		case GOT_OBJ_TYPE_COMMIT:
14434 			error = cat_commit(id, repo, stdout);
14435 			break;
14436 		case GOT_OBJ_TYPE_TAG:
14437 			error = cat_tag(id, repo, stdout);
14438 			break;
14439 		default:
14440 			error = got_error(GOT_ERR_OBJ_TYPE);
14441 			break;
14442 		}
14443 		if (error)
14444 			break;
14445 		free(label);
14446 		label = NULL;
14447 		free(id);
14448 		id = NULL;
14449 	}
14450 done:
14451 	free(label);
14452 	free(id);
14453 	free(commit_id);
14454 	free(keyword_idstr);
14455 	if (commit)
14456 		got_object_commit_close(commit);
14457 	if (worktree)
14458 		got_worktree_close(worktree);
14459 	if (repo) {
14460 		const struct got_error *close_err = got_repo_close(repo);
14461 		if (error == NULL)
14462 			error = close_err;
14463 	}
14464 	if (pack_fds) {
14465 		const struct got_error *pack_err =
14466 		    got_repo_pack_fds_close(pack_fds);
14467 		if (error == NULL)
14468 			error = pack_err;
14469 	}
14470 
14471 	got_ref_list_free(&refs);
14472 	return error;
14473 }
14474 
14475 __dead static void
14476 usage_info(void)
14477 {
14478 	fprintf(stderr, "usage: %s info [path ...]\n",
14479 	    getprogname());
14480 	exit(1);
14481 }
14482 
14483 static const struct got_error *
14484 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
14485     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
14486     struct got_object_id *commit_id)
14487 {
14488 	const struct got_error *err = NULL;
14489 	char *id_str = NULL;
14490 	char datebuf[128];
14491 	struct tm mytm, *tm;
14492 	struct got_pathlist_head *paths = arg;
14493 	struct got_pathlist_entry *pe;
14494 
14495 	/*
14496 	 * Clear error indication from any of the path arguments which
14497 	 * would cause this file index entry to be displayed.
14498 	 */
14499 	TAILQ_FOREACH(pe, paths, entry) {
14500 		if (got_path_cmp(path, pe->path, strlen(path),
14501 		    pe->path_len) == 0 ||
14502 		    got_path_is_child(path, pe->path, pe->path_len))
14503 			pe->data = NULL; /* no error */
14504 	}
14505 
14506 	printf(GOT_COMMIT_SEP_STR);
14507 	if (S_ISLNK(mode))
14508 		printf("symlink: %s\n", path);
14509 	else if (S_ISREG(mode)) {
14510 		printf("file: %s\n", path);
14511 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
14512 	} else if (S_ISDIR(mode))
14513 		printf("directory: %s\n", path);
14514 	else
14515 		printf("something: %s\n", path);
14516 
14517 	tm = localtime_r(&mtime, &mytm);
14518 	if (tm == NULL)
14519 		return NULL;
14520 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
14521 		return got_error(GOT_ERR_NO_SPACE);
14522 	printf("timestamp: %s\n", datebuf);
14523 
14524 	if (blob_id) {
14525 		err = got_object_id_str(&id_str, blob_id);
14526 		if (err)
14527 			return err;
14528 		printf("based on blob: %s\n", id_str);
14529 		free(id_str);
14530 	}
14531 
14532 	if (staged_blob_id) {
14533 		err = got_object_id_str(&id_str, staged_blob_id);
14534 		if (err)
14535 			return err;
14536 		printf("based on staged blob: %s\n", id_str);
14537 		free(id_str);
14538 	}
14539 
14540 	if (commit_id) {
14541 		err = got_object_id_str(&id_str, commit_id);
14542 		if (err)
14543 			return err;
14544 		printf("based on commit: %s\n", id_str);
14545 		free(id_str);
14546 	}
14547 
14548 	return NULL;
14549 }
14550 
14551 static const struct got_error *
14552 cmd_info(int argc, char *argv[])
14553 {
14554 	const struct got_error *error = NULL;
14555 	struct got_worktree *worktree = NULL;
14556 	char *cwd = NULL, *id_str = NULL;
14557 	struct got_pathlist_head paths;
14558 	char *uuidstr = NULL;
14559 	int ch, show_files = 0;
14560 
14561 	TAILQ_INIT(&paths);
14562 
14563 #ifndef PROFILE
14564 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14565 	    NULL) == -1)
14566 		err(1, "pledge");
14567 #endif
14568 
14569 	while ((ch = getopt(argc, argv, "")) != -1) {
14570 		switch (ch) {
14571 		default:
14572 			usage_info();
14573 			/* NOTREACHED */
14574 		}
14575 	}
14576 
14577 	argc -= optind;
14578 	argv += optind;
14579 
14580 	cwd = getcwd(NULL, 0);
14581 	if (cwd == NULL) {
14582 		error = got_error_from_errno("getcwd");
14583 		goto done;
14584 	}
14585 
14586 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14587 	if (error) {
14588 		if (error->code == GOT_ERR_NOT_WORKTREE)
14589 			error = wrap_not_worktree_error(error, "info", cwd);
14590 		goto done;
14591 	}
14592 
14593 #ifndef PROFILE
14594 	/* Remove "wpath cpath proc exec sendfd" promises. */
14595 	if (pledge("stdio rpath flock unveil", NULL) == -1)
14596 		err(1, "pledge");
14597 #endif
14598 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
14599 	if (error)
14600 		goto done;
14601 
14602 	if (argc >= 1) {
14603 		error = get_worktree_paths_from_argv(&paths, argc, argv,
14604 		    worktree);
14605 		if (error)
14606 			goto done;
14607 		show_files = 1;
14608 	}
14609 
14610 	error = got_object_id_str(&id_str,
14611 	    got_worktree_get_base_commit_id(worktree));
14612 	if (error)
14613 		goto done;
14614 
14615 	error = got_worktree_get_uuid(&uuidstr, worktree);
14616 	if (error)
14617 		goto done;
14618 
14619 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
14620 	printf("work tree base commit: %s\n", id_str);
14621 	printf("work tree path prefix: %s\n",
14622 	    got_worktree_get_path_prefix(worktree));
14623 	printf("work tree branch reference: %s\n",
14624 	    got_worktree_get_head_ref_name(worktree));
14625 	printf("work tree UUID: %s\n", uuidstr);
14626 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
14627 
14628 	if (show_files) {
14629 		struct got_pathlist_entry *pe;
14630 		TAILQ_FOREACH(pe, &paths, entry) {
14631 			if (pe->path_len == 0)
14632 				continue;
14633 			/*
14634 			 * Assume this path will fail. This will be corrected
14635 			 * in print_path_info() in case the path does suceeed.
14636 			 */
14637 			pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
14638 		}
14639 		error = got_worktree_path_info(worktree, &paths,
14640 		    print_path_info, &paths, check_cancelled, NULL);
14641 		if (error)
14642 			goto done;
14643 		TAILQ_FOREACH(pe, &paths, entry) {
14644 			if (pe->data != NULL) {
14645 				const struct got_error *perr;
14646 
14647 				perr = pe->data;
14648 				error = got_error_fmt(perr->code, "%s",
14649 				    pe->path);
14650 				break;
14651 			}
14652 		}
14653 	}
14654 done:
14655 	if (worktree)
14656 		got_worktree_close(worktree);
14657 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
14658 	free(cwd);
14659 	free(id_str);
14660 	free(uuidstr);
14661 	return error;
14662 }