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