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