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