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