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  * Copyright (C) 2023 Josh Rickmar <jrick@zettaport.com>
6  *
7  * Permission to use, copy, modify, and distribute this software for any
8  * purpose with or without fee is hereby granted, provided that the above
9  * copyright notice and this permission notice appear in all copies.
10  *
11  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18  */
19 
20 #include "got_compat.h"
21 
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_worktree_cvg.h"
53 #include "got_diff.h"
54 #include "got_commit_graph.h"
55 #include "got_fetch.h"
56 #include "got_send.h"
57 #include "got_blame.h"
58 #include "got_privsep.h"
59 #include "got_opentemp.h"
60 #include "got_gotconfig.h"
61 #include "got_dial.h"
62 #include "got_patch.h"
63 #include "got_sigs.h"
64 #include "got_date.h"
65 
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_checkout(void);
97 __dead static void	usage_update(void);
98 __dead static void	usage_log(void);
99 __dead static void	usage_diff(void);
100 __dead static void	usage_blame(void);
101 __dead static void	usage_tree(void);
102 __dead static void	usage_status(void);
103 __dead static void	usage_tag(void);
104 __dead static void	usage_add(void);
105 __dead static void	usage_remove(void);
106 __dead static void	usage_patch(void);
107 __dead static void	usage_revert(void);
108 __dead static void	usage_commit(void);
109 __dead static void	usage_cherrypick(void);
110 __dead static void	usage_backout(void);
111 __dead static void	usage_cat(void);
112 __dead static void	usage_info(void);
113 
114 static const struct got_error*		cmd_import(int, char *[]);
115 static const struct got_error*		cmd_clone(int, char *[]);
116 static const struct got_error*		cmd_checkout(int, char *[]);
117 static const struct got_error*		cmd_update(int, char *[]);
118 static const struct got_error*		cmd_log(int, char *[]);
119 static const struct got_error*		cmd_diff(int, char *[]);
120 static const struct got_error*		cmd_blame(int, char *[]);
121 static const struct got_error*		cmd_tree(int, char *[]);
122 static const struct got_error*		cmd_status(int, char *[]);
123 static const struct got_error*		cmd_tag(int, char *[]);
124 static const struct got_error*		cmd_add(int, char *[]);
125 static const struct got_error*		cmd_remove(int, char *[]);
126 static const struct got_error*		cmd_patch(int, char *[]);
127 static const struct got_error*		cmd_revert(int, char *[]);
128 static const struct got_error*		cmd_commit(int, char *[]);
129 static const struct got_error*		cmd_cherrypick(int, char *[]);
130 static const struct got_error*		cmd_backout(int, char *[]);
131 static const struct got_error*		cmd_cat(int, char *[]);
132 static const struct got_error*		cmd_info(int, char *[]);
133 
134 static const struct got_cmd got_commands[] = {
135 	{ "import",	cmd_import,	usage_import,	"im" },
136 	{ "clone",	cmd_clone,	usage_clone,	"cl" },
137 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
138 	{ "update",	cmd_update,	usage_update,	"up" },
139 	{ "log",	cmd_log,	usage_log,	"" },
140 	{ "diff",	cmd_diff,	usage_diff,	"di" },
141 	{ "blame",	cmd_blame,	usage_blame,	"bl" },
142 	{ "tree",	cmd_tree,	usage_tree,	"tr" },
143 	{ "status",	cmd_status,	usage_status,	"st" },
144 	{ "tag",	cmd_tag,	usage_tag,	"" },
145 	{ "add",	cmd_add,	usage_add,	"" },
146 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
147 	{ "patch",	cmd_patch,	usage_patch,	"pa" },
148 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
149 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
150 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
151 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
152 	{ "cat",	cmd_cat,	usage_cat,	"" },
153 	{ "info",	cmd_info,	usage_info,	"" },
154 };
155 
156 static void
157 list_commands(FILE *fp)
158 {
159 	size_t i;
160 
161 	fprintf(fp, "commands:");
162 	for (i = 0; i < nitems(got_commands); i++) {
163 		const struct got_cmd *cmd = &got_commands[i];
164 		fprintf(fp, " %s", cmd->cmd_name);
165 	}
166 	fputc('\n', fp);
167 }
168 
169 __dead static void
170 option_conflict(char a, char b)
171 {
172 	errx(1, "-%c and -%c options are mutually exclusive", a, b);
173 }
174 
175 int
176 main(int argc, char *argv[])
177 {
178 	const struct got_cmd *cmd;
179 	size_t i;
180 	int ch;
181 	int hflag = 0, Vflag = 0;
182 	static const struct option longopts[] = {
183 	    { "version", no_argument, NULL, 'V' },
184 	    { NULL, 0, NULL, 0 }
185 	};
186 
187 	setlocale(LC_CTYPE, "");
188 
189 	while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
190 		switch (ch) {
191 		case 'h':
192 			hflag = 1;
193 			break;
194 		case 'V':
195 			Vflag = 1;
196 			break;
197 		default:
198 			usage(hflag, 1);
199 			/* NOTREACHED */
200 		}
201 	}
202 
203 	argc -= optind;
204 	argv += optind;
205 	optind = 1;
206 	optreset = 1;
207 
208 	if (Vflag) {
209 		got_version_print_str();
210 		return 0;
211 	}
212 
213 	if (argc <= 0)
214 		usage(hflag, hflag ? 0 : 1);
215 
216 	signal(SIGINT, catch_sigint);
217 	signal(SIGPIPE, catch_sigpipe);
218 
219 	for (i = 0; i < nitems(got_commands); i++) {
220 		const struct got_error *error;
221 
222 		cmd = &got_commands[i];
223 
224 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
225 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
226 			continue;
227 
228 		if (hflag)
229 			cmd->cmd_usage();
230 
231 		error = cmd->cmd_main(argc, argv);
232 		if (error && error->code != GOT_ERR_CANCELLED &&
233 		    error->code != GOT_ERR_PRIVSEP_EXIT &&
234 		    !(sigpipe_received &&
235 		      error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
236 		    !(sigint_received &&
237 		      error->code == GOT_ERR_ERRNO && errno == EINTR)) {
238 			fflush(stdout);
239 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
240 			return 1;
241 		}
242 
243 		return 0;
244 	}
245 
246 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
247 	list_commands(stderr);
248 	return 1;
249 }
250 
251 __dead static void
252 usage(int hflag, int status)
253 {
254 	FILE *fp = (status == 0) ? stdout : stderr;
255 
256 	fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
257 	    getprogname());
258 	if (hflag)
259 		list_commands(fp);
260 	exit(status);
261 }
262 
263 static const struct got_error *
264 get_editor(char **abspath)
265 {
266 	const struct got_error *err = NULL;
267 	const char *editor;
268 
269 	*abspath = NULL;
270 
271 	editor = getenv("VISUAL");
272 	if (editor == NULL)
273 		editor = getenv("EDITOR");
274 
275 	if (editor) {
276 		err = got_path_find_prog(abspath, editor);
277 		if (err)
278 			return err;
279 	}
280 
281 	if (*abspath == NULL) {
282 		*abspath = strdup("/usr/bin/vi");
283 		if (*abspath == NULL)
284 			return got_error_from_errno("strdup");
285 	}
286 
287 	return NULL;
288 }
289 
290 static const struct got_error *
291 apply_unveil(const char *repo_path, int repo_read_only,
292     const char *worktree_path)
293 {
294 	const struct got_error *err;
295 
296 #ifdef PROFILE
297 	if (unveil("gmon.out", "rwc") != 0)
298 		return got_error_from_errno2("unveil", "gmon.out");
299 #endif
300 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
301 		return got_error_from_errno2("unveil", repo_path);
302 
303 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
304 		return got_error_from_errno2("unveil", worktree_path);
305 
306 	if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
307 		return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
308 
309 	err = got_privsep_unveil_exec_helpers();
310 	if (err != NULL)
311 		return err;
312 
313 	if (unveil(NULL, NULL) != 0)
314 		return got_error_from_errno("unveil");
315 
316 	return NULL;
317 }
318 
319 __dead static void
320 usage_import(void)
321 {
322 	fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
323 	    "[-r repository-path] directory\n", getprogname());
324 	exit(1);
325 }
326 
327 static int
328 spawn_editor(const char *editor, const char *file)
329 {
330 	pid_t pid;
331 	sig_t sighup, sigint, sigquit;
332 	int st = -1;
333 
334 	sighup = signal(SIGHUP, SIG_IGN);
335 	sigint = signal(SIGINT, SIG_IGN);
336 	sigquit = signal(SIGQUIT, SIG_IGN);
337 
338 	switch (pid = fork()) {
339 	case -1:
340 		goto doneediting;
341 	case 0:
342 		execl(editor, editor, file, (char *)NULL);
343 		_exit(127);
344 	}
345 
346 	while (waitpid(pid, &st, 0) == -1)
347 		if (errno != EINTR)
348 			break;
349 
350 doneediting:
351 	(void)signal(SIGHUP, sighup);
352 	(void)signal(SIGINT, sigint);
353 	(void)signal(SIGQUIT, sigquit);
354 
355 	if (!WIFEXITED(st)) {
356 		errno = EINTR;
357 		return -1;
358 	}
359 
360 	return WEXITSTATUS(st);
361 }
362 
363 static const struct got_error *
364 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
365 {
366 	const struct got_error *err = NULL;
367 	char *line = NULL;
368 	size_t linesize = 0;
369 
370 	*logmsg = NULL;
371 	*len = 0;
372 
373 	if (fseeko(fp, 0L, SEEK_SET) == -1)
374 		return got_error_from_errno("fseeko");
375 
376 	*logmsg = malloc(filesize + 1);
377 	if (*logmsg == NULL)
378 		return got_error_from_errno("malloc");
379 	(*logmsg)[0] = '\0';
380 
381 	while (getline(&line, &linesize, fp) != -1) {
382 		if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
383 			continue; /* remove comments and leading empty lines */
384 		*len = strlcat(*logmsg, line, filesize + 1);
385 		if (*len >= filesize + 1) {
386 			err = got_error(GOT_ERR_NO_SPACE);
387 			goto done;
388 		}
389 	}
390 	if (ferror(fp)) {
391 		err = got_ferror(fp, GOT_ERR_IO);
392 		goto done;
393 	}
394 
395 	while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
396 		(*logmsg)[*len - 1] = '\0';
397 		(*len)--;
398 	}
399 done:
400 	free(line);
401 	if (err) {
402 		free(*logmsg);
403 		*logmsg = NULL;
404 		*len = 0;
405 	}
406 	return err;
407 }
408 
409 static const struct got_error *
410 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
411     const char *initial_content, size_t initial_content_len,
412     int require_modification)
413 {
414 	const struct got_error *err = NULL;
415 	struct stat st, st2;
416 	FILE *fp = NULL;
417 	size_t logmsg_len;
418 
419 	*logmsg = NULL;
420 
421 	if (stat(logmsg_path, &st) == -1)
422 		return got_error_from_errno2("stat", logmsg_path);
423 
424 	if (spawn_editor(editor, logmsg_path) == -1)
425 		return got_error_from_errno("failed spawning editor");
426 
427 	if (require_modification) {
428 		struct timespec timeout;
429 
430 		timeout.tv_sec = 0;
431 		timeout.tv_nsec = 1;
432 		nanosleep(&timeout,  NULL);
433 	}
434 
435 	if (stat(logmsg_path, &st2) == -1)
436 		return got_error_from_errno2("stat", logmsg_path);
437 
438 	if (require_modification && st.st_size == st2.st_size &&
439 	    timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
440 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
441 		    "no changes made to commit message, aborting");
442 
443 	fp = fopen(logmsg_path, "re");
444 	if (fp == NULL) {
445 		err = got_error_from_errno("fopen");
446 		goto done;
447 	}
448 
449 	/* strip comments and leading/trailing newlines */
450 	err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
451 	if (err)
452 		goto done;
453 	if (logmsg_len == 0) {
454 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
455 		    "commit message cannot be empty, aborting");
456 		goto done;
457 	}
458 done:
459 	if (fp && fclose(fp) == EOF && err == NULL)
460 		err = got_error_from_errno("fclose");
461 	if (err) {
462 		free(*logmsg);
463 		*logmsg = NULL;
464 	}
465 	return err;
466 }
467 
468 static const struct got_error *
469 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
470     const char *path_dir, const char *branch_name)
471 {
472 	char *initial_content = NULL;
473 	const struct got_error *err = NULL;
474 	int initial_content_len;
475 	int fd = -1;
476 
477 	initial_content_len = asprintf(&initial_content,
478 	    "\n# %s to be imported to branch %s\n", path_dir,
479 	    branch_name);
480 	if (initial_content_len == -1)
481 		return got_error_from_errno("asprintf");
482 
483 	err = got_opentemp_named_fd(logmsg_path, &fd,
484 	    GOT_TMPDIR_STR "/got-importmsg", "");
485 	if (err)
486 		goto done;
487 
488 	if (write(fd, initial_content, initial_content_len) == -1) {
489 		err = got_error_from_errno2("write", *logmsg_path);
490 		goto done;
491 	}
492 	if (close(fd) == -1) {
493 		err = got_error_from_errno2("close", *logmsg_path);
494 		goto done;
495 	}
496 	fd = -1;
497 
498 	err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
499 	    initial_content_len, 1);
500 done:
501 	if (fd != -1 && close(fd) == -1 && err == NULL)
502 		err = got_error_from_errno2("close", *logmsg_path);
503 	free(initial_content);
504 	if (err) {
505 		free(*logmsg_path);
506 		*logmsg_path = NULL;
507 	}
508 	return err;
509 }
510 
511 static const struct got_error *
512 import_progress(void *arg, const char *path)
513 {
514 	printf("A  %s\n", path);
515 	return NULL;
516 }
517 
518 static const struct got_error *
519 valid_author(const char *author)
520 {
521 	const char *email = author;
522 
523 	/*
524 	 * Git' expects the author (or committer) to be in the form
525 	 * "name <email>", which are mostly free form (see the
526 	 * "committer" description in git-fast-import(1)).  We're only
527 	 * doing this to avoid git's object parser breaking on commits
528 	 * we create.
529 	 */
530 
531 	while (*author && *author != '\n' && *author != '<' && *author != '>')
532 		author++;
533 	if (author != email && *author == '<' && *(author - 1) != ' ')
534 		return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
535 		    "between author name and email required", email);
536 	if (*author++ != '<')
537 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
538 	while (*author && *author != '\n' && *author != '<' && *author != '>')
539 		author++;
540 	if (strcmp(author, ">") != 0)
541 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
542 	return NULL;
543 }
544 
545 static const struct got_error *
546 get_author(char **author, struct got_repository *repo,
547     struct got_worktree *worktree)
548 {
549 	const struct got_error *err = NULL;
550 	const char *got_author = NULL, *name, *email;
551 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
552 
553 	*author = NULL;
554 
555 	if (worktree)
556 		worktree_conf = got_worktree_get_gotconfig(worktree);
557 	repo_conf = got_repo_get_gotconfig(repo);
558 
559 	/*
560 	 * Priority of potential author information sources, from most
561 	 * significant to least significant:
562 	 * 1) work tree's .got/got.conf file
563 	 * 2) repository's got.conf file
564 	 * 3) repository's git config file
565 	 * 4) environment variables
566 	 * 5) global git config files (in user's home directory or /etc)
567 	 */
568 
569 	if (worktree_conf)
570 		got_author = got_gotconfig_get_author(worktree_conf);
571 	if (got_author == NULL)
572 		got_author = got_gotconfig_get_author(repo_conf);
573 	if (got_author == NULL) {
574 		name = got_repo_get_gitconfig_author_name(repo);
575 		email = got_repo_get_gitconfig_author_email(repo);
576 		if (name && email) {
577 			if (asprintf(author, "%s <%s>", name, email) == -1)
578 				return got_error_from_errno("asprintf");
579 			return NULL;
580 		}
581 
582 		got_author = getenv("GOT_AUTHOR");
583 		if (got_author == NULL) {
584 			name = got_repo_get_global_gitconfig_author_name(repo);
585 			email = got_repo_get_global_gitconfig_author_email(
586 			    repo);
587 			if (name && email) {
588 				if (asprintf(author, "%s <%s>", name, email)
589 				    == -1)
590 					return got_error_from_errno("asprintf");
591 				return NULL;
592 			}
593 			/* TODO: Look up user in password database? */
594 			return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
595 		}
596 	}
597 
598 	*author = strdup(got_author);
599 	if (*author == NULL)
600 		return got_error_from_errno("strdup");
601 
602 	err = valid_author(*author);
603 	if (err) {
604 		free(*author);
605 		*author = NULL;
606 	}
607 	return err;
608 }
609 
610 static const struct got_error *
611 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
612     struct got_worktree *worktree)
613 {
614 	const char *got_allowed_signers = NULL;
615 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
616 
617 	*allowed_signers = NULL;
618 
619 	if (worktree)
620 		worktree_conf = got_worktree_get_gotconfig(worktree);
621 	repo_conf = got_repo_get_gotconfig(repo);
622 
623 	/*
624 	 * Priority of potential author information sources, from most
625 	 * significant to least significant:
626 	 * 1) work tree's .got/got.conf file
627 	 * 2) repository's got.conf file
628 	 */
629 
630 	if (worktree_conf)
631 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
632 		    worktree_conf);
633 	if (got_allowed_signers == NULL)
634 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
635 		    repo_conf);
636 
637 	if (got_allowed_signers) {
638 		*allowed_signers = strdup(got_allowed_signers);
639 		if (*allowed_signers == NULL)
640 			return got_error_from_errno("strdup");
641 	}
642 	return NULL;
643 }
644 
645 static const struct got_error *
646 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
647     struct got_worktree *worktree)
648 {
649 	const char *got_revoked_signers = NULL;
650 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
651 
652 	*revoked_signers = NULL;
653 
654 	if (worktree)
655 		worktree_conf = got_worktree_get_gotconfig(worktree);
656 	repo_conf = got_repo_get_gotconfig(repo);
657 
658 	/*
659 	 * Priority of potential author information sources, from most
660 	 * significant to least significant:
661 	 * 1) work tree's .got/got.conf file
662 	 * 2) repository's got.conf file
663 	 */
664 
665 	if (worktree_conf)
666 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
667 		    worktree_conf);
668 	if (got_revoked_signers == NULL)
669 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
670 		    repo_conf);
671 
672 	if (got_revoked_signers) {
673 		*revoked_signers = strdup(got_revoked_signers);
674 		if (*revoked_signers == NULL)
675 			return got_error_from_errno("strdup");
676 	}
677 	return NULL;
678 }
679 
680 static const char *
681 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
682 {
683 	const char *got_signer_id = NULL;
684 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
685 
686 	if (worktree)
687 		worktree_conf = got_worktree_get_gotconfig(worktree);
688 	repo_conf = got_repo_get_gotconfig(repo);
689 
690 	/*
691 	 * Priority of potential author information sources, from most
692 	 * significant to least significant:
693 	 * 1) work tree's .got/got.conf file
694 	 * 2) repository's got.conf file
695 	 */
696 
697 	if (worktree_conf)
698 		got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
699 	if (got_signer_id == NULL)
700 		got_signer_id = got_gotconfig_get_signer_id(repo_conf);
701 
702 	return got_signer_id;
703 }
704 
705 static const struct got_error *
706 get_gitconfig_path(char **gitconfig_path)
707 {
708 	const char *homedir = getenv("HOME");
709 
710 	*gitconfig_path = NULL;
711 	if (homedir) {
712 		if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
713 			return got_error_from_errno("asprintf");
714 
715 	}
716 	return NULL;
717 }
718 
719 static const struct got_error *
720 cmd_import(int argc, char *argv[])
721 {
722 	const struct got_error *error = NULL;
723 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
724 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
725 	const char *branch_name = NULL;
726 	char *id_str = NULL, *logmsg_path = NULL;
727 	char refname[PATH_MAX] = "refs/heads/";
728 	struct got_repository *repo = NULL;
729 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
730 	struct got_object_id *new_commit_id = NULL;
731 	int ch, n = 0;
732 	struct got_pathlist_head ignores;
733 	struct got_pathlist_entry *pe;
734 	int preserve_logmsg = 0;
735 	int *pack_fds = NULL;
736 
737 	TAILQ_INIT(&ignores);
738 
739 #ifndef PROFILE
740 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
741 	    "unveil",
742 	    NULL) == -1)
743 		err(1, "pledge");
744 #endif
745 
746 	while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
747 		switch (ch) {
748 		case 'b':
749 			branch_name = optarg;
750 			break;
751 		case 'I':
752 			if (optarg[0] == '\0')
753 				break;
754 			error = got_pathlist_insert(&pe, &ignores, optarg,
755 			    NULL);
756 			if (error)
757 				goto done;
758 			break;
759 		case 'm':
760 			logmsg = strdup(optarg);
761 			if (logmsg == NULL) {
762 				error = got_error_from_errno("strdup");
763 				goto done;
764 			}
765 			break;
766 		case 'r':
767 			repo_path = realpath(optarg, NULL);
768 			if (repo_path == NULL) {
769 				error = got_error_from_errno2("realpath",
770 				    optarg);
771 				goto done;
772 			}
773 			break;
774 		default:
775 			usage_import();
776 			/* NOTREACHED */
777 		}
778 	}
779 
780 	argc -= optind;
781 	argv += optind;
782 
783 	if (argc != 1)
784 		usage_import();
785 
786 	if (repo_path == NULL) {
787 		repo_path = getcwd(NULL, 0);
788 		if (repo_path == NULL)
789 			return got_error_from_errno("getcwd");
790 	}
791 	got_path_strip_trailing_slashes(repo_path);
792 	error = get_gitconfig_path(&gitconfig_path);
793 	if (error)
794 		goto done;
795 	error = got_repo_pack_fds_open(&pack_fds);
796 	if (error != NULL)
797 		goto done;
798 	error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
799 	if (error)
800 		goto done;
801 
802 	error = get_author(&author, repo, NULL);
803 	if (error)
804 		return error;
805 
806 	/*
807 	 * Don't let the user create a branch name with a leading '-'.
808 	 * While technically a valid reference name, this case is usually
809 	 * an unintended typo.
810 	 */
811 	if (branch_name && branch_name[0] == '-')
812 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
813 
814 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
815 	if (error && error->code != GOT_ERR_NOT_REF)
816 		goto done;
817 
818 	if (branch_name)
819 		n = strlcat(refname, branch_name, sizeof(refname));
820 	else if (head_ref && got_ref_is_symbolic(head_ref))
821 		n = strlcpy(refname, got_ref_get_symref_target(head_ref),
822 		    sizeof(refname));
823 	else
824 		n = strlcat(refname, "main", sizeof(refname));
825 	if (n >= sizeof(refname)) {
826 		error = got_error(GOT_ERR_NO_SPACE);
827 		goto done;
828 	}
829 
830 	error = got_ref_open(&branch_ref, repo, refname, 0);
831 	if (error) {
832 		if (error->code != GOT_ERR_NOT_REF)
833 			goto done;
834 	} else {
835 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
836 		    "import target branch already exists");
837 		goto done;
838 	}
839 
840 	path_dir = realpath(argv[0], NULL);
841 	if (path_dir == NULL) {
842 		error = got_error_from_errno2("realpath", argv[0]);
843 		goto done;
844 	}
845 	got_path_strip_trailing_slashes(path_dir);
846 
847 	/*
848 	 * unveil(2) traverses exec(2); if an editor is used we have
849 	 * to apply unveil after the log message has been written.
850 	 */
851 	if (logmsg == NULL || *logmsg == '\0') {
852 		error = get_editor(&editor);
853 		if (error)
854 			goto done;
855 		free(logmsg);
856 		error = collect_import_msg(&logmsg, &logmsg_path, editor,
857 		    path_dir, refname);
858 		if (error) {
859 			if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
860 			    logmsg_path != NULL)
861 				preserve_logmsg = 1;
862 			goto done;
863 		}
864 	}
865 
866 	if (unveil(path_dir, "r") != 0) {
867 		error = got_error_from_errno2("unveil", path_dir);
868 		if (logmsg_path)
869 			preserve_logmsg = 1;
870 		goto done;
871 	}
872 
873 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
874 	if (error) {
875 		if (logmsg_path)
876 			preserve_logmsg = 1;
877 		goto done;
878 	}
879 
880 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
881 	    author, &ignores, repo, import_progress, NULL);
882 	if (error) {
883 		if (logmsg_path)
884 			preserve_logmsg = 1;
885 		goto done;
886 	}
887 
888 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
889 	if (error) {
890 		if (logmsg_path)
891 			preserve_logmsg = 1;
892 		goto done;
893 	}
894 
895 	error = got_ref_write(branch_ref, repo);
896 	if (error) {
897 		if (logmsg_path)
898 			preserve_logmsg = 1;
899 		goto done;
900 	}
901 
902 	error = got_object_id_str(&id_str, new_commit_id);
903 	if (error) {
904 		if (logmsg_path)
905 			preserve_logmsg = 1;
906 		goto done;
907 	}
908 
909 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
910 	if (error) {
911 		if (error->code != GOT_ERR_NOT_REF) {
912 			if (logmsg_path)
913 				preserve_logmsg = 1;
914 			goto done;
915 		}
916 
917 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
918 		    branch_ref);
919 		if (error) {
920 			if (logmsg_path)
921 				preserve_logmsg = 1;
922 			goto done;
923 		}
924 
925 		error = got_ref_write(head_ref, repo);
926 		if (error) {
927 			if (logmsg_path)
928 				preserve_logmsg = 1;
929 			goto done;
930 		}
931 	}
932 
933 	printf("Created branch %s with commit %s\n",
934 	    got_ref_get_name(branch_ref), id_str);
935 done:
936 	if (pack_fds) {
937 		const struct got_error *pack_err =
938 		    got_repo_pack_fds_close(pack_fds);
939 		if (error == NULL)
940 			error = pack_err;
941 	}
942 	if (repo) {
943 		const struct got_error *close_err = got_repo_close(repo);
944 		if (error == NULL)
945 			error = close_err;
946 	}
947 	if (preserve_logmsg) {
948 		fprintf(stderr, "%s: log message preserved in %s\n",
949 		    getprogname(), logmsg_path);
950 	} else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
951 		error = got_error_from_errno2("unlink", logmsg_path);
952 	free(logmsg);
953 	free(logmsg_path);
954 	free(repo_path);
955 	free(editor);
956 	free(new_commit_id);
957 	free(id_str);
958 	free(author);
959 	free(gitconfig_path);
960 	if (branch_ref)
961 		got_ref_close(branch_ref);
962 	if (head_ref)
963 		got_ref_close(head_ref);
964 	return error;
965 }
966 
967 __dead static void
968 usage_clone(void)
969 {
970 	fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
971 	    "repository-URL [directory]\n", getprogname());
972 	exit(1);
973 }
974 
975 struct got_fetch_progress_arg {
976 	char last_scaled_size[FMT_SCALED_STRSIZE];
977 	int last_p_indexed;
978 	int last_p_resolved;
979 	int verbosity;
980 
981 	struct got_repository *repo;
982 
983 	int create_configs;
984 	int configs_created;
985 	struct {
986 		struct got_pathlist_head *symrefs;
987 		struct got_pathlist_head *wanted_branches;
988 		struct got_pathlist_head *wanted_refs;
989 		const char *proto;
990 		const char *host;
991 		const char *port;
992 		const char *remote_repo_path;
993 		const char *git_url;
994 		int fetch_all_branches;
995 		int mirror_references;
996 	} config_info;
997 };
998 
999 /* XXX forward declaration */
1000 static const struct got_error *
1001 create_config_files(const char *proto, const char *host, const char *port,
1002     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1003     int mirror_references, struct got_pathlist_head *symrefs,
1004     struct got_pathlist_head *wanted_branches,
1005     struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1006 
1007 static const struct got_error *
1008 fetch_progress(void *arg, const char *message, off_t packfile_size,
1009     int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1010 {
1011 	const struct got_error *err = NULL;
1012 	struct got_fetch_progress_arg *a = arg;
1013 	char scaled_size[FMT_SCALED_STRSIZE];
1014 	int p_indexed, p_resolved;
1015 	int print_size = 0, print_indexed = 0, print_resolved = 0;
1016 
1017 	/*
1018 	 * In order to allow a failed clone to be resumed with 'got fetch'
1019 	 * we try to create configuration files as soon as possible.
1020 	 * Once the server has sent information about its default branch
1021 	 * we have all required information.
1022 	 */
1023 	if (a->create_configs && !a->configs_created &&
1024 	    !TAILQ_EMPTY(a->config_info.symrefs)) {
1025 		err = create_config_files(a->config_info.proto,
1026 		    a->config_info.host, a->config_info.port,
1027 		    a->config_info.remote_repo_path,
1028 		    a->config_info.git_url,
1029 		    a->config_info.fetch_all_branches,
1030 		    a->config_info.mirror_references,
1031 		    a->config_info.symrefs,
1032 		    a->config_info.wanted_branches,
1033 		    a->config_info.wanted_refs, a->repo);
1034 		if (err)
1035 			return err;
1036 		a->configs_created = 1;
1037 	}
1038 
1039 	if (a->verbosity < 0)
1040 		return NULL;
1041 
1042 	if (message && message[0] != '\0') {
1043 		printf("\rserver: %s", message);
1044 		fflush(stdout);
1045 		return NULL;
1046 	}
1047 
1048 	if (packfile_size > 0 || nobj_indexed > 0) {
1049 		if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1050 		    (a->last_scaled_size[0] == '\0' ||
1051 		    strcmp(scaled_size, a->last_scaled_size)) != 0) {
1052 			print_size = 1;
1053 			if (strlcpy(a->last_scaled_size, scaled_size,
1054 			    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1055 				return got_error(GOT_ERR_NO_SPACE);
1056 		}
1057 		if (nobj_indexed > 0) {
1058 			p_indexed = (nobj_indexed * 100) / nobj_total;
1059 			if (p_indexed != a->last_p_indexed) {
1060 				a->last_p_indexed = p_indexed;
1061 				print_indexed = 1;
1062 				print_size = 1;
1063 			}
1064 		}
1065 		if (nobj_resolved > 0) {
1066 			p_resolved = (nobj_resolved * 100) /
1067 			    (nobj_total - nobj_loose);
1068 			if (p_resolved != a->last_p_resolved) {
1069 				a->last_p_resolved = p_resolved;
1070 				print_resolved = 1;
1071 				print_indexed = 1;
1072 				print_size = 1;
1073 			}
1074 		}
1075 
1076 	}
1077 	if (print_size || print_indexed || print_resolved)
1078 		printf("\r");
1079 	if (print_size)
1080 		printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1081 	if (print_indexed)
1082 		printf("; indexing %d%%", p_indexed);
1083 	if (print_resolved)
1084 		printf("; resolving deltas %d%%", p_resolved);
1085 	if (print_size || print_indexed || print_resolved)
1086 		fflush(stdout);
1087 
1088 	return NULL;
1089 }
1090 
1091 static const struct got_error *
1092 create_symref(const char *refname, struct got_reference *target_ref,
1093     int verbosity, struct got_repository *repo)
1094 {
1095 	const struct got_error *err;
1096 	struct got_reference *head_symref;
1097 
1098 	err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1099 	if (err)
1100 		return err;
1101 
1102 	err = got_ref_write(head_symref, repo);
1103 	if (err == NULL && verbosity > 0) {
1104 		printf("Created reference %s: %s\n", GOT_REF_HEAD,
1105 		    got_ref_get_name(target_ref));
1106 	}
1107 	got_ref_close(head_symref);
1108 	return err;
1109 }
1110 
1111 static const struct got_error *
1112 list_remote_refs(struct got_pathlist_head *symrefs,
1113     struct got_pathlist_head *refs)
1114 {
1115 	const struct got_error *err;
1116 	struct got_pathlist_entry *pe;
1117 
1118 	TAILQ_FOREACH(pe, symrefs, entry) {
1119 		const char *refname = pe->path;
1120 		const char *targetref = pe->data;
1121 
1122 		printf("%s: %s\n", refname, targetref);
1123 	}
1124 
1125 	TAILQ_FOREACH(pe, refs, entry) {
1126 		const char *refname = pe->path;
1127 		struct got_object_id *id = pe->data;
1128 		char *id_str;
1129 
1130 		err = got_object_id_str(&id_str, id);
1131 		if (err)
1132 			return err;
1133 		printf("%s: %s\n", refname, id_str);
1134 		free(id_str);
1135 	}
1136 
1137 	return NULL;
1138 }
1139 
1140 static const struct got_error *
1141 create_ref(const char *refname, struct got_object_id *id,
1142     int verbosity, struct got_repository *repo)
1143 {
1144 	const struct got_error *err = NULL;
1145 	struct got_reference *ref;
1146 	char *id_str;
1147 
1148 	err = got_object_id_str(&id_str, id);
1149 	if (err)
1150 		return err;
1151 
1152 	err = got_ref_alloc(&ref, refname, id);
1153 	if (err)
1154 		goto done;
1155 
1156 	err = got_ref_write(ref, repo);
1157 	got_ref_close(ref);
1158 
1159 	if (err == NULL && verbosity >= 0)
1160 		printf("Created reference %s: %s\n", refname, id_str);
1161 done:
1162 	free(id_str);
1163 	return err;
1164 }
1165 
1166 static int
1167 match_wanted_ref(const char *refname, const char *wanted_ref)
1168 {
1169 	if (strncmp(refname, "refs/", 5) != 0)
1170 		return 0;
1171 	refname += 5;
1172 
1173 	/*
1174 	 * Prevent fetching of references that won't make any
1175 	 * sense outside of the remote repository's context.
1176 	 */
1177 	if (strncmp(refname, "got/", 4) == 0)
1178 		return 0;
1179 	if (strncmp(refname, "remotes/", 8) == 0)
1180 		return 0;
1181 
1182 	if (strncmp(wanted_ref, "refs/", 5) == 0)
1183 		wanted_ref += 5;
1184 
1185 	/* Allow prefix match. */
1186 	if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1187 		return 1;
1188 
1189 	/* Allow exact match. */
1190 	return (strcmp(refname, wanted_ref) == 0);
1191 }
1192 
1193 static int
1194 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1195 {
1196 	struct got_pathlist_entry *pe;
1197 
1198 	TAILQ_FOREACH(pe, wanted_refs, entry) {
1199 		if (match_wanted_ref(refname, pe->path))
1200 			return 1;
1201 	}
1202 
1203 	return 0;
1204 }
1205 
1206 static const struct got_error *
1207 create_wanted_ref(const char *refname, struct got_object_id *id,
1208     const char *remote_repo_name, int verbosity, struct got_repository *repo)
1209 {
1210 	const struct got_error *err;
1211 	char *remote_refname;
1212 
1213 	if (strncmp("refs/", refname, 5) == 0)
1214 		refname += 5;
1215 
1216 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1217 	    remote_repo_name, refname) == -1)
1218 		return got_error_from_errno("asprintf");
1219 
1220 	err = create_ref(remote_refname, id, verbosity, repo);
1221 	free(remote_refname);
1222 	return err;
1223 }
1224 
1225 static const struct got_error *
1226 create_gotconfig(const char *proto, const char *host, const char *port,
1227     const char *remote_repo_path, const char *default_branch,
1228     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1229     struct got_pathlist_head *wanted_refs, int mirror_references,
1230     struct got_repository *repo)
1231 {
1232 	const struct got_error *err = NULL;
1233 	char *gotconfig_path = NULL;
1234 	char *gotconfig = NULL;
1235 	FILE *gotconfig_file = NULL;
1236 	const char *branchname = NULL;
1237 	char *branches = NULL, *refs = NULL;
1238 	ssize_t n;
1239 
1240 	if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1241 		struct got_pathlist_entry *pe;
1242 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1243 			char *s;
1244 			branchname = pe->path;
1245 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1246 				branchname += 11;
1247 			if (asprintf(&s, "%s\"%s\" ",
1248 			    branches ? branches : "", branchname) == -1) {
1249 				err = got_error_from_errno("asprintf");
1250 				goto done;
1251 			}
1252 			free(branches);
1253 			branches = s;
1254 		}
1255 	} else if (!fetch_all_branches && default_branch) {
1256 		branchname = default_branch;
1257 		if (strncmp(branchname, "refs/heads/", 11) == 0)
1258 			branchname += 11;
1259 		if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1260 			err = got_error_from_errno("asprintf");
1261 			goto done;
1262 		}
1263 	}
1264 	if (!TAILQ_EMPTY(wanted_refs)) {
1265 		struct got_pathlist_entry *pe;
1266 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1267 			char *s;
1268 			const char *refname = pe->path;
1269 			if (strncmp(refname, "refs/", 5) == 0)
1270 				branchname += 5;
1271 			if (asprintf(&s, "%s\"%s\" ",
1272 			    refs ? refs : "", refname) == -1) {
1273 				err = got_error_from_errno("asprintf");
1274 				goto done;
1275 			}
1276 			free(refs);
1277 			refs = s;
1278 		}
1279 	}
1280 
1281 	/* Create got.conf(5). */
1282 	gotconfig_path = got_repo_get_path_gotconfig(repo);
1283 	if (gotconfig_path == NULL) {
1284 		err = got_error_from_errno("got_repo_get_path_gotconfig");
1285 		goto done;
1286 	}
1287 	gotconfig_file = fopen(gotconfig_path, "ae");
1288 	if (gotconfig_file == NULL) {
1289 		err = got_error_from_errno2("fopen", gotconfig_path);
1290 		goto done;
1291 	}
1292 	if (asprintf(&gotconfig,
1293 	    "remote \"%s\" {\n"
1294 	    "\tserver %s\n"
1295 	    "\tprotocol %s\n"
1296 	    "%s%s%s"
1297 	    "\trepository \"%s\"\n"
1298 	    "%s%s%s"
1299 	    "%s%s%s"
1300 	    "%s"
1301 	    "%s"
1302 	    "}\n",
1303 	    GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1304 	    port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1305 	    remote_repo_path, branches ? "\tbranch { " : "",
1306 	    branches ? branches : "", branches ? "}\n" : "",
1307 	    refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1308 	    mirror_references ? "\tmirror_references yes\n" : "",
1309 	    fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1310 		err = got_error_from_errno("asprintf");
1311 		goto done;
1312 	}
1313 	n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1314 	if (n != strlen(gotconfig)) {
1315 		err = got_ferror(gotconfig_file, GOT_ERR_IO);
1316 		goto done;
1317 	}
1318 
1319 done:
1320 	if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1321 		err = got_error_from_errno2("fclose", gotconfig_path);
1322 	free(gotconfig_path);
1323 	free(branches);
1324 	return err;
1325 }
1326 
1327 static const struct got_error *
1328 create_gitconfig(const char *git_url, const char *default_branch,
1329     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1330     struct got_pathlist_head *wanted_refs, int mirror_references,
1331     struct got_repository *repo)
1332 {
1333 	const struct got_error *err = NULL;
1334 	char *gitconfig_path = NULL;
1335 	char *gitconfig = NULL;
1336 	FILE *gitconfig_file = NULL;
1337 	char *branches = NULL, *refs = NULL;
1338 	const char *branchname;
1339 	ssize_t n;
1340 
1341 	/* Create a config file Git can understand. */
1342 	gitconfig_path = got_repo_get_path_gitconfig(repo);
1343 	if (gitconfig_path == NULL) {
1344 		err = got_error_from_errno("got_repo_get_path_gitconfig");
1345 		goto done;
1346 	}
1347 	gitconfig_file = fopen(gitconfig_path, "ae");
1348 	if (gitconfig_file == NULL) {
1349 		err = got_error_from_errno2("fopen", gitconfig_path);
1350 		goto done;
1351 	}
1352 	if (fetch_all_branches) {
1353 		if (mirror_references) {
1354 			if (asprintf(&branches,
1355 			    "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1356 				err = got_error_from_errno("asprintf");
1357 				goto done;
1358 			}
1359 		} else if (asprintf(&branches,
1360 		    "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1361 		    GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1362 			err = got_error_from_errno("asprintf");
1363 			goto done;
1364 		}
1365 	} else if (!TAILQ_EMPTY(wanted_branches)) {
1366 		struct got_pathlist_entry *pe;
1367 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1368 			char *s;
1369 			branchname = pe->path;
1370 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1371 				branchname += 11;
1372 			if (mirror_references) {
1373 				if (asprintf(&s,
1374 				    "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1375 				    branches ? branches : "",
1376 				    branchname, branchname) == -1) {
1377 					err = got_error_from_errno("asprintf");
1378 					goto done;
1379 				}
1380 			} else if (asprintf(&s,
1381 			    "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1382 			    branches ? branches : "",
1383 			    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1384 			    branchname) == -1) {
1385 				err = got_error_from_errno("asprintf");
1386 				goto done;
1387 			}
1388 			free(branches);
1389 			branches = s;
1390 		}
1391 	} else {
1392 		/*
1393 		 * If the server specified a default branch, use just that one.
1394 		 * Otherwise fall back to fetching all branches on next fetch.
1395 		 */
1396 		if (default_branch) {
1397 			branchname = default_branch;
1398 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1399 				branchname += 11;
1400 		} else
1401 			branchname = "*"; /* fall back to all branches */
1402 		if (mirror_references) {
1403 			if (asprintf(&branches,
1404 			    "\tfetch = refs/heads/%s:refs/heads/%s\n",
1405 			    branchname, branchname) == -1) {
1406 				err = got_error_from_errno("asprintf");
1407 				goto done;
1408 			}
1409 		} else if (asprintf(&branches,
1410 		    "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1411 		    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1412 		    branchname) == -1) {
1413 			err = got_error_from_errno("asprintf");
1414 			goto done;
1415 		}
1416 	}
1417 	if (!TAILQ_EMPTY(wanted_refs)) {
1418 		struct got_pathlist_entry *pe;
1419 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1420 			char *s;
1421 			const char *refname = pe->path;
1422 			if (strncmp(refname, "refs/", 5) == 0)
1423 				refname += 5;
1424 			if (mirror_references) {
1425 				if (asprintf(&s,
1426 				    "%s\tfetch = refs/%s:refs/%s\n",
1427 				    refs ? refs : "", refname, refname) == -1) {
1428 					err = got_error_from_errno("asprintf");
1429 					goto done;
1430 				}
1431 			} else if (asprintf(&s,
1432 			    "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1433 			    refs ? refs : "",
1434 			    refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1435 			    refname) == -1) {
1436 				err = got_error_from_errno("asprintf");
1437 				goto done;
1438 			}
1439 			free(refs);
1440 			refs = s;
1441 		}
1442 	}
1443 
1444 	if (asprintf(&gitconfig,
1445 	    "[remote \"%s\"]\n"
1446 	    "\turl = %s\n"
1447 	    "%s"
1448 	    "%s"
1449 	    "\tfetch = refs/tags/*:refs/tags/*\n",
1450 	    GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1451 	    refs ? refs : "") == -1) {
1452 		err = got_error_from_errno("asprintf");
1453 		goto done;
1454 	}
1455 	n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1456 	if (n != strlen(gitconfig)) {
1457 		err = got_ferror(gitconfig_file, GOT_ERR_IO);
1458 		goto done;
1459 	}
1460 done:
1461 	if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1462 		err = got_error_from_errno2("fclose", gitconfig_path);
1463 	free(gitconfig_path);
1464 	free(branches);
1465 	return err;
1466 }
1467 
1468 static const struct got_error *
1469 create_config_files(const char *proto, const char *host, const char *port,
1470     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1471     int mirror_references, struct got_pathlist_head *symrefs,
1472     struct got_pathlist_head *wanted_branches,
1473     struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1474 {
1475 	const struct got_error *err = NULL;
1476 	const char *default_branch = NULL;
1477 	struct got_pathlist_entry *pe;
1478 
1479 	/*
1480 	 * If we asked for a set of wanted branches then use the first
1481 	 * one of those.
1482 	 */
1483 	if (!TAILQ_EMPTY(wanted_branches)) {
1484 		pe = TAILQ_FIRST(wanted_branches);
1485 		default_branch = pe->path;
1486 	} else {
1487 		/* First HEAD ref listed by server is the default branch. */
1488 		TAILQ_FOREACH(pe, symrefs, entry) {
1489 			const char *refname = pe->path;
1490 			const char *target = pe->data;
1491 
1492 			if (strcmp(refname, GOT_REF_HEAD) != 0)
1493 				continue;
1494 
1495 			default_branch = target;
1496 			break;
1497 		}
1498 	}
1499 
1500 	/* Create got.conf(5). */
1501 	err = create_gotconfig(proto, host, port, remote_repo_path,
1502 	    default_branch, fetch_all_branches, wanted_branches,
1503 	    wanted_refs, mirror_references, repo);
1504 	if (err)
1505 		return err;
1506 
1507 	/* Create a config file Git can understand. */
1508 	return create_gitconfig(git_url, default_branch, fetch_all_branches,
1509 	    wanted_branches, wanted_refs, mirror_references, repo);
1510 }
1511 
1512 static const struct got_error *
1513 cmd_clone(int argc, char *argv[])
1514 {
1515 	const struct got_error *error = NULL;
1516 	const char *uri, *dirname;
1517 	char *proto, *host, *port, *repo_name, *server_path;
1518 	char *default_destdir = NULL, *id_str = NULL;
1519 	const char *repo_path;
1520 	struct got_repository *repo = NULL;
1521 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1522 	struct got_pathlist_entry *pe;
1523 	struct got_object_id *pack_hash = NULL;
1524 	int ch, fetchfd = -1, fetchstatus;
1525 	pid_t fetchpid = -1;
1526 	struct got_fetch_progress_arg fpa;
1527 	char *git_url = NULL;
1528 	int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1529 	int bflag = 0, list_refs_only = 0;
1530 	int *pack_fds = NULL;
1531 
1532 	TAILQ_INIT(&refs);
1533 	TAILQ_INIT(&symrefs);
1534 	TAILQ_INIT(&wanted_branches);
1535 	TAILQ_INIT(&wanted_refs);
1536 
1537 	while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1538 		switch (ch) {
1539 		case 'a':
1540 			fetch_all_branches = 1;
1541 			break;
1542 		case 'b':
1543 			error = got_pathlist_append(&wanted_branches,
1544 			    optarg, NULL);
1545 			if (error)
1546 				return error;
1547 			bflag = 1;
1548 			break;
1549 		case 'l':
1550 			list_refs_only = 1;
1551 			break;
1552 		case 'm':
1553 			mirror_references = 1;
1554 			break;
1555 		case 'q':
1556 			verbosity = -1;
1557 			break;
1558 		case 'R':
1559 			error = got_pathlist_append(&wanted_refs,
1560 			    optarg, NULL);
1561 			if (error)
1562 				return error;
1563 			break;
1564 		case 'v':
1565 			if (verbosity < 0)
1566 				verbosity = 0;
1567 			else if (verbosity < 3)
1568 				verbosity++;
1569 			break;
1570 		default:
1571 			usage_clone();
1572 			break;
1573 		}
1574 	}
1575 	argc -= optind;
1576 	argv += optind;
1577 
1578 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1579 		option_conflict('a', 'b');
1580 	if (list_refs_only) {
1581 		if (!TAILQ_EMPTY(&wanted_branches))
1582 			option_conflict('l', 'b');
1583 		if (fetch_all_branches)
1584 			option_conflict('l', 'a');
1585 		if (mirror_references)
1586 			option_conflict('l', 'm');
1587 		if (!TAILQ_EMPTY(&wanted_refs))
1588 			option_conflict('l', 'R');
1589 	}
1590 
1591 	uri = argv[0];
1592 
1593 	if (argc == 1)
1594 		dirname = NULL;
1595 	else if (argc == 2)
1596 		dirname = argv[1];
1597 	else
1598 		usage_clone();
1599 
1600 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1601 	    &repo_name, uri);
1602 	if (error)
1603 		goto done;
1604 
1605 	if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1606 	    host, port ? ":" : "", port ? port : "",
1607 	    server_path[0] != '/' ? "/" : "", server_path) == -1) {
1608 		error = got_error_from_errno("asprintf");
1609 		goto done;
1610 	}
1611 
1612 	if (strcmp(proto, "git") == 0) {
1613 #ifndef PROFILE
1614 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1615 		    "sendfd dns inet unveil", NULL) == -1)
1616 			err(1, "pledge");
1617 #endif
1618 	} else if (strcmp(proto, "git+ssh") == 0 ||
1619 	    strcmp(proto, "ssh") == 0) {
1620 #ifndef PROFILE
1621 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1622 		    "sendfd unveil", NULL) == -1)
1623 			err(1, "pledge");
1624 #endif
1625 	} else if (strcmp(proto, "http") == 0 ||
1626 	    strcmp(proto, "git+http") == 0) {
1627 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1628 		goto done;
1629 	} else {
1630 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1631 		goto done;
1632 	}
1633 	if (dirname == NULL) {
1634 		if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1635 			error = got_error_from_errno("asprintf");
1636 			goto done;
1637 		}
1638 		repo_path = default_destdir;
1639 	} else
1640 		repo_path = dirname;
1641 
1642 	if (!list_refs_only) {
1643 		error = got_path_mkdir(repo_path);
1644 		if (error &&
1645 		    (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1646 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1647 			goto done;
1648 		if (!got_path_dir_is_empty(repo_path)) {
1649 			error = got_error_path(repo_path,
1650 			    GOT_ERR_DIR_NOT_EMPTY);
1651 			goto done;
1652 		}
1653 	}
1654 
1655 	error = got_dial_apply_unveil(proto);
1656 	if (error)
1657 		goto done;
1658 
1659 	error = apply_unveil(repo_path, 0, NULL);
1660 	if (error)
1661 		goto done;
1662 
1663 	if (verbosity >= 0)
1664 		printf("Connecting to %s\n", git_url);
1665 
1666 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1667 	    server_path, verbosity);
1668 	if (error)
1669 		goto done;
1670 
1671 	if (!list_refs_only) {
1672 		error = got_repo_init(repo_path, NULL);
1673 		if (error)
1674 			goto done;
1675 		error = got_repo_pack_fds_open(&pack_fds);
1676 		if (error != NULL)
1677 			goto done;
1678 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1679 		if (error)
1680 			goto done;
1681 	}
1682 
1683 	fpa.last_scaled_size[0] = '\0';
1684 	fpa.last_p_indexed = -1;
1685 	fpa.last_p_resolved = -1;
1686 	fpa.verbosity = verbosity;
1687 	fpa.create_configs = 1;
1688 	fpa.configs_created = 0;
1689 	fpa.repo = repo;
1690 	fpa.config_info.symrefs = &symrefs;
1691 	fpa.config_info.wanted_branches = &wanted_branches;
1692 	fpa.config_info.wanted_refs = &wanted_refs;
1693 	fpa.config_info.proto = proto;
1694 	fpa.config_info.host = host;
1695 	fpa.config_info.port = port;
1696 	fpa.config_info.remote_repo_path = server_path;
1697 	fpa.config_info.git_url = git_url;
1698 	fpa.config_info.fetch_all_branches = fetch_all_branches;
1699 	fpa.config_info.mirror_references = mirror_references;
1700 	error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1701 	    GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1702 	    fetch_all_branches, &wanted_branches, &wanted_refs,
1703 	    list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1704 	    fetch_progress, &fpa);
1705 	if (error)
1706 		goto done;
1707 
1708 	if (list_refs_only) {
1709 		error = list_remote_refs(&symrefs, &refs);
1710 		goto done;
1711 	}
1712 
1713 	if (pack_hash == NULL) {
1714 		error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1715 		    "server sent an empty pack file");
1716 		goto done;
1717 	}
1718 	error = got_object_id_str(&id_str, pack_hash);
1719 	if (error)
1720 		goto done;
1721 	if (verbosity >= 0)
1722 		printf("\nFetched %s.pack\n", id_str);
1723 	free(id_str);
1724 
1725 	/* Set up references provided with the pack file. */
1726 	TAILQ_FOREACH(pe, &refs, entry) {
1727 		const char *refname = pe->path;
1728 		struct got_object_id *id = pe->data;
1729 		char *remote_refname;
1730 
1731 		if (is_wanted_ref(&wanted_refs, refname) &&
1732 		    !mirror_references) {
1733 			error = create_wanted_ref(refname, id,
1734 			    GOT_FETCH_DEFAULT_REMOTE_NAME,
1735 			    verbosity - 1, repo);
1736 			if (error)
1737 				goto done;
1738 			continue;
1739 		}
1740 
1741 		error = create_ref(refname, id, verbosity - 1, repo);
1742 		if (error)
1743 			goto done;
1744 
1745 		if (mirror_references)
1746 			continue;
1747 
1748 		if (strncmp("refs/heads/", refname, 11) != 0)
1749 			continue;
1750 
1751 		if (asprintf(&remote_refname,
1752 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1753 		    refname + 11) == -1) {
1754 			error = got_error_from_errno("asprintf");
1755 			goto done;
1756 		}
1757 		error = create_ref(remote_refname, id, verbosity - 1, repo);
1758 		free(remote_refname);
1759 		if (error)
1760 			goto done;
1761 	}
1762 
1763 	/* Set the HEAD reference if the server provided one. */
1764 	TAILQ_FOREACH(pe, &symrefs, entry) {
1765 		struct got_reference *target_ref;
1766 		const char *refname = pe->path;
1767 		const char *target = pe->data;
1768 		char *remote_refname = NULL, *remote_target = NULL;
1769 
1770 		if (strcmp(refname, GOT_REF_HEAD) != 0)
1771 			continue;
1772 
1773 		error = got_ref_open(&target_ref, repo, target, 0);
1774 		if (error) {
1775 			if (error->code == GOT_ERR_NOT_REF) {
1776 				error = NULL;
1777 				continue;
1778 			}
1779 			goto done;
1780 		}
1781 
1782 		error = create_symref(refname, target_ref, verbosity, repo);
1783 		got_ref_close(target_ref);
1784 		if (error)
1785 			goto done;
1786 
1787 		if (mirror_references)
1788 			continue;
1789 
1790 		if (strncmp("refs/heads/", target, 11) != 0)
1791 			continue;
1792 
1793 		if (asprintf(&remote_refname,
1794 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1795 		    refname) == -1) {
1796 			error = got_error_from_errno("asprintf");
1797 			goto done;
1798 		}
1799 		if (asprintf(&remote_target,
1800 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1801 		    target + 11) == -1) {
1802 			error = got_error_from_errno("asprintf");
1803 			free(remote_refname);
1804 			goto done;
1805 		}
1806 		error = got_ref_open(&target_ref, repo, remote_target, 0);
1807 		if (error) {
1808 			free(remote_refname);
1809 			free(remote_target);
1810 			if (error->code == GOT_ERR_NOT_REF) {
1811 				error = NULL;
1812 				continue;
1813 			}
1814 			goto done;
1815 		}
1816 		error = create_symref(remote_refname, target_ref,
1817 		    verbosity - 1, repo);
1818 		free(remote_refname);
1819 		free(remote_target);
1820 		got_ref_close(target_ref);
1821 		if (error)
1822 			goto done;
1823 	}
1824 	if (pe == NULL) {
1825 		/*
1826 		 * We failed to set the HEAD reference. If we asked for
1827 		 * a set of wanted branches use the first of one of those
1828 		 * which could be fetched instead.
1829 		 */
1830 		TAILQ_FOREACH(pe, &wanted_branches, entry) {
1831 			const char *target = pe->path;
1832 			struct got_reference *target_ref;
1833 
1834 			error = got_ref_open(&target_ref, repo, target, 0);
1835 			if (error) {
1836 				if (error->code == GOT_ERR_NOT_REF) {
1837 					error = NULL;
1838 					continue;
1839 				}
1840 				goto done;
1841 			}
1842 
1843 			error = create_symref(GOT_REF_HEAD, target_ref,
1844 			    verbosity, repo);
1845 			got_ref_close(target_ref);
1846 			if (error)
1847 				goto done;
1848 			break;
1849 		}
1850 
1851 		if (!fpa.configs_created && pe != NULL) {
1852 			error = create_config_files(fpa.config_info.proto,
1853 			    fpa.config_info.host, fpa.config_info.port,
1854 			    fpa.config_info.remote_repo_path,
1855 			    fpa.config_info.git_url,
1856 			    fpa.config_info.fetch_all_branches,
1857 			    fpa.config_info.mirror_references,
1858 			    fpa.config_info.symrefs,
1859 			    fpa.config_info.wanted_branches,
1860 			    fpa.config_info.wanted_refs, fpa.repo);
1861 			if (error)
1862 				goto done;
1863 		}
1864 	}
1865 
1866 	if (verbosity >= 0)
1867 		printf("Created %s repository '%s'\n",
1868 		    mirror_references ? "mirrored" : "cloned", repo_path);
1869 done:
1870 	if (pack_fds) {
1871 		const struct got_error *pack_err =
1872 		    got_repo_pack_fds_close(pack_fds);
1873 		if (error == NULL)
1874 			error = pack_err;
1875 	}
1876 	if (fetchpid > 0) {
1877 		if (kill(fetchpid, SIGTERM) == -1)
1878 			error = got_error_from_errno("kill");
1879 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1880 			error = got_error_from_errno("waitpid");
1881 	}
1882 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1883 		error = got_error_from_errno("close");
1884 	if (repo) {
1885 		const struct got_error *close_err = got_repo_close(repo);
1886 		if (error == NULL)
1887 			error = close_err;
1888 	}
1889 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1890 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1891 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1892 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1893 	free(pack_hash);
1894 	free(proto);
1895 	free(host);
1896 	free(port);
1897 	free(server_path);
1898 	free(repo_name);
1899 	free(default_destdir);
1900 	free(git_url);
1901 	return error;
1902 }
1903 
1904 static const struct got_error *
1905 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1906     int replace_tags, int verbosity, struct got_repository *repo)
1907 {
1908 	const struct got_error *err = NULL;
1909 	char *new_id_str = NULL;
1910 	struct got_object_id *old_id = NULL;
1911 
1912 	err = got_object_id_str(&new_id_str, new_id);
1913 	if (err)
1914 		goto done;
1915 
1916 	if (!replace_tags &&
1917 	    strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1918 		err = got_ref_resolve(&old_id, repo, ref);
1919 		if (err)
1920 			goto done;
1921 		if (got_object_id_cmp(old_id, new_id) == 0)
1922 			goto done;
1923 		if (verbosity >= 0) {
1924 			printf("Rejecting update of existing tag %s: %s\n",
1925 			    got_ref_get_name(ref), new_id_str);
1926 		}
1927 		goto done;
1928 	}
1929 
1930 	if (got_ref_is_symbolic(ref)) {
1931 		if (verbosity >= 0) {
1932 			printf("Replacing reference %s: %s\n",
1933 			    got_ref_get_name(ref),
1934 			    got_ref_get_symref_target(ref));
1935 		}
1936 		err = got_ref_change_symref_to_ref(ref, new_id);
1937 		if (err)
1938 			goto done;
1939 		err = got_ref_write(ref, repo);
1940 		if (err)
1941 			goto done;
1942 	} else {
1943 		err = got_ref_resolve(&old_id, repo, ref);
1944 		if (err)
1945 			goto done;
1946 		if (got_object_id_cmp(old_id, new_id) == 0)
1947 			goto done;
1948 
1949 		err = got_ref_change_ref(ref, new_id);
1950 		if (err)
1951 			goto done;
1952 		err = got_ref_write(ref, repo);
1953 		if (err)
1954 			goto done;
1955 	}
1956 
1957 	if (verbosity >= 0)
1958 		printf("Updated %s: %s\n", got_ref_get_name(ref),
1959 		    new_id_str);
1960 done:
1961 	free(old_id);
1962 	free(new_id_str);
1963 	return err;
1964 }
1965 
1966 static const struct got_error *
1967 update_wanted_ref(const char *refname, struct got_object_id *id,
1968     const char *remote_repo_name, int verbosity, struct got_repository *repo)
1969 {
1970 	const struct got_error *err, *unlock_err;
1971 	char *remote_refname;
1972 	struct got_reference *ref;
1973 
1974 	if (strncmp("refs/", refname, 5) == 0)
1975 		refname += 5;
1976 
1977 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1978 	    remote_repo_name, refname) == -1)
1979 		return got_error_from_errno("asprintf");
1980 
1981 	err = got_ref_open(&ref, repo, remote_refname, 1);
1982 	if (err) {
1983 		if (err->code != GOT_ERR_NOT_REF)
1984 			goto done;
1985 		err = create_ref(remote_refname, id, verbosity, repo);
1986 	} else {
1987 		err = update_ref(ref, id, 0, verbosity, repo);
1988 		unlock_err = got_ref_unlock(ref);
1989 		if (unlock_err && err == NULL)
1990 			err = unlock_err;
1991 		got_ref_close(ref);
1992 	}
1993 done:
1994 	free(remote_refname);
1995 	return err;
1996 }
1997 
1998 __dead static void
1999 usage_checkout(void)
2000 {
2001 	fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2002 	    "[-p path-prefix] repository-path [work-tree-path]\n",
2003 	    getprogname());
2004 	exit(1);
2005 }
2006 
2007 static void
2008 show_worktree_base_ref_warning(void)
2009 {
2010 	fprintf(stderr, "%s: warning: could not create a reference "
2011 	    "to the work tree's base commit; the commit could be "
2012 	    "garbage-collected by Git or 'gotadmin cleanup'; making the "
2013 	    "repository writable and running 'got update' will prevent this\n",
2014 	    getprogname());
2015 }
2016 
2017 struct got_checkout_progress_arg {
2018 	const char *worktree_path;
2019 	int had_base_commit_ref_error;
2020 	int verbosity;
2021 };
2022 
2023 static const struct got_error *
2024 checkout_progress(void *arg, unsigned char status, const char *path)
2025 {
2026 	struct got_checkout_progress_arg *a = arg;
2027 
2028 	/* Base commit bump happens silently. */
2029 	if (status == GOT_STATUS_BUMP_BASE)
2030 		return NULL;
2031 
2032 	if (status == GOT_STATUS_BASE_REF_ERR) {
2033 		a->had_base_commit_ref_error = 1;
2034 		return NULL;
2035 	}
2036 
2037 	while (path[0] == '/')
2038 		path++;
2039 
2040 	if (a->verbosity >= 0)
2041 		printf("%c  %s/%s\n", status, a->worktree_path, path);
2042 
2043 	return NULL;
2044 }
2045 
2046 static const struct got_error *
2047 check_cancelled(void *arg)
2048 {
2049 	if (sigint_received || sigpipe_received)
2050 		return got_error(GOT_ERR_CANCELLED);
2051 	return NULL;
2052 }
2053 
2054 static const struct got_error *
2055 check_linear_ancestry(struct got_object_id *commit_id,
2056     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2057     struct got_repository *repo)
2058 {
2059 	const struct got_error *err = NULL;
2060 	struct got_object_id *yca_id;
2061 
2062 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2063 	    commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2064 	if (err)
2065 		return err;
2066 
2067 	if (yca_id == NULL)
2068 		return got_error(GOT_ERR_ANCESTRY);
2069 
2070 	/*
2071 	 * Require a straight line of history between the target commit
2072 	 * and the work tree's base commit.
2073 	 *
2074 	 * Non-linear situations such as this require a rebase:
2075 	 *
2076 	 * (commit) D       F (base_commit)
2077 	 *           \     /
2078 	 *            C   E
2079 	 *             \ /
2080 	 *              B (yca)
2081 	 *              |
2082 	 *              A
2083 	 *
2084 	 * 'got update' only handles linear cases:
2085 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
2086 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
2087 	 */
2088 	if (allow_forwards_in_time_only) {
2089 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2090 		return got_error(GOT_ERR_ANCESTRY);
2091 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2092 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
2093 		return got_error(GOT_ERR_ANCESTRY);
2094 
2095 	free(yca_id);
2096 	return NULL;
2097 }
2098 
2099 static const struct got_error *
2100 check_same_branch(struct got_object_id *commit_id,
2101     struct got_reference *head_ref, struct got_repository *repo)
2102 {
2103 	const struct got_error *err = NULL;
2104 	struct got_commit_graph *graph = NULL;
2105 	struct got_object_id *head_commit_id = NULL;
2106 
2107 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
2108 	if (err)
2109 		goto done;
2110 
2111 	if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2112 		goto done;
2113 
2114 	err = got_commit_graph_open(&graph, "/", 1);
2115 	if (err)
2116 		goto done;
2117 
2118 	err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2119 	    check_cancelled, NULL);
2120 	if (err)
2121 		goto done;
2122 
2123 	for (;;) {
2124 		struct got_object_id id;
2125 
2126 		err = got_commit_graph_iter_next(&id, graph, repo,
2127 		    check_cancelled, NULL);
2128 		if (err) {
2129 			if (err->code == GOT_ERR_ITER_COMPLETED)
2130 				err = got_error(GOT_ERR_ANCESTRY);
2131 			break;
2132 		}
2133 
2134 		if (got_object_id_cmp(&id, commit_id) == 0)
2135 			break;
2136 	}
2137 done:
2138 	if (graph)
2139 		got_commit_graph_close(graph);
2140 	free(head_commit_id);
2141 	return err;
2142 }
2143 
2144 static const struct got_error *
2145 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2146 {
2147 	static char msg[512];
2148 	const char *branch_name;
2149 
2150 	if (got_ref_is_symbolic(ref))
2151 		branch_name = got_ref_get_symref_target(ref);
2152 	else
2153 		branch_name = got_ref_get_name(ref);
2154 
2155 	if (strncmp("refs/heads/", branch_name, 11) == 0)
2156 		branch_name += 11;
2157 
2158 	snprintf(msg, sizeof(msg),
2159 	    "target commit is not contained in branch '%s'; "
2160 	    "the branch to use must be specified with -b; "
2161 	    "if necessary a new branch can be created for "
2162 	    "this commit with 'got branch -c %s BRANCH_NAME'",
2163 	    branch_name, commit_id_str);
2164 
2165 	return got_error_msg(GOT_ERR_ANCESTRY, msg);
2166 }
2167 
2168 static const struct got_error *
2169 cmd_checkout(int argc, char *argv[])
2170 {
2171 	const struct got_error *error = NULL;
2172 	struct got_repository *repo = NULL;
2173 	struct got_reference *head_ref = NULL, *ref = NULL;
2174 	struct got_worktree *worktree = NULL;
2175 	char *repo_path = NULL;
2176 	char *worktree_path = NULL;
2177 	const char *path_prefix = "";
2178 	const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2179 	char *commit_id_str = NULL;
2180 	struct got_object_id *commit_id = NULL;
2181 	char *cwd = NULL;
2182 	int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2183 	struct got_pathlist_head paths;
2184 	struct got_checkout_progress_arg cpa;
2185 	int *pack_fds = NULL;
2186 
2187 	TAILQ_INIT(&paths);
2188 
2189 #ifndef PROFILE
2190 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2191 	    "unveil", NULL) == -1)
2192 		err(1, "pledge");
2193 #endif
2194 
2195 	while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2196 		switch (ch) {
2197 		case 'b':
2198 			branch_name = optarg;
2199 			break;
2200 		case 'c':
2201 			commit_id_str = strdup(optarg);
2202 			if (commit_id_str == NULL)
2203 				return got_error_from_errno("strdup");
2204 			break;
2205 		case 'E':
2206 			allow_nonempty = 1;
2207 			break;
2208 		case 'p':
2209 			path_prefix = optarg;
2210 			break;
2211 		case 'q':
2212 			verbosity = -1;
2213 			break;
2214 		default:
2215 			usage_checkout();
2216 			/* NOTREACHED */
2217 		}
2218 	}
2219 
2220 	argc -= optind;
2221 	argv += optind;
2222 
2223 	if (argc == 1) {
2224 		char *base, *dotgit;
2225 		const char *path;
2226 		repo_path = realpath(argv[0], NULL);
2227 		if (repo_path == NULL)
2228 			return got_error_from_errno2("realpath", argv[0]);
2229 		cwd = getcwd(NULL, 0);
2230 		if (cwd == NULL) {
2231 			error = got_error_from_errno("getcwd");
2232 			goto done;
2233 		}
2234 		if (path_prefix[0])
2235 			path = path_prefix;
2236 		else
2237 			path = repo_path;
2238 		error = got_path_basename(&base, path);
2239 		if (error)
2240 			goto done;
2241 		dotgit = strstr(base, ".git");
2242 		if (dotgit)
2243 			*dotgit = '\0';
2244 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2245 			error = got_error_from_errno("asprintf");
2246 			free(base);
2247 			goto done;
2248 		}
2249 		free(base);
2250 	} else if (argc == 2) {
2251 		repo_path = realpath(argv[0], NULL);
2252 		if (repo_path == NULL) {
2253 			error = got_error_from_errno2("realpath", argv[0]);
2254 			goto done;
2255 		}
2256 		worktree_path = realpath(argv[1], NULL);
2257 		if (worktree_path == NULL) {
2258 			if (errno != ENOENT) {
2259 				error = got_error_from_errno2("realpath",
2260 				    argv[1]);
2261 				goto done;
2262 			}
2263 			worktree_path = strdup(argv[1]);
2264 			if (worktree_path == NULL) {
2265 				error = got_error_from_errno("strdup");
2266 				goto done;
2267 			}
2268 		}
2269 	} else
2270 		usage_checkout();
2271 
2272 	got_path_strip_trailing_slashes(repo_path);
2273 	got_path_strip_trailing_slashes(worktree_path);
2274 
2275 	error = got_repo_pack_fds_open(&pack_fds);
2276 	if (error != NULL)
2277 		goto done;
2278 
2279 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2280 	if (error != NULL)
2281 		goto done;
2282 
2283 	/* Pre-create work tree path for unveil(2) */
2284 	error = got_path_mkdir(worktree_path);
2285 	if (error) {
2286 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2287 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2288 			goto done;
2289 		if (!allow_nonempty &&
2290 		    !got_path_dir_is_empty(worktree_path)) {
2291 			error = got_error_path(worktree_path,
2292 			    GOT_ERR_DIR_NOT_EMPTY);
2293 			goto done;
2294 		}
2295 	}
2296 
2297 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2298 	if (error)
2299 		goto done;
2300 
2301 	error = got_ref_open(&head_ref, repo, branch_name, 0);
2302 	if (error != NULL)
2303 		goto done;
2304 
2305 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2306 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2307 		goto done;
2308 
2309 	error = got_worktree_open(&worktree, worktree_path);
2310 	if (error != NULL)
2311 		goto done;
2312 
2313 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2314 	    path_prefix);
2315 	if (error != NULL)
2316 		goto done;
2317 	if (!same_path_prefix) {
2318 		error = got_error(GOT_ERR_PATH_PREFIX);
2319 		goto done;
2320 	}
2321 
2322 	if (commit_id_str) {
2323 		struct got_reflist_head refs;
2324 		TAILQ_INIT(&refs);
2325 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2326 		    NULL);
2327 		if (error)
2328 			goto done;
2329 		error = got_repo_match_object_id(&commit_id, NULL,
2330 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2331 		got_ref_list_free(&refs);
2332 		if (error)
2333 			goto done;
2334 		error = check_linear_ancestry(commit_id,
2335 		    got_worktree_get_base_commit_id(worktree), 0, repo);
2336 		if (error != NULL) {
2337 			if (error->code == GOT_ERR_ANCESTRY) {
2338 				error = checkout_ancestry_error(
2339 				    head_ref, commit_id_str);
2340 			}
2341 			goto done;
2342 		}
2343 		error = check_same_branch(commit_id, head_ref, repo);
2344 		if (error) {
2345 			if (error->code == GOT_ERR_ANCESTRY) {
2346 				error = checkout_ancestry_error(
2347 				    head_ref, commit_id_str);
2348 			}
2349 			goto done;
2350 		}
2351 		error = got_worktree_set_base_commit_id(worktree, repo,
2352 		    commit_id);
2353 		if (error)
2354 			goto done;
2355 		/* Expand potentially abbreviated commit ID string. */
2356 		free(commit_id_str);
2357 		error = got_object_id_str(&commit_id_str, commit_id);
2358 		if (error)
2359 			goto done;
2360 	} else {
2361 		commit_id = got_object_id_dup(
2362 		    got_worktree_get_base_commit_id(worktree));
2363 		if (commit_id == NULL) {
2364 			error = got_error_from_errno("got_object_id_dup");
2365 			goto done;
2366 		}
2367 		error = got_object_id_str(&commit_id_str, commit_id);
2368 		if (error)
2369 			goto done;
2370 	}
2371 
2372 	error = got_pathlist_append(&paths, "", NULL);
2373 	if (error)
2374 		goto done;
2375 	cpa.worktree_path = worktree_path;
2376 	cpa.had_base_commit_ref_error = 0;
2377 	cpa.verbosity = verbosity;
2378 	error = got_worktree_checkout_files(worktree, &paths, repo,
2379 	    checkout_progress, &cpa, check_cancelled, NULL);
2380 	if (error != NULL)
2381 		goto done;
2382 
2383 	if (got_ref_is_symbolic(head_ref)) {
2384 		error = got_ref_resolve_symbolic(&ref, repo, head_ref);
2385 		if (error)
2386 			goto done;
2387 		refname = got_ref_get_name(ref);
2388 	} else
2389 		refname = got_ref_get_name(head_ref);
2390 	printf("Checked out %s: %s\n", refname, commit_id_str);
2391 	printf("Now shut up and hack\n");
2392 	if (cpa.had_base_commit_ref_error)
2393 		show_worktree_base_ref_warning();
2394 done:
2395 	if (pack_fds) {
2396 		const struct got_error *pack_err =
2397 		    got_repo_pack_fds_close(pack_fds);
2398 		if (error == NULL)
2399 			error = pack_err;
2400 	}
2401 	if (head_ref)
2402 		got_ref_close(head_ref);
2403 	if (ref)
2404 		got_ref_close(ref);
2405 	if (repo) {
2406 		const struct got_error *close_err = got_repo_close(repo);
2407 		if (error == NULL)
2408 			error = close_err;
2409 	}
2410 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2411 	free(commit_id_str);
2412 	free(commit_id);
2413 	free(repo_path);
2414 	free(worktree_path);
2415 	free(cwd);
2416 	return error;
2417 }
2418 
2419 struct got_update_progress_arg {
2420 	int did_something;
2421 	int conflicts;
2422 	int obstructed;
2423 	int not_updated;
2424 	int missing;
2425 	int not_deleted;
2426 	int unversioned;
2427 	int verbosity;
2428 };
2429 
2430 static void
2431 print_update_progress_stats(struct got_update_progress_arg *upa)
2432 {
2433 	if (!upa->did_something)
2434 		return;
2435 
2436 	if (upa->conflicts > 0)
2437 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
2438 	if (upa->obstructed > 0)
2439 		printf("File paths obstructed by a non-regular file: %d\n",
2440 		    upa->obstructed);
2441 	if (upa->not_updated > 0)
2442 		printf("Files not updated because of existing merge "
2443 		    "conflicts: %d\n", upa->not_updated);
2444 }
2445 
2446 /*
2447  * The meaning of some status codes differs between merge-style operations and
2448  * update operations. For example, the ! status code means "file was missing"
2449  * if changes were merged into the work tree, and "missing file was restored"
2450  * if the work tree was updated. This function should be used by any operation
2451  * which merges changes into the work tree without updating the work tree.
2452  */
2453 static void
2454 print_merge_progress_stats(struct got_update_progress_arg *upa)
2455 {
2456 	if (!upa->did_something)
2457 		return;
2458 
2459 	if (upa->conflicts > 0)
2460 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
2461 	if (upa->obstructed > 0)
2462 		printf("File paths obstructed by a non-regular file: %d\n",
2463 		    upa->obstructed);
2464 	if (upa->missing > 0)
2465 		printf("Files which had incoming changes but could not be "
2466 		    "found in the work tree: %d\n", upa->missing);
2467 	if (upa->not_deleted > 0)
2468 		printf("Files not deleted due to differences in deleted "
2469 		    "content: %d\n", upa->not_deleted);
2470 	if (upa->unversioned > 0)
2471 		printf("Files not merged because an unversioned file was "
2472 		    "found in the work tree: %d\n", upa->unversioned);
2473 }
2474 
2475 __dead static void
2476 usage_update(void)
2477 {
2478 	fprintf(stderr, "usage: %s update [-qtvX] [-c commit] [-r remote] "
2479 	    "[path ...]\n", getprogname());
2480 	exit(1);
2481 }
2482 
2483 static const struct got_error *
2484 update_progress(void *arg, unsigned char status, const char *path)
2485 {
2486 	struct got_update_progress_arg *upa = arg;
2487 
2488 	if (status == GOT_STATUS_EXISTS ||
2489 	    status == GOT_STATUS_BASE_REF_ERR)
2490 		return NULL;
2491 
2492 	upa->did_something = 1;
2493 
2494 	/* Base commit bump happens silently. */
2495 	if (status == GOT_STATUS_BUMP_BASE)
2496 		return NULL;
2497 
2498 	if (status == GOT_STATUS_CONFLICT)
2499 		upa->conflicts++;
2500 	if (status == GOT_STATUS_OBSTRUCTED)
2501 		upa->obstructed++;
2502 	if (status == GOT_STATUS_CANNOT_UPDATE)
2503 		upa->not_updated++;
2504 	if (status == GOT_STATUS_MISSING)
2505 		upa->missing++;
2506 	if (status == GOT_STATUS_CANNOT_DELETE)
2507 		upa->not_deleted++;
2508 	if (status == GOT_STATUS_UNVERSIONED)
2509 		upa->unversioned++;
2510 
2511 	while (path[0] == '/')
2512 		path++;
2513 	if (upa->verbosity >= 0)
2514 		printf("%c  %s\n", status, path);
2515 
2516 	return NULL;
2517 }
2518 
2519 static const struct got_error *
2520 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2521 {
2522 	const struct got_error *err;
2523 	int in_progress;
2524 
2525 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
2526 	if (err)
2527 		return err;
2528 	if (in_progress)
2529 		return got_error(GOT_ERR_REBASING);
2530 
2531 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
2532 	if (err)
2533 		return err;
2534 	if (in_progress)
2535 		return got_error(GOT_ERR_HISTEDIT_BUSY);
2536 
2537 	return NULL;
2538 }
2539 
2540 static const struct got_error *
2541 check_merge_in_progress(struct got_worktree *worktree,
2542     struct got_repository *repo)
2543 {
2544 	const struct got_error *err;
2545 	int in_progress;
2546 
2547 	err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
2548 	if (err)
2549 		return err;
2550 	if (in_progress)
2551 		return got_error(GOT_ERR_MERGE_BUSY);
2552 
2553 	return NULL;
2554 }
2555 
2556 static const struct got_error *
2557 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2558     char *argv[], struct got_worktree *worktree)
2559 {
2560 	const struct got_error *err = NULL;
2561 	char *path;
2562 	struct got_pathlist_entry *new;
2563 	int i;
2564 
2565 	if (argc == 0) {
2566 		path = strdup("");
2567 		if (path == NULL)
2568 			return got_error_from_errno("strdup");
2569 		return got_pathlist_append(paths, path, NULL);
2570 	}
2571 
2572 	for (i = 0; i < argc; i++) {
2573 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
2574 		if (err)
2575 			break;
2576 		err = got_pathlist_insert(&new, paths, path, NULL);
2577 		if (err || new == NULL /* duplicate */) {
2578 			free(path);
2579 			if (err)
2580 				break;
2581 		}
2582 	}
2583 
2584 	return err;
2585 }
2586 
2587 static const struct got_error *
2588 wrap_not_worktree_error(const struct got_error *orig_err,
2589     const char *cmdname, const char *path)
2590 {
2591 	const struct got_error *err;
2592 	struct got_repository *repo;
2593 	static char msg[512];
2594 	int *pack_fds = NULL;
2595 
2596 	err = got_repo_pack_fds_open(&pack_fds);
2597 	if (err)
2598 		return err;
2599 
2600 	err = got_repo_open(&repo, path, NULL, pack_fds);
2601 	if (err)
2602 		return orig_err;
2603 
2604 	snprintf(msg, sizeof(msg),
2605 	    "'got %s' needs a work tree in addition to a git repository\n"
2606 	    "Work trees can be checked out from this Git repository with "
2607 	    "'got checkout'.\n"
2608 	    "The got(1) manual page contains more information.", cmdname);
2609 	err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2610 	if (repo) {
2611 		const struct got_error *close_err = got_repo_close(repo);
2612 		if (err == NULL)
2613 			err = close_err;
2614 	}
2615 	if (pack_fds) {
2616 		const struct got_error *pack_err =
2617 		    got_repo_pack_fds_close(pack_fds);
2618 		if (err == NULL)
2619 			err = pack_err;
2620 	}
2621 	return err;
2622 }
2623 
2624 static const struct got_error *
2625 cmd_update(int argc, char *argv[])
2626 {
2627 	const struct got_error *error = NULL, *unlock_err;
2628 	char *worktree_path = NULL;
2629 	const char *repo_path = NULL;
2630 	const char *remote_name = NULL;
2631 	char *proto = NULL, *host = NULL, *port = NULL;
2632 	char *repo_name = NULL, *server_path = NULL;
2633 	const struct got_remote_repo *remotes, *remote = NULL;
2634 	int nremotes;
2635 	char *id_str = NULL;
2636 	struct got_repository *repo = NULL;
2637 	struct got_worktree *worktree = NULL;
2638 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2639 	struct got_pathlist_head paths, refs, symrefs;
2640 	struct got_pathlist_head wanted_branches, wanted_refs;
2641 	struct got_pathlist_entry *pe;
2642 	struct got_reflist_head remote_refs;
2643 	struct got_reflist_entry *re;
2644 	struct got_object_id *pack_hash = NULL;
2645 	int i, ch, fetchfd = -1, fetchstatus;
2646 	pid_t fetchpid = -1;
2647 	struct got_fetch_progress_arg fpa;
2648 	struct got_update_progress_arg upa;
2649 	int verbosity = 0;
2650 	int delete_remote = 0;
2651 	int replace_tags = 0;
2652 	int *pack_fds = NULL;
2653 	const char *remote_head = NULL, *worktree_branch = NULL;
2654 	struct got_object_id *commit_id = NULL;
2655 	char *commit_id_str = NULL;
2656 	const char *refname;
2657 	struct got_reference *head_ref = NULL;
2658 
2659 	TAILQ_INIT(&paths);
2660 	TAILQ_INIT(&refs);
2661 	TAILQ_INIT(&symrefs);
2662 	TAILQ_INIT(&remote_refs);
2663 	TAILQ_INIT(&wanted_branches);
2664 	TAILQ_INIT(&wanted_refs);
2665 
2666 	while ((ch = getopt(argc, argv, "c:qr:vX")) != -1) {
2667 		switch (ch) {
2668 		case 'c':
2669 			commit_id_str = strdup(optarg);
2670 			if (commit_id_str == NULL)
2671 				return got_error_from_errno("strdup");
2672 			break;
2673 		case 't':
2674 			replace_tags = 1;
2675 			break;
2676 		case 'q':
2677 			verbosity = -1;
2678 			break;
2679 		case 'r':
2680 			remote_name = optarg;
2681 			break;
2682 		case 'v':
2683 			if (verbosity < 0)
2684 				verbosity = 0;
2685 			else if (verbosity < 3)
2686 				verbosity++;
2687 			break;
2688 		case 'X':
2689 			delete_remote = 1;
2690 			break;
2691 		default:
2692 			usage_update();
2693 			break;
2694 		}
2695 	}
2696 	argc -= optind;
2697 	argv += optind;
2698 
2699 	if (delete_remote) {
2700 		if (replace_tags)
2701 			option_conflict('X', 't');
2702 		if (remote_name == NULL)
2703 			errx(1, "-X option requires a remote name");
2704 	}
2705 	if (remote_name == NULL)
2706 		remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2707 
2708 	worktree_path = getcwd(NULL, 0);
2709 	if (worktree_path == NULL) {
2710 		error = got_error_from_errno("getcwd");
2711 		goto done;
2712 	}
2713 	error = got_worktree_open(&worktree, worktree_path);
2714 	if (error) {
2715 		if (error->code == GOT_ERR_NOT_WORKTREE)
2716 			error = wrap_not_worktree_error(error, "update",
2717 			    worktree_path);
2718 		goto done;
2719 	}
2720 	repo_path = got_worktree_get_repo_path(worktree);
2721 
2722 	error = got_repo_pack_fds_open(&pack_fds);
2723 	if (error != NULL)
2724 		goto done;
2725 
2726 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2727 	if (error)
2728 		goto done;
2729 
2730 	error = check_rebase_or_histedit_in_progress(worktree);
2731 	if (error)
2732 		goto done;
2733 	error = check_merge_in_progress(worktree, repo);
2734 	if (error)
2735 		goto done;
2736 
2737 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2738 	if (error)
2739 		goto done;
2740 
2741 	worktree_conf = got_worktree_get_gotconfig(worktree);
2742 	if (worktree_conf) {
2743 		got_gotconfig_get_remotes(&nremotes, &remotes,
2744 		    worktree_conf);
2745 		for (i = 0; i < nremotes; i++) {
2746 			if (strcmp(remotes[i].name, remote_name) == 0) {
2747 				remote = &remotes[i];
2748 				break;
2749 			}
2750 		}
2751 	}
2752 
2753 	if (remote == NULL) {
2754 		repo_conf = got_repo_get_gotconfig(repo);
2755 		if (repo_conf) {
2756 			got_gotconfig_get_remotes(&nremotes, &remotes,
2757 			    repo_conf);
2758 			for (i = 0; i < nremotes; i++) {
2759 				if (strcmp(remotes[i].name, remote_name) == 0) {
2760 					remote = &remotes[i];
2761 					break;
2762 				}
2763 			}
2764 		}
2765 	}
2766 	if (remote == NULL) {
2767 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2768 		for (i = 0; i < nremotes; i++) {
2769 			if (strcmp(remotes[i].name, remote_name) == 0) {
2770 				remote = &remotes[i];
2771 				break;
2772 			}
2773 		}
2774 	}
2775 	if (remote == NULL) {
2776 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2777 		goto done;
2778 	}
2779 
2780 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2781 	    &repo_name, remote->fetch_url);
2782 	if (error)
2783 		goto done;
2784 
2785 	if (strcmp(proto, "git") == 0) {
2786 #ifndef PROFILE
2787 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2788 		    "sendfd dns inet unveil", NULL) == -1)
2789 			err(1, "pledge");
2790 #endif
2791 	} else if (strcmp(proto, "git+ssh") == 0 ||
2792 	    strcmp(proto, "ssh") == 0) {
2793 #ifndef PROFILE
2794 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2795 		    "sendfd unveil", NULL) == -1)
2796 			err(1, "pledge");
2797 #endif
2798 	} else if (strcmp(proto, "http") == 0 ||
2799 	    strcmp(proto, "git+http") == 0) {
2800 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2801 		goto done;
2802 	} else {
2803 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2804 		goto done;
2805 	}
2806 
2807 	error = got_dial_apply_unveil(proto);
2808 	if (error)
2809 		goto done;
2810 
2811 	error = apply_unveil(got_repo_get_path(repo), 0,
2812 	    got_worktree_get_root_path(worktree));
2813 	if (error)
2814 		goto done;
2815 
2816 	if (verbosity >= 0) {
2817 		printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2818 		    remote->name, proto, host,
2819 		    port ? ":" : "", port ? port : "",
2820 		    *server_path == '/' ? "" : "/", server_path);
2821 	}
2822 
2823 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2824 	    server_path, verbosity);
2825 	if (error)
2826 		goto done;
2827 
2828 	/*
2829 	 * If set, get this remote's HEAD ref target so
2830 	 * if it has changed on the server we can fetch it.
2831 	 */
2832 	error = got_ref_list(&remote_refs, repo, "refs/remotes",
2833 	    got_ref_cmp_by_name, repo);
2834 	if (error)
2835 		goto done;
2836 
2837 	TAILQ_FOREACH(re, &remote_refs, entry) {
2838 		const char	*remote_refname, *remote_target;
2839 		size_t		 remote_name_len;
2840 
2841 		if (!got_ref_is_symbolic(re->ref))
2842 			continue;
2843 
2844 		remote_name_len = strlen(remote->name);
2845 		remote_refname = got_ref_get_name(re->ref);
2846 
2847 		/* we only want refs/remotes/$remote->name/HEAD */
2848 		if (strncmp(remote_refname + 13, remote->name,
2849 		    remote_name_len) != 0)
2850 			continue;
2851 
2852 		if (strcmp(remote_refname + remote_name_len + 14,
2853 		    GOT_REF_HEAD) != 0)
2854 			continue;
2855 
2856 		/*
2857 		 * Take the name itself because we already
2858 		 * only match with refs/heads/ in fetch_pack().
2859 		 */
2860 		remote_target = got_ref_get_symref_target(re->ref);
2861 		remote_head = remote_target + remote_name_len + 14;
2862 		break;
2863 	}
2864 
2865 	refname = got_worktree_get_head_ref_name(worktree);
2866 	if (strncmp(refname, "refs/heads/", 11) == 0)
2867 		worktree_branch = refname;
2868 
2869 	fpa.last_scaled_size[0] = '\0';
2870 	fpa.last_p_indexed = -1;
2871 	fpa.last_p_resolved = -1;
2872 	fpa.verbosity = verbosity;
2873 	fpa.repo = repo;
2874 	fpa.create_configs = 0;
2875 	fpa.configs_created = 0;
2876 	memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2877 
2878 	error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2879 	    remote->mirror_references, 0, &wanted_branches, &wanted_refs,
2880 	    0, verbosity, fetchfd, repo, worktree_branch, remote_head,
2881 	    0, fetch_progress, &fpa);
2882 	if (error)
2883 		goto done;
2884 
2885 	if (pack_hash != NULL && verbosity >= 0) {
2886 		error = got_object_id_str(&id_str, pack_hash);
2887 		if (error)
2888 			goto done;
2889 		printf("\nFetched %s.pack\n", id_str);
2890 		free(id_str);
2891 		id_str = NULL;
2892 	}
2893 
2894 	/* Update references provided with the pack file. */
2895 	TAILQ_FOREACH(pe, &refs, entry) {
2896 		const char *refname = pe->path;
2897 		struct got_object_id *id = pe->data;
2898 		struct got_reference *ref;
2899 
2900 		if (is_wanted_ref(&wanted_refs, refname)) {
2901 			error = update_wanted_ref(refname, id,
2902 			    remote->name, verbosity, repo);
2903 			if (error)
2904 				goto done;
2905 			continue;
2906 		}
2907 
2908 		error = got_ref_open(&ref, repo, refname, 1);
2909 		if (error) {
2910 			if (error->code != GOT_ERR_NOT_REF)
2911 				goto done;
2912 			error = create_ref(refname, id, verbosity,
2913 			    repo);
2914 			if (error)
2915 				goto done;
2916 		} else {
2917 			error = update_ref(ref, id, replace_tags,
2918 			    verbosity-1, repo);
2919 			unlock_err = got_ref_unlock(ref);
2920 			if (unlock_err && error == NULL)
2921 				error = unlock_err;
2922 			got_ref_close(ref);
2923 			if (error)
2924 				goto done;
2925 		}
2926 	}
2927 
2928 	/* Update worktree */
2929 	error = got_ref_open(&head_ref, repo,
2930 	    got_worktree_get_head_ref_name(worktree), 0);
2931 	if (error != NULL)
2932 		goto done;
2933 	if (commit_id_str == NULL) {
2934 		error = got_ref_resolve(&commit_id, repo, head_ref);
2935 		if (error != NULL)
2936 			goto done;
2937 		error = got_object_id_str(&commit_id_str, commit_id);
2938 		if (error != NULL)
2939 			goto done;
2940 	} else {
2941 		struct got_reflist_head refs;
2942 		TAILQ_INIT(&refs);
2943 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2944 		    NULL);
2945 		if (error)
2946 			goto done;
2947 		error = got_repo_match_object_id(&commit_id, NULL,
2948 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2949 		got_ref_list_free(&refs);
2950 		free(commit_id_str);
2951 		commit_id_str = NULL;
2952 		if (error)
2953 			goto done;
2954 		error = got_object_id_str(&commit_id_str, commit_id);
2955 		if (error)
2956 			goto done;
2957 	}
2958 
2959 
2960 	error = check_linear_ancestry(commit_id,
2961 	    got_worktree_get_base_commit_id(worktree), 0, repo);
2962 	if (error != NULL) {
2963 		if (error->code == GOT_ERR_ANCESTRY)
2964 			error = got_error(GOT_ERR_BRANCH_MOVED);
2965 		goto done;
2966 	}
2967 	error = check_same_branch(commit_id, head_ref, repo);
2968 	if (error)
2969 		goto done;
2970 
2971 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2972 	    commit_id) != 0) {
2973 		error = got_worktree_set_base_commit_id(worktree, repo,
2974 		    commit_id);
2975 		if (error)
2976 			goto done;
2977 	}
2978 
2979 	memset(&upa, 0, sizeof(upa));
2980 	upa.verbosity = verbosity;
2981 	error = got_worktree_checkout_files(worktree, &paths, repo,
2982 	    update_progress, &upa, check_cancelled, NULL);
2983 	if (error != NULL)
2984 		goto done;
2985 
2986 	if (upa.did_something) {
2987 		printf("Updated to %s: %s\n",
2988 		    got_worktree_get_head_ref_name(worktree), commit_id_str);
2989 	} else
2990 		printf("Already up-to-date\n");
2991 
2992 	print_update_progress_stats(&upa);
2993 done:
2994 	if (fetchpid > 0) {
2995 		if (kill(fetchpid, SIGTERM) == -1)
2996 			error = got_error_from_errno("kill");
2997 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2998 			error = got_error_from_errno("waitpid");
2999 	}
3000 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
3001 		error = got_error_from_errno("close");
3002 	if (repo) {
3003 		const struct got_error *close_err = got_repo_close(repo);
3004 		if (error == NULL)
3005 			error = close_err;
3006 	}
3007 	if (worktree)
3008 		got_worktree_close(worktree);
3009 	if (pack_fds) {
3010 		const struct got_error *pack_err =
3011 		    got_repo_pack_fds_close(pack_fds);
3012 		if (error == NULL)
3013 			error = pack_err;
3014 	}
3015 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3016 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
3017 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
3018 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
3019 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
3020 	got_ref_list_free(&remote_refs);
3021 	free(id_str);
3022 	free(worktree_path);
3023 	free(pack_hash);
3024 	free(proto);
3025 	free(host);
3026 	free(port);
3027 	free(server_path);
3028 	free(repo_name);
3029 	free(commit_id);
3030 	free(commit_id_str);
3031 	return error;
3032 }
3033 
3034 static const struct got_error *
3035 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3036     const char *path, int diff_context, int ignore_whitespace,
3037     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3038     struct got_repository *repo, FILE *outfile)
3039 {
3040 	const struct got_error *err = NULL;
3041 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3042 	FILE *f1 = NULL, *f2 = NULL;
3043 	int fd1 = -1, fd2 = -1;
3044 
3045 	fd1 = got_opentempfd();
3046 	if (fd1 == -1)
3047 		return got_error_from_errno("got_opentempfd");
3048 	fd2 = got_opentempfd();
3049 	if (fd2 == -1) {
3050 		err = got_error_from_errno("got_opentempfd");
3051 		goto done;
3052 	}
3053 
3054 	if (blob_id1) {
3055 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3056 		    fd1);
3057 		if (err)
3058 			goto done;
3059 	}
3060 
3061 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3062 	if (err)
3063 		goto done;
3064 
3065 	f1 = got_opentemp();
3066 	if (f1 == NULL) {
3067 		err = got_error_from_errno("got_opentemp");
3068 		goto done;
3069 	}
3070 	f2 = got_opentemp();
3071 	if (f2 == NULL) {
3072 		err = got_error_from_errno("got_opentemp");
3073 		goto done;
3074 	}
3075 
3076 	while (path[0] == '/')
3077 		path++;
3078 	err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3079 	    GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3080 	    force_text_diff, dsa, outfile);
3081 done:
3082 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3083 		err = got_error_from_errno("close");
3084 	if (blob1)
3085 		got_object_blob_close(blob1);
3086 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3087 		err = got_error_from_errno("close");
3088 	if (blob2)
3089 		got_object_blob_close(blob2);
3090 	if (f1 && fclose(f1) == EOF && err == NULL)
3091 		err = got_error_from_errno("fclose");
3092 	if (f2 && fclose(f2) == EOF && err == NULL)
3093 		err = got_error_from_errno("fclose");
3094 	return err;
3095 }
3096 
3097 static const struct got_error *
3098 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3099     const char *path, int diff_context, int ignore_whitespace,
3100     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3101     struct got_repository *repo, FILE *outfile)
3102 {
3103 	const struct got_error *err = NULL;
3104 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3105 	struct got_diff_blob_output_unidiff_arg arg;
3106 	FILE *f1 = NULL, *f2 = NULL;
3107 	int fd1 = -1, fd2 = -1;
3108 
3109 	if (tree_id1) {
3110 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3111 		if (err)
3112 			goto done;
3113 		fd1 = got_opentempfd();
3114 		if (fd1 == -1) {
3115 			err = got_error_from_errno("got_opentempfd");
3116 			goto done;
3117 		}
3118 	}
3119 
3120 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3121 	if (err)
3122 		goto done;
3123 
3124 	f1 = got_opentemp();
3125 	if (f1 == NULL) {
3126 		err = got_error_from_errno("got_opentemp");
3127 		goto done;
3128 	}
3129 
3130 	f2 = got_opentemp();
3131 	if (f2 == NULL) {
3132 		err = got_error_from_errno("got_opentemp");
3133 		goto done;
3134 	}
3135 	fd2 = got_opentempfd();
3136 	if (fd2 == -1) {
3137 		err = got_error_from_errno("got_opentempfd");
3138 		goto done;
3139 	}
3140 	arg.diff_context = diff_context;
3141 	arg.ignore_whitespace = ignore_whitespace;
3142 	arg.force_text_diff = force_text_diff;
3143 	arg.diffstat = dsa;
3144 	arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3145 	arg.outfile = outfile;
3146 	arg.lines = NULL;
3147 	arg.nlines = 0;
3148 	while (path[0] == '/')
3149 		path++;
3150 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3151 	    got_diff_blob_output_unidiff, &arg, 1);
3152 done:
3153 	if (tree1)
3154 		got_object_tree_close(tree1);
3155 	if (tree2)
3156 		got_object_tree_close(tree2);
3157 	if (f1 && fclose(f1) == EOF && err == NULL)
3158 		err = got_error_from_errno("fclose");
3159 	if (f2 && fclose(f2) == EOF && err == NULL)
3160 		err = got_error_from_errno("fclose");
3161 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3162 		err = got_error_from_errno("close");
3163 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3164 		err = got_error_from_errno("close");
3165 	return err;
3166 }
3167 
3168 static const struct got_error *
3169 get_changed_paths(struct got_pathlist_head *paths,
3170     struct got_commit_object *commit, struct got_repository *repo,
3171     struct got_diffstat_cb_arg *dsa)
3172 {
3173 	const struct got_error *err = NULL;
3174 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3175 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3176 	struct got_object_qid *qid;
3177 	got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3178 	FILE *f1 = NULL, *f2 = NULL;
3179 	int fd1 = -1, fd2 = -1;
3180 
3181 	if (dsa) {
3182 		cb = got_diff_tree_compute_diffstat;
3183 
3184 		f1 = got_opentemp();
3185 		if (f1 == NULL) {
3186 			err = got_error_from_errno("got_opentemp");
3187 			goto done;
3188 		}
3189 		f2 = got_opentemp();
3190 		if (f2 == NULL) {
3191 			err = got_error_from_errno("got_opentemp");
3192 			goto done;
3193 		}
3194 		fd1 = got_opentempfd();
3195 		if (fd1 == -1) {
3196 			err = got_error_from_errno("got_opentempfd");
3197 			goto done;
3198 		}
3199 		fd2 = got_opentempfd();
3200 		if (fd2 == -1) {
3201 			err = got_error_from_errno("got_opentempfd");
3202 			goto done;
3203 		}
3204 	}
3205 
3206 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3207 	if (qid != NULL) {
3208 		struct got_commit_object *pcommit;
3209 		err = got_object_open_as_commit(&pcommit, repo,
3210 		    &qid->id);
3211 		if (err)
3212 			return err;
3213 
3214 		tree_id1 = got_object_id_dup(
3215 		    got_object_commit_get_tree_id(pcommit));
3216 		if (tree_id1 == NULL) {
3217 			got_object_commit_close(pcommit);
3218 			return got_error_from_errno("got_object_id_dup");
3219 		}
3220 		got_object_commit_close(pcommit);
3221 
3222 	}
3223 
3224 	if (tree_id1) {
3225 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3226 		if (err)
3227 			goto done;
3228 	}
3229 
3230 	tree_id2 = got_object_commit_get_tree_id(commit);
3231 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3232 	if (err)
3233 		goto done;
3234 
3235 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3236 	    cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3237 done:
3238 	if (tree1)
3239 		got_object_tree_close(tree1);
3240 	if (tree2)
3241 		got_object_tree_close(tree2);
3242 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3243 		err = got_error_from_errno("close");
3244 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3245 		err = got_error_from_errno("close");
3246 	if (f1 && fclose(f1) == EOF && err == NULL)
3247 		err = got_error_from_errno("fclose");
3248 	if (f2 && fclose(f2) == EOF && err == NULL)
3249 		err = got_error_from_errno("fclose");
3250 	free(tree_id1);
3251 	return err;
3252 }
3253 
3254 static const struct got_error *
3255 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3256     const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3257     struct got_repository *repo, FILE *outfile)
3258 {
3259 	const struct got_error *err = NULL;
3260 	struct got_commit_object *pcommit = NULL;
3261 	char *id_str1 = NULL, *id_str2 = NULL;
3262 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3263 	struct got_object_qid *qid;
3264 
3265 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3266 	if (qid != NULL) {
3267 		err = got_object_open_as_commit(&pcommit, repo,
3268 		    &qid->id);
3269 		if (err)
3270 			return err;
3271 		err = got_object_id_str(&id_str1, &qid->id);
3272 		if (err)
3273 			goto done;
3274 	}
3275 
3276 	err = got_object_id_str(&id_str2, id);
3277 	if (err)
3278 		goto done;
3279 
3280 	if (path && path[0] != '\0') {
3281 		int obj_type;
3282 		err = got_object_id_by_path(&obj_id2, repo, commit, path);
3283 		if (err)
3284 			goto done;
3285 		if (pcommit) {
3286 			err = got_object_id_by_path(&obj_id1, repo,
3287 			    pcommit, path);
3288 			if (err) {
3289 				if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3290 					free(obj_id2);
3291 					goto done;
3292 				}
3293 			}
3294 		}
3295 		err = got_object_get_type(&obj_type, repo, obj_id2);
3296 		if (err) {
3297 			free(obj_id2);
3298 			goto done;
3299 		}
3300 		fprintf(outfile,
3301 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3302 		fprintf(outfile, "commit - %s\n",
3303 		    id_str1 ? id_str1 : "/dev/null");
3304 		fprintf(outfile, "commit + %s\n", id_str2);
3305 		switch (obj_type) {
3306 		case GOT_OBJ_TYPE_BLOB:
3307 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3308 			    0, 0, dsa, repo, outfile);
3309 			break;
3310 		case GOT_OBJ_TYPE_TREE:
3311 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
3312 			    0, 0, dsa, repo, outfile);
3313 			break;
3314 		default:
3315 			err = got_error(GOT_ERR_OBJ_TYPE);
3316 			break;
3317 		}
3318 		free(obj_id1);
3319 		free(obj_id2);
3320 	} else {
3321 		obj_id2 = got_object_commit_get_tree_id(commit);
3322 		if (pcommit)
3323 			obj_id1 = got_object_commit_get_tree_id(pcommit);
3324 		fprintf(outfile,
3325 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3326 		fprintf(outfile, "commit - %s\n",
3327 		    id_str1 ? id_str1 : "/dev/null");
3328 		fprintf(outfile, "commit + %s\n", id_str2);
3329 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3330 		    dsa, repo, outfile);
3331 	}
3332 done:
3333 	free(id_str1);
3334 	free(id_str2);
3335 	if (pcommit)
3336 		got_object_commit_close(pcommit);
3337 	return err;
3338 }
3339 
3340 static char *
3341 get_datestr(time_t *time, char *datebuf)
3342 {
3343 	struct tm mytm, *tm;
3344 	char *p, *s;
3345 
3346 	tm = gmtime_r(time, &mytm);
3347 	if (tm == NULL)
3348 		return NULL;
3349 	s = asctime_r(tm, datebuf);
3350 	if (s == NULL)
3351 		return NULL;
3352 	p = strchr(s, '\n');
3353 	if (p)
3354 		*p = '\0';
3355 	return s;
3356 }
3357 
3358 static const struct got_error *
3359 match_commit(int *have_match, struct got_object_id *id,
3360     struct got_commit_object *commit, regex_t *regex)
3361 {
3362 	const struct got_error *err = NULL;
3363 	regmatch_t regmatch;
3364 	char *id_str = NULL, *logmsg = NULL;
3365 
3366 	*have_match = 0;
3367 
3368 	err = got_object_id_str(&id_str, id);
3369 	if (err)
3370 		return err;
3371 
3372 	err = got_object_commit_get_logmsg(&logmsg, commit);
3373 	if (err)
3374 		goto done;
3375 
3376 	if (regexec(regex, got_object_commit_get_author(commit), 1,
3377 	    &regmatch, 0) == 0 ||
3378 	    regexec(regex, got_object_commit_get_committer(commit), 1,
3379 	    &regmatch, 0) == 0 ||
3380 	    regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
3381 	    regexec(regex, logmsg, 1, &regmatch, 0) == 0)
3382 		*have_match = 1;
3383 done:
3384 	free(id_str);
3385 	free(logmsg);
3386 	return err;
3387 }
3388 
3389 static void
3390 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3391     regex_t *regex)
3392 {
3393 	regmatch_t regmatch;
3394 	struct got_pathlist_entry *pe;
3395 
3396 	*have_match = 0;
3397 
3398 	TAILQ_FOREACH(pe, changed_paths, entry) {
3399 		if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
3400 			*have_match = 1;
3401 			break;
3402 		}
3403 	}
3404 }
3405 
3406 static const struct got_error *
3407 match_patch(int *have_match, struct got_commit_object *commit,
3408     struct got_object_id *id, const char *path, int diff_context,
3409     struct got_repository *repo, regex_t *regex, FILE *f)
3410 {
3411 	const struct got_error *err = NULL;
3412 	char *line = NULL;
3413 	size_t linesize = 0;
3414 	regmatch_t regmatch;
3415 
3416 	*have_match = 0;
3417 
3418 	err = got_opentemp_truncate(f);
3419 	if (err)
3420 		return err;
3421 
3422 	err = print_patch(commit, id, path, diff_context, NULL, repo, f);
3423 	if (err)
3424 		goto done;
3425 
3426 	if (fseeko(f, 0L, SEEK_SET) == -1) {
3427 		err = got_error_from_errno("fseeko");
3428 		goto done;
3429 	}
3430 
3431 	while (getline(&line, &linesize, f) != -1) {
3432 		if (regexec(regex, line, 1, &regmatch, 0) == 0) {
3433 			*have_match = 1;
3434 			break;
3435 		}
3436 	}
3437 done:
3438 	free(line);
3439 	return err;
3440 }
3441 
3442 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3443 
3444 static const struct got_error*
3445 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3446     struct got_object_id *id, struct got_repository *repo,
3447     int local_only)
3448 {
3449 	static const struct got_error *err = NULL;
3450 	struct got_reflist_entry *re;
3451 	char *s;
3452 	const char *name;
3453 
3454 	*refs_str = NULL;
3455 
3456 	TAILQ_FOREACH(re, refs, entry) {
3457 		struct got_tag_object *tag = NULL;
3458 		struct got_object_id *ref_id;
3459 		int cmp;
3460 
3461 		name = got_ref_get_name(re->ref);
3462 		if (strcmp(name, GOT_REF_HEAD) == 0)
3463 			continue;
3464 		if (strncmp(name, "refs/", 5) == 0)
3465 			name += 5;
3466 		if (strncmp(name, "got/", 4) == 0)
3467 			continue;
3468 		if (strncmp(name, "heads/", 6) == 0)
3469 			name += 6;
3470 		if (strncmp(name, "remotes/", 8) == 0) {
3471 			if (local_only)
3472 				continue;
3473 			name += 8;
3474 			s = strstr(name, "/" GOT_REF_HEAD);
3475 			if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
3476 				continue;
3477 		}
3478 		err = got_ref_resolve(&ref_id, repo, re->ref);
3479 		if (err)
3480 			break;
3481 		if (strncmp(name, "tags/", 5) == 0) {
3482 			err = got_object_open_as_tag(&tag, repo, ref_id);
3483 			if (err) {
3484 				if (err->code != GOT_ERR_OBJ_TYPE) {
3485 					free(ref_id);
3486 					break;
3487 				}
3488 				/* Ref points at something other than a tag. */
3489 				err = NULL;
3490 				tag = NULL;
3491 			}
3492 		}
3493 		cmp = got_object_id_cmp(tag ?
3494 		    got_object_tag_get_object_id(tag) : ref_id, id);
3495 		free(ref_id);
3496 		if (tag)
3497 			got_object_tag_close(tag);
3498 		if (cmp != 0)
3499 			continue;
3500 		s = *refs_str;
3501 		if (asprintf(refs_str, "%s%s%s", s ? s : "",
3502 		    s ? ", " : "", name) == -1) {
3503 			err = got_error_from_errno("asprintf");
3504 			free(s);
3505 			*refs_str = NULL;
3506 			break;
3507 		}
3508 		free(s);
3509 	}
3510 
3511 	return err;
3512 }
3513 
3514 static const struct got_error *
3515 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3516     struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3517 {
3518 	const struct got_error *err = NULL;
3519 	char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3520 	char *comma, *s, *nl;
3521 	struct got_reflist_head *refs;
3522 	char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3523 	struct tm tm;
3524 	time_t committer_time;
3525 
3526 	refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3527 	if (refs) {
3528 		err = build_refs_str(&ref_str, refs, id, repo, 1);
3529 		if (err)
3530 			return err;
3531 
3532 		/* Display the first matching ref only. */
3533 		if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3534 			*comma = '\0';
3535 	}
3536 
3537 	if (ref_str == NULL) {
3538 		err = got_object_id_str(&id_str, id);
3539 		if (err)
3540 			return err;
3541 	}
3542 
3543 	committer_time = got_object_commit_get_committer_time(commit);
3544 	if (gmtime_r(&committer_time, &tm) == NULL) {
3545 		err = got_error_from_errno("gmtime_r");
3546 		goto done;
3547 	}
3548 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3549 		err = got_error(GOT_ERR_NO_SPACE);
3550 		goto done;
3551 	}
3552 
3553 	err = got_object_commit_get_logmsg(&logmsg0, commit);
3554 	if (err)
3555 		goto done;
3556 
3557 	s = logmsg0;
3558 	while (isspace((unsigned char)s[0]))
3559 		s++;
3560 
3561 	nl = strchr(s, '\n');
3562 	if (nl) {
3563 		*nl = '\0';
3564 	}
3565 
3566 	if (ref_str)
3567 		printf("%s%-7s %s\n", datebuf, ref_str, s);
3568 	else
3569 		printf("%s%.7s %s\n", datebuf, id_str, s);
3570 
3571 	if (fflush(stdout) != 0 && err == NULL)
3572 		err = got_error_from_errno("fflush");
3573 done:
3574 	free(id_str);
3575 	free(ref_str);
3576 	free(logmsg0);
3577 	return err;
3578 }
3579 
3580 static const struct got_error *
3581 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
3582 {
3583 	struct got_pathlist_entry *pe;
3584 
3585 	if (header != NULL)
3586 		printf("%s\n", header);
3587 
3588 	TAILQ_FOREACH(pe, dsa->paths, entry) {
3589 		struct got_diff_changed_path *cp = pe->data;
3590 		int pad = dsa->max_path_len - pe->path_len + 1;
3591 
3592 		printf(" %c  %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
3593 		    ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
3594 	}
3595 	printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
3596 	    dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
3597 	    dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
3598 
3599 	if (fflush(stdout) != 0)
3600 		return got_error_from_errno("fflush");
3601 
3602 	return NULL;
3603 }
3604 
3605 static const struct got_error *
3606 printfile(FILE *f)
3607 {
3608 	char	buf[8192];
3609 	size_t	r;
3610 
3611 	if (fseeko(f, 0L, SEEK_SET) == -1)
3612 		return got_error_from_errno("fseek");
3613 
3614 	for (;;) {
3615 		r = fread(buf, 1, sizeof(buf), f);
3616 		if (r == 0) {
3617 			if (ferror(f))
3618 				return got_error_from_errno("fread");
3619 			if (feof(f))
3620 				break;
3621 		}
3622 		if (fwrite(buf, 1, r, stdout) != r)
3623 			return got_ferror(stdout, GOT_ERR_IO);
3624 	}
3625 
3626 	return NULL;
3627 }
3628 
3629 static const struct got_error *
3630 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3631     struct got_repository *repo, const char *path,
3632     struct got_pathlist_head *changed_paths,
3633     struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
3634     struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
3635     const char *prefix)
3636 {
3637 	const struct got_error *err = NULL;
3638 	FILE *f = NULL;
3639 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
3640 	char datebuf[26];
3641 	time_t committer_time;
3642 	const char *author, *committer;
3643 	char *refs_str = NULL;
3644 
3645 	err = got_object_id_str(&id_str, id);
3646 	if (err)
3647 		return err;
3648 
3649 	if (custom_refs_str == NULL) {
3650 		struct got_reflist_head *refs;
3651 		refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3652 		if (refs) {
3653 			err = build_refs_str(&refs_str, refs, id, repo, 0);
3654 			if (err)
3655 				goto done;
3656 		}
3657 	}
3658 
3659 	printf(GOT_COMMIT_SEP_STR);
3660 	if (custom_refs_str)
3661 		printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
3662 		    custom_refs_str);
3663 	else
3664 		printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
3665 		    refs_str ? " (" : "", refs_str ? refs_str : "",
3666 		    refs_str ? ")" : "");
3667 	free(id_str);
3668 	id_str = NULL;
3669 	free(refs_str);
3670 	refs_str = NULL;
3671 	printf("from: %s\n", got_object_commit_get_author(commit));
3672 	author = got_object_commit_get_author(commit);
3673 	committer = got_object_commit_get_committer(commit);
3674 	if (strcmp(author, committer) != 0)
3675 		printf("via: %s\n", committer);
3676 	committer_time = got_object_commit_get_committer_time(commit);
3677 	datestr = get_datestr(&committer_time, datebuf);
3678 	if (datestr)
3679 		printf("date: %s UTC\n", datestr);
3680 	if (got_object_commit_get_nparents(commit) > 1) {
3681 		const struct got_object_id_queue *parent_ids;
3682 		struct got_object_qid *qid;
3683 		int n = 1;
3684 		parent_ids = got_object_commit_get_parent_ids(commit);
3685 		STAILQ_FOREACH(qid, parent_ids, entry) {
3686 			err = got_object_id_str(&id_str, &qid->id);
3687 			if (err)
3688 				goto done;
3689 			printf("parent %d: %s\n", n++, id_str);
3690 			free(id_str);
3691 			id_str = NULL;
3692 		}
3693 	}
3694 
3695 	err = got_object_commit_get_logmsg(&logmsg0, commit);
3696 	if (err)
3697 		goto done;
3698 
3699 	logmsg = logmsg0;
3700 	do {
3701 		line = strsep(&logmsg, "\n");
3702 		if (line)
3703 			printf(" %s\n", line);
3704 	} while (line);
3705 	free(logmsg0);
3706 
3707 	if (changed_paths && diffstat == NULL) {
3708 		struct got_pathlist_entry *pe;
3709 
3710 		TAILQ_FOREACH(pe, changed_paths, entry) {
3711 			struct got_diff_changed_path *cp = pe->data;
3712 
3713 			printf(" %c  %s\n", cp->status, pe->path);
3714 		}
3715 		printf("\n");
3716 	}
3717 	if (show_patch) {
3718 		if (diffstat) {
3719 			f = got_opentemp();
3720 			if (f == NULL) {
3721 				err = got_error_from_errno("got_opentemp");
3722 				goto done;
3723 			}
3724 		}
3725 
3726 		err = print_patch(commit, id, path, diff_context, diffstat,
3727 		    repo, diffstat == NULL ? stdout : f);
3728 		if (err)
3729 			goto done;
3730 	}
3731 	if (diffstat) {
3732 		err = print_diffstat(diffstat, NULL);
3733 		if (err)
3734 			goto done;
3735 		if (show_patch) {
3736 			err = printfile(f);
3737 			if (err)
3738 				goto done;
3739 		}
3740 	}
3741 	if (show_patch)
3742 		printf("\n");
3743 
3744 	if (fflush(stdout) != 0 && err == NULL)
3745 		err = got_error_from_errno("fflush");
3746 done:
3747 	if (f && fclose(f) == EOF && err == NULL)
3748 		err = got_error_from_errno("fclose");
3749 	free(id_str);
3750 	free(refs_str);
3751 	return err;
3752 }
3753 
3754 static const struct got_error *
3755 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3756     struct got_repository *repo, const char *path, int show_changed_paths,
3757     int show_diffstat, int show_patch, const char *search_pattern,
3758     int diff_context, int limit, int log_branches, int reverse_display_order,
3759     struct got_reflist_object_id_map *refs_idmap, int one_line,
3760     FILE *tmpfile)
3761 {
3762 	const struct got_error *err;
3763 	struct got_commit_graph *graph;
3764 	regex_t regex;
3765 	int have_match;
3766 	struct got_object_id_queue reversed_commits;
3767 	struct got_object_qid *qid;
3768 	struct got_commit_object *commit;
3769 	struct got_pathlist_head changed_paths;
3770 
3771 	STAILQ_INIT(&reversed_commits);
3772 	TAILQ_INIT(&changed_paths);
3773 
3774 	if (search_pattern && regcomp(&regex, search_pattern,
3775 	    REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3776 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
3777 
3778 	err = got_commit_graph_open(&graph, path, !log_branches);
3779 	if (err)
3780 		return err;
3781 	err = got_commit_graph_iter_start(graph, root_id, repo,
3782 	    check_cancelled, NULL);
3783 	if (err)
3784 		goto done;
3785 	for (;;) {
3786 		struct got_object_id id;
3787 		struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3788 		    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3789 
3790 		if (sigint_received || sigpipe_received)
3791 			break;
3792 
3793 		err = got_commit_graph_iter_next(&id, graph, repo,
3794 		    check_cancelled, NULL);
3795 		if (err) {
3796 			if (err->code == GOT_ERR_ITER_COMPLETED)
3797 				err = NULL;
3798 			break;
3799 		}
3800 
3801 		err = got_object_open_as_commit(&commit, repo, &id);
3802 		if (err)
3803 			break;
3804 
3805 		if ((show_changed_paths || (show_diffstat && !show_patch))
3806 		    && !reverse_display_order) {
3807 			err = get_changed_paths(&changed_paths, commit, repo,
3808 			    show_diffstat ? &dsa : NULL);
3809 			if (err)
3810 				break;
3811 		}
3812 
3813 		if (search_pattern) {
3814 			err = match_commit(&have_match, &id, commit, &regex);
3815 			if (err) {
3816 				got_object_commit_close(commit);
3817 				break;
3818 			}
3819 			if (have_match == 0 && show_changed_paths)
3820 				match_changed_paths(&have_match,
3821 				    &changed_paths, &regex);
3822 			if (have_match == 0 && show_patch) {
3823 				err = match_patch(&have_match, commit, &id,
3824 				    path, diff_context, repo, &regex, tmpfile);
3825 				if (err)
3826 					break;
3827 			}
3828 			if (have_match == 0) {
3829 				got_object_commit_close(commit);
3830 				got_pathlist_free(&changed_paths,
3831 				    GOT_PATHLIST_FREE_ALL);
3832 				continue;
3833 			}
3834 		}
3835 
3836 		if (reverse_display_order) {
3837 			err = got_object_qid_alloc(&qid, &id);
3838 			if (err)
3839 				break;
3840 			STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3841 			got_object_commit_close(commit);
3842 		} else {
3843 			if (one_line)
3844 				err = print_commit_oneline(commit, &id,
3845 				    repo, refs_idmap);
3846 			else
3847 				err = print_commit(commit, &id, repo, path,
3848 				    (show_changed_paths || show_diffstat) ?
3849 				    &changed_paths : NULL,
3850 				    show_diffstat ? &dsa : NULL, show_patch,
3851 				    diff_context, refs_idmap, NULL, NULL);
3852 			got_object_commit_close(commit);
3853 			if (err)
3854 				break;
3855 		}
3856 		if ((limit && --limit == 0) ||
3857 		    (end_id && got_object_id_cmp(&id, end_id) == 0))
3858 			break;
3859 
3860 		got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3861 	}
3862 	if (reverse_display_order) {
3863 		STAILQ_FOREACH(qid, &reversed_commits, entry) {
3864 			struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3865 			    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3866 
3867 			err = got_object_open_as_commit(&commit, repo,
3868 			    &qid->id);
3869 			if (err)
3870 				break;
3871 			if (show_changed_paths ||
3872 			    (show_diffstat && !show_patch)) {
3873 				err = get_changed_paths(&changed_paths, commit,
3874 				    repo, show_diffstat ? &dsa : NULL);
3875 				if (err)
3876 					break;
3877 			}
3878 			if (one_line)
3879 				err = print_commit_oneline(commit, &qid->id,
3880 				    repo, refs_idmap);
3881 			else
3882 				err = print_commit(commit, &qid->id, repo, path,
3883 				    (show_changed_paths || show_diffstat) ?
3884 				    &changed_paths : NULL,
3885 				    show_diffstat ? &dsa : NULL, show_patch,
3886 				    diff_context, refs_idmap, NULL, NULL);
3887 			got_object_commit_close(commit);
3888 			if (err)
3889 				break;
3890 			got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3891 		}
3892 	}
3893 done:
3894 	while (!STAILQ_EMPTY(&reversed_commits)) {
3895 		qid = STAILQ_FIRST(&reversed_commits);
3896 		STAILQ_REMOVE_HEAD(&reversed_commits, entry);
3897 		got_object_qid_free(qid);
3898 	}
3899 	got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3900 	if (search_pattern)
3901 		regfree(&regex);
3902 	got_commit_graph_close(graph);
3903 	return err;
3904 }
3905 
3906 __dead static void
3907 usage_log(void)
3908 {
3909 	fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
3910 	    "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
3911 	    "[path]\n", getprogname());
3912 	exit(1);
3913 }
3914 
3915 static int
3916 get_default_log_limit(void)
3917 {
3918 	const char *got_default_log_limit;
3919 	long long n;
3920 	const char *errstr;
3921 
3922 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3923 	if (got_default_log_limit == NULL)
3924 		return 0;
3925 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3926 	if (errstr != NULL)
3927 		return 0;
3928 	return n;
3929 }
3930 
3931 static const struct got_error *
3932 cmd_log(int argc, char *argv[])
3933 {
3934 	const struct got_error *error;
3935 	struct got_repository *repo = NULL;
3936 	struct got_worktree *worktree = NULL;
3937 	struct got_object_id *start_id = NULL, *end_id = NULL;
3938 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3939 	const char *start_commit = NULL, *end_commit = NULL;
3940 	const char *search_pattern = NULL;
3941 	int diff_context = -1, ch;
3942 	int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3943 	int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
3944 	const char *errstr;
3945 	struct got_reflist_head refs;
3946 	struct got_reflist_object_id_map *refs_idmap = NULL;
3947 	FILE *tmpfile = NULL;
3948 	int *pack_fds = NULL;
3949 
3950 	TAILQ_INIT(&refs);
3951 
3952 #ifndef PROFILE
3953 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3954 	    NULL)
3955 	    == -1)
3956 		err(1, "pledge");
3957 #endif
3958 
3959 	limit = get_default_log_limit();
3960 
3961 	while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
3962 		switch (ch) {
3963 		case 'b':
3964 			log_branches = 1;
3965 			break;
3966 		case 'C':
3967 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3968 			    &errstr);
3969 			if (errstr != NULL)
3970 				errx(1, "number of context lines is %s: %s",
3971 				    errstr, optarg);
3972 			break;
3973 		case 'c':
3974 			start_commit = optarg;
3975 			break;
3976 		case 'd':
3977 			show_diffstat = 1;
3978 			break;
3979 		case 'l':
3980 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
3981 			if (errstr != NULL)
3982 				errx(1, "number of commits is %s: %s",
3983 				    errstr, optarg);
3984 			break;
3985 		case 'P':
3986 			show_changed_paths = 1;
3987 			break;
3988 		case 'p':
3989 			show_patch = 1;
3990 			break;
3991 		case 'R':
3992 			reverse_display_order = 1;
3993 			break;
3994 		case 'r':
3995 			repo_path = realpath(optarg, NULL);
3996 			if (repo_path == NULL)
3997 				return got_error_from_errno2("realpath",
3998 				    optarg);
3999 			got_path_strip_trailing_slashes(repo_path);
4000 			break;
4001 		case 'S':
4002 			search_pattern = optarg;
4003 			break;
4004 		case 's':
4005 			one_line = 1;
4006 			break;
4007 		case 'x':
4008 			end_commit = optarg;
4009 			break;
4010 		default:
4011 			usage_log();
4012 			/* NOTREACHED */
4013 		}
4014 	}
4015 
4016 	argc -= optind;
4017 	argv += optind;
4018 
4019 	if (diff_context == -1)
4020 		diff_context = 3;
4021 	else if (!show_patch)
4022 		errx(1, "-C requires -p");
4023 
4024 	if (one_line && (show_patch || show_changed_paths || show_diffstat))
4025 		errx(1, "cannot use -s with -d, -p or -P");
4026 
4027 	cwd = getcwd(NULL, 0);
4028 	if (cwd == NULL) {
4029 		error = got_error_from_errno("getcwd");
4030 		goto done;
4031 	}
4032 
4033 	error = got_repo_pack_fds_open(&pack_fds);
4034 	if (error != NULL)
4035 		goto done;
4036 
4037 	if (repo_path == NULL) {
4038 		error = got_worktree_open(&worktree, cwd);
4039 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4040 			goto done;
4041 		error = NULL;
4042 	}
4043 
4044 	if (argc == 1) {
4045 		if (worktree) {
4046 			error = got_worktree_resolve_path(&path, worktree,
4047 			    argv[0]);
4048 			if (error)
4049 				goto done;
4050 		} else {
4051 			path = strdup(argv[0]);
4052 			if (path == NULL) {
4053 				error = got_error_from_errno("strdup");
4054 				goto done;
4055 			}
4056 		}
4057 	} else if (argc != 0)
4058 		usage_log();
4059 
4060 	if (repo_path == NULL) {
4061 		repo_path = worktree ?
4062 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4063 	}
4064 	if (repo_path == NULL) {
4065 		error = got_error_from_errno("strdup");
4066 		goto done;
4067 	}
4068 
4069 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4070 	if (error != NULL)
4071 		goto done;
4072 
4073 	error = apply_unveil(got_repo_get_path(repo), 1,
4074 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4075 	if (error)
4076 		goto done;
4077 
4078 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4079 	if (error)
4080 		goto done;
4081 
4082 	error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4083 	if (error)
4084 		goto done;
4085 
4086 	if (start_commit == NULL) {
4087 		struct got_reference *head_ref;
4088 		struct got_commit_object *commit = NULL;
4089 		error = got_ref_open(&head_ref, repo,
4090 		    worktree ? got_worktree_get_head_ref_name(worktree)
4091 		    : GOT_REF_HEAD, 0);
4092 		if (error != NULL)
4093 			goto done;
4094 		error = got_ref_resolve(&start_id, repo, head_ref);
4095 		got_ref_close(head_ref);
4096 		if (error != NULL)
4097 			goto done;
4098 		error = got_object_open_as_commit(&commit, repo,
4099 		    start_id);
4100 		if (error != NULL)
4101 			goto done;
4102 		got_object_commit_close(commit);
4103 	} else {
4104 		error = got_repo_match_object_id(&start_id, NULL,
4105 		    start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4106 		if (error != NULL)
4107 			goto done;
4108 	}
4109 	if (end_commit != NULL) {
4110 		error = got_repo_match_object_id(&end_id, NULL,
4111 		    end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4112 		if (error != NULL)
4113 			goto done;
4114 	}
4115 
4116 	if (worktree) {
4117 		/*
4118 		 * If a path was specified on the command line it was resolved
4119 		 * to a path in the work tree above. Prepend the work tree's
4120 		 * path prefix to obtain the corresponding in-repository path.
4121 		 */
4122 		if (path) {
4123 			const char *prefix;
4124 			prefix = got_worktree_get_path_prefix(worktree);
4125 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
4126 			    (path[0] != '\0') ? "/" : "", path) == -1) {
4127 				error = got_error_from_errno("asprintf");
4128 				goto done;
4129 			}
4130 		}
4131 	} else
4132 		error = got_repo_map_path(&in_repo_path, repo,
4133 		    path ? path : "");
4134 	if (error != NULL)
4135 		goto done;
4136 	if (in_repo_path) {
4137 		free(path);
4138 		path = in_repo_path;
4139 	}
4140 
4141 	if (worktree) {
4142 		/* Release work tree lock. */
4143 		got_worktree_close(worktree);
4144 		worktree = NULL;
4145 	}
4146 
4147 	if (search_pattern && show_patch) {
4148 		tmpfile = got_opentemp();
4149 		if (tmpfile == NULL) {
4150 			error = got_error_from_errno("got_opentemp");
4151 			goto done;
4152 		}
4153 	}
4154 
4155 	error = print_commits(start_id, end_id, repo, path ? path : "",
4156 	    show_changed_paths, show_diffstat, show_patch, search_pattern,
4157 	    diff_context, limit, log_branches, reverse_display_order,
4158 	    refs_idmap, one_line, tmpfile);
4159 done:
4160 	free(path);
4161 	free(repo_path);
4162 	free(cwd);
4163 	free(start_id);
4164 	free(end_id);
4165 	if (worktree)
4166 		got_worktree_close(worktree);
4167 	if (repo) {
4168 		const struct got_error *close_err = got_repo_close(repo);
4169 		if (error == NULL)
4170 			error = close_err;
4171 	}
4172 	if (pack_fds) {
4173 		const struct got_error *pack_err =
4174 		    got_repo_pack_fds_close(pack_fds);
4175 		if (error == NULL)
4176 			error = pack_err;
4177 	}
4178 	if (refs_idmap)
4179 		got_reflist_object_id_map_free(refs_idmap);
4180 	if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4181 		error = got_error_from_errno("fclose");
4182 	got_ref_list_free(&refs);
4183 	return error;
4184 }
4185 
4186 __dead static void
4187 usage_diff(void)
4188 {
4189 	fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4190 	    "[-r repository-path] [object1 object2 | path ...]\n",
4191 	    getprogname());
4192 	exit(1);
4193 }
4194 
4195 struct print_diff_arg {
4196 	struct got_repository *repo;
4197 	struct got_worktree *worktree;
4198 	struct got_diffstat_cb_arg *diffstat;
4199 	int diff_context;
4200 	const char *id_str;
4201 	int header_shown;
4202 	int diff_staged;
4203 	enum got_diff_algorithm diff_algo;
4204 	int ignore_whitespace;
4205 	int force_text_diff;
4206 	FILE *f1;
4207 	FILE *f2;
4208 	FILE *outfile;
4209 };
4210 
4211 /*
4212  * Create a file which contains the target path of a symlink so we can feed
4213  * it as content to the diff engine.
4214  */
4215 static const struct got_error *
4216 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4217     const char *abspath)
4218 {
4219 	const struct got_error *err = NULL;
4220 	char target_path[PATH_MAX];
4221 	ssize_t target_len, outlen;
4222 
4223 	*fd = -1;
4224 
4225 	if (dirfd != -1) {
4226 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4227 		if (target_len == -1)
4228 			return got_error_from_errno2("readlinkat", abspath);
4229 	} else {
4230 		target_len = readlink(abspath, target_path, PATH_MAX);
4231 		if (target_len == -1)
4232 			return got_error_from_errno2("readlink", abspath);
4233 	}
4234 
4235 	*fd = got_opentempfd();
4236 	if (*fd == -1)
4237 		return got_error_from_errno("got_opentempfd");
4238 
4239 	outlen = write(*fd, target_path, target_len);
4240 	if (outlen == -1) {
4241 		err = got_error_from_errno("got_opentempfd");
4242 		goto done;
4243 	}
4244 
4245 	if (lseek(*fd, 0, SEEK_SET) == -1) {
4246 		err = got_error_from_errno2("lseek", abspath);
4247 		goto done;
4248 	}
4249 done:
4250 	if (err) {
4251 		close(*fd);
4252 		*fd = -1;
4253 	}
4254 	return err;
4255 }
4256 
4257 static const struct got_error *
4258 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4259     const char *path, struct got_object_id *blob_id,
4260     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4261     int dirfd, const char *de_name)
4262 {
4263 	struct print_diff_arg *a = arg;
4264 	const struct got_error *err = NULL;
4265 	struct got_blob_object *blob1 = NULL;
4266 	int fd = -1, fd1 = -1, fd2 = -1;
4267 	FILE *f2 = NULL;
4268 	char *abspath = NULL, *label1 = NULL;
4269 	struct stat sb;
4270 	off_t size1 = 0;
4271 	int f2_exists = 0;
4272 
4273 	memset(&sb, 0, sizeof(sb));
4274 
4275 	if (a->diff_staged) {
4276 		if (staged_status != GOT_STATUS_MODIFY &&
4277 		    staged_status != GOT_STATUS_ADD &&
4278 		    staged_status != GOT_STATUS_DELETE)
4279 			return NULL;
4280 	} else {
4281 		if (staged_status == GOT_STATUS_DELETE)
4282 			return NULL;
4283 		if (status == GOT_STATUS_NONEXISTENT)
4284 			return got_error_set_errno(ENOENT, path);
4285 		if (status != GOT_STATUS_MODIFY &&
4286 		    status != GOT_STATUS_ADD &&
4287 		    status != GOT_STATUS_DELETE &&
4288 		    status != GOT_STATUS_CONFLICT)
4289 			return NULL;
4290 	}
4291 
4292 	err = got_opentemp_truncate(a->f1);
4293 	if (err)
4294 		return got_error_from_errno("got_opentemp_truncate");
4295 	err = got_opentemp_truncate(a->f2);
4296 	if (err)
4297 		return got_error_from_errno("got_opentemp_truncate");
4298 
4299 	if (!a->header_shown) {
4300 		if (fprintf(a->outfile, "diff %s%s\n",
4301 		    a->diff_staged ? "-s " : "",
4302 		    got_worktree_get_root_path(a->worktree)) < 0) {
4303 			err = got_error_from_errno("fprintf");
4304 			goto done;
4305 		}
4306 		if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4307 			err = got_error_from_errno("fprintf");
4308 			goto done;
4309 		}
4310 		if (fprintf(a->outfile, "path + %s%s\n",
4311 		    got_worktree_get_root_path(a->worktree),
4312 		    a->diff_staged ? " (staged changes)" : "") < 0) {
4313 			err = got_error_from_errno("fprintf");
4314 			goto done;
4315 		}
4316 		a->header_shown = 1;
4317 	}
4318 
4319 	if (a->diff_staged) {
4320 		const char *label1 = NULL, *label2 = NULL;
4321 		switch (staged_status) {
4322 		case GOT_STATUS_MODIFY:
4323 			label1 = path;
4324 			label2 = path;
4325 			break;
4326 		case GOT_STATUS_ADD:
4327 			label2 = path;
4328 			break;
4329 		case GOT_STATUS_DELETE:
4330 			label1 = path;
4331 			break;
4332 		default:
4333 			return got_error(GOT_ERR_FILE_STATUS);
4334 		}
4335 		fd1 = got_opentempfd();
4336 		if (fd1 == -1) {
4337 			err = got_error_from_errno("got_opentempfd");
4338 			goto done;
4339 		}
4340 		fd2 = got_opentempfd();
4341 		if (fd2 == -1) {
4342 			err = got_error_from_errno("got_opentempfd");
4343 			goto done;
4344 		}
4345 		err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
4346 		    fd1, fd2, blob_id, staged_blob_id, label1, label2,
4347 		    a->diff_algo, a->diff_context, a->ignore_whitespace,
4348 		    a->force_text_diff, a->diffstat, a->repo, a->outfile);
4349 		goto done;
4350 	}
4351 
4352 	fd1 = got_opentempfd();
4353 	if (fd1 == -1) {
4354 		err = got_error_from_errno("got_opentempfd");
4355 		goto done;
4356 	}
4357 
4358 	if (staged_status == GOT_STATUS_ADD ||
4359 	    staged_status == GOT_STATUS_MODIFY) {
4360 		char *id_str;
4361 		err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4362 		    8192, fd1);
4363 		if (err)
4364 			goto done;
4365 		err = got_object_id_str(&id_str, staged_blob_id);
4366 		if (err)
4367 			goto done;
4368 		if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4369 			err = got_error_from_errno("asprintf");
4370 			free(id_str);
4371 			goto done;
4372 		}
4373 		free(id_str);
4374 	} else if (status != GOT_STATUS_ADD) {
4375 		err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
4376 		    fd1);
4377 		if (err)
4378 			goto done;
4379 	}
4380 
4381 	if (status != GOT_STATUS_DELETE) {
4382 		if (asprintf(&abspath, "%s/%s",
4383 		    got_worktree_get_root_path(a->worktree), path) == -1) {
4384 			err = got_error_from_errno("asprintf");
4385 			goto done;
4386 		}
4387 
4388 		if (dirfd != -1) {
4389 			fd = openat(dirfd, de_name,
4390 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4391 			if (fd == -1) {
4392 				if (!got_err_open_nofollow_on_symlink()) {
4393 					err = got_error_from_errno2("openat",
4394 					    abspath);
4395 					goto done;
4396 				}
4397 				err = get_symlink_target_file(&fd, dirfd,
4398 				    de_name, abspath);
4399 				if (err)
4400 					goto done;
4401 			}
4402 		} else {
4403 			fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4404 			if (fd == -1) {
4405 				if (!got_err_open_nofollow_on_symlink()) {
4406 					err = got_error_from_errno2("open",
4407 					    abspath);
4408 					goto done;
4409 				}
4410 				err = get_symlink_target_file(&fd, dirfd,
4411 				    de_name, abspath);
4412 				if (err)
4413 					goto done;
4414 			}
4415 		}
4416 		if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
4417 			err = got_error_from_errno2("fstatat", abspath);
4418 			goto done;
4419 		}
4420 		f2 = fdopen(fd, "r");
4421 		if (f2 == NULL) {
4422 			err = got_error_from_errno2("fdopen", abspath);
4423 			goto done;
4424 		}
4425 		fd = -1;
4426 		f2_exists = 1;
4427 	}
4428 
4429 	if (blob1) {
4430 		err = got_object_blob_dump_to_file(&size1, NULL, NULL,
4431 		    a->f1, blob1);
4432 		if (err)
4433 			goto done;
4434 	}
4435 
4436 	err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
4437 	    f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
4438 	    a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
4439 done:
4440 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
4441 		err = got_error_from_errno("close");
4442 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4443 		err = got_error_from_errno("close");
4444 	if (blob1)
4445 		got_object_blob_close(blob1);
4446 	if (fd != -1 && close(fd) == -1 && err == NULL)
4447 		err = got_error_from_errno("close");
4448 	if (f2 && fclose(f2) == EOF && err == NULL)
4449 		err = got_error_from_errno("fclose");
4450 	free(abspath);
4451 	return err;
4452 }
4453 
4454 static const struct got_error *
4455 cmd_diff(int argc, char *argv[])
4456 {
4457 	const struct got_error *error;
4458 	struct got_repository *repo = NULL;
4459 	struct got_worktree *worktree = NULL;
4460 	char *cwd = NULL, *repo_path = NULL;
4461 	const char *commit_args[2] = { NULL, NULL };
4462 	int ncommit_args = 0;
4463 	struct got_object_id *ids[2] = { NULL, NULL };
4464 	char *labels[2] = { NULL, NULL };
4465 	int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4466 	int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4467 	int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
4468 	const char *errstr;
4469 	struct got_reflist_head refs;
4470 	struct got_pathlist_head diffstat_paths, paths;
4471 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4472 	int fd1 = -1, fd2 = -1;
4473 	int *pack_fds = NULL;
4474 	struct got_diffstat_cb_arg dsa;
4475 
4476 	memset(&dsa, 0, sizeof(dsa));
4477 
4478 	TAILQ_INIT(&refs);
4479 	TAILQ_INIT(&paths);
4480 	TAILQ_INIT(&diffstat_paths);
4481 
4482 #ifndef PROFILE
4483 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4484 	    NULL) == -1)
4485 		err(1, "pledge");
4486 #endif
4487 
4488 	while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
4489 		switch (ch) {
4490 		case 'a':
4491 			force_text_diff = 1;
4492 			break;
4493 		case 'C':
4494 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4495 			    &errstr);
4496 			if (errstr != NULL)
4497 				errx(1, "number of context lines is %s: %s",
4498 				    errstr, optarg);
4499 			break;
4500 		case 'c':
4501 			if (ncommit_args >= 2)
4502 				errx(1, "too many -c options used");
4503 			commit_args[ncommit_args++] = optarg;
4504 			break;
4505 		case 'd':
4506 			show_diffstat = 1;
4507 			break;
4508 		case 'P':
4509 			force_path = 1;
4510 			break;
4511 		case 'r':
4512 			repo_path = realpath(optarg, NULL);
4513 			if (repo_path == NULL)
4514 				return got_error_from_errno2("realpath",
4515 				    optarg);
4516 			got_path_strip_trailing_slashes(repo_path);
4517 			rflag = 1;
4518 			break;
4519 		case 's':
4520 			diff_staged = 1;
4521 			break;
4522 		case 'w':
4523 			ignore_whitespace = 1;
4524 			break;
4525 		default:
4526 			usage_diff();
4527 			/* NOTREACHED */
4528 		}
4529 	}
4530 
4531 	argc -= optind;
4532 	argv += optind;
4533 
4534 	cwd = getcwd(NULL, 0);
4535 	if (cwd == NULL) {
4536 		error = got_error_from_errno("getcwd");
4537 		goto done;
4538 	}
4539 
4540 	error = got_repo_pack_fds_open(&pack_fds);
4541 	if (error != NULL)
4542 		goto done;
4543 
4544 	if (repo_path == NULL) {
4545 		error = got_worktree_open(&worktree, cwd);
4546 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4547 			goto done;
4548 		else
4549 			error = NULL;
4550 		if (worktree) {
4551 			repo_path =
4552 			    strdup(got_worktree_get_repo_path(worktree));
4553 			if (repo_path == NULL) {
4554 				error = got_error_from_errno("strdup");
4555 				goto done;
4556 			}
4557 		} else {
4558 			repo_path = strdup(cwd);
4559 			if (repo_path == NULL) {
4560 				error = got_error_from_errno("strdup");
4561 				goto done;
4562 			}
4563 		}
4564 	}
4565 
4566 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4567 	free(repo_path);
4568 	if (error != NULL)
4569 		goto done;
4570 
4571 	if (show_diffstat) {
4572 		dsa.paths = &diffstat_paths;
4573 		dsa.force_text = force_text_diff;
4574 		dsa.ignore_ws = ignore_whitespace;
4575 		dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4576 	}
4577 
4578 	if (rflag || worktree == NULL || ncommit_args > 0) {
4579 		if (force_path) {
4580 			error = got_error_msg(GOT_ERR_NOT_IMPL,
4581 			    "-P option can only be used when diffing "
4582 			    "a work tree");
4583 			goto done;
4584 		}
4585 		if (diff_staged) {
4586 			error = got_error_msg(GOT_ERR_NOT_IMPL,
4587 			    "-s option can only be used when diffing "
4588 			    "a work tree");
4589 			goto done;
4590 		}
4591 	}
4592 
4593 	error = apply_unveil(got_repo_get_path(repo), 1,
4594 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4595 	if (error)
4596 		goto done;
4597 
4598 	if ((!force_path && argc == 2) || ncommit_args > 0) {
4599 		int obj_type = (ncommit_args > 0 ?
4600 		    GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4601 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4602 		    NULL);
4603 		if (error)
4604 			goto done;
4605 		for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4606 			const char *arg;
4607 			if (ncommit_args > 0)
4608 				arg = commit_args[i];
4609 			else
4610 				arg = argv[i];
4611 			error = got_repo_match_object_id(&ids[i], &labels[i],
4612 			    arg, obj_type, &refs, repo);
4613 			if (error) {
4614 				if (error->code != GOT_ERR_NOT_REF &&
4615 				    error->code != GOT_ERR_NO_OBJ)
4616 					goto done;
4617 				if (ncommit_args > 0)
4618 					goto done;
4619 				error = NULL;
4620 				break;
4621 			}
4622 		}
4623 	}
4624 
4625 	f1 = got_opentemp();
4626 	if (f1 == NULL) {
4627 		error = got_error_from_errno("got_opentemp");
4628 		goto done;
4629 	}
4630 
4631 	f2 = got_opentemp();
4632 	if (f2 == NULL) {
4633 		error = got_error_from_errno("got_opentemp");
4634 		goto done;
4635 	}
4636 
4637 	outfile = got_opentemp();
4638 	if (outfile == NULL) {
4639 		error = got_error_from_errno("got_opentemp");
4640 		goto done;
4641 	}
4642 
4643 	if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4644 		struct print_diff_arg arg;
4645 		char *id_str;
4646 
4647 		if (worktree == NULL) {
4648 			if (argc == 2 && ids[0] == NULL) {
4649 				error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4650 				goto done;
4651 			} else if (argc == 2 && ids[1] == NULL) {
4652 				error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4653 				goto done;
4654 			} else if (argc > 0) {
4655 				error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4656 				    "%s", "specified paths cannot be resolved");
4657 				goto done;
4658 			} else {
4659 				error = got_error(GOT_ERR_NOT_WORKTREE);
4660 				goto done;
4661 			}
4662 		}
4663 
4664 		error = get_worktree_paths_from_argv(&paths, argc, argv,
4665 		    worktree);
4666 		if (error)
4667 			goto done;
4668 
4669 		error = got_object_id_str(&id_str,
4670 		    got_worktree_get_base_commit_id(worktree));
4671 		if (error)
4672 			goto done;
4673 		arg.repo = repo;
4674 		arg.worktree = worktree;
4675 		arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
4676 		arg.diff_context = diff_context;
4677 		arg.id_str = id_str;
4678 		arg.header_shown = 0;
4679 		arg.diff_staged = diff_staged;
4680 		arg.ignore_whitespace = ignore_whitespace;
4681 		arg.force_text_diff = force_text_diff;
4682 		arg.diffstat = show_diffstat ? &dsa : NULL;
4683 		arg.f1 = f1;
4684 		arg.f2 = f2;
4685 		arg.outfile = outfile;
4686 
4687 		error = got_worktree_status(worktree, &paths, repo, 0,
4688 		    print_diff, &arg, check_cancelled, NULL);
4689 		free(id_str);
4690 		if (error)
4691 			goto done;
4692 
4693 		if (show_diffstat && dsa.nfiles > 0) {
4694 			char *header;
4695 
4696 			if (asprintf(&header, "diffstat %s%s",
4697 			    diff_staged ? "-s " : "",
4698 			    got_worktree_get_root_path(worktree)) == -1) {
4699 				error = got_error_from_errno("asprintf");
4700 				goto done;
4701 			}
4702 
4703 			error = print_diffstat(&dsa, header);
4704 			free(header);
4705 			if (error)
4706 				goto done;
4707 		}
4708 
4709 		error = printfile(outfile);
4710 		goto done;
4711 	}
4712 
4713 	if (ncommit_args == 1) {
4714 		struct got_commit_object *commit;
4715 		error = got_object_open_as_commit(&commit, repo, ids[0]);
4716 		if (error)
4717 			goto done;
4718 
4719 		labels[1] = labels[0];
4720 		ids[1] = ids[0];
4721 		if (got_object_commit_get_nparents(commit) > 0) {
4722 			const struct got_object_id_queue *pids;
4723 			struct got_object_qid *pid;
4724 			pids = got_object_commit_get_parent_ids(commit);
4725 			pid = STAILQ_FIRST(pids);
4726 			ids[0] = got_object_id_dup(&pid->id);
4727 			if (ids[0] == NULL) {
4728 				error = got_error_from_errno(
4729 				    "got_object_id_dup");
4730 				got_object_commit_close(commit);
4731 				goto done;
4732 			}
4733 			error = got_object_id_str(&labels[0], ids[0]);
4734 			if (error) {
4735 				got_object_commit_close(commit);
4736 				goto done;
4737 			}
4738 		} else {
4739 			ids[0] = NULL;
4740 			labels[0] = strdup("/dev/null");
4741 			if (labels[0] == NULL) {
4742 				error = got_error_from_errno("strdup");
4743 				got_object_commit_close(commit);
4744 				goto done;
4745 			}
4746 		}
4747 
4748 		got_object_commit_close(commit);
4749 	}
4750 
4751 	if (ncommit_args == 0 && argc > 2) {
4752 		error = got_error_msg(GOT_ERR_BAD_PATH,
4753 		    "path arguments cannot be used when diffing two objects");
4754 		goto done;
4755 	}
4756 
4757 	if (ids[0]) {
4758 		error = got_object_get_type(&type1, repo, ids[0]);
4759 		if (error)
4760 			goto done;
4761 	}
4762 
4763 	error = got_object_get_type(&type2, repo, ids[1]);
4764 	if (error)
4765 		goto done;
4766 	if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4767 		error = got_error(GOT_ERR_OBJ_TYPE);
4768 		goto done;
4769 	}
4770 	if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
4771 		error = got_error_msg(GOT_ERR_OBJ_TYPE,
4772 		    "path arguments cannot be used when diffing blobs");
4773 		goto done;
4774 	}
4775 
4776 	for (i = 0; ncommit_args > 0 && i < argc; i++) {
4777 		char *in_repo_path;
4778 		struct got_pathlist_entry *new;
4779 		if (worktree) {
4780 			const char *prefix;
4781 			char *p;
4782 			error = got_worktree_resolve_path(&p, worktree,
4783 			    argv[i]);
4784 			if (error)
4785 				goto done;
4786 			prefix = got_worktree_get_path_prefix(worktree);
4787 			while (prefix[0] == '/')
4788 				prefix++;
4789 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
4790 			    (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4791 			    p) == -1) {
4792 				error = got_error_from_errno("asprintf");
4793 				free(p);
4794 				goto done;
4795 			}
4796 			free(p);
4797 		} else {
4798 			char *mapped_path, *s;
4799 			error = got_repo_map_path(&mapped_path, repo, argv[i]);
4800 			if (error)
4801 				goto done;
4802 			s = mapped_path;
4803 			while (s[0] == '/')
4804 				s++;
4805 			in_repo_path = strdup(s);
4806 			if (in_repo_path == NULL) {
4807 				error = got_error_from_errno("asprintf");
4808 				free(mapped_path);
4809 				goto done;
4810 			}
4811 			free(mapped_path);
4812 
4813 		}
4814 		error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4815 		if (error || new == NULL /* duplicate */)
4816 			free(in_repo_path);
4817 		if (error)
4818 			goto done;
4819 	}
4820 
4821 	if (worktree) {
4822 		/* Release work tree lock. */
4823 		got_worktree_close(worktree);
4824 		worktree = NULL;
4825 	}
4826 
4827 	fd1 = got_opentempfd();
4828 	if (fd1 == -1) {
4829 		error = got_error_from_errno("got_opentempfd");
4830 		goto done;
4831 	}
4832 
4833 	fd2 = got_opentempfd();
4834 	if (fd2 == -1) {
4835 		error = got_error_from_errno("got_opentempfd");
4836 		goto done;
4837 	}
4838 
4839 	switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4840 	case GOT_OBJ_TYPE_BLOB:
4841 		error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4842 		    fd1, fd2, ids[0], ids[1], NULL, NULL,
4843 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4844 		    ignore_whitespace, force_text_diff,
4845 		    show_diffstat ? &dsa : NULL, repo, outfile);
4846 		break;
4847 	case GOT_OBJ_TYPE_TREE:
4848 		error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
4849 		    ids[0], ids[1], &paths, "", "",
4850 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4851 		    ignore_whitespace, force_text_diff,
4852 		    show_diffstat ? &dsa : NULL, repo, outfile);
4853 		break;
4854 	case GOT_OBJ_TYPE_COMMIT:
4855 		fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
4856 		error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4857 		    fd1, fd2, ids[0], ids[1], &paths,
4858 		    GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
4859 		    ignore_whitespace, force_text_diff,
4860 		    show_diffstat ? &dsa : NULL, repo, outfile);
4861 		break;
4862 	default:
4863 		error = got_error(GOT_ERR_OBJ_TYPE);
4864 	}
4865 	if (error)
4866 		goto done;
4867 
4868 	if (show_diffstat && dsa.nfiles > 0) {
4869 		char *header = NULL;
4870 
4871 		if (asprintf(&header, "diffstat %s %s",
4872 		    labels[0], labels[1]) == -1) {
4873 			error = got_error_from_errno("asprintf");
4874 			goto done;
4875 		}
4876 
4877 		error = print_diffstat(&dsa, header);
4878 		free(header);
4879 		if (error)
4880 			goto done;
4881 	}
4882 
4883 	error = printfile(outfile);
4884 
4885 done:
4886 	free(labels[0]);
4887 	free(labels[1]);
4888 	free(ids[0]);
4889 	free(ids[1]);
4890 	if (worktree)
4891 		got_worktree_close(worktree);
4892 	if (repo) {
4893 		const struct got_error *close_err = got_repo_close(repo);
4894 		if (error == NULL)
4895 			error = close_err;
4896 	}
4897 	if (pack_fds) {
4898 		const struct got_error *pack_err =
4899 		    got_repo_pack_fds_close(pack_fds);
4900 		if (error == NULL)
4901 			error = pack_err;
4902 	}
4903 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
4904 	got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
4905 	got_ref_list_free(&refs);
4906 	if (outfile && fclose(outfile) == EOF && error == NULL)
4907 		error = got_error_from_errno("fclose");
4908 	if (f1 && fclose(f1) == EOF && error == NULL)
4909 		error = got_error_from_errno("fclose");
4910 	if (f2 && fclose(f2) == EOF && error == NULL)
4911 		error = got_error_from_errno("fclose");
4912 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
4913 		error = got_error_from_errno("close");
4914 	if (fd2 != -1 && close(fd2) == -1 && error == NULL)
4915 		error = got_error_from_errno("close");
4916 	return error;
4917 }
4918 
4919 __dead static void
4920 usage_blame(void)
4921 {
4922 	fprintf(stderr,
4923 	    "usage: %s blame [-c commit] [-r repository-path] path\n",
4924 	    getprogname());
4925 	exit(1);
4926 }
4927 
4928 struct blame_line {
4929 	int annotated;
4930 	char *id_str;
4931 	char *committer;
4932 	char datebuf[11]; /* YYYY-MM-DD + NUL */
4933 };
4934 
4935 struct blame_cb_args {
4936 	struct blame_line *lines;
4937 	int nlines;
4938 	int nlines_prec;
4939 	int lineno_cur;
4940 	off_t *line_offsets;
4941 	FILE *f;
4942 	struct got_repository *repo;
4943 };
4944 
4945 static const struct got_error *
4946 blame_cb(void *arg, int nlines, int lineno,
4947     struct got_commit_object *commit, struct got_object_id *id)
4948 {
4949 	const struct got_error *err = NULL;
4950 	struct blame_cb_args *a = arg;
4951 	struct blame_line *bline;
4952 	char *line = NULL;
4953 	size_t linesize = 0;
4954 	off_t offset;
4955 	struct tm tm;
4956 	time_t committer_time;
4957 
4958 	if (nlines != a->nlines ||
4959 	    (lineno != -1 && lineno < 1) || lineno > a->nlines)
4960 		return got_error(GOT_ERR_RANGE);
4961 
4962 	if (sigint_received)
4963 		return got_error(GOT_ERR_ITER_COMPLETED);
4964 
4965 	if (lineno == -1)
4966 		return NULL; /* no change in this commit */
4967 
4968 	/* Annotate this line. */
4969 	bline = &a->lines[lineno - 1];
4970 	if (bline->annotated)
4971 		return NULL;
4972 	err = got_object_id_str(&bline->id_str, id);
4973 	if (err)
4974 		return err;
4975 
4976 	bline->committer = strdup(got_object_commit_get_committer(commit));
4977 	if (bline->committer == NULL) {
4978 		err = got_error_from_errno("strdup");
4979 		goto done;
4980 	}
4981 
4982 	committer_time = got_object_commit_get_committer_time(commit);
4983 	if (gmtime_r(&committer_time, &tm) == NULL)
4984 		return got_error_from_errno("gmtime_r");
4985 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4986 	    &tm) == 0) {
4987 		err = got_error(GOT_ERR_NO_SPACE);
4988 		goto done;
4989 	}
4990 	bline->annotated = 1;
4991 
4992 	/* Print lines annotated so far. */
4993 	bline = &a->lines[a->lineno_cur - 1];
4994 	if (!bline->annotated)
4995 		goto done;
4996 
4997 	offset = a->line_offsets[a->lineno_cur - 1];
4998 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
4999 		err = got_error_from_errno("fseeko");
5000 		goto done;
5001 	}
5002 
5003 	while (a->lineno_cur <= a->nlines && bline->annotated) {
5004 		char *smallerthan, *at, *nl, *committer;
5005 		size_t len;
5006 
5007 		if (getline(&line, &linesize, a->f) == -1) {
5008 			if (ferror(a->f))
5009 				err = got_error_from_errno("getline");
5010 			break;
5011 		}
5012 
5013 		committer = bline->committer;
5014 		smallerthan = strchr(committer, '<');
5015 		if (smallerthan && smallerthan[1] != '\0')
5016 			committer = smallerthan + 1;
5017 		at = strchr(committer, '@');
5018 		if (at)
5019 			*at = '\0';
5020 		len = strlen(committer);
5021 		if (len >= 9)
5022 			committer[8] = '\0';
5023 
5024 		nl = strchr(line, '\n');
5025 		if (nl)
5026 			*nl = '\0';
5027 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5028 		    bline->id_str, bline->datebuf, committer, line);
5029 
5030 		a->lineno_cur++;
5031 		bline = &a->lines[a->lineno_cur - 1];
5032 	}
5033 done:
5034 	free(line);
5035 	return err;
5036 }
5037 
5038 static const struct got_error *
5039 cmd_blame(int argc, char *argv[])
5040 {
5041 	const struct got_error *error;
5042 	struct got_repository *repo = NULL;
5043 	struct got_worktree *worktree = NULL;
5044 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5045 	char *link_target = NULL;
5046 	struct got_object_id *obj_id = NULL;
5047 	struct got_object_id *commit_id = NULL;
5048 	struct got_commit_object *commit = NULL;
5049 	struct got_blob_object *blob = NULL;
5050 	char *commit_id_str = NULL;
5051 	struct blame_cb_args bca;
5052 	int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5053 	off_t filesize;
5054 	int *pack_fds = NULL;
5055 	FILE *f1 = NULL, *f2 = NULL;
5056 
5057 	fd1 = got_opentempfd();
5058 	if (fd1 == -1)
5059 		return got_error_from_errno("got_opentempfd");
5060 
5061 	memset(&bca, 0, sizeof(bca));
5062 
5063 #ifndef PROFILE
5064 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5065 	    NULL) == -1)
5066 		err(1, "pledge");
5067 #endif
5068 
5069 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5070 		switch (ch) {
5071 		case 'c':
5072 			commit_id_str = optarg;
5073 			break;
5074 		case 'r':
5075 			repo_path = realpath(optarg, NULL);
5076 			if (repo_path == NULL)
5077 				return got_error_from_errno2("realpath",
5078 				    optarg);
5079 			got_path_strip_trailing_slashes(repo_path);
5080 			break;
5081 		default:
5082 			usage_blame();
5083 			/* NOTREACHED */
5084 		}
5085 	}
5086 
5087 	argc -= optind;
5088 	argv += optind;
5089 
5090 	if (argc == 1)
5091 		path = argv[0];
5092 	else
5093 		usage_blame();
5094 
5095 	cwd = getcwd(NULL, 0);
5096 	if (cwd == NULL) {
5097 		error = got_error_from_errno("getcwd");
5098 		goto done;
5099 	}
5100 
5101 	error = got_repo_pack_fds_open(&pack_fds);
5102 	if (error != NULL)
5103 		goto done;
5104 
5105 	if (repo_path == NULL) {
5106 		error = got_worktree_open(&worktree, cwd);
5107 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5108 			goto done;
5109 		else
5110 			error = NULL;
5111 		if (worktree) {
5112 			repo_path =
5113 			    strdup(got_worktree_get_repo_path(worktree));
5114 			if (repo_path == NULL) {
5115 				error = got_error_from_errno("strdup");
5116 				if (error)
5117 					goto done;
5118 			}
5119 		} else {
5120 			repo_path = strdup(cwd);
5121 			if (repo_path == NULL) {
5122 				error = got_error_from_errno("strdup");
5123 				goto done;
5124 			}
5125 		}
5126 	}
5127 
5128 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5129 	if (error != NULL)
5130 		goto done;
5131 
5132 	if (worktree) {
5133 		const char *prefix = got_worktree_get_path_prefix(worktree);
5134 		char *p;
5135 
5136 		error = got_worktree_resolve_path(&p, worktree, path);
5137 		if (error)
5138 			goto done;
5139 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5140 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5141 		    p) == -1) {
5142 			error = got_error_from_errno("asprintf");
5143 			free(p);
5144 			goto done;
5145 		}
5146 		free(p);
5147 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5148 	} else {
5149 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5150 		if (error)
5151 			goto done;
5152 		error = got_repo_map_path(&in_repo_path, repo, path);
5153 	}
5154 	if (error)
5155 		goto done;
5156 
5157 	if (commit_id_str == NULL) {
5158 		struct got_reference *head_ref;
5159 		error = got_ref_open(&head_ref, repo, worktree ?
5160 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5161 		if (error != NULL)
5162 			goto done;
5163 		error = got_ref_resolve(&commit_id, repo, head_ref);
5164 		got_ref_close(head_ref);
5165 		if (error != NULL)
5166 			goto done;
5167 	} else {
5168 		struct got_reflist_head refs;
5169 		TAILQ_INIT(&refs);
5170 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5171 		    NULL);
5172 		if (error)
5173 			goto done;
5174 		error = got_repo_match_object_id(&commit_id, NULL,
5175 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5176 		got_ref_list_free(&refs);
5177 		if (error)
5178 			goto done;
5179 	}
5180 
5181 	if (worktree) {
5182 		/* Release work tree lock. */
5183 		got_worktree_close(worktree);
5184 		worktree = NULL;
5185 	}
5186 
5187 	error = got_object_open_as_commit(&commit, repo, commit_id);
5188 	if (error)
5189 		goto done;
5190 
5191 	error = got_object_resolve_symlinks(&link_target, in_repo_path,
5192 	    commit, repo);
5193 	if (error)
5194 		goto done;
5195 
5196 	error = got_object_id_by_path(&obj_id, repo, commit,
5197 	    link_target ? link_target : in_repo_path);
5198 	if (error)
5199 		goto done;
5200 
5201 	error = got_object_get_type(&obj_type, repo, obj_id);
5202 	if (error)
5203 		goto done;
5204 
5205 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
5206 		error = got_error_path(link_target ? link_target : in_repo_path,
5207 		    GOT_ERR_OBJ_TYPE);
5208 		goto done;
5209 	}
5210 
5211 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5212 	if (error)
5213 		goto done;
5214 	bca.f = got_opentemp();
5215 	if (bca.f == NULL) {
5216 		error = got_error_from_errno("got_opentemp");
5217 		goto done;
5218 	}
5219 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5220 	    &bca.line_offsets, bca.f, blob);
5221 	if (error || bca.nlines == 0)
5222 		goto done;
5223 
5224 	/* Don't include \n at EOF in the blame line count. */
5225 	if (bca.line_offsets[bca.nlines - 1] == filesize)
5226 		bca.nlines--;
5227 
5228 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5229 	if (bca.lines == NULL) {
5230 		error = got_error_from_errno("calloc");
5231 		goto done;
5232 	}
5233 	bca.lineno_cur = 1;
5234 	bca.nlines_prec = 0;
5235 	i = bca.nlines;
5236 	while (i > 0) {
5237 		i /= 10;
5238 		bca.nlines_prec++;
5239 	}
5240 	bca.repo = repo;
5241 
5242 	fd2 = got_opentempfd();
5243 	if (fd2 == -1) {
5244 		error = got_error_from_errno("got_opentempfd");
5245 		goto done;
5246 	}
5247 	fd3 = got_opentempfd();
5248 	if (fd3 == -1) {
5249 		error = got_error_from_errno("got_opentempfd");
5250 		goto done;
5251 	}
5252 	f1 = got_opentemp();
5253 	if (f1 == NULL) {
5254 		error = got_error_from_errno("got_opentemp");
5255 		goto done;
5256 	}
5257 	f2 = got_opentemp();
5258 	if (f2 == NULL) {
5259 		error = got_error_from_errno("got_opentemp");
5260 		goto done;
5261 	}
5262 	error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5263 	    repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5264 	    check_cancelled, NULL, fd2, fd3, f1, f2);
5265 done:
5266 	free(in_repo_path);
5267 	free(link_target);
5268 	free(repo_path);
5269 	free(cwd);
5270 	free(commit_id);
5271 	free(obj_id);
5272 	if (commit)
5273 		got_object_commit_close(commit);
5274 
5275 	if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5276 		error = got_error_from_errno("close");
5277 	if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5278 		error = got_error_from_errno("close");
5279 	if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5280 		error = got_error_from_errno("close");
5281 	if (f1 && fclose(f1) == EOF && error == NULL)
5282 		error = got_error_from_errno("fclose");
5283 	if (f2 && fclose(f2) == EOF && error == NULL)
5284 		error = got_error_from_errno("fclose");
5285 
5286 	if (blob)
5287 		got_object_blob_close(blob);
5288 	if (worktree)
5289 		got_worktree_close(worktree);
5290 	if (repo) {
5291 		const struct got_error *close_err = got_repo_close(repo);
5292 		if (error == NULL)
5293 			error = close_err;
5294 	}
5295 	if (pack_fds) {
5296 		const struct got_error *pack_err =
5297 		    got_repo_pack_fds_close(pack_fds);
5298 		if (error == NULL)
5299 			error = pack_err;
5300 	}
5301 	if (bca.lines) {
5302 		for (i = 0; i < bca.nlines; i++) {
5303 			struct blame_line *bline = &bca.lines[i];
5304 			free(bline->id_str);
5305 			free(bline->committer);
5306 		}
5307 		free(bca.lines);
5308 	}
5309 	free(bca.line_offsets);
5310 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
5311 		error = got_error_from_errno("fclose");
5312 	return error;
5313 }
5314 
5315 __dead static void
5316 usage_tree(void)
5317 {
5318 	fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
5319 	    "[path]\n", getprogname());
5320 	exit(1);
5321 }
5322 
5323 static const struct got_error *
5324 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5325     const char *root_path, struct got_repository *repo)
5326 {
5327 	const struct got_error *err = NULL;
5328 	int is_root_path = (strcmp(path, root_path) == 0);
5329 	const char *modestr = "";
5330 	mode_t mode = got_tree_entry_get_mode(te);
5331 	char *link_target = NULL;
5332 
5333 	path += strlen(root_path);
5334 	while (path[0] == '/')
5335 		path++;
5336 
5337 	if (got_object_tree_entry_is_submodule(te))
5338 		modestr = "$";
5339 	else if (S_ISLNK(mode)) {
5340 		int i;
5341 
5342 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5343 		if (err)
5344 			return err;
5345 		for (i = 0; link_target[i] != '\0'; i++) {
5346 			if (!isprint((unsigned char)link_target[i]))
5347 				link_target[i] = '?';
5348 		}
5349 
5350 		modestr = "@";
5351 	}
5352 	else if (S_ISDIR(mode))
5353 		modestr = "/";
5354 	else if (mode & S_IXUSR)
5355 		modestr = "*";
5356 
5357 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5358 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5359 	    link_target ? " -> ": "", link_target ? link_target : "");
5360 
5361 	free(link_target);
5362 	return NULL;
5363 }
5364 
5365 static const struct got_error *
5366 print_tree(const char *path, struct got_commit_object *commit,
5367     int show_ids, int recurse, const char *root_path,
5368     struct got_repository *repo)
5369 {
5370 	const struct got_error *err = NULL;
5371 	struct got_object_id *tree_id = NULL;
5372 	struct got_tree_object *tree = NULL;
5373 	int nentries, i;
5374 
5375 	err = got_object_id_by_path(&tree_id, repo, commit, path);
5376 	if (err)
5377 		goto done;
5378 
5379 	err = got_object_open_as_tree(&tree, repo, tree_id);
5380 	if (err)
5381 		goto done;
5382 	nentries = got_object_tree_get_nentries(tree);
5383 	for (i = 0; i < nentries; i++) {
5384 		struct got_tree_entry *te;
5385 		char *id = NULL;
5386 
5387 		if (sigint_received || sigpipe_received)
5388 			break;
5389 
5390 		te = got_object_tree_get_entry(tree, i);
5391 		if (show_ids) {
5392 			char *id_str;
5393 			err = got_object_id_str(&id_str,
5394 			    got_tree_entry_get_id(te));
5395 			if (err)
5396 				goto done;
5397 			if (asprintf(&id, "%s ", id_str) == -1) {
5398 				err = got_error_from_errno("asprintf");
5399 				free(id_str);
5400 				goto done;
5401 			}
5402 			free(id_str);
5403 		}
5404 		err = print_entry(te, id, path, root_path, repo);
5405 		free(id);
5406 		if (err)
5407 			goto done;
5408 
5409 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5410 			char *child_path;
5411 			if (asprintf(&child_path, "%s%s%s", path,
5412 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
5413 			    got_tree_entry_get_name(te)) == -1) {
5414 				err = got_error_from_errno("asprintf");
5415 				goto done;
5416 			}
5417 			err = print_tree(child_path, commit, show_ids, 1,
5418 			    root_path, repo);
5419 			free(child_path);
5420 			if (err)
5421 				goto done;
5422 		}
5423 	}
5424 done:
5425 	if (tree)
5426 		got_object_tree_close(tree);
5427 	free(tree_id);
5428 	return err;
5429 }
5430 
5431 static const struct got_error *
5432 cmd_tree(int argc, char *argv[])
5433 {
5434 	const struct got_error *error;
5435 	struct got_repository *repo = NULL;
5436 	struct got_worktree *worktree = NULL;
5437 	const char *path, *refname = NULL;
5438 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5439 	struct got_object_id *commit_id = NULL;
5440 	struct got_commit_object *commit = NULL;
5441 	char *commit_id_str = NULL;
5442 	int show_ids = 0, recurse = 0;
5443 	int ch;
5444 	int *pack_fds = NULL;
5445 
5446 #ifndef PROFILE
5447 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5448 	    NULL) == -1)
5449 		err(1, "pledge");
5450 #endif
5451 
5452 	while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
5453 		switch (ch) {
5454 		case 'c':
5455 			commit_id_str = optarg;
5456 			break;
5457 		case 'i':
5458 			show_ids = 1;
5459 			break;
5460 		case 'R':
5461 			recurse = 1;
5462 			break;
5463 		case 'r':
5464 			repo_path = realpath(optarg, NULL);
5465 			if (repo_path == NULL)
5466 				return got_error_from_errno2("realpath",
5467 				    optarg);
5468 			got_path_strip_trailing_slashes(repo_path);
5469 			break;
5470 		default:
5471 			usage_tree();
5472 			/* NOTREACHED */
5473 		}
5474 	}
5475 
5476 	argc -= optind;
5477 	argv += optind;
5478 
5479 	if (argc == 1)
5480 		path = argv[0];
5481 	else if (argc > 1)
5482 		usage_tree();
5483 	else
5484 		path = NULL;
5485 
5486 	cwd = getcwd(NULL, 0);
5487 	if (cwd == NULL) {
5488 		error = got_error_from_errno("getcwd");
5489 		goto done;
5490 	}
5491 
5492 	error = got_repo_pack_fds_open(&pack_fds);
5493 	if (error != NULL)
5494 		goto done;
5495 
5496 	if (repo_path == NULL) {
5497 		error = got_worktree_open(&worktree, cwd);
5498 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5499 			goto done;
5500 		else
5501 			error = NULL;
5502 		if (worktree) {
5503 			repo_path =
5504 			    strdup(got_worktree_get_repo_path(worktree));
5505 			if (repo_path == NULL)
5506 				error = got_error_from_errno("strdup");
5507 			if (error)
5508 				goto done;
5509 		} else {
5510 			repo_path = strdup(cwd);
5511 			if (repo_path == NULL) {
5512 				error = got_error_from_errno("strdup");
5513 				goto done;
5514 			}
5515 		}
5516 	}
5517 
5518 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5519 	if (error != NULL)
5520 		goto done;
5521 
5522 	if (worktree) {
5523 		const char *prefix = got_worktree_get_path_prefix(worktree);
5524 		char *p;
5525 
5526 		if (path == NULL || got_path_is_root_dir(path))
5527 			path = "";
5528 		error = got_worktree_resolve_path(&p, worktree, path);
5529 		if (error)
5530 			goto done;
5531 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5532 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ?  "/" : "",
5533 		    p) == -1) {
5534 			error = got_error_from_errno("asprintf");
5535 			free(p);
5536 			goto done;
5537 		}
5538 		free(p);
5539 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5540 		if (error)
5541 			goto done;
5542 	} else {
5543 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5544 		if (error)
5545 			goto done;
5546 		if (path == NULL)
5547 			path = "/";
5548 		error = got_repo_map_path(&in_repo_path, repo, path);
5549 		if (error != NULL)
5550 			goto done;
5551 	}
5552 
5553 	if (commit_id_str == NULL) {
5554 		struct got_reference *head_ref;
5555 		if (worktree)
5556 			refname = got_worktree_get_head_ref_name(worktree);
5557 		else
5558 			refname = GOT_REF_HEAD;
5559 		error = got_ref_open(&head_ref, repo, refname, 0);
5560 		if (error != NULL)
5561 			goto done;
5562 		error = got_ref_resolve(&commit_id, repo, head_ref);
5563 		got_ref_close(head_ref);
5564 		if (error != NULL)
5565 			goto done;
5566 	} else {
5567 		struct got_reflist_head refs;
5568 		TAILQ_INIT(&refs);
5569 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5570 		    NULL);
5571 		if (error)
5572 			goto done;
5573 		error = got_repo_match_object_id(&commit_id, NULL,
5574 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5575 		got_ref_list_free(&refs);
5576 		if (error)
5577 			goto done;
5578 	}
5579 
5580 	if (worktree) {
5581 		/* Release work tree lock. */
5582 		got_worktree_close(worktree);
5583 		worktree = NULL;
5584 	}
5585 
5586 	error = got_object_open_as_commit(&commit, repo, commit_id);
5587 	if (error)
5588 		goto done;
5589 
5590 	error = print_tree(in_repo_path, commit, show_ids, recurse,
5591 	    in_repo_path, repo);
5592 done:
5593 	free(in_repo_path);
5594 	free(repo_path);
5595 	free(cwd);
5596 	free(commit_id);
5597 	if (commit)
5598 		got_object_commit_close(commit);
5599 	if (worktree)
5600 		got_worktree_close(worktree);
5601 	if (repo) {
5602 		const struct got_error *close_err = got_repo_close(repo);
5603 		if (error == NULL)
5604 			error = close_err;
5605 	}
5606 	if (pack_fds) {
5607 		const struct got_error *pack_err =
5608 		    got_repo_pack_fds_close(pack_fds);
5609 		if (error == NULL)
5610 			error = pack_err;
5611 	}
5612 	return error;
5613 }
5614 
5615 __dead static void
5616 usage_status(void)
5617 {
5618 	fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
5619 	    "[-s status-codes] [path ...]\n", getprogname());
5620 	exit(1);
5621 }
5622 
5623 struct got_status_arg {
5624 	char *status_codes;
5625 	int suppress;
5626 };
5627 
5628 static const struct got_error *
5629 print_status(void *arg, unsigned char status, unsigned char staged_status,
5630     const char *path, struct got_object_id *blob_id,
5631     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5632     int dirfd, const char *de_name)
5633 {
5634 	struct got_status_arg *st = arg;
5635 
5636 	if (status == staged_status && (status == GOT_STATUS_DELETE))
5637 		status = GOT_STATUS_NO_CHANGE;
5638 	if (st != NULL && st->status_codes) {
5639 		size_t ncodes = strlen(st->status_codes);
5640 		int i, j = 0;
5641 
5642 		for (i = 0; i < ncodes ; i++) {
5643 			if (st->suppress) {
5644 				if (status == st->status_codes[i] ||
5645 				    staged_status == st->status_codes[i]) {
5646 					j++;
5647 					continue;
5648 				}
5649 			} else {
5650 				if (status == st->status_codes[i] ||
5651 				    staged_status == st->status_codes[i])
5652 					break;
5653 			}
5654 		}
5655 
5656 		if (st->suppress && j == 0)
5657 			goto print;
5658 
5659 		if (i == ncodes)
5660 			return NULL;
5661 	}
5662 print:
5663 	printf("%c%c %s\n", status, staged_status, path);
5664 	return NULL;
5665 }
5666 
5667 static const struct got_error *
5668 cmd_status(int argc, char *argv[])
5669 {
5670 	const struct got_error *error = NULL;
5671 	struct got_repository *repo = NULL;
5672 	struct got_worktree *worktree = NULL;
5673 	struct got_status_arg st;
5674 	char *cwd = NULL;
5675 	struct got_pathlist_head paths;
5676 	int ch, i, no_ignores = 0;
5677 	int *pack_fds = NULL;
5678 
5679 	TAILQ_INIT(&paths);
5680 
5681 	memset(&st, 0, sizeof(st));
5682 	st.status_codes = NULL;
5683 	st.suppress = 0;
5684 
5685 #ifndef PROFILE
5686 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5687 	    NULL) == -1)
5688 		err(1, "pledge");
5689 #endif
5690 
5691 	while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
5692 		switch (ch) {
5693 		case 'I':
5694 			no_ignores = 1;
5695 			break;
5696 		case 'S':
5697 			if (st.status_codes != NULL && st.suppress == 0)
5698 				option_conflict('S', 's');
5699 			st.suppress = 1;
5700 			/* fallthrough */
5701 		case 's':
5702 			for (i = 0; optarg[i] != '\0'; i++) {
5703 				switch (optarg[i]) {
5704 				case GOT_STATUS_MODIFY:
5705 				case GOT_STATUS_ADD:
5706 				case GOT_STATUS_DELETE:
5707 				case GOT_STATUS_CONFLICT:
5708 				case GOT_STATUS_MISSING:
5709 				case GOT_STATUS_OBSTRUCTED:
5710 				case GOT_STATUS_UNVERSIONED:
5711 				case GOT_STATUS_MODE_CHANGE:
5712 				case GOT_STATUS_NONEXISTENT:
5713 					break;
5714 				default:
5715 					errx(1, "invalid status code '%c'",
5716 					    optarg[i]);
5717 				}
5718 			}
5719 			if (ch == 's' && st.suppress)
5720 				option_conflict('s', 'S');
5721 			st.status_codes = optarg;
5722 			break;
5723 		default:
5724 			usage_status();
5725 			/* NOTREACHED */
5726 		}
5727 	}
5728 
5729 	argc -= optind;
5730 	argv += optind;
5731 
5732 	cwd = getcwd(NULL, 0);
5733 	if (cwd == NULL) {
5734 		error = got_error_from_errno("getcwd");
5735 		goto done;
5736 	}
5737 
5738 	error = got_repo_pack_fds_open(&pack_fds);
5739 	if (error != NULL)
5740 		goto done;
5741 
5742 	error = got_worktree_open(&worktree, cwd);
5743 	if (error) {
5744 		if (error->code == GOT_ERR_NOT_WORKTREE)
5745 			error = wrap_not_worktree_error(error, "status", cwd);
5746 		goto done;
5747 	}
5748 
5749 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5750 	    NULL, pack_fds);
5751 	if (error != NULL)
5752 		goto done;
5753 
5754 	error = apply_unveil(got_repo_get_path(repo), 1,
5755 	    got_worktree_get_root_path(worktree));
5756 	if (error)
5757 		goto done;
5758 
5759 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5760 	if (error)
5761 		goto done;
5762 
5763 	error = got_worktree_status(worktree, &paths, repo, no_ignores,
5764 	    print_status, &st, check_cancelled, NULL);
5765 done:
5766 	if (pack_fds) {
5767 		const struct got_error *pack_err =
5768 		    got_repo_pack_fds_close(pack_fds);
5769 		if (error == NULL)
5770 			error = pack_err;
5771 	}
5772 	if (repo) {
5773 		const struct got_error *close_err = got_repo_close(repo);
5774 		if (error == NULL)
5775 			error = close_err;
5776 	}
5777 
5778 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5779 	free(cwd);
5780 	return error;
5781 }
5782 
5783 __dead static void
5784 usage_tag(void)
5785 {
5786 	fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
5787 	    "[-r repository-path] [-s signer-id] name\n", getprogname());
5788 	exit(1);
5789 }
5790 
5791 #if 0
5792 static const struct got_error *
5793 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5794 {
5795 	const struct got_error *err = NULL;
5796 	struct got_reflist_entry *re, *se, *new;
5797 	struct got_object_id *re_id, *se_id;
5798 	struct got_tag_object *re_tag, *se_tag;
5799 	time_t re_time, se_time;
5800 
5801 	STAILQ_FOREACH(re, tags, entry) {
5802 		se = STAILQ_FIRST(sorted);
5803 		if (se == NULL) {
5804 			err = got_reflist_entry_dup(&new, re);
5805 			if (err)
5806 				return err;
5807 			STAILQ_INSERT_HEAD(sorted, new, entry);
5808 			continue;
5809 		} else {
5810 			err = got_ref_resolve(&re_id, repo, re->ref);
5811 			if (err)
5812 				break;
5813 			err = got_object_open_as_tag(&re_tag, repo, re_id);
5814 			free(re_id);
5815 			if (err)
5816 				break;
5817 			re_time = got_object_tag_get_tagger_time(re_tag);
5818 			got_object_tag_close(re_tag);
5819 		}
5820 
5821 		while (se) {
5822 			err = got_ref_resolve(&se_id, repo, re->ref);
5823 			if (err)
5824 				break;
5825 			err = got_object_open_as_tag(&se_tag, repo, se_id);
5826 			free(se_id);
5827 			if (err)
5828 				break;
5829 			se_time = got_object_tag_get_tagger_time(se_tag);
5830 			got_object_tag_close(se_tag);
5831 
5832 			if (se_time > re_time) {
5833 				err = got_reflist_entry_dup(&new, re);
5834 				if (err)
5835 					return err;
5836 				STAILQ_INSERT_AFTER(sorted, se, new, entry);
5837 				break;
5838 			}
5839 			se = STAILQ_NEXT(se, entry);
5840 			continue;
5841 		}
5842 	}
5843 done:
5844 	return err;
5845 }
5846 #endif
5847 
5848 static const struct got_error *
5849 get_tag_refname(char **refname, const char *tag_name)
5850 {
5851 	const struct got_error *err;
5852 
5853 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
5854 		*refname = strdup(tag_name);
5855 		if (*refname == NULL)
5856 			return got_error_from_errno("strdup");
5857 	} else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
5858 		err = got_error_from_errno("asprintf");
5859 		*refname = NULL;
5860 		return err;
5861 	}
5862 
5863 	return NULL;
5864 }
5865 
5866 static const struct got_error *
5867 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
5868     const char *allowed_signers, const char *revoked_signers, int verbosity)
5869 {
5870 	static const struct got_error *err = NULL;
5871 	struct got_reflist_head refs;
5872 	struct got_reflist_entry *re;
5873 	char *wanted_refname = NULL;
5874 	int bad_sigs = 0;
5875 
5876 	TAILQ_INIT(&refs);
5877 
5878 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5879 	if (err)
5880 		return err;
5881 
5882 	if (tag_name) {
5883 		struct got_reference *ref;
5884 		err = get_tag_refname(&wanted_refname, tag_name);
5885 		if (err)
5886 			goto done;
5887 		/* Wanted tag reference should exist. */
5888 		err = got_ref_open(&ref, repo, wanted_refname, 0);
5889 		if (err)
5890 			goto done;
5891 		got_ref_close(ref);
5892 	}
5893 
5894 	TAILQ_FOREACH(re, &refs, entry) {
5895 		const char *refname;
5896 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5897 		char datebuf[26];
5898 		const char *tagger, *ssh_sig = NULL;
5899 		char *sig_msg = NULL;
5900 		time_t tagger_time;
5901 		struct got_object_id *id;
5902 		struct got_tag_object *tag;
5903 		struct got_commit_object *commit = NULL;
5904 
5905 		refname = got_ref_get_name(re->ref);
5906 		if (strncmp(refname, "refs/tags/", 10) != 0 ||
5907 		    (wanted_refname && strcmp(refname, wanted_refname) != 0))
5908 			continue;
5909 		refname += 10;
5910 		refstr = got_ref_to_str(re->ref);
5911 		if (refstr == NULL) {
5912 			err = got_error_from_errno("got_ref_to_str");
5913 			break;
5914 		}
5915 
5916 		err = got_ref_resolve(&id, repo, re->ref);
5917 		if (err)
5918 			break;
5919 		err = got_object_open_as_tag(&tag, repo, id);
5920 		if (err) {
5921 			if (err->code != GOT_ERR_OBJ_TYPE) {
5922 				free(id);
5923 				break;
5924 			}
5925 			/* "lightweight" tag */
5926 			err = got_object_open_as_commit(&commit, repo, id);
5927 			if (err) {
5928 				free(id);
5929 				break;
5930 			}
5931 			tagger = got_object_commit_get_committer(commit);
5932 			tagger_time =
5933 			    got_object_commit_get_committer_time(commit);
5934 			err = got_object_id_str(&id_str, id);
5935 			free(id);
5936 			if (err)
5937 				break;
5938 		} else {
5939 			free(id);
5940 			tagger = got_object_tag_get_tagger(tag);
5941 			tagger_time = got_object_tag_get_tagger_time(tag);
5942 			err = got_object_id_str(&id_str,
5943 			    got_object_tag_get_object_id(tag));
5944 			if (err)
5945 				break;
5946 		}
5947 
5948 		if (tag && verify_tags) {
5949 			ssh_sig = got_sigs_get_tagmsg_ssh_signature(
5950 			    got_object_tag_get_message(tag));
5951 			if (ssh_sig && allowed_signers == NULL) {
5952 				err = got_error_msg(
5953 				    GOT_ERR_VERIFY_TAG_SIGNATURE,
5954 				    "SSH signature verification requires "
5955 				        "setting allowed_signers in "
5956 				        "got.conf(5)");
5957 				break;
5958 			}
5959 		}
5960 
5961 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5962 		free(refstr);
5963 		printf("from: %s\n", tagger);
5964 		datestr = get_datestr(&tagger_time, datebuf);
5965 		if (datestr)
5966 			printf("date: %s UTC\n", datestr);
5967 		if (commit)
5968 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5969 		else {
5970 			switch (got_object_tag_get_object_type(tag)) {
5971 			case GOT_OBJ_TYPE_BLOB:
5972 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5973 				    id_str);
5974 				break;
5975 			case GOT_OBJ_TYPE_TREE:
5976 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5977 				    id_str);
5978 				break;
5979 			case GOT_OBJ_TYPE_COMMIT:
5980 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5981 				    id_str);
5982 				break;
5983 			case GOT_OBJ_TYPE_TAG:
5984 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5985 				    id_str);
5986 				break;
5987 			default:
5988 				break;
5989 			}
5990 		}
5991 		free(id_str);
5992 
5993 		if (ssh_sig) {
5994 			err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
5995 				allowed_signers, revoked_signers, verbosity);
5996 			if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
5997 				bad_sigs = 1;
5998 			else if (err)
5999 				break;
6000 			printf("signature: %s", sig_msg);
6001 			free(sig_msg);
6002 			sig_msg = NULL;
6003 		}
6004 
6005 		if (commit) {
6006 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
6007 			if (err)
6008 				break;
6009 			got_object_commit_close(commit);
6010 		} else {
6011 			tagmsg0 = strdup(got_object_tag_get_message(tag));
6012 			got_object_tag_close(tag);
6013 			if (tagmsg0 == NULL) {
6014 				err = got_error_from_errno("strdup");
6015 				break;
6016 			}
6017 		}
6018 
6019 		tagmsg = tagmsg0;
6020 		do {
6021 			line = strsep(&tagmsg, "\n");
6022 			if (line)
6023 				printf(" %s\n", line);
6024 		} while (line);
6025 		free(tagmsg0);
6026 	}
6027 done:
6028 	got_ref_list_free(&refs);
6029 	free(wanted_refname);
6030 
6031 	if (err == NULL && bad_sigs)
6032 		err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
6033 	return err;
6034 }
6035 
6036 static const struct got_error *
6037 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6038     const char *tag_name, const char *repo_path)
6039 {
6040 	const struct got_error *err = NULL;
6041 	char *template = NULL, *initial_content = NULL;
6042 	char *editor = NULL;
6043 	int initial_content_len;
6044 	int fd = -1;
6045 
6046 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6047 		err = got_error_from_errno("asprintf");
6048 		goto done;
6049 	}
6050 
6051 	initial_content_len = asprintf(&initial_content,
6052 	    "\n# tagging commit %s as %s\n",
6053 	    commit_id_str, tag_name);
6054 	if (initial_content_len == -1) {
6055 		err = got_error_from_errno("asprintf");
6056 		goto done;
6057 	}
6058 
6059 	err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
6060 	if (err)
6061 		goto done;
6062 
6063 	if (write(fd, initial_content, initial_content_len) == -1) {
6064 		err = got_error_from_errno2("write", *tagmsg_path);
6065 		goto done;
6066 	}
6067 	if (close(fd) == -1) {
6068 		err = got_error_from_errno2("close", *tagmsg_path);
6069 		goto done;
6070 	}
6071 	fd = -1;
6072 
6073 	err = get_editor(&editor);
6074 	if (err)
6075 		goto done;
6076 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6077 	    initial_content_len, 1);
6078 done:
6079 	free(initial_content);
6080 	free(template);
6081 	free(editor);
6082 
6083 	if (fd != -1 && close(fd) == -1 && err == NULL)
6084 		err = got_error_from_errno2("close", *tagmsg_path);
6085 
6086 	if (err) {
6087 		free(*tagmsg);
6088 		*tagmsg = NULL;
6089 	}
6090 	return err;
6091 }
6092 
6093 static const struct got_error *
6094 add_tag(struct got_repository *repo, const char *tagger,
6095     const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
6096     const char *signer_id, int verbosity)
6097 {
6098 	const struct got_error *err = NULL;
6099 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
6100 	char *label = NULL, *commit_id_str = NULL;
6101 	struct got_reference *ref = NULL;
6102 	char *refname = NULL, *tagmsg = NULL;
6103 	char *tagmsg_path = NULL, *tag_id_str = NULL;
6104 	int preserve_tagmsg = 0;
6105 	struct got_reflist_head refs;
6106 
6107 	TAILQ_INIT(&refs);
6108 
6109 	/*
6110 	 * Don't let the user create a tag name with a leading '-'.
6111 	 * While technically a valid reference name, this case is usually
6112 	 * an unintended typo.
6113 	 */
6114 	if (tag_name[0] == '-')
6115 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6116 
6117 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6118 	if (err)
6119 		goto done;
6120 
6121 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6122 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
6123 	if (err)
6124 		goto done;
6125 
6126 	err = got_object_id_str(&commit_id_str, commit_id);
6127 	if (err)
6128 		goto done;
6129 
6130 	err = get_tag_refname(&refname, tag_name);
6131 	if (err)
6132 		goto done;
6133 	if (strncmp("refs/tags/", tag_name, 10) == 0)
6134 		tag_name += 10;
6135 
6136 	err = got_ref_open(&ref, repo, refname, 0);
6137 	if (err == NULL) {
6138 		err = got_error(GOT_ERR_TAG_EXISTS);
6139 		goto done;
6140 	} else if (err->code != GOT_ERR_NOT_REF)
6141 		goto done;
6142 
6143 	if (tagmsg_arg == NULL) {
6144 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6145 		    tag_name, got_repo_get_path(repo));
6146 		if (err) {
6147 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6148 			    tagmsg_path != NULL)
6149 				preserve_tagmsg = 1;
6150 			goto done;
6151 		}
6152 		/* Editor is done; we can now apply unveil(2) */
6153 		err = got_sigs_apply_unveil();
6154 		if (err)
6155 			goto done;
6156 		err = apply_unveil(got_repo_get_path(repo), 0, NULL);
6157 		if (err)
6158 			goto done;
6159 	}
6160 
6161 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
6162 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
6163 	    verbosity);
6164 	if (err) {
6165 		if (tagmsg_path)
6166 			preserve_tagmsg = 1;
6167 		goto done;
6168 	}
6169 
6170 	err = got_ref_alloc(&ref, refname, tag_id);
6171 	if (err) {
6172 		if (tagmsg_path)
6173 			preserve_tagmsg = 1;
6174 		goto done;
6175 	}
6176 
6177 	err = got_ref_write(ref, repo);
6178 	if (err) {
6179 		if (tagmsg_path)
6180 			preserve_tagmsg = 1;
6181 		goto done;
6182 	}
6183 
6184 	err = got_object_id_str(&tag_id_str, tag_id);
6185 	if (err) {
6186 		if (tagmsg_path)
6187 			preserve_tagmsg = 1;
6188 		goto done;
6189 	}
6190 	printf("Created tag %s\n", tag_id_str);
6191 done:
6192 	if (preserve_tagmsg) {
6193 		fprintf(stderr, "%s: tag message preserved in %s\n",
6194 		    getprogname(), tagmsg_path);
6195 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6196 		err = got_error_from_errno2("unlink", tagmsg_path);
6197 	free(tag_id_str);
6198 	if (ref)
6199 		got_ref_close(ref);
6200 	free(commit_id);
6201 	free(commit_id_str);
6202 	free(refname);
6203 	free(tagmsg);
6204 	free(tagmsg_path);
6205 	got_ref_list_free(&refs);
6206 	return err;
6207 }
6208 
6209 static const struct got_error *
6210 cmd_tag(int argc, char *argv[])
6211 {
6212 	const struct got_error *error = NULL;
6213 	struct got_repository *repo = NULL;
6214 	struct got_worktree *worktree = NULL;
6215 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6216 	char *gitconfig_path = NULL, *tagger = NULL;
6217 	char *allowed_signers = NULL, *revoked_signers = NULL;
6218 	const char *signer_id = NULL;
6219 	const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
6220 	int ch, do_list = 0, verify_tags = 0, verbosity = 0;
6221 	int *pack_fds = NULL;
6222 
6223 #ifndef PROFILE
6224 	if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6225 	    "sendfd unveil", NULL) == -1)
6226 		err(1, "pledge");
6227 #endif
6228 
6229 	while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
6230 		switch (ch) {
6231 		case 'c':
6232 			commit_id_arg = optarg;
6233 			break;
6234 		case 'l':
6235 			do_list = 1;
6236 			break;
6237 		case 'm':
6238 			tagmsg = optarg;
6239 			break;
6240 		case 'r':
6241 			repo_path = realpath(optarg, NULL);
6242 			if (repo_path == NULL) {
6243 				error = got_error_from_errno2("realpath",
6244 				    optarg);
6245 				goto done;
6246 			}
6247 			got_path_strip_trailing_slashes(repo_path);
6248 			break;
6249 		case 's':
6250 			signer_id = optarg;
6251 			break;
6252 		case 'V':
6253 			verify_tags = 1;
6254 			break;
6255 		case 'v':
6256 			if (verbosity < 0)
6257 				verbosity = 0;
6258 			else if (verbosity < 3)
6259 				verbosity++;
6260 			break;
6261 		default:
6262 			usage_tag();
6263 			/* NOTREACHED */
6264 		}
6265 	}
6266 
6267 	argc -= optind;
6268 	argv += optind;
6269 
6270 	if (do_list || verify_tags) {
6271 		if (commit_id_arg != NULL)
6272 			errx(1,
6273 			    "-c option can only be used when creating a tag");
6274 		if (tagmsg) {
6275 			if (do_list)
6276 				option_conflict('l', 'm');
6277 			else
6278 				option_conflict('V', 'm');
6279 		}
6280 		if (signer_id) {
6281 			if (do_list)
6282 				option_conflict('l', 's');
6283 			else
6284 				option_conflict('V', 's');
6285 		}
6286 		if (argc > 1)
6287 			usage_tag();
6288 	} else if (argc != 1)
6289 		usage_tag();
6290 
6291 	if (argc == 1)
6292 		tag_name = argv[0];
6293 
6294 	cwd = getcwd(NULL, 0);
6295 	if (cwd == NULL) {
6296 		error = got_error_from_errno("getcwd");
6297 		goto done;
6298 	}
6299 
6300 	error = got_repo_pack_fds_open(&pack_fds);
6301 	if (error != NULL)
6302 		goto done;
6303 
6304 	if (repo_path == NULL) {
6305 		error = got_worktree_open(&worktree, cwd);
6306 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6307 			goto done;
6308 		else
6309 			error = NULL;
6310 		if (worktree) {
6311 			repo_path =
6312 			    strdup(got_worktree_get_repo_path(worktree));
6313 			if (repo_path == NULL)
6314 				error = got_error_from_errno("strdup");
6315 			if (error)
6316 				goto done;
6317 		} else {
6318 			repo_path = strdup(cwd);
6319 			if (repo_path == NULL) {
6320 				error = got_error_from_errno("strdup");
6321 				goto done;
6322 			}
6323 		}
6324 	}
6325 
6326 	if (do_list || verify_tags) {
6327 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6328 		if (error != NULL)
6329 			goto done;
6330 		error = get_allowed_signers(&allowed_signers, repo, worktree);
6331 		if (error)
6332 			goto done;
6333 		error = get_revoked_signers(&revoked_signers, repo, worktree);
6334 		if (error)
6335 			goto done;
6336 		if (worktree) {
6337 			/* Release work tree lock. */
6338 			got_worktree_close(worktree);
6339 			worktree = NULL;
6340 		}
6341 
6342 		/*
6343 		 * Remove "cpath" promise unless needed for signature tmpfile
6344 		 * creation.
6345 		 */
6346 		if (verify_tags)
6347 		 	got_sigs_apply_unveil();
6348 		else {
6349 #ifndef PROFILE
6350 			if (pledge("stdio rpath wpath flock proc exec sendfd "
6351 			    "unveil", NULL) == -1)
6352 				err(1, "pledge");
6353 #endif
6354 		}
6355 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6356 		if (error)
6357 			goto done;
6358 		error = list_tags(repo, tag_name, verify_tags, allowed_signers,
6359 		    revoked_signers, verbosity);
6360 	} else {
6361 		error = get_gitconfig_path(&gitconfig_path);
6362 		if (error)
6363 			goto done;
6364 		error = got_repo_open(&repo, repo_path, gitconfig_path,
6365 		    pack_fds);
6366 		if (error != NULL)
6367 			goto done;
6368 
6369 		error = get_author(&tagger, repo, worktree);
6370 		if (error)
6371 			goto done;
6372 		if (signer_id == NULL)
6373 			signer_id = get_signer_id(repo, worktree);
6374 
6375 		if (tagmsg) {
6376 			if (signer_id) {
6377 				error = got_sigs_apply_unveil();
6378 				if (error)
6379 					goto done;
6380 			}
6381 			error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6382 			if (error)
6383 				goto done;
6384 		}
6385 
6386 		if (commit_id_arg == NULL) {
6387 			struct got_reference *head_ref;
6388 			struct got_object_id *commit_id;
6389 			error = got_ref_open(&head_ref, repo,
6390 			    worktree ? got_worktree_get_head_ref_name(worktree)
6391 			    : GOT_REF_HEAD, 0);
6392 			if (error)
6393 				goto done;
6394 			error = got_ref_resolve(&commit_id, repo, head_ref);
6395 			got_ref_close(head_ref);
6396 			if (error)
6397 				goto done;
6398 			error = got_object_id_str(&commit_id_str, commit_id);
6399 			free(commit_id);
6400 			if (error)
6401 				goto done;
6402 		}
6403 
6404 		if (worktree) {
6405 			/* Release work tree lock. */
6406 			got_worktree_close(worktree);
6407 			worktree = NULL;
6408 		}
6409 
6410 		error = add_tag(repo, tagger, tag_name,
6411 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
6412 		    signer_id, verbosity);
6413 	}
6414 done:
6415 	if (repo) {
6416 		const struct got_error *close_err = got_repo_close(repo);
6417 		if (error == NULL)
6418 			error = close_err;
6419 	}
6420 	if (worktree)
6421 		got_worktree_close(worktree);
6422 	if (pack_fds) {
6423 		const struct got_error *pack_err =
6424 		    got_repo_pack_fds_close(pack_fds);
6425 		if (error == NULL)
6426 			error = pack_err;
6427 	}
6428 	free(cwd);
6429 	free(repo_path);
6430 	free(gitconfig_path);
6431 	free(commit_id_str);
6432 	free(tagger);
6433 	free(allowed_signers);
6434 	free(revoked_signers);
6435 	return error;
6436 }
6437 
6438 __dead static void
6439 usage_add(void)
6440 {
6441 	fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
6442 	exit(1);
6443 }
6444 
6445 static const struct got_error *
6446 add_progress(void *arg, unsigned char status, const char *path)
6447 {
6448 	while (path[0] == '/')
6449 		path++;
6450 	printf("%c  %s\n", status, path);
6451 	return NULL;
6452 }
6453 
6454 static const struct got_error *
6455 cmd_add(int argc, char *argv[])
6456 {
6457 	const struct got_error *error = NULL;
6458 	struct got_repository *repo = NULL;
6459 	struct got_worktree *worktree = NULL;
6460 	char *cwd = NULL;
6461 	struct got_pathlist_head paths;
6462 	struct got_pathlist_entry *pe;
6463 	int ch, can_recurse = 0, no_ignores = 0;
6464 	int *pack_fds = NULL;
6465 
6466 	TAILQ_INIT(&paths);
6467 
6468 #ifndef PROFILE
6469 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6470 	    NULL) == -1)
6471 		err(1, "pledge");
6472 #endif
6473 
6474 	while ((ch = getopt(argc, argv, "IR")) != -1) {
6475 		switch (ch) {
6476 		case 'I':
6477 			no_ignores = 1;
6478 			break;
6479 		case 'R':
6480 			can_recurse = 1;
6481 			break;
6482 		default:
6483 			usage_add();
6484 			/* NOTREACHED */
6485 		}
6486 	}
6487 
6488 	argc -= optind;
6489 	argv += optind;
6490 
6491 	if (argc < 1)
6492 		usage_add();
6493 
6494 	cwd = getcwd(NULL, 0);
6495 	if (cwd == NULL) {
6496 		error = got_error_from_errno("getcwd");
6497 		goto done;
6498 	}
6499 
6500 	error = got_repo_pack_fds_open(&pack_fds);
6501 	if (error != NULL)
6502 		goto done;
6503 
6504 	error = got_worktree_open(&worktree, cwd);
6505 	if (error) {
6506 		if (error->code == GOT_ERR_NOT_WORKTREE)
6507 			error = wrap_not_worktree_error(error, "add", cwd);
6508 		goto done;
6509 	}
6510 
6511 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6512 	    NULL, pack_fds);
6513 	if (error != NULL)
6514 		goto done;
6515 
6516 	error = apply_unveil(got_repo_get_path(repo), 1,
6517 	    got_worktree_get_root_path(worktree));
6518 	if (error)
6519 		goto done;
6520 
6521 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6522 	if (error)
6523 		goto done;
6524 
6525 	if (!can_recurse) {
6526 		char *ondisk_path;
6527 		struct stat sb;
6528 		TAILQ_FOREACH(pe, &paths, entry) {
6529 			if (asprintf(&ondisk_path, "%s/%s",
6530 			    got_worktree_get_root_path(worktree),
6531 			    pe->path) == -1) {
6532 				error = got_error_from_errno("asprintf");
6533 				goto done;
6534 			}
6535 			if (lstat(ondisk_path, &sb) == -1) {
6536 				if (errno == ENOENT) {
6537 					free(ondisk_path);
6538 					continue;
6539 				}
6540 				error = got_error_from_errno2("lstat",
6541 				    ondisk_path);
6542 				free(ondisk_path);
6543 				goto done;
6544 			}
6545 			free(ondisk_path);
6546 			if (S_ISDIR(sb.st_mode)) {
6547 				error = got_error_msg(GOT_ERR_BAD_PATH,
6548 				    "adding directories requires -R option");
6549 				goto done;
6550 			}
6551 		}
6552 	}
6553 
6554 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
6555 	    NULL, repo, no_ignores);
6556 done:
6557 	if (repo) {
6558 		const struct got_error *close_err = got_repo_close(repo);
6559 		if (error == NULL)
6560 			error = close_err;
6561 	}
6562 	if (worktree)
6563 		got_worktree_close(worktree);
6564 	if (pack_fds) {
6565 		const struct got_error *pack_err =
6566 		    got_repo_pack_fds_close(pack_fds);
6567 		if (error == NULL)
6568 			error = pack_err;
6569 	}
6570 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6571 	free(cwd);
6572 	return error;
6573 }
6574 
6575 __dead static void
6576 usage_remove(void)
6577 {
6578 	fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
6579 	    getprogname());
6580 	exit(1);
6581 }
6582 
6583 static const struct got_error *
6584 print_remove_status(void *arg, unsigned char status,
6585     unsigned char staged_status, const char *path)
6586 {
6587 	while (path[0] == '/')
6588 		path++;
6589 	if (status == GOT_STATUS_NONEXISTENT)
6590 		return NULL;
6591 	if (status == staged_status && (status == GOT_STATUS_DELETE))
6592 		status = GOT_STATUS_NO_CHANGE;
6593 	printf("%c%c %s\n", status, staged_status, path);
6594 	return NULL;
6595 }
6596 
6597 static const struct got_error *
6598 cmd_remove(int argc, char *argv[])
6599 {
6600 	const struct got_error *error = NULL;
6601 	struct got_worktree *worktree = NULL;
6602 	struct got_repository *repo = NULL;
6603 	const char *status_codes = NULL;
6604 	char *cwd = NULL;
6605 	struct got_pathlist_head paths;
6606 	struct got_pathlist_entry *pe;
6607 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6608 	int ignore_missing_paths = 0;
6609 	int *pack_fds = NULL;
6610 
6611 	TAILQ_INIT(&paths);
6612 
6613 #ifndef PROFILE
6614 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6615 	    NULL) == -1)
6616 		err(1, "pledge");
6617 #endif
6618 
6619 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6620 		switch (ch) {
6621 		case 'f':
6622 			delete_local_mods = 1;
6623 			ignore_missing_paths = 1;
6624 			break;
6625 		case 'k':
6626 			keep_on_disk = 1;
6627 			break;
6628 		case 'R':
6629 			can_recurse = 1;
6630 			break;
6631 		case 's':
6632 			for (i = 0; optarg[i] != '\0'; i++) {
6633 				switch (optarg[i]) {
6634 				case GOT_STATUS_MODIFY:
6635 					delete_local_mods = 1;
6636 					break;
6637 				case GOT_STATUS_MISSING:
6638 					ignore_missing_paths = 1;
6639 					break;
6640 				default:
6641 					errx(1, "invalid status code '%c'",
6642 					    optarg[i]);
6643 				}
6644 			}
6645 			status_codes = optarg;
6646 			break;
6647 		default:
6648 			usage_remove();
6649 			/* NOTREACHED */
6650 		}
6651 	}
6652 
6653 	argc -= optind;
6654 	argv += optind;
6655 
6656 	if (argc < 1)
6657 		usage_remove();
6658 
6659 	cwd = getcwd(NULL, 0);
6660 	if (cwd == NULL) {
6661 		error = got_error_from_errno("getcwd");
6662 		goto done;
6663 	}
6664 
6665 	error = got_repo_pack_fds_open(&pack_fds);
6666 	if (error != NULL)
6667 		goto done;
6668 
6669 	error = got_worktree_open(&worktree, cwd);
6670 	if (error) {
6671 		if (error->code == GOT_ERR_NOT_WORKTREE)
6672 			error = wrap_not_worktree_error(error, "remove", cwd);
6673 		goto done;
6674 	}
6675 
6676 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6677 	    NULL, pack_fds);
6678 	if (error)
6679 		goto done;
6680 
6681 	error = apply_unveil(got_repo_get_path(repo), 1,
6682 	    got_worktree_get_root_path(worktree));
6683 	if (error)
6684 		goto done;
6685 
6686 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6687 	if (error)
6688 		goto done;
6689 
6690 	if (!can_recurse) {
6691 		char *ondisk_path;
6692 		struct stat sb;
6693 		TAILQ_FOREACH(pe, &paths, entry) {
6694 			if (asprintf(&ondisk_path, "%s/%s",
6695 			    got_worktree_get_root_path(worktree),
6696 			    pe->path) == -1) {
6697 				error = got_error_from_errno("asprintf");
6698 				goto done;
6699 			}
6700 			if (lstat(ondisk_path, &sb) == -1) {
6701 				if (errno == ENOENT) {
6702 					free(ondisk_path);
6703 					continue;
6704 				}
6705 				error = got_error_from_errno2("lstat",
6706 				    ondisk_path);
6707 				free(ondisk_path);
6708 				goto done;
6709 			}
6710 			free(ondisk_path);
6711 			if (S_ISDIR(sb.st_mode)) {
6712 				error = got_error_msg(GOT_ERR_BAD_PATH,
6713 				    "removing directories requires -R option");
6714 				goto done;
6715 			}
6716 		}
6717 	}
6718 
6719 	error = got_worktree_schedule_delete(worktree, &paths,
6720 	    delete_local_mods, status_codes, print_remove_status, NULL,
6721 	    repo, keep_on_disk, ignore_missing_paths);
6722 done:
6723 	if (repo) {
6724 		const struct got_error *close_err = got_repo_close(repo);
6725 		if (error == NULL)
6726 			error = close_err;
6727 	}
6728 	if (worktree)
6729 		got_worktree_close(worktree);
6730 	if (pack_fds) {
6731 		const struct got_error *pack_err =
6732 		    got_repo_pack_fds_close(pack_fds);
6733 		if (error == NULL)
6734 			error = pack_err;
6735 	}
6736 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6737 	free(cwd);
6738 	return error;
6739 }
6740 
6741 __dead static void
6742 usage_patch(void)
6743 {
6744 	fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
6745 	    "[patchfile]\n", getprogname());
6746 	exit(1);
6747 }
6748 
6749 static const struct got_error *
6750 patch_from_stdin(int *patchfd)
6751 {
6752 	const struct got_error *err = NULL;
6753 	ssize_t r;
6754 	char buf[BUFSIZ];
6755 	sig_t sighup, sigint, sigquit;
6756 
6757 	*patchfd = got_opentempfd();
6758 	if (*patchfd == -1)
6759 		return got_error_from_errno("got_opentempfd");
6760 
6761 	sighup = signal(SIGHUP, SIG_DFL);
6762 	sigint = signal(SIGINT, SIG_DFL);
6763 	sigquit = signal(SIGQUIT, SIG_DFL);
6764 
6765 	for (;;) {
6766 		r = read(0, buf, sizeof(buf));
6767 		if (r == -1) {
6768 			err = got_error_from_errno("read");
6769 			break;
6770 		}
6771 		if (r == 0)
6772 			break;
6773 		if (write(*patchfd, buf, r) == -1) {
6774 			err = got_error_from_errno("write");
6775 			break;
6776 		}
6777 	}
6778 
6779 	signal(SIGHUP, sighup);
6780 	signal(SIGINT, sigint);
6781 	signal(SIGQUIT, sigquit);
6782 
6783 	if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
6784 		err = got_error_from_errno("lseek");
6785 
6786 	if (err != NULL) {
6787 		close(*patchfd);
6788 		*patchfd = -1;
6789 	}
6790 
6791 	return err;
6792 }
6793 
6794 struct got_patch_progress_arg {
6795 	int did_something;
6796 	int conflicts;
6797 	int rejects;
6798 };
6799 
6800 static const struct got_error *
6801 patch_progress(void *arg, const char *old, const char *new,
6802     unsigned char status, const struct got_error *error, int old_from,
6803     int old_lines, int new_from, int new_lines, int offset,
6804     int ws_mangled, const struct got_error *hunk_err)
6805 {
6806 	const char *path = new == NULL ? old : new;
6807 	struct got_patch_progress_arg *a = arg;
6808 
6809 	while (*path == '/')
6810 		path++;
6811 
6812 	if (status != GOT_STATUS_NO_CHANGE &&
6813 	    status != 0 /* per-hunk progress */) {
6814 		printf("%c  %s\n", status, path);
6815 		a->did_something = 1;
6816 	}
6817 
6818 	if (hunk_err == NULL) {
6819 		if (status == GOT_STATUS_CANNOT_UPDATE)
6820 			a->rejects++;
6821 		else if (status == GOT_STATUS_CONFLICT)
6822 			a->conflicts++;
6823 	}
6824 
6825 	if (error != NULL)
6826 		fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
6827 
6828 	if (offset != 0 || hunk_err != NULL || ws_mangled) {
6829 		printf("@@ -%d,%d +%d,%d @@ ", old_from,
6830 		    old_lines, new_from, new_lines);
6831 		if (hunk_err != NULL)
6832 			printf("%s\n", hunk_err->msg);
6833 		else if (offset != 0)
6834 			printf("applied with offset %d\n", offset);
6835 		else
6836 			printf("hunk contains mangled whitespace\n");
6837 	}
6838 
6839 	return NULL;
6840 }
6841 
6842 static void
6843 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
6844 {
6845 	if (!ppa->did_something)
6846 		return;
6847 
6848 	if (ppa->conflicts > 0)
6849 		printf("Files with merge conflicts: %d\n", ppa->conflicts);
6850 
6851 	if (ppa->rejects > 0) {
6852 		printf("Files where patch failed to apply: %d\n",
6853 		    ppa->rejects);
6854 	}
6855 }
6856 
6857 static const struct got_error *
6858 cmd_patch(int argc, char *argv[])
6859 {
6860 	const struct got_error *error = NULL, *close_error = NULL;
6861 	struct got_worktree *worktree = NULL;
6862 	struct got_repository *repo = NULL;
6863 	struct got_reflist_head refs;
6864 	struct got_object_id *commit_id = NULL;
6865 	const char *commit_id_str = NULL;
6866 	struct stat sb;
6867 	const char *errstr;
6868 	char *cwd = NULL;
6869 	int ch, nop = 0, strip = -1, reverse = 0;
6870 	int patchfd;
6871 	int *pack_fds = NULL;
6872 	struct got_patch_progress_arg ppa;
6873 
6874 	TAILQ_INIT(&refs);
6875 
6876 #ifndef PROFILE
6877 	if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
6878 	    "unveil", NULL) == -1)
6879 		err(1, "pledge");
6880 #endif
6881 
6882 	while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
6883 		switch (ch) {
6884 		case 'c':
6885 			commit_id_str = optarg;
6886 			break;
6887 		case 'n':
6888 			nop = 1;
6889 			break;
6890 		case 'p':
6891 			strip = strtonum(optarg, 0, INT_MAX, &errstr);
6892 			if (errstr != NULL)
6893 				errx(1, "pathname strip count is %s: %s",
6894 				     errstr, optarg);
6895 			break;
6896 		case 'R':
6897 			reverse = 1;
6898 			break;
6899 		default:
6900 			usage_patch();
6901 			/* NOTREACHED */
6902 		}
6903 	}
6904 
6905 	argc -= optind;
6906 	argv += optind;
6907 
6908 	if (argc == 0) {
6909 		error = patch_from_stdin(&patchfd);
6910 		if (error)
6911 			return error;
6912 	} else if (argc == 1) {
6913 		patchfd = open(argv[0], O_RDONLY);
6914 		if (patchfd == -1) {
6915 			error = got_error_from_errno2("open", argv[0]);
6916 			return error;
6917 		}
6918 		if (fstat(patchfd, &sb) == -1) {
6919 			error = got_error_from_errno2("fstat", argv[0]);
6920 			goto done;
6921 		}
6922 		if (!S_ISREG(sb.st_mode)) {
6923 			error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
6924 			goto done;
6925 		}
6926 	} else
6927 		usage_patch();
6928 
6929 	if ((cwd = getcwd(NULL, 0)) == NULL) {
6930 		error = got_error_from_errno("getcwd");
6931 		goto done;
6932 	}
6933 
6934 	error = got_repo_pack_fds_open(&pack_fds);
6935 	if (error != NULL)
6936 		goto done;
6937 
6938 	error = got_worktree_open(&worktree, cwd);
6939 	if (error != NULL)
6940 		goto done;
6941 
6942 	const char *repo_path = got_worktree_get_repo_path(worktree);
6943 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6944 	if (error != NULL)
6945 		goto done;
6946 
6947 	error = apply_unveil(got_repo_get_path(repo), 0,
6948 	    got_worktree_get_root_path(worktree));
6949 	if (error != NULL)
6950 		goto done;
6951 
6952 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6953 	if (error)
6954 		goto done;
6955 
6956 	if (commit_id_str != NULL) {
6957 		error = got_repo_match_object_id(&commit_id, NULL,
6958 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6959 		if (error)
6960 			goto done;
6961 	}
6962 
6963 	memset(&ppa, 0, sizeof(ppa));
6964 	error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
6965 	    commit_id, patch_progress, &ppa, check_cancelled, NULL);
6966 	print_patch_progress_stats(&ppa);
6967 done:
6968 	got_ref_list_free(&refs);
6969 	free(commit_id);
6970 	if (repo) {
6971 		close_error = got_repo_close(repo);
6972 		if (error == NULL)
6973 			error = close_error;
6974 	}
6975 	if (worktree != NULL) {
6976 		close_error = got_worktree_close(worktree);
6977 		if (error == NULL)
6978 			error = close_error;
6979 	}
6980 	if (pack_fds) {
6981 		const struct got_error *pack_err =
6982 		    got_repo_pack_fds_close(pack_fds);
6983 		if (error == NULL)
6984 			error = pack_err;
6985 	}
6986 	free(cwd);
6987 	return error;
6988 }
6989 
6990 __dead static void
6991 usage_revert(void)
6992 {
6993 	fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
6994 	    getprogname());
6995 	exit(1);
6996 }
6997 
6998 static const struct got_error *
6999 revert_progress(void *arg, unsigned char status, const char *path)
7000 {
7001 	if (status == GOT_STATUS_UNVERSIONED)
7002 		return NULL;
7003 
7004 	while (path[0] == '/')
7005 		path++;
7006 	printf("%c  %s\n", status, path);
7007 	return NULL;
7008 }
7009 
7010 struct choose_patch_arg {
7011 	FILE *patch_script_file;
7012 	const char *action;
7013 };
7014 
7015 static const struct got_error *
7016 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7017     int nchanges, const char *action)
7018 {
7019 	const struct got_error *err;
7020 	char *line = NULL;
7021 	size_t linesize = 0;
7022 	ssize_t linelen;
7023 
7024 	switch (status) {
7025 	case GOT_STATUS_ADD:
7026 		printf("A  %s\n%s this addition? [y/n] ", path, action);
7027 		break;
7028 	case GOT_STATUS_DELETE:
7029 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
7030 		break;
7031 	case GOT_STATUS_MODIFY:
7032 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
7033 			return got_error_from_errno("fseek");
7034 		printf(GOT_COMMIT_SEP_STR);
7035 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7036 			printf("%s", line);
7037 		if (linelen == -1 && ferror(patch_file)) {
7038 			err = got_error_from_errno("getline");
7039 			free(line);
7040 			return err;
7041 		}
7042 		free(line);
7043 		printf(GOT_COMMIT_SEP_STR);
7044 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
7045 		    path, n, nchanges, action);
7046 		break;
7047 	default:
7048 		return got_error_path(path, GOT_ERR_FILE_STATUS);
7049 	}
7050 
7051 	fflush(stdout);
7052 	return NULL;
7053 }
7054 
7055 static const struct got_error *
7056 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7057     FILE *patch_file, int n, int nchanges)
7058 {
7059 	const struct got_error *err = NULL;
7060 	char *line = NULL;
7061 	size_t linesize = 0;
7062 	ssize_t linelen;
7063 	int resp = ' ';
7064 	struct choose_patch_arg *a = arg;
7065 
7066 	*choice = GOT_PATCH_CHOICE_NONE;
7067 
7068 	if (a->patch_script_file) {
7069 		char *nl;
7070 		err = show_change(status, path, patch_file, n, nchanges,
7071 		    a->action);
7072 		if (err)
7073 			return err;
7074 		linelen = getline(&line, &linesize, a->patch_script_file);
7075 		if (linelen == -1) {
7076 			if (ferror(a->patch_script_file))
7077 				return got_error_from_errno("getline");
7078 			return NULL;
7079 		}
7080 		nl = strchr(line, '\n');
7081 		if (nl)
7082 			*nl = '\0';
7083 		if (strcmp(line, "y") == 0) {
7084 			*choice = GOT_PATCH_CHOICE_YES;
7085 			printf("y\n");
7086 		} else if (strcmp(line, "n") == 0) {
7087 			*choice = GOT_PATCH_CHOICE_NO;
7088 			printf("n\n");
7089 		} else if (strcmp(line, "q") == 0 &&
7090 		    status == GOT_STATUS_MODIFY) {
7091 			*choice = GOT_PATCH_CHOICE_QUIT;
7092 			printf("q\n");
7093 		} else
7094 			printf("invalid response '%s'\n", line);
7095 		free(line);
7096 		return NULL;
7097 	}
7098 
7099 	while (resp != 'y' && resp != 'n' && resp != 'q') {
7100 		err = show_change(status, path, patch_file, n, nchanges,
7101 		    a->action);
7102 		if (err)
7103 			return err;
7104 		resp = getchar();
7105 		if (resp == '\n')
7106 			resp = getchar();
7107 		if (status == GOT_STATUS_MODIFY) {
7108 			if (resp != 'y' && resp != 'n' && resp != 'q') {
7109 				printf("invalid response '%c'\n", resp);
7110 				resp = ' ';
7111 			}
7112 		} else if (resp != 'y' && resp != 'n') {
7113 				printf("invalid response '%c'\n", resp);
7114 				resp = ' ';
7115 		}
7116 	}
7117 
7118 	if (resp == 'y')
7119 		*choice = GOT_PATCH_CHOICE_YES;
7120 	else if (resp == 'n')
7121 		*choice = GOT_PATCH_CHOICE_NO;
7122 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7123 		*choice = GOT_PATCH_CHOICE_QUIT;
7124 
7125 	return NULL;
7126 }
7127 
7128 struct wt_commitable_path_arg {
7129 	struct got_pathlist_head	*commit_paths;
7130 	int				*has_changes;
7131 };
7132 
7133 /*
7134  * Shortcut work tree status callback to determine if the set of paths scanned
7135  * has at least one versioned path that is being modified and, if not NULL, is
7136  * in the arg->commit_paths list.  Set arg and return GOT_ERR_FILE_MODIFIED as
7137  * soon as a path is passed with a status that satisfies this criteria.
7138  */
7139 static const struct got_error *
7140 worktree_has_commitable_path(void *arg, unsigned char status,
7141     unsigned char staged_status, const char *path,
7142     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7143     struct got_object_id *commit_id, int dirfd, const char *de_name)
7144 {
7145 	struct wt_commitable_path_arg *a = arg;
7146 
7147 	if (status == staged_status && (status == GOT_STATUS_DELETE))
7148 		status = GOT_STATUS_NO_CHANGE;
7149 
7150 	if (!(status == GOT_STATUS_NO_CHANGE ||
7151 	    status == GOT_STATUS_UNVERSIONED) ||
7152 	    staged_status != GOT_STATUS_NO_CHANGE) {
7153 		if (a->commit_paths != NULL) {
7154 			struct got_pathlist_entry *pe;
7155 
7156 			TAILQ_FOREACH(pe, a->commit_paths, entry) {
7157 				if (strncmp(path, pe->path,
7158 				    pe->path_len) == 0) {
7159 					*a->has_changes = 1;
7160 					break;
7161 				}
7162 			}
7163 		} else
7164 			*a->has_changes = 1;
7165 
7166 		if (*a->has_changes)
7167 			return got_error(GOT_ERR_FILE_MODIFIED);
7168 	}
7169 
7170 	return NULL;
7171 }
7172 
7173 /*
7174  * Check that the changeset of the commit identified by id is
7175  * comprised of at least one modified path that is being committed.
7176  */
7177 static const struct got_error *
7178 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
7179     struct got_object_id *id, struct got_worktree *worktree,
7180     struct got_repository *repo)
7181 {
7182 	const struct got_error		*err;
7183 	struct got_pathlist_head	 paths;
7184 	struct got_commit_object	*commit = NULL, *pcommit = NULL;
7185 	struct got_tree_object		*tree = NULL, *ptree = NULL;
7186 	struct got_object_qid		*pid;
7187 
7188 	TAILQ_INIT(&paths);
7189 
7190 	err = got_object_open_as_commit(&commit, repo, id);
7191 	if (err)
7192 		goto done;
7193 
7194 	err = got_object_open_as_tree(&tree, repo,
7195 	    got_object_commit_get_tree_id(commit));
7196 	if (err)
7197 		goto done;
7198 
7199 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
7200 	if (pid != NULL) {
7201 		err = got_object_open_as_commit(&pcommit, repo, &pid->id);
7202 		if (err)
7203 			goto done;
7204 
7205 		err = got_object_open_as_tree(&ptree, repo,
7206 		    got_object_commit_get_tree_id(pcommit));
7207 		if (err)
7208 			goto done;
7209 	}
7210 
7211 	err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
7212 	    got_diff_tree_collect_changed_paths, &paths, 0);
7213 	if (err)
7214 		goto done;
7215 
7216 	err = got_worktree_status(worktree, &paths, repo, 0,
7217 	    worktree_has_commitable_path, wcpa, check_cancelled, NULL);
7218 	if (err && err->code == GOT_ERR_FILE_MODIFIED) {
7219 		/*
7220 		 * At least one changed path in the referenced commit is
7221 		 * modified in the work tree, that's all we need to know!
7222 		 */
7223 		err = NULL;
7224 	}
7225 
7226 done:
7227 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
7228 	if (commit)
7229 		got_object_commit_close(commit);
7230 	if (pcommit)
7231 		got_object_commit_close(pcommit);
7232 	if (tree)
7233 		got_object_tree_close(tree);
7234 	if (ptree)
7235 		got_object_tree_close(ptree);
7236 	return err;
7237 }
7238 
7239 /*
7240  * Remove any "logmsg" reference comprised entirely of paths that have
7241  * been reverted in this work tree. If any path in the logmsg ref changeset
7242  * remains in a changed state in the worktree, do not remove the reference.
7243  */
7244 static const struct got_error *
7245 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
7246 {
7247 	const struct got_error		*err;
7248 	struct got_reflist_head		 refs;
7249 	struct got_reflist_entry	*re;
7250 	struct got_commit_object	*commit = NULL;
7251 	struct got_object_id		*commit_id = NULL;
7252 	struct wt_commitable_path_arg	 wcpa;
7253 	char				*uuidstr = NULL;
7254 
7255 	TAILQ_INIT(&refs);
7256 
7257 	err = got_worktree_get_uuid(&uuidstr, worktree);
7258 	if (err)
7259 		goto done;
7260 
7261 	err = got_ref_list(&refs, repo, "refs/got/worktree",
7262 	    got_ref_cmp_by_name, repo);
7263 	if (err)
7264 		goto done;
7265 
7266 	TAILQ_FOREACH(re, &refs, entry) {
7267 		const char	*refname;
7268 		int		 has_changes = 0;
7269 
7270 		refname = got_ref_get_name(re->ref);
7271 
7272 		if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7273 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
7274 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7275 		else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7276 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
7277 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7278 		else
7279 			continue;
7280 
7281 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7282 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7283 		else
7284 			continue;
7285 
7286 		err = got_repo_match_object_id(&commit_id, NULL, refname,
7287 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
7288 		if (err)
7289 			goto done;
7290 
7291 		err = got_object_open_as_commit(&commit, repo, commit_id);
7292 		if (err)
7293 			goto done;
7294 
7295 		wcpa.commit_paths = NULL;
7296 		wcpa.has_changes = &has_changes;
7297 
7298 		err = commit_path_changed_in_worktree(&wcpa, commit_id,
7299 		    worktree, repo);
7300 		if (err)
7301 			goto done;
7302 
7303 		if (!has_changes) {
7304 			err = got_ref_delete(re->ref, repo);
7305 			if (err)
7306 				goto done;
7307 		}
7308 
7309 		got_object_commit_close(commit);
7310 		commit = NULL;
7311 		free(commit_id);
7312 		commit_id = NULL;
7313 	}
7314 
7315 done:
7316 	free(uuidstr);
7317 	free(commit_id);
7318 	got_ref_list_free(&refs);
7319 	if (commit)
7320 		got_object_commit_close(commit);
7321 	return err;
7322 }
7323 
7324 static const struct got_error *
7325 cmd_revert(int argc, char *argv[])
7326 {
7327 	const struct got_error *error = NULL;
7328 	struct got_worktree *worktree = NULL;
7329 	struct got_repository *repo = NULL;
7330 	char *cwd = NULL, *path = NULL;
7331 	struct got_pathlist_head paths;
7332 	struct got_pathlist_entry *pe;
7333 	int ch, can_recurse = 0, pflag = 0;
7334 	FILE *patch_script_file = NULL;
7335 	const char *patch_script_path = NULL;
7336 	struct choose_patch_arg cpa;
7337 	int *pack_fds = NULL;
7338 
7339 	TAILQ_INIT(&paths);
7340 
7341 #ifndef PROFILE
7342 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7343 	    "unveil", NULL) == -1)
7344 		err(1, "pledge");
7345 #endif
7346 
7347 	while ((ch = getopt(argc, argv, "F:pR")) != -1) {
7348 		switch (ch) {
7349 		case 'F':
7350 			patch_script_path = optarg;
7351 			break;
7352 		case 'p':
7353 			pflag = 1;
7354 			break;
7355 		case 'R':
7356 			can_recurse = 1;
7357 			break;
7358 		default:
7359 			usage_revert();
7360 			/* NOTREACHED */
7361 		}
7362 	}
7363 
7364 	argc -= optind;
7365 	argv += optind;
7366 
7367 	if (argc < 1)
7368 		usage_revert();
7369 	if (patch_script_path && !pflag)
7370 		errx(1, "-F option can only be used together with -p option");
7371 
7372 	cwd = getcwd(NULL, 0);
7373 	if (cwd == NULL) {
7374 		error = got_error_from_errno("getcwd");
7375 		goto done;
7376 	}
7377 
7378 	error = got_repo_pack_fds_open(&pack_fds);
7379 	if (error != NULL)
7380 		goto done;
7381 
7382 	error = got_worktree_open(&worktree, cwd);
7383 	if (error) {
7384 		if (error->code == GOT_ERR_NOT_WORKTREE)
7385 			error = wrap_not_worktree_error(error, "revert", cwd);
7386 		goto done;
7387 	}
7388 
7389 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7390 	    NULL, pack_fds);
7391 	if (error != NULL)
7392 		goto done;
7393 
7394 	if (patch_script_path) {
7395 		patch_script_file = fopen(patch_script_path, "re");
7396 		if (patch_script_file == NULL) {
7397 			error = got_error_from_errno2("fopen",
7398 			    patch_script_path);
7399 			goto done;
7400 		}
7401 	}
7402 
7403 	/*
7404 	 * XXX "c" perm needed on repo dir to delete merge references.
7405 	 */
7406 	error = apply_unveil(got_repo_get_path(repo), 0,
7407 	    got_worktree_get_root_path(worktree));
7408 	if (error)
7409 		goto done;
7410 
7411 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7412 	if (error)
7413 		goto done;
7414 
7415 	if (!can_recurse) {
7416 		char *ondisk_path;
7417 		struct stat sb;
7418 		TAILQ_FOREACH(pe, &paths, entry) {
7419 			if (asprintf(&ondisk_path, "%s/%s",
7420 			    got_worktree_get_root_path(worktree),
7421 			    pe->path) == -1) {
7422 				error = got_error_from_errno("asprintf");
7423 				goto done;
7424 			}
7425 			if (lstat(ondisk_path, &sb) == -1) {
7426 				if (errno == ENOENT) {
7427 					free(ondisk_path);
7428 					continue;
7429 				}
7430 				error = got_error_from_errno2("lstat",
7431 				    ondisk_path);
7432 				free(ondisk_path);
7433 				goto done;
7434 			}
7435 			free(ondisk_path);
7436 			if (S_ISDIR(sb.st_mode)) {
7437 				error = got_error_msg(GOT_ERR_BAD_PATH,
7438 				    "reverting directories requires -R option");
7439 				goto done;
7440 			}
7441 		}
7442 	}
7443 
7444 	cpa.patch_script_file = patch_script_file;
7445 	cpa.action = "revert";
7446 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7447 	    pflag ? choose_patch : NULL, &cpa, repo);
7448 
7449 	error = rm_logmsg_ref(worktree, repo);
7450 done:
7451 	if (patch_script_file && fclose(patch_script_file) == EOF &&
7452 	    error == NULL)
7453 		error = got_error_from_errno2("fclose", patch_script_path);
7454 	if (repo) {
7455 		const struct got_error *close_err = got_repo_close(repo);
7456 		if (error == NULL)
7457 			error = close_err;
7458 	}
7459 	if (worktree)
7460 		got_worktree_close(worktree);
7461 	if (pack_fds) {
7462 		const struct got_error *pack_err =
7463 		    got_repo_pack_fds_close(pack_fds);
7464 		if (error == NULL)
7465 			error = pack_err;
7466 	}
7467 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7468 	free(path);
7469 	free(cwd);
7470 	return error;
7471 }
7472 
7473 __dead static void
7474 usage_commit(void)
7475 {
7476 	fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
7477 	    "[-m message] [path ...]\n", getprogname());
7478 	exit(1);
7479 }
7480 
7481 struct collect_commit_logmsg_arg {
7482 	const char *cmdline_log;
7483 	const char *prepared_log;
7484 	const char *merged_log;
7485 	int non_interactive;
7486 	const char *editor;
7487 	const char *worktree_path;
7488 	const char *repo_path;
7489 	const char *dial_proto;
7490 	char *logmsg_path;
7491 };
7492 
7493 static const struct got_error *
7494 read_prepared_logmsg(char **logmsg, const char *path)
7495 {
7496 	const struct got_error *err = NULL;
7497 	FILE *f = NULL;
7498 	struct stat sb;
7499 	size_t r;
7500 
7501 	*logmsg = NULL;
7502 	memset(&sb, 0, sizeof(sb));
7503 
7504 	f = fopen(path, "re");
7505 	if (f == NULL)
7506 		return got_error_from_errno2("fopen", path);
7507 
7508 	if (fstat(fileno(f), &sb) == -1) {
7509 		err = got_error_from_errno2("fstat", path);
7510 		goto done;
7511 	}
7512 	if (sb.st_size == 0) {
7513 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7514 		goto done;
7515 	}
7516 
7517 	*logmsg = malloc(sb.st_size + 1);
7518 	if (*logmsg == NULL) {
7519 		err = got_error_from_errno("malloc");
7520 		goto done;
7521 	}
7522 
7523 	r = fread(*logmsg, 1, sb.st_size, f);
7524 	if (r != sb.st_size) {
7525 		if (ferror(f))
7526 			err = got_error_from_errno2("fread", path);
7527 		else
7528 			err = got_error(GOT_ERR_IO);
7529 		goto done;
7530 	}
7531 	(*logmsg)[sb.st_size] = '\0';
7532 done:
7533 	if (fclose(f) == EOF && err == NULL)
7534 		err = got_error_from_errno2("fclose", path);
7535 	if (err) {
7536 		free(*logmsg);
7537 		*logmsg = NULL;
7538 	}
7539 	return err;
7540 }
7541 
7542 static const struct got_error *
7543 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
7544     const char *diff_path, char **logmsg, void *arg)
7545 {
7546 	char *initial_content = NULL;
7547 	struct got_pathlist_entry *pe;
7548 	const struct got_error *err = NULL;
7549 	char *template = NULL;
7550 	char *prepared_msg = NULL, *merged_msg = NULL;
7551 	struct collect_commit_logmsg_arg *a = arg;
7552 	int initial_content_len;
7553 	int fd = -1;
7554 	size_t len;
7555 
7556 	/* if a message was specified on the command line, just use it */
7557 	if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
7558 		len = strlen(a->cmdline_log) + 1;
7559 		*logmsg = malloc(len + 1);
7560 		if (*logmsg == NULL)
7561 			return got_error_from_errno("malloc");
7562 		strlcpy(*logmsg, a->cmdline_log, len);
7563 		return NULL;
7564 	} else if (a->prepared_log != NULL && a->non_interactive)
7565 		return read_prepared_logmsg(logmsg, a->prepared_log);
7566 
7567 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7568 		return got_error_from_errno("asprintf");
7569 
7570 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
7571 	if (err)
7572 		goto done;
7573 
7574 	if (a->prepared_log) {
7575 		err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
7576 		if (err)
7577 			goto done;
7578 	} else if (a->merged_log) {
7579 		err = read_prepared_logmsg(&merged_msg, a->merged_log);
7580 		if (err)
7581 			goto done;
7582 	}
7583 
7584 	initial_content_len = asprintf(&initial_content,
7585 	    "%s%s\n# changes to be committed:\n",
7586 	    prepared_msg ? prepared_msg : "",
7587 	    merged_msg ? merged_msg : "");
7588 	if (initial_content_len == -1) {
7589 		err = got_error_from_errno("asprintf");
7590 		goto done;
7591 	}
7592 
7593 	if (write(fd, initial_content, initial_content_len) == -1) {
7594 		err = got_error_from_errno2("write", a->logmsg_path);
7595 		goto done;
7596 	}
7597 
7598 	TAILQ_FOREACH(pe, commitable_paths, entry) {
7599 		struct got_commitable *ct = pe->data;
7600 		dprintf(fd, "#  %c  %s\n",
7601 		    got_commitable_get_status(ct),
7602 		    got_commitable_get_path(ct));
7603 	}
7604 
7605 	if (diff_path) {
7606 		dprintf(fd, "# detailed changes can be viewed in %s\n",
7607 		    diff_path);
7608 	}
7609 
7610 	if (close(fd) == -1) {
7611 		err = got_error_from_errno2("close", a->logmsg_path);
7612 		goto done;
7613 	}
7614 	fd = -1;
7615 
7616 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7617 	    initial_content_len, a->prepared_log ? 0 : 1);
7618 done:
7619 	free(initial_content);
7620 	free(template);
7621 	free(prepared_msg);
7622 	free(merged_msg);
7623 
7624 	if (fd != -1 && close(fd) == -1 && err == NULL)
7625 		err = got_error_from_errno2("close", a->logmsg_path);
7626 
7627 	/* Editor is done; we can now apply unveil(2) */
7628 	if (err == NULL)
7629 		err = got_dial_apply_unveil(a->dial_proto);
7630 	if (err == NULL)
7631 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
7632 	if (err) {
7633 		free(*logmsg);
7634 		*logmsg = NULL;
7635 	}
7636 	return err;
7637 }
7638 
7639 static const struct got_error *
7640 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
7641     const char *type, int has_content)
7642 {
7643 	const struct got_error	*err = NULL;
7644 	char			*logmsg = NULL;
7645 
7646 	err = got_object_commit_get_logmsg(&logmsg, commit);
7647 	if (err)
7648 		return err;
7649 
7650 	if (fprintf(f, "%s# log message of %s commit %s:%s",
7651 	    has_content ? "\n" : "", type, idstr, logmsg) < 0)
7652 		err = got_ferror(f, GOT_ERR_IO);
7653 
7654 	free(logmsg);
7655 	return err;
7656 }
7657 
7658 /*
7659  * Lookup "logmsg" references of backed-out and cherrypicked commits
7660  * belonging to the current work tree. If found, and the worktree has
7661  * at least one modified file that was changed in the referenced commit,
7662  * add its log message to a new temporary file at *logmsg_path.
7663  * Add all refs found to matched_refs to be scheduled for removal on
7664  * successful commit.
7665  */
7666 static const struct got_error *
7667 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
7668     struct got_reflist_head *matched_refs, struct got_worktree *worktree,
7669     struct got_repository *repo)
7670 {
7671 	const struct got_error		*err;
7672 	struct got_commit_object	*commit = NULL;
7673 	struct got_object_id		*id = NULL;
7674 	struct got_reflist_head		 refs;
7675 	struct got_reflist_entry	*re, *re_match;
7676 	FILE				*f = NULL;
7677 	char				*uuidstr = NULL;
7678 	int				 added_logmsg = 0;
7679 
7680 	TAILQ_INIT(&refs);
7681 
7682 	*logmsg_path = NULL;
7683 
7684 	err = got_worktree_get_uuid(&uuidstr, worktree);
7685 	if (err)
7686 		goto done;
7687 
7688 	err = got_ref_list(&refs, repo, "refs/got/worktree",
7689 	    got_ref_cmp_by_name, repo);
7690 	if (err)
7691 		goto done;
7692 
7693 	TAILQ_FOREACH(re, &refs, entry) {
7694 		const char			*refname, *type;
7695 		struct wt_commitable_path_arg	 wcpa;
7696 		int				 add_logmsg = 0;
7697 
7698 		refname = got_ref_get_name(re->ref);
7699 
7700 		if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
7701 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
7702 			refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
7703 			type = "cherrypicked";
7704 		} else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
7705 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
7706 			refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
7707 			type = "backed-out";
7708 		} else
7709 			continue;
7710 
7711 		if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
7712 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
7713 		else
7714 			continue;
7715 
7716 		err = got_repo_match_object_id(&id, NULL, refname,
7717 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
7718 		if (err)
7719 			goto done;
7720 
7721 		err = got_object_open_as_commit(&commit, repo, id);
7722 		if (err)
7723 			goto done;
7724 
7725 		wcpa.commit_paths = paths;
7726 		wcpa.has_changes = &add_logmsg;
7727 
7728 		err = commit_path_changed_in_worktree(&wcpa, id,
7729 		    worktree, repo);
7730 		if (err)
7731 			goto done;
7732 
7733 		if (add_logmsg) {
7734 			if (f == NULL) {
7735 				err = got_opentemp_named(logmsg_path, &f,
7736 				    "got-commit-logmsg", "");
7737 				if (err)
7738 					goto done;
7739 			}
7740 			err = cat_logmsg(f, commit, refname, type,
7741 			    added_logmsg);
7742 			if (err)
7743 				goto done;
7744 			if (!added_logmsg)
7745 				++added_logmsg;
7746 
7747 			err = got_reflist_entry_dup(&re_match, re);
7748 			if (err)
7749 				goto done;
7750 			TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
7751 		}
7752 
7753 		got_object_commit_close(commit);
7754 		commit = NULL;
7755 		free(id);
7756 		id = NULL;
7757 	}
7758 
7759 done:
7760 	free(id);
7761 	free(uuidstr);
7762 	got_ref_list_free(&refs);
7763 	if (commit)
7764 		got_object_commit_close(commit);
7765 	if (f && fclose(f) == EOF && err == NULL)
7766 		err = got_error_from_errno("fclose");
7767 	if (!added_logmsg) {
7768 		if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
7769 			err = got_error_from_errno2("unlink", *logmsg_path);
7770 		*logmsg_path = NULL;
7771 	}
7772 	return err;
7773 }
7774 
7775 static const struct got_error *
7776 cmd_commit(int argc, char *argv[])
7777 {
7778 	const struct got_error *error = NULL;
7779 	struct got_worktree *worktree = NULL;
7780 	struct got_repository *repo = NULL;
7781 	char *cwd = NULL, *id_str = NULL;
7782 	struct got_object_id *id = NULL;
7783 	const char *logmsg = NULL;
7784 	char *prepared_logmsg = NULL, *merged_logmsg = NULL;
7785 	struct collect_commit_logmsg_arg cl_arg;
7786 	const char *author = NULL;
7787 	char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
7788 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7789 	int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7790 	int show_diff = 1, commit_conflicts = 0;
7791 	struct got_pathlist_head paths;
7792 	struct got_reflist_head refs;
7793 	struct got_reflist_entry *re;
7794 	int *pack_fds = NULL;
7795 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
7796 	const struct got_remote_repo *remotes, *remote = NULL;
7797 	int nremotes;
7798 	char *proto = NULL, *host = NULL, *port = NULL;
7799 	char *repo_name = NULL, *server_path = NULL;
7800 	const char *remote_name;
7801 	int verbosity = 0;
7802 	int i;
7803 
7804 	TAILQ_INIT(&refs);
7805 	TAILQ_INIT(&paths);
7806 	cl_arg.logmsg_path = NULL;
7807 
7808 #ifndef PROFILE
7809 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7810 	    "unveil", NULL) == -1)
7811 		err(1, "pledge");
7812 #endif
7813 
7814 	while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
7815 		switch (ch) {
7816 		case 'A':
7817 			author = optarg;
7818 			error = valid_author(author);
7819 			if (error)
7820 				return error;
7821 			break;
7822 		case 'C':
7823 			commit_conflicts = 1;
7824 			break;
7825 		case 'F':
7826 			if (logmsg != NULL)
7827 				option_conflict('F', 'm');
7828 			prepared_logmsg = realpath(optarg, NULL);
7829 			if (prepared_logmsg == NULL)
7830 				return got_error_from_errno2("realpath",
7831 				    optarg);
7832 			break;
7833 		case 'm':
7834 			if (prepared_logmsg)
7835 				option_conflict('m', 'F');
7836 			logmsg = optarg;
7837 			break;
7838 		case 'N':
7839 			non_interactive = 1;
7840 			break;
7841 		case 'n':
7842 			show_diff = 0;
7843 			break;
7844 		case 'S':
7845 			allow_bad_symlinks = 1;
7846 			break;
7847 		default:
7848 			usage_commit();
7849 			/* NOTREACHED */
7850 		}
7851 	}
7852 
7853 	argc -= optind;
7854 	argv += optind;
7855 
7856 	cwd = getcwd(NULL, 0);
7857 	if (cwd == NULL) {
7858 		error = got_error_from_errno("getcwd");
7859 		goto done;
7860 	}
7861 
7862 	error = got_repo_pack_fds_open(&pack_fds);
7863 	if (error != NULL)
7864 		goto done;
7865 
7866 	error = got_worktree_open(&worktree, cwd);
7867 	if (error) {
7868 		if (error->code == GOT_ERR_NOT_WORKTREE)
7869 			error = wrap_not_worktree_error(error, "commit", cwd);
7870 		goto done;
7871 	}
7872 
7873 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7874 	if (error)
7875 		goto done;
7876 	if (rebase_in_progress) {
7877 		error = got_error(GOT_ERR_REBASING);
7878 		goto done;
7879 	}
7880 
7881 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
7882 	    worktree);
7883 	if (error)
7884 		goto done;
7885 
7886 	error = get_gitconfig_path(&gitconfig_path);
7887 	if (error)
7888 		goto done;
7889 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7890 	    gitconfig_path, pack_fds);
7891 	if (error != NULL)
7892 		goto done;
7893 
7894 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7895 	if (error)
7896 		goto done;
7897 	if (merge_in_progress) {
7898 		error = got_error(GOT_ERR_MERGE_BUSY);
7899 		goto done;
7900 	}
7901 
7902 	error = get_author(&committer, repo, worktree);
7903 	if (error)
7904 		goto done;
7905 
7906 	if (author == NULL)
7907 		author = committer;
7908 
7909 	remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
7910 	worktree_conf = got_worktree_get_gotconfig(worktree);
7911 	if (worktree_conf) {
7912 		got_gotconfig_get_remotes(&nremotes, &remotes,
7913 		    worktree_conf);
7914 		for (i = 0; i < nremotes; i++) {
7915 			if (strcmp(remotes[i].name, remote_name) == 0) {
7916 				remote = &remotes[i];
7917 				break;
7918 			}
7919 		}
7920 	}
7921 	if (remote == NULL) {
7922 		repo_conf = got_repo_get_gotconfig(repo);
7923 		if (repo_conf) {
7924 			got_gotconfig_get_remotes(&nremotes, &remotes,
7925 			    repo_conf);
7926 			for (i = 0; i < nremotes; i++) {
7927 				if (strcmp(remotes[i].name, remote_name) == 0) {
7928 					remote = &remotes[i];
7929 					break;
7930 				}
7931 			}
7932 		}
7933 	}
7934 	if (remote == NULL) {
7935 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
7936 		for (i = 0; i < nremotes; i++) {
7937 			if (strcmp(remotes[i].name, remote_name) == 0) {
7938 				remote = &remotes[i];
7939 				break;
7940 			}
7941 		}
7942 	}
7943 	if (remote == NULL) {
7944 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
7945 		goto done;
7946 	}
7947 
7948 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
7949 	    &repo_name, remote->fetch_url);
7950 	if (error)
7951 		goto done;
7952 
7953 	if (strcmp(proto, "git") == 0) {
7954 #ifndef PROFILE
7955 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7956 		    "sendfd dns inet unveil", NULL) == -1)
7957 			err(1, "pledge");
7958 #endif
7959 	} else if (strcmp(proto, "git+ssh") == 0 ||
7960 	    strcmp(proto, "ssh") == 0) {
7961 #ifndef PROFILE
7962 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7963 		    "sendfd unveil", NULL) == -1)
7964 			err(1, "pledge");
7965 #endif
7966 	} else if (strcmp(proto, "http") == 0 ||
7967 	    strcmp(proto, "git+http") == 0) {
7968 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
7969 		goto done;
7970 	} else {
7971 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
7972 		goto done;
7973 	}
7974 
7975 
7976 	/*if (verbosity >= 0) {
7977 		printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
7978 		    remote->name, proto, host,
7979 		    port ? ":" : "", port ? port : "",
7980 		    *server_path == '/' ? "" : "/", server_path);
7981 	}*/
7982 
7983 	/*
7984 	 * unveil(2) traverses exec(2); if an editor is used we have
7985 	 * to apply unveil after the log message has been written during
7986 	 * the callback.
7987 	 */
7988 	if (logmsg == NULL || strlen(logmsg) == 0)
7989 		error = get_editor(&editor);
7990 	else {
7991 		error = got_dial_apply_unveil(proto);
7992 		if (error)
7993 			goto done;
7994 		error = apply_unveil(got_repo_get_path(repo), 0,
7995 		    got_worktree_get_root_path(worktree));
7996 	}
7997 	if (error)
7998 		goto done;
7999 
8000 	if (prepared_logmsg == NULL) {
8001 		error = lookup_logmsg_ref(&merged_logmsg,
8002 		    argc > 0 ? &paths : NULL, &refs, worktree, repo);
8003 		if (error)
8004 			goto done;
8005 	}
8006 
8007 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8008 	if (error)
8009 		goto done;
8010 
8011 	cl_arg.editor = editor;
8012 	cl_arg.cmdline_log = logmsg;
8013 	cl_arg.prepared_log = prepared_logmsg;
8014 	cl_arg.merged_log = merged_logmsg;
8015 	cl_arg.non_interactive = non_interactive;
8016 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8017 	cl_arg.repo_path = got_repo_get_path(repo);
8018 	cl_arg.dial_proto = proto;
8019 	error = got_worktree_cvg_commit(&id, worktree, &paths, author,
8020 	    committer, allow_bad_symlinks, show_diff, commit_conflicts,
8021 	    collect_commit_logmsg, &cl_arg, print_status, NULL, proto, host,
8022 	    port, server_path, verbosity, remote, check_cancelled, repo);
8023 	if (error) {
8024 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8025 		    cl_arg.logmsg_path != NULL)
8026 			preserve_logmsg = 1;
8027 		goto done;
8028 	}
8029 
8030 	error = got_object_id_str(&id_str, id);
8031 	if (error)
8032 		goto done;
8033 	printf("Created commit %s\n", id_str);
8034 
8035 	TAILQ_FOREACH(re, &refs, entry) {
8036 		error = got_ref_delete(re->ref, repo);
8037 		if (error)
8038 			goto done;
8039 	}
8040 
8041 done:
8042 	if (preserve_logmsg) {
8043 		fprintf(stderr, "%s: log message preserved in %s\n",
8044 		    getprogname(), cl_arg.logmsg_path);
8045 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8046 	    error == NULL)
8047 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8048 	free(cl_arg.logmsg_path);
8049 	if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
8050 		error = got_error_from_errno2("unlink", merged_logmsg);
8051 	free(merged_logmsg);
8052 	if (repo) {
8053 		const struct got_error *close_err = got_repo_close(repo);
8054 		if (error == NULL)
8055 			error = close_err;
8056 	}
8057 	if (worktree)
8058 		got_worktree_close(worktree);
8059 	if (pack_fds) {
8060 		const struct got_error *pack_err =
8061 		    got_repo_pack_fds_close(pack_fds);
8062 		if (error == NULL)
8063 			error = pack_err;
8064 	}
8065 	got_ref_list_free(&refs);
8066 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8067 	free(cwd);
8068 	free(id_str);
8069 	free(gitconfig_path);
8070 	free(editor);
8071 	free(committer);
8072 	free(prepared_logmsg);
8073 	return error;
8074 }
8075 
8076 /*
8077  * Print and if delete is set delete all ref_prefix references.
8078  * If wanted_ref is not NULL, only print or delete this reference.
8079  */
8080 static const struct got_error *
8081 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
8082     const char *wanted_ref, int delete, struct got_worktree *worktree,
8083     struct got_repository *repo)
8084 {
8085 	const struct got_error			*err;
8086 	struct got_pathlist_head		 paths;
8087 	struct got_reflist_head			 refs;
8088 	struct got_reflist_entry		*re;
8089 	struct got_reflist_object_id_map	*refs_idmap = NULL;
8090 	struct got_commit_object		*commit = NULL;
8091 	struct got_object_id			*id = NULL;
8092 	const char				*header_prefix;
8093 	char					*uuidstr = NULL;
8094 	int					 found = 0;
8095 
8096 	TAILQ_INIT(&refs);
8097 	TAILQ_INIT(&paths);
8098 
8099 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
8100 	if (err)
8101 		goto done;
8102 
8103 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8104 	if (err)
8105 		goto done;
8106 
8107 	if (worktree != NULL) {
8108 		err = got_worktree_get_uuid(&uuidstr, worktree);
8109 		if (err)
8110 			goto done;
8111 	}
8112 
8113 	if (wanted_ref) {
8114 		if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
8115 			wanted_ref += 11;
8116 	}
8117 
8118 	if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
8119 		header_prefix = "backout";
8120 	else
8121 		header_prefix = "cherrypick";
8122 
8123 	TAILQ_FOREACH(re, &refs, entry) {
8124 		const char *refname, *wt;
8125 
8126 		refname = got_ref_get_name(re->ref);
8127 
8128 		err = check_cancelled(NULL);
8129 		if (err)
8130 			goto done;
8131 
8132 		if (strncmp(refname, ref_prefix, prefix_len) == 0)
8133 			refname += prefix_len + 1;  /* skip '-' delimiter */
8134 		else
8135 			continue;
8136 
8137 		wt = refname;
8138 
8139 		if (worktree == NULL || strncmp(refname, uuidstr,
8140 		    GOT_WORKTREE_UUID_STRLEN) == 0)
8141 			refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8142 		else
8143 			continue;
8144 
8145 		err = got_repo_match_object_id(&id, NULL, refname,
8146 		    GOT_OBJ_TYPE_COMMIT, NULL, repo);
8147 		if (err)
8148 			goto done;
8149 
8150 		err = got_object_open_as_commit(&commit, repo, id);
8151 		if (err)
8152 			goto done;
8153 
8154 		if (wanted_ref)
8155 			found = strncmp(wanted_ref, refname,
8156 			    strlen(wanted_ref)) == 0;
8157 		if (wanted_ref && !found) {
8158 			struct got_reflist_head	*ci_refs;
8159 
8160 			ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
8161 			    id);
8162 
8163 			if (ci_refs) {
8164 				char		*refs_str = NULL;
8165 				char const	*r = NULL;
8166 
8167 				err = build_refs_str(&refs_str, ci_refs, id,
8168 				    repo, 1);
8169 				if (err)
8170 					goto done;
8171 
8172 				r = refs_str;
8173 				while (r) {
8174 					if (strncmp(r, wanted_ref,
8175 					    strlen(wanted_ref)) == 0) {
8176 						found = 1;
8177 						break;
8178 					}
8179 					r = strchr(r, ' ');
8180 					if (r)
8181 						++r;
8182 				}
8183 				free(refs_str);
8184 			}
8185 		}
8186 
8187 		if (wanted_ref == NULL || found) {
8188 			if (delete) {
8189 				err = got_ref_delete(re->ref, repo);
8190 				if (err)
8191 					goto done;
8192 				printf("Deleted: ");
8193 				err = print_commit_oneline(commit, id, repo,
8194 				    refs_idmap);
8195 			} else {
8196 				/*
8197 				 * Print paths modified by commit to help
8198 				 * associate commits with worktree changes.
8199 				 */
8200 				err = get_changed_paths(&paths, commit,
8201 				    repo, NULL);
8202 				if (err)
8203 					goto done;
8204 
8205 				err = print_commit(commit, id, repo, NULL,
8206 				    &paths, NULL, 0, 0, refs_idmap, NULL,
8207 				    header_prefix);
8208 				got_pathlist_free(&paths,
8209 				    GOT_PATHLIST_FREE_ALL);
8210 
8211 				if (worktree == NULL)
8212 					printf("work tree: %.*s\n\n",
8213 					    GOT_WORKTREE_UUID_STRLEN, wt);
8214 			}
8215 			if (err || found)
8216 				goto done;
8217 		}
8218 
8219 		got_object_commit_close(commit);
8220 		commit = NULL;
8221 		free(id);
8222 		id = NULL;
8223 	}
8224 
8225 	if (wanted_ref != NULL && !found)
8226 		err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
8227 
8228 done:
8229 	free(id);
8230 	free(uuidstr);
8231 	got_ref_list_free(&refs);
8232 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8233 	if (refs_idmap)
8234 		got_reflist_object_id_map_free(refs_idmap);
8235 	if (commit)
8236 		got_object_commit_close(commit);
8237 	return err;
8238 }
8239 
8240 /*
8241  * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
8242  * identified by id for log messages to prepopulate the editor on commit.
8243  */
8244 static const struct got_error *
8245 logmsg_ref(struct got_object_id *id, const char *prefix,
8246     struct got_worktree *worktree, struct got_repository *repo)
8247 {
8248 	const struct got_error	*err = NULL;
8249 	char			*idstr, *ref = NULL, *refname = NULL;
8250 	int			 histedit_in_progress;
8251 	int			 rebase_in_progress, merge_in_progress;
8252 
8253 	/*
8254 	 * Silenty refuse to create merge reference if any histedit, merge,
8255 	 * or rebase operation is in progress.
8256 	 */
8257 	err = got_worktree_histedit_in_progress(&histedit_in_progress,
8258 	    worktree);
8259 	if (err)
8260 		return err;
8261 	if (histedit_in_progress)
8262 		return NULL;
8263 
8264 	err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8265 	if (err)
8266 		return err;
8267 	if (rebase_in_progress)
8268 		return NULL;
8269 
8270 	err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
8271 	    repo);
8272 	if (err)
8273 		return err;
8274 	if (merge_in_progress)
8275 		return NULL;
8276 
8277 	err = got_object_id_str(&idstr, id);
8278 	if (err)
8279 		return err;
8280 
8281 	err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
8282 	if (err)
8283 		goto done;
8284 
8285 	if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
8286 		err = got_error_from_errno("asprintf");
8287 		goto done;
8288 	}
8289 
8290 	err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
8291 	    -1, repo);
8292 done:
8293 	free(ref);
8294 	free(idstr);
8295 	free(refname);
8296 	return err;
8297 }
8298 
8299 __dead static void
8300 usage_cherrypick(void)
8301 {
8302 	fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
8303 	    getprogname());
8304 	exit(1);
8305 }
8306 
8307 static const struct got_error *
8308 cmd_cherrypick(int argc, char *argv[])
8309 {
8310 	const struct got_error *error = NULL;
8311 	struct got_worktree *worktree = NULL;
8312 	struct got_repository *repo = NULL;
8313 	char *cwd = NULL, *commit_id_str = NULL;
8314 	struct got_object_id *commit_id = NULL;
8315 	struct got_commit_object *commit = NULL;
8316 	struct got_object_qid *pid;
8317 	int ch, list_refs = 0, remove_refs = 0;
8318 	struct got_update_progress_arg upa;
8319 	int *pack_fds = NULL;
8320 
8321 #ifndef PROFILE
8322 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8323 	    "unveil", NULL) == -1)
8324 		err(1, "pledge");
8325 #endif
8326 
8327 	while ((ch = getopt(argc, argv, "lX")) != -1) {
8328 		switch (ch) {
8329 		case 'l':
8330 			list_refs = 1;
8331 			break;
8332 		case 'X':
8333 			remove_refs = 1;
8334 			break;
8335 		default:
8336 			usage_cherrypick();
8337 			/* NOTREACHED */
8338 		}
8339 	}
8340 
8341 	argc -= optind;
8342 	argv += optind;
8343 
8344 	if (list_refs || remove_refs) {
8345 		if (argc != 0 && argc != 1)
8346 			usage_cherrypick();
8347 	} else if (argc != 1)
8348 		usage_cherrypick();
8349 	if (list_refs && remove_refs)
8350 		option_conflict('l', 'X');
8351 
8352 	cwd = getcwd(NULL, 0);
8353 	if (cwd == NULL) {
8354 		error = got_error_from_errno("getcwd");
8355 		goto done;
8356 	}
8357 
8358 	error = got_repo_pack_fds_open(&pack_fds);
8359 	if (error != NULL)
8360 		goto done;
8361 
8362 	error = got_worktree_open(&worktree, cwd);
8363 	if (error) {
8364 		if (list_refs || remove_refs) {
8365 			if (error->code != GOT_ERR_NOT_WORKTREE)
8366 				goto done;
8367 		} else {
8368 			if (error->code == GOT_ERR_NOT_WORKTREE)
8369 				error = wrap_not_worktree_error(error,
8370 				    "cherrypick", cwd);
8371 			goto done;
8372 		}
8373 	}
8374 
8375 	error = got_repo_open(&repo,
8376 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
8377 	    NULL, pack_fds);
8378 	if (error != NULL)
8379 		goto done;
8380 
8381 	error = apply_unveil(got_repo_get_path(repo), 0,
8382 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
8383 	if (error)
8384 		goto done;
8385 
8386 	if (list_refs || remove_refs) {
8387 		error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8388 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
8389 		    argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8390 		goto done;
8391 	}
8392 
8393 	error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8394 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
8395 	if (error)
8396 		goto done;
8397 	error = got_object_id_str(&commit_id_str, commit_id);
8398 	if (error)
8399 		goto done;
8400 
8401 	error = got_object_open_as_commit(&commit, repo, commit_id);
8402 	if (error)
8403 		goto done;
8404 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8405 	memset(&upa, 0, sizeof(upa));
8406 	error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8407 	    commit_id, repo, update_progress, &upa, check_cancelled,
8408 	    NULL);
8409 	if (error != NULL)
8410 		goto done;
8411 
8412 	if (upa.did_something) {
8413 		error = logmsg_ref(commit_id,
8414 		    GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
8415 		if (error)
8416 			goto done;
8417 		printf("Merged commit %s\n", commit_id_str);
8418 	}
8419 	print_merge_progress_stats(&upa);
8420 done:
8421 	free(cwd);
8422 	if (commit)
8423 		got_object_commit_close(commit);
8424 	free(commit_id_str);
8425 	if (worktree)
8426 		got_worktree_close(worktree);
8427 	if (repo) {
8428 		const struct got_error *close_err = got_repo_close(repo);
8429 		if (error == NULL)
8430 			error = close_err;
8431 	}
8432 	if (pack_fds) {
8433 		const struct got_error *pack_err =
8434 		    got_repo_pack_fds_close(pack_fds);
8435 		if (error == NULL)
8436 			error = pack_err;
8437 	}
8438 
8439 	return error;
8440 }
8441 
8442 __dead static void
8443 usage_backout(void)
8444 {
8445 	fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
8446 	exit(1);
8447 }
8448 
8449 static const struct got_error *
8450 cmd_backout(int argc, char *argv[])
8451 {
8452 	const struct got_error *error = NULL;
8453 	struct got_worktree *worktree = NULL;
8454 	struct got_repository *repo = NULL;
8455 	char *cwd = NULL, *commit_id_str = NULL;
8456 	struct got_object_id *commit_id = NULL;
8457 	struct got_commit_object *commit = NULL;
8458 	struct got_object_qid *pid;
8459 	int ch, list_refs = 0, remove_refs = 0;
8460 	struct got_update_progress_arg upa;
8461 	int *pack_fds = NULL;
8462 
8463 #ifndef PROFILE
8464 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8465 	    "unveil", NULL) == -1)
8466 		err(1, "pledge");
8467 #endif
8468 
8469 	while ((ch = getopt(argc, argv, "lX")) != -1) {
8470 		switch (ch) {
8471 		case 'l':
8472 			list_refs = 1;
8473 			break;
8474 		case 'X':
8475 			remove_refs = 1;
8476 			break;
8477 		default:
8478 			usage_backout();
8479 			/* NOTREACHED */
8480 		}
8481 	}
8482 
8483 	argc -= optind;
8484 	argv += optind;
8485 
8486 	if (list_refs || remove_refs) {
8487 		if (argc != 0 && argc != 1)
8488 			usage_backout();
8489 	} else if (argc != 1)
8490 		usage_backout();
8491 	if (list_refs && remove_refs)
8492 		option_conflict('l', 'X');
8493 
8494 	cwd = getcwd(NULL, 0);
8495 	if (cwd == NULL) {
8496 		error = got_error_from_errno("getcwd");
8497 		goto done;
8498 	}
8499 
8500 	error = got_repo_pack_fds_open(&pack_fds);
8501 	if (error != NULL)
8502 		goto done;
8503 
8504 	error = got_worktree_open(&worktree, cwd);
8505 	if (error) {
8506 		if (list_refs || remove_refs) {
8507 			if (error->code != GOT_ERR_NOT_WORKTREE)
8508 				goto done;
8509 		} else {
8510 			if (error->code == GOT_ERR_NOT_WORKTREE)
8511 				error = wrap_not_worktree_error(error,
8512 				    "backout", cwd);
8513 			goto done;
8514 		}
8515 	}
8516 
8517 	error = got_repo_open(&repo,
8518 	    worktree ? got_worktree_get_repo_path(worktree) : cwd,
8519 	    NULL, pack_fds);
8520 	if (error != NULL)
8521 		goto done;
8522 
8523 	error = apply_unveil(got_repo_get_path(repo), 0,
8524 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
8525 	if (error)
8526 		goto done;
8527 
8528 	if (list_refs || remove_refs) {
8529 		error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
8530 		    GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
8531 		    argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
8532 		goto done;
8533 	}
8534 
8535 	error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8536 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
8537 	if (error)
8538 		goto done;
8539 	error = got_object_id_str(&commit_id_str, commit_id);
8540 	if (error)
8541 		goto done;
8542 
8543 	error = got_object_open_as_commit(&commit, repo, commit_id);
8544 	if (error)
8545 		goto done;
8546 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8547 	if (pid == NULL) {
8548 		error = got_error(GOT_ERR_ROOT_COMMIT);
8549 		goto done;
8550 	}
8551 
8552 	memset(&upa, 0, sizeof(upa));
8553 	error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8554 	    repo, update_progress, &upa, check_cancelled, NULL);
8555 	if (error != NULL)
8556 		goto done;
8557 
8558 	if (upa.did_something) {
8559 		error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8560 		    worktree, repo);
8561 		if (error)
8562 			goto done;
8563 		printf("Backed out commit %s\n", commit_id_str);
8564 	}
8565 	print_merge_progress_stats(&upa);
8566 done:
8567 	free(cwd);
8568 	if (commit)
8569 		got_object_commit_close(commit);
8570 	free(commit_id_str);
8571 	if (worktree)
8572 		got_worktree_close(worktree);
8573 	if (repo) {
8574 		const struct got_error *close_err = got_repo_close(repo);
8575 		if (error == NULL)
8576 			error = close_err;
8577 	}
8578 	if (pack_fds) {
8579 		const struct got_error *pack_err =
8580 		    got_repo_pack_fds_close(pack_fds);
8581 		if (error == NULL)
8582 			error = pack_err;
8583 	}
8584 	return error;
8585 }
8586 
8587 __dead static void
8588 usage_cat(void)
8589 {
8590 	fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
8591 	    "arg ...\n", getprogname());
8592 	exit(1);
8593 }
8594 
8595 static const struct got_error *
8596 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8597 {
8598 	const struct got_error *err;
8599 	struct got_blob_object *blob;
8600 	int fd = -1;
8601 
8602 	fd = got_opentempfd();
8603 	if (fd == -1)
8604 		return got_error_from_errno("got_opentempfd");
8605 
8606 	err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
8607 	if (err)
8608 		goto done;
8609 
8610 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8611 done:
8612 	if (fd != -1 && close(fd) == -1 && err == NULL)
8613 		err = got_error_from_errno("close");
8614 	if (blob)
8615 		got_object_blob_close(blob);
8616 	return err;
8617 }
8618 
8619 static const struct got_error *
8620 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8621 {
8622 	const struct got_error *err;
8623 	struct got_tree_object *tree;
8624 	int nentries, i;
8625 
8626 	err = got_object_open_as_tree(&tree, repo, id);
8627 	if (err)
8628 		return err;
8629 
8630 	nentries = got_object_tree_get_nentries(tree);
8631 	for (i = 0; i < nentries; i++) {
8632 		struct got_tree_entry *te;
8633 		char *id_str;
8634 		if (sigint_received || sigpipe_received)
8635 			break;
8636 		te = got_object_tree_get_entry(tree, i);
8637 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8638 		if (err)
8639 			break;
8640 		fprintf(outfile, "%s %.7o %s\n", id_str,
8641 		    got_tree_entry_get_mode(te),
8642 		    got_tree_entry_get_name(te));
8643 		free(id_str);
8644 	}
8645 
8646 	got_object_tree_close(tree);
8647 	return err;
8648 }
8649 
8650 static const struct got_error *
8651 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8652 {
8653 	const struct got_error *err;
8654 	struct got_commit_object *commit;
8655 	const struct got_object_id_queue *parent_ids;
8656 	struct got_object_qid *pid;
8657 	char *id_str = NULL;
8658 	const char *logmsg = NULL;
8659 	char gmtoff[6];
8660 
8661 	err = got_object_open_as_commit(&commit, repo, id);
8662 	if (err)
8663 		return err;
8664 
8665 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8666 	if (err)
8667 		goto done;
8668 
8669 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8670 	parent_ids = got_object_commit_get_parent_ids(commit);
8671 	fprintf(outfile, "numparents %d\n",
8672 	    got_object_commit_get_nparents(commit));
8673 	STAILQ_FOREACH(pid, parent_ids, entry) {
8674 		char *pid_str;
8675 		err = got_object_id_str(&pid_str, &pid->id);
8676 		if (err)
8677 			goto done;
8678 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8679 		free(pid_str);
8680 	}
8681 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8682 	    got_object_commit_get_author_gmtoff(commit));
8683 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
8684 	    got_object_commit_get_author(commit),
8685 	    (long long)got_object_commit_get_author_time(commit),
8686 	    gmtoff);
8687 
8688 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8689 	    got_object_commit_get_committer_gmtoff(commit));
8690 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
8691 	    got_object_commit_get_committer(commit),
8692 	    (long long)got_object_commit_get_committer_time(commit),
8693 	    gmtoff);
8694 
8695 	logmsg = got_object_commit_get_logmsg_raw(commit);
8696 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8697 	fprintf(outfile, "%s", logmsg);
8698 done:
8699 	free(id_str);
8700 	got_object_commit_close(commit);
8701 	return err;
8702 }
8703 
8704 static const struct got_error *
8705 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8706 {
8707 	const struct got_error *err;
8708 	struct got_tag_object *tag;
8709 	char *id_str = NULL;
8710 	const char *tagmsg = NULL;
8711 	char gmtoff[6];
8712 
8713 	err = got_object_open_as_tag(&tag, repo, id);
8714 	if (err)
8715 		return err;
8716 
8717 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8718 	if (err)
8719 		goto done;
8720 
8721 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8722 
8723 	switch (got_object_tag_get_object_type(tag)) {
8724 	case GOT_OBJ_TYPE_BLOB:
8725 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8726 		    GOT_OBJ_LABEL_BLOB);
8727 		break;
8728 	case GOT_OBJ_TYPE_TREE:
8729 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8730 		    GOT_OBJ_LABEL_TREE);
8731 		break;
8732 	case GOT_OBJ_TYPE_COMMIT:
8733 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8734 		    GOT_OBJ_LABEL_COMMIT);
8735 		break;
8736 	case GOT_OBJ_TYPE_TAG:
8737 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8738 		    GOT_OBJ_LABEL_TAG);
8739 		break;
8740 	default:
8741 		break;
8742 	}
8743 
8744 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8745 	    got_object_tag_get_name(tag));
8746 
8747 	got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
8748 	    got_object_tag_get_tagger_gmtoff(tag));
8749 	fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
8750 	    got_object_tag_get_tagger(tag),
8751 	    (long long)got_object_tag_get_tagger_time(tag),
8752 	    gmtoff);
8753 
8754 	tagmsg = got_object_tag_get_message(tag);
8755 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8756 	fprintf(outfile, "%s", tagmsg);
8757 done:
8758 	free(id_str);
8759 	got_object_tag_close(tag);
8760 	return err;
8761 }
8762 
8763 static const struct got_error *
8764 cmd_cat(int argc, char *argv[])
8765 {
8766 	const struct got_error *error;
8767 	struct got_repository *repo = NULL;
8768 	struct got_worktree *worktree = NULL;
8769 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
8770 	const char *commit_id_str = NULL;
8771 	struct got_object_id *id = NULL, *commit_id = NULL;
8772 	struct got_commit_object *commit = NULL;
8773 	int ch, obj_type, i, force_path = 0;
8774 	struct got_reflist_head refs;
8775 	int *pack_fds = NULL;
8776 
8777 	TAILQ_INIT(&refs);
8778 
8779 #ifndef PROFILE
8780 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8781 	    NULL) == -1)
8782 		err(1, "pledge");
8783 #endif
8784 
8785 	while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
8786 		switch (ch) {
8787 		case 'c':
8788 			commit_id_str = optarg;
8789 			break;
8790 		case 'P':
8791 			force_path = 1;
8792 			break;
8793 		case 'r':
8794 			repo_path = realpath(optarg, NULL);
8795 			if (repo_path == NULL)
8796 				return got_error_from_errno2("realpath",
8797 				    optarg);
8798 			got_path_strip_trailing_slashes(repo_path);
8799 			break;
8800 		default:
8801 			usage_cat();
8802 			/* NOTREACHED */
8803 		}
8804 	}
8805 
8806 	argc -= optind;
8807 	argv += optind;
8808 
8809 	cwd = getcwd(NULL, 0);
8810 	if (cwd == NULL) {
8811 		error = got_error_from_errno("getcwd");
8812 		goto done;
8813 	}
8814 
8815 	error = got_repo_pack_fds_open(&pack_fds);
8816 	if (error != NULL)
8817 		goto done;
8818 
8819 	if (repo_path == NULL) {
8820 		error = got_worktree_open(&worktree, cwd);
8821 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
8822 			goto done;
8823 		if (worktree) {
8824 			repo_path = strdup(
8825 			    got_worktree_get_repo_path(worktree));
8826 			if (repo_path == NULL) {
8827 				error = got_error_from_errno("strdup");
8828 				goto done;
8829 			}
8830 
8831 			/* Release work tree lock. */
8832 			got_worktree_close(worktree);
8833 			worktree = NULL;
8834 		}
8835 	}
8836 
8837 	if (repo_path == NULL) {
8838 		repo_path = strdup(cwd);
8839 		if (repo_path == NULL)
8840 			return got_error_from_errno("strdup");
8841 	}
8842 
8843 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8844 	free(repo_path);
8845 	if (error != NULL)
8846 		goto done;
8847 
8848 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8849 	if (error)
8850 		goto done;
8851 
8852 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8853 	if (error)
8854 		goto done;
8855 
8856 	if (commit_id_str == NULL)
8857 		commit_id_str = GOT_REF_HEAD;
8858 	error = got_repo_match_object_id(&commit_id, NULL,
8859 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
8860 	if (error)
8861 		goto done;
8862 
8863 	error = got_object_open_as_commit(&commit, repo, commit_id);
8864 	if (error)
8865 		goto done;
8866 
8867 	for (i = 0; i < argc; i++) {
8868 		if (force_path) {
8869 			error = got_object_id_by_path(&id, repo, commit,
8870 			    argv[i]);
8871 			if (error)
8872 				break;
8873 		} else {
8874 			error = got_repo_match_object_id(&id, &label, argv[i],
8875 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
8876 			    repo);
8877 			if (error) {
8878 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8879 				    error->code != GOT_ERR_NOT_REF)
8880 					break;
8881 				error = got_object_id_by_path(&id, repo,
8882 				    commit, argv[i]);
8883 				if (error)
8884 					break;
8885 			}
8886 		}
8887 
8888 		error = got_object_get_type(&obj_type, repo, id);
8889 		if (error)
8890 			break;
8891 
8892 		switch (obj_type) {
8893 		case GOT_OBJ_TYPE_BLOB:
8894 			error = cat_blob(id, repo, stdout);
8895 			break;
8896 		case GOT_OBJ_TYPE_TREE:
8897 			error = cat_tree(id, repo, stdout);
8898 			break;
8899 		case GOT_OBJ_TYPE_COMMIT:
8900 			error = cat_commit(id, repo, stdout);
8901 			break;
8902 		case GOT_OBJ_TYPE_TAG:
8903 			error = cat_tag(id, repo, stdout);
8904 			break;
8905 		default:
8906 			error = got_error(GOT_ERR_OBJ_TYPE);
8907 			break;
8908 		}
8909 		if (error)
8910 			break;
8911 		free(label);
8912 		label = NULL;
8913 		free(id);
8914 		id = NULL;
8915 	}
8916 done:
8917 	free(label);
8918 	free(id);
8919 	free(commit_id);
8920 	if (commit)
8921 		got_object_commit_close(commit);
8922 	if (worktree)
8923 		got_worktree_close(worktree);
8924 	if (repo) {
8925 		const struct got_error *close_err = got_repo_close(repo);
8926 		if (error == NULL)
8927 			error = close_err;
8928 	}
8929 	if (pack_fds) {
8930 		const struct got_error *pack_err =
8931 		    got_repo_pack_fds_close(pack_fds);
8932 		if (error == NULL)
8933 			error = pack_err;
8934 	}
8935 
8936 	got_ref_list_free(&refs);
8937 	return error;
8938 }
8939 
8940 __dead static void
8941 usage_info(void)
8942 {
8943 	fprintf(stderr, "usage: %s info [path ...]\n",
8944 	    getprogname());
8945 	exit(1);
8946 }
8947 
8948 static const struct got_error *
8949 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
8950     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8951     struct got_object_id *commit_id)
8952 {
8953 	const struct got_error *err = NULL;
8954 	char *id_str = NULL;
8955 	char datebuf[128];
8956 	struct tm mytm, *tm;
8957 	struct got_pathlist_head *paths = arg;
8958 	struct got_pathlist_entry *pe;
8959 
8960 	/*
8961 	 * Clear error indication from any of the path arguments which
8962 	 * would cause this file index entry to be displayed.
8963 	 */
8964 	TAILQ_FOREACH(pe, paths, entry) {
8965 		if (got_path_cmp(path, pe->path, strlen(path),
8966 		    pe->path_len) == 0 ||
8967 		    got_path_is_child(path, pe->path, pe->path_len))
8968 			pe->data = NULL; /* no error */
8969 	}
8970 
8971 	printf(GOT_COMMIT_SEP_STR);
8972 	if (S_ISLNK(mode))
8973 		printf("symlink: %s\n", path);
8974 	else if (S_ISREG(mode)) {
8975 		printf("file: %s\n", path);
8976 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
8977 	} else if (S_ISDIR(mode))
8978 		printf("directory: %s\n", path);
8979 	else
8980 		printf("something: %s\n", path);
8981 
8982 	tm = localtime_r(&mtime, &mytm);
8983 	if (tm == NULL)
8984 		return NULL;
8985 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
8986 		return got_error(GOT_ERR_NO_SPACE);
8987 	printf("timestamp: %s\n", datebuf);
8988 
8989 	if (blob_id) {
8990 		err = got_object_id_str(&id_str, blob_id);
8991 		if (err)
8992 			return err;
8993 		printf("based on blob: %s\n", id_str);
8994 		free(id_str);
8995 	}
8996 
8997 	if (staged_blob_id) {
8998 		err = got_object_id_str(&id_str, staged_blob_id);
8999 		if (err)
9000 			return err;
9001 		printf("based on staged blob: %s\n", id_str);
9002 		free(id_str);
9003 	}
9004 
9005 	if (commit_id) {
9006 		err = got_object_id_str(&id_str, commit_id);
9007 		if (err)
9008 			return err;
9009 		printf("based on commit: %s\n", id_str);
9010 		free(id_str);
9011 	}
9012 
9013 	return NULL;
9014 }
9015 
9016 static const struct got_error *
9017 cmd_info(int argc, char *argv[])
9018 {
9019 	const struct got_error *error = NULL;
9020 	struct got_worktree *worktree = NULL;
9021 	char *cwd = NULL, *id_str = NULL;
9022 	struct got_pathlist_head paths;
9023 	char *uuidstr = NULL;
9024 	int ch, show_files = 0;
9025 
9026 	TAILQ_INIT(&paths);
9027 
9028 #ifndef PROFILE
9029 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9030 	    NULL) == -1)
9031 		err(1, "pledge");
9032 #endif
9033 
9034 	while ((ch = getopt(argc, argv, "")) != -1) {
9035 		switch (ch) {
9036 		default:
9037 			usage_info();
9038 			/* NOTREACHED */
9039 		}
9040 	}
9041 
9042 	argc -= optind;
9043 	argv += optind;
9044 
9045 	cwd = getcwd(NULL, 0);
9046 	if (cwd == NULL) {
9047 		error = got_error_from_errno("getcwd");
9048 		goto done;
9049 	}
9050 
9051 	error = got_worktree_open(&worktree, cwd);
9052 	if (error) {
9053 		if (error->code == GOT_ERR_NOT_WORKTREE)
9054 			error = wrap_not_worktree_error(error, "info", cwd);
9055 		goto done;
9056 	}
9057 
9058 #ifndef PROFILE
9059 	/* Remove "wpath cpath proc exec sendfd" promises. */
9060 	if (pledge("stdio rpath flock unveil", NULL) == -1)
9061 		err(1, "pledge");
9062 #endif
9063 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9064 	if (error)
9065 		goto done;
9066 
9067 	if (argc >= 1) {
9068 		error = get_worktree_paths_from_argv(&paths, argc, argv,
9069 		    worktree);
9070 		if (error)
9071 			goto done;
9072 		show_files = 1;
9073 	}
9074 
9075 	error = got_object_id_str(&id_str,
9076 	    got_worktree_get_base_commit_id(worktree));
9077 	if (error)
9078 		goto done;
9079 
9080 	error = got_worktree_get_uuid(&uuidstr, worktree);
9081 	if (error)
9082 		goto done;
9083 
9084 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9085 	printf("work tree base commit: %s\n", id_str);
9086 	printf("work tree path prefix: %s\n",
9087 	    got_worktree_get_path_prefix(worktree));
9088 	printf("work tree branch reference: %s\n",
9089 	    got_worktree_get_head_ref_name(worktree));
9090 	printf("work tree UUID: %s\n", uuidstr);
9091 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9092 
9093 	if (show_files) {
9094 		struct got_pathlist_entry *pe;
9095 		TAILQ_FOREACH(pe, &paths, entry) {
9096 			if (pe->path_len == 0)
9097 				continue;
9098 			/*
9099 			 * Assume this path will fail. This will be corrected
9100 			 * in print_path_info() in case the path does suceeed.
9101 			 */
9102 			pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
9103 		}
9104 		error = got_worktree_path_info(worktree, &paths,
9105 		    print_path_info, &paths, check_cancelled, NULL);
9106 		if (error)
9107 			goto done;
9108 		TAILQ_FOREACH(pe, &paths, entry) {
9109 			if (pe->data != NULL) {
9110 				const struct got_error *perr;
9111 
9112 				perr = pe->data;
9113 				error = got_error_fmt(perr->code, "%s",
9114 				    pe->path);
9115 				break;
9116 			}
9117 		}
9118 	}
9119 done:
9120 	if (worktree)
9121 		got_worktree_close(worktree);
9122 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9123 	free(cwd);
9124 	free(id_str);
9125 	free(uuidstr);
9126 	return error;
9127 }