1 /*
2  * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3  * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4  * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
5  *
6  * Permission to use, copy, modify, and distribute this software for any
7  * purpose with or without fee is hereby granted, provided that the above
8  * copyright notice and this permission notice appear in all copies.
9  *
10  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17  */
18 
19 #include <sys/queue.h>
20 #include <sys/time.h>
21 #include <sys/types.h>
22 #include <sys/stat.h>
23 #include <sys/wait.h>
24 
25 #include <err.h>
26 #include <errno.h>
27 #include <fcntl.h>
28 #include <limits.h>
29 #include <locale.h>
30 #include <ctype.h>
31 #include <sha1.h>
32 #include <sha2.h>
33 #include <signal.h>
34 #include <stdio.h>
35 #include <stdlib.h>
36 #include <string.h>
37 #include <unistd.h>
38 #include <libgen.h>
39 #include <time.h>
40 #include <paths.h>
41 #include <regex.h>
42 #include <getopt.h>
43 #include <util.h>
44 
45 #include "got_version.h"
46 #include "got_error.h"
47 #include "got_object.h"
48 #include "got_reference.h"
49 #include "got_repository.h"
50 #include "got_path.h"
51 #include "got_cancel.h"
52 #include "got_worktree.h"
53 #include "got_diff.h"
54 #include "got_commit_graph.h"
55 #include "got_fetch.h"
56 #include "got_send.h"
57 #include "got_blame.h"
58 #include "got_privsep.h"
59 #include "got_opentemp.h"
60 #include "got_gotconfig.h"
61 #include "got_dial.h"
62 #include "got_patch.h"
63 #include "got_sigs.h"
64 #include "got_date.h"
65 #include "got_keyword.h"
66 
67 #ifndef nitems
68 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
69 #endif
70 
71 #ifndef GOT_DEFAULT_EDITOR
72 #define GOT_DEFAULT_EDITOR "/usr/bin/vi"
73 #endif
74 
75 static volatile sig_atomic_t sigint_received;
76 static volatile sig_atomic_t sigpipe_received;
77 
78 static void
79 catch_sigint(int signo)
80 {
81 	sigint_received = 1;
82 }
83 
84 static void
85 catch_sigpipe(int signo)
86 {
87 	sigpipe_received = 1;
88 }
89 
90 
91 struct got_cmd {
92 	const char	*cmd_name;
93 	const struct got_error *(*cmd_main)(int, char *[]);
94 	void		(*cmd_usage)(void);
95 	const char	*cmd_alias;
96 };
97 
98 __dead static void	usage(int, int);
99 __dead static void	usage_import(void);
100 __dead static void	usage_clone(void);
101 __dead static void	usage_fetch(void);
102 __dead static void	usage_checkout(void);
103 __dead static void	usage_update(void);
104 __dead static void	usage_log(void);
105 __dead static void	usage_diff(void);
106 __dead static void	usage_blame(void);
107 __dead static void	usage_tree(void);
108 __dead static void	usage_status(void);
109 __dead static void	usage_ref(void);
110 __dead static void	usage_branch(void);
111 __dead static void	usage_tag(void);
112 __dead static void	usage_add(void);
113 __dead static void	usage_remove(void);
114 __dead static void	usage_patch(void);
115 __dead static void	usage_revert(void);
116 __dead static void	usage_commit(void);
117 __dead static void	usage_send(void);
118 __dead static void	usage_cherrypick(void);
119 __dead static void	usage_backout(void);
120 __dead static void	usage_rebase(void);
121 __dead static void	usage_histedit(void);
122 __dead static void	usage_integrate(void);
123 __dead static void	usage_merge(void);
124 __dead static void	usage_stage(void);
125 __dead static void	usage_unstage(void);
126 __dead static void	usage_cat(void);
127 __dead static void	usage_info(void);
128 
129 static const struct got_error*		cmd_import(int, char *[]);
130 static const struct got_error*		cmd_clone(int, char *[]);
131 static const struct got_error*		cmd_fetch(int, char *[]);
132 static const struct got_error*		cmd_checkout(int, char *[]);
133 static const struct got_error*		cmd_update(int, char *[]);
134 static const struct got_error*		cmd_log(int, char *[]);
135 static const struct got_error*		cmd_diff(int, char *[]);
136 static const struct got_error*		cmd_blame(int, char *[]);
137 static const struct got_error*		cmd_tree(int, char *[]);
138 static const struct got_error*		cmd_status(int, char *[]);
139 static const struct got_error*		cmd_ref(int, char *[]);
140 static const struct got_error*		cmd_branch(int, char *[]);
141 static const struct got_error*		cmd_tag(int, char *[]);
142 static const struct got_error*		cmd_add(int, char *[]);
143 static const struct got_error*		cmd_remove(int, char *[]);
144 static const struct got_error*		cmd_patch(int, char *[]);
145 static const struct got_error*		cmd_revert(int, char *[]);
146 static const struct got_error*		cmd_commit(int, char *[]);
147 static const struct got_error*		cmd_send(int, char *[]);
148 static const struct got_error*		cmd_cherrypick(int, char *[]);
149 static const struct got_error*		cmd_backout(int, char *[]);
150 static const struct got_error*		cmd_rebase(int, char *[]);
151 static const struct got_error*		cmd_histedit(int, char *[]);
152 static const struct got_error*		cmd_integrate(int, char *[]);
153 static const struct got_error*		cmd_merge(int, char *[]);
154 static const struct got_error*		cmd_stage(int, char *[]);
155 static const struct got_error*		cmd_unstage(int, char *[]);
156 static const struct got_error*		cmd_cat(int, char *[]);
157 static const struct got_error*		cmd_info(int, char *[]);
158 
159 static const struct got_cmd got_commands[] = {
160 	{ "import",	cmd_import,	usage_import,	"im" },
161 	{ "clone",	cmd_clone,	usage_clone,	"cl" },
162 	{ "fetch",	cmd_fetch,	usage_fetch,	"fe" },
163 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
164 	{ "update",	cmd_update,	usage_update,	"up" },
165 	{ "log",	cmd_log,	usage_log,	"" },
166 	{ "diff",	cmd_diff,	usage_diff,	"di" },
167 	{ "blame",	cmd_blame,	usage_blame,	"bl" },
168 	{ "tree",	cmd_tree,	usage_tree,	"tr" },
169 	{ "status",	cmd_status,	usage_status,	"st" },
170 	{ "ref",	cmd_ref,	usage_ref,	"" },
171 	{ "branch",	cmd_branch,	usage_branch,	"br" },
172 	{ "tag",	cmd_tag,	usage_tag,	"" },
173 	{ "add",	cmd_add,	usage_add,	"" },
174 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
175 	{ "patch",	cmd_patch,	usage_patch,	"pa" },
176 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
177 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
178 	{ "send",	cmd_send,	usage_send,	"se" },
179 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
180 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
181 	{ "rebase",	cmd_rebase,	usage_rebase,	"rb" },
182 	{ "histedit",	cmd_histedit,	usage_histedit,	"he" },
183 	{ "integrate",  cmd_integrate,  usage_integrate,"ig" },
184 	{ "merge",	cmd_merge,	usage_merge,	"mg" },
185 	{ "stage",	cmd_stage,	usage_stage,	"sg" },
186 	{ "unstage",	cmd_unstage,	usage_unstage,	"ug" },
187 	{ "cat",	cmd_cat,	usage_cat,	"" },
188 	{ "info",	cmd_info,	usage_info,	"" },
189 };
190 
191 static void
192 list_commands(FILE *fp)
193 {
194 	size_t i;
195 
196 	fprintf(fp, "commands:");
197 	for (i = 0; i < nitems(got_commands); i++) {
198 		const struct got_cmd *cmd = &got_commands[i];
199 		fprintf(fp, " %s", cmd->cmd_name);
200 	}
201 	fputc('\n', fp);
202 }
203 
204 __dead static void
205 option_conflict(char a, char b)
206 {
207 	errx(1, "-%c and -%c options are mutually exclusive", a, b);
208 }
209 
210 int
211 main(int argc, char *argv[])
212 {
213 	const struct got_cmd *cmd;
214 	size_t i;
215 	int ch;
216 	int hflag = 0, Vflag = 0;
217 	static const struct option longopts[] = {
218 	    { "version", no_argument, NULL, 'V' },
219 	    { NULL, 0, NULL, 0 }
220 	};
221 
222 	setlocale(LC_CTYPE, "");
223 
224 	while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
225 		switch (ch) {
226 		case 'h':
227 			hflag = 1;
228 			break;
229 		case 'V':
230 			Vflag = 1;
231 			break;
232 		default:
233 			usage(hflag, 1);
234 			/* NOTREACHED */
235 		}
236 	}
237 
238 	argc -= optind;
239 	argv += optind;
240 	optind = 1;
241 	optreset = 1;
242 
243 	if (Vflag) {
244 		got_version_print_str();
245 		return 0;
246 	}
247 
248 	if (argc <= 0)
249 		usage(hflag, hflag ? 0 : 1);
250 
251 	signal(SIGINT, catch_sigint);
252 	signal(SIGPIPE, catch_sigpipe);
253 
254 	for (i = 0; i < nitems(got_commands); i++) {
255 		const struct got_error *error;
256 
257 		cmd = &got_commands[i];
258 
259 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
260 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
261 			continue;
262 
263 		if (hflag)
264 			cmd->cmd_usage();
265 
266 		error = cmd->cmd_main(argc, argv);
267 		if (error && error->code != GOT_ERR_CANCELLED &&
268 		    error->code != GOT_ERR_PRIVSEP_EXIT &&
269 		    !(sigpipe_received &&
270 		      error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
271 		    !(sigint_received &&
272 		      error->code == GOT_ERR_ERRNO && errno == EINTR)) {
273 			fflush(stdout);
274 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
275 			return 1;
276 		}
277 
278 		return 0;
279 	}
280 
281 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
282 	list_commands(stderr);
283 	return 1;
284 }
285 
286 __dead static void
287 usage(int hflag, int status)
288 {
289 	FILE *fp = (status == 0) ? stdout : stderr;
290 
291 	fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
292 	    getprogname());
293 	if (hflag)
294 		list_commands(fp);
295 	exit(status);
296 }
297 
298 static const struct got_error *
299 get_editor(char **abspath)
300 {
301 	const struct got_error *err = NULL;
302 	const char *editor;
303 
304 	*abspath = NULL;
305 
306 	editor = getenv("VISUAL");
307 	if (editor == NULL)
308 		editor = getenv("EDITOR");
309 
310 	if (editor) {
311 		err = got_path_find_prog(abspath, editor);
312 		if (err)
313 			return err;
314 	}
315 
316 	if (*abspath == NULL) {
317 		*abspath = strdup(GOT_DEFAULT_EDITOR);
318 		if (*abspath == NULL)
319 			return got_error_from_errno("strdup");
320 	}
321 
322 	return NULL;
323 }
324 
325 static const struct got_error *
326 apply_unveil(const char *repo_path, int repo_read_only,
327     const char *worktree_path)
328 {
329 	const struct got_error *err;
330 
331 #ifdef PROFILE
332 	if (unveil("gmon.out", "rwc") != 0)
333 		return got_error_from_errno2("unveil", "gmon.out");
334 #endif
335 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
336 		return got_error_from_errno2("unveil", repo_path);
337 
338 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
339 		return got_error_from_errno2("unveil", worktree_path);
340 
341 	if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
342 		return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
343 
344 	err = got_privsep_unveil_exec_helpers();
345 	if (err != NULL)
346 		return err;
347 
348 	if (unveil(NULL, NULL) != 0)
349 		return got_error_from_errno("unveil");
350 
351 	return NULL;
352 }
353 
354 __dead static void
355 usage_import(void)
356 {
357 	fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
358 	    "[-r repository-path] directory\n", getprogname());
359 	exit(1);
360 }
361 
362 static int
363 spawn_editor(const char *editor, const char *file)
364 {
365 	pid_t pid;
366 	sig_t sighup, sigint, sigquit;
367 	int st = -1;
368 
369 	sighup = signal(SIGHUP, SIG_IGN);
370 	sigint = signal(SIGINT, SIG_IGN);
371 	sigquit = signal(SIGQUIT, SIG_IGN);
372 
373 	switch (pid = fork()) {
374 	case -1:
375 		goto doneediting;
376 	case 0:
377 		execl(editor, editor, file, (char *)NULL);
378 		_exit(127);
379 	}
380 
381 	while (waitpid(pid, &st, 0) == -1)
382 		if (errno != EINTR)
383 			break;
384 
385 doneediting:
386 	(void)signal(SIGHUP, sighup);
387 	(void)signal(SIGINT, sigint);
388 	(void)signal(SIGQUIT, sigquit);
389 
390 	if (!WIFEXITED(st)) {
391 		errno = EINTR;
392 		return -1;
393 	}
394 
395 	return WEXITSTATUS(st);
396 }
397 
398 static const struct got_error *
399 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
400 {
401 	const struct got_error *err = NULL;
402 	char *line = NULL;
403 	size_t linesize = 0;
404 
405 	*logmsg = NULL;
406 	*len = 0;
407 
408 	if (fseeko(fp, 0L, SEEK_SET) == -1)
409 		return got_error_from_errno("fseeko");
410 
411 	*logmsg = malloc(filesize + 1);
412 	if (*logmsg == NULL)
413 		return got_error_from_errno("malloc");
414 	(*logmsg)[0] = '\0';
415 
416 	while (getline(&line, &linesize, fp) != -1) {
417 		if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
418 			continue; /* remove comments and leading empty lines */
419 		*len = strlcat(*logmsg, line, filesize + 1);
420 		if (*len >= filesize + 1) {
421 			err = got_error(GOT_ERR_NO_SPACE);
422 			goto done;
423 		}
424 	}
425 	if (ferror(fp)) {
426 		err = got_ferror(fp, GOT_ERR_IO);
427 		goto done;
428 	}
429 
430 	while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
431 		(*logmsg)[*len - 1] = '\0';
432 		(*len)--;
433 	}
434 done:
435 	free(line);
436 	if (err) {
437 		free(*logmsg);
438 		*logmsg = NULL;
439 		*len = 0;
440 	}
441 	return err;
442 }
443 
444 static const struct got_error *
445 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
446     const char *initial_content, size_t initial_content_len,
447     int require_modification)
448 {
449 	const struct got_error *err = NULL;
450 	struct stat st, st2;
451 	FILE *fp = NULL;
452 	size_t logmsg_len;
453 
454 	*logmsg = NULL;
455 
456 	if (stat(logmsg_path, &st) == -1)
457 		return got_error_from_errno2("stat", logmsg_path);
458 
459 	if (spawn_editor(editor, logmsg_path) == -1)
460 		return got_error_from_errno("failed spawning editor");
461 
462 	if (require_modification) {
463 		struct timespec timeout;
464 
465 		timeout.tv_sec = 0;
466 		timeout.tv_nsec = 1;
467 		nanosleep(&timeout,  NULL);
468 	}
469 
470 	if (stat(logmsg_path, &st2) == -1)
471 		return got_error_from_errno2("stat", logmsg_path);
472 
473 	if (require_modification && st.st_size == st2.st_size &&
474 	    timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
475 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
476 		    "no changes made to commit message, aborting");
477 
478 	fp = fopen(logmsg_path, "re");
479 	if (fp == NULL) {
480 		err = got_error_from_errno("fopen");
481 		goto done;
482 	}
483 
484 	/* strip comments and leading/trailing newlines */
485 	err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
486 	if (err)
487 		goto done;
488 	if (logmsg_len == 0) {
489 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
490 		    "commit message cannot be empty, aborting");
491 		goto done;
492 	}
493 done:
494 	if (fp && fclose(fp) == EOF && err == NULL)
495 		err = got_error_from_errno("fclose");
496 	if (err) {
497 		free(*logmsg);
498 		*logmsg = NULL;
499 	}
500 	return err;
501 }
502 
503 static const struct got_error *
504 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
505     const char *path_dir, const char *branch_name)
506 {
507 	char *initial_content = NULL;
508 	const struct got_error *err = NULL;
509 	int initial_content_len;
510 	int fd = -1;
511 
512 	initial_content_len = asprintf(&initial_content,
513 	    "\n# %s to be imported to branch %s\n", path_dir,
514 	    branch_name);
515 	if (initial_content_len == -1)
516 		return got_error_from_errno("asprintf");
517 
518 	err = got_opentemp_named_fd(logmsg_path, &fd,
519 	    GOT_TMPDIR_STR "/got-importmsg", "");
520 	if (err)
521 		goto done;
522 
523 	if (write(fd, initial_content, initial_content_len) == -1) {
524 		err = got_error_from_errno2("write", *logmsg_path);
525 		goto done;
526 	}
527 	if (close(fd) == -1) {
528 		err = got_error_from_errno2("close", *logmsg_path);
529 		goto done;
530 	}
531 	fd = -1;
532 
533 	err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
534 	    initial_content_len, 1);
535 done:
536 	if (fd != -1 && close(fd) == -1 && err == NULL)
537 		err = got_error_from_errno2("close", *logmsg_path);
538 	free(initial_content);
539 	if (err) {
540 		free(*logmsg_path);
541 		*logmsg_path = NULL;
542 	}
543 	return err;
544 }
545 
546 static const struct got_error *
547 import_progress(void *arg, const char *path)
548 {
549 	printf("A  %s\n", path);
550 	return NULL;
551 }
552 
553 static const struct got_error *
554 valid_author(const char *author)
555 {
556 	const char *email = author;
557 
558 	/*
559 	 * Git' expects the author (or committer) to be in the form
560 	 * "name <email>", which are mostly free form (see the
561 	 * "committer" description in git-fast-import(1)).  We're only
562 	 * doing this to avoid git's object parser breaking on commits
563 	 * we create.
564 	 */
565 
566 	while (*author && *author != '\n' && *author != '<' && *author != '>')
567 		author++;
568 	if (author != email && *author == '<' && *(author - 1) != ' ')
569 		return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
570 		    "between author name and email required", email);
571 	if (*author++ != '<')
572 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
573 	while (*author && *author != '\n' && *author != '<' && *author != '>')
574 		author++;
575 	if (strcmp(author, ">") != 0)
576 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
577 	return NULL;
578 }
579 
580 static const struct got_error *
581 get_author(char **author, struct got_repository *repo,
582     struct got_worktree *worktree)
583 {
584 	const struct got_error *err = NULL;
585 	const char *got_author = NULL, *name, *email;
586 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
587 
588 	*author = NULL;
589 
590 	if (worktree)
591 		worktree_conf = got_worktree_get_gotconfig(worktree);
592 	repo_conf = got_repo_get_gotconfig(repo);
593 
594 	/*
595 	 * Priority of potential author information sources, from most
596 	 * significant to least significant:
597 	 * 1) work tree's .got/got.conf file
598 	 * 2) repository's got.conf file
599 	 * 3) repository's git config file
600 	 * 4) environment variables
601 	 * 5) global git config files (in user's home directory or /etc)
602 	 */
603 
604 	if (worktree_conf)
605 		got_author = got_gotconfig_get_author(worktree_conf);
606 	if (got_author == NULL)
607 		got_author = got_gotconfig_get_author(repo_conf);
608 	if (got_author == NULL) {
609 		name = got_repo_get_gitconfig_author_name(repo);
610 		email = got_repo_get_gitconfig_author_email(repo);
611 		if (name && email) {
612 			if (asprintf(author, "%s <%s>", name, email) == -1)
613 				return got_error_from_errno("asprintf");
614 			return NULL;
615 		}
616 
617 		got_author = getenv("GOT_AUTHOR");
618 		if (got_author == NULL) {
619 			name = got_repo_get_global_gitconfig_author_name(repo);
620 			email = got_repo_get_global_gitconfig_author_email(
621 			    repo);
622 			if (name && email) {
623 				if (asprintf(author, "%s <%s>", name, email)
624 				    == -1)
625 					return got_error_from_errno("asprintf");
626 				return NULL;
627 			}
628 			/* TODO: Look up user in password database? */
629 			return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
630 		}
631 	}
632 
633 	*author = strdup(got_author);
634 	if (*author == NULL)
635 		return got_error_from_errno("strdup");
636 
637 	err = valid_author(*author);
638 	if (err) {
639 		free(*author);
640 		*author = NULL;
641 	}
642 	return err;
643 }
644 
645 static const struct got_error *
646 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
647     struct got_worktree *worktree)
648 {
649 	const char *got_allowed_signers = NULL;
650 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
651 
652 	*allowed_signers = NULL;
653 
654 	if (worktree)
655 		worktree_conf = got_worktree_get_gotconfig(worktree);
656 	repo_conf = got_repo_get_gotconfig(repo);
657 
658 	/*
659 	 * Priority of potential author information sources, from most
660 	 * significant to least significant:
661 	 * 1) work tree's .got/got.conf file
662 	 * 2) repository's got.conf file
663 	 */
664 
665 	if (worktree_conf)
666 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
667 		    worktree_conf);
668 	if (got_allowed_signers == NULL)
669 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
670 		    repo_conf);
671 
672 	if (got_allowed_signers) {
673 		*allowed_signers = strdup(got_allowed_signers);
674 		if (*allowed_signers == NULL)
675 			return got_error_from_errno("strdup");
676 	}
677 	return NULL;
678 }
679 
680 static const struct got_error *
681 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
682     struct got_worktree *worktree)
683 {
684 	const char *got_revoked_signers = NULL;
685 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
686 
687 	*revoked_signers = NULL;
688 
689 	if (worktree)
690 		worktree_conf = got_worktree_get_gotconfig(worktree);
691 	repo_conf = got_repo_get_gotconfig(repo);
692 
693 	/*
694 	 * Priority of potential author information sources, from most
695 	 * significant to least significant:
696 	 * 1) work tree's .got/got.conf file
697 	 * 2) repository's got.conf file
698 	 */
699 
700 	if (worktree_conf)
701 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
702 		    worktree_conf);
703 	if (got_revoked_signers == NULL)
704 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
705 		    repo_conf);
706 
707 	if (got_revoked_signers) {
708 		*revoked_signers = strdup(got_revoked_signers);
709 		if (*revoked_signers == NULL)
710 			return got_error_from_errno("strdup");
711 	}
712 	return NULL;
713 }
714 
715 static const char *
716 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
717 {
718 	const char *got_signer_id = NULL;
719 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
720 
721 	if (worktree)
722 		worktree_conf = got_worktree_get_gotconfig(worktree);
723 	repo_conf = got_repo_get_gotconfig(repo);
724 
725 	/*
726 	 * Priority of potential author information sources, from most
727 	 * significant to least significant:
728 	 * 1) work tree's .got/got.conf file
729 	 * 2) repository's got.conf file
730 	 */
731 
732 	if (worktree_conf)
733 		got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
734 	if (got_signer_id == NULL)
735 		got_signer_id = got_gotconfig_get_signer_id(repo_conf);
736 
737 	return got_signer_id;
738 }
739 
740 static const struct got_error *
741 get_gitconfig_path(char **gitconfig_path)
742 {
743 	const char *homedir = getenv("HOME");
744 
745 	*gitconfig_path = NULL;
746 	if (homedir) {
747 		if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
748 			return got_error_from_errno("asprintf");
749 
750 	}
751 	return NULL;
752 }
753 
754 static const struct got_error *
755 cmd_import(int argc, char *argv[])
756 {
757 	const struct got_error *error = NULL;
758 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
759 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
760 	const char *branch_name = NULL;
761 	char *id_str = NULL, *logmsg_path = NULL;
762 	char refname[PATH_MAX] = "refs/heads/";
763 	struct got_repository *repo = NULL;
764 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
765 	struct got_object_id *new_commit_id = NULL;
766 	int ch, n = 0;
767 	struct got_pathlist_head ignores;
768 	struct got_pathlist_entry *pe;
769 	int preserve_logmsg = 0;
770 	int *pack_fds = NULL;
771 
772 	TAILQ_INIT(&ignores);
773 
774 #ifndef PROFILE
775 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
776 	    "unveil",
777 	    NULL) == -1)
778 		err(1, "pledge");
779 #endif
780 
781 	while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
782 		switch (ch) {
783 		case 'b':
784 			branch_name = optarg;
785 			break;
786 		case 'I':
787 			if (optarg[0] == '\0')
788 				break;
789 			error = got_pathlist_insert(&pe, &ignores, optarg,
790 			    NULL);
791 			if (error)
792 				goto done;
793 			break;
794 		case 'm':
795 			logmsg = strdup(optarg);
796 			if (logmsg == NULL) {
797 				error = got_error_from_errno("strdup");
798 				goto done;
799 			}
800 			break;
801 		case 'r':
802 			repo_path = realpath(optarg, NULL);
803 			if (repo_path == NULL) {
804 				error = got_error_from_errno2("realpath",
805 				    optarg);
806 				goto done;
807 			}
808 			break;
809 		default:
810 			usage_import();
811 			/* NOTREACHED */
812 		}
813 	}
814 
815 	argc -= optind;
816 	argv += optind;
817 
818 	if (argc != 1)
819 		usage_import();
820 
821 	if (repo_path == NULL) {
822 		repo_path = getcwd(NULL, 0);
823 		if (repo_path == NULL)
824 			return got_error_from_errno("getcwd");
825 	}
826 	got_path_strip_trailing_slashes(repo_path);
827 	error = get_gitconfig_path(&gitconfig_path);
828 	if (error)
829 		goto done;
830 	error = got_repo_pack_fds_open(&pack_fds);
831 	if (error != NULL)
832 		goto done;
833 	error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
834 	if (error)
835 		goto done;
836 
837 	path_dir = realpath(argv[0], NULL);
838 	if (path_dir == NULL) {
839 		error = got_error_from_errno2("realpath", argv[0]);
840 		goto done;
841 	}
842 	got_path_strip_trailing_slashes(path_dir);
843 
844 	error = get_editor(&editor);
845 	if (error)
846 		goto done;
847 
848 	if (unveil(path_dir, "r") != 0) {
849 		error = got_error_from_errno2("unveil", path_dir);
850 		goto done;
851 	}
852 	if (unveil(editor, "x") != 0) {
853 		error = got_error_from_errno2("unveil", editor);
854 		goto done;
855 	}
856 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
857 	if (error)
858 		goto done;
859 
860 	error = get_author(&author, repo, NULL);
861 	if (error)
862 		return error;
863 
864 	/*
865 	 * Don't let the user create a branch name with a leading '-'.
866 	 * While technically a valid reference name, this case is usually
867 	 * an unintended typo.
868 	 */
869 	if (branch_name && branch_name[0] == '-')
870 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
871 
872 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
873 	if (error && error->code != GOT_ERR_NOT_REF)
874 		goto done;
875 
876 	if (branch_name)
877 		n = strlcat(refname, branch_name, sizeof(refname));
878 	else if (head_ref && got_ref_is_symbolic(head_ref))
879 		n = strlcpy(refname, got_ref_get_symref_target(head_ref),
880 		    sizeof(refname));
881 	else
882 		n = strlcat(refname, "main", sizeof(refname));
883 	if (n >= sizeof(refname)) {
884 		error = got_error(GOT_ERR_NO_SPACE);
885 		goto done;
886 	}
887 
888 	error = got_ref_open(&branch_ref, repo, refname, 0);
889 	if (error) {
890 		if (error->code != GOT_ERR_NOT_REF)
891 			goto done;
892 	} else {
893 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
894 		    "import target branch already exists");
895 		goto done;
896 	}
897 
898 	if (logmsg == NULL || *logmsg == '\0') {
899 		free(logmsg);
900 		error = collect_import_msg(&logmsg, &logmsg_path, editor,
901 		    path_dir, refname);
902 		if (error) {
903 			if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
904 			    logmsg_path != NULL)
905 				preserve_logmsg = 1;
906 			goto done;
907 		}
908 	}
909 
910 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
911 	    author, &ignores, repo, import_progress, NULL);
912 	if (error) {
913 		if (logmsg_path)
914 			preserve_logmsg = 1;
915 		goto done;
916 	}
917 
918 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
919 	if (error) {
920 		if (logmsg_path)
921 			preserve_logmsg = 1;
922 		goto done;
923 	}
924 
925 	error = got_ref_write(branch_ref, repo);
926 	if (error) {
927 		if (logmsg_path)
928 			preserve_logmsg = 1;
929 		goto done;
930 	}
931 
932 	error = got_object_id_str(&id_str, new_commit_id);
933 	if (error) {
934 		if (logmsg_path)
935 			preserve_logmsg = 1;
936 		goto done;
937 	}
938 
939 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
940 	if (error) {
941 		if (error->code != GOT_ERR_NOT_REF) {
942 			if (logmsg_path)
943 				preserve_logmsg = 1;
944 			goto done;
945 		}
946 
947 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
948 		    branch_ref);
949 		if (error) {
950 			if (logmsg_path)
951 				preserve_logmsg = 1;
952 			goto done;
953 		}
954 
955 		error = got_ref_write(head_ref, repo);
956 		if (error) {
957 			if (logmsg_path)
958 				preserve_logmsg = 1;
959 			goto done;
960 		}
961 	}
962 
963 	printf("Created branch %s with commit %s\n",
964 	    got_ref_get_name(branch_ref), id_str);
965 done:
966 	if (pack_fds) {
967 		const struct got_error *pack_err =
968 		    got_repo_pack_fds_close(pack_fds);
969 		if (error == NULL)
970 			error = pack_err;
971 	}
972 	if (repo) {
973 		const struct got_error *close_err = got_repo_close(repo);
974 		if (error == NULL)
975 			error = close_err;
976 	}
977 	if (preserve_logmsg) {
978 		fprintf(stderr, "%s: log message preserved in %s\n",
979 		    getprogname(), logmsg_path);
980 	} else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
981 		error = got_error_from_errno2("unlink", logmsg_path);
982 	free(logmsg);
983 	free(logmsg_path);
984 	free(repo_path);
985 	free(editor);
986 	free(new_commit_id);
987 	free(id_str);
988 	free(author);
989 	free(gitconfig_path);
990 	if (branch_ref)
991 		got_ref_close(branch_ref);
992 	if (head_ref)
993 		got_ref_close(head_ref);
994 	return error;
995 }
996 
997 __dead static void
998 usage_clone(void)
999 {
1000 	fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
1001 	    "repository-URL [directory]\n", getprogname());
1002 	exit(1);
1003 }
1004 
1005 struct got_fetch_progress_arg {
1006 	char last_scaled_size[FMT_SCALED_STRSIZE];
1007 	int last_p_indexed;
1008 	int last_p_resolved;
1009 	int verbosity;
1010 
1011 	struct got_repository *repo;
1012 
1013 	int create_configs;
1014 	int configs_created;
1015 	struct {
1016 		struct got_pathlist_head *symrefs;
1017 		struct got_pathlist_head *wanted_branches;
1018 		struct got_pathlist_head *wanted_refs;
1019 		const char *proto;
1020 		const char *host;
1021 		const char *port;
1022 		const char *remote_repo_path;
1023 		const char *git_url;
1024 		int fetch_all_branches;
1025 		int mirror_references;
1026 	} config_info;
1027 };
1028 
1029 /* XXX forward declaration */
1030 static const struct got_error *
1031 create_config_files(const char *proto, const char *host, const char *port,
1032     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1033     int mirror_references, struct got_pathlist_head *symrefs,
1034     struct got_pathlist_head *wanted_branches,
1035     struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1036 
1037 static const struct got_error *
1038 fetch_progress(void *arg, const char *message, off_t packfile_size,
1039     int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1040 {
1041 	const struct got_error *err = NULL;
1042 	struct got_fetch_progress_arg *a = arg;
1043 	char scaled_size[FMT_SCALED_STRSIZE];
1044 	int p_indexed, p_resolved;
1045 	int print_size = 0, print_indexed = 0, print_resolved = 0;
1046 
1047 	/*
1048 	 * In order to allow a failed clone to be resumed with 'got fetch'
1049 	 * we try to create configuration files as soon as possible.
1050 	 * Once the server has sent information about its default branch
1051 	 * we have all required information.
1052 	 */
1053 	if (a->create_configs && !a->configs_created &&
1054 	    !TAILQ_EMPTY(a->config_info.symrefs)) {
1055 		err = create_config_files(a->config_info.proto,
1056 		    a->config_info.host, a->config_info.port,
1057 		    a->config_info.remote_repo_path,
1058 		    a->config_info.git_url,
1059 		    a->config_info.fetch_all_branches,
1060 		    a->config_info.mirror_references,
1061 		    a->config_info.symrefs,
1062 		    a->config_info.wanted_branches,
1063 		    a->config_info.wanted_refs, a->repo);
1064 		if (err)
1065 			return err;
1066 		a->configs_created = 1;
1067 	}
1068 
1069 	if (a->verbosity < 0)
1070 		return NULL;
1071 
1072 	if (message && message[0] != '\0') {
1073 		printf("\rserver: %s", message);
1074 		fflush(stdout);
1075 		return NULL;
1076 	}
1077 
1078 	if (packfile_size > 0 || nobj_indexed > 0) {
1079 		if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1080 		    (a->last_scaled_size[0] == '\0' ||
1081 		    strcmp(scaled_size, a->last_scaled_size)) != 0) {
1082 			print_size = 1;
1083 			if (strlcpy(a->last_scaled_size, scaled_size,
1084 			    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1085 				return got_error(GOT_ERR_NO_SPACE);
1086 		}
1087 		if (nobj_indexed > 0) {
1088 			p_indexed = (nobj_indexed * 100) / nobj_total;
1089 			if (p_indexed != a->last_p_indexed) {
1090 				a->last_p_indexed = p_indexed;
1091 				print_indexed = 1;
1092 				print_size = 1;
1093 			}
1094 		}
1095 		if (nobj_resolved > 0) {
1096 			p_resolved = (nobj_resolved * 100) /
1097 			    (nobj_total - nobj_loose);
1098 			if (p_resolved != a->last_p_resolved) {
1099 				a->last_p_resolved = p_resolved;
1100 				print_resolved = 1;
1101 				print_indexed = 1;
1102 				print_size = 1;
1103 			}
1104 		}
1105 
1106 	}
1107 	if (print_size || print_indexed || print_resolved)
1108 		printf("\r");
1109 	if (print_size)
1110 		printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1111 	if (print_indexed)
1112 		printf("; indexing %d%%", p_indexed);
1113 	if (print_resolved)
1114 		printf("; resolving deltas %d%%", p_resolved);
1115 	if (print_size || print_indexed || print_resolved)
1116 		fflush(stdout);
1117 
1118 	return NULL;
1119 }
1120 
1121 static const struct got_error *
1122 create_symref(const char *refname, struct got_reference *target_ref,
1123     int verbosity, struct got_repository *repo)
1124 {
1125 	const struct got_error *err;
1126 	struct got_reference *head_symref;
1127 
1128 	err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1129 	if (err)
1130 		return err;
1131 
1132 	err = got_ref_write(head_symref, repo);
1133 	if (err == NULL && verbosity > 0) {
1134 		printf("Created reference %s: %s\n", GOT_REF_HEAD,
1135 		    got_ref_get_name(target_ref));
1136 	}
1137 	got_ref_close(head_symref);
1138 	return err;
1139 }
1140 
1141 static const struct got_error *
1142 list_remote_refs(struct got_pathlist_head *symrefs,
1143     struct got_pathlist_head *refs)
1144 {
1145 	const struct got_error *err;
1146 	struct got_pathlist_entry *pe;
1147 
1148 	TAILQ_FOREACH(pe, symrefs, entry) {
1149 		const char *refname = pe->path;
1150 		const char *targetref = pe->data;
1151 
1152 		printf("%s: %s\n", refname, targetref);
1153 	}
1154 
1155 	TAILQ_FOREACH(pe, refs, entry) {
1156 		const char *refname = pe->path;
1157 		struct got_object_id *id = pe->data;
1158 		char *id_str;
1159 
1160 		err = got_object_id_str(&id_str, id);
1161 		if (err)
1162 			return err;
1163 		printf("%s: %s\n", refname, id_str);
1164 		free(id_str);
1165 	}
1166 
1167 	return NULL;
1168 }
1169 
1170 static const struct got_error *
1171 create_ref(const char *refname, struct got_object_id *id,
1172     int verbosity, struct got_repository *repo)
1173 {
1174 	const struct got_error *err = NULL;
1175 	struct got_reference *ref;
1176 	char *id_str;
1177 
1178 	err = got_object_id_str(&id_str, id);
1179 	if (err)
1180 		return err;
1181 
1182 	err = got_ref_alloc(&ref, refname, id);
1183 	if (err)
1184 		goto done;
1185 
1186 	err = got_ref_write(ref, repo);
1187 	got_ref_close(ref);
1188 
1189 	if (err == NULL && verbosity >= 0)
1190 		printf("Created reference %s: %s\n", refname, id_str);
1191 done:
1192 	free(id_str);
1193 	return err;
1194 }
1195 
1196 static int
1197 match_wanted_ref(const char *refname, const char *wanted_ref)
1198 {
1199 	if (strncmp(refname, "refs/", 5) != 0)
1200 		return 0;
1201 	refname += 5;
1202 
1203 	/*
1204 	 * Prevent fetching of references that won't make any
1205 	 * sense outside of the remote repository's context.
1206 	 */
1207 	if (strncmp(refname, "got/", 4) == 0)
1208 		return 0;
1209 	if (strncmp(refname, "remotes/", 8) == 0)
1210 		return 0;
1211 
1212 	if (strncmp(wanted_ref, "refs/", 5) == 0)
1213 		wanted_ref += 5;
1214 
1215 	/* Allow prefix match. */
1216 	if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1217 		return 1;
1218 
1219 	/* Allow exact match. */
1220 	return (strcmp(refname, wanted_ref) == 0);
1221 }
1222 
1223 static int
1224 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1225 {
1226 	struct got_pathlist_entry *pe;
1227 
1228 	TAILQ_FOREACH(pe, wanted_refs, entry) {
1229 		if (match_wanted_ref(refname, pe->path))
1230 			return 1;
1231 	}
1232 
1233 	return 0;
1234 }
1235 
1236 static const struct got_error *
1237 create_wanted_ref(const char *refname, struct got_object_id *id,
1238     const char *remote_repo_name, int verbosity, struct got_repository *repo)
1239 {
1240 	const struct got_error *err;
1241 	char *remote_refname;
1242 
1243 	if (strncmp("refs/", refname, 5) == 0)
1244 		refname += 5;
1245 
1246 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1247 	    remote_repo_name, refname) == -1)
1248 		return got_error_from_errno("asprintf");
1249 
1250 	err = create_ref(remote_refname, id, verbosity, repo);
1251 	free(remote_refname);
1252 	return err;
1253 }
1254 
1255 static const struct got_error *
1256 create_gotconfig(const char *proto, const char *host, const char *port,
1257     const char *remote_repo_path, const char *default_branch,
1258     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1259     struct got_pathlist_head *wanted_refs, int mirror_references,
1260     struct got_repository *repo)
1261 {
1262 	const struct got_error *err = NULL;
1263 	char *gotconfig_path = NULL;
1264 	char *gotconfig = NULL;
1265 	FILE *gotconfig_file = NULL;
1266 	const char *branchname = NULL;
1267 	char *branches = NULL, *refs = NULL;
1268 	ssize_t n;
1269 
1270 	if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1271 		struct got_pathlist_entry *pe;
1272 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1273 			char *s;
1274 			branchname = pe->path;
1275 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1276 				branchname += 11;
1277 			if (asprintf(&s, "%s\"%s\" ",
1278 			    branches ? branches : "", branchname) == -1) {
1279 				err = got_error_from_errno("asprintf");
1280 				goto done;
1281 			}
1282 			free(branches);
1283 			branches = s;
1284 		}
1285 	} else if (!fetch_all_branches && default_branch) {
1286 		branchname = default_branch;
1287 		if (strncmp(branchname, "refs/heads/", 11) == 0)
1288 			branchname += 11;
1289 		if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1290 			err = got_error_from_errno("asprintf");
1291 			goto done;
1292 		}
1293 	}
1294 	if (!TAILQ_EMPTY(wanted_refs)) {
1295 		struct got_pathlist_entry *pe;
1296 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1297 			char *s;
1298 			const char *refname = pe->path;
1299 			if (strncmp(refname, "refs/", 5) == 0)
1300 				branchname += 5;
1301 			if (asprintf(&s, "%s\"%s\" ",
1302 			    refs ? refs : "", refname) == -1) {
1303 				err = got_error_from_errno("asprintf");
1304 				goto done;
1305 			}
1306 			free(refs);
1307 			refs = s;
1308 		}
1309 	}
1310 
1311 	/* Create got.conf(5). */
1312 	gotconfig_path = got_repo_get_path_gotconfig(repo);
1313 	if (gotconfig_path == NULL) {
1314 		err = got_error_from_errno("got_repo_get_path_gotconfig");
1315 		goto done;
1316 	}
1317 	gotconfig_file = fopen(gotconfig_path, "ae");
1318 	if (gotconfig_file == NULL) {
1319 		err = got_error_from_errno2("fopen", gotconfig_path);
1320 		goto done;
1321 	}
1322 	if (asprintf(&gotconfig,
1323 	    "remote \"%s\" {\n"
1324 	    "\tserver %s\n"
1325 	    "\tprotocol %s\n"
1326 	    "%s%s%s"
1327 	    "\trepository \"%s\"\n"
1328 	    "%s%s%s"
1329 	    "%s%s%s"
1330 	    "%s"
1331 	    "%s"
1332 	    "}\n",
1333 	    GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1334 	    port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1335 	    remote_repo_path, branches ? "\tbranch { " : "",
1336 	    branches ? branches : "", branches ? "}\n" : "",
1337 	    refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1338 	    mirror_references ? "\tmirror_references yes\n" : "",
1339 	    fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1340 		err = got_error_from_errno("asprintf");
1341 		goto done;
1342 	}
1343 	n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1344 	if (n != strlen(gotconfig)) {
1345 		err = got_ferror(gotconfig_file, GOT_ERR_IO);
1346 		goto done;
1347 	}
1348 
1349 done:
1350 	if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1351 		err = got_error_from_errno2("fclose", gotconfig_path);
1352 	free(gotconfig_path);
1353 	free(branches);
1354 	return err;
1355 }
1356 
1357 static const struct got_error *
1358 create_gitconfig(const char *git_url, const char *default_branch,
1359     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1360     struct got_pathlist_head *wanted_refs, int mirror_references,
1361     struct got_repository *repo)
1362 {
1363 	const struct got_error *err = NULL;
1364 	char *gitconfig_path = NULL;
1365 	char *gitconfig = NULL;
1366 	FILE *gitconfig_file = NULL;
1367 	char *branches = NULL, *refs = NULL;
1368 	const char *branchname;
1369 	ssize_t n;
1370 
1371 	/* Create a config file Git can understand. */
1372 	gitconfig_path = got_repo_get_path_gitconfig(repo);
1373 	if (gitconfig_path == NULL) {
1374 		err = got_error_from_errno("got_repo_get_path_gitconfig");
1375 		goto done;
1376 	}
1377 	gitconfig_file = fopen(gitconfig_path, "ae");
1378 	if (gitconfig_file == NULL) {
1379 		err = got_error_from_errno2("fopen", gitconfig_path);
1380 		goto done;
1381 	}
1382 	if (fetch_all_branches) {
1383 		if (mirror_references) {
1384 			if (asprintf(&branches,
1385 			    "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1386 				err = got_error_from_errno("asprintf");
1387 				goto done;
1388 			}
1389 		} else if (asprintf(&branches,
1390 		    "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1391 		    GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1392 			err = got_error_from_errno("asprintf");
1393 			goto done;
1394 		}
1395 	} else if (!TAILQ_EMPTY(wanted_branches)) {
1396 		struct got_pathlist_entry *pe;
1397 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1398 			char *s;
1399 			branchname = pe->path;
1400 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1401 				branchname += 11;
1402 			if (mirror_references) {
1403 				if (asprintf(&s,
1404 				    "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1405 				    branches ? branches : "",
1406 				    branchname, branchname) == -1) {
1407 					err = got_error_from_errno("asprintf");
1408 					goto done;
1409 				}
1410 			} else if (asprintf(&s,
1411 			    "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1412 			    branches ? branches : "",
1413 			    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1414 			    branchname) == -1) {
1415 				err = got_error_from_errno("asprintf");
1416 				goto done;
1417 			}
1418 			free(branches);
1419 			branches = s;
1420 		}
1421 	} else {
1422 		/*
1423 		 * If the server specified a default branch, use just that one.
1424 		 * Otherwise fall back to fetching all branches on next fetch.
1425 		 */
1426 		if (default_branch) {
1427 			branchname = default_branch;
1428 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1429 				branchname += 11;
1430 		} else
1431 			branchname = "*"; /* fall back to all branches */
1432 		if (mirror_references) {
1433 			if (asprintf(&branches,
1434 			    "\tfetch = refs/heads/%s:refs/heads/%s\n",
1435 			    branchname, branchname) == -1) {
1436 				err = got_error_from_errno("asprintf");
1437 				goto done;
1438 			}
1439 		} else if (asprintf(&branches,
1440 		    "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1441 		    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1442 		    branchname) == -1) {
1443 			err = got_error_from_errno("asprintf");
1444 			goto done;
1445 		}
1446 	}
1447 	if (!TAILQ_EMPTY(wanted_refs)) {
1448 		struct got_pathlist_entry *pe;
1449 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1450 			char *s;
1451 			const char *refname = pe->path;
1452 			if (strncmp(refname, "refs/", 5) == 0)
1453 				refname += 5;
1454 			if (mirror_references) {
1455 				if (asprintf(&s,
1456 				    "%s\tfetch = refs/%s:refs/%s\n",
1457 				    refs ? refs : "", refname, refname) == -1) {
1458 					err = got_error_from_errno("asprintf");
1459 					goto done;
1460 				}
1461 			} else if (asprintf(&s,
1462 			    "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1463 			    refs ? refs : "",
1464 			    refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1465 			    refname) == -1) {
1466 				err = got_error_from_errno("asprintf");
1467 				goto done;
1468 			}
1469 			free(refs);
1470 			refs = s;
1471 		}
1472 	}
1473 
1474 	if (asprintf(&gitconfig,
1475 	    "[remote \"%s\"]\n"
1476 	    "\turl = %s\n"
1477 	    "%s"
1478 	    "%s"
1479 	    "\tfetch = refs/tags/*:refs/tags/*\n",
1480 	    GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1481 	    refs ? refs : "") == -1) {
1482 		err = got_error_from_errno("asprintf");
1483 		goto done;
1484 	}
1485 	n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1486 	if (n != strlen(gitconfig)) {
1487 		err = got_ferror(gitconfig_file, GOT_ERR_IO);
1488 		goto done;
1489 	}
1490 done:
1491 	if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1492 		err = got_error_from_errno2("fclose", gitconfig_path);
1493 	free(gitconfig_path);
1494 	free(branches);
1495 	return err;
1496 }
1497 
1498 static const struct got_error *
1499 create_config_files(const char *proto, const char *host, const char *port,
1500     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1501     int mirror_references, struct got_pathlist_head *symrefs,
1502     struct got_pathlist_head *wanted_branches,
1503     struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1504 {
1505 	const struct got_error *err = NULL;
1506 	const char *default_branch = NULL;
1507 	struct got_pathlist_entry *pe;
1508 
1509 	/*
1510 	 * If we asked for a set of wanted branches then use the first
1511 	 * one of those.
1512 	 */
1513 	if (!TAILQ_EMPTY(wanted_branches)) {
1514 		pe = TAILQ_FIRST(wanted_branches);
1515 		default_branch = pe->path;
1516 	} else {
1517 		/* First HEAD ref listed by server is the default branch. */
1518 		TAILQ_FOREACH(pe, symrefs, entry) {
1519 			const char *refname = pe->path;
1520 			const char *target = pe->data;
1521 
1522 			if (strcmp(refname, GOT_REF_HEAD) != 0)
1523 				continue;
1524 
1525 			default_branch = target;
1526 			break;
1527 		}
1528 	}
1529 
1530 	/* Create got.conf(5). */
1531 	err = create_gotconfig(proto, host, port, remote_repo_path,
1532 	    default_branch, fetch_all_branches, wanted_branches,
1533 	    wanted_refs, mirror_references, repo);
1534 	if (err)
1535 		return err;
1536 
1537 	/* Create a config file Git can understand. */
1538 	return create_gitconfig(git_url, default_branch, fetch_all_branches,
1539 	    wanted_branches, wanted_refs, mirror_references, repo);
1540 }
1541 
1542 static const struct got_error *
1543 cmd_clone(int argc, char *argv[])
1544 {
1545 	const struct got_error *error = NULL;
1546 	const char *uri, *dirname;
1547 	char *proto, *host, *port, *repo_name, *server_path;
1548 	char *default_destdir = NULL, *id_str = NULL;
1549 	const char *repo_path;
1550 	struct got_repository *repo = NULL;
1551 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1552 	struct got_pathlist_entry *pe;
1553 	struct got_object_id *pack_hash = NULL;
1554 	int ch, fetchfd = -1, fetchstatus;
1555 	pid_t fetchpid = -1;
1556 	struct got_fetch_progress_arg fpa;
1557 	char *git_url = NULL;
1558 	int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1559 	int bflag = 0, list_refs_only = 0;
1560 	int *pack_fds = NULL;
1561 
1562 	TAILQ_INIT(&refs);
1563 	TAILQ_INIT(&symrefs);
1564 	TAILQ_INIT(&wanted_branches);
1565 	TAILQ_INIT(&wanted_refs);
1566 
1567 	while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1568 		switch (ch) {
1569 		case 'a':
1570 			fetch_all_branches = 1;
1571 			break;
1572 		case 'b':
1573 			error = got_pathlist_append(&wanted_branches,
1574 			    optarg, NULL);
1575 			if (error)
1576 				return error;
1577 			bflag = 1;
1578 			break;
1579 		case 'l':
1580 			list_refs_only = 1;
1581 			break;
1582 		case 'm':
1583 			mirror_references = 1;
1584 			break;
1585 		case 'q':
1586 			verbosity = -1;
1587 			break;
1588 		case 'R':
1589 			error = got_pathlist_append(&wanted_refs,
1590 			    optarg, NULL);
1591 			if (error)
1592 				return error;
1593 			break;
1594 		case 'v':
1595 			if (verbosity < 0)
1596 				verbosity = 0;
1597 			else if (verbosity < 3)
1598 				verbosity++;
1599 			break;
1600 		default:
1601 			usage_clone();
1602 			break;
1603 		}
1604 	}
1605 	argc -= optind;
1606 	argv += optind;
1607 
1608 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1609 		option_conflict('a', 'b');
1610 	if (list_refs_only) {
1611 		if (!TAILQ_EMPTY(&wanted_branches))
1612 			option_conflict('l', 'b');
1613 		if (fetch_all_branches)
1614 			option_conflict('l', 'a');
1615 		if (mirror_references)
1616 			option_conflict('l', 'm');
1617 		if (!TAILQ_EMPTY(&wanted_refs))
1618 			option_conflict('l', 'R');
1619 	}
1620 
1621 	uri = argv[0];
1622 
1623 	if (argc == 1)
1624 		dirname = NULL;
1625 	else if (argc == 2)
1626 		dirname = argv[1];
1627 	else
1628 		usage_clone();
1629 
1630 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1631 	    &repo_name, uri);
1632 	if (error)
1633 		goto done;
1634 
1635 	if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1636 	    host, port ? ":" : "", port ? port : "",
1637 	    server_path[0] != '/' ? "/" : "", server_path) == -1) {
1638 		error = got_error_from_errno("asprintf");
1639 		goto done;
1640 	}
1641 
1642 	if (strcmp(proto, "git") == 0) {
1643 #ifndef PROFILE
1644 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1645 		    "sendfd dns inet unveil", NULL) == -1)
1646 			err(1, "pledge");
1647 #endif
1648 	} else if (strcmp(proto, "git+ssh") == 0 ||
1649 	    strcmp(proto, "ssh") == 0 ||
1650 	    strcmp(proto, "git+http") == 0 ||
1651 	    strcmp(proto, "http") == 0 ||
1652 	    strcmp(proto, "git+https") == 0 ||
1653 	    strcmp(proto, "https") == 0) {
1654 #ifndef PROFILE
1655 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1656 		    "sendfd unveil", NULL) == -1)
1657 			err(1, "pledge");
1658 #endif
1659 	} else {
1660 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1661 		goto done;
1662 	}
1663 	if (dirname == NULL) {
1664 		if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1665 			error = got_error_from_errno("asprintf");
1666 			goto done;
1667 		}
1668 		repo_path = default_destdir;
1669 	} else
1670 		repo_path = dirname;
1671 
1672 	if (!list_refs_only) {
1673 		error = got_path_mkdir(repo_path);
1674 		if (error &&
1675 		    (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1676 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1677 			goto done;
1678 		if (!got_path_dir_is_empty(repo_path)) {
1679 			error = got_error_path(repo_path,
1680 			    GOT_ERR_DIR_NOT_EMPTY);
1681 			goto done;
1682 		}
1683 	}
1684 
1685 	error = got_dial_apply_unveil(proto);
1686 	if (error)
1687 		goto done;
1688 
1689 	error = apply_unveil(repo_path, 0, NULL);
1690 	if (error)
1691 		goto done;
1692 
1693 	if (verbosity >= 0)
1694 		printf("Connecting to %s\n", git_url);
1695 
1696 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1697 	    server_path, verbosity);
1698 	if (error)
1699 		goto done;
1700 
1701 #ifndef PROFILE
1702 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd",
1703 	     NULL) == -1)
1704 		err(1, "pledge");
1705 #endif
1706 	if (!list_refs_only) {
1707 		error = got_repo_init(repo_path, NULL);
1708 		if (error)
1709 			goto done;
1710 		error = got_repo_pack_fds_open(&pack_fds);
1711 		if (error != NULL)
1712 			goto done;
1713 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1714 		if (error)
1715 			goto done;
1716 	}
1717 
1718 	fpa.last_scaled_size[0] = '\0';
1719 	fpa.last_p_indexed = -1;
1720 	fpa.last_p_resolved = -1;
1721 	fpa.verbosity = verbosity;
1722 	fpa.create_configs = 1;
1723 	fpa.configs_created = 0;
1724 	fpa.repo = repo;
1725 	fpa.config_info.symrefs = &symrefs;
1726 	fpa.config_info.wanted_branches = &wanted_branches;
1727 	fpa.config_info.wanted_refs = &wanted_refs;
1728 	fpa.config_info.proto = proto;
1729 	fpa.config_info.host = host;
1730 	fpa.config_info.port = port;
1731 	fpa.config_info.remote_repo_path = server_path;
1732 	fpa.config_info.git_url = git_url;
1733 	fpa.config_info.fetch_all_branches = fetch_all_branches;
1734 	fpa.config_info.mirror_references = mirror_references;
1735 	error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1736 	    GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1737 	    fetch_all_branches, &wanted_branches, &wanted_refs,
1738 	    list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1739 	    fetch_progress, &fpa);
1740 	if (error)
1741 		goto done;
1742 
1743 	if (list_refs_only) {
1744 		error = list_remote_refs(&symrefs, &refs);
1745 		goto done;
1746 	}
1747 
1748 	if (pack_hash == NULL) {
1749 		error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1750 		    "server sent an empty pack file");
1751 		goto done;
1752 	}
1753 	error = got_object_id_str(&id_str, pack_hash);
1754 	if (error)
1755 		goto done;
1756 	if (verbosity >= 0)
1757 		printf("\nFetched %s.pack\n", id_str);
1758 	free(id_str);
1759 
1760 	/* Set up references provided with the pack file. */
1761 	TAILQ_FOREACH(pe, &refs, entry) {
1762 		const char *refname = pe->path;
1763 		struct got_object_id *id = pe->data;
1764 		char *remote_refname;
1765 
1766 		if (is_wanted_ref(&wanted_refs, refname) &&
1767 		    !mirror_references) {
1768 			error = create_wanted_ref(refname, id,
1769 			    GOT_FETCH_DEFAULT_REMOTE_NAME,
1770 			    verbosity - 1, repo);
1771 			if (error)
1772 				goto done;
1773 			continue;
1774 		}
1775 
1776 		error = create_ref(refname, id, verbosity - 1, repo);
1777 		if (error)
1778 			goto done;
1779 
1780 		if (mirror_references)
1781 			continue;
1782 
1783 		if (strncmp("refs/heads/", refname, 11) != 0)
1784 			continue;
1785 
1786 		if (asprintf(&remote_refname,
1787 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1788 		    refname + 11) == -1) {
1789 			error = got_error_from_errno("asprintf");
1790 			goto done;
1791 		}
1792 		error = create_ref(remote_refname, id, verbosity - 1, repo);
1793 		free(remote_refname);
1794 		if (error)
1795 			goto done;
1796 	}
1797 
1798 	/* Set the HEAD reference if the server provided one. */
1799 	TAILQ_FOREACH(pe, &symrefs, entry) {
1800 		struct got_reference *target_ref;
1801 		const char *refname = pe->path;
1802 		const char *target = pe->data;
1803 		char *remote_refname = NULL, *remote_target = NULL;
1804 
1805 		if (strcmp(refname, GOT_REF_HEAD) != 0)
1806 			continue;
1807 
1808 		error = got_ref_open(&target_ref, repo, target, 0);
1809 		if (error) {
1810 			if (error->code == GOT_ERR_NOT_REF) {
1811 				error = NULL;
1812 				continue;
1813 			}
1814 			goto done;
1815 		}
1816 
1817 		error = create_symref(refname, target_ref, verbosity, repo);
1818 		got_ref_close(target_ref);
1819 		if (error)
1820 			goto done;
1821 
1822 		if (mirror_references)
1823 			continue;
1824 
1825 		if (strncmp("refs/heads/", target, 11) != 0)
1826 			continue;
1827 
1828 		if (asprintf(&remote_refname,
1829 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1830 		    refname) == -1) {
1831 			error = got_error_from_errno("asprintf");
1832 			goto done;
1833 		}
1834 		if (asprintf(&remote_target,
1835 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1836 		    target + 11) == -1) {
1837 			error = got_error_from_errno("asprintf");
1838 			free(remote_refname);
1839 			goto done;
1840 		}
1841 		error = got_ref_open(&target_ref, repo, remote_target, 0);
1842 		if (error) {
1843 			free(remote_refname);
1844 			free(remote_target);
1845 			if (error->code == GOT_ERR_NOT_REF) {
1846 				error = NULL;
1847 				continue;
1848 			}
1849 			goto done;
1850 		}
1851 		error = create_symref(remote_refname, target_ref,
1852 		    verbosity - 1, repo);
1853 		free(remote_refname);
1854 		free(remote_target);
1855 		got_ref_close(target_ref);
1856 		if (error)
1857 			goto done;
1858 	}
1859 	if (pe == NULL) {
1860 		/*
1861 		 * We failed to set the HEAD reference. If we asked for
1862 		 * a set of wanted branches use the first of one of those
1863 		 * which could be fetched instead.
1864 		 */
1865 		TAILQ_FOREACH(pe, &wanted_branches, entry) {
1866 			const char *target = pe->path;
1867 			struct got_reference *target_ref;
1868 
1869 			error = got_ref_open(&target_ref, repo, target, 0);
1870 			if (error) {
1871 				if (error->code == GOT_ERR_NOT_REF) {
1872 					error = NULL;
1873 					continue;
1874 				}
1875 				goto done;
1876 			}
1877 
1878 			error = create_symref(GOT_REF_HEAD, target_ref,
1879 			    verbosity, repo);
1880 			got_ref_close(target_ref);
1881 			if (error)
1882 				goto done;
1883 			break;
1884 		}
1885 
1886 		if (!fpa.configs_created && pe != NULL) {
1887 			error = create_config_files(fpa.config_info.proto,
1888 			    fpa.config_info.host, fpa.config_info.port,
1889 			    fpa.config_info.remote_repo_path,
1890 			    fpa.config_info.git_url,
1891 			    fpa.config_info.fetch_all_branches,
1892 			    fpa.config_info.mirror_references,
1893 			    fpa.config_info.symrefs,
1894 			    fpa.config_info.wanted_branches,
1895 			    fpa.config_info.wanted_refs, fpa.repo);
1896 			if (error)
1897 				goto done;
1898 		}
1899 	}
1900 
1901 	if (verbosity >= 0)
1902 		printf("Created %s repository '%s'\n",
1903 		    mirror_references ? "mirrored" : "cloned", repo_path);
1904 done:
1905 	if (pack_fds) {
1906 		const struct got_error *pack_err =
1907 		    got_repo_pack_fds_close(pack_fds);
1908 		if (error == NULL)
1909 			error = pack_err;
1910 	}
1911 	if (fetchpid > 0) {
1912 		if (kill(fetchpid, SIGTERM) == -1)
1913 			error = got_error_from_errno("kill");
1914 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1915 			error = got_error_from_errno("waitpid");
1916 	}
1917 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1918 		error = got_error_from_errno("close");
1919 	if (repo) {
1920 		const struct got_error *close_err = got_repo_close(repo);
1921 		if (error == NULL)
1922 			error = close_err;
1923 	}
1924 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1925 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1926 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1927 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1928 	free(pack_hash);
1929 	free(proto);
1930 	free(host);
1931 	free(port);
1932 	free(server_path);
1933 	free(repo_name);
1934 	free(default_destdir);
1935 	free(git_url);
1936 	return error;
1937 }
1938 
1939 static const struct got_error *
1940 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1941     int replace_tags, int verbosity, struct got_repository *repo)
1942 {
1943 	const struct got_error *err = NULL;
1944 	char *new_id_str = NULL;
1945 	struct got_object_id *old_id = NULL;
1946 
1947 	err = got_object_id_str(&new_id_str, new_id);
1948 	if (err)
1949 		goto done;
1950 
1951 	if (!replace_tags &&
1952 	    strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1953 		err = got_ref_resolve(&old_id, repo, ref);
1954 		if (err)
1955 			goto done;
1956 		if (got_object_id_cmp(old_id, new_id) == 0)
1957 			goto done;
1958 		if (verbosity >= 0) {
1959 			printf("Rejecting update of existing tag %s: %s\n",
1960 			    got_ref_get_name(ref), new_id_str);
1961 		}
1962 		goto done;
1963 	}
1964 
1965 	if (got_ref_is_symbolic(ref)) {
1966 		if (verbosity >= 0) {
1967 			printf("Replacing reference %s: %s\n",
1968 			    got_ref_get_name(ref),
1969 			    got_ref_get_symref_target(ref));
1970 		}
1971 		err = got_ref_change_symref_to_ref(ref, new_id);
1972 		if (err)
1973 			goto done;
1974 		err = got_ref_write(ref, repo);
1975 		if (err)
1976 			goto done;
1977 	} else {
1978 		err = got_ref_resolve(&old_id, repo, ref);
1979 		if (err)
1980 			goto done;
1981 		if (got_object_id_cmp(old_id, new_id) == 0)
1982 			goto done;
1983 
1984 		err = got_ref_change_ref(ref, new_id);
1985 		if (err)
1986 			goto done;
1987 		err = got_ref_write(ref, repo);
1988 		if (err)
1989 			goto done;
1990 	}
1991 
1992 	if (verbosity >= 0)
1993 		printf("Updated %s: %s\n", got_ref_get_name(ref),
1994 		    new_id_str);
1995 done:
1996 	free(old_id);
1997 	free(new_id_str);
1998 	return err;
1999 }
2000 
2001 static const struct got_error *
2002 update_symref(const char *refname, struct got_reference *target_ref,
2003     int verbosity, struct got_repository *repo)
2004 {
2005 	const struct got_error *err = NULL, *unlock_err;
2006 	struct got_reference *symref;
2007 	int symref_is_locked = 0;
2008 
2009 	err = got_ref_open(&symref, repo, refname, 1);
2010 	if (err) {
2011 		if (err->code != GOT_ERR_NOT_REF)
2012 			return err;
2013 		err = got_ref_alloc_symref(&symref, refname, target_ref);
2014 		if (err)
2015 			goto done;
2016 
2017 		err = got_ref_write(symref, repo);
2018 		if (err)
2019 			goto done;
2020 
2021 		if (verbosity >= 0)
2022 			printf("Created reference %s: %s\n",
2023 			    got_ref_get_name(symref),
2024 			    got_ref_get_symref_target(symref));
2025 	} else {
2026 		symref_is_locked = 1;
2027 
2028 		if (strcmp(got_ref_get_symref_target(symref),
2029 		    got_ref_get_name(target_ref)) == 0)
2030 			goto done;
2031 
2032 		err = got_ref_change_symref(symref,
2033 		    got_ref_get_name(target_ref));
2034 		if (err)
2035 			goto done;
2036 
2037 		err = got_ref_write(symref, repo);
2038 		if (err)
2039 			goto done;
2040 
2041 		if (verbosity >= 0)
2042 			printf("Updated %s: %s\n", got_ref_get_name(symref),
2043 			    got_ref_get_symref_target(symref));
2044 
2045 	}
2046 done:
2047 	if (symref_is_locked) {
2048 		unlock_err = got_ref_unlock(symref);
2049 		if (unlock_err && err == NULL)
2050 			err = unlock_err;
2051 	}
2052 	got_ref_close(symref);
2053 	return err;
2054 }
2055 
2056 __dead static void
2057 usage_fetch(void)
2058 {
2059 	fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2060 	    "[-R reference] [-r repository-path] [remote-repository]\n",
2061 	    getprogname());
2062 	exit(1);
2063 }
2064 
2065 static const struct got_error *
2066 delete_missing_ref(struct got_reference *ref,
2067     int verbosity, struct got_repository *repo)
2068 {
2069 	const struct got_error *err = NULL;
2070 	struct got_object_id *id = NULL;
2071 	char *id_str = NULL;
2072 
2073 	if (got_ref_is_symbolic(ref)) {
2074 		err = got_ref_delete(ref, repo);
2075 		if (err)
2076 			return err;
2077 		if (verbosity >= 0) {
2078 			printf("Deleted %s: %s\n",
2079 			    got_ref_get_name(ref),
2080 			    got_ref_get_symref_target(ref));
2081 		}
2082 	} else {
2083 		err = got_ref_resolve(&id, repo, ref);
2084 		if (err)
2085 			return err;
2086 		err = got_object_id_str(&id_str, id);
2087 		if (err)
2088 			goto done;
2089 
2090 		err = got_ref_delete(ref, repo);
2091 		if (err)
2092 			goto done;
2093 		if (verbosity >= 0) {
2094 			printf("Deleted %s: %s\n",
2095 			    got_ref_get_name(ref), id_str);
2096 		}
2097 	}
2098 done:
2099 	free(id);
2100 	free(id_str);
2101 	return err;
2102 }
2103 
2104 static const struct got_error *
2105 delete_missing_refs(struct got_pathlist_head *their_refs,
2106     struct got_pathlist_head *their_symrefs,
2107     const struct got_remote_repo *remote,
2108     int verbosity, struct got_repository *repo)
2109 {
2110 	const struct got_error *err = NULL, *unlock_err;
2111 	struct got_reflist_head my_refs;
2112 	struct got_reflist_entry *re;
2113 	struct got_pathlist_entry *pe;
2114 	char *remote_namespace = NULL;
2115 	char *local_refname = NULL;
2116 
2117 	TAILQ_INIT(&my_refs);
2118 
2119 	if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2120 	    == -1)
2121 		return got_error_from_errno("asprintf");
2122 
2123 	err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2124 	if (err)
2125 		goto done;
2126 
2127 	TAILQ_FOREACH(re, &my_refs, entry) {
2128 		const char *refname = got_ref_get_name(re->ref);
2129 		const char *their_refname;
2130 
2131 		if (remote->mirror_references) {
2132 			their_refname = refname;
2133 		} else {
2134 			if (strncmp(refname, remote_namespace,
2135 			    strlen(remote_namespace)) == 0) {
2136 				if (strcmp(refname + strlen(remote_namespace),
2137 				    GOT_REF_HEAD) == 0)
2138 					continue;
2139 				if (asprintf(&local_refname, "refs/heads/%s",
2140 				    refname + strlen(remote_namespace)) == -1) {
2141 					err = got_error_from_errno("asprintf");
2142 					goto done;
2143 				}
2144 			} else if (strncmp(refname, "refs/tags/", 10) != 0)
2145 				continue;
2146 
2147 			their_refname = local_refname;
2148 		}
2149 
2150 		TAILQ_FOREACH(pe, their_refs, entry) {
2151 			if (strcmp(their_refname, pe->path) == 0)
2152 				break;
2153 		}
2154 		if (pe != NULL)
2155 			continue;
2156 
2157 		TAILQ_FOREACH(pe, their_symrefs, entry) {
2158 			if (strcmp(their_refname, pe->path) == 0)
2159 				break;
2160 		}
2161 		if (pe != NULL)
2162 			continue;
2163 
2164 		err = delete_missing_ref(re->ref, verbosity, repo);
2165 		if (err)
2166 			break;
2167 
2168 		if (local_refname) {
2169 			struct got_reference *ref;
2170 			err = got_ref_open(&ref, repo, local_refname, 1);
2171 			if (err) {
2172 				if (err->code != GOT_ERR_NOT_REF)
2173 					break;
2174 				free(local_refname);
2175 				local_refname = NULL;
2176 				continue;
2177 			}
2178 			err = delete_missing_ref(ref, verbosity, repo);
2179 			if (err)
2180 				break;
2181 			unlock_err = got_ref_unlock(ref);
2182 			got_ref_close(ref);
2183 			if (unlock_err && err == NULL) {
2184 				err = unlock_err;
2185 				break;
2186 			}
2187 
2188 			free(local_refname);
2189 			local_refname = NULL;
2190 		}
2191 	}
2192 done:
2193 	got_ref_list_free(&my_refs);
2194 	free(remote_namespace);
2195 	free(local_refname);
2196 	return err;
2197 }
2198 
2199 static const struct got_error *
2200 update_wanted_ref(const char *refname, struct got_object_id *id,
2201     const char *remote_repo_name, int verbosity, struct got_repository *repo)
2202 {
2203 	const struct got_error *err, *unlock_err;
2204 	char *remote_refname;
2205 	struct got_reference *ref;
2206 
2207 	if (strncmp("refs/", refname, 5) == 0)
2208 		refname += 5;
2209 
2210 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2211 	    remote_repo_name, refname) == -1)
2212 		return got_error_from_errno("asprintf");
2213 
2214 	err = got_ref_open(&ref, repo, remote_refname, 1);
2215 	if (err) {
2216 		if (err->code != GOT_ERR_NOT_REF)
2217 			goto done;
2218 		err = create_ref(remote_refname, id, verbosity, repo);
2219 	} else {
2220 		err = update_ref(ref, id, 0, verbosity, repo);
2221 		unlock_err = got_ref_unlock(ref);
2222 		if (unlock_err && err == NULL)
2223 			err = unlock_err;
2224 		got_ref_close(ref);
2225 	}
2226 done:
2227 	free(remote_refname);
2228 	return err;
2229 }
2230 
2231 static const struct got_error *
2232 delete_ref(struct got_repository *repo, struct got_reference *ref)
2233 {
2234 	const struct got_error *err = NULL;
2235 	struct got_object_id *id = NULL;
2236 	char *id_str = NULL;
2237 	const char *target;
2238 
2239 	if (got_ref_is_symbolic(ref)) {
2240 		target = got_ref_get_symref_target(ref);
2241 	} else {
2242 		err = got_ref_resolve(&id, repo, ref);
2243 		if (err)
2244 			goto done;
2245 		err = got_object_id_str(&id_str, id);
2246 		if (err)
2247 			goto done;
2248 		target = id_str;
2249 	}
2250 
2251 	err = got_ref_delete(ref, repo);
2252 	if (err)
2253 		goto done;
2254 
2255 	printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2256 done:
2257 	free(id);
2258 	free(id_str);
2259 	return err;
2260 }
2261 
2262 static const struct got_error *
2263 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2264 {
2265 	const struct got_error *err = NULL;
2266 	struct got_reflist_head refs;
2267 	struct got_reflist_entry *re;
2268 	char *prefix;
2269 
2270 	TAILQ_INIT(&refs);
2271 
2272 	if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2273 		err = got_error_from_errno("asprintf");
2274 		goto done;
2275 	}
2276 	err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2277 	if (err)
2278 		goto done;
2279 
2280 	TAILQ_FOREACH(re, &refs, entry)
2281 		delete_ref(repo, re->ref);
2282 done:
2283 	got_ref_list_free(&refs);
2284 	return err;
2285 }
2286 
2287 static const struct got_error *
2288 cmd_fetch(int argc, char *argv[])
2289 {
2290 	const struct got_error *error = NULL, *unlock_err;
2291 	char *cwd = NULL, *repo_path = NULL;
2292 	const char *remote_name;
2293 	char *proto = NULL, *host = NULL, *port = NULL;
2294 	char *repo_name = NULL, *server_path = NULL;
2295 	const struct got_remote_repo *remotes;
2296 	struct got_remote_repo *remote = NULL;
2297 	int nremotes;
2298 	char *id_str = NULL;
2299 	struct got_repository *repo = NULL;
2300 	struct got_worktree *worktree = NULL;
2301 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2302 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2303 	char *head_refname = NULL;
2304 	struct got_pathlist_entry *pe;
2305 	struct got_reflist_head remote_refs;
2306 	struct got_reflist_entry *re;
2307 	struct got_object_id *pack_hash = NULL;
2308 	int i, ch, fetchfd = -1, fetchstatus;
2309 	pid_t fetchpid = -1;
2310 	struct got_fetch_progress_arg fpa;
2311 	int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2312 	int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2313 	int *pack_fds = NULL, have_bflag = 0;
2314 	const char *remote_head = NULL, *worktree_branch = NULL;
2315 
2316 	TAILQ_INIT(&refs);
2317 	TAILQ_INIT(&symrefs);
2318 	TAILQ_INIT(&remote_refs);
2319 	TAILQ_INIT(&wanted_branches);
2320 	TAILQ_INIT(&wanted_refs);
2321 
2322 	while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2323 		switch (ch) {
2324 		case 'a':
2325 			fetch_all_branches = 1;
2326 			break;
2327 		case 'b':
2328 			error = got_pathlist_append(&wanted_branches,
2329 			    optarg, NULL);
2330 			if (error)
2331 				return error;
2332 			have_bflag = 1;
2333 			break;
2334 		case 'd':
2335 			delete_refs = 1;
2336 			break;
2337 		case 'l':
2338 			list_refs_only = 1;
2339 			break;
2340 		case 'q':
2341 			verbosity = -1;
2342 			break;
2343 		case 'R':
2344 			error = got_pathlist_append(&wanted_refs,
2345 			    optarg, NULL);
2346 			if (error)
2347 				return error;
2348 			break;
2349 		case 'r':
2350 			repo_path = realpath(optarg, NULL);
2351 			if (repo_path == NULL)
2352 				return got_error_from_errno2("realpath",
2353 				    optarg);
2354 			got_path_strip_trailing_slashes(repo_path);
2355 			break;
2356 		case 't':
2357 			replace_tags = 1;
2358 			break;
2359 		case 'v':
2360 			if (verbosity < 0)
2361 				verbosity = 0;
2362 			else if (verbosity < 3)
2363 				verbosity++;
2364 			break;
2365 		case 'X':
2366 			delete_remote = 1;
2367 			break;
2368 		default:
2369 			usage_fetch();
2370 			break;
2371 		}
2372 	}
2373 	argc -= optind;
2374 	argv += optind;
2375 
2376 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2377 		option_conflict('a', 'b');
2378 	if (list_refs_only) {
2379 		if (!TAILQ_EMPTY(&wanted_branches))
2380 			option_conflict('l', 'b');
2381 		if (fetch_all_branches)
2382 			option_conflict('l', 'a');
2383 		if (delete_refs)
2384 			option_conflict('l', 'd');
2385 		if (delete_remote)
2386 			option_conflict('l', 'X');
2387 	}
2388 	if (delete_remote) {
2389 		if (fetch_all_branches)
2390 			option_conflict('X', 'a');
2391 		if (!TAILQ_EMPTY(&wanted_branches))
2392 			option_conflict('X', 'b');
2393 		if (delete_refs)
2394 			option_conflict('X', 'd');
2395 		if (replace_tags)
2396 			option_conflict('X', 't');
2397 		if (!TAILQ_EMPTY(&wanted_refs))
2398 			option_conflict('X', 'R');
2399 	}
2400 
2401 	if (argc == 0) {
2402 		if (delete_remote)
2403 			errx(1, "-X option requires a remote name");
2404 		remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2405 	} else if (argc == 1)
2406 		remote_name = argv[0];
2407 	else
2408 		usage_fetch();
2409 
2410 	cwd = getcwd(NULL, 0);
2411 	if (cwd == NULL) {
2412 		error = got_error_from_errno("getcwd");
2413 		goto done;
2414 	}
2415 
2416 	error = got_repo_pack_fds_open(&pack_fds);
2417 	if (error != NULL)
2418 		goto done;
2419 
2420 	if (repo_path == NULL) {
2421 		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
2422 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
2423 			goto done;
2424 		else
2425 			error = NULL;
2426 		if (worktree) {
2427 			repo_path =
2428 			    strdup(got_worktree_get_repo_path(worktree));
2429 			if (repo_path == NULL)
2430 				error = got_error_from_errno("strdup");
2431 			if (error)
2432 				goto done;
2433 		} else {
2434 			repo_path = strdup(cwd);
2435 			if (repo_path == NULL) {
2436 				error = got_error_from_errno("strdup");
2437 				goto done;
2438 			}
2439 		}
2440 	}
2441 
2442 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2443 	if (error)
2444 		goto done;
2445 
2446 	if (delete_remote) {
2447 		error = delete_refs_for_remote(repo, remote_name);
2448 		goto done; /* nothing else to do */
2449 	}
2450 
2451 	if (worktree) {
2452 		worktree_conf = got_worktree_get_gotconfig(worktree);
2453 		if (worktree_conf) {
2454 			got_gotconfig_get_remotes(&nremotes, &remotes,
2455 			    worktree_conf);
2456 			for (i = 0; i < nremotes; i++) {
2457 				if (strcmp(remotes[i].name, remote_name) == 0) {
2458 					error = got_repo_remote_repo_dup(&remote,
2459 					    &remotes[i]);
2460 					if (error)
2461 						goto done;
2462 					break;
2463 				}
2464 			}
2465 		}
2466 	}
2467 	if (remote == NULL) {
2468 		repo_conf = got_repo_get_gotconfig(repo);
2469 		if (repo_conf) {
2470 			got_gotconfig_get_remotes(&nremotes, &remotes,
2471 			    repo_conf);
2472 			for (i = 0; i < nremotes; i++) {
2473 				if (strcmp(remotes[i].name, remote_name) == 0) {
2474 					error = got_repo_remote_repo_dup(&remote,
2475 					    &remotes[i]);
2476 					if (error)
2477 						goto done;
2478 					break;
2479 				}
2480 			}
2481 		}
2482 	}
2483 	if (remote == NULL) {
2484 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2485 		for (i = 0; i < nremotes; i++) {
2486 			if (strcmp(remotes[i].name, remote_name) == 0) {
2487 				error = got_repo_remote_repo_dup(&remote,
2488 				    &remotes[i]);
2489 				if (error)
2490 					goto done;
2491 				break;
2492 			}
2493 		}
2494 	}
2495 	if (remote == NULL) {
2496 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2497 		goto done;
2498 	}
2499 
2500 	if (TAILQ_EMPTY(&wanted_branches)) {
2501 		if (!fetch_all_branches)
2502 			fetch_all_branches = remote->fetch_all_branches;
2503 		for (i = 0; i < remote->nfetch_branches; i++) {
2504 			error = got_pathlist_append(&wanted_branches,
2505 			    remote->fetch_branches[i], NULL);
2506 			if (error)
2507 				goto done;
2508 		}
2509 	}
2510 	if (TAILQ_EMPTY(&wanted_refs)) {
2511 		for (i = 0; i < remote->nfetch_refs; i++) {
2512 			error = got_pathlist_append(&wanted_refs,
2513 			    remote->fetch_refs[i], NULL);
2514 			if (error)
2515 				goto done;
2516 		}
2517 	}
2518 
2519 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2520 	    &repo_name, remote->fetch_url);
2521 	if (error)
2522 		goto done;
2523 
2524 	if (strcmp(proto, "git") == 0) {
2525 #ifndef PROFILE
2526 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2527 		    "sendfd dns inet unveil", NULL) == -1)
2528 			err(1, "pledge");
2529 #endif
2530 	} else if (strcmp(proto, "git+ssh") == 0 ||
2531 	    strcmp(proto, "ssh") == 0 ||
2532 	    strcmp(proto, "git+http") == 0 ||
2533 	    strcmp(proto, "http") == 0 ||
2534 	    strcmp(proto, "git+https") == 0 ||
2535 	    strcmp(proto, "https") == 0) {
2536 #ifndef PROFILE
2537 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2538 		    "sendfd unveil", NULL) == -1)
2539 			err(1, "pledge");
2540 #endif
2541 	} else {
2542 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2543 		goto done;
2544 	}
2545 
2546 	error = got_dial_apply_unveil(proto);
2547 	if (error)
2548 		goto done;
2549 
2550 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2551 	if (error)
2552 		goto done;
2553 
2554 	if (worktree) {
2555 		head_refname = strdup(got_worktree_get_head_ref_name(worktree));
2556 		if (head_refname == NULL) {
2557 			error = got_error_from_errno("strdup");
2558 			goto done;
2559 		}
2560 
2561 		/* Release work tree lock. */
2562 		got_worktree_close(worktree);
2563 		worktree = NULL;
2564 	}
2565 
2566 	if (verbosity >= 0) {
2567 		printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2568 		    remote->name, proto, host,
2569 		    port ? ":" : "", port ? port : "",
2570 		    *server_path == '/' ? "" : "/", server_path);
2571 	}
2572 
2573 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2574 	    server_path, verbosity);
2575 	if (error)
2576 		goto done;
2577 #ifndef PROFILE
2578 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd",
2579 	     NULL) == -1)
2580 		err(1, "pledge");
2581 #endif
2582 	if (!have_bflag) {
2583 		/*
2584 		 * If set, get this remote's HEAD ref target so
2585 		 * if it has changed on the server we can fetch it.
2586 		 */
2587 		error = got_ref_list(&remote_refs, repo, "refs/remotes",
2588 		    got_ref_cmp_by_name, repo);
2589 		if (error)
2590 			goto done;
2591 
2592 		TAILQ_FOREACH(re, &remote_refs, entry) {
2593 			const char	*remote_refname, *remote_target;
2594 			size_t		 remote_name_len;
2595 
2596 			if (!got_ref_is_symbolic(re->ref))
2597 				continue;
2598 
2599 			remote_name_len = strlen(remote->name);
2600 			remote_refname = got_ref_get_name(re->ref);
2601 
2602 			/* we only want refs/remotes/$remote->name/HEAD */
2603 			if (strncmp(remote_refname + 13, remote->name,
2604 			    remote_name_len) != 0)
2605 				continue;
2606 
2607 			if (strcmp(remote_refname + remote_name_len + 14,
2608 			    GOT_REF_HEAD) != 0)
2609 				continue;
2610 
2611 			/*
2612 			 * Take the name itself because we already
2613 			 * only match with refs/heads/ in fetch_pack().
2614 			 */
2615 			remote_target = got_ref_get_symref_target(re->ref);
2616 			remote_head = remote_target + remote_name_len + 14;
2617 			break;
2618 		}
2619 
2620 		if (head_refname &&
2621 		    strncmp(head_refname, "refs/heads/", 11) == 0)
2622 			worktree_branch = head_refname;
2623 	}
2624 
2625 	fpa.last_scaled_size[0] = '\0';
2626 	fpa.last_p_indexed = -1;
2627 	fpa.last_p_resolved = -1;
2628 	fpa.verbosity = verbosity;
2629 	fpa.repo = repo;
2630 	fpa.create_configs = 0;
2631 	fpa.configs_created = 0;
2632 	memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2633 
2634 	error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2635 	    remote->mirror_references, fetch_all_branches, &wanted_branches,
2636 	    &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2637 	    worktree_branch, remote_head, have_bflag, fetch_progress, &fpa);
2638 	if (error)
2639 		goto done;
2640 
2641 	if (list_refs_only) {
2642 		error = list_remote_refs(&symrefs, &refs);
2643 		goto done;
2644 	}
2645 
2646 	if (pack_hash == NULL) {
2647 		if (verbosity >= 0)
2648 			printf("Already up-to-date\n");
2649 	} else if (verbosity >= 0) {
2650 		error = got_object_id_str(&id_str, pack_hash);
2651 		if (error)
2652 			goto done;
2653 		printf("\nFetched %s.pack\n", id_str);
2654 		free(id_str);
2655 		id_str = NULL;
2656 	}
2657 
2658 	/* Update references provided with the pack file. */
2659 	TAILQ_FOREACH(pe, &refs, entry) {
2660 		const char *refname = pe->path;
2661 		struct got_object_id *id = pe->data;
2662 		struct got_reference *ref;
2663 		char *remote_refname;
2664 
2665 		if (is_wanted_ref(&wanted_refs, refname) &&
2666 		    !remote->mirror_references) {
2667 			error = update_wanted_ref(refname, id,
2668 			    remote->name, verbosity, repo);
2669 			if (error)
2670 				goto done;
2671 			continue;
2672 		}
2673 
2674 		if (remote->mirror_references ||
2675 		    strncmp("refs/tags/", refname, 10) == 0) {
2676 			error = got_ref_open(&ref, repo, refname, 1);
2677 			if (error) {
2678 				if (error->code != GOT_ERR_NOT_REF)
2679 					goto done;
2680 				error = create_ref(refname, id, verbosity,
2681 				    repo);
2682 				if (error)
2683 					goto done;
2684 			} else {
2685 				error = update_ref(ref, id, replace_tags,
2686 				    verbosity, repo);
2687 				unlock_err = got_ref_unlock(ref);
2688 				if (unlock_err && error == NULL)
2689 					error = unlock_err;
2690 				got_ref_close(ref);
2691 				if (error)
2692 					goto done;
2693 			}
2694 		} else if (strncmp("refs/heads/", refname, 11) == 0) {
2695 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2696 			    remote_name, refname + 11) == -1) {
2697 				error = got_error_from_errno("asprintf");
2698 				goto done;
2699 			}
2700 
2701 			error = got_ref_open(&ref, repo, remote_refname, 1);
2702 			if (error) {
2703 				if (error->code != GOT_ERR_NOT_REF)
2704 					goto done;
2705 				error = create_ref(remote_refname, id,
2706 				    verbosity, repo);
2707 				if (error)
2708 					goto done;
2709 			} else {
2710 				error = update_ref(ref, id, replace_tags,
2711 				    verbosity, repo);
2712 				unlock_err = got_ref_unlock(ref);
2713 				if (unlock_err && error == NULL)
2714 					error = unlock_err;
2715 				got_ref_close(ref);
2716 				if (error)
2717 					goto done;
2718 			}
2719 
2720 			/* Also create a local branch if none exists yet. */
2721 			error = got_ref_open(&ref, repo, refname, 1);
2722 			if (error) {
2723 				if (error->code != GOT_ERR_NOT_REF)
2724 					goto done;
2725 				error = create_ref(refname, id, verbosity,
2726 				    repo);
2727 				if (error)
2728 					goto done;
2729 			} else {
2730 				unlock_err = got_ref_unlock(ref);
2731 				if (unlock_err && error == NULL)
2732 					error = unlock_err;
2733 				got_ref_close(ref);
2734 			}
2735 		}
2736 	}
2737 	if (delete_refs) {
2738 		error = delete_missing_refs(&refs, &symrefs, remote,
2739 		    verbosity, repo);
2740 		if (error)
2741 			goto done;
2742 	}
2743 
2744 	if (!remote->mirror_references) {
2745 		/* Update remote HEAD reference if the server provided one. */
2746 		TAILQ_FOREACH(pe, &symrefs, entry) {
2747 			struct got_reference *target_ref;
2748 			const char *refname = pe->path;
2749 			const char *target = pe->data;
2750 			char *remote_refname = NULL, *remote_target = NULL;
2751 
2752 			if (strcmp(refname, GOT_REF_HEAD) != 0)
2753 				continue;
2754 
2755 			if (strncmp("refs/heads/", target, 11) != 0)
2756 				continue;
2757 
2758 			if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2759 			    remote->name, refname) == -1) {
2760 				error = got_error_from_errno("asprintf");
2761 				goto done;
2762 			}
2763 			if (asprintf(&remote_target, "refs/remotes/%s/%s",
2764 			    remote->name, target + 11) == -1) {
2765 				error = got_error_from_errno("asprintf");
2766 				free(remote_refname);
2767 				goto done;
2768 			}
2769 
2770 			error = got_ref_open(&target_ref, repo, remote_target,
2771 			    0);
2772 			if (error) {
2773 				free(remote_refname);
2774 				free(remote_target);
2775 				if (error->code == GOT_ERR_NOT_REF) {
2776 					error = NULL;
2777 					continue;
2778 				}
2779 				goto done;
2780 			}
2781 			error = update_symref(remote_refname, target_ref,
2782 			    verbosity, repo);
2783 			free(remote_refname);
2784 			free(remote_target);
2785 			got_ref_close(target_ref);
2786 			if (error)
2787 				goto done;
2788 		}
2789 	}
2790 done:
2791 	if (fetchpid > 0) {
2792 		if (kill(fetchpid, SIGTERM) == -1)
2793 			error = got_error_from_errno("kill");
2794 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2795 			error = got_error_from_errno("waitpid");
2796 	}
2797 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2798 		error = got_error_from_errno("close");
2799 	if (repo) {
2800 		const struct got_error *close_err = got_repo_close(repo);
2801 		if (error == NULL)
2802 			error = close_err;
2803 	}
2804 	if (worktree)
2805 		got_worktree_close(worktree);
2806 	if (pack_fds) {
2807 		const struct got_error *pack_err =
2808 		    got_repo_pack_fds_close(pack_fds);
2809 		if (error == NULL)
2810 			error = pack_err;
2811 	}
2812 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
2813 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
2814 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2815 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2816 	got_ref_list_free(&remote_refs);
2817 	got_repo_free_remote_repo_data(remote);
2818 	free(remote);
2819 	free(head_refname);
2820 	free(id_str);
2821 	free(cwd);
2822 	free(repo_path);
2823 	free(pack_hash);
2824 	free(proto);
2825 	free(host);
2826 	free(port);
2827 	free(server_path);
2828 	free(repo_name);
2829 	return error;
2830 }
2831 
2832 
2833 __dead static void
2834 usage_checkout(void)
2835 {
2836 	fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2837 	    "[-p path-prefix] repository-path [work-tree-path]\n",
2838 	    getprogname());
2839 	exit(1);
2840 }
2841 
2842 static void
2843 show_worktree_base_ref_warning(void)
2844 {
2845 	fprintf(stderr, "%s: warning: could not create a reference "
2846 	    "to the work tree's base commit; the commit could be "
2847 	    "garbage-collected by Git or 'gotadmin cleanup'; making the "
2848 	    "repository writable and running 'got update' will prevent this\n",
2849 	    getprogname());
2850 }
2851 
2852 struct got_checkout_progress_arg {
2853 	const char *worktree_path;
2854 	int had_base_commit_ref_error;
2855 	int verbosity;
2856 };
2857 
2858 static const struct got_error *
2859 checkout_progress(void *arg, unsigned char status, const char *path)
2860 {
2861 	struct got_checkout_progress_arg *a = arg;
2862 
2863 	/* Base commit bump happens silently. */
2864 	if (status == GOT_STATUS_BUMP_BASE)
2865 		return NULL;
2866 
2867 	if (status == GOT_STATUS_BASE_REF_ERR) {
2868 		a->had_base_commit_ref_error = 1;
2869 		return NULL;
2870 	}
2871 
2872 	while (path[0] == '/')
2873 		path++;
2874 
2875 	if (a->verbosity >= 0)
2876 		printf("%c  %s/%s\n", status, a->worktree_path, path);
2877 
2878 	return NULL;
2879 }
2880 
2881 static const struct got_error *
2882 check_cancelled(void *arg)
2883 {
2884 	if (sigint_received || sigpipe_received)
2885 		return got_error(GOT_ERR_CANCELLED);
2886 	return NULL;
2887 }
2888 
2889 static const struct got_error *
2890 check_linear_ancestry(struct got_object_id *commit_id,
2891     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2892     struct got_repository *repo)
2893 {
2894 	const struct got_error *err = NULL;
2895 	struct got_object_id *yca_id;
2896 
2897 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2898 	    commit_id, base_commit_id, 1, 0, repo, check_cancelled, NULL);
2899 	if (err)
2900 		return err;
2901 
2902 	if (yca_id == NULL)
2903 		return got_error(GOT_ERR_ANCESTRY);
2904 
2905 	/*
2906 	 * Require a straight line of history between the target commit
2907 	 * and the work tree's base commit.
2908 	 *
2909 	 * Non-linear situations such as this require a rebase:
2910 	 *
2911 	 * (commit) D       F (base_commit)
2912 	 *           \     /
2913 	 *            C   E
2914 	 *             \ /
2915 	 *              B (yca)
2916 	 *              |
2917 	 *              A
2918 	 *
2919 	 * 'got update' only handles linear cases:
2920 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
2921 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
2922 	 */
2923 	if (allow_forwards_in_time_only) {
2924 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2925 		return got_error(GOT_ERR_ANCESTRY);
2926 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2927 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
2928 		return got_error(GOT_ERR_ANCESTRY);
2929 
2930 	free(yca_id);
2931 	return NULL;
2932 }
2933 
2934 static const struct got_error *
2935 check_same_branch(struct got_object_id *commit_id,
2936     struct got_reference *head_ref, struct got_repository *repo)
2937 {
2938 	const struct got_error *err = NULL;
2939 	struct got_commit_graph *graph = NULL;
2940 	struct got_object_id *head_commit_id = NULL;
2941 
2942 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
2943 	if (err)
2944 		goto done;
2945 
2946 	if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2947 		goto done;
2948 
2949 	err = got_commit_graph_open(&graph, "/", 1);
2950 	if (err)
2951 		goto done;
2952 
2953 	err = got_commit_graph_bfsort(graph, head_commit_id, repo,
2954 	    check_cancelled, NULL);
2955 	if (err)
2956 		goto done;
2957 
2958 	for (;;) {
2959 		struct got_object_id id;
2960 
2961 		err = got_commit_graph_iter_next(&id, graph, repo,
2962 		    check_cancelled, NULL);
2963 		if (err) {
2964 			if (err->code == GOT_ERR_ITER_COMPLETED)
2965 				err = got_error(GOT_ERR_ANCESTRY);
2966 			break;
2967 		}
2968 
2969 		if (got_object_id_cmp(&id, commit_id) == 0)
2970 			break;
2971 	}
2972 done:
2973 	if (graph)
2974 		got_commit_graph_close(graph);
2975 	free(head_commit_id);
2976 	return err;
2977 }
2978 
2979 static const struct got_error *
2980 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2981 {
2982 	static char msg[512];
2983 	const char *branch_name;
2984 
2985 	if (got_ref_is_symbolic(ref))
2986 		branch_name = got_ref_get_symref_target(ref);
2987 	else
2988 		branch_name = got_ref_get_name(ref);
2989 
2990 	if (strncmp("refs/heads/", branch_name, 11) == 0)
2991 		branch_name += 11;
2992 
2993 	snprintf(msg, sizeof(msg),
2994 	    "target commit is not contained in branch '%s'; "
2995 	    "the branch to use must be specified with -b; "
2996 	    "if necessary a new branch can be created for "
2997 	    "this commit with 'got branch -c %s BRANCH_NAME'",
2998 	    branch_name, commit_id_str);
2999 
3000 	return got_error_msg(GOT_ERR_ANCESTRY, msg);
3001 }
3002 
3003 static const struct got_error *
3004 cmd_checkout(int argc, char *argv[])
3005 {
3006 	const struct got_error *close_err, *error = NULL;
3007 	struct got_repository *repo = NULL;
3008 	struct got_reference *head_ref = NULL, *ref = NULL;
3009 	struct got_worktree *worktree = NULL;
3010 	char *repo_path = NULL;
3011 	char *worktree_path = NULL;
3012 	const char *path_prefix = "";
3013 	const char *branch_name = GOT_REF_HEAD, *refname = NULL;
3014 	char *commit_id_str = NULL, *keyword_idstr = NULL;
3015 	struct got_object_id *commit_id = NULL;
3016 	char *cwd = NULL;
3017 	int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
3018 	struct got_pathlist_head paths;
3019 	struct got_checkout_progress_arg cpa;
3020 	int *pack_fds = NULL;
3021 
3022 	TAILQ_INIT(&paths);
3023 
3024 #ifndef PROFILE
3025 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3026 	    "unveil", NULL) == -1)
3027 		err(1, "pledge");
3028 #endif
3029 
3030 	while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
3031 		switch (ch) {
3032 		case 'b':
3033 			branch_name = optarg;
3034 			break;
3035 		case 'c':
3036 			commit_id_str = strdup(optarg);
3037 			if (commit_id_str == NULL)
3038 				return got_error_from_errno("strdup");
3039 			break;
3040 		case 'E':
3041 			allow_nonempty = 1;
3042 			break;
3043 		case 'p':
3044 			path_prefix = optarg;
3045 			break;
3046 		case 'q':
3047 			verbosity = -1;
3048 			break;
3049 		default:
3050 			usage_checkout();
3051 			/* NOTREACHED */
3052 		}
3053 	}
3054 
3055 	argc -= optind;
3056 	argv += optind;
3057 
3058 	if (argc == 1) {
3059 		char *base, *dotgit;
3060 		const char *path;
3061 		repo_path = realpath(argv[0], NULL);
3062 		if (repo_path == NULL)
3063 			return got_error_from_errno2("realpath", argv[0]);
3064 		cwd = getcwd(NULL, 0);
3065 		if (cwd == NULL) {
3066 			error = got_error_from_errno("getcwd");
3067 			goto done;
3068 		}
3069 		if (path_prefix[0])
3070 			path = path_prefix;
3071 		else
3072 			path = repo_path;
3073 		error = got_path_basename(&base, path);
3074 		if (error)
3075 			goto done;
3076 		dotgit = strstr(base, ".git");
3077 		if (dotgit)
3078 			*dotgit = '\0';
3079 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3080 			error = got_error_from_errno("asprintf");
3081 			free(base);
3082 			goto done;
3083 		}
3084 		free(base);
3085 	} else if (argc == 2) {
3086 		repo_path = realpath(argv[0], NULL);
3087 		if (repo_path == NULL) {
3088 			error = got_error_from_errno2("realpath", argv[0]);
3089 			goto done;
3090 		}
3091 		worktree_path = realpath(argv[1], NULL);
3092 		if (worktree_path == NULL) {
3093 			if (errno != ENOENT) {
3094 				error = got_error_from_errno2("realpath",
3095 				    argv[1]);
3096 				goto done;
3097 			}
3098 			worktree_path = strdup(argv[1]);
3099 			if (worktree_path == NULL) {
3100 				error = got_error_from_errno("strdup");
3101 				goto done;
3102 			}
3103 		}
3104 	} else
3105 		usage_checkout();
3106 
3107 	got_path_strip_trailing_slashes(repo_path);
3108 	got_path_strip_trailing_slashes(worktree_path);
3109 
3110 	if (got_path_is_child(worktree_path, repo_path, strlen(repo_path)) ||
3111 	    got_path_is_child(repo_path, worktree_path,
3112 	    strlen(worktree_path))) {
3113 		error = got_error_fmt(GOT_ERR_BAD_PATH,
3114 		    "work tree and repository paths may not overlap: %s",
3115 		    worktree_path);
3116 		goto done;
3117 	}
3118 
3119 	error = got_repo_pack_fds_open(&pack_fds);
3120 	if (error != NULL)
3121 		goto done;
3122 
3123 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3124 	if (error != NULL)
3125 		goto done;
3126 
3127 	/* Pre-create work tree path for unveil(2) */
3128 	error = got_path_mkdir(worktree_path);
3129 	if (error) {
3130 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3131 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3132 			goto done;
3133 		if (!allow_nonempty &&
3134 		    !got_path_dir_is_empty(worktree_path)) {
3135 			error = got_error_path(worktree_path,
3136 			    GOT_ERR_DIR_NOT_EMPTY);
3137 			goto done;
3138 		}
3139 	}
3140 
3141 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3142 	if (error)
3143 		goto done;
3144 
3145 	error = got_ref_open(&head_ref, repo, branch_name, 0);
3146 	if (error != NULL)
3147 		goto done;
3148 
3149 	error = got_worktree_init(worktree_path, head_ref, path_prefix,
3150 	    GOT_WORKTREE_GOT_DIR, repo);
3151 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3152 		goto done;
3153 
3154 	error = got_worktree_open(&worktree, worktree_path,
3155 	    GOT_WORKTREE_GOT_DIR);
3156 	if (error != NULL)
3157 		goto done;
3158 
3159 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3160 	    path_prefix);
3161 	if (error != NULL)
3162 		goto done;
3163 	if (!same_path_prefix) {
3164 		error = got_error(GOT_ERR_PATH_PREFIX);
3165 		goto done;
3166 	}
3167 
3168 	if (commit_id_str) {
3169 		struct got_reflist_head refs;
3170 		TAILQ_INIT(&refs);
3171 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3172 		    NULL);
3173 		if (error)
3174 			goto done;
3175 
3176 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3177 		    repo, worktree);
3178 		if (error != NULL)
3179 			goto done;
3180 		if (keyword_idstr != NULL) {
3181 			free(commit_id_str);
3182 			commit_id_str = keyword_idstr;
3183 		}
3184 
3185 		error = got_repo_match_object_id(&commit_id, NULL,
3186 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3187 		got_ref_list_free(&refs);
3188 		if (error)
3189 			goto done;
3190 		error = check_linear_ancestry(commit_id,
3191 		    got_worktree_get_base_commit_id(worktree), 0, repo);
3192 		if (error != NULL) {
3193 			if (error->code == GOT_ERR_ANCESTRY) {
3194 				error = checkout_ancestry_error(
3195 				    head_ref, commit_id_str);
3196 			}
3197 			goto done;
3198 		}
3199 		error = check_same_branch(commit_id, head_ref, repo);
3200 		if (error) {
3201 			if (error->code == GOT_ERR_ANCESTRY) {
3202 				error = checkout_ancestry_error(
3203 				    head_ref, commit_id_str);
3204 			}
3205 			goto done;
3206 		}
3207 		error = got_worktree_set_base_commit_id(worktree, repo,
3208 		    commit_id);
3209 		if (error)
3210 			goto done;
3211 		/* Expand potentially abbreviated commit ID string. */
3212 		free(commit_id_str);
3213 		error = got_object_id_str(&commit_id_str, commit_id);
3214 		if (error)
3215 			goto done;
3216 	} else {
3217 		commit_id = got_object_id_dup(
3218 		    got_worktree_get_base_commit_id(worktree));
3219 		if (commit_id == NULL) {
3220 			error = got_error_from_errno("got_object_id_dup");
3221 			goto done;
3222 		}
3223 		error = got_object_id_str(&commit_id_str, commit_id);
3224 		if (error)
3225 			goto done;
3226 	}
3227 
3228 	error = got_pathlist_append(&paths, "", NULL);
3229 	if (error)
3230 		goto done;
3231 	cpa.worktree_path = worktree_path;
3232 	cpa.had_base_commit_ref_error = 0;
3233 	cpa.verbosity = verbosity;
3234 	error = got_worktree_checkout_files(worktree, &paths, repo,
3235 	    checkout_progress, &cpa, check_cancelled, NULL);
3236 	if (error != NULL)
3237 		goto done;
3238 
3239 	if (got_ref_is_symbolic(head_ref)) {
3240 		error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3241 		if (error)
3242 			goto done;
3243 		refname = got_ref_get_name(ref);
3244 	} else
3245 		refname = got_ref_get_name(head_ref);
3246 	printf("Checked out %s: %s\n", refname, commit_id_str);
3247 	printf("Now shut up and hack\n");
3248 	if (cpa.had_base_commit_ref_error)
3249 		show_worktree_base_ref_warning();
3250 done:
3251 	if (pack_fds) {
3252 		const struct got_error *pack_err =
3253 		    got_repo_pack_fds_close(pack_fds);
3254 		if (error == NULL)
3255 			error = pack_err;
3256 	}
3257 	if (head_ref)
3258 		got_ref_close(head_ref);
3259 	if (ref)
3260 		got_ref_close(ref);
3261 	if (repo) {
3262 		close_err = got_repo_close(repo);
3263 		if (error == NULL)
3264 			error = close_err;
3265 	}
3266 	if (worktree != NULL) {
3267 		close_err = got_worktree_close(worktree);
3268 		if (error == NULL)
3269 			error = close_err;
3270 	}
3271 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
3272 	free(commit_id_str);
3273 	free(commit_id);
3274 	free(repo_path);
3275 	free(worktree_path);
3276 	free(cwd);
3277 	return error;
3278 }
3279 
3280 struct got_update_progress_arg {
3281 	int did_something;
3282 	int conflicts;
3283 	int obstructed;
3284 	int not_updated;
3285 	int missing;
3286 	int not_deleted;
3287 	int unversioned;
3288 	int verbosity;
3289 };
3290 
3291 static void
3292 print_update_progress_stats(struct got_update_progress_arg *upa)
3293 {
3294 	if (!upa->did_something)
3295 		return;
3296 
3297 	if (upa->conflicts > 0)
3298 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
3299 	if (upa->obstructed > 0)
3300 		printf("File paths obstructed by a non-regular file: %d\n",
3301 		    upa->obstructed);
3302 	if (upa->not_updated > 0)
3303 		printf("Files not updated because of existing merge "
3304 		    "conflicts: %d\n", upa->not_updated);
3305 }
3306 
3307 /*
3308  * The meaning of some status codes differs between merge-style operations and
3309  * update operations. For example, the ! status code means "file was missing"
3310  * if changes were merged into the work tree, and "missing file was restored"
3311  * if the work tree was updated. This function should be used by any operation
3312  * which merges changes into the work tree without updating the work tree.
3313  */
3314 static void
3315 print_merge_progress_stats(struct got_update_progress_arg *upa)
3316 {
3317 	if (!upa->did_something)
3318 		return;
3319 
3320 	if (upa->conflicts > 0)
3321 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
3322 	if (upa->obstructed > 0)
3323 		printf("File paths obstructed by a non-regular file: %d\n",
3324 		    upa->obstructed);
3325 	if (upa->missing > 0)
3326 		printf("Files which had incoming changes but could not be "
3327 		    "found in the work tree: %d\n", upa->missing);
3328 	if (upa->not_deleted > 0)
3329 		printf("Files not deleted due to differences in deleted "
3330 		    "content: %d\n", upa->not_deleted);
3331 	if (upa->unversioned > 0)
3332 		printf("Files not merged because an unversioned file was "
3333 		    "found in the work tree: %d\n", upa->unversioned);
3334 }
3335 
3336 __dead static void
3337 usage_update(void)
3338 {
3339 	fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3340 	    "[path ...]\n", getprogname());
3341 	exit(1);
3342 }
3343 
3344 static const struct got_error *
3345 update_progress(void *arg, unsigned char status, const char *path)
3346 {
3347 	struct got_update_progress_arg *upa = arg;
3348 
3349 	if (status == GOT_STATUS_EXISTS ||
3350 	    status == GOT_STATUS_BASE_REF_ERR)
3351 		return NULL;
3352 
3353 	upa->did_something = 1;
3354 
3355 	/* Base commit bump happens silently. */
3356 	if (status == GOT_STATUS_BUMP_BASE)
3357 		return NULL;
3358 
3359 	if (status == GOT_STATUS_CONFLICT)
3360 		upa->conflicts++;
3361 	if (status == GOT_STATUS_OBSTRUCTED)
3362 		upa->obstructed++;
3363 	if (status == GOT_STATUS_CANNOT_UPDATE)
3364 		upa->not_updated++;
3365 	if (status == GOT_STATUS_MISSING)
3366 		upa->missing++;
3367 	if (status == GOT_STATUS_CANNOT_DELETE)
3368 		upa->not_deleted++;
3369 	if (status == GOT_STATUS_UNVERSIONED)
3370 		upa->unversioned++;
3371 
3372 	while (path[0] == '/')
3373 		path++;
3374 	if (upa->verbosity >= 0)
3375 		printf("%c  %s\n", status, path);
3376 
3377 	return NULL;
3378 }
3379 
3380 static const struct got_error *
3381 switch_head_ref(struct got_reference *head_ref,
3382     struct got_object_id *commit_id, struct got_worktree *worktree,
3383     struct got_repository *repo)
3384 {
3385 	const struct got_error *err = NULL;
3386 	char *base_id_str;
3387 	int ref_has_moved = 0;
3388 
3389 	/* Trivial case: switching between two different references. */
3390 	if (strcmp(got_ref_get_name(head_ref),
3391 	    got_worktree_get_head_ref_name(worktree)) != 0) {
3392 		printf("Switching work tree from %s to %s\n",
3393 		    got_worktree_get_head_ref_name(worktree),
3394 		    got_ref_get_name(head_ref));
3395 		return got_worktree_set_head_ref(worktree, head_ref);
3396 	}
3397 
3398 	err = check_linear_ancestry(commit_id,
3399 	    got_worktree_get_base_commit_id(worktree), 0, repo);
3400 	if (err) {
3401 		if (err->code != GOT_ERR_ANCESTRY)
3402 			return err;
3403 		ref_has_moved = 1;
3404 	}
3405 	if (!ref_has_moved)
3406 		return NULL;
3407 
3408 	/* Switching to a rebased branch with the same reference name. */
3409 	err = got_object_id_str(&base_id_str,
3410 	    got_worktree_get_base_commit_id(worktree));
3411 	if (err)
3412 		return err;
3413 	printf("Reference %s now points at a different branch\n",
3414 	    got_worktree_get_head_ref_name(worktree));
3415 	printf("Switching work tree from %s to %s\n", base_id_str,
3416 	    got_worktree_get_head_ref_name(worktree));
3417 	return NULL;
3418 }
3419 
3420 static const struct got_error *
3421 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3422 {
3423 	const struct got_error *err;
3424 	int in_progress;
3425 
3426 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
3427 	if (err)
3428 		return err;
3429 	if (in_progress)
3430 		return got_error(GOT_ERR_REBASING);
3431 
3432 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
3433 	if (err)
3434 		return err;
3435 	if (in_progress)
3436 		return got_error(GOT_ERR_HISTEDIT_BUSY);
3437 
3438 	return NULL;
3439 }
3440 
3441 static const struct got_error *
3442 check_merge_in_progress(struct got_worktree *worktree,
3443     struct got_repository *repo)
3444 {
3445 	const struct got_error *err;
3446 	int in_progress;
3447 
3448 	err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3449 	if (err)
3450 		return err;
3451 	if (in_progress)
3452 		return got_error(GOT_ERR_MERGE_BUSY);
3453 
3454 	return NULL;
3455 }
3456 
3457 static const struct got_error *
3458 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3459     char *argv[], struct got_worktree *worktree)
3460 {
3461 	const struct got_error *err = NULL;
3462 	char *path;
3463 	struct got_pathlist_entry *new;
3464 	int i;
3465 
3466 	if (argc == 0) {
3467 		path = strdup("");
3468 		if (path == NULL)
3469 			return got_error_from_errno("strdup");
3470 		return got_pathlist_append(paths, path, NULL);
3471 	}
3472 
3473 	for (i = 0; i < argc; i++) {
3474 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
3475 		if (err)
3476 			break;
3477 		err = got_pathlist_insert(&new, paths, path, NULL);
3478 		if (err || new == NULL /* duplicate */) {
3479 			free(path);
3480 			if (err)
3481 				break;
3482 		}
3483 	}
3484 
3485 	return err;
3486 }
3487 
3488 static const struct got_error *
3489 wrap_not_worktree_error(const struct got_error *orig_err,
3490     const char *cmdname, const char *path)
3491 {
3492 	const struct got_error *err;
3493 	struct got_repository *repo;
3494 	static char msg[512];
3495 	int *pack_fds = NULL;
3496 
3497 	err = got_repo_pack_fds_open(&pack_fds);
3498 	if (err)
3499 		return err;
3500 
3501 	err = got_repo_open(&repo, path, NULL, pack_fds);
3502 	if (err)
3503 		return orig_err;
3504 
3505 	snprintf(msg, sizeof(msg),
3506 	    "'got %s' needs a work tree in addition to a git repository\n"
3507 	    "Work trees can be checked out from this Git repository with "
3508 	    "'got checkout'.\n"
3509 	    "The got(1) manual page contains more information.", cmdname);
3510 	err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3511 	if (repo) {
3512 		const struct got_error *close_err = got_repo_close(repo);
3513 		if (err == NULL)
3514 			err = close_err;
3515 	}
3516 	if (pack_fds) {
3517 		const struct got_error *pack_err =
3518 		    got_repo_pack_fds_close(pack_fds);
3519 		if (err == NULL)
3520 			err = pack_err;
3521 	}
3522 	return err;
3523 }
3524 
3525 static const struct got_error *
3526 cmd_update(int argc, char *argv[])
3527 {
3528 	const struct got_error *close_err, *error = NULL;
3529 	struct got_repository *repo = NULL;
3530 	struct got_worktree *worktree = NULL;
3531 	char *worktree_path = NULL;
3532 	struct got_object_id *commit_id = NULL;
3533 	char *commit_id_str = NULL;
3534 	const char *branch_name = NULL;
3535 	struct got_reference *head_ref = NULL;
3536 	struct got_pathlist_head paths;
3537 	struct got_pathlist_entry *pe;
3538 	int ch, verbosity = 0;
3539 	struct got_update_progress_arg upa;
3540 	int *pack_fds = NULL;
3541 
3542 	TAILQ_INIT(&paths);
3543 
3544 #ifndef PROFILE
3545 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3546 	    "unveil", NULL) == -1)
3547 		err(1, "pledge");
3548 #endif
3549 
3550 	while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3551 		switch (ch) {
3552 		case 'b':
3553 			branch_name = optarg;
3554 			break;
3555 		case 'c':
3556 			commit_id_str = strdup(optarg);
3557 			if (commit_id_str == NULL)
3558 				return got_error_from_errno("strdup");
3559 			break;
3560 		case 'q':
3561 			verbosity = -1;
3562 			break;
3563 		default:
3564 			usage_update();
3565 			/* NOTREACHED */
3566 		}
3567 	}
3568 
3569 	argc -= optind;
3570 	argv += optind;
3571 
3572 	worktree_path = getcwd(NULL, 0);
3573 	if (worktree_path == NULL) {
3574 		error = got_error_from_errno("getcwd");
3575 		goto done;
3576 	}
3577 
3578 	error = got_repo_pack_fds_open(&pack_fds);
3579 	if (error != NULL)
3580 		goto done;
3581 
3582 	error = got_worktree_open(&worktree, worktree_path,
3583 	    GOT_WORKTREE_GOT_DIR);
3584 	if (error) {
3585 		if (error->code == GOT_ERR_NOT_WORKTREE)
3586 			error = wrap_not_worktree_error(error, "update",
3587 			    worktree_path);
3588 		goto done;
3589 	}
3590 
3591 	error = check_rebase_or_histedit_in_progress(worktree);
3592 	if (error)
3593 		goto done;
3594 
3595 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3596 	    NULL, pack_fds);
3597 	if (error != NULL)
3598 		goto done;
3599 
3600 	error = apply_unveil(got_repo_get_path(repo), 0,
3601 	    got_worktree_get_root_path(worktree));
3602 	if (error)
3603 		goto done;
3604 
3605 	error = check_merge_in_progress(worktree, repo);
3606 	if (error)
3607 		goto done;
3608 
3609 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3610 	if (error)
3611 		goto done;
3612 
3613 	error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3614 	    got_worktree_get_head_ref_name(worktree), 0);
3615 	if (error != NULL)
3616 		goto done;
3617 	if (commit_id_str == NULL) {
3618 		error = got_ref_resolve(&commit_id, repo, head_ref);
3619 		if (error != NULL)
3620 			goto done;
3621 		error = got_object_id_str(&commit_id_str, commit_id);
3622 		if (error != NULL)
3623 			goto done;
3624 	} else {
3625 		struct got_reflist_head refs;
3626 		char *keyword_idstr = NULL;
3627 
3628 		TAILQ_INIT(&refs);
3629 
3630 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3631 		    NULL);
3632 		if (error)
3633 			goto done;
3634 
3635 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3636 		    repo, worktree);
3637 		if (error != NULL)
3638 			goto done;
3639 		if (keyword_idstr != NULL) {
3640 			free(commit_id_str);
3641 			commit_id_str = keyword_idstr;
3642 		}
3643 
3644 		error = got_repo_match_object_id(&commit_id, NULL,
3645 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3646 		got_ref_list_free(&refs);
3647 		free(commit_id_str);
3648 		commit_id_str = NULL;
3649 		if (error)
3650 			goto done;
3651 		error = got_object_id_str(&commit_id_str, commit_id);
3652 		if (error)
3653 			goto done;
3654 	}
3655 
3656 	if (branch_name) {
3657 		struct got_object_id *head_commit_id;
3658 		TAILQ_FOREACH(pe, &paths, entry) {
3659 			if (pe->path_len == 0)
3660 				continue;
3661 			error = got_error_msg(GOT_ERR_BAD_PATH,
3662 			    "switching between branches requires that "
3663 			    "the entire work tree gets updated");
3664 			goto done;
3665 		}
3666 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
3667 		if (error)
3668 			goto done;
3669 		error = check_linear_ancestry(commit_id, head_commit_id, 0,
3670 		    repo);
3671 		free(head_commit_id);
3672 		if (error != NULL)
3673 			goto done;
3674 		error = check_same_branch(commit_id, head_ref, repo);
3675 		if (error)
3676 			goto done;
3677 		error = switch_head_ref(head_ref, commit_id, worktree, repo);
3678 		if (error)
3679 			goto done;
3680 	} else {
3681 		error = check_linear_ancestry(commit_id,
3682 		    got_worktree_get_base_commit_id(worktree), 0, repo);
3683 		if (error != NULL) {
3684 			if (error->code == GOT_ERR_ANCESTRY)
3685 				error = got_error(GOT_ERR_BRANCH_MOVED);
3686 			goto done;
3687 		}
3688 		error = check_same_branch(commit_id, head_ref, repo);
3689 		if (error)
3690 			goto done;
3691 	}
3692 
3693 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3694 	    commit_id) != 0) {
3695 		error = got_worktree_set_base_commit_id(worktree, repo,
3696 		    commit_id);
3697 		if (error)
3698 			goto done;
3699 	}
3700 
3701 	memset(&upa, 0, sizeof(upa));
3702 	upa.verbosity = verbosity;
3703 	error = got_worktree_checkout_files(worktree, &paths, repo,
3704 	    update_progress, &upa, check_cancelled, NULL);
3705 	if (error != NULL)
3706 		goto done;
3707 
3708 	if (upa.did_something) {
3709 		printf("Updated to %s: %s\n",
3710 		    got_worktree_get_head_ref_name(worktree), commit_id_str);
3711 	} else
3712 		printf("Already up-to-date\n");
3713 
3714 	print_update_progress_stats(&upa);
3715 done:
3716 	if (pack_fds) {
3717 		const struct got_error *pack_err =
3718 		    got_repo_pack_fds_close(pack_fds);
3719 		if (error == NULL)
3720 			error = pack_err;
3721 	}
3722 	if (repo) {
3723 		close_err = got_repo_close(repo);
3724 		if (error == NULL)
3725 			error = close_err;
3726 	}
3727 	if (worktree != NULL) {
3728 		close_err = got_worktree_close(worktree);
3729 		if (error == NULL)
3730 			error = close_err;
3731 	}
3732 	if (head_ref != NULL)
3733 		got_ref_close(head_ref);
3734 	free(worktree_path);
3735 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3736 	free(commit_id);
3737 	free(commit_id_str);
3738 	return error;
3739 }
3740 
3741 static const struct got_error *
3742 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3743     const char *path, int diff_context, int ignore_whitespace,
3744     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3745     struct got_repository *repo, FILE *outfile)
3746 {
3747 	const struct got_error *err = NULL;
3748 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3749 	FILE *f1 = NULL, *f2 = NULL;
3750 	int fd1 = -1, fd2 = -1;
3751 
3752 	fd1 = got_opentempfd();
3753 	if (fd1 == -1)
3754 		return got_error_from_errno("got_opentempfd");
3755 	fd2 = got_opentempfd();
3756 	if (fd2 == -1) {
3757 		err = got_error_from_errno("got_opentempfd");
3758 		goto done;
3759 	}
3760 
3761 	if (blob_id1) {
3762 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3763 		    fd1);
3764 		if (err)
3765 			goto done;
3766 	}
3767 
3768 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3769 	if (err)
3770 		goto done;
3771 
3772 	f1 = got_opentemp();
3773 	if (f1 == NULL) {
3774 		err = got_error_from_errno("got_opentemp");
3775 		goto done;
3776 	}
3777 	f2 = got_opentemp();
3778 	if (f2 == NULL) {
3779 		err = got_error_from_errno("got_opentemp");
3780 		goto done;
3781 	}
3782 
3783 	while (path[0] == '/')
3784 		path++;
3785 	err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3786 	    GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3787 	    force_text_diff, dsa, outfile);
3788 done:
3789 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3790 		err = got_error_from_errno("close");
3791 	if (blob1)
3792 		got_object_blob_close(blob1);
3793 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3794 		err = got_error_from_errno("close");
3795 	if (blob2)
3796 		got_object_blob_close(blob2);
3797 	if (f1 && fclose(f1) == EOF && err == NULL)
3798 		err = got_error_from_errno("fclose");
3799 	if (f2 && fclose(f2) == EOF && err == NULL)
3800 		err = got_error_from_errno("fclose");
3801 	return err;
3802 }
3803 
3804 static const struct got_error *
3805 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3806     const char *path, int diff_context, int ignore_whitespace,
3807     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3808     struct got_repository *repo, FILE *outfile)
3809 {
3810 	const struct got_error *err = NULL;
3811 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3812 	struct got_diff_blob_output_unidiff_arg arg;
3813 	FILE *f1 = NULL, *f2 = NULL;
3814 	int fd1 = -1, fd2 = -1;
3815 
3816 	if (tree_id1) {
3817 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3818 		if (err)
3819 			goto done;
3820 		fd1 = got_opentempfd();
3821 		if (fd1 == -1) {
3822 			err = got_error_from_errno("got_opentempfd");
3823 			goto done;
3824 		}
3825 	}
3826 
3827 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3828 	if (err)
3829 		goto done;
3830 
3831 	f1 = got_opentemp();
3832 	if (f1 == NULL) {
3833 		err = got_error_from_errno("got_opentemp");
3834 		goto done;
3835 	}
3836 
3837 	f2 = got_opentemp();
3838 	if (f2 == NULL) {
3839 		err = got_error_from_errno("got_opentemp");
3840 		goto done;
3841 	}
3842 	fd2 = got_opentempfd();
3843 	if (fd2 == -1) {
3844 		err = got_error_from_errno("got_opentempfd");
3845 		goto done;
3846 	}
3847 	arg.diff_context = diff_context;
3848 	arg.ignore_whitespace = ignore_whitespace;
3849 	arg.force_text_diff = force_text_diff;
3850 	arg.diffstat = dsa;
3851 	arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3852 	arg.outfile = outfile;
3853 	arg.lines = NULL;
3854 	arg.nlines = 0;
3855 	while (path[0] == '/')
3856 		path++;
3857 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3858 	    got_diff_blob_output_unidiff, &arg, 1);
3859 done:
3860 	if (tree1)
3861 		got_object_tree_close(tree1);
3862 	if (tree2)
3863 		got_object_tree_close(tree2);
3864 	if (f1 && fclose(f1) == EOF && err == NULL)
3865 		err = got_error_from_errno("fclose");
3866 	if (f2 && fclose(f2) == EOF && err == NULL)
3867 		err = got_error_from_errno("fclose");
3868 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3869 		err = got_error_from_errno("close");
3870 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3871 		err = got_error_from_errno("close");
3872 	return err;
3873 }
3874 
3875 static const struct got_error *
3876 get_changed_paths(struct got_pathlist_head *paths,
3877     struct got_commit_object *commit, struct got_repository *repo,
3878     struct got_diffstat_cb_arg *dsa)
3879 {
3880 	const struct got_error *err = NULL;
3881 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3882 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3883 	struct got_object_qid *qid;
3884 	got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3885 	FILE *f1 = NULL, *f2 = NULL;
3886 	int fd1 = -1, fd2 = -1;
3887 
3888 	if (dsa) {
3889 		cb = got_diff_tree_compute_diffstat;
3890 
3891 		f1 = got_opentemp();
3892 		if (f1 == NULL) {
3893 			err = got_error_from_errno("got_opentemp");
3894 			goto done;
3895 		}
3896 		f2 = got_opentemp();
3897 		if (f2 == NULL) {
3898 			err = got_error_from_errno("got_opentemp");
3899 			goto done;
3900 		}
3901 		fd1 = got_opentempfd();
3902 		if (fd1 == -1) {
3903 			err = got_error_from_errno("got_opentempfd");
3904 			goto done;
3905 		}
3906 		fd2 = got_opentempfd();
3907 		if (fd2 == -1) {
3908 			err = got_error_from_errno("got_opentempfd");
3909 			goto done;
3910 		}
3911 	}
3912 
3913 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3914 	if (qid != NULL) {
3915 		struct got_commit_object *pcommit;
3916 		err = got_object_open_as_commit(&pcommit, repo,
3917 		    &qid->id);
3918 		if (err)
3919 			return err;
3920 
3921 		tree_id1 = got_object_id_dup(
3922 		    got_object_commit_get_tree_id(pcommit));
3923 		if (tree_id1 == NULL) {
3924 			got_object_commit_close(pcommit);
3925 			return got_error_from_errno("got_object_id_dup");
3926 		}
3927 		got_object_commit_close(pcommit);
3928 
3929 	}
3930 
3931 	if (tree_id1) {
3932 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3933 		if (err)
3934 			goto done;
3935 	}
3936 
3937 	tree_id2 = got_object_commit_get_tree_id(commit);
3938 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3939 	if (err)
3940 		goto done;
3941 
3942 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3943 	    cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3944 done:
3945 	if (tree1)
3946 		got_object_tree_close(tree1);
3947 	if (tree2)
3948 		got_object_tree_close(tree2);
3949 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3950 		err = got_error_from_errno("close");
3951 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3952 		err = got_error_from_errno("close");
3953 	if (f1 && fclose(f1) == EOF && err == NULL)
3954 		err = got_error_from_errno("fclose");
3955 	if (f2 && fclose(f2) == EOF && err == NULL)
3956 		err = got_error_from_errno("fclose");
3957 	free(tree_id1);
3958 	return err;
3959 }
3960 
3961 static const struct got_error *
3962 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3963     const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3964     struct got_repository *repo, FILE *outfile)
3965 {
3966 	const struct got_error *err = NULL;
3967 	struct got_commit_object *pcommit = NULL;
3968 	char *id_str1 = NULL, *id_str2 = NULL;
3969 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3970 	struct got_object_qid *qid;
3971 
3972 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3973 	if (qid != NULL) {
3974 		err = got_object_open_as_commit(&pcommit, repo,
3975 		    &qid->id);
3976 		if (err)
3977 			return err;
3978 		err = got_object_id_str(&id_str1, &qid->id);
3979 		if (err)
3980 			goto done;
3981 	}
3982 
3983 	err = got_object_id_str(&id_str2, id);
3984 	if (err)
3985 		goto done;
3986 
3987 	if (path && path[0] != '\0') {
3988 		int obj_type;
3989 		err = got_object_id_by_path(&obj_id2, repo, commit, path);
3990 		if (err)
3991 			goto done;
3992 		if (pcommit) {
3993 			err = got_object_id_by_path(&obj_id1, repo,
3994 			    pcommit, path);
3995 			if (err) {
3996 				if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3997 					free(obj_id2);
3998 					goto done;
3999 				}
4000 			}
4001 		}
4002 		err = got_object_get_type(&obj_type, repo, obj_id2);
4003 		if (err) {
4004 			free(obj_id2);
4005 			goto done;
4006 		}
4007 		fprintf(outfile,
4008 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
4009 		fprintf(outfile, "commit - %s\n",
4010 		    id_str1 ? id_str1 : "/dev/null");
4011 		fprintf(outfile, "commit + %s\n", id_str2);
4012 		switch (obj_type) {
4013 		case GOT_OBJ_TYPE_BLOB:
4014 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
4015 			    0, 0, dsa, repo, outfile);
4016 			break;
4017 		case GOT_OBJ_TYPE_TREE:
4018 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
4019 			    0, 0, dsa, repo, outfile);
4020 			break;
4021 		default:
4022 			err = got_error(GOT_ERR_OBJ_TYPE);
4023 			break;
4024 		}
4025 		free(obj_id1);
4026 		free(obj_id2);
4027 	} else {
4028 		obj_id2 = got_object_commit_get_tree_id(commit);
4029 		if (pcommit)
4030 			obj_id1 = got_object_commit_get_tree_id(pcommit);
4031 		fprintf(outfile,
4032 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
4033 		fprintf(outfile, "commit - %s\n",
4034 		    id_str1 ? id_str1 : "/dev/null");
4035 		fprintf(outfile, "commit + %s\n", id_str2);
4036 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
4037 		    dsa, repo, outfile);
4038 	}
4039 done:
4040 	free(id_str1);
4041 	free(id_str2);
4042 	if (pcommit)
4043 		got_object_commit_close(pcommit);
4044 	return err;
4045 }
4046 
4047 static char *
4048 get_datestr(time_t *time, char *datebuf)
4049 {
4050 	struct tm mytm, *tm;
4051 	char *p, *s;
4052 
4053 	tm = gmtime_r(time, &mytm);
4054 	if (tm == NULL)
4055 		return NULL;
4056 	s = asctime_r(tm, datebuf);
4057 	if (s == NULL)
4058 		return NULL;
4059 	p = strchr(s, '\n');
4060 	if (p)
4061 		*p = '\0';
4062 	return s;
4063 }
4064 
4065 static const struct got_error *
4066 match_commit(int *have_match, struct got_object_id *id,
4067     struct got_commit_object *commit, regex_t *regex)
4068 {
4069 	const struct got_error *err = NULL;
4070 	regmatch_t regmatch;
4071 	char *id_str = NULL, *logmsg = NULL;
4072 
4073 	*have_match = 0;
4074 
4075 	err = got_object_id_str(&id_str, id);
4076 	if (err)
4077 		return err;
4078 
4079 	err = got_object_commit_get_logmsg(&logmsg, commit);
4080 	if (err)
4081 		goto done;
4082 
4083 	if (regexec(regex, got_object_commit_get_author(commit), 1,
4084 	    &regmatch, 0) == 0 ||
4085 	    regexec(regex, got_object_commit_get_committer(commit), 1,
4086 	    &regmatch, 0) == 0 ||
4087 	    regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
4088 	    regexec(regex, logmsg, 1, &regmatch, 0) == 0)
4089 		*have_match = 1;
4090 done:
4091 	free(id_str);
4092 	free(logmsg);
4093 	return err;
4094 }
4095 
4096 static void
4097 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
4098     regex_t *regex)
4099 {
4100 	regmatch_t regmatch;
4101 	struct got_pathlist_entry *pe;
4102 
4103 	*have_match = 0;
4104 
4105 	TAILQ_FOREACH(pe, changed_paths, entry) {
4106 		if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
4107 			*have_match = 1;
4108 			break;
4109 		}
4110 	}
4111 }
4112 
4113 static const struct got_error *
4114 match_patch(int *have_match, struct got_commit_object *commit,
4115     struct got_object_id *id, const char *path, int diff_context,
4116     struct got_repository *repo, regex_t *regex, FILE *f)
4117 {
4118 	const struct got_error *err = NULL;
4119 	char *line = NULL;
4120 	size_t linesize = 0;
4121 	regmatch_t regmatch;
4122 
4123 	*have_match = 0;
4124 
4125 	err = got_opentemp_truncate(f);
4126 	if (err)
4127 		return err;
4128 
4129 	err = print_patch(commit, id, path, diff_context, NULL, repo, f);
4130 	if (err)
4131 		goto done;
4132 
4133 	if (fseeko(f, 0L, SEEK_SET) == -1) {
4134 		err = got_error_from_errno("fseeko");
4135 		goto done;
4136 	}
4137 
4138 	while (getline(&line, &linesize, f) != -1) {
4139 		if (regexec(regex, line, 1, &regmatch, 0) == 0) {
4140 			*have_match = 1;
4141 			break;
4142 		}
4143 	}
4144 done:
4145 	free(line);
4146 	return err;
4147 }
4148 
4149 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
4150 
4151 static const struct got_error*
4152 build_refs_str(char **refs_str, struct got_reflist_head *refs,
4153     struct got_object_id *id, struct got_repository *repo,
4154     int local_only)
4155 {
4156 	static const struct got_error *err = NULL;
4157 	struct got_reflist_entry *re;
4158 	char *s;
4159 	const char *name;
4160 
4161 	*refs_str = NULL;
4162 
4163 	TAILQ_FOREACH(re, refs, entry) {
4164 		struct got_tag_object *tag = NULL;
4165 		struct got_object_id *ref_id;
4166 		int cmp;
4167 
4168 		name = got_ref_get_name(re->ref);
4169 		if (strcmp(name, GOT_REF_HEAD) == 0)
4170 			continue;
4171 		if (strncmp(name, "refs/", 5) == 0)
4172 			name += 5;
4173 		if (strncmp(name, "got/", 4) == 0)
4174 			continue;
4175 		if (strncmp(name, "heads/", 6) == 0)
4176 			name += 6;
4177 		if (strncmp(name, "remotes/", 8) == 0) {
4178 			if (local_only)
4179 				continue;
4180 			name += 8;
4181 			s = strstr(name, "/" GOT_REF_HEAD);
4182 			if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
4183 				continue;
4184 		}
4185 		err = got_ref_resolve(&ref_id, repo, re->ref);
4186 		if (err)
4187 			break;
4188 		if (strncmp(name, "tags/", 5) == 0) {
4189 			err = got_object_open_as_tag(&tag, repo, ref_id);
4190 			if (err) {
4191 				if (err->code != GOT_ERR_OBJ_TYPE) {
4192 					free(ref_id);
4193 					break;
4194 				}
4195 				/* Ref points at something other than a tag. */
4196 				err = NULL;
4197 				tag = NULL;
4198 			}
4199 		}
4200 		cmp = got_object_id_cmp(tag ?
4201 		    got_object_tag_get_object_id(tag) : ref_id, id);
4202 		free(ref_id);
4203 		if (tag)
4204 			got_object_tag_close(tag);
4205 		if (cmp != 0)
4206 			continue;
4207 		s = *refs_str;
4208 		if (asprintf(refs_str, "%s%s%s", s ? s : "",
4209 		    s ? ", " : "", name) == -1) {
4210 			err = got_error_from_errno("asprintf");
4211 			free(s);
4212 			*refs_str = NULL;
4213 			break;
4214 		}
4215 		free(s);
4216 	}
4217 
4218 	return err;
4219 }
4220 
4221 static const struct got_error *
4222 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4223     struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4224 {
4225 	const struct got_error *err = NULL;
4226 	char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4227 	char *comma, *s, *nl;
4228 	struct got_reflist_head *refs;
4229 	char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4230 	struct tm tm;
4231 	time_t committer_time;
4232 
4233 	refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4234 	if (refs) {
4235 		err = build_refs_str(&ref_str, refs, id, repo, 1);
4236 		if (err)
4237 			return err;
4238 
4239 		/* Display the first matching ref only. */
4240 		if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4241 			*comma = '\0';
4242 	}
4243 
4244 	if (ref_str == NULL) {
4245 		err = got_object_id_str(&id_str, id);
4246 		if (err)
4247 			return err;
4248 	}
4249 
4250 	committer_time = got_object_commit_get_committer_time(commit);
4251 	if (gmtime_r(&committer_time, &tm) == NULL) {
4252 		err = got_error_from_errno("gmtime_r");
4253 		goto done;
4254 	}
4255 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4256 		err = got_error(GOT_ERR_NO_SPACE);
4257 		goto done;
4258 	}
4259 
4260 	err = got_object_commit_get_logmsg(&logmsg0, commit);
4261 	if (err)
4262 		goto done;
4263 
4264 	s = logmsg0;
4265 	while (isspace((unsigned char)s[0]))
4266 		s++;
4267 
4268 	nl = strchr(s, '\n');
4269 	if (nl) {
4270 		*nl = '\0';
4271 	}
4272 
4273 	if (ref_str)
4274 		printf("%s%-7s %s\n", datebuf, ref_str, s);
4275 	else
4276 		printf("%s%.7s %s\n", datebuf, id_str, s);
4277 
4278 	if (fflush(stdout) != 0 && err == NULL)
4279 		err = got_error_from_errno("fflush");
4280 done:
4281 	free(id_str);
4282 	free(ref_str);
4283 	free(logmsg0);
4284 	return err;
4285 }
4286 
4287 static const struct got_error *
4288 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
4289 {
4290 	struct got_pathlist_entry *pe;
4291 
4292 	if (header != NULL)
4293 		printf("%s\n", header);
4294 
4295 	TAILQ_FOREACH(pe, dsa->paths, entry) {
4296 		struct got_diff_changed_path *cp = pe->data;
4297 		int pad = dsa->max_path_len - pe->path_len + 1;
4298 
4299 		printf(" %c  %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
4300 		    ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
4301 	}
4302 	printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
4303 	    dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
4304 	    dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
4305 
4306 	if (fflush(stdout) != 0)
4307 		return got_error_from_errno("fflush");
4308 
4309 	return NULL;
4310 }
4311 
4312 static const struct got_error *
4313 printfile(FILE *f)
4314 {
4315 	char	buf[8192];
4316 	size_t	r;
4317 
4318 	if (fseeko(f, 0L, SEEK_SET) == -1)
4319 		return got_error_from_errno("fseek");
4320 
4321 	for (;;) {
4322 		r = fread(buf, 1, sizeof(buf), f);
4323 		if (r == 0) {
4324 			if (ferror(f))
4325 				return got_error_from_errno("fread");
4326 			if (feof(f))
4327 				break;
4328 		}
4329 		if (fwrite(buf, 1, r, stdout) != r)
4330 			return got_ferror(stdout, GOT_ERR_IO);
4331 	}
4332 
4333 	return NULL;
4334 }
4335 
4336 static const struct got_error *
4337 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4338     struct got_repository *repo, const char *path,
4339     struct got_pathlist_head *changed_paths,
4340     struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
4341     struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
4342     const char *prefix)
4343 {
4344 	const struct got_error *err = NULL;
4345 	FILE *f = NULL;
4346 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
4347 	char datebuf[26];
4348 	time_t committer_time;
4349 	const char *author, *committer;
4350 	char *refs_str = NULL;
4351 
4352 	err = got_object_id_str(&id_str, id);
4353 	if (err)
4354 		return err;
4355 
4356 	if (custom_refs_str == NULL) {
4357 		struct got_reflist_head *refs;
4358 		refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4359 		if (refs) {
4360 			err = build_refs_str(&refs_str, refs, id, repo, 0);
4361 			if (err)
4362 				goto done;
4363 		}
4364 	}
4365 
4366 	printf(GOT_COMMIT_SEP_STR);
4367 	if (custom_refs_str)
4368 		printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
4369 		    custom_refs_str);
4370 	else
4371 		printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
4372 		    refs_str ? " (" : "", refs_str ? refs_str : "",
4373 		    refs_str ? ")" : "");
4374 	free(id_str);
4375 	id_str = NULL;
4376 	free(refs_str);
4377 	refs_str = NULL;
4378 	printf("from: %s\n", got_object_commit_get_author(commit));
4379 	author = got_object_commit_get_author(commit);
4380 	committer = got_object_commit_get_committer(commit);
4381 	if (strcmp(author, committer) != 0)
4382 		printf("via: %s\n", committer);
4383 	committer_time = got_object_commit_get_committer_time(commit);
4384 	datestr = get_datestr(&committer_time, datebuf);
4385 	if (datestr)
4386 		printf("date: %s UTC\n", datestr);
4387 	if (got_object_commit_get_nparents(commit) > 1) {
4388 		const struct got_object_id_queue *parent_ids;
4389 		struct got_object_qid *qid;
4390 		int n = 1;
4391 		parent_ids = got_object_commit_get_parent_ids(commit);
4392 		STAILQ_FOREACH(qid, parent_ids, entry) {
4393 			err = got_object_id_str(&id_str, &qid->id);
4394 			if (err)
4395 				goto done;
4396 			printf("parent %d: %s\n", n++, id_str);
4397 			free(id_str);
4398 			id_str = NULL;
4399 		}
4400 	}
4401 
4402 	err = got_object_commit_get_logmsg(&logmsg0, commit);
4403 	if (err)
4404 		goto done;
4405 
4406 	logmsg = logmsg0;
4407 	do {
4408 		line = strsep(&logmsg, "\n");
4409 		if (line)
4410 			printf(" %s\n", line);
4411 	} while (line);
4412 	free(logmsg0);
4413 
4414 	if (changed_paths && diffstat == NULL) {
4415 		struct got_pathlist_entry *pe;
4416 
4417 		TAILQ_FOREACH(pe, changed_paths, entry) {
4418 			struct got_diff_changed_path *cp = pe->data;
4419 
4420 			printf(" %c  %s\n", cp->status, pe->path);
4421 		}
4422 		printf("\n");
4423 	}
4424 	if (show_patch) {
4425 		if (diffstat) {
4426 			f = got_opentemp();
4427 			if (f == NULL) {
4428 				err = got_error_from_errno("got_opentemp");
4429 				goto done;
4430 			}
4431 		}
4432 
4433 		err = print_patch(commit, id, path, diff_context, diffstat,
4434 		    repo, diffstat == NULL ? stdout : f);
4435 		if (err)
4436 			goto done;
4437 	}
4438 	if (diffstat) {
4439 		err = print_diffstat(diffstat, NULL);
4440 		if (err)
4441 			goto done;
4442 		if (show_patch) {
4443 			err = printfile(f);
4444 			if (err)
4445 				goto done;
4446 		}
4447 	}
4448 	if (show_patch)
4449 		printf("\n");
4450 
4451 	if (fflush(stdout) != 0 && err == NULL)
4452 		err = got_error_from_errno("fflush");
4453 done:
4454 	if (f && fclose(f) == EOF && err == NULL)
4455 		err = got_error_from_errno("fclose");
4456 	free(id_str);
4457 	free(refs_str);
4458 	return err;
4459 }
4460 
4461 static const struct got_error *
4462 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4463     struct got_repository *repo, const char *path, int show_changed_paths,
4464     int show_diffstat, int show_patch, const char *search_pattern,
4465     int diff_context, int limit, int log_branches, int reverse_display_order,
4466     struct got_reflist_object_id_map *refs_idmap, int one_line, int toposort,
4467     FILE *tmpfile)
4468 {
4469 	const struct got_error *err;
4470 	struct got_commit_graph *graph;
4471 	regex_t regex;
4472 	int have_match;
4473 	struct got_object_id_queue reversed_commits;
4474 	struct got_object_qid *qid;
4475 	struct got_commit_object *commit;
4476 	struct got_pathlist_head changed_paths;
4477 
4478 	STAILQ_INIT(&reversed_commits);
4479 	TAILQ_INIT(&changed_paths);
4480 
4481 	if (search_pattern && regcomp(&regex, search_pattern,
4482 	    REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4483 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
4484 
4485 	err = got_commit_graph_open(&graph, path, !log_branches);
4486 	if (err)
4487 		return err;
4488 	if (log_branches && toposort) {
4489 		err = got_commit_graph_toposort(graph, root_id, repo,
4490 		    check_cancelled, NULL);
4491 	} else {
4492 		err = got_commit_graph_bfsort(graph, root_id, repo,
4493 		    check_cancelled, NULL);
4494 	}
4495 	if (err)
4496 		goto done;
4497 	for (;;) {
4498 		struct got_object_id id;
4499 		struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4500 		    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4501 
4502 		if (sigint_received || sigpipe_received)
4503 			break;
4504 
4505 		err = got_commit_graph_iter_next(&id, graph, repo,
4506 		    check_cancelled, NULL);
4507 		if (err) {
4508 			if (err->code == GOT_ERR_ITER_COMPLETED)
4509 				err = NULL;
4510 			break;
4511 		}
4512 
4513 		err = got_object_open_as_commit(&commit, repo, &id);
4514 		if (err)
4515 			break;
4516 
4517 		if (((show_changed_paths && !show_diffstat) ||
4518 		    (show_diffstat && !show_patch))
4519 		    && !reverse_display_order) {
4520 			err = get_changed_paths(&changed_paths, commit, repo,
4521 			    show_diffstat ? &dsa : NULL);
4522 			if (err)
4523 				break;
4524 		}
4525 
4526 		if (search_pattern) {
4527 			err = match_commit(&have_match, &id, commit, &regex);
4528 			if (err) {
4529 				got_object_commit_close(commit);
4530 				break;
4531 			}
4532 			if (have_match == 0 && show_changed_paths)
4533 				match_changed_paths(&have_match,
4534 				    &changed_paths, &regex);
4535 			if (have_match == 0 && show_patch) {
4536 				err = match_patch(&have_match, commit, &id,
4537 				    path, diff_context, repo, &regex, tmpfile);
4538 				if (err)
4539 					break;
4540 			}
4541 			if (have_match == 0) {
4542 				got_object_commit_close(commit);
4543 				got_pathlist_free(&changed_paths,
4544 				    GOT_PATHLIST_FREE_ALL);
4545 				continue;
4546 			}
4547 		}
4548 
4549 		if (reverse_display_order) {
4550 			err = got_object_qid_alloc(&qid, &id);
4551 			if (err)
4552 				break;
4553 			STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4554 			got_object_commit_close(commit);
4555 		} else {
4556 			if (one_line)
4557 				err = print_commit_oneline(commit, &id,
4558 				    repo, refs_idmap);
4559 			else
4560 				err = print_commit(commit, &id, repo, path,
4561 				    (show_changed_paths || show_diffstat) ?
4562 				    &changed_paths : NULL,
4563 				    show_diffstat ? &dsa : NULL, show_patch,
4564 				    diff_context, refs_idmap, NULL, NULL);
4565 			got_object_commit_close(commit);
4566 			if (err)
4567 				break;
4568 		}
4569 		if ((limit && --limit == 0) ||
4570 		    (end_id && got_object_id_cmp(&id, end_id) == 0))
4571 			break;
4572 
4573 		got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4574 	}
4575 	if (reverse_display_order) {
4576 		STAILQ_FOREACH(qid, &reversed_commits, entry) {
4577 			struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4578 			    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4579 
4580 			err = got_object_open_as_commit(&commit, repo,
4581 			    &qid->id);
4582 			if (err)
4583 				break;
4584 			if ((show_changed_paths && !show_diffstat) ||
4585 			    (show_diffstat && !show_patch)) {
4586 				err = get_changed_paths(&changed_paths, commit,
4587 				    repo, show_diffstat ? &dsa : NULL);
4588 				if (err)
4589 					break;
4590 			}
4591 			if (one_line)
4592 				err = print_commit_oneline(commit, &qid->id,
4593 				    repo, refs_idmap);
4594 			else
4595 				err = print_commit(commit, &qid->id, repo, path,
4596 				    (show_changed_paths || show_diffstat) ?
4597 				    &changed_paths : NULL,
4598 				    show_diffstat ? &dsa : NULL, show_patch,
4599 				    diff_context, refs_idmap, NULL, NULL);
4600 			got_object_commit_close(commit);
4601 			if (err)
4602 				break;
4603 			got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4604 		}
4605 	}
4606 done:
4607 	while (!STAILQ_EMPTY(&reversed_commits)) {
4608 		qid = STAILQ_FIRST(&reversed_commits);
4609 		STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4610 		got_object_qid_free(qid);
4611 	}
4612 	got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4613 	if (search_pattern)
4614 		regfree(&regex);
4615 	got_commit_graph_close(graph);
4616 	return err;
4617 }
4618 
4619 __dead static void
4620 usage_log(void)
4621 {
4622 	fprintf(stderr, "usage: %s log [-bdPpRst] [-C number] [-c commit] "
4623 	    "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4624 	    "[path]\n", getprogname());
4625 	exit(1);
4626 }
4627 
4628 static int
4629 get_default_log_limit(void)
4630 {
4631 	const char *got_default_log_limit;
4632 	long long n;
4633 	const char *errstr;
4634 
4635 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4636 	if (got_default_log_limit == NULL)
4637 		return 0;
4638 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4639 	if (errstr != NULL)
4640 		return 0;
4641 	return n;
4642 }
4643 
4644 static const struct got_error *
4645 cmd_log(int argc, char *argv[])
4646 {
4647 	const struct got_error *error;
4648 	struct got_repository *repo = NULL;
4649 	struct got_worktree *worktree = NULL;
4650 	struct got_object_id *start_id = NULL, *end_id = NULL;
4651 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4652 	char *keyword_idstr = NULL;
4653 	const char *start_commit = NULL, *end_commit = NULL;
4654 	const char *search_pattern = NULL;
4655 	int diff_context = -1, ch;
4656 	int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4657 	int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4658 	int toposort = 0;
4659 	const char *errstr;
4660 	struct got_reflist_head refs;
4661 	struct got_reflist_object_id_map *refs_idmap = NULL;
4662 	FILE *tmpfile = NULL;
4663 	int *pack_fds = NULL;
4664 
4665 	TAILQ_INIT(&refs);
4666 
4667 #ifndef PROFILE
4668 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4669 	    NULL)
4670 	    == -1)
4671 		err(1, "pledge");
4672 #endif
4673 
4674 	limit = get_default_log_limit();
4675 
4676 	while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:stx:")) != -1) {
4677 		switch (ch) {
4678 		case 'b':
4679 			log_branches = 1;
4680 			break;
4681 		case 'C':
4682 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4683 			    &errstr);
4684 			if (errstr != NULL)
4685 				errx(1, "number of context lines is %s: %s",
4686 				    errstr, optarg);
4687 			break;
4688 		case 'c':
4689 			start_commit = optarg;
4690 			break;
4691 		case 'd':
4692 			show_diffstat = 1;
4693 			break;
4694 		case 'l':
4695 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
4696 			if (errstr != NULL)
4697 				errx(1, "number of commits is %s: %s",
4698 				    errstr, optarg);
4699 			break;
4700 		case 'P':
4701 			show_changed_paths = 1;
4702 			break;
4703 		case 'p':
4704 			show_patch = 1;
4705 			break;
4706 		case 'R':
4707 			reverse_display_order = 1;
4708 			break;
4709 		case 'r':
4710 			repo_path = realpath(optarg, NULL);
4711 			if (repo_path == NULL)
4712 				return got_error_from_errno2("realpath",
4713 				    optarg);
4714 			got_path_strip_trailing_slashes(repo_path);
4715 			break;
4716 		case 'S':
4717 			search_pattern = optarg;
4718 			break;
4719 		case 's':
4720 			one_line = 1;
4721 			break;
4722 		case 't':
4723 			toposort = 1;
4724 			break;
4725 		case 'x':
4726 			end_commit = optarg;
4727 			break;
4728 		default:
4729 			usage_log();
4730 			/* NOTREACHED */
4731 		}
4732 	}
4733 
4734 	argc -= optind;
4735 	argv += optind;
4736 
4737 	if (diff_context == -1)
4738 		diff_context = 3;
4739 	else if (!show_patch)
4740 		errx(1, "-C requires -p");
4741 
4742 	if (one_line && (show_patch || show_changed_paths || show_diffstat))
4743 		errx(1, "cannot use -s with -d, -p or -P");
4744 
4745 	cwd = getcwd(NULL, 0);
4746 	if (cwd == NULL) {
4747 		error = got_error_from_errno("getcwd");
4748 		goto done;
4749 	}
4750 
4751 	error = got_repo_pack_fds_open(&pack_fds);
4752 	if (error != NULL)
4753 		goto done;
4754 
4755 	if (repo_path == NULL) {
4756 		error = got_worktree_open(&worktree, cwd,
4757 		    GOT_WORKTREE_GOT_DIR);
4758 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4759 			goto done;
4760 		error = NULL;
4761 	}
4762 
4763 	if (argc == 1) {
4764 		if (worktree) {
4765 			error = got_worktree_resolve_path(&path, worktree,
4766 			    argv[0]);
4767 			if (error)
4768 				goto done;
4769 		} else {
4770 			path = strdup(argv[0]);
4771 			if (path == NULL) {
4772 				error = got_error_from_errno("strdup");
4773 				goto done;
4774 			}
4775 		}
4776 	} else if (argc != 0)
4777 		usage_log();
4778 
4779 	if (repo_path == NULL) {
4780 		repo_path = worktree ?
4781 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4782 	}
4783 	if (repo_path == NULL) {
4784 		error = got_error_from_errno("strdup");
4785 		goto done;
4786 	}
4787 
4788 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4789 	if (error != NULL)
4790 		goto done;
4791 
4792 	error = apply_unveil(got_repo_get_path(repo), 1,
4793 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4794 	if (error)
4795 		goto done;
4796 
4797 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4798 	if (error)
4799 		goto done;
4800 
4801 	error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4802 	if (error)
4803 		goto done;
4804 
4805 	if (start_commit == NULL) {
4806 		struct got_reference *head_ref;
4807 		struct got_commit_object *commit = NULL;
4808 		error = got_ref_open(&head_ref, repo,
4809 		    worktree ? got_worktree_get_head_ref_name(worktree)
4810 		    : GOT_REF_HEAD, 0);
4811 		if (error != NULL)
4812 			goto done;
4813 		error = got_ref_resolve(&start_id, repo, head_ref);
4814 		got_ref_close(head_ref);
4815 		if (error != NULL)
4816 			goto done;
4817 		error = got_object_open_as_commit(&commit, repo,
4818 		    start_id);
4819 		if (error != NULL)
4820 			goto done;
4821 		got_object_commit_close(commit);
4822 	} else {
4823 		error = got_keyword_to_idstr(&keyword_idstr, start_commit,
4824 		    repo, worktree);
4825 		if (error != NULL)
4826 			goto done;
4827 		if (keyword_idstr != NULL)
4828 			start_commit = keyword_idstr;
4829 
4830 		error = got_repo_match_object_id(&start_id, NULL,
4831 		    start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4832 		if (error != NULL)
4833 			goto done;
4834 	}
4835 	if (end_commit != NULL) {
4836 		error = got_keyword_to_idstr(&keyword_idstr, end_commit,
4837 		    repo, worktree);
4838 		if (error != NULL)
4839 			goto done;
4840 		if (keyword_idstr != NULL)
4841 			end_commit = keyword_idstr;
4842 
4843 		error = got_repo_match_object_id(&end_id, NULL,
4844 		    end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4845 		if (error != NULL)
4846 			goto done;
4847 	}
4848 
4849 	if (worktree) {
4850 		/*
4851 		 * If a path was specified on the command line it was resolved
4852 		 * to a path in the work tree above. Prepend the work tree's
4853 		 * path prefix to obtain the corresponding in-repository path.
4854 		 */
4855 		if (path) {
4856 			const char *prefix;
4857 			prefix = got_worktree_get_path_prefix(worktree);
4858 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
4859 			    (path[0] != '\0') ? "/" : "", path) == -1) {
4860 				error = got_error_from_errno("asprintf");
4861 				goto done;
4862 			}
4863 		}
4864 	} else
4865 		error = got_repo_map_path(&in_repo_path, repo,
4866 		    path ? path : "");
4867 	if (error != NULL)
4868 		goto done;
4869 	if (in_repo_path) {
4870 		free(path);
4871 		path = in_repo_path;
4872 	}
4873 
4874 	if (worktree) {
4875 		/* Release work tree lock. */
4876 		got_worktree_close(worktree);
4877 		worktree = NULL;
4878 	}
4879 
4880 	if (search_pattern && show_patch) {
4881 		tmpfile = got_opentemp();
4882 		if (tmpfile == NULL) {
4883 			error = got_error_from_errno("got_opentemp");
4884 			goto done;
4885 		}
4886 	}
4887 
4888 	error = print_commits(start_id, end_id, repo, path ? path : "",
4889 	    show_changed_paths, show_diffstat, show_patch, search_pattern,
4890 	    diff_context, limit, log_branches, reverse_display_order,
4891 	    refs_idmap, one_line, toposort, tmpfile);
4892 done:
4893 	free(path);
4894 	free(repo_path);
4895 	free(cwd);
4896 	free(start_id);
4897 	free(end_id);
4898 	free(keyword_idstr);
4899 	if (worktree)
4900 		got_worktree_close(worktree);
4901 	if (repo) {
4902 		const struct got_error *close_err = got_repo_close(repo);
4903 		if (error == NULL)
4904 			error = close_err;
4905 	}
4906 	if (pack_fds) {
4907 		const struct got_error *pack_err =
4908 		    got_repo_pack_fds_close(pack_fds);
4909 		if (error == NULL)
4910 			error = pack_err;
4911 	}
4912 	if (refs_idmap)
4913 		got_reflist_object_id_map_free(refs_idmap);
4914 	if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4915 		error = got_error_from_errno("fclose");
4916 	got_ref_list_free(&refs);
4917 	return error;
4918 }
4919 
4920 __dead static void
4921 usage_diff(void)
4922 {
4923 	fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4924 	    "[-r repository-path] [object1 object2 | path ...]\n",
4925 	    getprogname());
4926 	exit(1);
4927 }
4928 
4929 struct print_diff_arg {
4930 	struct got_repository *repo;
4931 	struct got_worktree *worktree;
4932 	struct got_diffstat_cb_arg *diffstat;
4933 	int diff_context;
4934 	const char *id_str;
4935 	int header_shown;
4936 	int diff_staged;
4937 	enum got_diff_algorithm diff_algo;
4938 	int ignore_whitespace;
4939 	int force_text_diff;
4940 	FILE *f1;
4941 	FILE *f2;
4942 	FILE *outfile;
4943 };
4944 
4945 /*
4946  * Create a file which contains the target path of a symlink so we can feed
4947  * it as content to the diff engine.
4948  */
4949 static const struct got_error *
4950 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4951     const char *abspath)
4952 {
4953 	const struct got_error *err = NULL;
4954 	char target_path[PATH_MAX];
4955 	ssize_t target_len, outlen;
4956 
4957 	*fd = -1;
4958 
4959 	if (dirfd != -1) {
4960 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4961 		if (target_len == -1)
4962 			return got_error_from_errno2("readlinkat", abspath);
4963 	} else {
4964 		target_len = readlink(abspath, target_path, PATH_MAX);
4965 		if (target_len == -1)
4966 			return got_error_from_errno2("readlink", abspath);
4967 	}
4968 
4969 	*fd = got_opentempfd();
4970 	if (*fd == -1)
4971 		return got_error_from_errno("got_opentempfd");
4972 
4973 	outlen = write(*fd, target_path, target_len);
4974 	if (outlen == -1) {
4975 		err = got_error_from_errno("got_opentempfd");
4976 		goto done;
4977 	}
4978 
4979 	if (lseek(*fd, 0, SEEK_SET) == -1) {
4980 		err = got_error_from_errno2("lseek", abspath);
4981 		goto done;
4982 	}
4983 done:
4984 	if (err) {
4985 		close(*fd);
4986 		*fd = -1;
4987 	}
4988 	return err;
4989 }
4990 
4991 static const struct got_error *
4992 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4993     const char *path, struct got_object_id *blob_id,
4994     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4995     int dirfd, const char *de_name)
4996 {
4997 	struct print_diff_arg *a = arg;
4998 	const struct got_error *err = NULL;
4999 	struct got_blob_object *blob1 = NULL;
5000 	int fd = -1, fd1 = -1, fd2 = -1;
5001 	FILE *f2 = NULL;
5002 	char *abspath = NULL, *label1 = NULL;
5003 	struct stat sb;
5004 	off_t size1 = 0;
5005 	int f2_exists = 0;
5006 
5007 	memset(&sb, 0, sizeof(sb));
5008 
5009 	if (a->diff_staged) {
5010 		if (staged_status != GOT_STATUS_MODIFY &&
5011 		    staged_status != GOT_STATUS_ADD &&
5012 		    staged_status != GOT_STATUS_DELETE)
5013 			return NULL;
5014 	} else {
5015 		if (staged_status == GOT_STATUS_DELETE)
5016 			return NULL;
5017 		if (status == GOT_STATUS_NONEXISTENT)
5018 			return got_error_set_errno(ENOENT, path);
5019 		if (status != GOT_STATUS_MODIFY &&
5020 		    status != GOT_STATUS_ADD &&
5021 		    status != GOT_STATUS_DELETE &&
5022 		    status != GOT_STATUS_CONFLICT)
5023 			return NULL;
5024 	}
5025 
5026 	err = got_opentemp_truncate(a->f1);
5027 	if (err)
5028 		return got_error_from_errno("got_opentemp_truncate");
5029 	err = got_opentemp_truncate(a->f2);
5030 	if (err)
5031 		return got_error_from_errno("got_opentemp_truncate");
5032 
5033 	if (!a->header_shown) {
5034 		if (fprintf(a->outfile, "diff %s%s\n",
5035 		    a->diff_staged ? "-s " : "",
5036 		    got_worktree_get_root_path(a->worktree)) < 0) {
5037 			err = got_error_from_errno("fprintf");
5038 			goto done;
5039 		}
5040 		if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
5041 			err = got_error_from_errno("fprintf");
5042 			goto done;
5043 		}
5044 		if (fprintf(a->outfile, "path + %s%s\n",
5045 		    got_worktree_get_root_path(a->worktree),
5046 		    a->diff_staged ? " (staged changes)" : "") < 0) {
5047 			err = got_error_from_errno("fprintf");
5048 			goto done;
5049 		}
5050 		a->header_shown = 1;
5051 	}
5052 
5053 	if (a->diff_staged) {
5054 		const char *label1 = NULL, *label2 = NULL;
5055 		switch (staged_status) {
5056 		case GOT_STATUS_MODIFY:
5057 			label1 = path;
5058 			label2 = path;
5059 			break;
5060 		case GOT_STATUS_ADD:
5061 			label2 = path;
5062 			break;
5063 		case GOT_STATUS_DELETE:
5064 			label1 = path;
5065 			break;
5066 		default:
5067 			return got_error(GOT_ERR_FILE_STATUS);
5068 		}
5069 		fd1 = got_opentempfd();
5070 		if (fd1 == -1) {
5071 			err = got_error_from_errno("got_opentempfd");
5072 			goto done;
5073 		}
5074 		fd2 = got_opentempfd();
5075 		if (fd2 == -1) {
5076 			err = got_error_from_errno("got_opentempfd");
5077 			goto done;
5078 		}
5079 		err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
5080 		    fd1, fd2, blob_id, staged_blob_id, label1, label2,
5081 		    a->diff_algo, a->diff_context, a->ignore_whitespace,
5082 		    a->force_text_diff, a->diffstat, a->repo, a->outfile);
5083 		goto done;
5084 	}
5085 
5086 	fd1 = got_opentempfd();
5087 	if (fd1 == -1) {
5088 		err = got_error_from_errno("got_opentempfd");
5089 		goto done;
5090 	}
5091 
5092 	if (staged_status == GOT_STATUS_ADD ||
5093 	    staged_status == GOT_STATUS_MODIFY) {
5094 		char *id_str;
5095 		err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
5096 		    8192, fd1);
5097 		if (err)
5098 			goto done;
5099 		err = got_object_id_str(&id_str, staged_blob_id);
5100 		if (err)
5101 			goto done;
5102 		if (asprintf(&label1, "%s (staged)", id_str) == -1) {
5103 			err = got_error_from_errno("asprintf");
5104 			free(id_str);
5105 			goto done;
5106 		}
5107 		free(id_str);
5108 	} else if (status != GOT_STATUS_ADD) {
5109 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
5110 		    fd1);
5111 		if (err)
5112 			goto done;
5113 	}
5114 
5115 	if (status != GOT_STATUS_DELETE) {
5116 		if (asprintf(&abspath, "%s/%s",
5117 		    got_worktree_get_root_path(a->worktree), path) == -1) {
5118 			err = got_error_from_errno("asprintf");
5119 			goto done;
5120 		}
5121 
5122 		if (dirfd != -1) {
5123 			fd = openat(dirfd, de_name,
5124 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5125 			if (fd == -1) {
5126 				if (!got_err_open_nofollow_on_symlink()) {
5127 					err = got_error_from_errno2("openat",
5128 					    abspath);
5129 					goto done;
5130 				}
5131 				err = get_symlink_target_file(&fd, dirfd,
5132 				    de_name, abspath);
5133 				if (err)
5134 					goto done;
5135 			}
5136 		} else {
5137 			fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5138 			if (fd == -1) {
5139 				if (!got_err_open_nofollow_on_symlink()) {
5140 					err = got_error_from_errno2("open",
5141 					    abspath);
5142 					goto done;
5143 				}
5144 				err = get_symlink_target_file(&fd, dirfd,
5145 				    de_name, abspath);
5146 				if (err)
5147 					goto done;
5148 			}
5149 		}
5150 		if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
5151 			err = got_error_from_errno2("fstatat", abspath);
5152 			goto done;
5153 		}
5154 		f2 = fdopen(fd, "r");
5155 		if (f2 == NULL) {
5156 			err = got_error_from_errno2("fdopen", abspath);
5157 			goto done;
5158 		}
5159 		fd = -1;
5160 		f2_exists = 1;
5161 	}
5162 
5163 	if (blob1) {
5164 		err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5165 		    a->f1, blob1);
5166 		if (err)
5167 			goto done;
5168 	}
5169 
5170 	err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
5171 	    f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
5172 	    a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
5173 done:
5174 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5175 		err = got_error_from_errno("close");
5176 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5177 		err = got_error_from_errno("close");
5178 	if (blob1)
5179 		got_object_blob_close(blob1);
5180 	if (fd != -1 && close(fd) == -1 && err == NULL)
5181 		err = got_error_from_errno("close");
5182 	if (f2 && fclose(f2) == EOF && err == NULL)
5183 		err = got_error_from_errno("fclose");
5184 	free(abspath);
5185 	return err;
5186 }
5187 
5188 static const struct got_error *
5189 cmd_diff(int argc, char *argv[])
5190 {
5191 	const struct got_error *error;
5192 	struct got_repository *repo = NULL;
5193 	struct got_worktree *worktree = NULL;
5194 	char *cwd = NULL, *repo_path = NULL;
5195 	const char *commit_args[2] = { NULL, NULL };
5196 	int ncommit_args = 0;
5197 	struct got_object_id *ids[2] = { NULL, NULL };
5198 	char *labels[2] = { NULL, NULL };
5199 	int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5200 	int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5201 	int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5202 	const char *errstr;
5203 	struct got_reflist_head refs;
5204 	struct got_pathlist_head diffstat_paths, paths;
5205 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5206 	int fd1 = -1, fd2 = -1;
5207 	int *pack_fds = NULL;
5208 	struct got_diffstat_cb_arg dsa;
5209 
5210 	memset(&dsa, 0, sizeof(dsa));
5211 
5212 	TAILQ_INIT(&refs);
5213 	TAILQ_INIT(&paths);
5214 	TAILQ_INIT(&diffstat_paths);
5215 
5216 #ifndef PROFILE
5217 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5218 	    NULL) == -1)
5219 		err(1, "pledge");
5220 #endif
5221 
5222 	while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5223 		switch (ch) {
5224 		case 'a':
5225 			force_text_diff = 1;
5226 			break;
5227 		case 'C':
5228 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5229 			    &errstr);
5230 			if (errstr != NULL)
5231 				errx(1, "number of context lines is %s: %s",
5232 				    errstr, optarg);
5233 			break;
5234 		case 'c':
5235 			if (ncommit_args >= 2)
5236 				errx(1, "too many -c options used");
5237 			commit_args[ncommit_args++] = optarg;
5238 			break;
5239 		case 'd':
5240 			show_diffstat = 1;
5241 			break;
5242 		case 'P':
5243 			force_path = 1;
5244 			break;
5245 		case 'r':
5246 			repo_path = realpath(optarg, NULL);
5247 			if (repo_path == NULL)
5248 				return got_error_from_errno2("realpath",
5249 				    optarg);
5250 			got_path_strip_trailing_slashes(repo_path);
5251 			rflag = 1;
5252 			break;
5253 		case 's':
5254 			diff_staged = 1;
5255 			break;
5256 		case 'w':
5257 			ignore_whitespace = 1;
5258 			break;
5259 		default:
5260 			usage_diff();
5261 			/* NOTREACHED */
5262 		}
5263 	}
5264 
5265 	argc -= optind;
5266 	argv += optind;
5267 
5268 	cwd = getcwd(NULL, 0);
5269 	if (cwd == NULL) {
5270 		error = got_error_from_errno("getcwd");
5271 		goto done;
5272 	}
5273 
5274 	error = got_repo_pack_fds_open(&pack_fds);
5275 	if (error != NULL)
5276 		goto done;
5277 
5278 	if (repo_path == NULL) {
5279 		error = got_worktree_open(&worktree, cwd,
5280 		    GOT_WORKTREE_GOT_DIR);
5281 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5282 			goto done;
5283 		else
5284 			error = NULL;
5285 		if (worktree) {
5286 			repo_path =
5287 			    strdup(got_worktree_get_repo_path(worktree));
5288 			if (repo_path == NULL) {
5289 				error = got_error_from_errno("strdup");
5290 				goto done;
5291 			}
5292 		} else {
5293 			repo_path = strdup(cwd);
5294 			if (repo_path == NULL) {
5295 				error = got_error_from_errno("strdup");
5296 				goto done;
5297 			}
5298 		}
5299 	}
5300 
5301 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5302 	free(repo_path);
5303 	if (error != NULL)
5304 		goto done;
5305 
5306 	if (show_diffstat) {
5307 		dsa.paths = &diffstat_paths;
5308 		dsa.force_text = force_text_diff;
5309 		dsa.ignore_ws = ignore_whitespace;
5310 		dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5311 	}
5312 
5313 	if (rflag || worktree == NULL || ncommit_args > 0) {
5314 		if (force_path) {
5315 			error = got_error_msg(GOT_ERR_NOT_IMPL,
5316 			    "-P option can only be used when diffing "
5317 			    "a work tree");
5318 			goto done;
5319 		}
5320 		if (diff_staged) {
5321 			error = got_error_msg(GOT_ERR_NOT_IMPL,
5322 			    "-s option can only be used when diffing "
5323 			    "a work tree");
5324 			goto done;
5325 		}
5326 	}
5327 
5328 	error = apply_unveil(got_repo_get_path(repo), 1,
5329 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
5330 	if (error)
5331 		goto done;
5332 
5333 	if ((!force_path && argc == 2) || ncommit_args > 0) {
5334 		int obj_type = (ncommit_args > 0 ?
5335 		    GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5336 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5337 		    NULL);
5338 		if (error)
5339 			goto done;
5340 		for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5341 			const char	*arg;
5342 			char		*keyword_idstr = NULL;
5343 
5344 			if (ncommit_args > 0)
5345 				arg = commit_args[i];
5346 			else
5347 				arg = argv[i];
5348 
5349 			error = got_keyword_to_idstr(&keyword_idstr, arg,
5350 			    repo, worktree);
5351 			if (error != NULL)
5352 				goto done;
5353 			if (keyword_idstr != NULL)
5354 				arg = keyword_idstr;
5355 
5356 			error = got_repo_match_object_id(&ids[i], &labels[i],
5357 			    arg, obj_type, &refs, repo);
5358 			free(keyword_idstr);
5359 			if (error) {
5360 				if (error->code != GOT_ERR_NOT_REF &&
5361 				    error->code != GOT_ERR_NO_OBJ)
5362 					goto done;
5363 				if (ncommit_args > 0)
5364 					goto done;
5365 				error = NULL;
5366 				break;
5367 			}
5368 		}
5369 	}
5370 
5371 	f1 = got_opentemp();
5372 	if (f1 == NULL) {
5373 		error = got_error_from_errno("got_opentemp");
5374 		goto done;
5375 	}
5376 
5377 	f2 = got_opentemp();
5378 	if (f2 == NULL) {
5379 		error = got_error_from_errno("got_opentemp");
5380 		goto done;
5381 	}
5382 
5383 	outfile = got_opentemp();
5384 	if (outfile == NULL) {
5385 		error = got_error_from_errno("got_opentemp");
5386 		goto done;
5387 	}
5388 
5389 	if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5390 		struct print_diff_arg arg;
5391 		char *id_str;
5392 
5393 		if (worktree == NULL) {
5394 			if (argc == 2 && ids[0] == NULL) {
5395 				error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5396 				goto done;
5397 			} else if (argc == 2 && ids[1] == NULL) {
5398 				error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5399 				goto done;
5400 			} else if (argc > 0) {
5401 				error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5402 				    "%s", "specified paths cannot be resolved");
5403 				goto done;
5404 			} else {
5405 				error = got_error(GOT_ERR_NOT_WORKTREE);
5406 				goto done;
5407 			}
5408 		}
5409 
5410 		error = get_worktree_paths_from_argv(&paths, argc, argv,
5411 		    worktree);
5412 		if (error)
5413 			goto done;
5414 
5415 		error = got_object_id_str(&id_str,
5416 		    got_worktree_get_base_commit_id(worktree));
5417 		if (error)
5418 			goto done;
5419 		arg.repo = repo;
5420 		arg.worktree = worktree;
5421 		arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5422 		arg.diff_context = diff_context;
5423 		arg.id_str = id_str;
5424 		arg.header_shown = 0;
5425 		arg.diff_staged = diff_staged;
5426 		arg.ignore_whitespace = ignore_whitespace;
5427 		arg.force_text_diff = force_text_diff;
5428 		arg.diffstat = show_diffstat ? &dsa : NULL;
5429 		arg.f1 = f1;
5430 		arg.f2 = f2;
5431 		arg.outfile = outfile;
5432 
5433 		error = got_worktree_status(worktree, &paths, repo, 0,
5434 		    print_diff, &arg, check_cancelled, NULL);
5435 		free(id_str);
5436 		if (error)
5437 			goto done;
5438 
5439 		if (show_diffstat && dsa.nfiles > 0) {
5440 			char *header;
5441 
5442 			if (asprintf(&header, "diffstat %s%s",
5443 			    diff_staged ? "-s " : "",
5444 			    got_worktree_get_root_path(worktree)) == -1) {
5445 				error = got_error_from_errno("asprintf");
5446 				goto done;
5447 			}
5448 
5449 			error = print_diffstat(&dsa, header);
5450 			free(header);
5451 			if (error)
5452 				goto done;
5453 		}
5454 
5455 		error = printfile(outfile);
5456 		goto done;
5457 	}
5458 
5459 	if (ncommit_args == 1) {
5460 		struct got_commit_object *commit;
5461 		error = got_object_open_as_commit(&commit, repo, ids[0]);
5462 		if (error)
5463 			goto done;
5464 
5465 		labels[1] = labels[0];
5466 		ids[1] = ids[0];
5467 		if (got_object_commit_get_nparents(commit) > 0) {
5468 			const struct got_object_id_queue *pids;
5469 			struct got_object_qid *pid;
5470 			pids = got_object_commit_get_parent_ids(commit);
5471 			pid = STAILQ_FIRST(pids);
5472 			ids[0] = got_object_id_dup(&pid->id);
5473 			if (ids[0] == NULL) {
5474 				error = got_error_from_errno(
5475 				    "got_object_id_dup");
5476 				got_object_commit_close(commit);
5477 				goto done;
5478 			}
5479 			error = got_object_id_str(&labels[0], ids[0]);
5480 			if (error) {
5481 				got_object_commit_close(commit);
5482 				goto done;
5483 			}
5484 		} else {
5485 			ids[0] = NULL;
5486 			labels[0] = strdup("/dev/null");
5487 			if (labels[0] == NULL) {
5488 				error = got_error_from_errno("strdup");
5489 				got_object_commit_close(commit);
5490 				goto done;
5491 			}
5492 		}
5493 
5494 		got_object_commit_close(commit);
5495 	}
5496 
5497 	if (ncommit_args == 0 && argc > 2) {
5498 		error = got_error_msg(GOT_ERR_BAD_PATH,
5499 		    "path arguments cannot be used when diffing two objects");
5500 		goto done;
5501 	}
5502 
5503 	if (ids[0]) {
5504 		error = got_object_get_type(&type1, repo, ids[0]);
5505 		if (error)
5506 			goto done;
5507 	}
5508 
5509 	error = got_object_get_type(&type2, repo, ids[1]);
5510 	if (error)
5511 		goto done;
5512 	if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5513 		error = got_error(GOT_ERR_OBJ_TYPE);
5514 		goto done;
5515 	}
5516 	if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5517 		error = got_error_msg(GOT_ERR_OBJ_TYPE,
5518 		    "path arguments cannot be used when diffing blobs");
5519 		goto done;
5520 	}
5521 
5522 	for (i = 0; ncommit_args > 0 && i < argc; i++) {
5523 		char *in_repo_path;
5524 		struct got_pathlist_entry *new;
5525 		if (worktree) {
5526 			const char *prefix;
5527 			char *p;
5528 			error = got_worktree_resolve_path(&p, worktree,
5529 			    argv[i]);
5530 			if (error)
5531 				goto done;
5532 			prefix = got_worktree_get_path_prefix(worktree);
5533 			while (prefix[0] == '/')
5534 				prefix++;
5535 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
5536 			    (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5537 			    p) == -1) {
5538 				error = got_error_from_errno("asprintf");
5539 				free(p);
5540 				goto done;
5541 			}
5542 			free(p);
5543 		} else {
5544 			char *mapped_path, *s;
5545 			error = got_repo_map_path(&mapped_path, repo, argv[i]);
5546 			if (error)
5547 				goto done;
5548 			s = mapped_path;
5549 			while (s[0] == '/')
5550 				s++;
5551 			in_repo_path = strdup(s);
5552 			if (in_repo_path == NULL) {
5553 				error = got_error_from_errno("asprintf");
5554 				free(mapped_path);
5555 				goto done;
5556 			}
5557 			free(mapped_path);
5558 
5559 		}
5560 		error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5561 		if (error || new == NULL /* duplicate */)
5562 			free(in_repo_path);
5563 		if (error)
5564 			goto done;
5565 	}
5566 
5567 	if (worktree) {
5568 		/* Release work tree lock. */
5569 		got_worktree_close(worktree);
5570 		worktree = NULL;
5571 	}
5572 
5573 	fd1 = got_opentempfd();
5574 	if (fd1 == -1) {
5575 		error = got_error_from_errno("got_opentempfd");
5576 		goto done;
5577 	}
5578 
5579 	fd2 = got_opentempfd();
5580 	if (fd2 == -1) {
5581 		error = got_error_from_errno("got_opentempfd");
5582 		goto done;
5583 	}
5584 
5585 	switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5586 	case GOT_OBJ_TYPE_BLOB:
5587 		error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5588 		    fd1, fd2, ids[0], ids[1], NULL, NULL,
5589 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5590 		    ignore_whitespace, force_text_diff,
5591 		    show_diffstat ? &dsa : NULL, repo, outfile);
5592 		break;
5593 	case GOT_OBJ_TYPE_TREE:
5594 		error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5595 		    ids[0], ids[1], &paths, "", "",
5596 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5597 		    ignore_whitespace, force_text_diff,
5598 		    show_diffstat ? &dsa : NULL, repo, outfile);
5599 		break;
5600 	case GOT_OBJ_TYPE_COMMIT:
5601 		fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5602 		error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5603 		    fd1, fd2, ids[0], ids[1], &paths,
5604 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5605 		    ignore_whitespace, force_text_diff,
5606 		    show_diffstat ? &dsa : NULL, repo, outfile);
5607 		break;
5608 	default:
5609 		error = got_error(GOT_ERR_OBJ_TYPE);
5610 	}
5611 	if (error)
5612 		goto done;
5613 
5614 	if (show_diffstat && dsa.nfiles > 0) {
5615 		char *header = NULL;
5616 
5617 		if (asprintf(&header, "diffstat %s %s",
5618 		    labels[0], labels[1]) == -1) {
5619 			error = got_error_from_errno("asprintf");
5620 			goto done;
5621 		}
5622 
5623 		error = print_diffstat(&dsa, header);
5624 		free(header);
5625 		if (error)
5626 			goto done;
5627 	}
5628 
5629 	error = printfile(outfile);
5630 
5631 done:
5632 	free(labels[0]);
5633 	free(labels[1]);
5634 	free(ids[0]);
5635 	free(ids[1]);
5636 	if (worktree)
5637 		got_worktree_close(worktree);
5638 	if (repo) {
5639 		const struct got_error *close_err = got_repo_close(repo);
5640 		if (error == NULL)
5641 			error = close_err;
5642 	}
5643 	if (pack_fds) {
5644 		const struct got_error *pack_err =
5645 		    got_repo_pack_fds_close(pack_fds);
5646 		if (error == NULL)
5647 			error = pack_err;
5648 	}
5649 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5650 	got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5651 	got_ref_list_free(&refs);
5652 	if (outfile && fclose(outfile) == EOF && error == NULL)
5653 		error = got_error_from_errno("fclose");
5654 	if (f1 && fclose(f1) == EOF && error == NULL)
5655 		error = got_error_from_errno("fclose");
5656 	if (f2 && fclose(f2) == EOF && error == NULL)
5657 		error = got_error_from_errno("fclose");
5658 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5659 		error = got_error_from_errno("close");
5660 	if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5661 		error = got_error_from_errno("close");
5662 	return error;
5663 }
5664 
5665 __dead static void
5666 usage_blame(void)
5667 {
5668 	fprintf(stderr,
5669 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
5670 	    getprogname());
5671 	exit(1);
5672 }
5673 
5674 struct blame_line {
5675 	int annotated;
5676 	char *id_str;
5677 	char *committer;
5678 	char datebuf[11]; /* YYYY-MM-DD + NUL */
5679 };
5680 
5681 struct blame_cb_args {
5682 	struct blame_line *lines;
5683 	int nlines;
5684 	int nlines_prec;
5685 	int lineno_cur;
5686 	off_t *line_offsets;
5687 	FILE *f;
5688 	struct got_repository *repo;
5689 };
5690 
5691 static const struct got_error *
5692 blame_cb(void *arg, int nlines, int lineno,
5693     struct got_commit_object *commit, struct got_object_id *id)
5694 {
5695 	const struct got_error *err = NULL;
5696 	struct blame_cb_args *a = arg;
5697 	struct blame_line *bline;
5698 	char *line = NULL;
5699 	size_t linesize = 0;
5700 	off_t offset;
5701 	struct tm tm;
5702 	time_t committer_time;
5703 
5704 	if (nlines != a->nlines ||
5705 	    (lineno != -1 && lineno < 1) || lineno > a->nlines)
5706 		return got_error(GOT_ERR_RANGE);
5707 
5708 	if (sigint_received)
5709 		return got_error(GOT_ERR_ITER_COMPLETED);
5710 
5711 	if (lineno == -1)
5712 		return NULL; /* no change in this commit */
5713 
5714 	/* Annotate this line. */
5715 	bline = &a->lines[lineno - 1];
5716 	if (bline->annotated)
5717 		return NULL;
5718 	err = got_object_id_str(&bline->id_str, id);
5719 	if (err)
5720 		return err;
5721 
5722 	bline->committer = strdup(got_object_commit_get_committer(commit));
5723 	if (bline->committer == NULL) {
5724 		err = got_error_from_errno("strdup");
5725 		goto done;
5726 	}
5727 
5728 	committer_time = got_object_commit_get_committer_time(commit);
5729 	if (gmtime_r(&committer_time, &tm) == NULL)
5730 		return got_error_from_errno("gmtime_r");
5731 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5732 	    &tm) == 0) {
5733 		err = got_error(GOT_ERR_NO_SPACE);
5734 		goto done;
5735 	}
5736 	bline->annotated = 1;
5737 
5738 	/* Print lines annotated so far. */
5739 	bline = &a->lines[a->lineno_cur - 1];
5740 	if (!bline->annotated)
5741 		goto done;
5742 
5743 	offset = a->line_offsets[a->lineno_cur - 1];
5744 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
5745 		err = got_error_from_errno("fseeko");
5746 		goto done;
5747 	}
5748 
5749 	while (a->lineno_cur <= a->nlines && bline->annotated) {
5750 		char *smallerthan, *at, *nl, *committer;
5751 		size_t len;
5752 
5753 		if (getline(&line, &linesize, a->f) == -1) {
5754 			if (ferror(a->f))
5755 				err = got_error_from_errno("getline");
5756 			break;
5757 		}
5758 
5759 		committer = bline->committer;
5760 		smallerthan = strchr(committer, '<');
5761 		if (smallerthan && smallerthan[1] != '\0')
5762 			committer = smallerthan + 1;
5763 		at = strchr(committer, '@');
5764 		if (at)
5765 			*at = '\0';
5766 		len = strlen(committer);
5767 		if (len >= 9)
5768 			committer[8] = '\0';
5769 
5770 		nl = strchr(line, '\n');
5771 		if (nl)
5772 			*nl = '\0';
5773 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5774 		    bline->id_str, bline->datebuf, committer, line);
5775 
5776 		a->lineno_cur++;
5777 		bline = &a->lines[a->lineno_cur - 1];
5778 	}
5779 done:
5780 	free(line);
5781 	return err;
5782 }
5783 
5784 static const struct got_error *
5785 cmd_blame(int argc, char *argv[])
5786 {
5787 	const struct got_error *error;
5788 	struct got_repository *repo = NULL;
5789 	struct got_worktree *worktree = NULL;
5790 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5791 	char *link_target = NULL;
5792 	struct got_object_id *obj_id = NULL;
5793 	struct got_object_id *commit_id = NULL;
5794 	struct got_commit_object *commit = NULL;
5795 	struct got_blob_object *blob = NULL;
5796 	char *commit_id_str = NULL, *keyword_idstr = NULL;
5797 	struct blame_cb_args bca;
5798 	int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5799 	off_t filesize;
5800 	int *pack_fds = NULL;
5801 	FILE *f1 = NULL, *f2 = NULL;
5802 
5803 	fd1 = got_opentempfd();
5804 	if (fd1 == -1)
5805 		return got_error_from_errno("got_opentempfd");
5806 
5807 	memset(&bca, 0, sizeof(bca));
5808 
5809 #ifndef PROFILE
5810 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5811 	    NULL) == -1)
5812 		err(1, "pledge");
5813 #endif
5814 
5815 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5816 		switch (ch) {
5817 		case 'c':
5818 			commit_id_str = optarg;
5819 			break;
5820 		case 'r':
5821 			repo_path = realpath(optarg, NULL);
5822 			if (repo_path == NULL)
5823 				return got_error_from_errno2("realpath",
5824 				    optarg);
5825 			got_path_strip_trailing_slashes(repo_path);
5826 			break;
5827 		default:
5828 			usage_blame();
5829 			/* NOTREACHED */
5830 		}
5831 	}
5832 
5833 	argc -= optind;
5834 	argv += optind;
5835 
5836 	if (argc == 1)
5837 		path = argv[0];
5838 	else
5839 		usage_blame();
5840 
5841 	cwd = getcwd(NULL, 0);
5842 	if (cwd == NULL) {
5843 		error = got_error_from_errno("getcwd");
5844 		goto done;
5845 	}
5846 
5847 	error = got_repo_pack_fds_open(&pack_fds);
5848 	if (error != NULL)
5849 		goto done;
5850 
5851 	if (repo_path == NULL) {
5852 		error = got_worktree_open(&worktree, cwd,
5853 		    GOT_WORKTREE_GOT_DIR);
5854 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5855 			goto done;
5856 		else
5857 			error = NULL;
5858 		if (worktree) {
5859 			repo_path =
5860 			    strdup(got_worktree_get_repo_path(worktree));
5861 			if (repo_path == NULL) {
5862 				error = got_error_from_errno("strdup");
5863 				if (error)
5864 					goto done;
5865 			}
5866 		} else {
5867 			repo_path = strdup(cwd);
5868 			if (repo_path == NULL) {
5869 				error = got_error_from_errno("strdup");
5870 				goto done;
5871 			}
5872 		}
5873 	}
5874 
5875 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5876 	if (error != NULL)
5877 		goto done;
5878 
5879 	if (worktree) {
5880 		const char *prefix = got_worktree_get_path_prefix(worktree);
5881 		char *p;
5882 
5883 		error = got_worktree_resolve_path(&p, worktree, path);
5884 		if (error)
5885 			goto done;
5886 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5887 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5888 		    p) == -1) {
5889 			error = got_error_from_errno("asprintf");
5890 			free(p);
5891 			goto done;
5892 		}
5893 		free(p);
5894 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5895 	} else {
5896 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5897 		if (error)
5898 			goto done;
5899 		error = got_repo_map_path(&in_repo_path, repo, path);
5900 	}
5901 	if (error)
5902 		goto done;
5903 
5904 	if (commit_id_str == NULL) {
5905 		struct got_reference *head_ref;
5906 		error = got_ref_open(&head_ref, repo, worktree ?
5907 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5908 		if (error != NULL)
5909 			goto done;
5910 		error = got_ref_resolve(&commit_id, repo, head_ref);
5911 		got_ref_close(head_ref);
5912 		if (error != NULL)
5913 			goto done;
5914 	} else {
5915 		struct got_reflist_head refs;
5916 
5917 		TAILQ_INIT(&refs);
5918 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5919 		    NULL);
5920 		if (error)
5921 			goto done;
5922 
5923 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
5924 		    repo, worktree);
5925 		if (error != NULL)
5926 			goto done;
5927 		if (keyword_idstr != NULL)
5928 			commit_id_str = keyword_idstr;
5929 
5930 		error = got_repo_match_object_id(&commit_id, NULL,
5931 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5932 		got_ref_list_free(&refs);
5933 		if (error)
5934 			goto done;
5935 	}
5936 
5937 	if (worktree) {
5938 		/* Release work tree lock. */
5939 		got_worktree_close(worktree);
5940 		worktree = NULL;
5941 	}
5942 
5943 	error = got_object_open_as_commit(&commit, repo, commit_id);
5944 	if (error)
5945 		goto done;
5946 
5947 	error = got_object_resolve_symlinks(&link_target, in_repo_path,
5948 	    commit, repo);
5949 	if (error)
5950 		goto done;
5951 
5952 	error = got_object_id_by_path(&obj_id, repo, commit,
5953 	    link_target ? link_target : in_repo_path);
5954 	if (error)
5955 		goto done;
5956 
5957 	error = got_object_get_type(&obj_type, repo, obj_id);
5958 	if (error)
5959 		goto done;
5960 
5961 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
5962 		error = got_error_path(link_target ? link_target : in_repo_path,
5963 		    GOT_ERR_OBJ_TYPE);
5964 		goto done;
5965 	}
5966 
5967 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5968 	if (error)
5969 		goto done;
5970 	bca.f = got_opentemp();
5971 	if (bca.f == NULL) {
5972 		error = got_error_from_errno("got_opentemp");
5973 		goto done;
5974 	}
5975 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5976 	    &bca.line_offsets, bca.f, blob);
5977 	if (error || bca.nlines == 0)
5978 		goto done;
5979 
5980 	/* Don't include \n at EOF in the blame line count. */
5981 	if (bca.line_offsets[bca.nlines - 1] == filesize)
5982 		bca.nlines--;
5983 
5984 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5985 	if (bca.lines == NULL) {
5986 		error = got_error_from_errno("calloc");
5987 		goto done;
5988 	}
5989 	bca.lineno_cur = 1;
5990 	bca.nlines_prec = 0;
5991 	i = bca.nlines;
5992 	while (i > 0) {
5993 		i /= 10;
5994 		bca.nlines_prec++;
5995 	}
5996 	bca.repo = repo;
5997 
5998 	fd2 = got_opentempfd();
5999 	if (fd2 == -1) {
6000 		error = got_error_from_errno("got_opentempfd");
6001 		goto done;
6002 	}
6003 	fd3 = got_opentempfd();
6004 	if (fd3 == -1) {
6005 		error = got_error_from_errno("got_opentempfd");
6006 		goto done;
6007 	}
6008 	f1 = got_opentemp();
6009 	if (f1 == NULL) {
6010 		error = got_error_from_errno("got_opentemp");
6011 		goto done;
6012 	}
6013 	f2 = got_opentemp();
6014 	if (f2 == NULL) {
6015 		error = got_error_from_errno("got_opentemp");
6016 		goto done;
6017 	}
6018 	error = got_blame(link_target ? link_target : in_repo_path, commit_id,
6019 	    repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
6020 	    check_cancelled, NULL, fd2, fd3, f1, f2);
6021 done:
6022 	free(keyword_idstr);
6023 	free(in_repo_path);
6024 	free(link_target);
6025 	free(repo_path);
6026 	free(cwd);
6027 	free(commit_id);
6028 	free(obj_id);
6029 	if (commit)
6030 		got_object_commit_close(commit);
6031 
6032 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
6033 		error = got_error_from_errno("close");
6034 	if (fd2 != -1 && close(fd2) == -1 && error == NULL)
6035 		error = got_error_from_errno("close");
6036 	if (fd3 != -1 && close(fd3) == -1 && error == NULL)
6037 		error = got_error_from_errno("close");
6038 	if (f1 && fclose(f1) == EOF && error == NULL)
6039 		error = got_error_from_errno("fclose");
6040 	if (f2 && fclose(f2) == EOF && error == NULL)
6041 		error = got_error_from_errno("fclose");
6042 
6043 	if (blob)
6044 		got_object_blob_close(blob);
6045 	if (worktree)
6046 		got_worktree_close(worktree);
6047 	if (repo) {
6048 		const struct got_error *close_err = got_repo_close(repo);
6049 		if (error == NULL)
6050 			error = close_err;
6051 	}
6052 	if (pack_fds) {
6053 		const struct got_error *pack_err =
6054 		    got_repo_pack_fds_close(pack_fds);
6055 		if (error == NULL)
6056 			error = pack_err;
6057 	}
6058 	if (bca.lines) {
6059 		for (i = 0; i < bca.nlines; i++) {
6060 			struct blame_line *bline = &bca.lines[i];
6061 			free(bline->id_str);
6062 			free(bline->committer);
6063 		}
6064 		free(bca.lines);
6065 	}
6066 	free(bca.line_offsets);
6067 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
6068 		error = got_error_from_errno("fclose");
6069 	return error;
6070 }
6071 
6072 __dead static void
6073 usage_tree(void)
6074 {
6075 	fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
6076 	    "[path]\n", getprogname());
6077 	exit(1);
6078 }
6079 
6080 static const struct got_error *
6081 print_entry(struct got_tree_entry *te, const char *id, const char *path,
6082     const char *root_path, struct got_repository *repo)
6083 {
6084 	const struct got_error *err = NULL;
6085 	int is_root_path = (strcmp(path, root_path) == 0);
6086 	const char *modestr = "";
6087 	mode_t mode = got_tree_entry_get_mode(te);
6088 	char *link_target = NULL;
6089 
6090 	path += strlen(root_path);
6091 	while (path[0] == '/')
6092 		path++;
6093 
6094 	if (got_object_tree_entry_is_submodule(te))
6095 		modestr = "$";
6096 	else if (S_ISLNK(mode)) {
6097 		int i;
6098 
6099 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
6100 		if (err)
6101 			return err;
6102 		for (i = 0; link_target[i] != '\0'; i++) {
6103 			if (!isprint((unsigned char)link_target[i]))
6104 				link_target[i] = '?';
6105 		}
6106 
6107 		modestr = "@";
6108 	}
6109 	else if (S_ISDIR(mode))
6110 		modestr = "/";
6111 	else if (mode & S_IXUSR)
6112 		modestr = "*";
6113 
6114 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
6115 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
6116 	    link_target ? " -> ": "", link_target ? link_target : "");
6117 
6118 	free(link_target);
6119 	return NULL;
6120 }
6121 
6122 static const struct got_error *
6123 print_tree(const char *path, struct got_commit_object *commit,
6124     int show_ids, int recurse, const char *root_path,
6125     struct got_repository *repo)
6126 {
6127 	const struct got_error *err = NULL;
6128 	struct got_object_id *tree_id = NULL;
6129 	struct got_tree_object *tree = NULL;
6130 	int nentries, i;
6131 
6132 	err = got_object_id_by_path(&tree_id, repo, commit, path);
6133 	if (err)
6134 		goto done;
6135 
6136 	err = got_object_open_as_tree(&tree, repo, tree_id);
6137 	if (err)
6138 		goto done;
6139 	nentries = got_object_tree_get_nentries(tree);
6140 	for (i = 0; i < nentries; i++) {
6141 		struct got_tree_entry *te;
6142 		char *id = NULL;
6143 
6144 		if (sigint_received || sigpipe_received)
6145 			break;
6146 
6147 		te = got_object_tree_get_entry(tree, i);
6148 		if (show_ids) {
6149 			char *id_str;
6150 			err = got_object_id_str(&id_str,
6151 			    got_tree_entry_get_id(te));
6152 			if (err)
6153 				goto done;
6154 			if (asprintf(&id, "%s ", id_str) == -1) {
6155 				err = got_error_from_errno("asprintf");
6156 				free(id_str);
6157 				goto done;
6158 			}
6159 			free(id_str);
6160 		}
6161 		err = print_entry(te, id, path, root_path, repo);
6162 		free(id);
6163 		if (err)
6164 			goto done;
6165 
6166 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
6167 			char *child_path;
6168 			if (asprintf(&child_path, "%s%s%s", path,
6169 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
6170 			    got_tree_entry_get_name(te)) == -1) {
6171 				err = got_error_from_errno("asprintf");
6172 				goto done;
6173 			}
6174 			err = print_tree(child_path, commit, show_ids, 1,
6175 			    root_path, repo);
6176 			free(child_path);
6177 			if (err)
6178 				goto done;
6179 		}
6180 	}
6181 done:
6182 	if (tree)
6183 		got_object_tree_close(tree);
6184 	free(tree_id);
6185 	return err;
6186 }
6187 
6188 static const struct got_error *
6189 cmd_tree(int argc, char *argv[])
6190 {
6191 	const struct got_error *error;
6192 	struct got_repository *repo = NULL;
6193 	struct got_worktree *worktree = NULL;
6194 	const char *path, *refname = NULL;
6195 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6196 	struct got_object_id *commit_id = NULL;
6197 	struct got_commit_object *commit = NULL;
6198 	char *commit_id_str = NULL, *keyword_idstr = NULL;
6199 	int show_ids = 0, recurse = 0;
6200 	int ch;
6201 	int *pack_fds = NULL;
6202 
6203 #ifndef PROFILE
6204 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6205 	    NULL) == -1)
6206 		err(1, "pledge");
6207 #endif
6208 
6209 	while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6210 		switch (ch) {
6211 		case 'c':
6212 			commit_id_str = optarg;
6213 			break;
6214 		case 'i':
6215 			show_ids = 1;
6216 			break;
6217 		case 'R':
6218 			recurse = 1;
6219 			break;
6220 		case 'r':
6221 			repo_path = realpath(optarg, NULL);
6222 			if (repo_path == NULL)
6223 				return got_error_from_errno2("realpath",
6224 				    optarg);
6225 			got_path_strip_trailing_slashes(repo_path);
6226 			break;
6227 		default:
6228 			usage_tree();
6229 			/* NOTREACHED */
6230 		}
6231 	}
6232 
6233 	argc -= optind;
6234 	argv += optind;
6235 
6236 	if (argc == 1)
6237 		path = argv[0];
6238 	else if (argc > 1)
6239 		usage_tree();
6240 	else
6241 		path = NULL;
6242 
6243 	cwd = getcwd(NULL, 0);
6244 	if (cwd == NULL) {
6245 		error = got_error_from_errno("getcwd");
6246 		goto done;
6247 	}
6248 
6249 	error = got_repo_pack_fds_open(&pack_fds);
6250 	if (error != NULL)
6251 		goto done;
6252 
6253 	if (repo_path == NULL) {
6254 		error = got_worktree_open(&worktree, cwd,
6255 		    GOT_WORKTREE_GOT_DIR);
6256 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6257 			goto done;
6258 		else
6259 			error = NULL;
6260 		if (worktree) {
6261 			repo_path =
6262 			    strdup(got_worktree_get_repo_path(worktree));
6263 			if (repo_path == NULL)
6264 				error = got_error_from_errno("strdup");
6265 			if (error)
6266 				goto done;
6267 		} else {
6268 			repo_path = strdup(cwd);
6269 			if (repo_path == NULL) {
6270 				error = got_error_from_errno("strdup");
6271 				goto done;
6272 			}
6273 		}
6274 	}
6275 
6276 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6277 	if (error != NULL)
6278 		goto done;
6279 
6280 	if (worktree) {
6281 		const char *prefix = got_worktree_get_path_prefix(worktree);
6282 		char *p;
6283 
6284 		if (path == NULL || got_path_is_root_dir(path))
6285 			path = "";
6286 		error = got_worktree_resolve_path(&p, worktree, path);
6287 		if (error)
6288 			goto done;
6289 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
6290 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ?  "/" : "",
6291 		    p) == -1) {
6292 			error = got_error_from_errno("asprintf");
6293 			free(p);
6294 			goto done;
6295 		}
6296 		free(p);
6297 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6298 		if (error)
6299 			goto done;
6300 	} else {
6301 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6302 		if (error)
6303 			goto done;
6304 		if (path == NULL)
6305 			path = "/";
6306 		error = got_repo_map_path(&in_repo_path, repo, path);
6307 		if (error != NULL)
6308 			goto done;
6309 	}
6310 
6311 	if (commit_id_str == NULL) {
6312 		struct got_reference *head_ref;
6313 		if (worktree)
6314 			refname = got_worktree_get_head_ref_name(worktree);
6315 		else
6316 			refname = GOT_REF_HEAD;
6317 		error = got_ref_open(&head_ref, repo, refname, 0);
6318 		if (error != NULL)
6319 			goto done;
6320 		error = got_ref_resolve(&commit_id, repo, head_ref);
6321 		got_ref_close(head_ref);
6322 		if (error != NULL)
6323 			goto done;
6324 	} else {
6325 		struct got_reflist_head refs;
6326 
6327 		TAILQ_INIT(&refs);
6328 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6329 		    NULL);
6330 		if (error)
6331 			goto done;
6332 
6333 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
6334 		    repo, worktree);
6335 		if (error != NULL)
6336 			goto done;
6337 		if (keyword_idstr != NULL)
6338 			commit_id_str = keyword_idstr;
6339 
6340 		error = got_repo_match_object_id(&commit_id, NULL,
6341 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6342 		got_ref_list_free(&refs);
6343 		if (error)
6344 			goto done;
6345 	}
6346 
6347 	if (worktree) {
6348 		/* Release work tree lock. */
6349 		got_worktree_close(worktree);
6350 		worktree = NULL;
6351 	}
6352 
6353 	error = got_object_open_as_commit(&commit, repo, commit_id);
6354 	if (error)
6355 		goto done;
6356 
6357 	error = print_tree(in_repo_path, commit, show_ids, recurse,
6358 	    in_repo_path, repo);
6359 done:
6360 	free(keyword_idstr);
6361 	free(in_repo_path);
6362 	free(repo_path);
6363 	free(cwd);
6364 	free(commit_id);
6365 	if (commit)
6366 		got_object_commit_close(commit);
6367 	if (worktree)
6368 		got_worktree_close(worktree);
6369 	if (repo) {
6370 		const struct got_error *close_err = got_repo_close(repo);
6371 		if (error == NULL)
6372 			error = close_err;
6373 	}
6374 	if (pack_fds) {
6375 		const struct got_error *pack_err =
6376 		    got_repo_pack_fds_close(pack_fds);
6377 		if (error == NULL)
6378 			error = pack_err;
6379 	}
6380 	return error;
6381 }
6382 
6383 __dead static void
6384 usage_status(void)
6385 {
6386 	fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6387 	    "[-s status-codes] [path ...]\n", getprogname());
6388 	exit(1);
6389 }
6390 
6391 struct got_status_arg {
6392 	char *status_codes;
6393 	int suppress;
6394 };
6395 
6396 static const struct got_error *
6397 print_status(void *arg, unsigned char status, unsigned char staged_status,
6398     const char *path, struct got_object_id *blob_id,
6399     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6400     int dirfd, const char *de_name)
6401 {
6402 	struct got_status_arg *st = arg;
6403 
6404 	if (status == staged_status && (status == GOT_STATUS_DELETE))
6405 		status = GOT_STATUS_NO_CHANGE;
6406 	if (st != NULL && st->status_codes) {
6407 		size_t ncodes = strlen(st->status_codes);
6408 		int i, j = 0;
6409 
6410 		for (i = 0; i < ncodes ; i++) {
6411 			if (st->suppress) {
6412 				if (status == st->status_codes[i] ||
6413 				    staged_status == st->status_codes[i]) {
6414 					j++;
6415 					continue;
6416 				}
6417 			} else {
6418 				if (status == st->status_codes[i] ||
6419 				    staged_status == st->status_codes[i])
6420 					break;
6421 			}
6422 		}
6423 
6424 		if (st->suppress && j == 0)
6425 			goto print;
6426 
6427 		if (i == ncodes)
6428 			return NULL;
6429 	}
6430 print:
6431 	printf("%c%c %s\n", status, staged_status, path);
6432 	return NULL;
6433 }
6434 
6435 static const struct got_error *
6436 show_operation_in_progress(struct got_worktree *worktree,
6437     struct got_repository *repo)
6438 {
6439 	const struct got_error *err;
6440 	char *new_base_branch_name = NULL;
6441 	char *branch_name = NULL;
6442 	int rebase_in_progress, histedit_in_progress, merge_in_progress;
6443 
6444 	err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6445 	if (err)
6446 		return err;
6447 	if (rebase_in_progress) {
6448 		err = got_worktree_rebase_info(&new_base_branch_name,
6449 		    &branch_name, worktree, repo);
6450 		if (err)
6451 			return err;
6452 		printf("Work tree is rebasing %s onto %s\n",
6453 		    branch_name, new_base_branch_name);
6454 	}
6455 
6456 	err = got_worktree_histedit_in_progress(&histedit_in_progress,
6457 	    worktree);
6458 	if (err)
6459 		return err;
6460 	if (histedit_in_progress) {
6461 		err = got_worktree_histedit_info(&branch_name, worktree, repo);
6462 		if (err)
6463 			return err;
6464 		printf("Work tree is editing the history of %s\n", branch_name);
6465 	}
6466 
6467 	err = got_worktree_merge_in_progress(&merge_in_progress,
6468 	    worktree, repo);
6469 	if (err)
6470 		return err;
6471 	if (merge_in_progress) {
6472 		err = got_worktree_merge_info(&branch_name, worktree,
6473 		    repo);
6474 		if (err)
6475 			return err;
6476 		printf("Work tree is merging %s into %s\n", branch_name,
6477 		    got_worktree_get_head_ref_name(worktree));
6478 	}
6479 
6480 	free(new_base_branch_name);
6481 	free(branch_name);
6482 	return NULL;
6483 }
6484 
6485 static const struct got_error *
6486 cmd_status(int argc, char *argv[])
6487 {
6488 	const struct got_error *close_err, *error = NULL;
6489 	struct got_repository *repo = NULL;
6490 	struct got_worktree *worktree = NULL;
6491 	struct got_status_arg st;
6492 	char *cwd = NULL;
6493 	struct got_pathlist_head paths;
6494 	int ch, i, no_ignores = 0;
6495 	int *pack_fds = NULL;
6496 
6497 	TAILQ_INIT(&paths);
6498 
6499 	memset(&st, 0, sizeof(st));
6500 	st.status_codes = NULL;
6501 	st.suppress = 0;
6502 
6503 #ifndef PROFILE
6504 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6505 	    NULL) == -1)
6506 		err(1, "pledge");
6507 #endif
6508 
6509 	while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6510 		switch (ch) {
6511 		case 'I':
6512 			no_ignores = 1;
6513 			break;
6514 		case 'S':
6515 			if (st.status_codes != NULL && st.suppress == 0)
6516 				option_conflict('S', 's');
6517 			st.suppress = 1;
6518 			/* fallthrough */
6519 		case 's':
6520 			for (i = 0; optarg[i] != '\0'; i++) {
6521 				switch (optarg[i]) {
6522 				case GOT_STATUS_MODIFY:
6523 				case GOT_STATUS_ADD:
6524 				case GOT_STATUS_DELETE:
6525 				case GOT_STATUS_CONFLICT:
6526 				case GOT_STATUS_MISSING:
6527 				case GOT_STATUS_OBSTRUCTED:
6528 				case GOT_STATUS_UNVERSIONED:
6529 				case GOT_STATUS_MODE_CHANGE:
6530 				case GOT_STATUS_NONEXISTENT:
6531 					break;
6532 				default:
6533 					errx(1, "invalid status code '%c'",
6534 					    optarg[i]);
6535 				}
6536 			}
6537 			if (ch == 's' && st.suppress)
6538 				option_conflict('s', 'S');
6539 			st.status_codes = optarg;
6540 			break;
6541 		default:
6542 			usage_status();
6543 			/* NOTREACHED */
6544 		}
6545 	}
6546 
6547 	argc -= optind;
6548 	argv += optind;
6549 
6550 	cwd = getcwd(NULL, 0);
6551 	if (cwd == NULL) {
6552 		error = got_error_from_errno("getcwd");
6553 		goto done;
6554 	}
6555 
6556 	error = got_repo_pack_fds_open(&pack_fds);
6557 	if (error != NULL)
6558 		goto done;
6559 
6560 	error = got_worktree_open(&worktree, cwd,
6561 	    GOT_WORKTREE_GOT_DIR);
6562 	if (error) {
6563 		if (error->code == GOT_ERR_NOT_WORKTREE)
6564 			error = wrap_not_worktree_error(error, "status", cwd);
6565 		goto done;
6566 	}
6567 
6568 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6569 	    NULL, pack_fds);
6570 	if (error != NULL)
6571 		goto done;
6572 
6573 	error = apply_unveil(got_repo_get_path(repo), 1,
6574 	    got_worktree_get_root_path(worktree));
6575 	if (error)
6576 		goto done;
6577 
6578 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6579 	if (error)
6580 		goto done;
6581 
6582 	error = got_worktree_status(worktree, &paths, repo, no_ignores,
6583 	    print_status, &st, check_cancelled, NULL);
6584 	if (error)
6585 		goto done;
6586 
6587 	error = show_operation_in_progress(worktree, repo);
6588 done:
6589 	if (pack_fds) {
6590 		const struct got_error *pack_err =
6591 		    got_repo_pack_fds_close(pack_fds);
6592 		if (error == NULL)
6593 			error = pack_err;
6594 	}
6595 	if (repo) {
6596 		close_err = got_repo_close(repo);
6597 		if (error == NULL)
6598 			error = close_err;
6599 	}
6600 	if (worktree != NULL) {
6601 		close_err = got_worktree_close(worktree);
6602 		if (error == NULL)
6603 			error = close_err;
6604 	}
6605 
6606 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6607 	free(cwd);
6608 	return error;
6609 }
6610 
6611 __dead static void
6612 usage_ref(void)
6613 {
6614 	fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6615 	    "[-s reference] [name]\n", getprogname());
6616 	exit(1);
6617 }
6618 
6619 static const struct got_error *
6620 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6621 {
6622 	static const struct got_error *err = NULL;
6623 	struct got_reflist_head refs;
6624 	struct got_reflist_entry *re;
6625 
6626 	TAILQ_INIT(&refs);
6627 	err = got_ref_list(&refs, repo, refname, sort_by_time ?
6628 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6629 	    repo);
6630 	if (err)
6631 		return err;
6632 
6633 	TAILQ_FOREACH(re, &refs, entry) {
6634 		char *refstr;
6635 		refstr = got_ref_to_str(re->ref);
6636 		if (refstr == NULL) {
6637 			err = got_error_from_errno("got_ref_to_str");
6638 			break;
6639 		}
6640 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6641 		free(refstr);
6642 	}
6643 
6644 	got_ref_list_free(&refs);
6645 	return err;
6646 }
6647 
6648 static const struct got_error *
6649 delete_ref_by_name(struct got_repository *repo, const char *refname)
6650 {
6651 	const struct got_error *err;
6652 	struct got_reference *ref;
6653 
6654 	err = got_ref_open(&ref, repo, refname, 0);
6655 	if (err)
6656 		return err;
6657 
6658 	err = delete_ref(repo, ref);
6659 	got_ref_close(ref);
6660 	return err;
6661 }
6662 
6663 static const struct got_error *
6664 add_ref(struct got_repository *repo, const char *refname, const char *target)
6665 {
6666 	const struct got_error *err = NULL;
6667 	struct got_object_id *id = NULL;
6668 	struct got_reference *ref = NULL;
6669 	struct got_reflist_head refs;
6670 
6671 	/*
6672 	 * Don't let the user create a reference name with a leading '-'.
6673 	 * While technically a valid reference name, this case is usually
6674 	 * an unintended typo.
6675 	 */
6676 	if (refname[0] == '-')
6677 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6678 
6679 	TAILQ_INIT(&refs);
6680 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6681 	if (err)
6682 		goto done;
6683 	err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6684 	    &refs, repo);
6685 	got_ref_list_free(&refs);
6686 	if (err)
6687 		goto done;
6688 
6689 	err = got_ref_alloc(&ref, refname, id);
6690 	if (err)
6691 		goto done;
6692 
6693 	err = got_ref_write(ref, repo);
6694 done:
6695 	if (ref)
6696 		got_ref_close(ref);
6697 	free(id);
6698 	return err;
6699 }
6700 
6701 static const struct got_error *
6702 add_symref(struct got_repository *repo, const char *refname, const char *target)
6703 {
6704 	const struct got_error *err = NULL;
6705 	struct got_reference *ref = NULL;
6706 	struct got_reference *target_ref = NULL;
6707 
6708 	/*
6709 	 * Don't let the user create a reference name with a leading '-'.
6710 	 * While technically a valid reference name, this case is usually
6711 	 * an unintended typo.
6712 	 */
6713 	if (refname[0] == '-')
6714 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6715 
6716 	err = got_ref_open(&target_ref, repo, target, 0);
6717 	if (err)
6718 		return err;
6719 
6720 	err = got_ref_alloc_symref(&ref, refname, target_ref);
6721 	if (err)
6722 		goto done;
6723 
6724 	err = got_ref_write(ref, repo);
6725 done:
6726 	if (target_ref)
6727 		got_ref_close(target_ref);
6728 	if (ref)
6729 		got_ref_close(ref);
6730 	return err;
6731 }
6732 
6733 static const struct got_error *
6734 cmd_ref(int argc, char *argv[])
6735 {
6736 	const struct got_error *error = NULL;
6737 	struct got_repository *repo = NULL;
6738 	struct got_worktree *worktree = NULL;
6739 	char *cwd = NULL, *repo_path = NULL;
6740 	int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6741 	const char *obj_arg = NULL, *symref_target= NULL;
6742 	char *refname = NULL, *keyword_idstr = NULL;
6743 	int *pack_fds = NULL;
6744 
6745 #ifndef PROFILE
6746 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6747 	    "sendfd unveil", NULL) == -1)
6748 		err(1, "pledge");
6749 #endif
6750 
6751 	while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6752 		switch (ch) {
6753 		case 'c':
6754 			obj_arg = optarg;
6755 			break;
6756 		case 'd':
6757 			do_delete = 1;
6758 			break;
6759 		case 'l':
6760 			do_list = 1;
6761 			break;
6762 		case 'r':
6763 			repo_path = realpath(optarg, NULL);
6764 			if (repo_path == NULL)
6765 				return got_error_from_errno2("realpath",
6766 				    optarg);
6767 			got_path_strip_trailing_slashes(repo_path);
6768 			break;
6769 		case 's':
6770 			symref_target = optarg;
6771 			break;
6772 		case 't':
6773 			sort_by_time = 1;
6774 			break;
6775 		default:
6776 			usage_ref();
6777 			/* NOTREACHED */
6778 		}
6779 	}
6780 
6781 	if (obj_arg && do_list)
6782 		option_conflict('c', 'l');
6783 	if (obj_arg && do_delete)
6784 		option_conflict('c', 'd');
6785 	if (obj_arg && symref_target)
6786 		option_conflict('c', 's');
6787 	if (symref_target && do_delete)
6788 		option_conflict('s', 'd');
6789 	if (symref_target && do_list)
6790 		option_conflict('s', 'l');
6791 	if (do_delete && do_list)
6792 		option_conflict('d', 'l');
6793 	if (sort_by_time && !do_list)
6794 		errx(1, "-t option requires -l option");
6795 
6796 	argc -= optind;
6797 	argv += optind;
6798 
6799 	if (do_list) {
6800 		if (argc != 0 && argc != 1)
6801 			usage_ref();
6802 		if (argc == 1) {
6803 			refname = strdup(argv[0]);
6804 			if (refname == NULL) {
6805 				error = got_error_from_errno("strdup");
6806 				goto done;
6807 			}
6808 		}
6809 	} else {
6810 		if (argc != 1)
6811 			usage_ref();
6812 		refname = strdup(argv[0]);
6813 		if (refname == NULL) {
6814 			error = got_error_from_errno("strdup");
6815 			goto done;
6816 		}
6817 	}
6818 
6819 	if (refname)
6820 		got_path_strip_trailing_slashes(refname);
6821 
6822 	cwd = getcwd(NULL, 0);
6823 	if (cwd == NULL) {
6824 		error = got_error_from_errno("getcwd");
6825 		goto done;
6826 	}
6827 
6828 	error = got_repo_pack_fds_open(&pack_fds);
6829 	if (error != NULL)
6830 		goto done;
6831 
6832 	if (repo_path == NULL) {
6833 		error = got_worktree_open(&worktree, cwd,
6834 		    GOT_WORKTREE_GOT_DIR);
6835 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6836 			goto done;
6837 		else
6838 			error = NULL;
6839 		if (worktree) {
6840 			repo_path =
6841 			    strdup(got_worktree_get_repo_path(worktree));
6842 			if (repo_path == NULL)
6843 				error = got_error_from_errno("strdup");
6844 			if (error)
6845 				goto done;
6846 		} else {
6847 			repo_path = strdup(cwd);
6848 			if (repo_path == NULL) {
6849 				error = got_error_from_errno("strdup");
6850 				goto done;
6851 			}
6852 		}
6853 	}
6854 
6855 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6856 	if (error != NULL)
6857 		goto done;
6858 
6859 #ifndef PROFILE
6860 	if (do_list) {
6861 		/* Remove "cpath" promise. */
6862 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6863 		    NULL) == -1)
6864 			err(1, "pledge");
6865 	}
6866 #endif
6867 
6868 	error = apply_unveil(got_repo_get_path(repo), do_list,
6869 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
6870 	if (error)
6871 		goto done;
6872 
6873 	if (do_list)
6874 		error = list_refs(repo, refname, sort_by_time);
6875 	else if (do_delete)
6876 		error = delete_ref_by_name(repo, refname);
6877 	else if (symref_target)
6878 		error = add_symref(repo, refname, symref_target);
6879 	else {
6880 		if (obj_arg == NULL)
6881 			usage_ref();
6882 
6883 		error = got_keyword_to_idstr(&keyword_idstr, obj_arg,
6884 		    repo, worktree);
6885 		if (error != NULL)
6886 			goto done;
6887 		if (keyword_idstr != NULL)
6888 			obj_arg = keyword_idstr;
6889 
6890 		error = add_ref(repo, refname, obj_arg);
6891 	}
6892 done:
6893 	free(refname);
6894 	if (repo) {
6895 		const struct got_error *close_err = got_repo_close(repo);
6896 		if (error == NULL)
6897 			error = close_err;
6898 	}
6899 	if (worktree)
6900 		got_worktree_close(worktree);
6901 	if (pack_fds) {
6902 		const struct got_error *pack_err =
6903 		    got_repo_pack_fds_close(pack_fds);
6904 		if (error == NULL)
6905 			error = pack_err;
6906 	}
6907 	free(cwd);
6908 	free(repo_path);
6909 	free(keyword_idstr);
6910 	return error;
6911 }
6912 
6913 __dead static void
6914 usage_branch(void)
6915 {
6916 	fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6917 	    "[-r repository-path] [name]\n", getprogname());
6918 	exit(1);
6919 }
6920 
6921 static const struct got_error *
6922 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6923     struct got_reference *ref)
6924 {
6925 	const struct got_error *err = NULL;
6926 	const char *refname;
6927 	char *refstr;
6928 	char marker = ' ';
6929 
6930 	refname = got_ref_get_name(ref);
6931 	if (worktree && strcmp(refname,
6932 	    got_worktree_get_head_ref_name(worktree)) == 0) {
6933 		err = got_worktree_get_state(&marker, repo, worktree,
6934 		    check_cancelled, NULL);
6935 		if (err != NULL)
6936 			return err;
6937 	}
6938 
6939 	if (strncmp(refname, "refs/heads/", 11) == 0)
6940 		refname += 11;
6941 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6942 		refname += 18;
6943 	if (strncmp(refname, "refs/remotes/", 13) == 0)
6944 		refname += 13;
6945 
6946 	refstr = got_ref_to_str(ref);
6947 	if (refstr == NULL)
6948 		return got_error_from_errno("got_ref_to_str");
6949 
6950 	printf("%c %s: %s\n", marker, refname, refstr);
6951 	free(refstr);
6952 	return NULL;
6953 }
6954 
6955 static const struct got_error *
6956 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6957 {
6958 	const char *refname;
6959 
6960 	if (worktree == NULL)
6961 		return got_error(GOT_ERR_NOT_WORKTREE);
6962 
6963 	refname = got_worktree_get_head_ref_name(worktree);
6964 
6965 	if (strncmp(refname, "refs/heads/", 11) == 0)
6966 		refname += 11;
6967 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6968 		refname += 18;
6969 
6970 	printf("%s\n", refname);
6971 
6972 	return NULL;
6973 }
6974 
6975 static const struct got_error *
6976 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6977     int sort_by_time)
6978 {
6979 	static const struct got_error *err = NULL;
6980 	struct got_reflist_head refs;
6981 	struct got_reflist_entry *re;
6982 	struct got_reference *temp_ref = NULL;
6983 	int rebase_in_progress, histedit_in_progress;
6984 
6985 	TAILQ_INIT(&refs);
6986 
6987 	if (worktree) {
6988 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
6989 		    worktree);
6990 		if (err)
6991 			return err;
6992 
6993 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
6994 		    worktree);
6995 		if (err)
6996 			return err;
6997 
6998 		if (rebase_in_progress || histedit_in_progress) {
6999 			err = got_ref_open(&temp_ref, repo,
7000 			    got_worktree_get_head_ref_name(worktree), 0);
7001 			if (err)
7002 				return err;
7003 			list_branch(repo, worktree, temp_ref);
7004 			got_ref_close(temp_ref);
7005 		}
7006 	}
7007 
7008 	err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
7009 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
7010 	    repo);
7011 	if (err)
7012 		return err;
7013 
7014 	TAILQ_FOREACH(re, &refs, entry)
7015 		list_branch(repo, worktree, re->ref);
7016 
7017 	got_ref_list_free(&refs);
7018 
7019 	err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
7020 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
7021 	    repo);
7022 	if (err)
7023 		return err;
7024 
7025 	TAILQ_FOREACH(re, &refs, entry)
7026 		list_branch(repo, worktree, re->ref);
7027 
7028 	got_ref_list_free(&refs);
7029 
7030 	return NULL;
7031 }
7032 
7033 static const struct got_error *
7034 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
7035     const char *branch_name)
7036 {
7037 	const struct got_error *err = NULL;
7038 	struct got_reference *ref = NULL;
7039 	char *refname, *remote_refname = NULL;
7040 
7041 	if (strncmp(branch_name, "refs/", 5) == 0)
7042 		branch_name += 5;
7043 	if (strncmp(branch_name, "heads/", 6) == 0)
7044 		branch_name += 6;
7045 	else if (strncmp(branch_name, "remotes/", 8) == 0)
7046 		branch_name += 8;
7047 
7048 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
7049 		return got_error_from_errno("asprintf");
7050 
7051 	if (asprintf(&remote_refname, "refs/remotes/%s",
7052 	    branch_name) == -1) {
7053 		err = got_error_from_errno("asprintf");
7054 		goto done;
7055 	}
7056 
7057 	err = got_ref_open(&ref, repo, refname, 0);
7058 	if (err) {
7059 		const struct got_error *err2;
7060 		if (err->code != GOT_ERR_NOT_REF)
7061 			goto done;
7062 		/*
7063 		 * Keep 'err' intact such that if neither branch exists
7064 		 * we report "refs/heads" rather than "refs/remotes" in
7065 		 * our error message.
7066 		 */
7067 		err2 = got_ref_open(&ref, repo, remote_refname, 0);
7068 		if (err2)
7069 			goto done;
7070 		err = NULL;
7071 	}
7072 
7073 	if (worktree &&
7074 	    strcmp(got_worktree_get_head_ref_name(worktree),
7075 	    got_ref_get_name(ref)) == 0) {
7076 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
7077 		    "will not delete this work tree's current branch");
7078 		goto done;
7079 	}
7080 
7081 	err = delete_ref(repo, ref);
7082 done:
7083 	if (ref)
7084 		got_ref_close(ref);
7085 	free(refname);
7086 	free(remote_refname);
7087 	return err;
7088 }
7089 
7090 static const struct got_error *
7091 add_branch(struct got_repository *repo, const char *branch_name,
7092     struct got_object_id *base_commit_id)
7093 {
7094 	const struct got_error *err = NULL;
7095 	struct got_reference *ref = NULL;
7096 	char *refname = NULL;
7097 
7098 	/*
7099 	 * Don't let the user create a branch name with a leading '-'.
7100 	 * While technically a valid reference name, this case is usually
7101 	 * an unintended typo.
7102 	 */
7103 	if (branch_name[0] == '-')
7104 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
7105 
7106 	if (strncmp(branch_name, "refs/heads/", 11) == 0)
7107 		branch_name += 11;
7108 
7109 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
7110 		err = got_error_from_errno("asprintf");
7111 		goto done;
7112 	}
7113 
7114 	err = got_ref_open(&ref, repo, refname, 0);
7115 	if (err == NULL) {
7116 		err = got_error(GOT_ERR_BRANCH_EXISTS);
7117 		goto done;
7118 	} else if (err->code != GOT_ERR_NOT_REF)
7119 		goto done;
7120 
7121 	err = got_ref_alloc(&ref, refname, base_commit_id);
7122 	if (err)
7123 		goto done;
7124 
7125 	err = got_ref_write(ref, repo);
7126 done:
7127 	if (ref)
7128 		got_ref_close(ref);
7129 	free(refname);
7130 	return err;
7131 }
7132 
7133 static const struct got_error *
7134 cmd_branch(int argc, char *argv[])
7135 {
7136 	const struct got_error *error = NULL;
7137 	struct got_repository *repo = NULL;
7138 	struct got_worktree *worktree = NULL;
7139 	char *cwd = NULL, *repo_path = NULL;
7140 	int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
7141 	const char *delref = NULL, *commit_id_arg = NULL;
7142 	struct got_reference *ref = NULL;
7143 	struct got_pathlist_head paths;
7144 	struct got_object_id *commit_id = NULL;
7145 	char *commit_id_str = NULL, *keyword_idstr = NULL;;
7146 	int *pack_fds = NULL;
7147 
7148 	TAILQ_INIT(&paths);
7149 
7150 #ifndef PROFILE
7151 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7152 	    "sendfd unveil", NULL) == -1)
7153 		err(1, "pledge");
7154 #endif
7155 
7156 	while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
7157 		switch (ch) {
7158 		case 'c':
7159 			commit_id_arg = optarg;
7160 			break;
7161 		case 'd':
7162 			delref = optarg;
7163 			break;
7164 		case 'l':
7165 			do_list = 1;
7166 			break;
7167 		case 'n':
7168 			do_update = 0;
7169 			break;
7170 		case 'r':
7171 			repo_path = realpath(optarg, NULL);
7172 			if (repo_path == NULL)
7173 				return got_error_from_errno2("realpath",
7174 				    optarg);
7175 			got_path_strip_trailing_slashes(repo_path);
7176 			break;
7177 		case 't':
7178 			sort_by_time = 1;
7179 			break;
7180 		default:
7181 			usage_branch();
7182 			/* NOTREACHED */
7183 		}
7184 	}
7185 
7186 	if (do_list && delref)
7187 		option_conflict('l', 'd');
7188 	if (sort_by_time && !do_list)
7189 		errx(1, "-t option requires -l option");
7190 
7191 	argc -= optind;
7192 	argv += optind;
7193 
7194 	if (!do_list && !delref && argc == 0)
7195 		do_show = 1;
7196 
7197 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
7198 		errx(1, "-c option can only be used when creating a branch");
7199 
7200 	if (do_list || delref) {
7201 		if (argc > 0)
7202 			usage_branch();
7203 	} else if (!do_show && argc != 1)
7204 		usage_branch();
7205 
7206 	cwd = getcwd(NULL, 0);
7207 	if (cwd == NULL) {
7208 		error = got_error_from_errno("getcwd");
7209 		goto done;
7210 	}
7211 
7212 	error = got_repo_pack_fds_open(&pack_fds);
7213 	if (error != NULL)
7214 		goto done;
7215 
7216 	if (repo_path == NULL) {
7217 		error = got_worktree_open(&worktree, cwd,
7218 		    GOT_WORKTREE_GOT_DIR);
7219 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
7220 			goto done;
7221 		else
7222 			error = NULL;
7223 		if (worktree) {
7224 			repo_path =
7225 			    strdup(got_worktree_get_repo_path(worktree));
7226 			if (repo_path == NULL)
7227 				error = got_error_from_errno("strdup");
7228 			if (error)
7229 				goto done;
7230 		} else {
7231 			repo_path = strdup(cwd);
7232 			if (repo_path == NULL) {
7233 				error = got_error_from_errno("strdup");
7234 				goto done;
7235 			}
7236 		}
7237 	}
7238 
7239 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7240 	if (error != NULL)
7241 		goto done;
7242 
7243 #ifndef PROFILE
7244 	if (do_list || do_show) {
7245 		/* Remove "cpath" promise. */
7246 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7247 		    NULL) == -1)
7248 			err(1, "pledge");
7249 	}
7250 #endif
7251 
7252 	error = apply_unveil(got_repo_get_path(repo), do_list,
7253 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
7254 	if (error)
7255 		goto done;
7256 
7257 	if (do_show)
7258 		error = show_current_branch(repo, worktree);
7259 	else if (do_list)
7260 		error = list_branches(repo, worktree, sort_by_time);
7261 	else if (delref)
7262 		error = delete_branch(repo, worktree, delref);
7263 	else {
7264 		struct got_reflist_head refs;
7265 		TAILQ_INIT(&refs);
7266 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
7267 		    NULL);
7268 		if (error)
7269 			goto done;
7270 		if (commit_id_arg == NULL)
7271 			commit_id_arg = worktree ?
7272 			    got_worktree_get_head_ref_name(worktree) :
7273 			    GOT_REF_HEAD;
7274 		else {
7275 			error = got_keyword_to_idstr(&keyword_idstr,
7276 			    commit_id_arg, repo, worktree);
7277 			if (error != NULL)
7278 				goto done;
7279 			if (keyword_idstr != NULL)
7280 				commit_id_arg = keyword_idstr;
7281 		}
7282 		error = got_repo_match_object_id(&commit_id, NULL,
7283 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
7284 		got_ref_list_free(&refs);
7285 		if (error)
7286 			goto done;
7287 		error = add_branch(repo, argv[0], commit_id);
7288 		if (error)
7289 			goto done;
7290 		if (worktree && do_update) {
7291 			struct got_update_progress_arg upa;
7292 			char *branch_refname = NULL;
7293 
7294 			error = got_object_id_str(&commit_id_str, commit_id);
7295 			if (error)
7296 				goto done;
7297 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
7298 			    worktree);
7299 			if (error)
7300 				goto done;
7301 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7302 			    == -1) {
7303 				error = got_error_from_errno("asprintf");
7304 				goto done;
7305 			}
7306 			error = got_ref_open(&ref, repo, branch_refname, 0);
7307 			free(branch_refname);
7308 			if (error)
7309 				goto done;
7310 			error = switch_head_ref(ref, commit_id, worktree,
7311 			    repo);
7312 			if (error)
7313 				goto done;
7314 			error = got_worktree_set_base_commit_id(worktree, repo,
7315 			    commit_id);
7316 			if (error)
7317 				goto done;
7318 			memset(&upa, 0, sizeof(upa));
7319 			error = got_worktree_checkout_files(worktree, &paths,
7320 			    repo, update_progress, &upa, check_cancelled,
7321 			    NULL);
7322 			if (error)
7323 				goto done;
7324 			if (upa.did_something) {
7325 				printf("Updated to %s: %s\n",
7326 				    got_worktree_get_head_ref_name(worktree),
7327 				    commit_id_str);
7328 			}
7329 			print_update_progress_stats(&upa);
7330 		}
7331 	}
7332 done:
7333 	free(keyword_idstr);
7334 	if (ref)
7335 		got_ref_close(ref);
7336 	if (repo) {
7337 		const struct got_error *close_err = got_repo_close(repo);
7338 		if (error == NULL)
7339 			error = close_err;
7340 	}
7341 	if (worktree)
7342 		got_worktree_close(worktree);
7343 	if (pack_fds) {
7344 		const struct got_error *pack_err =
7345 		    got_repo_pack_fds_close(pack_fds);
7346 		if (error == NULL)
7347 			error = pack_err;
7348 	}
7349 	free(cwd);
7350 	free(repo_path);
7351 	free(commit_id);
7352 	free(commit_id_str);
7353 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7354 	return error;
7355 }
7356 
7357 
7358 __dead static void
7359 usage_tag(void)
7360 {
7361 	fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7362 	    "[-r repository-path] [-s signer-id] name\n", getprogname());
7363 	exit(1);
7364 }
7365 
7366 #if 0
7367 static const struct got_error *
7368 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7369 {
7370 	const struct got_error *err = NULL;
7371 	struct got_reflist_entry *re, *se, *new;
7372 	struct got_object_id *re_id, *se_id;
7373 	struct got_tag_object *re_tag, *se_tag;
7374 	time_t re_time, se_time;
7375 
7376 	STAILQ_FOREACH(re, tags, entry) {
7377 		se = STAILQ_FIRST(sorted);
7378 		if (se == NULL) {
7379 			err = got_reflist_entry_dup(&new, re);
7380 			if (err)
7381 				return err;
7382 			STAILQ_INSERT_HEAD(sorted, new, entry);
7383 			continue;
7384 		} else {
7385 			err = got_ref_resolve(&re_id, repo, re->ref);
7386 			if (err)
7387 				break;
7388 			err = got_object_open_as_tag(&re_tag, repo, re_id);
7389 			free(re_id);
7390 			if (err)
7391 				break;
7392 			re_time = got_object_tag_get_tagger_time(re_tag);
7393 			got_object_tag_close(re_tag);
7394 		}
7395 
7396 		while (se) {
7397 			err = got_ref_resolve(&se_id, repo, re->ref);
7398 			if (err)
7399 				break;
7400 			err = got_object_open_as_tag(&se_tag, repo, se_id);
7401 			free(se_id);
7402 			if (err)
7403 				break;
7404 			se_time = got_object_tag_get_tagger_time(se_tag);
7405 			got_object_tag_close(se_tag);
7406 
7407 			if (se_time > re_time) {
7408 				err = got_reflist_entry_dup(&new, re);
7409 				if (err)
7410 					return err;
7411 				STAILQ_INSERT_AFTER(sorted, se, new, entry);
7412 				break;
7413 			}
7414 			se = STAILQ_NEXT(se, entry);
7415 			continue;
7416 		}
7417 	}
7418 done:
7419 	return err;
7420 }
7421 #endif
7422 
7423 static const struct got_error *
7424 get_tag_refname(char **refname, const char *tag_name)
7425 {
7426 	const struct got_error *err;
7427 
7428 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
7429 		*refname = strdup(tag_name);
7430 		if (*refname == NULL)
7431 			return got_error_from_errno("strdup");
7432 	} else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7433 		err = got_error_from_errno("asprintf");
7434 		*refname = NULL;
7435 		return err;
7436 	}
7437 
7438 	return NULL;
7439 }
7440 
7441 static const struct got_error *
7442 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7443     const char *allowed_signers, const char *revoked_signers, int verbosity)
7444 {
7445 	static const struct got_error *err = NULL;
7446 	struct got_reflist_head refs;
7447 	struct got_reflist_entry *re;
7448 	char *wanted_refname = NULL;
7449 	int bad_sigs = 0;
7450 
7451 	TAILQ_INIT(&refs);
7452 
7453 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7454 	if (err)
7455 		return err;
7456 
7457 	if (tag_name) {
7458 		struct got_reference *ref;
7459 		err = get_tag_refname(&wanted_refname, tag_name);
7460 		if (err)
7461 			goto done;
7462 		/* Wanted tag reference should exist. */
7463 		err = got_ref_open(&ref, repo, wanted_refname, 0);
7464 		if (err)
7465 			goto done;
7466 		got_ref_close(ref);
7467 	}
7468 
7469 	TAILQ_FOREACH(re, &refs, entry) {
7470 		const char *refname;
7471 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7472 		char datebuf[26];
7473 		const char *tagger, *ssh_sig = NULL;
7474 		char *sig_msg = NULL;
7475 		time_t tagger_time;
7476 		struct got_object_id *id;
7477 		struct got_tag_object *tag;
7478 		struct got_commit_object *commit = NULL;
7479 
7480 		refname = got_ref_get_name(re->ref);
7481 		if (strncmp(refname, "refs/tags/", 10) != 0 ||
7482 		    (wanted_refname && strcmp(refname, wanted_refname) != 0))
7483 			continue;
7484 		refname += 10;
7485 		refstr = got_ref_to_str(re->ref);
7486 		if (refstr == NULL) {
7487 			err = got_error_from_errno("got_ref_to_str");
7488 			break;
7489 		}
7490 
7491 		err = got_ref_resolve(&id, repo, re->ref);
7492 		if (err)
7493 			break;
7494 		err = got_object_open_as_tag(&tag, repo, id);
7495 		if (err) {
7496 			if (err->code != GOT_ERR_OBJ_TYPE) {
7497 				free(id);
7498 				break;
7499 			}
7500 			/* "lightweight" tag */
7501 			err = got_object_open_as_commit(&commit, repo, id);
7502 			if (err) {
7503 				free(id);
7504 				break;
7505 			}
7506 			tagger = got_object_commit_get_committer(commit);
7507 			tagger_time =
7508 			    got_object_commit_get_committer_time(commit);
7509 			err = got_object_id_str(&id_str, id);
7510 			free(id);
7511 			if (err)
7512 				break;
7513 		} else {
7514 			free(id);
7515 			tagger = got_object_tag_get_tagger(tag);
7516 			tagger_time = got_object_tag_get_tagger_time(tag);
7517 			err = got_object_id_str(&id_str,
7518 			    got_object_tag_get_object_id(tag));
7519 			if (err)
7520 				break;
7521 		}
7522 
7523 		if (tag && verify_tags) {
7524 			ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7525 			    got_object_tag_get_message(tag));
7526 			if (ssh_sig && allowed_signers == NULL) {
7527 				err = got_error_msg(
7528 				    GOT_ERR_VERIFY_TAG_SIGNATURE,
7529 				    "SSH signature verification requires "
7530 				        "setting allowed_signers in "
7531 				        "got.conf(5)");
7532 				break;
7533 			}
7534 		}
7535 
7536 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7537 		free(refstr);
7538 		printf("from: %s\n", tagger);
7539 		datestr = get_datestr(&tagger_time, datebuf);
7540 		if (datestr)
7541 			printf("date: %s UTC\n", datestr);
7542 		if (commit)
7543 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7544 		else {
7545 			switch (got_object_tag_get_object_type(tag)) {
7546 			case GOT_OBJ_TYPE_BLOB:
7547 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7548 				    id_str);
7549 				break;
7550 			case GOT_OBJ_TYPE_TREE:
7551 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7552 				    id_str);
7553 				break;
7554 			case GOT_OBJ_TYPE_COMMIT:
7555 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7556 				    id_str);
7557 				break;
7558 			case GOT_OBJ_TYPE_TAG:
7559 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7560 				    id_str);
7561 				break;
7562 			default:
7563 				break;
7564 			}
7565 		}
7566 		free(id_str);
7567 
7568 		if (ssh_sig) {
7569 			err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7570 				allowed_signers, revoked_signers, verbosity);
7571 			if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7572 				bad_sigs = 1;
7573 			else if (err)
7574 				break;
7575 			printf("signature: %s", sig_msg);
7576 			free(sig_msg);
7577 			sig_msg = NULL;
7578 		}
7579 
7580 		if (commit) {
7581 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
7582 			if (err)
7583 				break;
7584 			got_object_commit_close(commit);
7585 		} else {
7586 			tagmsg0 = strdup(got_object_tag_get_message(tag));
7587 			got_object_tag_close(tag);
7588 			if (tagmsg0 == NULL) {
7589 				err = got_error_from_errno("strdup");
7590 				break;
7591 			}
7592 		}
7593 
7594 		tagmsg = tagmsg0;
7595 		do {
7596 			line = strsep(&tagmsg, "\n");
7597 			if (line)
7598 				printf(" %s\n", line);
7599 		} while (line);
7600 		free(tagmsg0);
7601 	}
7602 done:
7603 	got_ref_list_free(&refs);
7604 	free(wanted_refname);
7605 
7606 	if (err == NULL && bad_sigs)
7607 		err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7608 	return err;
7609 }
7610 
7611 static const struct got_error *
7612 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7613     const char *tag_name, const char *editor, const char *repo_path)
7614 {
7615 	const struct got_error *err = NULL;
7616 	char *template = NULL, *initial_content = NULL;
7617 	int initial_content_len;
7618 	int fd = -1;
7619 
7620 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7621 		err = got_error_from_errno("asprintf");
7622 		goto done;
7623 	}
7624 
7625 	initial_content_len = asprintf(&initial_content,
7626 	    "\n# tagging commit %s as %s\n",
7627 	    commit_id_str, tag_name);
7628 	if (initial_content_len == -1) {
7629 		err = got_error_from_errno("asprintf");
7630 		goto done;
7631 	}
7632 
7633 	err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7634 	if (err)
7635 		goto done;
7636 
7637 	if (write(fd, initial_content, initial_content_len) == -1) {
7638 		err = got_error_from_errno2("write", *tagmsg_path);
7639 		goto done;
7640 	}
7641 	if (close(fd) == -1) {
7642 		err = got_error_from_errno2("close", *tagmsg_path);
7643 		goto done;
7644 	}
7645 	fd = -1;
7646 
7647 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7648 	    initial_content_len, 1);
7649 done:
7650 	free(initial_content);
7651 	free(template);
7652 
7653 	if (fd != -1 && close(fd) == -1 && err == NULL)
7654 		err = got_error_from_errno2("close", *tagmsg_path);
7655 
7656 	if (err) {
7657 		free(*tagmsg);
7658 		*tagmsg = NULL;
7659 	}
7660 	return err;
7661 }
7662 
7663 static const struct got_error *
7664 add_tag(struct got_repository *repo, const char *tagger,
7665     const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7666     const char *signer_id, const char *editor, int verbosity)
7667 {
7668 	const struct got_error *err = NULL;
7669 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
7670 	char *label = NULL, *commit_id_str = NULL;
7671 	struct got_reference *ref = NULL;
7672 	char *refname = NULL, *tagmsg = NULL;
7673 	char *tagmsg_path = NULL, *tag_id_str = NULL;
7674 	int preserve_tagmsg = 0;
7675 	struct got_reflist_head refs;
7676 
7677 	TAILQ_INIT(&refs);
7678 
7679 	/*
7680 	 * Don't let the user create a tag name with a leading '-'.
7681 	 * While technically a valid reference name, this case is usually
7682 	 * an unintended typo.
7683 	 */
7684 	if (tag_name[0] == '-')
7685 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7686 
7687 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7688 	if (err)
7689 		goto done;
7690 
7691 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7692 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
7693 	if (err)
7694 		goto done;
7695 
7696 	err = got_object_id_str(&commit_id_str, commit_id);
7697 	if (err)
7698 		goto done;
7699 
7700 	err = get_tag_refname(&refname, tag_name);
7701 	if (err)
7702 		goto done;
7703 	if (strncmp("refs/tags/", tag_name, 10) == 0)
7704 		tag_name += 10;
7705 
7706 	err = got_ref_open(&ref, repo, refname, 0);
7707 	if (err == NULL) {
7708 		err = got_error(GOT_ERR_TAG_EXISTS);
7709 		goto done;
7710 	} else if (err->code != GOT_ERR_NOT_REF)
7711 		goto done;
7712 
7713 	if (tagmsg_arg == NULL) {
7714 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7715 		    tag_name, editor, got_repo_get_path(repo));
7716 		if (err) {
7717 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7718 			    tagmsg_path != NULL)
7719 				preserve_tagmsg = 1;
7720 			goto done;
7721 		}
7722 	}
7723 
7724 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
7725 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7726 	    verbosity);
7727 	if (err) {
7728 		if (tagmsg_path)
7729 			preserve_tagmsg = 1;
7730 		goto done;
7731 	}
7732 
7733 	err = got_ref_alloc(&ref, refname, tag_id);
7734 	if (err) {
7735 		if (tagmsg_path)
7736 			preserve_tagmsg = 1;
7737 		goto done;
7738 	}
7739 
7740 	err = got_ref_write(ref, repo);
7741 	if (err) {
7742 		if (tagmsg_path)
7743 			preserve_tagmsg = 1;
7744 		goto done;
7745 	}
7746 
7747 	err = got_object_id_str(&tag_id_str, tag_id);
7748 	if (err) {
7749 		if (tagmsg_path)
7750 			preserve_tagmsg = 1;
7751 		goto done;
7752 	}
7753 	printf("Created tag %s\n", tag_id_str);
7754 done:
7755 	if (preserve_tagmsg) {
7756 		fprintf(stderr, "%s: tag message preserved in %s\n",
7757 		    getprogname(), tagmsg_path);
7758 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7759 		err = got_error_from_errno2("unlink", tagmsg_path);
7760 	free(tag_id_str);
7761 	if (ref)
7762 		got_ref_close(ref);
7763 	free(commit_id);
7764 	free(commit_id_str);
7765 	free(refname);
7766 	free(tagmsg);
7767 	free(tagmsg_path);
7768 	got_ref_list_free(&refs);
7769 	return err;
7770 }
7771 
7772 static const struct got_error *
7773 cmd_tag(int argc, char *argv[])
7774 {
7775 	const struct got_error *error = NULL;
7776 	struct got_repository *repo = NULL;
7777 	struct got_worktree *worktree = NULL;
7778 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7779 	char *gitconfig_path = NULL, *tagger = NULL, *keyword_idstr = NULL;
7780 	char *allowed_signers = NULL, *revoked_signers = NULL, *editor = NULL;
7781 	const char *signer_id = NULL;
7782 	const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7783 	int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7784 	int *pack_fds = NULL;
7785 
7786 #ifndef PROFILE
7787 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7788 	    "sendfd unveil", NULL) == -1)
7789 		err(1, "pledge");
7790 #endif
7791 
7792 	while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7793 		switch (ch) {
7794 		case 'c':
7795 			commit_id_arg = optarg;
7796 			break;
7797 		case 'l':
7798 			do_list = 1;
7799 			break;
7800 		case 'm':
7801 			tagmsg = optarg;
7802 			break;
7803 		case 'r':
7804 			repo_path = realpath(optarg, NULL);
7805 			if (repo_path == NULL) {
7806 				error = got_error_from_errno2("realpath",
7807 				    optarg);
7808 				goto done;
7809 			}
7810 			got_path_strip_trailing_slashes(repo_path);
7811 			break;
7812 		case 's':
7813 			signer_id = optarg;
7814 			break;
7815 		case 'V':
7816 			verify_tags = 1;
7817 			break;
7818 		case 'v':
7819 			if (verbosity < 0)
7820 				verbosity = 0;
7821 			else if (verbosity < 3)
7822 				verbosity++;
7823 			break;
7824 		default:
7825 			usage_tag();
7826 			/* NOTREACHED */
7827 		}
7828 	}
7829 
7830 	argc -= optind;
7831 	argv += optind;
7832 
7833 	if (do_list || verify_tags) {
7834 		if (commit_id_arg != NULL)
7835 			errx(1,
7836 			    "-c option can only be used when creating a tag");
7837 		if (tagmsg) {
7838 			if (do_list)
7839 				option_conflict('l', 'm');
7840 			else
7841 				option_conflict('V', 'm');
7842 		}
7843 		if (signer_id) {
7844 			if (do_list)
7845 				option_conflict('l', 's');
7846 			else
7847 				option_conflict('V', 's');
7848 		}
7849 		if (argc > 1)
7850 			usage_tag();
7851 	} else if (argc != 1)
7852 		usage_tag();
7853 
7854 	if (argc == 1)
7855 		tag_name = argv[0];
7856 
7857 	cwd = getcwd(NULL, 0);
7858 	if (cwd == NULL) {
7859 		error = got_error_from_errno("getcwd");
7860 		goto done;
7861 	}
7862 
7863 	error = got_repo_pack_fds_open(&pack_fds);
7864 	if (error != NULL)
7865 		goto done;
7866 
7867 	if (repo_path == NULL) {
7868 		error = got_worktree_open(&worktree, cwd,
7869 		    GOT_WORKTREE_GOT_DIR);
7870 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
7871 			goto done;
7872 		else
7873 			error = NULL;
7874 		if (worktree) {
7875 			repo_path =
7876 			    strdup(got_worktree_get_repo_path(worktree));
7877 			if (repo_path == NULL)
7878 				error = got_error_from_errno("strdup");
7879 			if (error)
7880 				goto done;
7881 		} else {
7882 			repo_path = strdup(cwd);
7883 			if (repo_path == NULL) {
7884 				error = got_error_from_errno("strdup");
7885 				goto done;
7886 			}
7887 		}
7888 	}
7889 
7890 	if (do_list || verify_tags) {
7891 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7892 		if (error != NULL)
7893 			goto done;
7894 		error = get_allowed_signers(&allowed_signers, repo, worktree);
7895 		if (error)
7896 			goto done;
7897 		error = get_revoked_signers(&revoked_signers, repo, worktree);
7898 		if (error)
7899 			goto done;
7900 		if (worktree) {
7901 			/* Release work tree lock. */
7902 			got_worktree_close(worktree);
7903 			worktree = NULL;
7904 		}
7905 
7906 		/*
7907 		 * Remove "cpath" promise unless needed for signature tmpfile
7908 		 * creation.
7909 		 */
7910 		if (verify_tags)
7911 		 	got_sigs_apply_unveil();
7912 		else {
7913 #ifndef PROFILE
7914 			if (pledge("stdio rpath wpath flock proc exec sendfd "
7915 			    "unveil", NULL) == -1)
7916 				err(1, "pledge");
7917 #endif
7918 		}
7919 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7920 		if (error)
7921 			goto done;
7922 		error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7923 		    revoked_signers, verbosity);
7924 	} else {
7925 		error = get_gitconfig_path(&gitconfig_path);
7926 		if (error)
7927 			goto done;
7928 		error = got_repo_open(&repo, repo_path, gitconfig_path,
7929 		    pack_fds);
7930 		if (error != NULL)
7931 			goto done;
7932 
7933 		error = get_author(&tagger, repo, worktree);
7934 		if (error)
7935 			goto done;
7936 		if (signer_id == NULL)
7937 			signer_id = get_signer_id(repo, worktree);
7938 
7939 		if (tagmsg == NULL) {
7940 			error = get_editor(&editor);
7941 			if (error)
7942 				goto done;
7943 			if (unveil(editor, "x") != 0) {
7944 				error = got_error_from_errno2("unveil", editor);
7945 				goto done;
7946 			}
7947 		}
7948 		if (signer_id) {
7949 			error = got_sigs_apply_unveil();
7950 			if (error)
7951 				goto done;
7952 		}
7953 		error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7954 		if (error)
7955 			goto done;
7956 
7957 		if (commit_id_arg == NULL) {
7958 			struct got_reference *head_ref;
7959 			struct got_object_id *commit_id;
7960 			error = got_ref_open(&head_ref, repo,
7961 			    worktree ? got_worktree_get_head_ref_name(worktree)
7962 			    : GOT_REF_HEAD, 0);
7963 			if (error)
7964 				goto done;
7965 			error = got_ref_resolve(&commit_id, repo, head_ref);
7966 			got_ref_close(head_ref);
7967 			if (error)
7968 				goto done;
7969 			error = got_object_id_str(&commit_id_str, commit_id);
7970 			free(commit_id);
7971 			if (error)
7972 				goto done;
7973 		} else {
7974 			error = got_keyword_to_idstr(&keyword_idstr,
7975 			    commit_id_arg, repo, worktree);
7976 			if (error != NULL)
7977 				goto done;
7978 			commit_id_str = keyword_idstr;
7979 		}
7980 
7981 		if (worktree) {
7982 			/* Release work tree lock. */
7983 			got_worktree_close(worktree);
7984 			worktree = NULL;
7985 		}
7986 
7987 		error = add_tag(repo, tagger, tag_name,
7988 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7989 		    signer_id, editor, verbosity);
7990 	}
7991 done:
7992 	if (repo) {
7993 		const struct got_error *close_err = got_repo_close(repo);
7994 		if (error == NULL)
7995 			error = close_err;
7996 	}
7997 	if (worktree)
7998 		got_worktree_close(worktree);
7999 	if (pack_fds) {
8000 		const struct got_error *pack_err =
8001 		    got_repo_pack_fds_close(pack_fds);
8002 		if (error == NULL)
8003 			error = pack_err;
8004 	}
8005 	free(cwd);
8006 	free(editor);
8007 	free(repo_path);
8008 	free(gitconfig_path);
8009 	free(commit_id_str);
8010 	free(tagger);
8011 	free(allowed_signers);
8012 	free(revoked_signers);
8013 	return error;
8014 }
8015 
8016 __dead static void
8017 usage_add(void)
8018 {
8019 	fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
8020 	exit(1);
8021 }
8022 
8023 static const struct got_error *
8024 add_progress(void *arg, unsigned char status, const char *path)
8025 {
8026 	while (path[0] == '/')
8027 		path++;
8028 	printf("%c  %s\n", status, path);
8029 	return NULL;
8030 }
8031 
8032 static const struct got_error *
8033 cmd_add(int argc, char *argv[])
8034 {
8035 	const struct got_error *error = NULL;
8036 	struct got_repository *repo = NULL;
8037 	struct got_worktree *worktree = NULL;
8038 	char *cwd = NULL;
8039 	struct got_pathlist_head paths;
8040 	struct got_pathlist_entry *pe;
8041 	int ch, can_recurse = 0, no_ignores = 0;
8042 	int *pack_fds = NULL;
8043 
8044 	TAILQ_INIT(&paths);
8045 
8046 #ifndef PROFILE
8047 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8048 	    NULL) == -1)
8049 		err(1, "pledge");
8050 #endif
8051 
8052 	while ((ch = getopt(argc, argv, "IR")) != -1) {
8053 		switch (ch) {
8054 		case 'I':
8055 			no_ignores = 1;
8056 			break;
8057 		case 'R':
8058 			can_recurse = 1;
8059 			break;
8060 		default:
8061 			usage_add();
8062 			/* NOTREACHED */
8063 		}
8064 	}
8065 
8066 	argc -= optind;
8067 	argv += optind;
8068 
8069 	if (argc < 1)
8070 		usage_add();
8071 
8072 	cwd = getcwd(NULL, 0);
8073 	if (cwd == NULL) {
8074 		error = got_error_from_errno("getcwd");
8075 		goto done;
8076 	}
8077 
8078 	error = got_repo_pack_fds_open(&pack_fds);
8079 	if (error != NULL)
8080 		goto done;
8081 
8082 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8083 	if (error) {
8084 		if (error->code == GOT_ERR_NOT_WORKTREE)
8085 			error = wrap_not_worktree_error(error, "add", cwd);
8086 		goto done;
8087 	}
8088 
8089 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8090 	    NULL, pack_fds);
8091 	if (error != NULL)
8092 		goto done;
8093 
8094 	error = apply_unveil(got_repo_get_path(repo), 1,
8095 	    got_worktree_get_root_path(worktree));
8096 	if (error)
8097 		goto done;
8098 
8099 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8100 	if (error)
8101 		goto done;
8102 
8103 	if (!can_recurse) {
8104 		char *ondisk_path;
8105 		struct stat sb;
8106 		TAILQ_FOREACH(pe, &paths, entry) {
8107 			if (asprintf(&ondisk_path, "%s/%s",
8108 			    got_worktree_get_root_path(worktree),
8109 			    pe->path) == -1) {
8110 				error = got_error_from_errno("asprintf");
8111 				goto done;
8112 			}
8113 			if (lstat(ondisk_path, &sb) == -1) {
8114 				if (errno == ENOENT) {
8115 					free(ondisk_path);
8116 					continue;
8117 				}
8118 				error = got_error_from_errno2("lstat",
8119 				    ondisk_path);
8120 				free(ondisk_path);
8121 				goto done;
8122 			}
8123 			free(ondisk_path);
8124 			if (S_ISDIR(sb.st_mode)) {
8125 				error = got_error_msg(GOT_ERR_BAD_PATH,
8126 				    "adding directories requires -R option");
8127 				goto done;
8128 			}
8129 		}
8130 	}
8131 
8132 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
8133 	    NULL, repo, no_ignores);
8134 done:
8135 	if (repo) {
8136 		const struct got_error *close_err = got_repo_close(repo);
8137 		if (error == NULL)
8138 			error = close_err;
8139 	}
8140 	if (worktree)
8141 		got_worktree_close(worktree);
8142 	if (pack_fds) {
8143 		const struct got_error *pack_err =
8144 		    got_repo_pack_fds_close(pack_fds);
8145 		if (error == NULL)
8146 			error = pack_err;
8147 	}
8148 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8149 	free(cwd);
8150 	return error;
8151 }
8152 
8153 __dead static void
8154 usage_remove(void)
8155 {
8156 	fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
8157 	    getprogname());
8158 	exit(1);
8159 }
8160 
8161 static const struct got_error *
8162 print_remove_status(void *arg, unsigned char status,
8163     unsigned char staged_status, const char *path)
8164 {
8165 	while (path[0] == '/')
8166 		path++;
8167 	if (status == GOT_STATUS_NONEXISTENT)
8168 		return NULL;
8169 	if (status == staged_status && (status == GOT_STATUS_DELETE))
8170 		status = GOT_STATUS_NO_CHANGE;
8171 	printf("%c%c %s\n", status, staged_status, path);
8172 	return NULL;
8173 }
8174 
8175 static const struct got_error *
8176 cmd_remove(int argc, char *argv[])
8177 {
8178 	const struct got_error *error = NULL;
8179 	struct got_worktree *worktree = NULL;
8180 	struct got_repository *repo = NULL;
8181 	const char *status_codes = NULL;
8182 	char *cwd = NULL;
8183 	struct got_pathlist_head paths;
8184 	struct got_pathlist_entry *pe;
8185 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
8186 	int ignore_missing_paths = 0;
8187 	int *pack_fds = NULL;
8188 
8189 	TAILQ_INIT(&paths);
8190 
8191 #ifndef PROFILE
8192 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8193 	    NULL) == -1)
8194 		err(1, "pledge");
8195 #endif
8196 
8197 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
8198 		switch (ch) {
8199 		case 'f':
8200 			delete_local_mods = 1;
8201 			ignore_missing_paths = 1;
8202 			break;
8203 		case 'k':
8204 			keep_on_disk = 1;
8205 			break;
8206 		case 'R':
8207 			can_recurse = 1;
8208 			break;
8209 		case 's':
8210 			for (i = 0; optarg[i] != '\0'; i++) {
8211 				switch (optarg[i]) {
8212 				case GOT_STATUS_MODIFY:
8213 					delete_local_mods = 1;
8214 					break;
8215 				case GOT_STATUS_MISSING:
8216 					ignore_missing_paths = 1;
8217 					break;
8218 				default:
8219 					errx(1, "invalid status code '%c'",
8220 					    optarg[i]);
8221 				}
8222 			}
8223 			status_codes = optarg;
8224 			break;
8225 		default:
8226 			usage_remove();
8227 			/* NOTREACHED */
8228 		}
8229 	}
8230 
8231 	argc -= optind;
8232 	argv += optind;
8233 
8234 	if (argc < 1)
8235 		usage_remove();
8236 
8237 	cwd = getcwd(NULL, 0);
8238 	if (cwd == NULL) {
8239 		error = got_error_from_errno("getcwd");
8240 		goto done;
8241 	}
8242 
8243 	error = got_repo_pack_fds_open(&pack_fds);
8244 	if (error != NULL)
8245 		goto done;
8246 
8247 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8248 	if (error) {
8249 		if (error->code == GOT_ERR_NOT_WORKTREE)
8250 			error = wrap_not_worktree_error(error, "remove", cwd);
8251 		goto done;
8252 	}
8253 
8254 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8255 	    NULL, pack_fds);
8256 	if (error)
8257 		goto done;
8258 
8259 	error = apply_unveil(got_repo_get_path(repo), 1,
8260 	    got_worktree_get_root_path(worktree));
8261 	if (error)
8262 		goto done;
8263 
8264 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8265 	if (error)
8266 		goto done;
8267 
8268 	if (!can_recurse) {
8269 		char *ondisk_path;
8270 		struct stat sb;
8271 		TAILQ_FOREACH(pe, &paths, entry) {
8272 			if (asprintf(&ondisk_path, "%s/%s",
8273 			    got_worktree_get_root_path(worktree),
8274 			    pe->path) == -1) {
8275 				error = got_error_from_errno("asprintf");
8276 				goto done;
8277 			}
8278 			if (lstat(ondisk_path, &sb) == -1) {
8279 				if (errno == ENOENT) {
8280 					free(ondisk_path);
8281 					continue;
8282 				}
8283 				error = got_error_from_errno2("lstat",
8284 				    ondisk_path);
8285 				free(ondisk_path);
8286 				goto done;
8287 			}
8288 			free(ondisk_path);
8289 			if (S_ISDIR(sb.st_mode)) {
8290 				error = got_error_msg(GOT_ERR_BAD_PATH,
8291 				    "removing directories requires -R option");
8292 				goto done;
8293 			}
8294 		}
8295 	}
8296 
8297 	error = got_worktree_schedule_delete(worktree, &paths,
8298 	    delete_local_mods, status_codes, print_remove_status, NULL,
8299 	    repo, keep_on_disk, ignore_missing_paths);
8300 done:
8301 	if (repo) {
8302 		const struct got_error *close_err = got_repo_close(repo);
8303 		if (error == NULL)
8304 			error = close_err;
8305 	}
8306 	if (worktree)
8307 		got_worktree_close(worktree);
8308 	if (pack_fds) {
8309 		const struct got_error *pack_err =
8310 		    got_repo_pack_fds_close(pack_fds);
8311 		if (error == NULL)
8312 			error = pack_err;
8313 	}
8314 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8315 	free(cwd);
8316 	return error;
8317 }
8318 
8319 __dead static void
8320 usage_patch(void)
8321 {
8322 	fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8323 	    "[patchfile]\n", getprogname());
8324 	exit(1);
8325 }
8326 
8327 static const struct got_error *
8328 patch_from_stdin(int *patchfd)
8329 {
8330 	const struct got_error *err = NULL;
8331 	ssize_t r;
8332 	char buf[BUFSIZ];
8333 	sig_t sighup, sigint, sigquit;
8334 
8335 	*patchfd = got_opentempfd();
8336 	if (*patchfd == -1)
8337 		return got_error_from_errno("got_opentempfd");
8338 
8339 	sighup = signal(SIGHUP, SIG_DFL);
8340 	sigint = signal(SIGINT, SIG_DFL);
8341 	sigquit = signal(SIGQUIT, SIG_DFL);
8342 
8343 	for (;;) {
8344 		r = read(0, buf, sizeof(buf));
8345 		if (r == -1) {
8346 			err = got_error_from_errno("read");
8347 			break;
8348 		}
8349 		if (r == 0)
8350 			break;
8351 		if (write(*patchfd, buf, r) == -1) {
8352 			err = got_error_from_errno("write");
8353 			break;
8354 		}
8355 	}
8356 
8357 	signal(SIGHUP, sighup);
8358 	signal(SIGINT, sigint);
8359 	signal(SIGQUIT, sigquit);
8360 
8361 	if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8362 		err = got_error_from_errno("lseek");
8363 
8364 	if (err != NULL) {
8365 		close(*patchfd);
8366 		*patchfd = -1;
8367 	}
8368 
8369 	return err;
8370 }
8371 
8372 struct got_patch_progress_arg {
8373 	int did_something;
8374 	int conflicts;
8375 	int rejects;
8376 };
8377 
8378 static const struct got_error *
8379 patch_progress(void *arg, const char *old, const char *new,
8380     unsigned char status, const struct got_error *error, int old_from,
8381     int old_lines, int new_from, int new_lines, int offset,
8382     int ws_mangled, const struct got_error *hunk_err)
8383 {
8384 	const char *path = new == NULL ? old : new;
8385 	struct got_patch_progress_arg *a = arg;
8386 
8387 	while (*path == '/')
8388 		path++;
8389 
8390 	if (status != GOT_STATUS_NO_CHANGE &&
8391 	    status != 0 /* per-hunk progress */) {
8392 		printf("%c  %s\n", status, path);
8393 		a->did_something = 1;
8394 	}
8395 
8396 	if (hunk_err == NULL) {
8397 		if (status == GOT_STATUS_CANNOT_UPDATE)
8398 			a->rejects++;
8399 		else if (status == GOT_STATUS_CONFLICT)
8400 			a->conflicts++;
8401 	}
8402 
8403 	if (error != NULL)
8404 		fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8405 
8406 	if (offset != 0 || hunk_err != NULL || ws_mangled) {
8407 		printf("@@ -%d,%d +%d,%d @@ ", old_from,
8408 		    old_lines, new_from, new_lines);
8409 		if (hunk_err != NULL)
8410 			printf("%s\n", hunk_err->msg);
8411 		else if (offset != 0)
8412 			printf("applied with offset %d\n", offset);
8413 		else
8414 			printf("hunk contains mangled whitespace\n");
8415 	}
8416 
8417 	return NULL;
8418 }
8419 
8420 static void
8421 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
8422 {
8423 	if (!ppa->did_something)
8424 		return;
8425 
8426 	if (ppa->conflicts > 0)
8427 		printf("Files with merge conflicts: %d\n", ppa->conflicts);
8428 
8429 	if (ppa->rejects > 0) {
8430 		printf("Files where patch failed to apply: %d\n",
8431 		    ppa->rejects);
8432 	}
8433 }
8434 
8435 static const struct got_error *
8436 cmd_patch(int argc, char *argv[])
8437 {
8438 	const struct got_error *error = NULL, *close_error = NULL;
8439 	struct got_worktree *worktree = NULL;
8440 	struct got_repository *repo = NULL;
8441 	struct got_reflist_head refs;
8442 	struct got_object_id *commit_id = NULL;
8443 	const char *commit_id_str = NULL;
8444 	struct stat sb;
8445 	const char *errstr;
8446 	char *cwd = NULL, *keyword_idstr = NULL;
8447 	int ch, nop = 0, strip = -1, reverse = 0;
8448 	int patchfd;
8449 	int *pack_fds = NULL;
8450 	struct got_patch_progress_arg ppa;
8451 
8452 	TAILQ_INIT(&refs);
8453 
8454 #ifndef PROFILE
8455 	if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8456 	    "unveil", NULL) == -1)
8457 		err(1, "pledge");
8458 #endif
8459 
8460 	while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8461 		switch (ch) {
8462 		case 'c':
8463 			commit_id_str = optarg;
8464 			break;
8465 		case 'n':
8466 			nop = 1;
8467 			break;
8468 		case 'p':
8469 			strip = strtonum(optarg, 0, INT_MAX, &errstr);
8470 			if (errstr != NULL)
8471 				errx(1, "pathname strip count is %s: %s",
8472 				     errstr, optarg);
8473 			break;
8474 		case 'R':
8475 			reverse = 1;
8476 			break;
8477 		default:
8478 			usage_patch();
8479 			/* NOTREACHED */
8480 		}
8481 	}
8482 
8483 	argc -= optind;
8484 	argv += optind;
8485 
8486 	if (argc == 0) {
8487 		error = patch_from_stdin(&patchfd);
8488 		if (error)
8489 			return error;
8490 	} else if (argc == 1) {
8491 		patchfd = open(argv[0], O_RDONLY);
8492 		if (patchfd == -1) {
8493 			error = got_error_from_errno2("open", argv[0]);
8494 			return error;
8495 		}
8496 		if (fstat(patchfd, &sb) == -1) {
8497 			error = got_error_from_errno2("fstat", argv[0]);
8498 			goto done;
8499 		}
8500 		if (!S_ISREG(sb.st_mode)) {
8501 			error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8502 			goto done;
8503 		}
8504 	} else
8505 		usage_patch();
8506 
8507 	if ((cwd = getcwd(NULL, 0)) == NULL) {
8508 		error = got_error_from_errno("getcwd");
8509 		goto done;
8510 	}
8511 
8512 	error = got_repo_pack_fds_open(&pack_fds);
8513 	if (error != NULL)
8514 		goto done;
8515 
8516 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8517 	if (error != NULL)
8518 		goto done;
8519 
8520 	const char *repo_path = got_worktree_get_repo_path(worktree);
8521 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8522 	if (error != NULL)
8523 		goto done;
8524 
8525 	error = apply_unveil(got_repo_get_path(repo), 0,
8526 	    got_worktree_get_root_path(worktree));
8527 	if (error != NULL)
8528 		goto done;
8529 
8530 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8531 	if (error)
8532 		goto done;
8533 
8534 	if (commit_id_str != NULL) {
8535 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
8536 		    repo, worktree);
8537 		if (error != NULL)
8538 			goto done;
8539 
8540 		error = got_repo_match_object_id(&commit_id, NULL,
8541 		    keyword_idstr != NULL ? keyword_idstr : commit_id_str,
8542 		    GOT_OBJ_TYPE_COMMIT, &refs, repo);
8543 		if (error)
8544 			goto done;
8545 	}
8546 
8547 	memset(&ppa, 0, sizeof(ppa));
8548 	error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8549 	    commit_id, patch_progress, &ppa, check_cancelled, NULL);
8550 	print_patch_progress_stats(&ppa);
8551 done:
8552 	got_ref_list_free(&refs);
8553 	free(keyword_idstr);
8554 	free(commit_id);
8555 	if (repo) {
8556 		close_error = got_repo_close(repo);
8557 		if (error == NULL)
8558 			error = close_error;
8559 	}
8560 	if (worktree != NULL) {
8561 		close_error = got_worktree_close(worktree);
8562 		if (error == NULL)
8563 			error = close_error;
8564 	}
8565 	if (pack_fds) {
8566 		const struct got_error *pack_err =
8567 		    got_repo_pack_fds_close(pack_fds);
8568 		if (error == NULL)
8569 			error = pack_err;
8570 	}
8571 	free(cwd);
8572 	return error;
8573 }
8574 
8575 __dead static void
8576 usage_revert(void)
8577 {
8578 	fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8579 	    getprogname());
8580 	exit(1);
8581 }
8582 
8583 static const struct got_error *
8584 revert_progress(void *arg, unsigned char status, const char *path)
8585 {
8586 	if (status == GOT_STATUS_UNVERSIONED)
8587 		return NULL;
8588 
8589 	while (path[0] == '/')
8590 		path++;
8591 	printf("%c  %s\n", status, path);
8592 	return NULL;
8593 }
8594 
8595 struct choose_patch_arg {
8596 	FILE *patch_script_file;
8597 	const char *action;
8598 };
8599 
8600 static const struct got_error *
8601 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8602     int nchanges, const char *action)
8603 {
8604 	const struct got_error *err;
8605 	char *line = NULL;
8606 	size_t linesize = 0;
8607 	ssize_t linelen;
8608 
8609 	switch (status) {
8610 	case GOT_STATUS_ADD:
8611 		printf("A  %s\n%s this addition? [y/n] ", path, action);
8612 		break;
8613 	case GOT_STATUS_DELETE:
8614 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
8615 		break;
8616 	case GOT_STATUS_MODIFY:
8617 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
8618 			return got_error_from_errno("fseek");
8619 		printf(GOT_COMMIT_SEP_STR);
8620 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8621 			printf("%s", line);
8622 		if (linelen == -1 && ferror(patch_file)) {
8623 			err = got_error_from_errno("getline");
8624 			free(line);
8625 			return err;
8626 		}
8627 		free(line);
8628 		printf(GOT_COMMIT_SEP_STR);
8629 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
8630 		    path, n, nchanges, action);
8631 		break;
8632 	default:
8633 		return got_error_path(path, GOT_ERR_FILE_STATUS);
8634 	}
8635 
8636 	fflush(stdout);
8637 	return NULL;
8638 }
8639 
8640 static const struct got_error *
8641 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8642     FILE *patch_file, int n, int nchanges)
8643 {
8644 	const struct got_error *err = NULL;
8645 	char *line = NULL;
8646 	size_t linesize = 0;
8647 	ssize_t linelen;
8648 	int resp = ' ';
8649 	struct choose_patch_arg *a = arg;
8650 
8651 	*choice = GOT_PATCH_CHOICE_NONE;
8652 
8653 	if (a->patch_script_file) {
8654 		char *nl;
8655 		err = show_change(status, path, patch_file, n, nchanges,
8656 		    a->action);
8657 		if (err)
8658 			return err;
8659 		linelen = getline(&line, &linesize, a->patch_script_file);
8660 		if (linelen == -1) {
8661 			if (ferror(a->patch_script_file))
8662 				return got_error_from_errno("getline");
8663 			return NULL;
8664 		}
8665 		nl = strchr(line, '\n');
8666 		if (nl)
8667 			*nl = '\0';
8668 		if (strcmp(line, "y") == 0) {
8669 			*choice = GOT_PATCH_CHOICE_YES;
8670 			printf("y\n");
8671 		} else if (strcmp(line, "n") == 0) {
8672 			*choice = GOT_PATCH_CHOICE_NO;
8673 			printf("n\n");
8674 		} else if (strcmp(line, "q") == 0 &&
8675 		    status == GOT_STATUS_MODIFY) {
8676 			*choice = GOT_PATCH_CHOICE_QUIT;
8677 			printf("q\n");
8678 		} else
8679 			printf("invalid response '%s'\n", line);
8680 		free(line);
8681 		return NULL;
8682 	}
8683 
8684 	while (resp != 'y' && resp != 'n' && resp != 'q') {
8685 		err = show_change(status, path, patch_file, n, nchanges,
8686 		    a->action);
8687 		if (err)
8688 			return err;
8689 		resp = getchar();
8690 		if (resp == '\n')
8691 			resp = getchar();
8692 		if (status == GOT_STATUS_MODIFY) {
8693 			if (resp != 'y' && resp != 'n' && resp != 'q') {
8694 				printf("invalid response '%c'\n", resp);
8695 				resp = ' ';
8696 			}
8697 		} else if (resp != 'y' && resp != 'n') {
8698 				printf("invalid response '%c'\n", resp);
8699 				resp = ' ';
8700 		}
8701 	}
8702 
8703 	if (resp == 'y')
8704 		*choice = GOT_PATCH_CHOICE_YES;
8705 	else if (resp == 'n')
8706 		*choice = GOT_PATCH_CHOICE_NO;
8707 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8708 		*choice = GOT_PATCH_CHOICE_QUIT;
8709 
8710 	return NULL;
8711 }
8712 
8713 struct wt_commitable_path_arg {
8714 	struct got_pathlist_head	*commit_paths;
8715 	int				*has_changes;
8716 };
8717 
8718 /*
8719  * Shortcut work tree status callback to determine if the set of paths scanned
8720  * has at least one versioned path that is being modified and, if not NULL, is
8721  * in the arg->commit_paths list.  Set arg and return GOT_ERR_FILE_MODIFIED as
8722  * soon as a path is passed with a status that satisfies this criteria.
8723  */
8724 static const struct got_error *
8725 worktree_has_commitable_path(void *arg, unsigned char status,
8726     unsigned char staged_status, const char *path,
8727     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8728     struct got_object_id *commit_id, int dirfd, const char *de_name)
8729 {
8730 	struct wt_commitable_path_arg *a = arg;
8731 
8732 	if (status == staged_status && (status == GOT_STATUS_DELETE))
8733 		status = GOT_STATUS_NO_CHANGE;
8734 
8735 	if (!(status == GOT_STATUS_NO_CHANGE ||
8736 	    status == GOT_STATUS_UNVERSIONED) ||
8737 	    staged_status != GOT_STATUS_NO_CHANGE) {
8738 		if (a->commit_paths != NULL) {
8739 			struct got_pathlist_entry *pe;
8740 
8741 			TAILQ_FOREACH(pe, a->commit_paths, entry) {
8742 				if (strncmp(path, pe->path,
8743 				    pe->path_len) == 0) {
8744 					*a->has_changes = 1;
8745 					break;
8746 				}
8747 			}
8748 		} else
8749 			*a->has_changes = 1;
8750 
8751 		if (*a->has_changes)
8752 			return got_error(GOT_ERR_FILE_MODIFIED);
8753 	}
8754 
8755 	return NULL;
8756 }
8757 
8758 /*
8759  * Check that the changeset of the commit identified by id is
8760  * comprised of at least one modified path that is being committed.
8761  */
8762 static const struct got_error *
8763 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
8764     struct got_object_id *id, struct got_worktree *worktree,
8765     struct got_repository *repo)
8766 {
8767 	const struct got_error		*err;
8768 	struct got_pathlist_head	 paths;
8769 	struct got_commit_object	*commit = NULL, *pcommit = NULL;
8770 	struct got_tree_object		*tree = NULL, *ptree = NULL;
8771 	struct got_object_qid		*pid;
8772 
8773 	TAILQ_INIT(&paths);
8774 
8775 	err = got_object_open_as_commit(&commit, repo, id);
8776 	if (err)
8777 		goto done;
8778 
8779 	err = got_object_open_as_tree(&tree, repo,
8780 	    got_object_commit_get_tree_id(commit));
8781 	if (err)
8782 		goto done;
8783 
8784 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8785 	if (pid != NULL) {
8786 		err = got_object_open_as_commit(&pcommit, repo, &pid->id);
8787 		if (err)
8788 			goto done;
8789 
8790 		err = got_object_open_as_tree(&ptree, repo,
8791 		    got_object_commit_get_tree_id(pcommit));
8792 		if (err)
8793 			goto done;
8794 	}
8795 
8796 	err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
8797 	    got_diff_tree_collect_changed_paths, &paths, 0);
8798 	if (err)
8799 		goto done;
8800 
8801 	err = got_worktree_status(worktree, &paths, repo, 0,
8802 	    worktree_has_commitable_path, wcpa, check_cancelled, NULL);
8803 	if (err && err->code == GOT_ERR_FILE_MODIFIED) {
8804 		/*
8805 		 * At least one changed path in the referenced commit is
8806 		 * modified in the work tree, that's all we need to know!
8807 		 */
8808 		err = NULL;
8809 	}
8810 
8811 done:
8812 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8813 	if (commit)
8814 		got_object_commit_close(commit);
8815 	if (pcommit)
8816 		got_object_commit_close(pcommit);
8817 	if (tree)
8818 		got_object_tree_close(tree);
8819 	if (ptree)
8820 		got_object_tree_close(ptree);
8821 	return err;
8822 }
8823 
8824 /*
8825  * Remove any "logmsg" reference comprised entirely of paths that have
8826  * been reverted in this work tree. If any path in the logmsg ref changeset
8827  * remains in a changed state in the worktree, do not remove the reference.
8828  */
8829 static const struct got_error *
8830 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
8831 {
8832 	const struct got_error		*err;
8833 	struct got_reflist_head		 refs;
8834 	struct got_reflist_entry	*re;
8835 	struct got_commit_object	*commit = NULL;
8836 	struct got_object_id		*commit_id = NULL;
8837 	struct wt_commitable_path_arg	 wcpa;
8838 	char				*uuidstr = NULL;
8839 
8840 	TAILQ_INIT(&refs);
8841 
8842 	err = got_worktree_get_uuid(&uuidstr, worktree);
8843 	if (err)
8844 		goto done;
8845 
8846 	err = got_ref_list(&refs, repo, "refs/got/worktree",
8847 	    got_ref_cmp_by_name, repo);
8848 	if (err)
8849 		goto done;
8850 
8851 	TAILQ_FOREACH(re, &refs, entry) {
8852 		const char	*refname;
8853 		int		 has_changes = 0;
8854 
8855 		refname = got_ref_get_name(re->ref);
8856 
8857 		if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8858 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
8859 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
8860 		else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8861 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
8862 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
8863 		else
8864 			continue;
8865 
8866 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
8867 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8868 		else
8869 			continue;
8870 
8871 		err = got_repo_match_object_id(&commit_id, NULL, refname,
8872 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
8873 		if (err)
8874 			goto done;
8875 
8876 		err = got_object_open_as_commit(&commit, repo, commit_id);
8877 		if (err)
8878 			goto done;
8879 
8880 		wcpa.commit_paths = NULL;
8881 		wcpa.has_changes = &has_changes;
8882 
8883 		err = commit_path_changed_in_worktree(&wcpa, commit_id,
8884 		    worktree, repo);
8885 		if (err)
8886 			goto done;
8887 
8888 		if (!has_changes) {
8889 			err = got_ref_delete(re->ref, repo);
8890 			if (err)
8891 				goto done;
8892 		}
8893 
8894 		got_object_commit_close(commit);
8895 		commit = NULL;
8896 		free(commit_id);
8897 		commit_id = NULL;
8898 	}
8899 
8900 done:
8901 	free(uuidstr);
8902 	free(commit_id);
8903 	got_ref_list_free(&refs);
8904 	if (commit)
8905 		got_object_commit_close(commit);
8906 	return err;
8907 }
8908 
8909 static const struct got_error *
8910 cmd_revert(int argc, char *argv[])
8911 {
8912 	const struct got_error *error = NULL;
8913 	struct got_worktree *worktree = NULL;
8914 	struct got_repository *repo = NULL;
8915 	char *cwd = NULL, *path = NULL;
8916 	struct got_pathlist_head paths;
8917 	struct got_pathlist_entry *pe;
8918 	int ch, can_recurse = 0, pflag = 0;
8919 	FILE *patch_script_file = NULL;
8920 	const char *patch_script_path = NULL;
8921 	struct choose_patch_arg cpa;
8922 	int *pack_fds = NULL;
8923 
8924 	TAILQ_INIT(&paths);
8925 
8926 #ifndef PROFILE
8927 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8928 	    "unveil", NULL) == -1)
8929 		err(1, "pledge");
8930 #endif
8931 
8932 	while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8933 		switch (ch) {
8934 		case 'F':
8935 			patch_script_path = optarg;
8936 			break;
8937 		case 'p':
8938 			pflag = 1;
8939 			break;
8940 		case 'R':
8941 			can_recurse = 1;
8942 			break;
8943 		default:
8944 			usage_revert();
8945 			/* NOTREACHED */
8946 		}
8947 	}
8948 
8949 	argc -= optind;
8950 	argv += optind;
8951 
8952 	if (argc < 1)
8953 		usage_revert();
8954 	if (patch_script_path && !pflag)
8955 		errx(1, "-F option can only be used together with -p option");
8956 
8957 	cwd = getcwd(NULL, 0);
8958 	if (cwd == NULL) {
8959 		error = got_error_from_errno("getcwd");
8960 		goto done;
8961 	}
8962 
8963 	error = got_repo_pack_fds_open(&pack_fds);
8964 	if (error != NULL)
8965 		goto done;
8966 
8967 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8968 	if (error) {
8969 		if (error->code == GOT_ERR_NOT_WORKTREE)
8970 			error = wrap_not_worktree_error(error, "revert", cwd);
8971 		goto done;
8972 	}
8973 
8974 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8975 	    NULL, pack_fds);
8976 	if (error != NULL)
8977 		goto done;
8978 
8979 	if (patch_script_path) {
8980 		patch_script_file = fopen(patch_script_path, "re");
8981 		if (patch_script_file == NULL) {
8982 			error = got_error_from_errno2("fopen",
8983 			    patch_script_path);
8984 			goto done;
8985 		}
8986 	}
8987 
8988 	/*
8989 	 * XXX "c" perm needed on repo dir to delete merge references.
8990 	 */
8991 	error = apply_unveil(got_repo_get_path(repo), 0,
8992 	    got_worktree_get_root_path(worktree));
8993 	if (error)
8994 		goto done;
8995 
8996 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8997 	if (error)
8998 		goto done;
8999 
9000 	if (!can_recurse) {
9001 		char *ondisk_path;
9002 		struct stat sb;
9003 		TAILQ_FOREACH(pe, &paths, entry) {
9004 			if (asprintf(&ondisk_path, "%s/%s",
9005 			    got_worktree_get_root_path(worktree),
9006 			    pe->path) == -1) {
9007 				error = got_error_from_errno("asprintf");
9008 				goto done;
9009 			}
9010 			if (lstat(ondisk_path, &sb) == -1) {
9011 				if (errno == ENOENT) {
9012 					free(ondisk_path);
9013 					continue;
9014 				}
9015 				error = got_error_from_errno2("lstat",
9016 				    ondisk_path);
9017 				free(ondisk_path);
9018 				goto done;
9019 			}
9020 			free(ondisk_path);
9021 			if (S_ISDIR(sb.st_mode)) {
9022 				error = got_error_msg(GOT_ERR_BAD_PATH,
9023 				    "reverting directories requires -R option");
9024 				goto done;
9025 			}
9026 		}
9027 	}
9028 
9029 	cpa.patch_script_file = patch_script_file;
9030 	cpa.action = "revert";
9031 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
9032 	    pflag ? choose_patch : NULL, &cpa, repo);
9033 
9034 	error = rm_logmsg_ref(worktree, repo);
9035 done:
9036 	if (patch_script_file && fclose(patch_script_file) == EOF &&
9037 	    error == NULL)
9038 		error = got_error_from_errno2("fclose", patch_script_path);
9039 	if (repo) {
9040 		const struct got_error *close_err = got_repo_close(repo);
9041 		if (error == NULL)
9042 			error = close_err;
9043 	}
9044 	if (worktree)
9045 		got_worktree_close(worktree);
9046 	if (pack_fds) {
9047 		const struct got_error *pack_err =
9048 		    got_repo_pack_fds_close(pack_fds);
9049 		if (error == NULL)
9050 			error = pack_err;
9051 	}
9052 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9053 	free(path);
9054 	free(cwd);
9055 	return error;
9056 }
9057 
9058 __dead static void
9059 usage_commit(void)
9060 {
9061 	fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
9062 	    "[-m message] [path ...]\n", getprogname());
9063 	exit(1);
9064 }
9065 
9066 struct collect_commit_logmsg_arg {
9067 	const char *cmdline_log;
9068 	const char *prepared_log;
9069 	const char *merged_log;
9070 	int non_interactive;
9071 	const char *editor;
9072 	const char *worktree_path;
9073 	const char *branch_name;
9074 	const char *repo_path;
9075 	char *logmsg_path;
9076 
9077 };
9078 
9079 static const struct got_error *
9080 read_prepared_logmsg(char **logmsg, const char *path)
9081 {
9082 	const struct got_error *err = NULL;
9083 	FILE *f = NULL;
9084 	struct stat sb;
9085 	size_t r;
9086 
9087 	*logmsg = NULL;
9088 	memset(&sb, 0, sizeof(sb));
9089 
9090 	f = fopen(path, "re");
9091 	if (f == NULL)
9092 		return got_error_from_errno2("fopen", path);
9093 
9094 	if (fstat(fileno(f), &sb) == -1) {
9095 		err = got_error_from_errno2("fstat", path);
9096 		goto done;
9097 	}
9098 	if (sb.st_size == 0) {
9099 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
9100 		goto done;
9101 	}
9102 
9103 	*logmsg = malloc(sb.st_size + 1);
9104 	if (*logmsg == NULL) {
9105 		err = got_error_from_errno("malloc");
9106 		goto done;
9107 	}
9108 
9109 	r = fread(*logmsg, 1, sb.st_size, f);
9110 	if (r != sb.st_size) {
9111 		if (ferror(f))
9112 			err = got_error_from_errno2("fread", path);
9113 		else
9114 			err = got_error(GOT_ERR_IO);
9115 		goto done;
9116 	}
9117 	(*logmsg)[sb.st_size] = '\0';
9118 done:
9119 	if (fclose(f) == EOF && err == NULL)
9120 		err = got_error_from_errno2("fclose", path);
9121 	if (err) {
9122 		free(*logmsg);
9123 		*logmsg = NULL;
9124 	}
9125 	return err;
9126 }
9127 
9128 static const struct got_error *
9129 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
9130     const char *diff_path, char **logmsg, void *arg)
9131 {
9132 	char *initial_content = NULL;
9133 	struct got_pathlist_entry *pe;
9134 	const struct got_error *err = NULL;
9135 	char *template = NULL;
9136 	char *prepared_msg = NULL, *merged_msg = NULL;
9137 	struct collect_commit_logmsg_arg *a = arg;
9138 	int initial_content_len;
9139 	int fd = -1;
9140 	size_t len;
9141 
9142 	/* if a message was specified on the command line, just use it */
9143 	if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
9144 		len = strlen(a->cmdline_log) + 1;
9145 		*logmsg = malloc(len + 1);
9146 		if (*logmsg == NULL)
9147 			return got_error_from_errno("malloc");
9148 		strlcpy(*logmsg, a->cmdline_log, len);
9149 		return NULL;
9150 	} else if (a->prepared_log != NULL && a->non_interactive)
9151 		return read_prepared_logmsg(logmsg, a->prepared_log);
9152 
9153 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
9154 		return got_error_from_errno("asprintf");
9155 
9156 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
9157 	if (err)
9158 		goto done;
9159 
9160 	if (a->prepared_log) {
9161 		err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
9162 		if (err)
9163 			goto done;
9164 	} else if (a->merged_log) {
9165 		err = read_prepared_logmsg(&merged_msg, a->merged_log);
9166 		if (err)
9167 			goto done;
9168 	}
9169 
9170 	initial_content_len = asprintf(&initial_content,
9171 	    "%s%s\n# changes to be committed on branch %s:\n",
9172 	    prepared_msg ? prepared_msg : "",
9173 	    merged_msg ? merged_msg : "", a->branch_name);
9174 	if (initial_content_len == -1) {
9175 		err = got_error_from_errno("asprintf");
9176 		goto done;
9177 	}
9178 
9179 	if (write(fd, initial_content, initial_content_len) == -1) {
9180 		err = got_error_from_errno2("write", a->logmsg_path);
9181 		goto done;
9182 	}
9183 
9184 	TAILQ_FOREACH(pe, commitable_paths, entry) {
9185 		struct got_commitable *ct = pe->data;
9186 		dprintf(fd, "#  %c  %s\n",
9187 		    got_commitable_get_status(ct),
9188 		    got_commitable_get_path(ct));
9189 	}
9190 
9191 	if (diff_path) {
9192 		dprintf(fd, "# detailed changes can be viewed in %s\n",
9193 		    diff_path);
9194 	}
9195 
9196 	if (close(fd) == -1) {
9197 		err = got_error_from_errno2("close", a->logmsg_path);
9198 		goto done;
9199 	}
9200 	fd = -1;
9201 
9202 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
9203 	    initial_content_len, a->prepared_log ? 0 : 1);
9204 done:
9205 	free(initial_content);
9206 	free(template);
9207 	free(prepared_msg);
9208 	free(merged_msg);
9209 
9210 	if (fd != -1 && close(fd) == -1 && err == NULL)
9211 		err = got_error_from_errno2("close", a->logmsg_path);
9212 	if (err) {
9213 		free(*logmsg);
9214 		*logmsg = NULL;
9215 	}
9216 	return err;
9217 }
9218 
9219 static const struct got_error *
9220 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
9221     const char *type, int has_content)
9222 {
9223 	const struct got_error	*err = NULL;
9224 	char			*logmsg = NULL;
9225 
9226 	err = got_object_commit_get_logmsg(&logmsg, commit);
9227 	if (err)
9228 		return err;
9229 
9230 	if (fprintf(f, "%s# log message of %s commit %s:%s",
9231 	    has_content ? "\n" : "", type, idstr, logmsg) < 0)
9232 		err = got_ferror(f, GOT_ERR_IO);
9233 
9234 	free(logmsg);
9235 	return err;
9236 }
9237 
9238 /*
9239  * Lookup "logmsg" references of backed-out and cherrypicked commits
9240  * belonging to the current work tree. If found, and the worktree has
9241  * at least one modified file that was changed in the referenced commit,
9242  * add its log message to a new temporary file at *logmsg_path.
9243  * Add all refs found to matched_refs to be scheduled for removal on
9244  * successful commit.
9245  */
9246 static const struct got_error *
9247 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
9248     struct got_reflist_head *matched_refs, struct got_worktree *worktree,
9249     struct got_repository *repo)
9250 {
9251 	const struct got_error		*err;
9252 	struct got_commit_object	*commit = NULL;
9253 	struct got_object_id		*id = NULL;
9254 	struct got_reflist_head		 refs;
9255 	struct got_reflist_entry	*re, *re_match;
9256 	FILE				*f = NULL;
9257 	char				*uuidstr = NULL;
9258 	int				 added_logmsg = 0;
9259 
9260 	TAILQ_INIT(&refs);
9261 
9262 	*logmsg_path = NULL;
9263 
9264 	err = got_worktree_get_uuid(&uuidstr, worktree);
9265 	if (err)
9266 		goto done;
9267 
9268 	err = got_ref_list(&refs, repo, "refs/got/worktree",
9269 	    got_ref_cmp_by_name, repo);
9270 	if (err)
9271 		goto done;
9272 
9273 	TAILQ_FOREACH(re, &refs, entry) {
9274 		const char			*refname, *type;
9275 		struct wt_commitable_path_arg	 wcpa;
9276 		int				 add_logmsg = 0;
9277 
9278 		refname = got_ref_get_name(re->ref);
9279 
9280 		if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
9281 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
9282 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
9283 			type = "cherrypicked";
9284 		} else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
9285 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
9286 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
9287 			type = "backed-out";
9288 		} else
9289 			continue;
9290 
9291 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
9292 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
9293 		else
9294 			continue;
9295 
9296 		err = got_repo_match_object_id(&id, NULL, refname,
9297 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
9298 		if (err)
9299 			goto done;
9300 
9301 		err = got_object_open_as_commit(&commit, repo, id);
9302 		if (err)
9303 			goto done;
9304 
9305 		wcpa.commit_paths = paths;
9306 		wcpa.has_changes = &add_logmsg;
9307 
9308 		err = commit_path_changed_in_worktree(&wcpa, id,
9309 		    worktree, repo);
9310 		if (err)
9311 			goto done;
9312 
9313 		if (add_logmsg) {
9314 			if (f == NULL) {
9315 				err = got_opentemp_named(logmsg_path, &f,
9316 				    "got-commit-logmsg", "");
9317 				if (err)
9318 					goto done;
9319 			}
9320 			err = cat_logmsg(f, commit, refname, type,
9321 			    added_logmsg);
9322 			if (err)
9323 				goto done;
9324 			if (!added_logmsg)
9325 				++added_logmsg;
9326 
9327 			err = got_reflist_entry_dup(&re_match, re);
9328 			if (err)
9329 				goto done;
9330 			TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
9331 		}
9332 
9333 		got_object_commit_close(commit);
9334 		commit = NULL;
9335 		free(id);
9336 		id = NULL;
9337 	}
9338 
9339 done:
9340 	free(id);
9341 	free(uuidstr);
9342 	got_ref_list_free(&refs);
9343 	if (commit)
9344 		got_object_commit_close(commit);
9345 	if (f && fclose(f) == EOF && err == NULL)
9346 		err = got_error_from_errno("fclose");
9347 	if (!added_logmsg) {
9348 		if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
9349 			err = got_error_from_errno2("unlink", *logmsg_path);
9350 		*logmsg_path = NULL;
9351 	}
9352 	return err;
9353 }
9354 
9355 static const struct got_error *
9356 cmd_commit(int argc, char *argv[])
9357 {
9358 	const struct got_error *error = NULL;
9359 	struct got_worktree *worktree = NULL;
9360 	struct got_repository *repo = NULL;
9361 	char *cwd = NULL, *id_str = NULL;
9362 	struct got_object_id *id = NULL;
9363 	const char *logmsg = NULL;
9364 	char *prepared_logmsg = NULL, *merged_logmsg = NULL;
9365 	struct collect_commit_logmsg_arg cl_arg;
9366 	const char *author = NULL;
9367 	char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
9368 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
9369 	int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
9370 	int show_diff = 1, commit_conflicts = 0;
9371 	struct got_pathlist_head paths;
9372 	struct got_reflist_head refs;
9373 	struct got_reflist_entry *re;
9374 	int *pack_fds = NULL;
9375 
9376 	TAILQ_INIT(&refs);
9377 	TAILQ_INIT(&paths);
9378 	cl_arg.logmsg_path = NULL;
9379 
9380 #ifndef PROFILE
9381 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9382 	    "unveil", NULL) == -1)
9383 		err(1, "pledge");
9384 #endif
9385 
9386 	while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
9387 		switch (ch) {
9388 		case 'A':
9389 			author = optarg;
9390 			error = valid_author(author);
9391 			if (error)
9392 				return error;
9393 			break;
9394 		case 'C':
9395 			commit_conflicts = 1;
9396 			break;
9397 		case 'F':
9398 			if (logmsg != NULL)
9399 				option_conflict('F', 'm');
9400 			prepared_logmsg = realpath(optarg, NULL);
9401 			if (prepared_logmsg == NULL)
9402 				return got_error_from_errno2("realpath",
9403 				    optarg);
9404 			break;
9405 		case 'm':
9406 			if (prepared_logmsg)
9407 				option_conflict('m', 'F');
9408 			logmsg = optarg;
9409 			break;
9410 		case 'N':
9411 			non_interactive = 1;
9412 			break;
9413 		case 'n':
9414 			show_diff = 0;
9415 			break;
9416 		case 'S':
9417 			allow_bad_symlinks = 1;
9418 			break;
9419 		default:
9420 			usage_commit();
9421 			/* NOTREACHED */
9422 		}
9423 	}
9424 
9425 	argc -= optind;
9426 	argv += optind;
9427 
9428 	cwd = getcwd(NULL, 0);
9429 	if (cwd == NULL) {
9430 		error = got_error_from_errno("getcwd");
9431 		goto done;
9432 	}
9433 
9434 	error = got_repo_pack_fds_open(&pack_fds);
9435 	if (error != NULL)
9436 		goto done;
9437 
9438 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9439 	if (error) {
9440 		if (error->code == GOT_ERR_NOT_WORKTREE)
9441 			error = wrap_not_worktree_error(error, "commit", cwd);
9442 		goto done;
9443 	}
9444 
9445 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9446 	if (error)
9447 		goto done;
9448 	if (rebase_in_progress) {
9449 		error = got_error(GOT_ERR_REBASING);
9450 		goto done;
9451 	}
9452 
9453 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
9454 	    worktree);
9455 	if (error)
9456 		goto done;
9457 
9458 	error = get_gitconfig_path(&gitconfig_path);
9459 	if (error)
9460 		goto done;
9461 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9462 	    gitconfig_path, pack_fds);
9463 	if (error != NULL)
9464 		goto done;
9465 
9466 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
9467 	if (error)
9468 		goto done;
9469 	if (merge_in_progress) {
9470 		error = got_error(GOT_ERR_MERGE_BUSY);
9471 		goto done;
9472 	}
9473 
9474 	error = get_author(&committer, repo, worktree);
9475 	if (error)
9476 		goto done;
9477 
9478 	if (author == NULL)
9479 		author = committer;
9480 
9481 	if (logmsg == NULL || strlen(logmsg) == 0) {
9482 		error = get_editor(&editor);
9483 		if (error)
9484 			goto done;
9485 		if (unveil(editor, "x") != 0) {
9486 			error = got_error_from_errno2("unveil", editor);
9487 			goto done;
9488 		}
9489 	}
9490 	if (prepared_logmsg) {
9491 		if (unveil(prepared_logmsg, "r") != 0) {
9492 			error = got_error_from_errno2("unveil",
9493 			    prepared_logmsg);
9494 			goto done;
9495 		}
9496 	}
9497 
9498 	error = apply_unveil(got_repo_get_path(repo), 0,
9499 	    got_worktree_get_root_path(worktree));
9500 	if (error)
9501 		goto done;
9502 
9503 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9504 	if (error)
9505 		goto done;
9506 
9507 	if (prepared_logmsg == NULL) {
9508 		error = lookup_logmsg_ref(&merged_logmsg,
9509 		    argc > 0 ? &paths : NULL, &refs, worktree, repo);
9510 		if (error)
9511 			goto done;
9512 	}
9513 
9514 	cl_arg.editor = editor;
9515 	cl_arg.cmdline_log = logmsg;
9516 	cl_arg.prepared_log = prepared_logmsg;
9517 	cl_arg.merged_log = merged_logmsg;
9518 	cl_arg.non_interactive = non_interactive;
9519 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
9520 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
9521 	if (!histedit_in_progress) {
9522 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
9523 			error = got_error(GOT_ERR_COMMIT_BRANCH);
9524 			goto done;
9525 		}
9526 		cl_arg.branch_name += 11;
9527 	}
9528 	cl_arg.repo_path = got_repo_get_path(repo);
9529 	error = got_worktree_commit(&id, worktree, &paths, author, committer,
9530 	    allow_bad_symlinks, show_diff, commit_conflicts,
9531 	    collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
9532 	if (error) {
9533 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
9534 		    cl_arg.logmsg_path != NULL)
9535 			preserve_logmsg = 1;
9536 		goto done;
9537 	}
9538 
9539 	error = got_object_id_str(&id_str, id);
9540 	if (error)
9541 		goto done;
9542 	printf("Created commit %s\n", id_str);
9543 
9544 	TAILQ_FOREACH(re, &refs, entry) {
9545 		error = got_ref_delete(re->ref, repo);
9546 		if (error)
9547 			goto done;
9548 	}
9549 
9550 done:
9551 	if (preserve_logmsg) {
9552 		fprintf(stderr, "%s: log message preserved in %s\n",
9553 		    getprogname(), cl_arg.logmsg_path);
9554 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
9555 	    error == NULL)
9556 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
9557 	free(cl_arg.logmsg_path);
9558 	if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
9559 		error = got_error_from_errno2("unlink", merged_logmsg);
9560 	free(merged_logmsg);
9561 	if (repo) {
9562 		const struct got_error *close_err = got_repo_close(repo);
9563 		if (error == NULL)
9564 			error = close_err;
9565 	}
9566 	if (worktree)
9567 		got_worktree_close(worktree);
9568 	if (pack_fds) {
9569 		const struct got_error *pack_err =
9570 		    got_repo_pack_fds_close(pack_fds);
9571 		if (error == NULL)
9572 			error = pack_err;
9573 	}
9574 	got_ref_list_free(&refs);
9575 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9576 	free(cwd);
9577 	free(id_str);
9578 	free(gitconfig_path);
9579 	free(editor);
9580 	free(committer);
9581 	free(prepared_logmsg);
9582 	return error;
9583 }
9584 
9585 __dead static void
9586 usage_send(void)
9587 {
9588 	fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
9589 	    "[-r repository-path] [-t tag] [remote-repository]\n",
9590 	    getprogname());
9591 	exit(1);
9592 }
9593 
9594 static void
9595 print_load_info(int print_colored, int print_found, int print_trees,
9596     int ncolored, int nfound, int ntrees)
9597 {
9598 	if (print_colored) {
9599 		printf("%d commit%s colored", ncolored,
9600 		    ncolored == 1 ? "" : "s");
9601 	}
9602 	if (print_found) {
9603 		printf("%s%d object%s found",
9604 		    ncolored > 0 ? "; " : "",
9605 		    nfound, nfound == 1 ? "" : "s");
9606 	}
9607 	if (print_trees) {
9608 		printf("; %d tree%s scanned", ntrees,
9609 		    ntrees == 1 ? "" : "s");
9610 	}
9611 }
9612 
9613 struct got_send_progress_arg {
9614 	char last_scaled_packsize[FMT_SCALED_STRSIZE];
9615 	int verbosity;
9616 	int last_ncolored;
9617 	int last_nfound;
9618 	int last_ntrees;
9619 	int loading_done;
9620 	int last_ncommits;
9621 	int last_nobj_total;
9622 	int last_p_deltify;
9623 	int last_p_written;
9624 	int last_p_sent;
9625 	int printed_something;
9626 	int sent_something;
9627 	struct got_pathlist_head *delete_branches;
9628 };
9629 
9630 static const struct got_error *
9631 send_progress(void *arg, int ncolored, int nfound, int ntrees,
9632     off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
9633     int nobj_written, off_t bytes_sent, const char *refname,
9634     const char *errmsg, int success)
9635 {
9636 	struct got_send_progress_arg *a = arg;
9637 	char scaled_packsize[FMT_SCALED_STRSIZE];
9638 	char scaled_sent[FMT_SCALED_STRSIZE];
9639 	int p_deltify = 0, p_written = 0, p_sent = 0;
9640 	int print_colored = 0, print_found = 0, print_trees = 0;
9641 	int print_searching = 0, print_total = 0;
9642 	int print_deltify = 0, print_written = 0, print_sent = 0;
9643 
9644 	if (a->verbosity < 0)
9645 		return NULL;
9646 
9647 	if (refname) {
9648 		const char *status = success ? "accepted" : "rejected";
9649 
9650 		if (success) {
9651 			struct got_pathlist_entry *pe;
9652 			TAILQ_FOREACH(pe, a->delete_branches, entry) {
9653 				const char *branchname = pe->path;
9654 				if (got_path_cmp(branchname, refname,
9655 				    strlen(branchname), strlen(refname)) == 0) {
9656 					status = "deleted";
9657 					a->sent_something = 1;
9658 					break;
9659 				}
9660 			}
9661 		}
9662 
9663 		if (a->printed_something)
9664 			putchar('\n');
9665 		printf("Server has %s %s", status, refname);
9666 		if (errmsg)
9667 			printf(": %s", errmsg);
9668 		a->printed_something = 1;
9669 		return NULL;
9670 	}
9671 
9672 	if (a->last_ncolored != ncolored) {
9673 		print_colored = 1;
9674 		a->last_ncolored = ncolored;
9675 	}
9676 
9677 	if (a->last_nfound != nfound) {
9678 		print_colored = 1;
9679 		print_found = 1;
9680 		a->last_nfound = nfound;
9681 	}
9682 
9683 	if (a->last_ntrees != ntrees) {
9684 		print_colored = 1;
9685 		print_found = 1;
9686 		print_trees = 1;
9687 		a->last_ntrees = ntrees;
9688 	}
9689 
9690 	if ((print_colored || print_found || print_trees) &&
9691 	    !a->loading_done) {
9692 		printf("\r");
9693 		print_load_info(print_colored, print_found, print_trees,
9694 		    ncolored, nfound, ntrees);
9695 		a->printed_something = 1;
9696 		fflush(stdout);
9697 		return NULL;
9698 	} else if (!a->loading_done) {
9699 		printf("\r");
9700 		print_load_info(1, 1, 1, ncolored, nfound, ntrees);
9701 		printf("\n");
9702 		a->loading_done = 1;
9703 	}
9704 
9705 	if (fmt_scaled(packfile_size, scaled_packsize) == -1)
9706 		return got_error_from_errno("fmt_scaled");
9707 	if (fmt_scaled(bytes_sent, scaled_sent) == -1)
9708 		return got_error_from_errno("fmt_scaled");
9709 
9710 	if (a->last_ncommits != ncommits) {
9711 		print_searching = 1;
9712 		a->last_ncommits = ncommits;
9713 	}
9714 
9715 	if (a->last_nobj_total != nobj_total) {
9716 		print_searching = 1;
9717 		print_total = 1;
9718 		a->last_nobj_total = nobj_total;
9719 	}
9720 
9721 	if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9722 	    strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9723 		if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9724 		    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9725 			return got_error(GOT_ERR_NO_SPACE);
9726 	}
9727 
9728 	if (nobj_deltify > 0 || nobj_written > 0) {
9729 		if (nobj_deltify > 0) {
9730 			p_deltify = (nobj_deltify * 100) / nobj_total;
9731 			if (p_deltify != a->last_p_deltify) {
9732 				a->last_p_deltify = p_deltify;
9733 				print_searching = 1;
9734 				print_total = 1;
9735 				print_deltify = 1;
9736 			}
9737 		}
9738 		if (nobj_written > 0) {
9739 			p_written = (nobj_written * 100) / nobj_total;
9740 			if (p_written != a->last_p_written) {
9741 				a->last_p_written = p_written;
9742 				print_searching = 1;
9743 				print_total = 1;
9744 				print_deltify = 1;
9745 				print_written = 1;
9746 			}
9747 		}
9748 	}
9749 
9750 	if (bytes_sent > 0) {
9751 		p_sent = (bytes_sent * 100) / packfile_size;
9752 		if (p_sent != a->last_p_sent) {
9753 			a->last_p_sent = p_sent;
9754 			print_searching = 1;
9755 			print_total = 1;
9756 			print_deltify = 1;
9757 			print_written = 1;
9758 			print_sent = 1;
9759 		}
9760 		a->sent_something = 1;
9761 	}
9762 
9763 	if (print_searching || print_total || print_deltify || print_written ||
9764 	    print_sent)
9765 		printf("\r");
9766 	if (print_searching)
9767 		printf("packing %d reference%s", ncommits,
9768 		    ncommits == 1 ? "" : "s");
9769 	if (print_total)
9770 		printf("; %d object%s", nobj_total,
9771 		    nobj_total == 1 ? "" : "s");
9772 	if (print_deltify)
9773 		printf("; deltify: %d%%", p_deltify);
9774 	if (print_sent)
9775 		printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9776 		    scaled_packsize, p_sent);
9777 	else if (print_written)
9778 		printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9779 		    scaled_packsize, p_written);
9780 	if (print_searching || print_total || print_deltify ||
9781 	    print_written || print_sent) {
9782 		a->printed_something = 1;
9783 		fflush(stdout);
9784 	}
9785 	return NULL;
9786 }
9787 
9788 static const struct got_error *
9789 cmd_send(int argc, char *argv[])
9790 {
9791 	const struct got_error *error = NULL;
9792 	char *cwd = NULL, *repo_path = NULL;
9793 	const char *remote_name;
9794 	char *proto = NULL, *host = NULL, *port = NULL;
9795 	char *repo_name = NULL, *server_path = NULL;
9796 	const struct got_remote_repo *remotes;
9797 	struct got_remote_repo *remote = NULL;
9798 	int nremotes, nbranches = 0, ndelete_branches = 0;
9799 	struct got_repository *repo = NULL;
9800 	struct got_worktree *worktree = NULL;
9801 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9802 	struct got_pathlist_head branches;
9803 	struct got_pathlist_head tags;
9804 	struct got_reflist_head all_branches;
9805 	struct got_reflist_head all_tags;
9806 	struct got_pathlist_head delete_args;
9807 	struct got_pathlist_head delete_branches;
9808 	struct got_reflist_entry *re;
9809 	struct got_pathlist_entry *pe;
9810 	int i, ch, sendfd = -1, sendstatus;
9811 	pid_t sendpid = -1;
9812 	struct got_send_progress_arg spa;
9813 	int verbosity = 0, overwrite_refs = 0;
9814 	int send_all_branches = 0, send_all_tags = 0;
9815 	struct got_reference *ref = NULL;
9816 	int *pack_fds = NULL;
9817 
9818 	TAILQ_INIT(&branches);
9819 	TAILQ_INIT(&tags);
9820 	TAILQ_INIT(&all_branches);
9821 	TAILQ_INIT(&all_tags);
9822 	TAILQ_INIT(&delete_args);
9823 	TAILQ_INIT(&delete_branches);
9824 
9825 	while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9826 		switch (ch) {
9827 		case 'a':
9828 			send_all_branches = 1;
9829 			break;
9830 		case 'b':
9831 			error = got_pathlist_append(&branches, optarg, NULL);
9832 			if (error)
9833 				return error;
9834 			nbranches++;
9835 			break;
9836 		case 'd':
9837 			error = got_pathlist_append(&delete_args, optarg, NULL);
9838 			if (error)
9839 				return error;
9840 			break;
9841 		case 'f':
9842 			overwrite_refs = 1;
9843 			break;
9844 		case 'q':
9845 			verbosity = -1;
9846 			break;
9847 		case 'r':
9848 			repo_path = realpath(optarg, NULL);
9849 			if (repo_path == NULL)
9850 				return got_error_from_errno2("realpath",
9851 				    optarg);
9852 			got_path_strip_trailing_slashes(repo_path);
9853 			break;
9854 		case 'T':
9855 			send_all_tags = 1;
9856 			break;
9857 		case 't':
9858 			error = got_pathlist_append(&tags, optarg, NULL);
9859 			if (error)
9860 				return error;
9861 			break;
9862 		case 'v':
9863 			if (verbosity < 0)
9864 				verbosity = 0;
9865 			else if (verbosity < 3)
9866 				verbosity++;
9867 			break;
9868 		default:
9869 			usage_send();
9870 			/* NOTREACHED */
9871 		}
9872 	}
9873 	argc -= optind;
9874 	argv += optind;
9875 
9876 	if (send_all_branches && !TAILQ_EMPTY(&branches))
9877 		option_conflict('a', 'b');
9878 	if (send_all_tags && !TAILQ_EMPTY(&tags))
9879 		option_conflict('T', 't');
9880 
9881 
9882 	if (argc == 0)
9883 		remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9884 	else if (argc == 1)
9885 		remote_name = argv[0];
9886 	else
9887 		usage_send();
9888 
9889 	cwd = getcwd(NULL, 0);
9890 	if (cwd == NULL) {
9891 		error = got_error_from_errno("getcwd");
9892 		goto done;
9893 	}
9894 
9895 	error = got_repo_pack_fds_open(&pack_fds);
9896 	if (error != NULL)
9897 		goto done;
9898 
9899 	if (repo_path == NULL) {
9900 		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9901 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
9902 			goto done;
9903 		else
9904 			error = NULL;
9905 		if (worktree) {
9906 			repo_path =
9907 			    strdup(got_worktree_get_repo_path(worktree));
9908 			if (repo_path == NULL)
9909 				error = got_error_from_errno("strdup");
9910 			if (error)
9911 				goto done;
9912 		} else {
9913 			repo_path = strdup(cwd);
9914 			if (repo_path == NULL) {
9915 				error = got_error_from_errno("strdup");
9916 				goto done;
9917 			}
9918 		}
9919 	}
9920 
9921 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9922 	if (error)
9923 		goto done;
9924 
9925 	if (worktree) {
9926 		worktree_conf = got_worktree_get_gotconfig(worktree);
9927 		if (worktree_conf) {
9928 			got_gotconfig_get_remotes(&nremotes, &remotes,
9929 			    worktree_conf);
9930 			for (i = 0; i < nremotes; i++) {
9931 				if (strcmp(remotes[i].name, remote_name) == 0) {
9932 					error = got_repo_remote_repo_dup(&remote,
9933 					    &remotes[i]);
9934 					if (error)
9935 						goto done;
9936 					break;
9937 				}
9938 			}
9939 		}
9940 	}
9941 	if (remote == NULL) {
9942 		repo_conf = got_repo_get_gotconfig(repo);
9943 		if (repo_conf) {
9944 			got_gotconfig_get_remotes(&nremotes, &remotes,
9945 			    repo_conf);
9946 			for (i = 0; i < nremotes; i++) {
9947 				if (strcmp(remotes[i].name, remote_name) == 0) {
9948 					error = got_repo_remote_repo_dup(&remote,
9949 					    &remotes[i]);
9950 					if (error)
9951 						goto done;
9952 					break;
9953 				}
9954 			}
9955 		}
9956 	}
9957 	if (remote == NULL) {
9958 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9959 		for (i = 0; i < nremotes; i++) {
9960 			if (strcmp(remotes[i].name, remote_name) == 0) {
9961 				error = got_repo_remote_repo_dup(&remote,
9962 				    &remotes[i]);
9963 				if (error)
9964 					goto done;
9965 				break;
9966 			}
9967 		}
9968 	}
9969 	if (remote == NULL) {
9970 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9971 		goto done;
9972 	}
9973 
9974 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9975 	    &repo_name, remote->send_url);
9976 	if (error)
9977 		goto done;
9978 
9979 	if (strcmp(proto, "git") == 0) {
9980 #ifndef PROFILE
9981 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9982 		    "sendfd dns inet unveil", NULL) == -1)
9983 			err(1, "pledge");
9984 #endif
9985 	} else if (strcmp(proto, "git+ssh") == 0 ||
9986 	    strcmp(proto, "ssh") == 0) {
9987 #ifndef PROFILE
9988 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9989 		    "sendfd unveil", NULL) == -1)
9990 			err(1, "pledge");
9991 #endif
9992 	} else if (strcmp(proto, "http") == 0 ||
9993 	    strcmp(proto, "git+http") == 0) {
9994 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9995 		goto done;
9996 	} else {
9997 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9998 		goto done;
9999 	}
10000 
10001 	error = got_dial_apply_unveil(proto);
10002 	if (error)
10003 		goto done;
10004 
10005 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
10006 	if (error)
10007 		goto done;
10008 
10009 	if (send_all_branches) {
10010 		error = got_ref_list(&all_branches, repo, "refs/heads",
10011 		    got_ref_cmp_by_name, NULL);
10012 		if (error)
10013 			goto done;
10014 		TAILQ_FOREACH(re, &all_branches, entry) {
10015 			const char *branchname = got_ref_get_name(re->ref);
10016 			error = got_pathlist_append(&branches,
10017 			    branchname, NULL);
10018 			if (error)
10019 				goto done;
10020 			nbranches++;
10021 		}
10022 	} else if (nbranches == 0) {
10023 		for (i = 0; i < remote->nsend_branches; i++) {
10024 			error = got_pathlist_append(&branches,
10025 			    remote->send_branches[i], NULL);
10026 			if (error)
10027 				goto done;
10028 		}
10029 	}
10030 
10031 	if (send_all_tags) {
10032 		error = got_ref_list(&all_tags, repo, "refs/tags",
10033 		    got_ref_cmp_by_name, NULL);
10034 		if (error)
10035 			goto done;
10036 		TAILQ_FOREACH(re, &all_tags, entry) {
10037 			const char *tagname = got_ref_get_name(re->ref);
10038 			error = got_pathlist_append(&tags,
10039 			    tagname, NULL);
10040 			if (error)
10041 				goto done;
10042 		}
10043 	}
10044 
10045 	/*
10046 	 * To prevent accidents only branches in refs/heads/ can be deleted
10047 	 * with 'got send -d'.
10048 	 * Deleting anything else requires local repository access or Git.
10049 	 */
10050 	TAILQ_FOREACH(pe, &delete_args, entry) {
10051 		const char *branchname = pe->path;
10052 		char *s;
10053 		struct got_pathlist_entry *new;
10054 		if (strncmp(branchname, "refs/heads/", 11) == 0) {
10055 			s = strdup(branchname);
10056 			if (s == NULL) {
10057 				error = got_error_from_errno("strdup");
10058 				goto done;
10059 			}
10060 		} else {
10061 			if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
10062 				error = got_error_from_errno("asprintf");
10063 				goto done;
10064 			}
10065 		}
10066 		error = got_pathlist_insert(&new, &delete_branches, s, NULL);
10067 		if (error || new == NULL /* duplicate */)
10068 			free(s);
10069 		if (error)
10070 			goto done;
10071 		ndelete_branches++;
10072 	}
10073 
10074 	if (nbranches == 0 && ndelete_branches == 0) {
10075 		struct got_reference *head_ref;
10076 		if (worktree)
10077 			error = got_ref_open(&head_ref, repo,
10078 			    got_worktree_get_head_ref_name(worktree), 0);
10079 		else
10080 			error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
10081 		if (error)
10082 			goto done;
10083 		if (got_ref_is_symbolic(head_ref)) {
10084 			error = got_ref_resolve_symbolic(&ref, repo, head_ref);
10085 			got_ref_close(head_ref);
10086 			if (error)
10087 				goto done;
10088 		} else
10089 			ref = head_ref;
10090 		error = got_pathlist_append(&branches, got_ref_get_name(ref),
10091 		    NULL);
10092 		if (error)
10093 			goto done;
10094 		nbranches++;
10095 	}
10096 
10097 	if (worktree) {
10098 		/* Release work tree lock. */
10099 		got_worktree_close(worktree);
10100 		worktree = NULL;
10101 	}
10102 
10103 	if (verbosity >= 0) {
10104 		printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
10105 		    remote->name, proto, host,
10106 		    port ? ":" : "", port ? port : "",
10107 		    *server_path == '/' ? "" : "/", server_path);
10108 	}
10109 
10110 	error = got_send_connect(&sendpid, &sendfd, proto, host, port,
10111 	    server_path, verbosity);
10112 	if (error)
10113 		goto done;
10114 
10115 	memset(&spa, 0, sizeof(spa));
10116 	spa.last_scaled_packsize[0] = '\0';
10117 	spa.last_p_deltify = -1;
10118 	spa.last_p_written = -1;
10119 	spa.verbosity = verbosity;
10120 	spa.delete_branches = &delete_branches;
10121 	error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
10122 	    verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
10123 	    check_cancelled, NULL);
10124 	if (spa.printed_something)
10125 		putchar('\n');
10126 	if (error)
10127 		goto done;
10128 	if (!spa.sent_something && verbosity >= 0)
10129 		printf("Already up-to-date\n");
10130 done:
10131 	if (sendpid > 0) {
10132 		if (kill(sendpid, SIGTERM) == -1)
10133 			error = got_error_from_errno("kill");
10134 		if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
10135 			error = got_error_from_errno("waitpid");
10136 	}
10137 	if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
10138 		error = got_error_from_errno("close");
10139 	if (repo) {
10140 		const struct got_error *close_err = got_repo_close(repo);
10141 		if (error == NULL)
10142 			error = close_err;
10143 	}
10144 	if (worktree)
10145 		got_worktree_close(worktree);
10146 	if (pack_fds) {
10147 		const struct got_error *pack_err =
10148 		    got_repo_pack_fds_close(pack_fds);
10149 		if (error == NULL)
10150 			error = pack_err;
10151 	}
10152 	if (ref)
10153 		got_ref_close(ref);
10154 	got_repo_free_remote_repo_data(remote);
10155 	free(remote);
10156 	got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
10157 	got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
10158 	got_ref_list_free(&all_branches);
10159 	got_ref_list_free(&all_tags);
10160 	got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
10161 	got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
10162 	free(cwd);
10163 	free(repo_path);
10164 	free(proto);
10165 	free(host);
10166 	free(port);
10167 	free(server_path);
10168 	free(repo_name);
10169 	return error;
10170 }
10171 
10172 /*
10173  * Print and if delete is set delete all ref_prefix references.
10174  * If wanted_ref is not NULL, only print or delete this reference.
10175  */
10176 static const struct got_error *
10177 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
10178     const char *wanted_ref, int delete, struct got_worktree *worktree,
10179     struct got_repository *repo)
10180 {
10181 	const struct got_error			*err;
10182 	struct got_pathlist_head		 paths;
10183 	struct got_reflist_head			 refs;
10184 	struct got_reflist_entry		*re;
10185 	struct got_reflist_object_id_map	*refs_idmap = NULL;
10186 	struct got_commit_object		*commit = NULL;
10187 	struct got_object_id			*id = NULL;
10188 	const char				*header_prefix;
10189 	char					*uuidstr = NULL;
10190 	int					 found = 0;
10191 
10192 	TAILQ_INIT(&refs);
10193 	TAILQ_INIT(&paths);
10194 
10195 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
10196 	if (err)
10197 		goto done;
10198 
10199 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10200 	if (err)
10201 		goto done;
10202 
10203 	if (worktree != NULL) {
10204 		err = got_worktree_get_uuid(&uuidstr, worktree);
10205 		if (err)
10206 			goto done;
10207 	}
10208 
10209 	if (wanted_ref) {
10210 		if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
10211 			wanted_ref += 11;
10212 	}
10213 
10214 	if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
10215 		header_prefix = "backout";
10216 	else
10217 		header_prefix = "cherrypick";
10218 
10219 	TAILQ_FOREACH(re, &refs, entry) {
10220 		const char *refname, *wt;
10221 
10222 		refname = got_ref_get_name(re->ref);
10223 
10224 		err = check_cancelled(NULL);
10225 		if (err)
10226 			goto done;
10227 
10228 		if (strncmp(refname, ref_prefix, prefix_len) == 0)
10229 			refname += prefix_len + 1;  /* skip '-' delimiter */
10230 		else
10231 			continue;
10232 
10233 		wt = refname;
10234 
10235 		if (worktree == NULL || strncmp(refname, uuidstr,
10236 		    GOT_WORKTREE_UUID_STRLEN) == 0)
10237 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
10238 		else
10239 			continue;
10240 
10241 		err = got_repo_match_object_id(&id, NULL, refname,
10242 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
10243 		if (err)
10244 			goto done;
10245 
10246 		err = got_object_open_as_commit(&commit, repo, id);
10247 		if (err)
10248 			goto done;
10249 
10250 		if (wanted_ref)
10251 			found = strncmp(wanted_ref, refname,
10252 			    strlen(wanted_ref)) == 0;
10253 		if (wanted_ref && !found) {
10254 			struct got_reflist_head	*ci_refs;
10255 
10256 			ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
10257 			    id);
10258 
10259 			if (ci_refs) {
10260 				char		*refs_str = NULL;
10261 				char const	*r = NULL;
10262 
10263 				err = build_refs_str(&refs_str, ci_refs, id,
10264 				    repo, 1);
10265 				if (err)
10266 					goto done;
10267 
10268 				r = refs_str;
10269 				while (r) {
10270 					if (strncmp(r, wanted_ref,
10271 					    strlen(wanted_ref)) == 0) {
10272 						found = 1;
10273 						break;
10274 					}
10275 					r = strchr(r, ' ');
10276 					if (r)
10277 						++r;
10278 				}
10279 				free(refs_str);
10280 			}
10281 		}
10282 
10283 		if (wanted_ref == NULL || found) {
10284 			if (delete) {
10285 				err = got_ref_delete(re->ref, repo);
10286 				if (err)
10287 					goto done;
10288 				printf("Deleted: ");
10289 				err = print_commit_oneline(commit, id, repo,
10290 				    refs_idmap);
10291 			} else {
10292 				/*
10293 				 * Print paths modified by commit to help
10294 				 * associate commits with worktree changes.
10295 				 */
10296 				err = get_changed_paths(&paths, commit,
10297 				    repo, NULL);
10298 				if (err)
10299 					goto done;
10300 
10301 				err = print_commit(commit, id, repo, NULL,
10302 				    &paths, NULL, 0, 0, refs_idmap, NULL,
10303 				    header_prefix);
10304 				got_pathlist_free(&paths,
10305 				    GOT_PATHLIST_FREE_ALL);
10306 
10307 				if (worktree == NULL)
10308 					printf("work tree: %.*s\n\n",
10309 					    GOT_WORKTREE_UUID_STRLEN, wt);
10310 			}
10311 			if (err || found)
10312 				goto done;
10313 		}
10314 
10315 		got_object_commit_close(commit);
10316 		commit = NULL;
10317 		free(id);
10318 		id = NULL;
10319 	}
10320 
10321 	if (wanted_ref != NULL && !found)
10322 		err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
10323 
10324 done:
10325 	free(id);
10326 	free(uuidstr);
10327 	got_ref_list_free(&refs);
10328 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
10329 	if (refs_idmap)
10330 		got_reflist_object_id_map_free(refs_idmap);
10331 	if (commit)
10332 		got_object_commit_close(commit);
10333 	return err;
10334 }
10335 
10336 /*
10337  * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
10338  * identified by id for log messages to prepopulate the editor on commit.
10339  */
10340 static const struct got_error *
10341 logmsg_ref(struct got_object_id *id, const char *prefix,
10342     struct got_worktree *worktree, struct got_repository *repo)
10343 {
10344 	const struct got_error	*err = NULL;
10345 	char			*idstr, *ref = NULL, *refname = NULL;
10346 	int			 histedit_in_progress;
10347 	int			 rebase_in_progress, merge_in_progress;
10348 
10349 	/*
10350 	 * Silenty refuse to create merge reference if any histedit, merge,
10351 	 * or rebase operation is in progress.
10352 	 */
10353 	err = got_worktree_histedit_in_progress(&histedit_in_progress,
10354 	    worktree);
10355 	if (err)
10356 		return err;
10357 	if (histedit_in_progress)
10358 		return NULL;
10359 
10360 	err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10361 	if (err)
10362 		return err;
10363 	if (rebase_in_progress)
10364 		return NULL;
10365 
10366 	err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10367 	    repo);
10368 	if (err)
10369 		return err;
10370 	if (merge_in_progress)
10371 		return NULL;
10372 
10373 	err = got_object_id_str(&idstr, id);
10374 	if (err)
10375 		return err;
10376 
10377 	err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
10378 	if (err)
10379 		goto done;
10380 
10381 	if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
10382 		err = got_error_from_errno("asprintf");
10383 		goto done;
10384 	}
10385 
10386 	err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
10387 	    -1, repo);
10388 done:
10389 	free(ref);
10390 	free(idstr);
10391 	free(refname);
10392 	return err;
10393 }
10394 
10395 __dead static void
10396 usage_cherrypick(void)
10397 {
10398 	fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
10399 	    getprogname());
10400 	exit(1);
10401 }
10402 
10403 static const struct got_error *
10404 cmd_cherrypick(int argc, char *argv[])
10405 {
10406 	const struct got_error *error = NULL;
10407 	struct got_worktree *worktree = NULL;
10408 	struct got_repository *repo = NULL;
10409 	char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10410 	struct got_object_id *commit_id = NULL;
10411 	struct got_commit_object *commit = NULL;
10412 	struct got_object_qid *pid;
10413 	int ch, list_refs = 0, remove_refs = 0;
10414 	struct got_update_progress_arg upa;
10415 	int *pack_fds = NULL;
10416 
10417 #ifndef PROFILE
10418 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10419 	    "unveil", NULL) == -1)
10420 		err(1, "pledge");
10421 #endif
10422 
10423 	while ((ch = getopt(argc, argv, "lX")) != -1) {
10424 		switch (ch) {
10425 		case 'l':
10426 			list_refs = 1;
10427 			break;
10428 		case 'X':
10429 			remove_refs = 1;
10430 			break;
10431 		default:
10432 			usage_cherrypick();
10433 			/* NOTREACHED */
10434 		}
10435 	}
10436 
10437 	argc -= optind;
10438 	argv += optind;
10439 
10440 	if (list_refs || remove_refs) {
10441 		if (argc != 0 && argc != 1)
10442 			usage_cherrypick();
10443 	} else if (argc != 1)
10444 		usage_cherrypick();
10445 	if (list_refs && remove_refs)
10446 		option_conflict('l', 'X');
10447 
10448 	cwd = getcwd(NULL, 0);
10449 	if (cwd == NULL) {
10450 		error = got_error_from_errno("getcwd");
10451 		goto done;
10452 	}
10453 
10454 	error = got_repo_pack_fds_open(&pack_fds);
10455 	if (error != NULL)
10456 		goto done;
10457 
10458 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10459 	if (error) {
10460 		if (list_refs || remove_refs) {
10461 			if (error->code != GOT_ERR_NOT_WORKTREE)
10462 				goto done;
10463 		} else {
10464 			if (error->code == GOT_ERR_NOT_WORKTREE)
10465 				error = wrap_not_worktree_error(error,
10466 				    "cherrypick", cwd);
10467 			goto done;
10468 		}
10469 	}
10470 
10471 	error = got_repo_open(&repo,
10472 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
10473 	    NULL, pack_fds);
10474 	if (error != NULL)
10475 		goto done;
10476 
10477 	error = apply_unveil(got_repo_get_path(repo), 0,
10478 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
10479 	if (error)
10480 		goto done;
10481 
10482 	if (list_refs || remove_refs) {
10483 		error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
10484 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
10485 		    argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10486 		goto done;
10487 	}
10488 
10489 	error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10490 	if (error != NULL)
10491 		goto done;
10492 
10493 	error = got_repo_match_object_id(&commit_id, NULL,
10494 	    keyword_idstr != NULL ? keyword_idstr : argv[0],
10495 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
10496 	if (error)
10497 		goto done;
10498 	error = got_object_id_str(&commit_id_str, commit_id);
10499 	if (error)
10500 		goto done;
10501 
10502 	error = got_object_open_as_commit(&commit, repo, commit_id);
10503 	if (error)
10504 		goto done;
10505 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10506 	memset(&upa, 0, sizeof(upa));
10507 	error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
10508 	    commit_id, repo, update_progress, &upa, check_cancelled,
10509 	    NULL);
10510 	if (error != NULL)
10511 		goto done;
10512 
10513 	if (upa.did_something) {
10514 		error = logmsg_ref(commit_id,
10515 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
10516 		if (error)
10517 			goto done;
10518 		printf("Merged commit %s\n", commit_id_str);
10519 	}
10520 	print_merge_progress_stats(&upa);
10521 done:
10522 	free(cwd);
10523 	free(keyword_idstr);
10524 	if (commit)
10525 		got_object_commit_close(commit);
10526 	free(commit_id_str);
10527 	if (worktree)
10528 		got_worktree_close(worktree);
10529 	if (repo) {
10530 		const struct got_error *close_err = got_repo_close(repo);
10531 		if (error == NULL)
10532 			error = close_err;
10533 	}
10534 	if (pack_fds) {
10535 		const struct got_error *pack_err =
10536 		    got_repo_pack_fds_close(pack_fds);
10537 		if (error == NULL)
10538 			error = pack_err;
10539 	}
10540 
10541 	return error;
10542 }
10543 
10544 __dead static void
10545 usage_backout(void)
10546 {
10547 	fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
10548 	exit(1);
10549 }
10550 
10551 static const struct got_error *
10552 cmd_backout(int argc, char *argv[])
10553 {
10554 	const struct got_error *error = NULL;
10555 	struct got_worktree *worktree = NULL;
10556 	struct got_repository *repo = NULL;
10557 	char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10558 	struct got_object_id *commit_id = NULL;
10559 	struct got_commit_object *commit = NULL;
10560 	struct got_object_qid *pid;
10561 	int ch, list_refs = 0, remove_refs = 0;
10562 	struct got_update_progress_arg upa;
10563 	int *pack_fds = NULL;
10564 
10565 #ifndef PROFILE
10566 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10567 	    "unveil", NULL) == -1)
10568 		err(1, "pledge");
10569 #endif
10570 
10571 	while ((ch = getopt(argc, argv, "lX")) != -1) {
10572 		switch (ch) {
10573 		case 'l':
10574 			list_refs = 1;
10575 			break;
10576 		case 'X':
10577 			remove_refs = 1;
10578 			break;
10579 		default:
10580 			usage_backout();
10581 			/* NOTREACHED */
10582 		}
10583 	}
10584 
10585 	argc -= optind;
10586 	argv += optind;
10587 
10588 	if (list_refs || remove_refs) {
10589 		if (argc != 0 && argc != 1)
10590 			usage_backout();
10591 	} else if (argc != 1)
10592 		usage_backout();
10593 	if (list_refs && remove_refs)
10594 		option_conflict('l', 'X');
10595 
10596 	cwd = getcwd(NULL, 0);
10597 	if (cwd == NULL) {
10598 		error = got_error_from_errno("getcwd");
10599 		goto done;
10600 	}
10601 
10602 	error = got_repo_pack_fds_open(&pack_fds);
10603 	if (error != NULL)
10604 		goto done;
10605 
10606 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10607 	if (error) {
10608 		if (list_refs || remove_refs) {
10609 			if (error->code != GOT_ERR_NOT_WORKTREE)
10610 				goto done;
10611 		} else {
10612 			if (error->code == GOT_ERR_NOT_WORKTREE)
10613 				error = wrap_not_worktree_error(error,
10614 				    "backout", cwd);
10615 			goto done;
10616 		}
10617 	}
10618 
10619 	error = got_repo_open(&repo,
10620 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
10621 	    NULL, pack_fds);
10622 	if (error != NULL)
10623 		goto done;
10624 
10625 	error = apply_unveil(got_repo_get_path(repo), 0,
10626 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
10627 	if (error)
10628 		goto done;
10629 
10630 	if (list_refs || remove_refs) {
10631 		error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
10632 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
10633 		    argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10634 		goto done;
10635 	}
10636 
10637 	error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10638 	if (error != NULL)
10639 		goto done;
10640 
10641 	error = got_repo_match_object_id(&commit_id, NULL,
10642 	    keyword_idstr != NULL ? keyword_idstr : argv[0],
10643 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
10644 	if (error)
10645 		goto done;
10646 	error = got_object_id_str(&commit_id_str, commit_id);
10647 	if (error)
10648 		goto done;
10649 
10650 	error = got_object_open_as_commit(&commit, repo, commit_id);
10651 	if (error)
10652 		goto done;
10653 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10654 	if (pid == NULL) {
10655 		error = got_error(GOT_ERR_ROOT_COMMIT);
10656 		goto done;
10657 	}
10658 
10659 	memset(&upa, 0, sizeof(upa));
10660 	error = got_worktree_merge_files(worktree, commit_id, &pid->id,
10661 	    repo, update_progress, &upa, check_cancelled, NULL);
10662 	if (error != NULL)
10663 		goto done;
10664 
10665 	if (upa.did_something) {
10666 		error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
10667 		    worktree, repo);
10668 		if (error)
10669 			goto done;
10670 		printf("Backed out commit %s\n", commit_id_str);
10671 	}
10672 	print_merge_progress_stats(&upa);
10673 done:
10674 	free(cwd);
10675 	free(keyword_idstr);
10676 	if (commit)
10677 		got_object_commit_close(commit);
10678 	free(commit_id_str);
10679 	if (worktree)
10680 		got_worktree_close(worktree);
10681 	if (repo) {
10682 		const struct got_error *close_err = got_repo_close(repo);
10683 		if (error == NULL)
10684 			error = close_err;
10685 	}
10686 	if (pack_fds) {
10687 		const struct got_error *pack_err =
10688 		    got_repo_pack_fds_close(pack_fds);
10689 		if (error == NULL)
10690 			error = pack_err;
10691 	}
10692 	return error;
10693 }
10694 
10695 __dead static void
10696 usage_rebase(void)
10697 {
10698 	fprintf(stderr, "usage: %s rebase [-aCclX] [branch]\n", getprogname());
10699 	exit(1);
10700 }
10701 
10702 static void
10703 trim_logmsg(char *logmsg, int limit)
10704 {
10705 	char *nl;
10706 	size_t len;
10707 
10708 	len = strlen(logmsg);
10709 	if (len > limit)
10710 		len = limit;
10711 	logmsg[len] = '\0';
10712 	nl = strchr(logmsg, '\n');
10713 	if (nl)
10714 		*nl = '\0';
10715 }
10716 
10717 static const struct got_error *
10718 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
10719 {
10720 	const struct got_error *err;
10721 	char *logmsg0 = NULL;
10722 	const char *s;
10723 
10724 	err = got_object_commit_get_logmsg(&logmsg0, commit);
10725 	if (err)
10726 		return err;
10727 
10728 	s = logmsg0;
10729 	while (isspace((unsigned char)s[0]))
10730 		s++;
10731 
10732 	*logmsg = strdup(s);
10733 	if (*logmsg == NULL) {
10734 		err = got_error_from_errno("strdup");
10735 		goto done;
10736 	}
10737 
10738 	trim_logmsg(*logmsg, limit);
10739 done:
10740 	free(logmsg0);
10741 	return err;
10742 }
10743 
10744 static const struct got_error *
10745 show_rebase_merge_conflict(struct got_object_id *id,
10746     struct got_repository *repo)
10747 {
10748 	const struct got_error *err;
10749 	struct got_commit_object *commit = NULL;
10750 	char *id_str = NULL, *logmsg = NULL;
10751 
10752 	err = got_object_open_as_commit(&commit, repo, id);
10753 	if (err)
10754 		return err;
10755 
10756 	err = got_object_id_str(&id_str, id);
10757 	if (err)
10758 		goto done;
10759 
10760 	id_str[12] = '\0';
10761 
10762 	err = get_short_logmsg(&logmsg, 42, commit);
10763 	if (err)
10764 		goto done;
10765 
10766 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
10767 done:
10768 	free(id_str);
10769 	got_object_commit_close(commit);
10770 	free(logmsg);
10771 	return err;
10772 }
10773 
10774 static const struct got_error *
10775 show_rebase_progress(struct got_commit_object *commit,
10776     struct got_object_id *old_id, struct got_object_id *new_id)
10777 {
10778 	const struct got_error *err;
10779 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10780 
10781 	err = got_object_id_str(&old_id_str, old_id);
10782 	if (err)
10783 		goto done;
10784 
10785 	if (new_id) {
10786 		err = got_object_id_str(&new_id_str, new_id);
10787 		if (err)
10788 			goto done;
10789 	}
10790 
10791 	old_id_str[12] = '\0';
10792 	if (new_id_str)
10793 		new_id_str[12] = '\0';
10794 
10795 	err = get_short_logmsg(&logmsg, 42, commit);
10796 	if (err)
10797 		goto done;
10798 
10799 	printf("%s -> %s: %s\n", old_id_str,
10800 	    new_id_str ? new_id_str : "no-op change", logmsg);
10801 done:
10802 	free(old_id_str);
10803 	free(new_id_str);
10804 	free(logmsg);
10805 	return err;
10806 }
10807 
10808 static const struct got_error *
10809 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
10810     struct got_reference *branch, struct got_reference *tmp_branch,
10811     struct got_repository *repo, int create_backup)
10812 {
10813 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
10814 	return got_worktree_rebase_complete(worktree, fileindex,
10815 	    tmp_branch, branch, repo, create_backup);
10816 }
10817 
10818 static const struct got_error *
10819 rebase_commit(struct got_pathlist_head *merged_paths,
10820     struct got_worktree *worktree, struct got_fileindex *fileindex,
10821     struct got_reference *tmp_branch, const char *committer,
10822     struct got_object_id *commit_id, int allow_conflict,
10823     struct got_repository *repo)
10824 {
10825 	const struct got_error *error;
10826 	struct got_commit_object *commit;
10827 	struct got_object_id *new_commit_id;
10828 
10829 	error = got_object_open_as_commit(&commit, repo, commit_id);
10830 	if (error)
10831 		return error;
10832 
10833 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
10834 	    worktree, fileindex, tmp_branch, committer, commit, commit_id,
10835 	    allow_conflict, repo);
10836 	if (error) {
10837 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
10838 			goto done;
10839 		error = show_rebase_progress(commit, commit_id, NULL);
10840 	} else {
10841 		error = show_rebase_progress(commit, commit_id, new_commit_id);
10842 		free(new_commit_id);
10843 	}
10844 done:
10845 	got_object_commit_close(commit);
10846 	return error;
10847 }
10848 
10849 struct check_path_prefix_arg {
10850 	const char *path_prefix;
10851 	size_t len;
10852 	int errcode;
10853 };
10854 
10855 static const struct got_error *
10856 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
10857     struct got_blob_object *blob2, FILE *f1, FILE *f2,
10858     struct got_object_id *id1, struct got_object_id *id2,
10859     const char *path1, const char *path2,
10860     mode_t mode1, mode_t mode2, struct got_repository *repo)
10861 {
10862 	struct check_path_prefix_arg *a = arg;
10863 
10864 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
10865 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
10866 		return got_error(a->errcode);
10867 
10868 	return NULL;
10869 }
10870 
10871 static const struct got_error *
10872 check_path_prefix(struct got_object_id *parent_id,
10873     struct got_object_id *commit_id, const char *path_prefix,
10874     int errcode, struct got_repository *repo)
10875 {
10876 	const struct got_error *err;
10877 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
10878 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
10879 	struct check_path_prefix_arg cpp_arg;
10880 
10881 	if (got_path_is_root_dir(path_prefix))
10882 		return NULL;
10883 
10884 	err = got_object_open_as_commit(&commit, repo, commit_id);
10885 	if (err)
10886 		goto done;
10887 
10888 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
10889 	if (err)
10890 		goto done;
10891 
10892 	err = got_object_open_as_tree(&tree1, repo,
10893 	    got_object_commit_get_tree_id(parent_commit));
10894 	if (err)
10895 		goto done;
10896 
10897 	err = got_object_open_as_tree(&tree2, repo,
10898 	    got_object_commit_get_tree_id(commit));
10899 	if (err)
10900 		goto done;
10901 
10902 	cpp_arg.path_prefix = path_prefix;
10903 	while (cpp_arg.path_prefix[0] == '/')
10904 		cpp_arg.path_prefix++;
10905 	cpp_arg.len = strlen(cpp_arg.path_prefix);
10906 	cpp_arg.errcode = errcode;
10907 	err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
10908 	    check_path_prefix_in_diff, &cpp_arg, 0);
10909 done:
10910 	if (tree1)
10911 		got_object_tree_close(tree1);
10912 	if (tree2)
10913 		got_object_tree_close(tree2);
10914 	if (commit)
10915 		got_object_commit_close(commit);
10916 	if (parent_commit)
10917 		got_object_commit_close(parent_commit);
10918 	return err;
10919 }
10920 
10921 static const struct got_error *
10922 collect_commits(struct got_object_id_queue *commits,
10923     struct got_object_id *initial_commit_id,
10924     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
10925     const char *path_prefix, int path_prefix_errcode,
10926     struct got_repository *repo)
10927 {
10928 	const struct got_error *err = NULL;
10929 	struct got_commit_graph *graph = NULL;
10930 	struct got_object_id parent_id, commit_id;
10931 	struct got_object_qid *qid;
10932 
10933 	err = got_commit_graph_open(&graph, "/", 1);
10934 	if (err)
10935 		return err;
10936 
10937 	err = got_commit_graph_bfsort(graph, iter_start_id, repo,
10938 	    check_cancelled, NULL);
10939 	if (err)
10940 		goto done;
10941 
10942 	memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
10943 	while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
10944 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
10945 		    check_cancelled, NULL);
10946 		if (err) {
10947 			if (err->code == GOT_ERR_ITER_COMPLETED) {
10948 				err = got_error_msg(GOT_ERR_ANCESTRY,
10949 				    "ran out of commits to rebase before "
10950 				    "youngest common ancestor commit has "
10951 				    "been reached?!?");
10952 			}
10953 			goto done;
10954 		} else {
10955 			err = check_path_prefix(&parent_id, &commit_id,
10956 			    path_prefix, path_prefix_errcode, repo);
10957 			if (err)
10958 				goto done;
10959 
10960 			err = got_object_qid_alloc(&qid, &commit_id);
10961 			if (err)
10962 				goto done;
10963 			STAILQ_INSERT_HEAD(commits, qid, entry);
10964 
10965 			memcpy(&commit_id, &parent_id, sizeof(commit_id));
10966 		}
10967 	}
10968 done:
10969 	got_commit_graph_close(graph);
10970 	return err;
10971 }
10972 
10973 static const struct got_error *
10974 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
10975 {
10976 	const struct got_error *err = NULL;
10977 	time_t committer_time;
10978 	struct tm tm;
10979 	char datebuf[11]; /* YYYY-MM-DD + NUL */
10980 	char *author0 = NULL, *author, *smallerthan;
10981 	char *logmsg0 = NULL, *logmsg, *newline;
10982 
10983 	committer_time = got_object_commit_get_committer_time(commit);
10984 	if (gmtime_r(&committer_time, &tm) == NULL)
10985 		return got_error_from_errno("gmtime_r");
10986 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
10987 		return got_error(GOT_ERR_NO_SPACE);
10988 
10989 	author0 = strdup(got_object_commit_get_author(commit));
10990 	if (author0 == NULL)
10991 		return got_error_from_errno("strdup");
10992 	author = author0;
10993 	smallerthan = strchr(author, '<');
10994 	if (smallerthan && smallerthan[1] != '\0')
10995 		author = smallerthan + 1;
10996 	author[strcspn(author, "@>")] = '\0';
10997 
10998 	err = got_object_commit_get_logmsg(&logmsg0, commit);
10999 	if (err)
11000 		goto done;
11001 	logmsg = logmsg0;
11002 	while (*logmsg == '\n')
11003 		logmsg++;
11004 	newline = strchr(logmsg, '\n');
11005 	if (newline)
11006 		*newline = '\0';
11007 
11008 	if (asprintf(brief_str, "%s %s  %s",
11009 	    datebuf, author, logmsg) == -1)
11010 		err = got_error_from_errno("asprintf");
11011 done:
11012 	free(author0);
11013 	free(logmsg0);
11014 	return err;
11015 }
11016 
11017 static const struct got_error *
11018 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
11019     struct got_repository *repo)
11020 {
11021 	const struct got_error *err;
11022 	char *id_str;
11023 
11024 	err = got_object_id_str(&id_str, id);
11025 	if (err)
11026 		return err;
11027 
11028 	err = got_ref_delete(ref, repo);
11029 	if (err)
11030 		goto done;
11031 
11032 	printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
11033 done:
11034 	free(id_str);
11035 	return err;
11036 }
11037 
11038 static const struct got_error *
11039 print_backup_ref(const char *branch_name, const char *new_id_str,
11040     struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
11041     struct got_reflist_object_id_map *refs_idmap,
11042     struct got_repository *repo)
11043 {
11044 	const struct got_error *err = NULL;
11045 	struct got_reflist_head *refs;
11046 	char *refs_str = NULL;
11047 	struct got_object_id *new_commit_id = NULL;
11048 	struct got_commit_object *new_commit = NULL;
11049 	char *new_commit_brief_str = NULL;
11050 	struct got_object_id *yca_id = NULL;
11051 	struct got_commit_object *yca_commit = NULL;
11052 	char *yca_id_str = NULL, *yca_brief_str = NULL;
11053 	char *custom_refs_str;
11054 
11055 	if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
11056 		return got_error_from_errno("asprintf");
11057 
11058 	err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
11059 	    0, 0, refs_idmap, custom_refs_str, NULL);
11060 	if (err)
11061 		goto done;
11062 
11063 	err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
11064 	if (err)
11065 		goto done;
11066 
11067 	refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
11068 	if (refs) {
11069 		err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
11070 		if (err)
11071 			goto done;
11072 	}
11073 
11074 	err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
11075 	if (err)
11076 		goto done;
11077 
11078 	err = get_commit_brief_str(&new_commit_brief_str, new_commit);
11079 	if (err)
11080 		goto done;
11081 
11082 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11083 	    old_commit_id, new_commit_id, 1, 0, repo, check_cancelled, NULL);
11084 	if (err)
11085 		goto done;
11086 
11087 	printf("has become commit %s%s%s%s\n %s\n", new_id_str,
11088 	    refs_str ? " (" : "", refs_str ? refs_str : "",
11089 	    refs_str ? ")" : "", new_commit_brief_str);
11090 	if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
11091 	    got_object_id_cmp(yca_id, old_commit_id) != 0) {
11092 		free(refs_str);
11093 		refs_str = NULL;
11094 
11095 		err = got_object_open_as_commit(&yca_commit, repo, yca_id);
11096 		if (err)
11097 			goto done;
11098 
11099 		err = get_commit_brief_str(&yca_brief_str, yca_commit);
11100 		if (err)
11101 			goto done;
11102 
11103 		err = got_object_id_str(&yca_id_str, yca_id);
11104 		if (err)
11105 			goto done;
11106 
11107 		refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
11108 		if (refs) {
11109 			err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
11110 			if (err)
11111 				goto done;
11112 		}
11113 		printf("history forked at %s%s%s%s\n %s\n",
11114 		    yca_id_str,
11115 		    refs_str ? " (" : "", refs_str ? refs_str : "",
11116 		    refs_str ? ")" : "", yca_brief_str);
11117 	}
11118 done:
11119 	free(custom_refs_str);
11120 	free(new_commit_id);
11121 	free(refs_str);
11122 	free(yca_id);
11123 	free(yca_id_str);
11124 	free(yca_brief_str);
11125 	if (new_commit)
11126 		got_object_commit_close(new_commit);
11127 	if (yca_commit)
11128 		got_object_commit_close(yca_commit);
11129 
11130 	return err;
11131 }
11132 
11133 static const struct got_error *
11134 worktree_has_logmsg_ref(const char *caller, struct got_worktree *worktree,
11135     struct got_repository *repo)
11136 {
11137 	const struct got_error		*err;
11138 	struct got_reflist_head		 refs;
11139 	struct got_reflist_entry	*re;
11140 	char				*uuidstr = NULL;
11141 	static char			 msg[160];
11142 
11143 	TAILQ_INIT(&refs);
11144 
11145 	err = got_worktree_get_uuid(&uuidstr, worktree);
11146 	if (err)
11147 		goto done;
11148 
11149 	err = got_ref_list(&refs, repo, "refs/got/worktree",
11150 	    got_ref_cmp_by_name, repo);
11151 	if (err)
11152 		goto done;
11153 
11154 	TAILQ_FOREACH(re, &refs, entry) {
11155 		const char *cmd, *refname, *type;
11156 
11157 		refname = got_ref_get_name(re->ref);
11158 
11159 		if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
11160 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
11161 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
11162 			cmd = "cherrypick";
11163 			type = "cherrypicked";
11164 		} else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
11165 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
11166 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
11167 			cmd = "backout";
11168 			type = "backed-out";
11169 		} else
11170 			continue;
11171 
11172 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) != 0)
11173 			continue;
11174 
11175 		snprintf(msg, sizeof(msg),
11176 		    "work tree has references created by %s commits which "
11177 		    "must be removed with 'got %s -X' before running the %s "
11178 		    "command", type, cmd, caller);
11179 		err = got_error_msg(GOT_ERR_WORKTREE_META, msg);
11180 		goto done;
11181 	}
11182 
11183 done:
11184 	free(uuidstr);
11185 	got_ref_list_free(&refs);
11186 	return err;
11187 }
11188 
11189 static const struct got_error *
11190 process_backup_refs(const char *backup_ref_prefix,
11191     const char *wanted_branch_name,
11192     int delete, struct got_repository *repo)
11193 {
11194 	const struct got_error *err;
11195 	struct got_reflist_head refs, backup_refs;
11196 	struct got_reflist_entry *re;
11197 	const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
11198 	struct got_object_id *old_commit_id = NULL;
11199 	char *branch_name = NULL;
11200 	struct got_commit_object *old_commit = NULL;
11201 	struct got_reflist_object_id_map *refs_idmap = NULL;
11202 	int wanted_branch_found = 0;
11203 
11204 	TAILQ_INIT(&refs);
11205 	TAILQ_INIT(&backup_refs);
11206 
11207 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11208 	if (err)
11209 		return err;
11210 
11211 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
11212 	if (err)
11213 		goto done;
11214 
11215 	if (wanted_branch_name) {
11216 		if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
11217 			wanted_branch_name += 11;
11218 	}
11219 
11220 	err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
11221 	    got_ref_cmp_by_commit_timestamp_descending, repo);
11222 	if (err)
11223 		goto done;
11224 
11225 	TAILQ_FOREACH(re, &backup_refs, entry) {
11226 		const char *refname = got_ref_get_name(re->ref);
11227 		char *slash;
11228 
11229 		err = check_cancelled(NULL);
11230 		if (err)
11231 			break;
11232 
11233 		err = got_ref_resolve(&old_commit_id, repo, re->ref);
11234 		if (err)
11235 			break;
11236 
11237 		err = got_object_open_as_commit(&old_commit, repo,
11238 		    old_commit_id);
11239 		if (err)
11240 			break;
11241 
11242 		if (strncmp(backup_ref_prefix, refname,
11243 		    backup_ref_prefix_len) == 0)
11244 			refname += backup_ref_prefix_len;
11245 
11246 		while (refname[0] == '/')
11247 			refname++;
11248 
11249 		branch_name = strdup(refname);
11250 		if (branch_name == NULL) {
11251 			err = got_error_from_errno("strdup");
11252 			break;
11253 		}
11254 		slash = strrchr(branch_name, '/');
11255 		if (slash) {
11256 			*slash = '\0';
11257 			refname += strlen(branch_name) + 1;
11258 		}
11259 
11260 		if (wanted_branch_name == NULL ||
11261 		    strcmp(wanted_branch_name, branch_name) == 0) {
11262 			wanted_branch_found = 1;
11263 			if (delete) {
11264 				err = delete_backup_ref(re->ref,
11265 				    old_commit_id, repo);
11266 			} else {
11267 				err = print_backup_ref(branch_name, refname,
11268 				    old_commit_id, old_commit, refs_idmap,
11269 				    repo);
11270 			}
11271 			if (err)
11272 				break;
11273 		}
11274 
11275 		free(old_commit_id);
11276 		old_commit_id = NULL;
11277 		free(branch_name);
11278 		branch_name = NULL;
11279 		got_object_commit_close(old_commit);
11280 		old_commit = NULL;
11281 	}
11282 
11283 	if (wanted_branch_name && !wanted_branch_found) {
11284 		err = got_error_fmt(GOT_ERR_NOT_REF,
11285 		    "%s/%s/", backup_ref_prefix, wanted_branch_name);
11286 	}
11287 done:
11288 	if (refs_idmap)
11289 		got_reflist_object_id_map_free(refs_idmap);
11290 	got_ref_list_free(&refs);
11291 	got_ref_list_free(&backup_refs);
11292 	free(old_commit_id);
11293 	free(branch_name);
11294 	if (old_commit)
11295 		got_object_commit_close(old_commit);
11296 	return err;
11297 }
11298 
11299 static const struct got_error *
11300 abort_progress(void *arg, unsigned char status, const char *path)
11301 {
11302 	/*
11303 	 * Unversioned files should not clutter progress output when
11304 	 * an operation is aborted.
11305 	 */
11306 	if (status == GOT_STATUS_UNVERSIONED)
11307 		return NULL;
11308 
11309 	return update_progress(arg, status, path);
11310 }
11311 
11312 static const struct got_error *
11313 find_merge_commit_yca(struct got_object_id **new_yca_id,
11314     struct got_object_id *branch_head_commit_id,
11315     struct got_object_id *yca_id,
11316     struct got_object_id *base_commit_id,
11317     struct got_repository *repo)
11318 {
11319 	const struct got_error *err = NULL;
11320 	struct got_commit_graph *graph = NULL;
11321 	struct got_commit_object *commit = NULL;
11322 
11323 	*new_yca_id = NULL;
11324 
11325 	err = got_commit_graph_open(&graph, "/", 1);
11326 	if (err)
11327 		return err;
11328 
11329 	err = got_commit_graph_bfsort(graph, base_commit_id,
11330 	    repo, check_cancelled, NULL);
11331 	if (err)
11332 		goto done;
11333 
11334 	for (;;) {
11335 		struct got_object_id id;
11336 
11337 		err = got_commit_graph_iter_next(&id, graph, repo,
11338 		    check_cancelled, NULL);
11339 		if (err) {
11340 			if (err->code == GOT_ERR_ITER_COMPLETED)
11341 				err = NULL;
11342 			break;
11343 		}
11344 
11345 		err = got_object_open_as_commit(&commit, repo, &id);
11346 		if (err)
11347 			break;
11348 
11349 		if (got_object_commit_get_nparents(commit) > 1) {
11350 			/* Search for a better YCA using toposort. */
11351 			err = got_commit_graph_find_youngest_common_ancestor(
11352 			    new_yca_id, base_commit_id, branch_head_commit_id,
11353 			    0, 1, repo, check_cancelled, NULL);
11354 			break;
11355 		}
11356 
11357 		if (got_object_id_cmp(&id, yca_id) == 0)
11358 			break;
11359 		got_object_commit_close(commit);
11360 		commit = NULL;
11361 	}
11362 done:
11363 	got_commit_graph_close(graph);
11364 	if (commit)
11365 		got_object_commit_close(commit);
11366 	return err;
11367 }
11368 
11369 static const struct got_error *
11370 cmd_rebase(int argc, char *argv[])
11371 {
11372 	const struct got_error *error = NULL;
11373 	struct got_worktree *worktree = NULL;
11374 	struct got_repository *repo = NULL;
11375 	struct got_fileindex *fileindex = NULL;
11376 	char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11377 	struct got_reference *branch = NULL;
11378 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
11379 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
11380 	struct got_object_id *resume_commit_id = NULL;
11381 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
11382 	struct got_object_id *head_commit_id = NULL;
11383 	struct got_reference *head_ref = NULL;
11384 	struct got_commit_object *commit = NULL;
11385 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
11386 	int histedit_in_progress = 0, merge_in_progress = 0;
11387 	int create_backup = 1, list_backups = 0, delete_backups = 0;
11388 	int allow_conflict = 0;
11389 	struct got_object_id_queue commits;
11390 	struct got_pathlist_head merged_paths;
11391 	const struct got_object_id_queue *parent_ids;
11392 	struct got_object_qid *qid, *pid;
11393 	struct got_update_progress_arg upa;
11394 	int *pack_fds = NULL;
11395 
11396 	STAILQ_INIT(&commits);
11397 	TAILQ_INIT(&merged_paths);
11398 	memset(&upa, 0, sizeof(upa));
11399 
11400 #ifndef PROFILE
11401 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11402 	    "unveil", NULL) == -1)
11403 		err(1, "pledge");
11404 #endif
11405 
11406 	while ((ch = getopt(argc, argv, "aCclX")) != -1) {
11407 		switch (ch) {
11408 		case 'a':
11409 			abort_rebase = 1;
11410 			break;
11411 		case 'C':
11412 			allow_conflict = 1;
11413 			break;
11414 		case 'c':
11415 			continue_rebase = 1;
11416 			break;
11417 		case 'l':
11418 			list_backups = 1;
11419 			break;
11420 		case 'X':
11421 			delete_backups = 1;
11422 			break;
11423 		default:
11424 			usage_rebase();
11425 			/* NOTREACHED */
11426 		}
11427 	}
11428 
11429 	argc -= optind;
11430 	argv += optind;
11431 
11432 	if (list_backups) {
11433 		if (abort_rebase)
11434 			option_conflict('l', 'a');
11435 		if (allow_conflict)
11436 			option_conflict('l', 'C');
11437 		if (continue_rebase)
11438 			option_conflict('l', 'c');
11439 		if (delete_backups)
11440 			option_conflict('l', 'X');
11441 		if (argc != 0 && argc != 1)
11442 			usage_rebase();
11443 	} else if (delete_backups) {
11444 		if (abort_rebase)
11445 			option_conflict('X', 'a');
11446 		if (allow_conflict)
11447 			option_conflict('X', 'C');
11448 		if (continue_rebase)
11449 			option_conflict('X', 'c');
11450 		if (list_backups)
11451 			option_conflict('l', 'X');
11452 		if (argc != 0 && argc != 1)
11453 			usage_rebase();
11454 	} else if (allow_conflict) {
11455 		if (abort_rebase)
11456 			option_conflict('C', 'a');
11457 		if (!continue_rebase)
11458 			errx(1, "-C option requires -c");
11459 	} else {
11460 		if (abort_rebase && continue_rebase)
11461 			usage_rebase();
11462 		else if (abort_rebase || continue_rebase) {
11463 			if (argc != 0)
11464 				usage_rebase();
11465 		} else if (argc != 1)
11466 			usage_rebase();
11467 	}
11468 
11469 	cwd = getcwd(NULL, 0);
11470 	if (cwd == NULL) {
11471 		error = got_error_from_errno("getcwd");
11472 		goto done;
11473 	}
11474 
11475 	error = got_repo_pack_fds_open(&pack_fds);
11476 	if (error != NULL)
11477 		goto done;
11478 
11479 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
11480 	if (error) {
11481 		if (list_backups || delete_backups) {
11482 			if (error->code != GOT_ERR_NOT_WORKTREE)
11483 				goto done;
11484 		} else {
11485 			if (error->code == GOT_ERR_NOT_WORKTREE)
11486 				error = wrap_not_worktree_error(error,
11487 				    "rebase", cwd);
11488 			goto done;
11489 		}
11490 	}
11491 
11492 	error = get_gitconfig_path(&gitconfig_path);
11493 	if (error)
11494 		goto done;
11495 	error = got_repo_open(&repo,
11496 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
11497 	    gitconfig_path, pack_fds);
11498 	if (error != NULL)
11499 		goto done;
11500 
11501 	if (worktree != NULL && !list_backups && !delete_backups) {
11502 		error = worktree_has_logmsg_ref("rebase", worktree, repo);
11503 		if (error)
11504 			goto done;
11505 	}
11506 
11507 	error = get_author(&committer, repo, worktree);
11508 	if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
11509 		goto done;
11510 
11511 	error = apply_unveil(got_repo_get_path(repo), 0,
11512 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
11513 	if (error)
11514 		goto done;
11515 
11516 	if (list_backups || delete_backups) {
11517 		error = process_backup_refs(
11518 		    GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
11519 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
11520 		goto done; /* nothing else to do */
11521 	}
11522 
11523 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
11524 	    worktree);
11525 	if (error)
11526 		goto done;
11527 	if (histedit_in_progress) {
11528 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
11529 		goto done;
11530 	}
11531 
11532 	error = got_worktree_merge_in_progress(&merge_in_progress,
11533 	    worktree, repo);
11534 	if (error)
11535 		goto done;
11536 	if (merge_in_progress) {
11537 		error = got_error(GOT_ERR_MERGE_BUSY);
11538 		goto done;
11539 	}
11540 
11541 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11542 	if (error)
11543 		goto done;
11544 
11545 	if (abort_rebase) {
11546 		if (!rebase_in_progress) {
11547 			error = got_error(GOT_ERR_NOT_REBASING);
11548 			goto done;
11549 		}
11550 		error = got_worktree_rebase_continue(&resume_commit_id,
11551 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
11552 		    worktree, repo);
11553 		if (error)
11554 			goto done;
11555 		printf("Switching work tree to %s\n",
11556 		    got_ref_get_symref_target(new_base_branch));
11557 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
11558 		    new_base_branch, abort_progress, &upa);
11559 		if (error)
11560 			goto done;
11561 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
11562 		print_merge_progress_stats(&upa);
11563 		goto done; /* nothing else to do */
11564 	}
11565 
11566 	if (continue_rebase) {
11567 		if (!rebase_in_progress) {
11568 			error = got_error(GOT_ERR_NOT_REBASING);
11569 			goto done;
11570 		}
11571 		error = got_worktree_rebase_continue(&resume_commit_id,
11572 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
11573 		    worktree, repo);
11574 		if (error)
11575 			goto done;
11576 
11577 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
11578 		    committer, resume_commit_id, allow_conflict, repo);
11579 		if (error)
11580 			goto done;
11581 
11582 		yca_id = got_object_id_dup(resume_commit_id);
11583 		if (yca_id == NULL) {
11584 			error = got_error_from_errno("got_object_id_dup");
11585 			goto done;
11586 		}
11587 	} else {
11588 		error = got_ref_open(&branch, repo, argv[0], 0);
11589 		if (error != NULL)
11590 			goto done;
11591 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11592 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11593 			    "will not rebase a branch which lives outside "
11594 			    "the \"refs/heads/\" reference namespace");
11595 			goto done;
11596 		}
11597 	}
11598 
11599 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
11600 	if (error)
11601 		goto done;
11602 
11603 	if (!continue_rebase) {
11604 		struct got_object_id *base_commit_id;
11605 
11606 		error = got_ref_open(&head_ref, repo,
11607 		    got_worktree_get_head_ref_name(worktree), 0);
11608 		if (error)
11609 			goto done;
11610 		error = got_ref_resolve(&head_commit_id, repo, head_ref);
11611 		if (error)
11612 			goto done;
11613 		base_commit_id = got_worktree_get_base_commit_id(worktree);
11614 		if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
11615 			error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
11616 			goto done;
11617 		}
11618 
11619 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11620 		    base_commit_id, branch_head_commit_id, 1, 0,
11621 		    repo, check_cancelled, NULL);
11622 		if (error) {
11623 			if (error->code == GOT_ERR_ANCESTRY) {
11624 				error = got_error_msg(GOT_ERR_ANCESTRY,
11625 				    "specified branch shares no common "
11626 				    "ancestry with work tree's branch");
11627 			}
11628 			goto done;
11629 		}
11630 
11631 		/*
11632 		 * If a merge commit appears between the new base branch tip
11633 		 * and a YCA found via first-parent traversal then we might
11634 		 * find a better YCA using topologically sorted commits.
11635 		 */
11636 		if (got_object_id_cmp(base_commit_id, yca_id) != 0) {
11637 			struct got_object_id *better_yca_id;
11638 			error = find_merge_commit_yca(&better_yca_id,
11639 			    branch_head_commit_id, yca_id,
11640 			    base_commit_id, repo);
11641 			if (error)
11642 				goto done;
11643 			if (better_yca_id) {
11644 				free(yca_id);
11645 				yca_id = better_yca_id;
11646 			}
11647 		}
11648 
11649 		if (got_object_id_cmp(base_commit_id, yca_id) == 0) {
11650 			struct got_pathlist_head paths;
11651 			printf("%s is already based on %s\n",
11652 			    got_ref_get_name(branch),
11653 			    got_worktree_get_head_ref_name(worktree));
11654 			error = switch_head_ref(branch, branch_head_commit_id,
11655 			    worktree, repo);
11656 			if (error)
11657 				goto done;
11658 			error = got_worktree_set_base_commit_id(worktree, repo,
11659 			    branch_head_commit_id);
11660 			if (error)
11661 				goto done;
11662 			TAILQ_INIT(&paths);
11663 			error = got_pathlist_append(&paths, "", NULL);
11664 			if (error)
11665 				goto done;
11666 			error = got_worktree_checkout_files(worktree,
11667 			    &paths, repo, update_progress, &upa,
11668 			    check_cancelled, NULL);
11669 			got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
11670 			if (error)
11671 				goto done;
11672 			if (upa.did_something) {
11673 				char *id_str;
11674 				error = got_object_id_str(&id_str,
11675 				    branch_head_commit_id);
11676 				if (error)
11677 					goto done;
11678 				printf("Updated to %s: %s\n",
11679 				    got_worktree_get_head_ref_name(worktree),
11680 				    id_str);
11681 				free(id_str);
11682 			} else
11683 				printf("Already up-to-date\n");
11684 			print_update_progress_stats(&upa);
11685 			goto done;
11686 		}
11687 	}
11688 
11689 	commit_id = branch_head_commit_id;
11690 	error = got_object_open_as_commit(&commit, repo, commit_id);
11691 	if (error)
11692 		goto done;
11693 
11694 	parent_ids = got_object_commit_get_parent_ids(commit);
11695 	pid = STAILQ_FIRST(parent_ids);
11696 	if (pid) {
11697 		error = collect_commits(&commits, commit_id, &pid->id,
11698 		    yca_id, got_worktree_get_path_prefix(worktree),
11699 		    GOT_ERR_REBASE_PATH, repo);
11700 		if (error)
11701 			goto done;
11702 	}
11703 
11704 	got_object_commit_close(commit);
11705 	commit = NULL;
11706 
11707 	if (!continue_rebase) {
11708 		error = got_worktree_rebase_prepare(&new_base_branch,
11709 		    &tmp_branch, &fileindex, worktree, branch, repo);
11710 		if (error)
11711 			goto done;
11712 	}
11713 
11714 	if (STAILQ_EMPTY(&commits)) {
11715 		if (continue_rebase) {
11716 			error = rebase_complete(worktree, fileindex,
11717 			    branch, tmp_branch, repo, create_backup);
11718 			goto done;
11719 		} else {
11720 			/* Fast-forward the reference of the branch. */
11721 			struct got_object_id *new_head_commit_id;
11722 			char *id_str;
11723 			error = got_ref_resolve(&new_head_commit_id, repo,
11724 			    new_base_branch);
11725 			if (error)
11726 				goto done;
11727 			error = got_object_id_str(&id_str, new_head_commit_id);
11728 			if (error)
11729 				goto done;
11730 			printf("Forwarding %s to commit %s\n",
11731 			    got_ref_get_name(branch), id_str);
11732 			free(id_str);
11733 			error = got_ref_change_ref(branch,
11734 			    new_head_commit_id);
11735 			if (error)
11736 				goto done;
11737 			/* No backup needed since objects did not change. */
11738 			create_backup = 0;
11739 		}
11740 	}
11741 
11742 	pid = NULL;
11743 	STAILQ_FOREACH(qid, &commits, entry) {
11744 
11745 		commit_id = &qid->id;
11746 		parent_id = pid ? &pid->id : yca_id;
11747 		pid = qid;
11748 
11749 		memset(&upa, 0, sizeof(upa));
11750 		error = got_worktree_rebase_merge_files(&merged_paths,
11751 		    worktree, fileindex, parent_id, commit_id, repo,
11752 		    update_progress, &upa, check_cancelled, NULL);
11753 		if (error)
11754 			goto done;
11755 
11756 		print_merge_progress_stats(&upa);
11757 		if (upa.conflicts > 0 || upa.missing > 0 ||
11758 		    upa.not_deleted > 0 || upa.unversioned > 0) {
11759 			if (upa.conflicts > 0) {
11760 				error = show_rebase_merge_conflict(&qid->id,
11761 				    repo);
11762 				if (error)
11763 					goto done;
11764 			}
11765 			got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11766 			break;
11767 		}
11768 
11769 		error = rebase_commit(&merged_paths, worktree, fileindex,
11770 		    tmp_branch, committer, commit_id, 0, repo);
11771 		got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11772 		if (error)
11773 			goto done;
11774 	}
11775 
11776 	if (upa.conflicts > 0 || upa.missing > 0 ||
11777 	    upa.not_deleted > 0 || upa.unversioned > 0) {
11778 		error = got_worktree_rebase_postpone(worktree, fileindex);
11779 		if (error)
11780 			goto done;
11781 		if (upa.conflicts > 0 && upa.missing == 0 &&
11782 		    upa.not_deleted == 0 && upa.unversioned == 0) {
11783 			error = got_error_msg(GOT_ERR_CONFLICTS,
11784 			    "conflicts must be resolved before rebasing "
11785 			    "can continue");
11786 		} else if (upa.conflicts > 0) {
11787 			error = got_error_msg(GOT_ERR_CONFLICTS,
11788 			    "conflicts must be resolved before rebasing "
11789 			    "can continue; changes destined for some "
11790 			    "files were not yet merged and should be "
11791 			    "merged manually if required before the "
11792 			    "rebase operation is continued");
11793 		} else {
11794 			error = got_error_msg(GOT_ERR_CONFLICTS,
11795 			    "changes destined for some files were not "
11796 			    "yet merged and should be merged manually "
11797 			    "if required before the rebase operation "
11798 			    "is continued");
11799 		}
11800 	} else
11801 		error = rebase_complete(worktree, fileindex, branch,
11802 		    tmp_branch, repo, create_backup);
11803 done:
11804 	free(cwd);
11805 	free(committer);
11806 	free(gitconfig_path);
11807 	got_object_id_queue_free(&commits);
11808 	free(branch_head_commit_id);
11809 	free(resume_commit_id);
11810 	free(head_commit_id);
11811 	free(yca_id);
11812 	if (commit)
11813 		got_object_commit_close(commit);
11814 	if (branch)
11815 		got_ref_close(branch);
11816 	if (new_base_branch)
11817 		got_ref_close(new_base_branch);
11818 	if (tmp_branch)
11819 		got_ref_close(tmp_branch);
11820 	if (head_ref)
11821 		got_ref_close(head_ref);
11822 	if (worktree)
11823 		got_worktree_close(worktree);
11824 	if (repo) {
11825 		const struct got_error *close_err = got_repo_close(repo);
11826 		if (error == NULL)
11827 			error = close_err;
11828 	}
11829 	if (pack_fds) {
11830 		const struct got_error *pack_err =
11831 		    got_repo_pack_fds_close(pack_fds);
11832 		if (error == NULL)
11833 			error = pack_err;
11834 	}
11835 	return error;
11836 }
11837 
11838 __dead static void
11839 usage_histedit(void)
11840 {
11841 	fprintf(stderr, "usage: %s histedit [-aCcdeflmX] [-F histedit-script] "
11842 	    "[branch]\n", getprogname());
11843 	exit(1);
11844 }
11845 
11846 #define GOT_HISTEDIT_PICK 'p'
11847 #define GOT_HISTEDIT_EDIT 'e'
11848 #define GOT_HISTEDIT_FOLD 'f'
11849 #define GOT_HISTEDIT_DROP 'd'
11850 #define GOT_HISTEDIT_MESG 'm'
11851 
11852 static const struct got_histedit_cmd {
11853 	unsigned char code;
11854 	const char *name;
11855 	const char *desc;
11856 } got_histedit_cmds[] = {
11857 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
11858 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
11859 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
11860 	    "be used" },
11861 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
11862 	{ GOT_HISTEDIT_MESG, "mesg", "open editor to edit the log message" },
11863 };
11864 
11865 struct got_histedit_list_entry {
11866 	TAILQ_ENTRY(got_histedit_list_entry) entry;
11867 	struct got_object_id *commit_id;
11868 	const struct got_histedit_cmd *cmd;
11869 	char *logmsg;
11870 };
11871 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
11872 
11873 static const struct got_error *
11874 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
11875     FILE *f, struct got_repository *repo)
11876 {
11877 	const struct got_error *err = NULL;
11878 	char *logmsg = NULL, *id_str = NULL;
11879 	struct got_commit_object *commit = NULL;
11880 	int n;
11881 
11882 	err = got_object_open_as_commit(&commit, repo, commit_id);
11883 	if (err)
11884 		goto done;
11885 
11886 	err = get_short_logmsg(&logmsg, 34, commit);
11887 	if (err)
11888 		goto done;
11889 
11890 	err = got_object_id_str(&id_str, commit_id);
11891 	if (err)
11892 		goto done;
11893 
11894 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
11895 	if (n < 0)
11896 		err = got_ferror(f, GOT_ERR_IO);
11897 done:
11898 	if (commit)
11899 		got_object_commit_close(commit);
11900 	free(id_str);
11901 	free(logmsg);
11902 	return err;
11903 }
11904 
11905 static const struct got_error *
11906 histedit_write_commit_list(struct got_object_id_queue *commits,
11907     FILE *f, int edit_logmsg_only, int fold_only, int drop_only,
11908     int edit_only, struct got_repository *repo)
11909 {
11910 	const struct got_error *err = NULL;
11911 	struct got_object_qid *qid;
11912 	const char *histedit_cmd = NULL;
11913 
11914 	if (STAILQ_EMPTY(commits))
11915 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
11916 
11917 	STAILQ_FOREACH(qid, commits, entry) {
11918 		histedit_cmd = got_histedit_cmds[0].name;
11919 		if (drop_only)
11920 			histedit_cmd = "drop";
11921 		else if (edit_only)
11922 			histedit_cmd = "edit";
11923 		else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
11924 			histedit_cmd = "fold";
11925 		else if (edit_logmsg_only)
11926 			histedit_cmd = "mesg";
11927 		err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
11928 		if (err)
11929 			break;
11930 	}
11931 
11932 	return err;
11933 }
11934 
11935 static const struct got_error *
11936 write_cmd_list(FILE *f, const char *branch_name,
11937     struct got_object_id_queue *commits)
11938 {
11939 	const struct got_error *err = NULL;
11940 	size_t i;
11941 	int n;
11942 	char *id_str;
11943 	struct got_object_qid *qid;
11944 
11945 	qid = STAILQ_FIRST(commits);
11946 	err = got_object_id_str(&id_str, &qid->id);
11947 	if (err)
11948 		return err;
11949 
11950 	n = fprintf(f,
11951 	    "# Editing the history of branch '%s' starting at\n"
11952 	    "# commit %s\n"
11953 	    "# Commits will be processed in order from top to "
11954 	    "bottom of this file.\n", branch_name, id_str);
11955 	if (n < 0) {
11956 		err = got_ferror(f, GOT_ERR_IO);
11957 		goto done;
11958 	}
11959 
11960 	n = fprintf(f, "# Available histedit commands:\n");
11961 	if (n < 0) {
11962 		err = got_ferror(f, GOT_ERR_IO);
11963 		goto done;
11964 	}
11965 
11966 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
11967 		const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
11968 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
11969 		    cmd->desc);
11970 		if (n < 0) {
11971 			err = got_ferror(f, GOT_ERR_IO);
11972 			break;
11973 		}
11974 	}
11975 done:
11976 	free(id_str);
11977 	return err;
11978 }
11979 
11980 static const struct got_error *
11981 histedit_syntax_error(int lineno)
11982 {
11983 	static char msg[42];
11984 	int ret;
11985 
11986 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
11987 	    lineno);
11988 	if (ret < 0 || (size_t)ret >= sizeof(msg))
11989 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
11990 
11991 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
11992 }
11993 
11994 static const struct got_error *
11995 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
11996     char *logmsg, struct got_repository *repo)
11997 {
11998 	const struct got_error *err;
11999 	struct got_commit_object *folded_commit = NULL;
12000 	char *id_str, *folded_logmsg = NULL;
12001 
12002 	err = got_object_id_str(&id_str, hle->commit_id);
12003 	if (err)
12004 		return err;
12005 
12006 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
12007 	if (err)
12008 		goto done;
12009 
12010 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
12011 	if (err)
12012 		goto done;
12013 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
12014 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
12015 	    folded_logmsg) == -1) {
12016 		err = got_error_from_errno("asprintf");
12017 	}
12018 done:
12019 	if (folded_commit)
12020 		got_object_commit_close(folded_commit);
12021 	free(id_str);
12022 	free(folded_logmsg);
12023 	return err;
12024 }
12025 
12026 static struct got_histedit_list_entry *
12027 get_folded_commits(struct got_histedit_list_entry *hle)
12028 {
12029 	struct got_histedit_list_entry *prev, *folded = NULL;
12030 
12031 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
12032 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
12033 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
12034 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
12035 			folded = prev;
12036 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
12037 	}
12038 
12039 	return folded;
12040 }
12041 
12042 static const struct got_error *
12043 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
12044     const char *editor, struct got_repository *repo)
12045 {
12046 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
12047 	char *logmsg = NULL, *new_msg = NULL;
12048 	const struct got_error *err = NULL;
12049 	struct got_commit_object *commit = NULL;
12050 	int logmsg_len;
12051 	int fd = -1;
12052 	struct got_histedit_list_entry *folded = NULL;
12053 
12054 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12055 	if (err)
12056 		return err;
12057 
12058 	folded = get_folded_commits(hle);
12059 	if (folded) {
12060 		while (folded != hle) {
12061 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
12062 				folded = TAILQ_NEXT(folded, entry);
12063 				continue;
12064 			}
12065 			err = append_folded_commit_msg(&new_msg, folded,
12066 			    logmsg, repo);
12067 			if (err)
12068 				goto done;
12069 			free(logmsg);
12070 			logmsg = new_msg;
12071 			folded = TAILQ_NEXT(folded, entry);
12072 		}
12073 	}
12074 
12075 	err = got_object_id_str(&id_str, hle->commit_id);
12076 	if (err)
12077 		goto done;
12078 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
12079 	if (err)
12080 		goto done;
12081 	logmsg_len = asprintf(&new_msg,
12082 	    "%s\n# original log message of commit %s: %s",
12083 	    logmsg ? logmsg : "", id_str, orig_logmsg);
12084 	if (logmsg_len == -1) {
12085 		err = got_error_from_errno("asprintf");
12086 		goto done;
12087 	}
12088 	free(logmsg);
12089 	logmsg = new_msg;
12090 
12091 	err = got_object_id_str(&id_str, hle->commit_id);
12092 	if (err)
12093 		goto done;
12094 
12095 	err = got_opentemp_named_fd(&logmsg_path, &fd,
12096 	    GOT_TMPDIR_STR "/got-logmsg", "");
12097 	if (err)
12098 		goto done;
12099 
12100 	if (write(fd, logmsg, logmsg_len) == -1) {
12101 		err = got_error_from_errno2("write", logmsg_path);
12102 		goto done;
12103 	}
12104 	if (close(fd) == -1) {
12105 		err = got_error_from_errno2("close", logmsg_path);
12106 		goto done;
12107 	}
12108 	fd = -1;
12109 
12110 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
12111 	    logmsg_len, 0);
12112 	if (err) {
12113 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
12114 			goto done;
12115 		err = NULL;
12116 		hle->logmsg = strdup(new_msg);
12117 		if (hle->logmsg == NULL)
12118 			err = got_error_from_errno("strdup");
12119 	}
12120 done:
12121 	if (fd != -1 && close(fd) == -1 && err == NULL)
12122 		err = got_error_from_errno2("close", logmsg_path);
12123 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
12124 		err = got_error_from_errno2("unlink", logmsg_path);
12125 	free(logmsg_path);
12126 	free(logmsg);
12127 	free(orig_logmsg);
12128 	if (commit)
12129 		got_object_commit_close(commit);
12130 	return err;
12131 }
12132 
12133 static const struct got_error *
12134 histedit_parse_list(struct got_histedit_list *histedit_cmds,
12135     FILE *f, struct got_repository *repo)
12136 {
12137 	const struct got_error *err = NULL;
12138 	char *line = NULL, *p, *end;
12139 	size_t i, linesize = 0;
12140 	ssize_t linelen;
12141 	int lineno = 0;
12142 	const struct got_histedit_cmd *cmd;
12143 	struct got_object_id *commit_id = NULL;
12144 	struct got_histedit_list_entry *hle = NULL;
12145 
12146 	for (;;) {
12147 		linelen = getline(&line, &linesize, f);
12148 		if (linelen == -1) {
12149 			const struct got_error *getline_err;
12150 			if (feof(f))
12151 				break;
12152 			getline_err = got_error_from_errno("getline");
12153 			err = got_ferror(f, getline_err->code);
12154 			break;
12155 		}
12156 		lineno++;
12157 		p = line;
12158 		while (isspace((unsigned char)p[0]))
12159 			p++;
12160 		if (p[0] == '#' || p[0] == '\0')
12161 			continue;
12162 		cmd = NULL;
12163 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
12164 			cmd = &got_histedit_cmds[i];
12165 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
12166 			    isspace((unsigned char)p[strlen(cmd->name)])) {
12167 				p += strlen(cmd->name);
12168 				break;
12169 			}
12170 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
12171 				p++;
12172 				break;
12173 			}
12174 		}
12175 		if (i == nitems(got_histedit_cmds)) {
12176 			err = histedit_syntax_error(lineno);
12177 			break;
12178 		}
12179 		while (isspace((unsigned char)p[0]))
12180 			p++;
12181 		end = p;
12182 		while (end[0] && !isspace((unsigned char)end[0]))
12183 			end++;
12184 		*end = '\0';
12185 		err = got_object_resolve_id_str(&commit_id, repo, p);
12186 		if (err) {
12187 			/* override error code */
12188 			err = histedit_syntax_error(lineno);
12189 			break;
12190 		}
12191 		hle = malloc(sizeof(*hle));
12192 		if (hle == NULL) {
12193 			err = got_error_from_errno("malloc");
12194 			break;
12195 		}
12196 		hle->cmd = cmd;
12197 		hle->commit_id = commit_id;
12198 		hle->logmsg = NULL;
12199 		commit_id = NULL;
12200 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
12201 	}
12202 
12203 	free(line);
12204 	free(commit_id);
12205 	return err;
12206 }
12207 
12208 static const struct got_error *
12209 histedit_check_script(struct got_histedit_list *histedit_cmds,
12210     struct got_object_id_queue *commits, struct got_repository *repo)
12211 {
12212 	const struct got_error *err = NULL;
12213 	struct got_object_qid *qid;
12214 	struct got_histedit_list_entry *hle;
12215 	static char msg[92];
12216 	char *id_str;
12217 
12218 	if (TAILQ_EMPTY(histedit_cmds))
12219 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12220 		    "histedit script contains no commands");
12221 	if (STAILQ_EMPTY(commits))
12222 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
12223 
12224 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
12225 		struct got_histedit_list_entry *hle2;
12226 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
12227 			if (hle == hle2)
12228 				continue;
12229 			if (got_object_id_cmp(hle->commit_id,
12230 			    hle2->commit_id) != 0)
12231 				continue;
12232 			err = got_object_id_str(&id_str, hle->commit_id);
12233 			if (err)
12234 				return err;
12235 			snprintf(msg, sizeof(msg), "commit %s is listed "
12236 			    "more than once in histedit script", id_str);
12237 			free(id_str);
12238 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12239 		}
12240 	}
12241 
12242 	STAILQ_FOREACH(qid, commits, entry) {
12243 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
12244 			if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
12245 				break;
12246 		}
12247 		if (hle == NULL) {
12248 			err = got_object_id_str(&id_str, &qid->id);
12249 			if (err)
12250 				return err;
12251 			snprintf(msg, sizeof(msg),
12252 			    "commit %s missing from histedit script", id_str);
12253 			free(id_str);
12254 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12255 		}
12256 	}
12257 
12258 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
12259 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
12260 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
12261 		    "last commit in histedit script cannot be folded");
12262 
12263 	return NULL;
12264 }
12265 
12266 static const struct got_error *
12267 histedit_run_editor(struct got_histedit_list *histedit_cmds,
12268     const char *editor, const char *path,
12269     struct got_object_id_queue *commits, struct got_repository *repo)
12270 {
12271 	const struct got_error *err = NULL;
12272 	struct stat st, st2;
12273 	struct timespec timeout;
12274 	FILE *f = NULL;
12275 
12276 	if (stat(path, &st) == -1) {
12277 		err = got_error_from_errno2("stat", path);
12278 		goto done;
12279 	}
12280 
12281 	if (spawn_editor(editor, path) == -1) {
12282 		err = got_error_from_errno("failed spawning editor");
12283 		goto done;
12284 	}
12285 
12286 	timeout.tv_sec = 0;
12287 	timeout.tv_nsec = 1;
12288 	nanosleep(&timeout,  NULL);
12289 
12290 	if (stat(path, &st2) == -1) {
12291 		err = got_error_from_errno2("stat", path);
12292 		goto done;
12293 	}
12294 
12295 	if (st.st_size == st2.st_size &&
12296 	    timespeccmp(&st.st_mtim, &st2.st_mtim, ==)) {
12297 		err = got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12298                     "no changes made to histedit script, aborting");
12299 		goto done;
12300 	}
12301 
12302 	f = fopen(path, "re");
12303 	if (f == NULL) {
12304 		err = got_error_from_errno("fopen");
12305 		goto done;
12306 	}
12307 	err = histedit_parse_list(histedit_cmds, f, repo);
12308 	if (err)
12309 		goto done;
12310 
12311 	err = histedit_check_script(histedit_cmds, commits, repo);
12312 done:
12313 	if (f && fclose(f) == EOF && err == NULL)
12314 		err = got_error_from_errno("fclose");
12315 	return err;
12316 }
12317 
12318 static const struct got_error *
12319 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
12320     struct got_object_id_queue *, const char *, const char *, const char *,
12321     struct got_repository *);
12322 
12323 static const struct got_error *
12324 histedit_edit_script(struct got_histedit_list *histedit_cmds,
12325     struct got_object_id_queue *commits, const char *branch_name,
12326     int edit_logmsg_only, int fold_only, int drop_only, int edit_only,
12327     const char *editor, struct got_repository *repo)
12328 {
12329 	const struct got_error *err;
12330 	FILE *f = NULL;
12331 	char *path = NULL;
12332 
12333 	err = got_opentemp_named(&path, &f, "got-histedit", "");
12334 	if (err)
12335 		return err;
12336 
12337 	err = write_cmd_list(f, branch_name, commits);
12338 	if (err)
12339 		goto done;
12340 
12341 	err = histedit_write_commit_list(commits, f, edit_logmsg_only,
12342 	    fold_only, drop_only, edit_only, repo);
12343 	if (err)
12344 		goto done;
12345 
12346 	if (drop_only || edit_logmsg_only || fold_only || edit_only) {
12347 		rewind(f);
12348 		err = histedit_parse_list(histedit_cmds, f, repo);
12349 	} else {
12350 		if (fclose(f) == EOF) {
12351 			err = got_error_from_errno("fclose");
12352 			goto done;
12353 		}
12354 		f = NULL;
12355 		err = histedit_run_editor(histedit_cmds, editor, path,
12356 		    commits, repo);
12357 		if (err) {
12358 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12359 			    err->code != GOT_ERR_HISTEDIT_CMD)
12360 				goto done;
12361 			err = histedit_edit_list_retry(histedit_cmds, err,
12362 			    commits, editor, path, branch_name, repo);
12363 		}
12364 	}
12365 done:
12366 	if (f && fclose(f) == EOF && err == NULL)
12367 		err = got_error_from_errno("fclose");
12368 	if (path && unlink(path) != 0 && err == NULL)
12369 		err = got_error_from_errno2("unlink", path);
12370 	free(path);
12371 	return err;
12372 }
12373 
12374 static const struct got_error *
12375 histedit_save_list(struct got_histedit_list *histedit_cmds,
12376     struct got_worktree *worktree, struct got_repository *repo)
12377 {
12378 	const struct got_error *err = NULL;
12379 	char *path = NULL;
12380 	FILE *f = NULL;
12381 	struct got_histedit_list_entry *hle;
12382 
12383 	err = got_worktree_get_histedit_script_path(&path, worktree);
12384 	if (err)
12385 		return err;
12386 
12387 	f = fopen(path, "we");
12388 	if (f == NULL) {
12389 		err = got_error_from_errno2("fopen", path);
12390 		goto done;
12391 	}
12392 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
12393 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
12394 		    repo);
12395 		if (err)
12396 			break;
12397 	}
12398 done:
12399 	if (f && fclose(f) == EOF && err == NULL)
12400 		err = got_error_from_errno("fclose");
12401 	free(path);
12402 	return err;
12403 }
12404 
12405 static void
12406 histedit_free_list(struct got_histedit_list *histedit_cmds)
12407 {
12408 	struct got_histedit_list_entry *hle;
12409 
12410 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
12411 		TAILQ_REMOVE(histedit_cmds, hle, entry);
12412 		free(hle);
12413 	}
12414 }
12415 
12416 static const struct got_error *
12417 histedit_load_list(struct got_histedit_list *histedit_cmds,
12418     const char *path, struct got_repository *repo)
12419 {
12420 	const struct got_error *err = NULL;
12421 	FILE *f = NULL;
12422 
12423 	f = fopen(path, "re");
12424 	if (f == NULL) {
12425 		err = got_error_from_errno2("fopen", path);
12426 		goto done;
12427 	}
12428 
12429 	err = histedit_parse_list(histedit_cmds, f, repo);
12430 done:
12431 	if (f && fclose(f) == EOF && err == NULL)
12432 		err = got_error_from_errno("fclose");
12433 	return err;
12434 }
12435 
12436 static const struct got_error *
12437 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
12438     const struct got_error *edit_err, struct got_object_id_queue *commits,
12439     const char *editor, const char *path, const char *branch_name,
12440     struct got_repository *repo)
12441 {
12442 	const struct got_error *err = NULL, *prev_err = edit_err;
12443 	int resp = ' ';
12444 
12445 	while (resp != 'c' && resp != 'r' && resp != 'a') {
12446 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
12447 		    "or (a)bort: ", getprogname(), prev_err->msg);
12448 		resp = getchar();
12449 		if (resp == '\n')
12450 			resp = getchar();
12451 		if (resp == 'c') {
12452 			histedit_free_list(histedit_cmds);
12453 			err = histedit_run_editor(histedit_cmds, editor, path,
12454 			    commits, repo);
12455 			if (err) {
12456 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12457 				    err->code != GOT_ERR_HISTEDIT_CMD)
12458 					break;
12459 				prev_err = err;
12460 				resp = ' ';
12461 				continue;
12462 			}
12463 			break;
12464 		} else if (resp == 'r') {
12465 			histedit_free_list(histedit_cmds);
12466 			err = histedit_edit_script(histedit_cmds,
12467 			    commits, branch_name, 0, 0, 0, 0, editor, repo);
12468 			if (err) {
12469 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12470 				    err->code != GOT_ERR_HISTEDIT_CMD)
12471 					break;
12472 				prev_err = err;
12473 				resp = ' ';
12474 				continue;
12475 			}
12476 			break;
12477 		} else if (resp == 'a') {
12478 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
12479 			break;
12480 		} else
12481 			printf("invalid response '%c'\n", resp);
12482 	}
12483 
12484 	return err;
12485 }
12486 
12487 static const struct got_error *
12488 histedit_complete(struct got_worktree *worktree,
12489     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
12490     struct got_reference *branch, struct got_repository *repo)
12491 {
12492 	printf("Switching work tree to %s\n",
12493 	    got_ref_get_symref_target(branch));
12494 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
12495 	    branch, repo);
12496 }
12497 
12498 static const struct got_error *
12499 show_histedit_progress(struct got_commit_object *commit,
12500     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
12501 {
12502 	const struct got_error *err;
12503 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
12504 
12505 	err = got_object_id_str(&old_id_str, hle->commit_id);
12506 	if (err)
12507 		goto done;
12508 
12509 	if (new_id) {
12510 		err = got_object_id_str(&new_id_str, new_id);
12511 		if (err)
12512 			goto done;
12513 	}
12514 
12515 	old_id_str[12] = '\0';
12516 	if (new_id_str)
12517 		new_id_str[12] = '\0';
12518 
12519 	if (hle->logmsg) {
12520 		logmsg = strdup(hle->logmsg);
12521 		if (logmsg == NULL) {
12522 			err = got_error_from_errno("strdup");
12523 			goto done;
12524 		}
12525 		trim_logmsg(logmsg, 42);
12526 	} else {
12527 		err = get_short_logmsg(&logmsg, 42, commit);
12528 		if (err)
12529 			goto done;
12530 	}
12531 
12532 	switch (hle->cmd->code) {
12533 	case GOT_HISTEDIT_PICK:
12534 	case GOT_HISTEDIT_EDIT:
12535 	case GOT_HISTEDIT_MESG:
12536 		printf("%s -> %s: %s\n", old_id_str,
12537 		    new_id_str ? new_id_str : "no-op change", logmsg);
12538 		break;
12539 	case GOT_HISTEDIT_DROP:
12540 	case GOT_HISTEDIT_FOLD:
12541 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
12542 		    logmsg);
12543 		break;
12544 	default:
12545 		break;
12546 	}
12547 done:
12548 	free(old_id_str);
12549 	free(new_id_str);
12550 	return err;
12551 }
12552 
12553 static const struct got_error *
12554 histedit_commit(struct got_pathlist_head *merged_paths,
12555     struct got_worktree *worktree, struct got_fileindex *fileindex,
12556     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
12557     const char *committer, int allow_conflict, const char *editor,
12558     struct got_repository *repo)
12559 {
12560 	const struct got_error *err;
12561 	struct got_commit_object *commit;
12562 	struct got_object_id *new_commit_id;
12563 
12564 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
12565 	    && hle->logmsg == NULL) {
12566 		err = histedit_edit_logmsg(hle, editor, repo);
12567 		if (err)
12568 			return err;
12569 	}
12570 
12571 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12572 	if (err)
12573 		return err;
12574 
12575 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
12576 	    worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
12577 	    hle->logmsg, allow_conflict, repo);
12578 	if (err) {
12579 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
12580 			goto done;
12581 		err = show_histedit_progress(commit, hle, NULL);
12582 	} else {
12583 		err = show_histedit_progress(commit, hle, new_commit_id);
12584 		free(new_commit_id);
12585 	}
12586 done:
12587 	got_object_commit_close(commit);
12588 	return err;
12589 }
12590 
12591 static const struct got_error *
12592 histedit_skip_commit(struct got_histedit_list_entry *hle,
12593     struct got_worktree *worktree, struct got_repository *repo)
12594 {
12595 	const struct got_error *error;
12596 	struct got_commit_object *commit;
12597 
12598 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
12599 	    repo);
12600 	if (error)
12601 		return error;
12602 
12603 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
12604 	if (error)
12605 		return error;
12606 
12607 	error = show_histedit_progress(commit, hle, NULL);
12608 	got_object_commit_close(commit);
12609 	return error;
12610 }
12611 
12612 static const struct got_error *
12613 check_local_changes(void *arg, unsigned char status,
12614     unsigned char staged_status, const char *path,
12615     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12616     struct got_object_id *commit_id, int dirfd, const char *de_name)
12617 {
12618 	int *have_local_changes = arg;
12619 
12620 	switch (status) {
12621 	case GOT_STATUS_ADD:
12622 	case GOT_STATUS_DELETE:
12623 	case GOT_STATUS_MODIFY:
12624 	case GOT_STATUS_CONFLICT:
12625 		*have_local_changes = 1;
12626 		return got_error(GOT_ERR_CANCELLED);
12627 	default:
12628 		break;
12629 	}
12630 
12631 	switch (staged_status) {
12632 	case GOT_STATUS_ADD:
12633 	case GOT_STATUS_DELETE:
12634 	case GOT_STATUS_MODIFY:
12635 		*have_local_changes = 1;
12636 		return got_error(GOT_ERR_CANCELLED);
12637 	default:
12638 		break;
12639 	}
12640 
12641 	return NULL;
12642 }
12643 
12644 static const struct got_error *
12645 cmd_histedit(int argc, char *argv[])
12646 {
12647 	const struct got_error *error = NULL;
12648 	struct got_worktree *worktree = NULL;
12649 	struct got_fileindex *fileindex = NULL;
12650 	struct got_repository *repo = NULL;
12651 	char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
12652 	struct got_reference *branch = NULL;
12653 	struct got_reference *tmp_branch = NULL;
12654 	struct got_object_id *resume_commit_id = NULL;
12655 	struct got_object_id *base_commit_id = NULL;
12656 	struct got_object_id *head_commit_id = NULL;
12657 	struct got_commit_object *commit = NULL;
12658 	int ch, rebase_in_progress = 0, merge_in_progress = 0;
12659 	struct got_update_progress_arg upa;
12660 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
12661 	int drop_only = 0, edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
12662 	int allow_conflict = 0, list_backups = 0, delete_backups = 0;
12663 	const char *edit_script_path = NULL;
12664 	char *editor = NULL;
12665 	struct got_object_id_queue commits;
12666 	struct got_pathlist_head merged_paths;
12667 	const struct got_object_id_queue *parent_ids;
12668 	struct got_object_qid *pid;
12669 	struct got_histedit_list histedit_cmds;
12670 	struct got_histedit_list_entry *hle;
12671 	int *pack_fds = NULL;
12672 
12673 	STAILQ_INIT(&commits);
12674 	TAILQ_INIT(&histedit_cmds);
12675 	TAILQ_INIT(&merged_paths);
12676 	memset(&upa, 0, sizeof(upa));
12677 
12678 #ifndef PROFILE
12679 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12680 	    "unveil", NULL) == -1)
12681 		err(1, "pledge");
12682 #endif
12683 
12684 	while ((ch = getopt(argc, argv, "aCcdeF:flmX")) != -1) {
12685 		switch (ch) {
12686 		case 'a':
12687 			abort_edit = 1;
12688 			break;
12689 		case 'C':
12690 			allow_conflict = 1;
12691 			break;
12692 		case 'c':
12693 			continue_edit = 1;
12694 			break;
12695 		case 'd':
12696 			drop_only = 1;
12697 			break;
12698 		case 'e':
12699 			edit_only = 1;
12700 			break;
12701 		case 'F':
12702 			edit_script_path = optarg;
12703 			break;
12704 		case 'f':
12705 			fold_only = 1;
12706 			break;
12707 		case 'l':
12708 			list_backups = 1;
12709 			break;
12710 		case 'm':
12711 			edit_logmsg_only = 1;
12712 			break;
12713 		case 'X':
12714 			delete_backups = 1;
12715 			break;
12716 		default:
12717 			usage_histedit();
12718 			/* NOTREACHED */
12719 		}
12720 	}
12721 
12722 	argc -= optind;
12723 	argv += optind;
12724 
12725 	if (abort_edit && allow_conflict)
12726 		option_conflict('a', 'C');
12727 	if (abort_edit && continue_edit)
12728 		option_conflict('a', 'c');
12729 	if (edit_script_path && allow_conflict)
12730 		option_conflict('F', 'C');
12731 	if (edit_script_path && edit_logmsg_only)
12732 		option_conflict('F', 'm');
12733 	if (abort_edit && edit_logmsg_only)
12734 		option_conflict('a', 'm');
12735 	if (edit_logmsg_only && allow_conflict)
12736 		option_conflict('m', 'C');
12737 	if (continue_edit && edit_logmsg_only)
12738 		option_conflict('c', 'm');
12739 	if (abort_edit && fold_only)
12740 		option_conflict('a', 'f');
12741 	if (fold_only && allow_conflict)
12742 		option_conflict('f', 'C');
12743 	if (continue_edit && fold_only)
12744 		option_conflict('c', 'f');
12745 	if (fold_only && edit_logmsg_only)
12746 		option_conflict('f', 'm');
12747 	if (edit_script_path && fold_only)
12748 		option_conflict('F', 'f');
12749 	if (abort_edit && edit_only)
12750 		option_conflict('a', 'e');
12751 	if (continue_edit && edit_only)
12752 		option_conflict('c', 'e');
12753 	if (edit_only && edit_logmsg_only)
12754 		option_conflict('e', 'm');
12755 	if (edit_script_path && edit_only)
12756 		option_conflict('F', 'e');
12757 	if (fold_only && edit_only)
12758 		option_conflict('f', 'e');
12759 	if (drop_only && abort_edit)
12760 		option_conflict('d', 'a');
12761 	if (drop_only && allow_conflict)
12762 		option_conflict('d', 'C');
12763 	if (drop_only && continue_edit)
12764 		option_conflict('d', 'c');
12765 	if (drop_only && edit_logmsg_only)
12766 		option_conflict('d', 'm');
12767 	if (drop_only && edit_only)
12768 		option_conflict('d', 'e');
12769 	if (drop_only && edit_script_path)
12770 		option_conflict('d', 'F');
12771 	if (drop_only && fold_only)
12772 		option_conflict('d', 'f');
12773 	if (list_backups) {
12774 		if (abort_edit)
12775 			option_conflict('l', 'a');
12776 		if (allow_conflict)
12777 			option_conflict('l', 'C');
12778 		if (continue_edit)
12779 			option_conflict('l', 'c');
12780 		if (edit_script_path)
12781 			option_conflict('l', 'F');
12782 		if (edit_logmsg_only)
12783 			option_conflict('l', 'm');
12784 		if (drop_only)
12785 			option_conflict('l', 'd');
12786 		if (fold_only)
12787 			option_conflict('l', 'f');
12788 		if (edit_only)
12789 			option_conflict('l', 'e');
12790 		if (delete_backups)
12791 			option_conflict('l', 'X');
12792 		if (argc != 0 && argc != 1)
12793 			usage_histedit();
12794 	} else if (delete_backups) {
12795 		if (abort_edit)
12796 			option_conflict('X', 'a');
12797 		if (allow_conflict)
12798 			option_conflict('X', 'C');
12799 		if (continue_edit)
12800 			option_conflict('X', 'c');
12801 		if (drop_only)
12802 			option_conflict('X', 'd');
12803 		if (edit_script_path)
12804 			option_conflict('X', 'F');
12805 		if (edit_logmsg_only)
12806 			option_conflict('X', 'm');
12807 		if (fold_only)
12808 			option_conflict('X', 'f');
12809 		if (edit_only)
12810 			option_conflict('X', 'e');
12811 		if (list_backups)
12812 			option_conflict('X', 'l');
12813 		if (argc != 0 && argc != 1)
12814 			usage_histedit();
12815 	} else if (allow_conflict && !continue_edit)
12816 		errx(1, "-C option requires -c");
12817 	else if (argc != 0)
12818 		usage_histedit();
12819 
12820 	cwd = getcwd(NULL, 0);
12821 	if (cwd == NULL) {
12822 		error = got_error_from_errno("getcwd");
12823 		goto done;
12824 	}
12825 
12826 	error = got_repo_pack_fds_open(&pack_fds);
12827 	if (error != NULL)
12828 		goto done;
12829 
12830 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
12831 	if (error) {
12832 		if (list_backups || delete_backups) {
12833 			if (error->code != GOT_ERR_NOT_WORKTREE)
12834 				goto done;
12835 		} else {
12836 			if (error->code == GOT_ERR_NOT_WORKTREE)
12837 				error = wrap_not_worktree_error(error,
12838 				    "histedit", cwd);
12839 			goto done;
12840 		}
12841 	}
12842 
12843 	if (list_backups || delete_backups) {
12844 		error = got_repo_open(&repo,
12845 		    worktree ? got_worktree_get_repo_path(worktree) : cwd,
12846 		    NULL, pack_fds);
12847 		if (error != NULL)
12848 			goto done;
12849 		error = apply_unveil(got_repo_get_path(repo), 0,
12850 		    worktree ? got_worktree_get_root_path(worktree) : NULL);
12851 		if (error)
12852 			goto done;
12853 		error = process_backup_refs(
12854 		    GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
12855 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
12856 		goto done; /* nothing else to do */
12857 	} else {
12858 		error = get_gitconfig_path(&gitconfig_path);
12859 		if (error)
12860 			goto done;
12861 		error = got_repo_open(&repo,
12862 		    got_worktree_get_repo_path(worktree), gitconfig_path,
12863 		    pack_fds);
12864 		if (error != NULL)
12865 			goto done;
12866 		error = get_editor(&editor);
12867 		if (error)
12868 			goto done;
12869 		if (unveil(editor, "x") != 0) {
12870 			error = got_error_from_errno2("unveil", editor);
12871 			goto done;
12872 		}
12873 		if (edit_script_path) {
12874 			if (unveil(edit_script_path, "r") != 0) {
12875 				error = got_error_from_errno2("unveil",
12876 				    edit_script_path);
12877 				goto done;
12878 			}
12879 		}
12880 		error = apply_unveil(got_repo_get_path(repo), 0,
12881 		    got_worktree_get_root_path(worktree));
12882 		if (error)
12883 			goto done;
12884 	}
12885 
12886 	if (worktree != NULL && !list_backups && !delete_backups) {
12887 		error = worktree_has_logmsg_ref("histedit", worktree, repo);
12888 		if (error)
12889 			goto done;
12890 	}
12891 
12892 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
12893 	if (error)
12894 		goto done;
12895 	if (rebase_in_progress) {
12896 		error = got_error(GOT_ERR_REBASING);
12897 		goto done;
12898 	}
12899 
12900 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12901 	    repo);
12902 	if (error)
12903 		goto done;
12904 	if (merge_in_progress) {
12905 		error = got_error(GOT_ERR_MERGE_BUSY);
12906 		goto done;
12907 	}
12908 
12909 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
12910 	if (error)
12911 		goto done;
12912 
12913 	if (edit_in_progress && edit_logmsg_only) {
12914 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12915 		    "histedit operation is in progress in this "
12916 		    "work tree and must be continued or aborted "
12917 		    "before the -m option can be used");
12918 		goto done;
12919 	}
12920 	if (edit_in_progress && drop_only) {
12921 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12922 		    "histedit operation is in progress in this "
12923 		    "work tree and must be continued or aborted "
12924 		    "before the -d option can be used");
12925 		goto done;
12926 	}
12927 	if (edit_in_progress && fold_only) {
12928 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12929 		    "histedit operation is in progress in this "
12930 		    "work tree and must be continued or aborted "
12931 		    "before the -f option can be used");
12932 		goto done;
12933 	}
12934 	if (edit_in_progress && edit_only) {
12935 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12936 		    "histedit operation is in progress in this "
12937 		    "work tree and must be continued or aborted "
12938 		    "before the -e option can be used");
12939 		goto done;
12940 	}
12941 
12942 	if (edit_in_progress && abort_edit) {
12943 		error = got_worktree_histedit_continue(&resume_commit_id,
12944 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
12945 		    worktree, repo);
12946 		if (error)
12947 			goto done;
12948 		printf("Switching work tree to %s\n",
12949 		    got_ref_get_symref_target(branch));
12950 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
12951 		    branch, base_commit_id, abort_progress, &upa);
12952 		if (error)
12953 			goto done;
12954 		printf("Histedit of %s aborted\n",
12955 		    got_ref_get_symref_target(branch));
12956 		print_merge_progress_stats(&upa);
12957 		goto done; /* nothing else to do */
12958 	} else if (abort_edit) {
12959 		error = got_error(GOT_ERR_NOT_HISTEDIT);
12960 		goto done;
12961 	}
12962 
12963 	error = get_author(&committer, repo, worktree);
12964 	if (error)
12965 		goto done;
12966 
12967 	if (continue_edit) {
12968 		char *path;
12969 
12970 		if (!edit_in_progress) {
12971 			error = got_error(GOT_ERR_NOT_HISTEDIT);
12972 			goto done;
12973 		}
12974 
12975 		error = got_worktree_get_histedit_script_path(&path, worktree);
12976 		if (error)
12977 			goto done;
12978 
12979 		error = histedit_load_list(&histedit_cmds, path, repo);
12980 		free(path);
12981 		if (error)
12982 			goto done;
12983 
12984 		error = got_worktree_histedit_continue(&resume_commit_id,
12985 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
12986 		    worktree, repo);
12987 		if (error)
12988 			goto done;
12989 
12990 		error = got_ref_resolve(&head_commit_id, repo, branch);
12991 		if (error)
12992 			goto done;
12993 
12994 		error = got_object_open_as_commit(&commit, repo,
12995 		    head_commit_id);
12996 		if (error)
12997 			goto done;
12998 		parent_ids = got_object_commit_get_parent_ids(commit);
12999 		pid = STAILQ_FIRST(parent_ids);
13000 		if (pid == NULL) {
13001 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13002 			goto done;
13003 		}
13004 		error = collect_commits(&commits, head_commit_id, &pid->id,
13005 		    base_commit_id, got_worktree_get_path_prefix(worktree),
13006 		    GOT_ERR_HISTEDIT_PATH, repo);
13007 		got_object_commit_close(commit);
13008 		commit = NULL;
13009 		if (error)
13010 			goto done;
13011 	} else {
13012 		if (edit_in_progress) {
13013 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
13014 			goto done;
13015 		}
13016 
13017 		error = got_ref_open(&branch, repo,
13018 		    got_worktree_get_head_ref_name(worktree), 0);
13019 		if (error != NULL)
13020 			goto done;
13021 
13022 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
13023 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
13024 			    "will not edit commit history of a branch outside "
13025 			    "the \"refs/heads/\" reference namespace");
13026 			goto done;
13027 		}
13028 
13029 		error = got_ref_resolve(&head_commit_id, repo, branch);
13030 		got_ref_close(branch);
13031 		branch = NULL;
13032 		if (error)
13033 			goto done;
13034 
13035 		error = got_object_open_as_commit(&commit, repo,
13036 		    head_commit_id);
13037 		if (error)
13038 			goto done;
13039 		parent_ids = got_object_commit_get_parent_ids(commit);
13040 		pid = STAILQ_FIRST(parent_ids);
13041 		if (pid == NULL) {
13042 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13043 			goto done;
13044 		}
13045 		error = collect_commits(&commits, head_commit_id, &pid->id,
13046 		    got_worktree_get_base_commit_id(worktree),
13047 		    got_worktree_get_path_prefix(worktree),
13048 		    GOT_ERR_HISTEDIT_PATH, repo);
13049 		got_object_commit_close(commit);
13050 		commit = NULL;
13051 		if (error)
13052 			goto done;
13053 
13054 		if (STAILQ_EMPTY(&commits)) {
13055 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
13056 			goto done;
13057 		}
13058 
13059 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
13060 		    &base_commit_id, &fileindex, worktree, repo);
13061 		if (error)
13062 			goto done;
13063 
13064 		if (edit_script_path) {
13065 			error = histedit_load_list(&histedit_cmds,
13066 			    edit_script_path, repo);
13067 			if (error) {
13068 				got_worktree_histedit_abort(worktree, fileindex,
13069 				    repo, branch, base_commit_id,
13070 				    abort_progress, &upa);
13071 				print_merge_progress_stats(&upa);
13072 				goto done;
13073 			}
13074 		} else {
13075 			const char *branch_name;
13076 			branch_name = got_ref_get_symref_target(branch);
13077 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
13078 				branch_name += 11;
13079 			error = histedit_edit_script(&histedit_cmds, &commits,
13080 			    branch_name, edit_logmsg_only, fold_only,
13081 			    drop_only, edit_only, editor, repo);
13082 			if (error) {
13083 				got_worktree_histedit_abort(worktree, fileindex,
13084 				    repo, branch, base_commit_id,
13085 				    abort_progress, &upa);
13086 				print_merge_progress_stats(&upa);
13087 				goto done;
13088 			}
13089 
13090 		}
13091 
13092 		error = histedit_save_list(&histedit_cmds, worktree,
13093 		    repo);
13094 		if (error) {
13095 			got_worktree_histedit_abort(worktree, fileindex,
13096 			    repo, branch, base_commit_id,
13097 			    abort_progress, &upa);
13098 			print_merge_progress_stats(&upa);
13099 			goto done;
13100 		}
13101 
13102 	}
13103 
13104 	error = histedit_check_script(&histedit_cmds, &commits, repo);
13105 	if (error)
13106 		goto done;
13107 
13108 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
13109 		if (resume_commit_id) {
13110 			if (got_object_id_cmp(hle->commit_id,
13111 			    resume_commit_id) != 0)
13112 				continue;
13113 
13114 			resume_commit_id = NULL;
13115 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
13116 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
13117 				error = histedit_skip_commit(hle, worktree,
13118 				    repo);
13119 				if (error)
13120 					goto done;
13121 			} else {
13122 				struct got_pathlist_head paths;
13123 				int have_changes = 0;
13124 
13125 				TAILQ_INIT(&paths);
13126 				error = got_pathlist_append(&paths, "", NULL);
13127 				if (error)
13128 					goto done;
13129 				error = got_worktree_status(worktree, &paths,
13130 				    repo, 0, check_local_changes, &have_changes,
13131 				    check_cancelled, NULL);
13132 				got_pathlist_free(&paths,
13133 				    GOT_PATHLIST_FREE_NONE);
13134 				if (error) {
13135 					if (error->code != GOT_ERR_CANCELLED)
13136 						goto done;
13137 					if (sigint_received || sigpipe_received)
13138 						goto done;
13139 				}
13140 				if (have_changes) {
13141 					error = histedit_commit(NULL, worktree,
13142 					    fileindex, tmp_branch, hle,
13143 					    committer, allow_conflict, editor,
13144 					    repo);
13145 					if (error)
13146 						goto done;
13147 				} else {
13148 					error = got_object_open_as_commit(
13149 					    &commit, repo, hle->commit_id);
13150 					if (error)
13151 						goto done;
13152 					error = show_histedit_progress(commit,
13153 					    hle, NULL);
13154 					got_object_commit_close(commit);
13155 					commit = NULL;
13156 					if (error)
13157 						goto done;
13158 				}
13159 			}
13160 			continue;
13161 		}
13162 
13163 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
13164 			error = histedit_skip_commit(hle, worktree, repo);
13165 			if (error)
13166 				goto done;
13167 			continue;
13168 		}
13169 		error = got_object_open_as_commit(&commit, repo,
13170 		    hle->commit_id);
13171 		if (error)
13172 			goto done;
13173 		parent_ids = got_object_commit_get_parent_ids(commit);
13174 		pid = STAILQ_FIRST(parent_ids);
13175 
13176 		error = got_worktree_histedit_merge_files(&merged_paths,
13177 		    worktree, fileindex, &pid->id, hle->commit_id, repo,
13178 		    update_progress, &upa, check_cancelled, NULL);
13179 		if (error)
13180 			goto done;
13181 		got_object_commit_close(commit);
13182 		commit = NULL;
13183 
13184 		print_merge_progress_stats(&upa);
13185 		if (upa.conflicts > 0 || upa.missing > 0 ||
13186 		    upa.not_deleted > 0 || upa.unversioned > 0) {
13187 			if (upa.conflicts > 0) {
13188 				error = show_rebase_merge_conflict(
13189 				    hle->commit_id, repo);
13190 				if (error)
13191 					goto done;
13192 			}
13193 			got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13194 			break;
13195 		}
13196 
13197 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
13198 			char *id_str;
13199 			error = got_object_id_str(&id_str, hle->commit_id);
13200 			if (error)
13201 				goto done;
13202 			printf("Stopping histedit for amending commit %s\n",
13203 			    id_str);
13204 			free(id_str);
13205 			got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13206 			error = got_worktree_histedit_postpone(worktree,
13207 			    fileindex);
13208 			goto done;
13209 		} else if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
13210 			error = histedit_skip_commit(hle, worktree, repo);
13211 			if (error)
13212 				goto done;
13213 			continue;
13214 		} else if (hle->cmd->code == GOT_HISTEDIT_MESG) {
13215 			error = histedit_edit_logmsg(hle, editor, repo);
13216 			if (error)
13217 				goto done;
13218 		}
13219 
13220 		error = histedit_commit(&merged_paths, worktree, fileindex,
13221 		    tmp_branch, hle, committer, allow_conflict, editor, repo);
13222 		got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13223 		if (error)
13224 			goto done;
13225 	}
13226 
13227 	if (upa.conflicts > 0 || upa.missing > 0 ||
13228 	    upa.not_deleted > 0 || upa.unversioned > 0) {
13229 		error = got_worktree_histedit_postpone(worktree, fileindex);
13230 		if (error)
13231 			goto done;
13232 		if (upa.conflicts > 0 && upa.missing == 0 &&
13233 		    upa.not_deleted == 0 && upa.unversioned == 0) {
13234 			error = got_error_msg(GOT_ERR_CONFLICTS,
13235 			    "conflicts must be resolved before histedit "
13236 			    "can continue");
13237 		} else if (upa.conflicts > 0) {
13238 			error = got_error_msg(GOT_ERR_CONFLICTS,
13239 			    "conflicts must be resolved before histedit "
13240 			    "can continue; changes destined for some "
13241 			    "files were not yet merged and should be "
13242 			    "merged manually if required before the "
13243 			    "histedit operation is continued");
13244 		} else {
13245 			error = got_error_msg(GOT_ERR_CONFLICTS,
13246 			    "changes destined for some files were not "
13247 			    "yet merged and should be merged manually "
13248 			    "if required before the histedit operation "
13249 			    "is continued");
13250 		}
13251 	} else
13252 		error = histedit_complete(worktree, fileindex, tmp_branch,
13253 		    branch, repo);
13254 done:
13255 	free(cwd);
13256 	free(editor);
13257 	free(committer);
13258 	free(gitconfig_path);
13259 	got_object_id_queue_free(&commits);
13260 	histedit_free_list(&histedit_cmds);
13261 	free(head_commit_id);
13262 	free(base_commit_id);
13263 	free(resume_commit_id);
13264 	if (commit)
13265 		got_object_commit_close(commit);
13266 	if (branch)
13267 		got_ref_close(branch);
13268 	if (tmp_branch)
13269 		got_ref_close(tmp_branch);
13270 	if (worktree)
13271 		got_worktree_close(worktree);
13272 	if (repo) {
13273 		const struct got_error *close_err = got_repo_close(repo);
13274 		if (error == NULL)
13275 			error = close_err;
13276 	}
13277 	if (pack_fds) {
13278 		const struct got_error *pack_err =
13279 		    got_repo_pack_fds_close(pack_fds);
13280 		if (error == NULL)
13281 			error = pack_err;
13282 	}
13283 	return error;
13284 }
13285 
13286 __dead static void
13287 usage_integrate(void)
13288 {
13289 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
13290 	exit(1);
13291 }
13292 
13293 static const struct got_error *
13294 cmd_integrate(int argc, char *argv[])
13295 {
13296 	const struct got_error *error = NULL;
13297 	struct got_repository *repo = NULL;
13298 	struct got_worktree *worktree = NULL;
13299 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
13300 	const char *branch_arg = NULL;
13301 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
13302 	struct got_fileindex *fileindex = NULL;
13303 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
13304 	int ch;
13305 	struct got_update_progress_arg upa;
13306 	int *pack_fds = NULL;
13307 
13308 #ifndef PROFILE
13309 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13310 	    "unveil", NULL) == -1)
13311 		err(1, "pledge");
13312 #endif
13313 
13314 	while ((ch = getopt(argc, argv, "")) != -1) {
13315 		switch (ch) {
13316 		default:
13317 			usage_integrate();
13318 			/* NOTREACHED */
13319 		}
13320 	}
13321 
13322 	argc -= optind;
13323 	argv += optind;
13324 
13325 	if (argc != 1)
13326 		usage_integrate();
13327 	branch_arg = argv[0];
13328 
13329 	cwd = getcwd(NULL, 0);
13330 	if (cwd == NULL) {
13331 		error = got_error_from_errno("getcwd");
13332 		goto done;
13333 	}
13334 
13335 	error = got_repo_pack_fds_open(&pack_fds);
13336 	if (error != NULL)
13337 		goto done;
13338 
13339 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13340 	if (error) {
13341 		if (error->code == GOT_ERR_NOT_WORKTREE)
13342 			error = wrap_not_worktree_error(error, "integrate",
13343 			    cwd);
13344 		goto done;
13345 	}
13346 
13347 	error = check_rebase_or_histedit_in_progress(worktree);
13348 	if (error)
13349 		goto done;
13350 
13351 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13352 	    NULL, pack_fds);
13353 	if (error != NULL)
13354 		goto done;
13355 
13356 	error = apply_unveil(got_repo_get_path(repo), 0,
13357 	    got_worktree_get_root_path(worktree));
13358 	if (error)
13359 		goto done;
13360 
13361 	error = check_merge_in_progress(worktree, repo);
13362 	if (error)
13363 		goto done;
13364 
13365 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
13366 		error = got_error_from_errno("asprintf");
13367 		goto done;
13368 	}
13369 
13370 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
13371 	    &base_branch_ref, worktree, refname, repo);
13372 	if (error)
13373 		goto done;
13374 
13375 	refname = strdup(got_ref_get_name(branch_ref));
13376 	if (refname == NULL) {
13377 		error = got_error_from_errno("strdup");
13378 		got_worktree_integrate_abort(worktree, fileindex, repo,
13379 		    branch_ref, base_branch_ref);
13380 		goto done;
13381 	}
13382 	base_refname = strdup(got_ref_get_name(base_branch_ref));
13383 	if (base_refname == NULL) {
13384 		error = got_error_from_errno("strdup");
13385 		got_worktree_integrate_abort(worktree, fileindex, repo,
13386 		    branch_ref, base_branch_ref);
13387 		goto done;
13388 	}
13389 	if (strncmp(base_refname, "refs/heads/", 11) != 0) {
13390 		error = got_error(GOT_ERR_INTEGRATE_BRANCH);
13391 		got_worktree_integrate_abort(worktree, fileindex, repo,
13392 		    branch_ref, base_branch_ref);
13393 		goto done;
13394 	}
13395 
13396 	error = got_ref_resolve(&commit_id, repo, branch_ref);
13397 	if (error)
13398 		goto done;
13399 
13400 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
13401 	if (error)
13402 		goto done;
13403 
13404 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
13405 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
13406 		    "specified branch has already been integrated");
13407 		got_worktree_integrate_abort(worktree, fileindex, repo,
13408 		    branch_ref, base_branch_ref);
13409 		goto done;
13410 	}
13411 
13412 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
13413 	if (error) {
13414 		if (error->code == GOT_ERR_ANCESTRY)
13415 			error = got_error(GOT_ERR_REBASE_REQUIRED);
13416 		got_worktree_integrate_abort(worktree, fileindex, repo,
13417 		    branch_ref, base_branch_ref);
13418 		goto done;
13419 	}
13420 
13421 	memset(&upa, 0, sizeof(upa));
13422 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
13423 	    branch_ref, base_branch_ref, update_progress, &upa,
13424 	    check_cancelled, NULL);
13425 	if (error)
13426 		goto done;
13427 
13428 	printf("Integrated %s into %s\n", refname, base_refname);
13429 	print_update_progress_stats(&upa);
13430 done:
13431 	if (repo) {
13432 		const struct got_error *close_err = got_repo_close(repo);
13433 		if (error == NULL)
13434 			error = close_err;
13435 	}
13436 	if (worktree)
13437 		got_worktree_close(worktree);
13438 	if (pack_fds) {
13439 		const struct got_error *pack_err =
13440 		    got_repo_pack_fds_close(pack_fds);
13441 		if (error == NULL)
13442 			error = pack_err;
13443 	}
13444 	free(cwd);
13445 	free(base_commit_id);
13446 	free(commit_id);
13447 	free(refname);
13448 	free(base_refname);
13449 	return error;
13450 }
13451 
13452 __dead static void
13453 usage_merge(void)
13454 {
13455 	fprintf(stderr, "usage: %s merge [-aCcn] [branch]\n", getprogname());
13456 	exit(1);
13457 }
13458 
13459 static const struct got_error *
13460 cmd_merge(int argc, char *argv[])
13461 {
13462 	const struct got_error *error = NULL;
13463 	struct got_worktree *worktree = NULL;
13464 	struct got_repository *repo = NULL;
13465 	struct got_fileindex *fileindex = NULL;
13466 	char *cwd = NULL, *id_str = NULL, *author = NULL;
13467 	char *gitconfig_path = NULL;
13468 	struct got_reference *branch = NULL, *wt_branch = NULL;
13469 	struct got_object_id *branch_tip = NULL, *yca_id = NULL;
13470 	struct got_object_id *wt_branch_tip = NULL;
13471 	int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
13472 	int allow_conflict = 0, prefer_fast_forward = 1, interrupt_merge = 0;
13473 	struct got_update_progress_arg upa;
13474 	struct got_object_id *merge_commit_id = NULL;
13475 	char *branch_name = NULL;
13476 	int *pack_fds = NULL;
13477 
13478 	memset(&upa, 0, sizeof(upa));
13479 
13480 #ifndef PROFILE
13481 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13482 	    "unveil", NULL) == -1)
13483 		err(1, "pledge");
13484 #endif
13485 
13486 	while ((ch = getopt(argc, argv, "aCcMn")) != -1) {
13487 		switch (ch) {
13488 		case 'a':
13489 			abort_merge = 1;
13490 			break;
13491 		case 'C':
13492 			allow_conflict = 1;
13493 			break;
13494 		case 'c':
13495 			continue_merge = 1;
13496 			break;
13497 		case 'M':
13498 			prefer_fast_forward = 0;
13499 			break;
13500 		case 'n':
13501 			interrupt_merge = 1;
13502 			break;
13503 		default:
13504 			usage_merge();
13505 			/* NOTREACHED */
13506 		}
13507 	}
13508 
13509 	argc -= optind;
13510 	argv += optind;
13511 
13512 	if (abort_merge) {
13513 		if (continue_merge)
13514 			option_conflict('a', 'c');
13515 		if (!prefer_fast_forward)
13516 			option_conflict('a', 'M');
13517 		if (interrupt_merge)
13518 			option_conflict('a', 'n');
13519 	} else if (continue_merge) {
13520 		if (!prefer_fast_forward)
13521 			option_conflict('c', 'M');
13522 		if (interrupt_merge)
13523 			option_conflict('c', 'n');
13524 	}
13525 	if (allow_conflict) {
13526 		if (!continue_merge)
13527 			errx(1, "-C option requires -c");
13528 	}
13529 	if (abort_merge || continue_merge) {
13530 		if (argc != 0)
13531 			usage_merge();
13532 	} else if (argc != 1)
13533 		usage_merge();
13534 
13535 	cwd = getcwd(NULL, 0);
13536 	if (cwd == NULL) {
13537 		error = got_error_from_errno("getcwd");
13538 		goto done;
13539 	}
13540 
13541 	error = got_repo_pack_fds_open(&pack_fds);
13542 	if (error != NULL)
13543 		goto done;
13544 
13545 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13546 	if (error) {
13547 		if (error->code == GOT_ERR_NOT_WORKTREE)
13548 			error = wrap_not_worktree_error(error,
13549 			    "merge", cwd);
13550 		goto done;
13551 	}
13552 
13553 	error = get_gitconfig_path(&gitconfig_path);
13554 	if (error)
13555 		goto done;
13556 	error = got_repo_open(&repo,
13557 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
13558 	    gitconfig_path, pack_fds);
13559 	if (error != NULL)
13560 		goto done;
13561 
13562 	if (worktree != NULL) {
13563 		error = worktree_has_logmsg_ref("merge", worktree, repo);
13564 		if (error)
13565 			goto done;
13566 	}
13567 
13568 	error = apply_unveil(got_repo_get_path(repo), 0,
13569 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
13570 	if (error)
13571 		goto done;
13572 
13573 	error = check_rebase_or_histedit_in_progress(worktree);
13574 	if (error)
13575 		goto done;
13576 
13577 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
13578 	    repo);
13579 	if (error)
13580 		goto done;
13581 
13582 	if (merge_in_progress && !(abort_merge || continue_merge)) {
13583 		error = got_error(GOT_ERR_MERGE_BUSY);
13584 		goto done;
13585 	}
13586 
13587 	if (!merge_in_progress && (abort_merge || continue_merge)) {
13588 		error = got_error(GOT_ERR_NOT_MERGING);
13589 		goto done;
13590 	}
13591 
13592 	if (abort_merge) {
13593 		error = got_worktree_merge_continue(&branch_name,
13594 		    &branch_tip, &fileindex, worktree, repo);
13595 		if (error)
13596 			goto done;
13597 		error = got_worktree_merge_abort(worktree, fileindex, repo,
13598 		    abort_progress, &upa);
13599 		if (error)
13600 			goto done;
13601 		printf("Merge of %s aborted\n", branch_name);
13602 		goto done; /* nothing else to do */
13603 	}
13604 
13605 	if (strncmp(got_worktree_get_head_ref_name(worktree),
13606 	    "refs/heads/", 11) != 0) {
13607 		error = got_error_fmt(GOT_ERR_COMMIT_BRANCH,
13608 		    "work tree's current branch %s is outside the "
13609 		    "\"refs/heads/\" reference namespace; "
13610 		    "update -b required",
13611 		    got_worktree_get_head_ref_name(worktree));
13612 		goto done;
13613 	}
13614 
13615 	error = get_author(&author, repo, worktree);
13616 	if (error)
13617 		goto done;
13618 
13619 	error = got_ref_open(&wt_branch, repo,
13620 	    got_worktree_get_head_ref_name(worktree), 0);
13621 	if (error)
13622 		goto done;
13623 	error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
13624 	if (error)
13625 		goto done;
13626 
13627 	if (continue_merge) {
13628 		struct got_object_id *base_commit_id;
13629 		base_commit_id = got_worktree_get_base_commit_id(worktree);
13630 		if (got_object_id_cmp(wt_branch_tip, base_commit_id) != 0) {
13631 			error = got_error(GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
13632 			goto done;
13633 		}
13634 		error = got_worktree_merge_continue(&branch_name,
13635 		    &branch_tip, &fileindex, worktree, repo);
13636 		if (error)
13637 			goto done;
13638 	} else {
13639 		error = got_ref_open(&branch, repo, argv[0], 0);
13640 		if (error != NULL)
13641 			goto done;
13642 		branch_name = strdup(got_ref_get_name(branch));
13643 		if (branch_name == NULL) {
13644 			error = got_error_from_errno("strdup");
13645 			goto done;
13646 		}
13647 		error = got_ref_resolve(&branch_tip, repo, branch);
13648 		if (error)
13649 			goto done;
13650 	}
13651 
13652 	error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
13653 	    wt_branch_tip, branch_tip, 0, 0, repo,
13654 	    check_cancelled, NULL);
13655 	if (error && error->code != GOT_ERR_ANCESTRY)
13656 		goto done;
13657 
13658 	if (!continue_merge) {
13659 		error = check_path_prefix(wt_branch_tip, branch_tip,
13660 		    got_worktree_get_path_prefix(worktree),
13661 		    GOT_ERR_MERGE_PATH, repo);
13662 		if (error)
13663 			goto done;
13664 		error = got_worktree_merge_prepare(&fileindex, worktree, repo);
13665 		if (error)
13666 			goto done;
13667 		if (prefer_fast_forward && yca_id &&
13668 		    got_object_id_cmp(wt_branch_tip, yca_id) == 0) {
13669 			struct got_pathlist_head paths;
13670 			if (interrupt_merge) {
13671 				error = got_error_fmt(GOT_ERR_BAD_OPTION,
13672 				    "there are no changes to merge since %s "
13673 				    "is already based on %s; merge cannot be "
13674 				    "interrupted for amending; -n",
13675 				    branch_name, got_ref_get_name(wt_branch));
13676 				goto done;
13677 			}
13678 			printf("Forwarding %s to %s\n",
13679 				got_ref_get_name(wt_branch), branch_name);
13680 			error = got_ref_change_ref(wt_branch, branch_tip);
13681 			if (error)
13682 				goto done;
13683 			error = got_ref_write(wt_branch, repo);
13684 			if (error)
13685 				goto done;
13686 			error = got_worktree_set_base_commit_id(worktree, repo,
13687 			    branch_tip);
13688 			if (error)
13689 				goto done;
13690 			TAILQ_INIT(&paths);
13691 			error = got_pathlist_append(&paths, "", NULL);
13692 			if (error)
13693 				goto done;
13694 			error = got_worktree_checkout_files(worktree,
13695 			    &paths, repo, update_progress, &upa,
13696 			    check_cancelled, NULL);
13697 			got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
13698 			if (error)
13699 				goto done;
13700 			if (upa.did_something) {
13701 				char *id_str;
13702 				error = got_object_id_str(&id_str, branch_tip);
13703 				if (error)
13704 					goto done;
13705 				printf("Updated to commit %s\n", id_str);
13706 				free(id_str);
13707 			} else
13708 				printf("Already up-to-date\n");
13709 			print_update_progress_stats(&upa);
13710 			goto done;
13711 		}
13712 		error = got_worktree_merge_write_refs(worktree, branch, repo);
13713 		if (error)
13714 			goto done;
13715 
13716 		error = got_worktree_merge_branch(worktree, fileindex,
13717 		    yca_id, branch_tip, repo, update_progress, &upa,
13718 		    check_cancelled, NULL);
13719 		if (error)
13720 			goto done;
13721 		print_merge_progress_stats(&upa);
13722 		if (!upa.did_something) {
13723 			error = got_worktree_merge_abort(worktree, fileindex,
13724 			    repo, abort_progress, &upa);
13725 			if (error)
13726 				goto done;
13727 			printf("Already up-to-date\n");
13728 			goto done;
13729 		}
13730 	}
13731 
13732 	if (interrupt_merge) {
13733 		error = got_worktree_merge_postpone(worktree, fileindex);
13734 		if (error)
13735 			goto done;
13736 		printf("Merge of %s interrupted on request\n", branch_name);
13737 	} else if (upa.conflicts > 0 || upa.missing > 0 ||
13738 	    upa.not_deleted > 0 || upa.unversioned > 0) {
13739 		error = got_worktree_merge_postpone(worktree, fileindex);
13740 		if (error)
13741 			goto done;
13742 		if (upa.conflicts > 0 && upa.missing == 0 &&
13743 		    upa.not_deleted == 0 && upa.unversioned == 0) {
13744 			error = got_error_msg(GOT_ERR_CONFLICTS,
13745 			    "conflicts must be resolved before merging "
13746 			    "can continue");
13747 		} else if (upa.conflicts > 0) {
13748 			error = got_error_msg(GOT_ERR_CONFLICTS,
13749 			    "conflicts must be resolved before merging "
13750 			    "can continue; changes destined for some "
13751 			    "files were not yet merged and "
13752 			    "should be merged manually if required before the "
13753 			    "merge operation is continued");
13754 		} else {
13755 			error = got_error_msg(GOT_ERR_CONFLICTS,
13756 			    "changes destined for some "
13757 			    "files were not yet merged and should be "
13758 			    "merged manually if required before the "
13759 			    "merge operation is continued");
13760 		}
13761 		goto done;
13762 	} else {
13763 		error = got_worktree_merge_commit(&merge_commit_id, worktree,
13764 		    fileindex, author, NULL, 1, branch_tip, branch_name,
13765 		    allow_conflict, repo, continue_merge ? print_status : NULL,
13766 		    NULL);
13767 		if (error)
13768 			goto done;
13769 		error = got_worktree_merge_complete(worktree, fileindex, repo);
13770 		if (error)
13771 			goto done;
13772 		error = got_object_id_str(&id_str, merge_commit_id);
13773 		if (error)
13774 			goto done;
13775 		printf("Merged %s into %s: %s\n", branch_name,
13776 		    got_worktree_get_head_ref_name(worktree),
13777 		    id_str);
13778 
13779 	}
13780 done:
13781 	free(gitconfig_path);
13782 	free(id_str);
13783 	free(merge_commit_id);
13784 	free(author);
13785 	free(branch_tip);
13786 	free(branch_name);
13787 	free(yca_id);
13788 	if (branch)
13789 		got_ref_close(branch);
13790 	if (wt_branch)
13791 		got_ref_close(wt_branch);
13792 	if (worktree)
13793 		got_worktree_close(worktree);
13794 	if (repo) {
13795 		const struct got_error *close_err = got_repo_close(repo);
13796 		if (error == NULL)
13797 			error = close_err;
13798 	}
13799 	if (pack_fds) {
13800 		const struct got_error *pack_err =
13801 		    got_repo_pack_fds_close(pack_fds);
13802 		if (error == NULL)
13803 			error = pack_err;
13804 	}
13805 	return error;
13806 }
13807 
13808 __dead static void
13809 usage_stage(void)
13810 {
13811 	fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
13812 	    "[path ...]\n", getprogname());
13813 	exit(1);
13814 }
13815 
13816 static const struct got_error *
13817 print_stage(void *arg, unsigned char status, unsigned char staged_status,
13818     const char *path, struct got_object_id *blob_id,
13819     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
13820     int dirfd, const char *de_name)
13821 {
13822 	const struct got_error *err = NULL;
13823 	char *id_str = NULL;
13824 
13825 	if (staged_status != GOT_STATUS_ADD &&
13826 	    staged_status != GOT_STATUS_MODIFY &&
13827 	    staged_status != GOT_STATUS_DELETE)
13828 		return NULL;
13829 
13830 	if (staged_status == GOT_STATUS_ADD ||
13831 	    staged_status == GOT_STATUS_MODIFY)
13832 		err = got_object_id_str(&id_str, staged_blob_id);
13833 	else
13834 		err = got_object_id_str(&id_str, blob_id);
13835 	if (err)
13836 		return err;
13837 
13838 	printf("%s %c %s\n", id_str, staged_status, path);
13839 	free(id_str);
13840 	return NULL;
13841 }
13842 
13843 static const struct got_error *
13844 cmd_stage(int argc, char *argv[])
13845 {
13846 	const struct got_error *error = NULL;
13847 	struct got_repository *repo = NULL;
13848 	struct got_worktree *worktree = NULL;
13849 	char *cwd = NULL;
13850 	struct got_pathlist_head paths;
13851 	int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
13852 	FILE *patch_script_file = NULL;
13853 	const char *patch_script_path = NULL;
13854 	struct choose_patch_arg cpa;
13855 	int *pack_fds = NULL;
13856 
13857 	TAILQ_INIT(&paths);
13858 
13859 #ifndef PROFILE
13860 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13861 	    "unveil", NULL) == -1)
13862 		err(1, "pledge");
13863 #endif
13864 
13865 	while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
13866 		switch (ch) {
13867 		case 'F':
13868 			patch_script_path = optarg;
13869 			break;
13870 		case 'l':
13871 			list_stage = 1;
13872 			break;
13873 		case 'p':
13874 			pflag = 1;
13875 			break;
13876 		case 'S':
13877 			allow_bad_symlinks = 1;
13878 			break;
13879 		default:
13880 			usage_stage();
13881 			/* NOTREACHED */
13882 		}
13883 	}
13884 
13885 	argc -= optind;
13886 	argv += optind;
13887 
13888 	if (list_stage && (pflag || patch_script_path))
13889 		errx(1, "-l option cannot be used with other options");
13890 	if (patch_script_path && !pflag)
13891 		errx(1, "-F option can only be used together with -p option");
13892 
13893 	cwd = getcwd(NULL, 0);
13894 	if (cwd == NULL) {
13895 		error = got_error_from_errno("getcwd");
13896 		goto done;
13897 	}
13898 
13899 	error = got_repo_pack_fds_open(&pack_fds);
13900 	if (error != NULL)
13901 		goto done;
13902 
13903 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13904 	if (error) {
13905 		if (error->code == GOT_ERR_NOT_WORKTREE)
13906 			error = wrap_not_worktree_error(error, "stage", cwd);
13907 		goto done;
13908 	}
13909 
13910 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13911 	    NULL, pack_fds);
13912 	if (error != NULL)
13913 		goto done;
13914 
13915 	if (patch_script_path) {
13916 		patch_script_file = fopen(patch_script_path, "re");
13917 		if (patch_script_file == NULL) {
13918 			error = got_error_from_errno2("fopen",
13919 			    patch_script_path);
13920 			goto done;
13921 		}
13922 	}
13923 	error = apply_unveil(got_repo_get_path(repo), 0,
13924 	    got_worktree_get_root_path(worktree));
13925 	if (error)
13926 		goto done;
13927 
13928 	error = check_merge_in_progress(worktree, repo);
13929 	if (error)
13930 		goto done;
13931 
13932 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13933 	if (error)
13934 		goto done;
13935 
13936 	if (list_stage)
13937 		error = got_worktree_status(worktree, &paths, repo, 0,
13938 		    print_stage, NULL, check_cancelled, NULL);
13939 	else {
13940 		cpa.patch_script_file = patch_script_file;
13941 		cpa.action = "stage";
13942 		error = got_worktree_stage(worktree, &paths,
13943 		    pflag ? NULL : print_status, NULL,
13944 		    pflag ? choose_patch : NULL, &cpa,
13945 		    allow_bad_symlinks, repo);
13946 	}
13947 done:
13948 	if (patch_script_file && fclose(patch_script_file) == EOF &&
13949 	    error == NULL)
13950 		error = got_error_from_errno2("fclose", patch_script_path);
13951 	if (repo) {
13952 		const struct got_error *close_err = got_repo_close(repo);
13953 		if (error == NULL)
13954 			error = close_err;
13955 	}
13956 	if (worktree)
13957 		got_worktree_close(worktree);
13958 	if (pack_fds) {
13959 		const struct got_error *pack_err =
13960 		    got_repo_pack_fds_close(pack_fds);
13961 		if (error == NULL)
13962 			error = pack_err;
13963 	}
13964 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13965 	free(cwd);
13966 	return error;
13967 }
13968 
13969 __dead static void
13970 usage_unstage(void)
13971 {
13972 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
13973 	    "[path ...]\n", getprogname());
13974 	exit(1);
13975 }
13976 
13977 
13978 static const struct got_error *
13979 cmd_unstage(int argc, char *argv[])
13980 {
13981 	const struct got_error *error = NULL;
13982 	struct got_repository *repo = NULL;
13983 	struct got_worktree *worktree = NULL;
13984 	char *cwd = NULL;
13985 	struct got_pathlist_head paths;
13986 	int ch, pflag = 0;
13987 	struct got_update_progress_arg upa;
13988 	FILE *patch_script_file = NULL;
13989 	const char *patch_script_path = NULL;
13990 	struct choose_patch_arg cpa;
13991 	int *pack_fds = NULL;
13992 
13993 	TAILQ_INIT(&paths);
13994 
13995 #ifndef PROFILE
13996 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13997 	    "unveil", NULL) == -1)
13998 		err(1, "pledge");
13999 #endif
14000 
14001 	while ((ch = getopt(argc, argv, "F:p")) != -1) {
14002 		switch (ch) {
14003 		case 'F':
14004 			patch_script_path = optarg;
14005 			break;
14006 		case 'p':
14007 			pflag = 1;
14008 			break;
14009 		default:
14010 			usage_unstage();
14011 			/* NOTREACHED */
14012 		}
14013 	}
14014 
14015 	argc -= optind;
14016 	argv += optind;
14017 
14018 	if (patch_script_path && !pflag)
14019 		errx(1, "-F option can only be used together with -p option");
14020 
14021 	cwd = getcwd(NULL, 0);
14022 	if (cwd == NULL) {
14023 		error = got_error_from_errno("getcwd");
14024 		goto done;
14025 	}
14026 
14027 	error = got_repo_pack_fds_open(&pack_fds);
14028 	if (error != NULL)
14029 		goto done;
14030 
14031 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14032 	if (error) {
14033 		if (error->code == GOT_ERR_NOT_WORKTREE)
14034 			error = wrap_not_worktree_error(error, "unstage", cwd);
14035 		goto done;
14036 	}
14037 
14038 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
14039 	    NULL, pack_fds);
14040 	if (error != NULL)
14041 		goto done;
14042 
14043 	if (patch_script_path) {
14044 		patch_script_file = fopen(patch_script_path, "re");
14045 		if (patch_script_file == NULL) {
14046 			error = got_error_from_errno2("fopen",
14047 			    patch_script_path);
14048 			goto done;
14049 		}
14050 	}
14051 
14052 	error = apply_unveil(got_repo_get_path(repo), 0,
14053 	    got_worktree_get_root_path(worktree));
14054 	if (error)
14055 		goto done;
14056 
14057 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
14058 	if (error)
14059 		goto done;
14060 
14061 	cpa.patch_script_file = patch_script_file;
14062 	cpa.action = "unstage";
14063 	memset(&upa, 0, sizeof(upa));
14064 	error = got_worktree_unstage(worktree, &paths, update_progress,
14065 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
14066 	if (!error)
14067 		print_merge_progress_stats(&upa);
14068 done:
14069 	if (patch_script_file && fclose(patch_script_file) == EOF &&
14070 	    error == NULL)
14071 		error = got_error_from_errno2("fclose", patch_script_path);
14072 	if (repo) {
14073 		const struct got_error *close_err = got_repo_close(repo);
14074 		if (error == NULL)
14075 			error = close_err;
14076 	}
14077 	if (worktree)
14078 		got_worktree_close(worktree);
14079 	if (pack_fds) {
14080 		const struct got_error *pack_err =
14081 		    got_repo_pack_fds_close(pack_fds);
14082 		if (error == NULL)
14083 			error = pack_err;
14084 	}
14085 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
14086 	free(cwd);
14087 	return error;
14088 }
14089 
14090 __dead static void
14091 usage_cat(void)
14092 {
14093 	fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
14094 	    "arg ...\n", getprogname());
14095 	exit(1);
14096 }
14097 
14098 static const struct got_error *
14099 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14100 {
14101 	const struct got_error *err;
14102 	struct got_blob_object *blob;
14103 	int fd = -1;
14104 
14105 	fd = got_opentempfd();
14106 	if (fd == -1)
14107 		return got_error_from_errno("got_opentempfd");
14108 
14109 	err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
14110 	if (err)
14111 		goto done;
14112 
14113 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
14114 done:
14115 	if (fd != -1 && close(fd) == -1 && err == NULL)
14116 		err = got_error_from_errno("close");
14117 	if (blob)
14118 		got_object_blob_close(blob);
14119 	return err;
14120 }
14121 
14122 static const struct got_error *
14123 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14124 {
14125 	const struct got_error *err;
14126 	struct got_tree_object *tree;
14127 	int nentries, i;
14128 
14129 	err = got_object_open_as_tree(&tree, repo, id);
14130 	if (err)
14131 		return err;
14132 
14133 	nentries = got_object_tree_get_nentries(tree);
14134 	for (i = 0; i < nentries; i++) {
14135 		struct got_tree_entry *te;
14136 		char *id_str;
14137 		if (sigint_received || sigpipe_received)
14138 			break;
14139 		te = got_object_tree_get_entry(tree, i);
14140 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
14141 		if (err)
14142 			break;
14143 		fprintf(outfile, "%s %.7o %s\n", id_str,
14144 		    got_tree_entry_get_mode(te),
14145 		    got_tree_entry_get_name(te));
14146 		free(id_str);
14147 	}
14148 
14149 	got_object_tree_close(tree);
14150 	return err;
14151 }
14152 
14153 static const struct got_error *
14154 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14155 {
14156 	const struct got_error *err;
14157 	struct got_commit_object *commit;
14158 	const struct got_object_id_queue *parent_ids;
14159 	struct got_object_qid *pid;
14160 	char *id_str = NULL;
14161 	const char *logmsg = NULL;
14162 	char gmtoff[6];
14163 
14164 	err = got_object_open_as_commit(&commit, repo, id);
14165 	if (err)
14166 		return err;
14167 
14168 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
14169 	if (err)
14170 		goto done;
14171 
14172 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
14173 	parent_ids = got_object_commit_get_parent_ids(commit);
14174 	fprintf(outfile, "numparents %d\n",
14175 	    got_object_commit_get_nparents(commit));
14176 	STAILQ_FOREACH(pid, parent_ids, entry) {
14177 		char *pid_str;
14178 		err = got_object_id_str(&pid_str, &pid->id);
14179 		if (err)
14180 			goto done;
14181 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
14182 		free(pid_str);
14183 	}
14184 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14185 	    got_object_commit_get_author_gmtoff(commit));
14186 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
14187 	    got_object_commit_get_author(commit),
14188 	    (long long)got_object_commit_get_author_time(commit),
14189 	    gmtoff);
14190 
14191 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14192 	    got_object_commit_get_committer_gmtoff(commit));
14193 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
14194 	    got_object_commit_get_committer(commit),
14195 	    (long long)got_object_commit_get_committer_time(commit),
14196 	    gmtoff);
14197 
14198 	logmsg = got_object_commit_get_logmsg_raw(commit);
14199 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
14200 	fprintf(outfile, "%s", logmsg);
14201 done:
14202 	free(id_str);
14203 	got_object_commit_close(commit);
14204 	return err;
14205 }
14206 
14207 static const struct got_error *
14208 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14209 {
14210 	const struct got_error *err;
14211 	struct got_tag_object *tag;
14212 	char *id_str = NULL;
14213 	const char *tagmsg = NULL;
14214 	char gmtoff[6];
14215 
14216 	err = got_object_open_as_tag(&tag, repo, id);
14217 	if (err)
14218 		return err;
14219 
14220 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
14221 	if (err)
14222 		goto done;
14223 
14224 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
14225 
14226 	switch (got_object_tag_get_object_type(tag)) {
14227 	case GOT_OBJ_TYPE_BLOB:
14228 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14229 		    GOT_OBJ_LABEL_BLOB);
14230 		break;
14231 	case GOT_OBJ_TYPE_TREE:
14232 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14233 		    GOT_OBJ_LABEL_TREE);
14234 		break;
14235 	case GOT_OBJ_TYPE_COMMIT:
14236 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14237 		    GOT_OBJ_LABEL_COMMIT);
14238 		break;
14239 	case GOT_OBJ_TYPE_TAG:
14240 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14241 		    GOT_OBJ_LABEL_TAG);
14242 		break;
14243 	default:
14244 		break;
14245 	}
14246 
14247 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
14248 	    got_object_tag_get_name(tag));
14249 
14250 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14251 	    got_object_tag_get_tagger_gmtoff(tag));
14252 	fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
14253 	    got_object_tag_get_tagger(tag),
14254 	    (long long)got_object_tag_get_tagger_time(tag),
14255 	    gmtoff);
14256 
14257 	tagmsg = got_object_tag_get_message(tag);
14258 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
14259 	fprintf(outfile, "%s", tagmsg);
14260 done:
14261 	free(id_str);
14262 	got_object_tag_close(tag);
14263 	return err;
14264 }
14265 
14266 static const struct got_error *
14267 cmd_cat(int argc, char *argv[])
14268 {
14269 	const struct got_error *error;
14270 	struct got_repository *repo = NULL;
14271 	struct got_worktree *worktree = NULL;
14272 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
14273 	char *keyword_idstr = NULL;
14274 	const char *commit_id_str = NULL;
14275 	struct got_object_id *id = NULL, *commit_id = NULL;
14276 	struct got_commit_object *commit = NULL;
14277 	int ch, obj_type, i, force_path = 0;
14278 	struct got_reflist_head refs;
14279 	int *pack_fds = NULL;
14280 
14281 	TAILQ_INIT(&refs);
14282 
14283 #ifndef PROFILE
14284 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14285 	    NULL) == -1)
14286 		err(1, "pledge");
14287 #endif
14288 
14289 	while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
14290 		switch (ch) {
14291 		case 'c':
14292 			commit_id_str = optarg;
14293 			break;
14294 		case 'P':
14295 			force_path = 1;
14296 			break;
14297 		case 'r':
14298 			repo_path = realpath(optarg, NULL);
14299 			if (repo_path == NULL)
14300 				return got_error_from_errno2("realpath",
14301 				    optarg);
14302 			got_path_strip_trailing_slashes(repo_path);
14303 			break;
14304 		default:
14305 			usage_cat();
14306 			/* NOTREACHED */
14307 		}
14308 	}
14309 
14310 	argc -= optind;
14311 	argv += optind;
14312 
14313 	cwd = getcwd(NULL, 0);
14314 	if (cwd == NULL) {
14315 		error = got_error_from_errno("getcwd");
14316 		goto done;
14317 	}
14318 
14319 	error = got_repo_pack_fds_open(&pack_fds);
14320 	if (error != NULL)
14321 		goto done;
14322 
14323 	if (repo_path == NULL) {
14324 		error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14325 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
14326 			goto done;
14327 		if (worktree) {
14328 			repo_path = strdup(
14329 			    got_worktree_get_repo_path(worktree));
14330 			if (repo_path == NULL) {
14331 				error = got_error_from_errno("strdup");
14332 				goto done;
14333 			}
14334 
14335 			if (commit_id_str == NULL) {
14336 				/* Release work tree lock. */
14337 				got_worktree_close(worktree);
14338 				worktree = NULL;
14339 			}
14340 		}
14341 	}
14342 
14343 	if (repo_path == NULL) {
14344 		repo_path = strdup(cwd);
14345 		if (repo_path == NULL)
14346 			return got_error_from_errno("strdup");
14347 	}
14348 
14349 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
14350 	free(repo_path);
14351 	if (error != NULL)
14352 		goto done;
14353 
14354 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
14355 	if (error)
14356 		goto done;
14357 
14358 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
14359 	if (error)
14360 		goto done;
14361 
14362 	if (commit_id_str != NULL) {
14363 		error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
14364 		    repo, worktree);
14365 		if (error != NULL)
14366 			goto done;
14367 		if (keyword_idstr != NULL)
14368 			commit_id_str = keyword_idstr;
14369 		if (worktree != NULL) {
14370 			got_worktree_close(worktree);
14371 			worktree = NULL;
14372 		}
14373 	} else
14374 		commit_id_str = GOT_REF_HEAD;
14375 	error = got_repo_match_object_id(&commit_id, NULL,
14376 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
14377 	if (error)
14378 		goto done;
14379 
14380 	error = got_object_open_as_commit(&commit, repo, commit_id);
14381 	if (error)
14382 		goto done;
14383 
14384 	for (i = 0; i < argc; i++) {
14385 		if (force_path) {
14386 			error = got_object_id_by_path(&id, repo, commit,
14387 			    argv[i]);
14388 			if (error)
14389 				break;
14390 		} else {
14391 			error = got_repo_match_object_id(&id, &label, argv[i],
14392 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
14393 			    repo);
14394 			if (error) {
14395 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
14396 				    error->code != GOT_ERR_NOT_REF)
14397 					break;
14398 				error = got_object_id_by_path(&id, repo,
14399 				    commit, argv[i]);
14400 				if (error)
14401 					break;
14402 			}
14403 		}
14404 
14405 		error = got_object_get_type(&obj_type, repo, id);
14406 		if (error)
14407 			break;
14408 
14409 		switch (obj_type) {
14410 		case GOT_OBJ_TYPE_BLOB:
14411 			error = cat_blob(id, repo, stdout);
14412 			break;
14413 		case GOT_OBJ_TYPE_TREE:
14414 			error = cat_tree(id, repo, stdout);
14415 			break;
14416 		case GOT_OBJ_TYPE_COMMIT:
14417 			error = cat_commit(id, repo, stdout);
14418 			break;
14419 		case GOT_OBJ_TYPE_TAG:
14420 			error = cat_tag(id, repo, stdout);
14421 			break;
14422 		default:
14423 			error = got_error(GOT_ERR_OBJ_TYPE);
14424 			break;
14425 		}
14426 		if (error)
14427 			break;
14428 		free(label);
14429 		label = NULL;
14430 		free(id);
14431 		id = NULL;
14432 	}
14433 done:
14434 	free(label);
14435 	free(id);
14436 	free(commit_id);
14437 	free(keyword_idstr);
14438 	if (commit)
14439 		got_object_commit_close(commit);
14440 	if (worktree)
14441 		got_worktree_close(worktree);
14442 	if (repo) {
14443 		const struct got_error *close_err = got_repo_close(repo);
14444 		if (error == NULL)
14445 			error = close_err;
14446 	}
14447 	if (pack_fds) {
14448 		const struct got_error *pack_err =
14449 		    got_repo_pack_fds_close(pack_fds);
14450 		if (error == NULL)
14451 			error = pack_err;
14452 	}
14453 
14454 	got_ref_list_free(&refs);
14455 	return error;
14456 }
14457 
14458 __dead static void
14459 usage_info(void)
14460 {
14461 	fprintf(stderr, "usage: %s info [path ...]\n",
14462 	    getprogname());
14463 	exit(1);
14464 }
14465 
14466 static const struct got_error *
14467 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
14468     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
14469     struct got_object_id *commit_id)
14470 {
14471 	const struct got_error *err = NULL;
14472 	char *id_str = NULL;
14473 	char datebuf[128];
14474 	struct tm mytm, *tm;
14475 	struct got_pathlist_head *paths = arg;
14476 	struct got_pathlist_entry *pe;
14477 
14478 	/*
14479 	 * Clear error indication from any of the path arguments which
14480 	 * would cause this file index entry to be displayed.
14481 	 */
14482 	TAILQ_FOREACH(pe, paths, entry) {
14483 		if (got_path_cmp(path, pe->path, strlen(path),
14484 		    pe->path_len) == 0 ||
14485 		    got_path_is_child(path, pe->path, pe->path_len))
14486 			pe->data = NULL; /* no error */
14487 	}
14488 
14489 	printf(GOT_COMMIT_SEP_STR);
14490 	if (S_ISLNK(mode))
14491 		printf("symlink: %s\n", path);
14492 	else if (S_ISREG(mode)) {
14493 		printf("file: %s\n", path);
14494 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
14495 	} else if (S_ISDIR(mode))
14496 		printf("directory: %s\n", path);
14497 	else
14498 		printf("something: %s\n", path);
14499 
14500 	tm = localtime_r(&mtime, &mytm);
14501 	if (tm == NULL)
14502 		return NULL;
14503 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
14504 		return got_error(GOT_ERR_NO_SPACE);
14505 	printf("timestamp: %s\n", datebuf);
14506 
14507 	if (blob_id) {
14508 		err = got_object_id_str(&id_str, blob_id);
14509 		if (err)
14510 			return err;
14511 		printf("based on blob: %s\n", id_str);
14512 		free(id_str);
14513 	}
14514 
14515 	if (staged_blob_id) {
14516 		err = got_object_id_str(&id_str, staged_blob_id);
14517 		if (err)
14518 			return err;
14519 		printf("based on staged blob: %s\n", id_str);
14520 		free(id_str);
14521 	}
14522 
14523 	if (commit_id) {
14524 		err = got_object_id_str(&id_str, commit_id);
14525 		if (err)
14526 			return err;
14527 		printf("based on commit: %s\n", id_str);
14528 		free(id_str);
14529 	}
14530 
14531 	return NULL;
14532 }
14533 
14534 static const struct got_error *
14535 cmd_info(int argc, char *argv[])
14536 {
14537 	const struct got_error *error = NULL;
14538 	struct got_worktree *worktree = NULL;
14539 	char *cwd = NULL, *id_str = NULL;
14540 	struct got_pathlist_head paths;
14541 	char *uuidstr = NULL;
14542 	int ch, show_files = 0;
14543 
14544 	TAILQ_INIT(&paths);
14545 
14546 #ifndef PROFILE
14547 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14548 	    NULL) == -1)
14549 		err(1, "pledge");
14550 #endif
14551 
14552 	while ((ch = getopt(argc, argv, "")) != -1) {
14553 		switch (ch) {
14554 		default:
14555 			usage_info();
14556 			/* NOTREACHED */
14557 		}
14558 	}
14559 
14560 	argc -= optind;
14561 	argv += optind;
14562 
14563 	cwd = getcwd(NULL, 0);
14564 	if (cwd == NULL) {
14565 		error = got_error_from_errno("getcwd");
14566 		goto done;
14567 	}
14568 
14569 	error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14570 	if (error) {
14571 		if (error->code == GOT_ERR_NOT_WORKTREE)
14572 			error = wrap_not_worktree_error(error, "info", cwd);
14573 		goto done;
14574 	}
14575 
14576 #ifndef PROFILE
14577 	/* Remove "wpath cpath proc exec sendfd" promises. */
14578 	if (pledge("stdio rpath flock unveil", NULL) == -1)
14579 		err(1, "pledge");
14580 #endif
14581 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
14582 	if (error)
14583 		goto done;
14584 
14585 	if (argc >= 1) {
14586 		error = get_worktree_paths_from_argv(&paths, argc, argv,
14587 		    worktree);
14588 		if (error)
14589 			goto done;
14590 		show_files = 1;
14591 	}
14592 
14593 	error = got_object_id_str(&id_str,
14594 	    got_worktree_get_base_commit_id(worktree));
14595 	if (error)
14596 		goto done;
14597 
14598 	error = got_worktree_get_uuid(&uuidstr, worktree);
14599 	if (error)
14600 		goto done;
14601 
14602 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
14603 	printf("work tree base commit: %s\n", id_str);
14604 	printf("work tree path prefix: %s\n",
14605 	    got_worktree_get_path_prefix(worktree));
14606 	printf("work tree branch reference: %s\n",
14607 	    got_worktree_get_head_ref_name(worktree));
14608 	printf("work tree UUID: %s\n", uuidstr);
14609 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
14610 
14611 	if (show_files) {
14612 		struct got_pathlist_entry *pe;
14613 		TAILQ_FOREACH(pe, &paths, entry) {
14614 			if (pe->path_len == 0)
14615 				continue;
14616 			/*
14617 			 * Assume this path will fail. This will be corrected
14618 			 * in print_path_info() in case the path does suceeed.
14619 			 */
14620 			pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
14621 		}
14622 		error = got_worktree_path_info(worktree, &paths,
14623 		    print_path_info, &paths, check_cancelled, NULL);
14624 		if (error)
14625 			goto done;
14626 		TAILQ_FOREACH(pe, &paths, entry) {
14627 			if (pe->data != NULL) {
14628 				const struct got_error *perr;
14629 
14630 				perr = pe->data;
14631 				error = got_error_fmt(perr->code, "%s",
14632 				    pe->path);
14633 				break;
14634 			}
14635 		}
14636 	}
14637 done:
14638 	if (worktree)
14639 		got_worktree_close(worktree);
14640 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
14641 	free(cwd);
14642 	free(id_str);
14643 	free(uuidstr);
14644 	return error;
14645 }