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