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