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