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 <sys/queue.h>
21 #include <sys/time.h>
22 #include <sys/types.h>
23 #include <sys/stat.h>
24 #include <sys/wait.h>
25 
26 #include <err.h>
27 #include <errno.h>
28 #include <fcntl.h>
29 #include <limits.h>
30 #include <locale.h>
31 #include <ctype.h>
32 #include <sha1.h>
33 #include <sha2.h>
34 #include <signal.h>
35 #include <stdio.h>
36 #include <stdlib.h>
37 #include <string.h>
38 #include <unistd.h>
39 #include <libgen.h>
40 #include <time.h>
41 #include <paths.h>
42 #include <regex.h>
43 #include <getopt.h>
44 #include <util.h>
45 
46 #include "got_version.h"
47 #include "got_error.h"
48 #include "got_object.h"
49 #include "got_reference.h"
50 #include "got_repository.h"
51 #include "got_path.h"
52 #include "got_cancel.h"
53 #include "got_worktree.h"
54 #include "got_worktree_cvg.h"
55 #include "got_diff.h"
56 #include "got_commit_graph.h"
57 #include "got_fetch.h"
58 #include "got_send.h"
59 #include "got_blame.h"
60 #include "got_privsep.h"
61 #include "got_opentemp.h"
62 #include "got_gotconfig.h"
63 #include "got_dial.h"
64 #include "got_patch.h"
65 #include "got_sigs.h"
66 #include "got_date.h"
67 
68 #ifndef nitems
69 #define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
70 #endif
71 
72 static volatile sig_atomic_t sigint_received;
73 static volatile sig_atomic_t sigpipe_received;
74 
75 static void
76 catch_sigint(int signo)
77 {
78 	sigint_received = 1;
79 }
80 
81 static void
82 catch_sigpipe(int signo)
83 {
84 	sigpipe_received = 1;
85 }
86 
87 
88 struct got_cmd {
89 	const char	*cmd_name;
90 	const struct got_error *(*cmd_main)(int, char *[]);
91 	void		(*cmd_usage)(void);
92 	const char	*cmd_alias;
93 };
94 
95 __dead static void	usage(int, int);
96 __dead static void	usage_import(void);
97 __dead static void	usage_clone(void);
98 __dead static void	usage_checkout(void);
99 __dead static void	usage_update(void);
100 __dead static void	usage_log(void);
101 __dead static void	usage_diff(void);
102 __dead static void	usage_blame(void);
103 __dead static void	usage_tree(void);
104 __dead static void	usage_status(void);
105 __dead static void	usage_tag(void);
106 __dead static void	usage_add(void);
107 __dead static void	usage_remove(void);
108 __dead static void	usage_patch(void);
109 __dead static void	usage_revert(void);
110 __dead static void	usage_commit(void);
111 __dead static void	usage_cherrypick(void);
112 __dead static void	usage_backout(void);
113 __dead static void	usage_cat(void);
114 __dead static void	usage_info(void);
115 
116 static const struct got_error*		cmd_import(int, char *[]);
117 static const struct got_error*		cmd_clone(int, char *[]);
118 static const struct got_error*		cmd_checkout(int, char *[]);
119 static const struct got_error*		cmd_update(int, char *[]);
120 static const struct got_error*		cmd_log(int, char *[]);
121 static const struct got_error*		cmd_diff(int, char *[]);
122 static const struct got_error*		cmd_blame(int, char *[]);
123 static const struct got_error*		cmd_tree(int, char *[]);
124 static const struct got_error*		cmd_status(int, char *[]);
125 static const struct got_error*		cmd_tag(int, char *[]);
126 static const struct got_error*		cmd_add(int, char *[]);
127 static const struct got_error*		cmd_remove(int, char *[]);
128 static const struct got_error*		cmd_patch(int, char *[]);
129 static const struct got_error*		cmd_revert(int, char *[]);
130 static const struct got_error*		cmd_commit(int, char *[]);
131 static const struct got_error*		cmd_cherrypick(int, char *[]);
132 static const struct got_error*		cmd_backout(int, char *[]);
133 static const struct got_error*		cmd_cat(int, char *[]);
134 static const struct got_error*		cmd_info(int, char *[]);
135 
136 static const struct got_cmd got_commands[] = {
137 	{ "import",	cmd_import,	usage_import,	"im" },
138 	{ "clone",	cmd_clone,	usage_clone,	"cl" },
139 	{ "checkout",	cmd_checkout,	usage_checkout,	"co" },
140 	{ "update",	cmd_update,	usage_update,	"up" },
141 	{ "log",	cmd_log,	usage_log,	"" },
142 	{ "diff",	cmd_diff,	usage_diff,	"di" },
143 	{ "blame",	cmd_blame,	usage_blame,	"bl" },
144 	{ "tree",	cmd_tree,	usage_tree,	"tr" },
145 	{ "status",	cmd_status,	usage_status,	"st" },
146 	{ "tag",	cmd_tag,	usage_tag,	"" },
147 	{ "add",	cmd_add,	usage_add,	"" },
148 	{ "remove",	cmd_remove,	usage_remove,	"rm" },
149 	{ "patch",	cmd_patch,	usage_patch,	"pa" },
150 	{ "revert",	cmd_revert,	usage_revert,	"rv" },
151 	{ "commit",	cmd_commit,	usage_commit,	"ci" },
152 	{ "cherrypick",	cmd_cherrypick,	usage_cherrypick, "cy" },
153 	{ "backout",	cmd_backout,	usage_backout,	"bo" },
154 	{ "cat",	cmd_cat,	usage_cat,	"" },
155 	{ "info",	cmd_info,	usage_info,	"" },
156 };
157 
158 static void
159 list_commands(FILE *fp)
160 {
161 	size_t i;
162 
163 	fprintf(fp, "commands:");
164 	for (i = 0; i < nitems(got_commands); i++) {
165 		const struct got_cmd *cmd = &got_commands[i];
166 		fprintf(fp, " %s", cmd->cmd_name);
167 	}
168 	fputc('\n', fp);
169 }
170 
171 __dead static void
172 option_conflict(char a, char b)
173 {
174 	errx(1, "-%c and -%c options are mutually exclusive", a, b);
175 }
176 
177 int
178 main(int argc, char *argv[])
179 {
180 	const struct got_cmd *cmd;
181 	size_t i;
182 	int ch;
183 	int hflag = 0, Vflag = 0;
184 	static const struct option longopts[] = {
185 	    { "version", no_argument, NULL, 'V' },
186 	    { NULL, 0, NULL, 0 }
187 	};
188 
189 	setlocale(LC_CTYPE, "");
190 
191 	while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
192 		switch (ch) {
193 		case 'h':
194 			hflag = 1;
195 			break;
196 		case 'V':
197 			Vflag = 1;
198 			break;
199 		default:
200 			usage(hflag, 1);
201 			/* NOTREACHED */
202 		}
203 	}
204 
205 	argc -= optind;
206 	argv += optind;
207 	optind = 1;
208 	optreset = 1;
209 
210 	if (Vflag) {
211 		got_version_print_str();
212 		return 0;
213 	}
214 
215 	if (argc <= 0)
216 		usage(hflag, hflag ? 0 : 1);
217 
218 	signal(SIGINT, catch_sigint);
219 	signal(SIGPIPE, catch_sigpipe);
220 
221 	for (i = 0; i < nitems(got_commands); i++) {
222 		const struct got_error *error;
223 
224 		cmd = &got_commands[i];
225 
226 		if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
227 		    strcmp(cmd->cmd_alias, argv[0]) != 0)
228 			continue;
229 
230 		if (hflag)
231 			cmd->cmd_usage();
232 
233 		error = cmd->cmd_main(argc, argv);
234 		if (error && error->code != GOT_ERR_CANCELLED &&
235 		    error->code != GOT_ERR_PRIVSEP_EXIT &&
236 		    !(sigpipe_received &&
237 		      error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
238 		    !(sigint_received &&
239 		      error->code == GOT_ERR_ERRNO && errno == EINTR)) {
240 			fflush(stdout);
241 			fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
242 			return 1;
243 		}
244 
245 		return 0;
246 	}
247 
248 	fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
249 	list_commands(stderr);
250 	return 1;
251 }
252 
253 __dead static void
254 usage(int hflag, int status)
255 {
256 	FILE *fp = (status == 0) ? stdout : stderr;
257 
258 	fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
259 	    getprogname());
260 	if (hflag)
261 		list_commands(fp);
262 	exit(status);
263 }
264 
265 static const struct got_error *
266 get_editor(char **abspath)
267 {
268 	const struct got_error *err = NULL;
269 	const char *editor;
270 
271 	*abspath = NULL;
272 
273 	editor = getenv("VISUAL");
274 	if (editor == NULL)
275 		editor = getenv("EDITOR");
276 
277 	if (editor) {
278 		err = got_path_find_prog(abspath, editor);
279 		if (err)
280 			return err;
281 	}
282 
283 	if (*abspath == NULL) {
284 		*abspath = strdup("/usr/bin/vi");
285 		if (*abspath == NULL)
286 			return got_error_from_errno("strdup");
287 	}
288 
289 	return NULL;
290 }
291 
292 static const struct got_error *
293 apply_unveil(const char *repo_path, int repo_read_only,
294     const char *worktree_path)
295 {
296 	const struct got_error *err;
297 
298 #ifdef PROFILE
299 	if (unveil("gmon.out", "rwc") != 0)
300 		return got_error_from_errno2("unveil", "gmon.out");
301 #endif
302 	if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
303 		return got_error_from_errno2("unveil", repo_path);
304 
305 	if (worktree_path && unveil(worktree_path, "rwc") != 0)
306 		return got_error_from_errno2("unveil", worktree_path);
307 
308 	if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
309 		return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
310 
311 	err = got_privsep_unveil_exec_helpers();
312 	if (err != NULL)
313 		return err;
314 
315 	if (unveil(NULL, NULL) != 0)
316 		return got_error_from_errno("unveil");
317 
318 	return NULL;
319 }
320 
321 __dead static void
322 usage_import(void)
323 {
324 	fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
325 	    "[-r repository-path] directory\n", getprogname());
326 	exit(1);
327 }
328 
329 static int
330 spawn_editor(const char *editor, const char *file)
331 {
332 	pid_t pid;
333 	sig_t sighup, sigint, sigquit;
334 	int st = -1;
335 
336 	sighup = signal(SIGHUP, SIG_IGN);
337 	sigint = signal(SIGINT, SIG_IGN);
338 	sigquit = signal(SIGQUIT, SIG_IGN);
339 
340 	switch (pid = fork()) {
341 	case -1:
342 		goto doneediting;
343 	case 0:
344 		execl(editor, editor, file, (char *)NULL);
345 		_exit(127);
346 	}
347 
348 	while (waitpid(pid, &st, 0) == -1)
349 		if (errno != EINTR)
350 			break;
351 
352 doneediting:
353 	(void)signal(SIGHUP, sighup);
354 	(void)signal(SIGINT, sigint);
355 	(void)signal(SIGQUIT, sigquit);
356 
357 	if (!WIFEXITED(st)) {
358 		errno = EINTR;
359 		return -1;
360 	}
361 
362 	return WEXITSTATUS(st);
363 }
364 
365 static const struct got_error *
366 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
367 {
368 	const struct got_error *err = NULL;
369 	char *line = NULL;
370 	size_t linesize = 0;
371 
372 	*logmsg = NULL;
373 	*len = 0;
374 
375 	if (fseeko(fp, 0L, SEEK_SET) == -1)
376 		return got_error_from_errno("fseeko");
377 
378 	*logmsg = malloc(filesize + 1);
379 	if (*logmsg == NULL)
380 		return got_error_from_errno("malloc");
381 	(*logmsg)[0] = '\0';
382 
383 	while (getline(&line, &linesize, fp) != -1) {
384 		if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
385 			continue; /* remove comments and leading empty lines */
386 		*len = strlcat(*logmsg, line, filesize + 1);
387 		if (*len >= filesize + 1) {
388 			err = got_error(GOT_ERR_NO_SPACE);
389 			goto done;
390 		}
391 	}
392 	if (ferror(fp)) {
393 		err = got_ferror(fp, GOT_ERR_IO);
394 		goto done;
395 	}
396 
397 	while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
398 		(*logmsg)[*len - 1] = '\0';
399 		(*len)--;
400 	}
401 done:
402 	free(line);
403 	if (err) {
404 		free(*logmsg);
405 		*logmsg = NULL;
406 		*len = 0;
407 	}
408 	return err;
409 }
410 
411 static const struct got_error *
412 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
413     const char *initial_content, size_t initial_content_len,
414     int require_modification)
415 {
416 	const struct got_error *err = NULL;
417 	struct stat st, st2;
418 	FILE *fp = NULL;
419 	size_t logmsg_len;
420 
421 	*logmsg = NULL;
422 
423 	if (stat(logmsg_path, &st) == -1)
424 		return got_error_from_errno2("stat", logmsg_path);
425 
426 	if (spawn_editor(editor, logmsg_path) == -1)
427 		return got_error_from_errno("failed spawning editor");
428 
429 	if (require_modification) {
430 		struct timespec timeout;
431 
432 		timeout.tv_sec = 0;
433 		timeout.tv_nsec = 1;
434 		nanosleep(&timeout,  NULL);
435 	}
436 
437 	if (stat(logmsg_path, &st2) == -1)
438 		return got_error_from_errno("stat");
439 
440 	if (require_modification && st.st_size == st2.st_size &&
441 	    timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
442 		return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
443 		    "no changes made to commit message, aborting");
444 
445 	fp = fopen(logmsg_path, "re");
446 	if (fp == NULL) {
447 		err = got_error_from_errno("fopen");
448 		goto done;
449 	}
450 
451 	/* strip comments and leading/trailing newlines */
452 	err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
453 	if (err)
454 		goto done;
455 	if (logmsg_len == 0) {
456 		err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
457 		    "commit message cannot be empty, aborting");
458 		goto done;
459 	}
460 done:
461 	if (fp && fclose(fp) == EOF && err == NULL)
462 		err = got_error_from_errno("fclose");
463 	if (err) {
464 		free(*logmsg);
465 		*logmsg = NULL;
466 	}
467 	return err;
468 }
469 
470 static const struct got_error *
471 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
472     const char *path_dir, const char *branch_name)
473 {
474 	char *initial_content = NULL;
475 	const struct got_error *err = NULL;
476 	int initial_content_len;
477 	int fd = -1;
478 
479 	initial_content_len = asprintf(&initial_content,
480 	    "\n# %s to be imported to branch %s\n", path_dir,
481 	    branch_name);
482 	if (initial_content_len == -1)
483 		return got_error_from_errno("asprintf");
484 
485 	err = got_opentemp_named_fd(logmsg_path, &fd,
486 	    GOT_TMPDIR_STR "/got-importmsg", "");
487 	if (err)
488 		goto done;
489 
490 	if (write(fd, initial_content, initial_content_len) == -1) {
491 		err = got_error_from_errno2("write", *logmsg_path);
492 		goto done;
493 	}
494 	if (close(fd) == -1) {
495 		err = got_error_from_errno2("close", *logmsg_path);
496 		goto done;
497 	}
498 	fd = -1;
499 
500 	err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
501 	    initial_content_len, 1);
502 done:
503 	if (fd != -1 && close(fd) == -1 && err == NULL)
504 		err = got_error_from_errno2("close", *logmsg_path);
505 	free(initial_content);
506 	if (err) {
507 		free(*logmsg_path);
508 		*logmsg_path = NULL;
509 	}
510 	return err;
511 }
512 
513 static const struct got_error *
514 import_progress(void *arg, const char *path)
515 {
516 	printf("A  %s\n", path);
517 	return NULL;
518 }
519 
520 static const struct got_error *
521 valid_author(const char *author)
522 {
523 	const char *email = author;
524 
525 	/*
526 	 * Git' expects the author (or committer) to be in the form
527 	 * "name <email>", which are mostly free form (see the
528 	 * "committer" description in git-fast-import(1)).  We're only
529 	 * doing this to avoid git's object parser breaking on commits
530 	 * we create.
531 	 */
532 
533 	while (*author && *author != '\n' && *author != '<' && *author != '>')
534 		author++;
535 	if (author != email && *author == '<' && *(author - 1) != ' ')
536 		return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
537 		    "between author name and email required", email);
538 	if (*author++ != '<')
539 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
540 	while (*author && *author != '\n' && *author != '<' && *author != '>')
541 		author++;
542 	if (strcmp(author, ">") != 0)
543 		return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
544 	return NULL;
545 }
546 
547 static const struct got_error *
548 get_author(char **author, struct got_repository *repo,
549     struct got_worktree *worktree)
550 {
551 	const struct got_error *err = NULL;
552 	const char *got_author = NULL, *name, *email;
553 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
554 
555 	*author = NULL;
556 
557 	if (worktree)
558 		worktree_conf = got_worktree_get_gotconfig(worktree);
559 	repo_conf = got_repo_get_gotconfig(repo);
560 
561 	/*
562 	 * Priority of potential author information sources, from most
563 	 * significant to least significant:
564 	 * 1) work tree's .got/got.conf file
565 	 * 2) repository's got.conf file
566 	 * 3) repository's git config file
567 	 * 4) environment variables
568 	 * 5) global git config files (in user's home directory or /etc)
569 	 */
570 
571 	if (worktree_conf)
572 		got_author = got_gotconfig_get_author(worktree_conf);
573 	if (got_author == NULL)
574 		got_author = got_gotconfig_get_author(repo_conf);
575 	if (got_author == NULL) {
576 		name = got_repo_get_gitconfig_author_name(repo);
577 		email = got_repo_get_gitconfig_author_email(repo);
578 		if (name && email) {
579 			if (asprintf(author, "%s <%s>", name, email) == -1)
580 				return got_error_from_errno("asprintf");
581 			return NULL;
582 		}
583 
584 		got_author = getenv("GOT_AUTHOR");
585 		if (got_author == NULL) {
586 			name = got_repo_get_global_gitconfig_author_name(repo);
587 			email = got_repo_get_global_gitconfig_author_email(
588 			    repo);
589 			if (name && email) {
590 				if (asprintf(author, "%s <%s>", name, email)
591 				    == -1)
592 					return got_error_from_errno("asprintf");
593 				return NULL;
594 			}
595 			/* TODO: Look up user in password database? */
596 			return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
597 		}
598 	}
599 
600 	*author = strdup(got_author);
601 	if (*author == NULL)
602 		return got_error_from_errno("strdup");
603 
604 	err = valid_author(*author);
605 	if (err) {
606 		free(*author);
607 		*author = NULL;
608 	}
609 	return err;
610 }
611 
612 static const struct got_error *
613 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
614     struct got_worktree *worktree)
615 {
616 	const char *got_allowed_signers = NULL;
617 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
618 
619 	*allowed_signers = NULL;
620 
621 	if (worktree)
622 		worktree_conf = got_worktree_get_gotconfig(worktree);
623 	repo_conf = got_repo_get_gotconfig(repo);
624 
625 	/*
626 	 * Priority of potential author information sources, from most
627 	 * significant to least significant:
628 	 * 1) work tree's .got/got.conf file
629 	 * 2) repository's got.conf file
630 	 */
631 
632 	if (worktree_conf)
633 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
634 		    worktree_conf);
635 	if (got_allowed_signers == NULL)
636 		got_allowed_signers = got_gotconfig_get_allowed_signers_file(
637 		    repo_conf);
638 
639 	if (got_allowed_signers) {
640 		*allowed_signers = strdup(got_allowed_signers);
641 		if (*allowed_signers == NULL)
642 			return got_error_from_errno("strdup");
643 	}
644 	return NULL;
645 }
646 
647 static const struct got_error *
648 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
649     struct got_worktree *worktree)
650 {
651 	const char *got_revoked_signers = NULL;
652 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
653 
654 	*revoked_signers = NULL;
655 
656 	if (worktree)
657 		worktree_conf = got_worktree_get_gotconfig(worktree);
658 	repo_conf = got_repo_get_gotconfig(repo);
659 
660 	/*
661 	 * Priority of potential author information sources, from most
662 	 * significant to least significant:
663 	 * 1) work tree's .got/got.conf file
664 	 * 2) repository's got.conf file
665 	 */
666 
667 	if (worktree_conf)
668 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
669 		    worktree_conf);
670 	if (got_revoked_signers == NULL)
671 		got_revoked_signers = got_gotconfig_get_revoked_signers_file(
672 		    repo_conf);
673 
674 	if (got_revoked_signers) {
675 		*revoked_signers = strdup(got_revoked_signers);
676 		if (*revoked_signers == NULL)
677 			return got_error_from_errno("strdup");
678 	}
679 	return NULL;
680 }
681 
682 static const char *
683 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
684 {
685 	const char *got_signer_id = NULL;
686 	const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
687 
688 	if (worktree)
689 		worktree_conf = got_worktree_get_gotconfig(worktree);
690 	repo_conf = got_repo_get_gotconfig(repo);
691 
692 	/*
693 	 * Priority of potential author information sources, from most
694 	 * significant to least significant:
695 	 * 1) work tree's .got/got.conf file
696 	 * 2) repository's got.conf file
697 	 */
698 
699 	if (worktree_conf)
700 		got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
701 	if (got_signer_id == NULL)
702 		got_signer_id = got_gotconfig_get_signer_id(repo_conf);
703 
704 	return got_signer_id;
705 }
706 
707 static const struct got_error *
708 get_gitconfig_path(char **gitconfig_path)
709 {
710 	const char *homedir = getenv("HOME");
711 
712 	*gitconfig_path = NULL;
713 	if (homedir) {
714 		if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
715 			return got_error_from_errno("asprintf");
716 
717 	}
718 	return NULL;
719 }
720 
721 static const struct got_error *
722 cmd_import(int argc, char *argv[])
723 {
724 	const struct got_error *error = NULL;
725 	char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
726 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
727 	const char *branch_name = NULL;
728 	char *id_str = NULL, *logmsg_path = NULL;
729 	char refname[PATH_MAX] = "refs/heads/";
730 	struct got_repository *repo = NULL;
731 	struct got_reference *branch_ref = NULL, *head_ref = NULL;
732 	struct got_object_id *new_commit_id = NULL;
733 	int ch, n = 0;
734 	struct got_pathlist_head ignores;
735 	struct got_pathlist_entry *pe;
736 	int preserve_logmsg = 0;
737 	int *pack_fds = NULL;
738 
739 	TAILQ_INIT(&ignores);
740 
741 #ifndef PROFILE
742 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
743 	    "unveil",
744 	    NULL) == -1)
745 		err(1, "pledge");
746 #endif
747 
748 	while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
749 		switch (ch) {
750 		case 'b':
751 			branch_name = optarg;
752 			break;
753 		case 'I':
754 			if (optarg[0] == '\0')
755 				break;
756 			error = got_pathlist_insert(&pe, &ignores, optarg,
757 			    NULL);
758 			if (error)
759 				goto done;
760 			break;
761 		case 'm':
762 			logmsg = strdup(optarg);
763 			if (logmsg == NULL) {
764 				error = got_error_from_errno("strdup");
765 				goto done;
766 			}
767 			break;
768 		case 'r':
769 			repo_path = realpath(optarg, NULL);
770 			if (repo_path == NULL) {
771 				error = got_error_from_errno2("realpath",
772 				    optarg);
773 				goto done;
774 			}
775 			break;
776 		default:
777 			usage_import();
778 			/* NOTREACHED */
779 		}
780 	}
781 
782 	argc -= optind;
783 	argv += optind;
784 
785 	if (argc != 1)
786 		usage_import();
787 
788 	if (repo_path == NULL) {
789 		repo_path = getcwd(NULL, 0);
790 		if (repo_path == NULL)
791 			return got_error_from_errno("getcwd");
792 	}
793 	got_path_strip_trailing_slashes(repo_path);
794 	error = get_gitconfig_path(&gitconfig_path);
795 	if (error)
796 		goto done;
797 	error = got_repo_pack_fds_open(&pack_fds);
798 	if (error != NULL)
799 		goto done;
800 	error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
801 	if (error)
802 		goto done;
803 
804 	error = get_author(&author, repo, NULL);
805 	if (error)
806 		return error;
807 
808 	/*
809 	 * Don't let the user create a branch name with a leading '-'.
810 	 * While technically a valid reference name, this case is usually
811 	 * an unintended typo.
812 	 */
813 	if (branch_name && branch_name[0] == '-')
814 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
815 
816 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
817 	if (error && error->code != GOT_ERR_NOT_REF)
818 		goto done;
819 
820 	if (branch_name)
821 		n = strlcat(refname, branch_name, sizeof(refname));
822 	else if (head_ref && got_ref_is_symbolic(head_ref))
823 		n = strlcpy(refname, got_ref_get_symref_target(head_ref),
824 		    sizeof(refname));
825 	else
826 		n = strlcat(refname, "main", sizeof(refname));
827 	if (n >= sizeof(refname)) {
828 		error = got_error(GOT_ERR_NO_SPACE);
829 		goto done;
830 	}
831 
832 	error = got_ref_open(&branch_ref, repo, refname, 0);
833 	if (error) {
834 		if (error->code != GOT_ERR_NOT_REF)
835 			goto done;
836 	} else {
837 		error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
838 		    "import target branch already exists");
839 		goto done;
840 	}
841 
842 	path_dir = realpath(argv[0], NULL);
843 	if (path_dir == NULL) {
844 		error = got_error_from_errno2("realpath", argv[0]);
845 		goto done;
846 	}
847 	got_path_strip_trailing_slashes(path_dir);
848 
849 	/*
850 	 * unveil(2) traverses exec(2); if an editor is used we have
851 	 * to apply unveil after the log message has been written.
852 	 */
853 	if (logmsg == NULL || *logmsg == '\0') {
854 		error = get_editor(&editor);
855 		if (error)
856 			goto done;
857 		free(logmsg);
858 		error = collect_import_msg(&logmsg, &logmsg_path, editor,
859 		    path_dir, refname);
860 		if (error) {
861 			if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
862 			    logmsg_path != NULL)
863 				preserve_logmsg = 1;
864 			goto done;
865 		}
866 	}
867 
868 	if (unveil(path_dir, "r") != 0) {
869 		error = got_error_from_errno2("unveil", path_dir);
870 		if (logmsg_path)
871 			preserve_logmsg = 1;
872 		goto done;
873 	}
874 
875 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
876 	if (error) {
877 		if (logmsg_path)
878 			preserve_logmsg = 1;
879 		goto done;
880 	}
881 
882 	error = got_repo_import(&new_commit_id, path_dir, logmsg,
883 	    author, &ignores, repo, import_progress, NULL);
884 	if (error) {
885 		if (logmsg_path)
886 			preserve_logmsg = 1;
887 		goto done;
888 	}
889 
890 	error = got_ref_alloc(&branch_ref, refname, new_commit_id);
891 	if (error) {
892 		if (logmsg_path)
893 			preserve_logmsg = 1;
894 		goto done;
895 	}
896 
897 	error = got_ref_write(branch_ref, repo);
898 	if (error) {
899 		if (logmsg_path)
900 			preserve_logmsg = 1;
901 		goto done;
902 	}
903 
904 	error = got_object_id_str(&id_str, new_commit_id);
905 	if (error) {
906 		if (logmsg_path)
907 			preserve_logmsg = 1;
908 		goto done;
909 	}
910 
911 	error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
912 	if (error) {
913 		if (error->code != GOT_ERR_NOT_REF) {
914 			if (logmsg_path)
915 				preserve_logmsg = 1;
916 			goto done;
917 		}
918 
919 		error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
920 		    branch_ref);
921 		if (error) {
922 			if (logmsg_path)
923 				preserve_logmsg = 1;
924 			goto done;
925 		}
926 
927 		error = got_ref_write(head_ref, repo);
928 		if (error) {
929 			if (logmsg_path)
930 				preserve_logmsg = 1;
931 			goto done;
932 		}
933 	}
934 
935 	printf("Created branch %s with commit %s\n",
936 	    got_ref_get_name(branch_ref), id_str);
937 done:
938 	if (pack_fds) {
939 		const struct got_error *pack_err =
940 		    got_repo_pack_fds_close(pack_fds);
941 		if (error == NULL)
942 			error = pack_err;
943 	}
944 	if (repo) {
945 		const struct got_error *close_err = got_repo_close(repo);
946 		if (error == NULL)
947 			error = close_err;
948 	}
949 	if (preserve_logmsg) {
950 		fprintf(stderr, "%s: log message preserved in %s\n",
951 		    getprogname(), logmsg_path);
952 	} else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
953 		error = got_error_from_errno2("unlink", logmsg_path);
954 	free(logmsg);
955 	free(logmsg_path);
956 	free(repo_path);
957 	free(editor);
958 	free(new_commit_id);
959 	free(id_str);
960 	free(author);
961 	free(gitconfig_path);
962 	if (branch_ref)
963 		got_ref_close(branch_ref);
964 	if (head_ref)
965 		got_ref_close(head_ref);
966 	return error;
967 }
968 
969 __dead static void
970 usage_clone(void)
971 {
972 	fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
973 	    "repository-URL [directory]\n", getprogname());
974 	exit(1);
975 }
976 
977 struct got_fetch_progress_arg {
978 	char last_scaled_size[FMT_SCALED_STRSIZE];
979 	int last_p_indexed;
980 	int last_p_resolved;
981 	int verbosity;
982 
983 	struct got_repository *repo;
984 
985 	int create_configs;
986 	int configs_created;
987 	struct {
988 		struct got_pathlist_head *symrefs;
989 		struct got_pathlist_head *wanted_branches;
990 		struct got_pathlist_head *wanted_refs;
991 		const char *proto;
992 		const char *host;
993 		const char *port;
994 		const char *remote_repo_path;
995 		const char *git_url;
996 		int fetch_all_branches;
997 		int mirror_references;
998 	} config_info;
999 };
1000 
1001 /* XXX forward declaration */
1002 static const struct got_error *
1003 create_config_files(const char *proto, const char *host, const char *port,
1004     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1005     int mirror_references, struct got_pathlist_head *symrefs,
1006     struct got_pathlist_head *wanted_branches,
1007     struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1008 
1009 static const struct got_error *
1010 fetch_progress(void *arg, const char *message, off_t packfile_size,
1011     int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1012 {
1013 	const struct got_error *err = NULL;
1014 	struct got_fetch_progress_arg *a = arg;
1015 	char scaled_size[FMT_SCALED_STRSIZE];
1016 	int p_indexed, p_resolved;
1017 	int print_size = 0, print_indexed = 0, print_resolved = 0;
1018 
1019 	/*
1020 	 * In order to allow a failed clone to be resumed with 'got fetch'
1021 	 * we try to create configuration files as soon as possible.
1022 	 * Once the server has sent information about its default branch
1023 	 * we have all required information.
1024 	 */
1025 	if (a->create_configs && !a->configs_created &&
1026 	    !TAILQ_EMPTY(a->config_info.symrefs)) {
1027 		err = create_config_files(a->config_info.proto,
1028 		    a->config_info.host, a->config_info.port,
1029 		    a->config_info.remote_repo_path,
1030 		    a->config_info.git_url,
1031 		    a->config_info.fetch_all_branches,
1032 		    a->config_info.mirror_references,
1033 		    a->config_info.symrefs,
1034 		    a->config_info.wanted_branches,
1035 		    a->config_info.wanted_refs, a->repo);
1036 		if (err)
1037 			return err;
1038 		a->configs_created = 1;
1039 	}
1040 
1041 	if (a->verbosity < 0)
1042 		return NULL;
1043 
1044 	if (message && message[0] != '\0') {
1045 		printf("\rserver: %s", message);
1046 		fflush(stdout);
1047 		return NULL;
1048 	}
1049 
1050 	if (packfile_size > 0 || nobj_indexed > 0) {
1051 		if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1052 		    (a->last_scaled_size[0] == '\0' ||
1053 		    strcmp(scaled_size, a->last_scaled_size)) != 0) {
1054 			print_size = 1;
1055 			if (strlcpy(a->last_scaled_size, scaled_size,
1056 			    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1057 				return got_error(GOT_ERR_NO_SPACE);
1058 		}
1059 		if (nobj_indexed > 0) {
1060 			p_indexed = (nobj_indexed * 100) / nobj_total;
1061 			if (p_indexed != a->last_p_indexed) {
1062 				a->last_p_indexed = p_indexed;
1063 				print_indexed = 1;
1064 				print_size = 1;
1065 			}
1066 		}
1067 		if (nobj_resolved > 0) {
1068 			p_resolved = (nobj_resolved * 100) /
1069 			    (nobj_total - nobj_loose);
1070 			if (p_resolved != a->last_p_resolved) {
1071 				a->last_p_resolved = p_resolved;
1072 				print_resolved = 1;
1073 				print_indexed = 1;
1074 				print_size = 1;
1075 			}
1076 		}
1077 
1078 	}
1079 	if (print_size || print_indexed || print_resolved)
1080 		printf("\r");
1081 	if (print_size)
1082 		printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1083 	if (print_indexed)
1084 		printf("; indexing %d%%", p_indexed);
1085 	if (print_resolved)
1086 		printf("; resolving deltas %d%%", p_resolved);
1087 	if (print_size || print_indexed || print_resolved)
1088 		fflush(stdout);
1089 
1090 	return NULL;
1091 }
1092 
1093 static const struct got_error *
1094 create_symref(const char *refname, struct got_reference *target_ref,
1095     int verbosity, struct got_repository *repo)
1096 {
1097 	const struct got_error *err;
1098 	struct got_reference *head_symref;
1099 
1100 	err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1101 	if (err)
1102 		return err;
1103 
1104 	err = got_ref_write(head_symref, repo);
1105 	if (err == NULL && verbosity > 0) {
1106 		printf("Created reference %s: %s\n", GOT_REF_HEAD,
1107 		    got_ref_get_name(target_ref));
1108 	}
1109 	got_ref_close(head_symref);
1110 	return err;
1111 }
1112 
1113 static const struct got_error *
1114 list_remote_refs(struct got_pathlist_head *symrefs,
1115     struct got_pathlist_head *refs)
1116 {
1117 	const struct got_error *err;
1118 	struct got_pathlist_entry *pe;
1119 
1120 	TAILQ_FOREACH(pe, symrefs, entry) {
1121 		const char *refname = pe->path;
1122 		const char *targetref = pe->data;
1123 
1124 		printf("%s: %s\n", refname, targetref);
1125 	}
1126 
1127 	TAILQ_FOREACH(pe, refs, entry) {
1128 		const char *refname = pe->path;
1129 		struct got_object_id *id = pe->data;
1130 		char *id_str;
1131 
1132 		err = got_object_id_str(&id_str, id);
1133 		if (err)
1134 			return err;
1135 		printf("%s: %s\n", refname, id_str);
1136 		free(id_str);
1137 	}
1138 
1139 	return NULL;
1140 }
1141 
1142 static const struct got_error *
1143 create_ref(const char *refname, struct got_object_id *id,
1144     int verbosity, struct got_repository *repo)
1145 {
1146 	const struct got_error *err = NULL;
1147 	struct got_reference *ref;
1148 	char *id_str;
1149 
1150 	err = got_object_id_str(&id_str, id);
1151 	if (err)
1152 		return err;
1153 
1154 	err = got_ref_alloc(&ref, refname, id);
1155 	if (err)
1156 		goto done;
1157 
1158 	err = got_ref_write(ref, repo);
1159 	got_ref_close(ref);
1160 
1161 	if (err == NULL && verbosity >= 0)
1162 		printf("Created reference %s: %s\n", refname, id_str);
1163 done:
1164 	free(id_str);
1165 	return err;
1166 }
1167 
1168 static int
1169 match_wanted_ref(const char *refname, const char *wanted_ref)
1170 {
1171 	if (strncmp(refname, "refs/", 5) != 0)
1172 		return 0;
1173 	refname += 5;
1174 
1175 	/*
1176 	 * Prevent fetching of references that won't make any
1177 	 * sense outside of the remote repository's context.
1178 	 */
1179 	if (strncmp(refname, "got/", 4) == 0)
1180 		return 0;
1181 	if (strncmp(refname, "remotes/", 8) == 0)
1182 		return 0;
1183 
1184 	if (strncmp(wanted_ref, "refs/", 5) == 0)
1185 		wanted_ref += 5;
1186 
1187 	/* Allow prefix match. */
1188 	if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1189 		return 1;
1190 
1191 	/* Allow exact match. */
1192 	return (strcmp(refname, wanted_ref) == 0);
1193 }
1194 
1195 static int
1196 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1197 {
1198 	struct got_pathlist_entry *pe;
1199 
1200 	TAILQ_FOREACH(pe, wanted_refs, entry) {
1201 		if (match_wanted_ref(refname, pe->path))
1202 			return 1;
1203 	}
1204 
1205 	return 0;
1206 }
1207 
1208 static const struct got_error *
1209 create_wanted_ref(const char *refname, struct got_object_id *id,
1210     const char *remote_repo_name, int verbosity, struct got_repository *repo)
1211 {
1212 	const struct got_error *err;
1213 	char *remote_refname;
1214 
1215 	if (strncmp("refs/", refname, 5) == 0)
1216 		refname += 5;
1217 
1218 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1219 	    remote_repo_name, refname) == -1)
1220 		return got_error_from_errno("asprintf");
1221 
1222 	err = create_ref(remote_refname, id, verbosity, repo);
1223 	free(remote_refname);
1224 	return err;
1225 }
1226 
1227 static const struct got_error *
1228 create_gotconfig(const char *proto, const char *host, const char *port,
1229     const char *remote_repo_path, const char *default_branch,
1230     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1231     struct got_pathlist_head *wanted_refs, int mirror_references,
1232     struct got_repository *repo)
1233 {
1234 	const struct got_error *err = NULL;
1235 	char *gotconfig_path = NULL;
1236 	char *gotconfig = NULL;
1237 	FILE *gotconfig_file = NULL;
1238 	const char *branchname = NULL;
1239 	char *branches = NULL, *refs = NULL;
1240 	ssize_t n;
1241 
1242 	if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1243 		struct got_pathlist_entry *pe;
1244 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1245 			char *s;
1246 			branchname = pe->path;
1247 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1248 				branchname += 11;
1249 			if (asprintf(&s, "%s\"%s\" ",
1250 			    branches ? branches : "", branchname) == -1) {
1251 				err = got_error_from_errno("asprintf");
1252 				goto done;
1253 			}
1254 			free(branches);
1255 			branches = s;
1256 		}
1257 	} else if (!fetch_all_branches && default_branch) {
1258 		branchname = default_branch;
1259 		if (strncmp(branchname, "refs/heads/", 11) == 0)
1260 			branchname += 11;
1261 		if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1262 			err = got_error_from_errno("asprintf");
1263 			goto done;
1264 		}
1265 	}
1266 	if (!TAILQ_EMPTY(wanted_refs)) {
1267 		struct got_pathlist_entry *pe;
1268 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1269 			char *s;
1270 			const char *refname = pe->path;
1271 			if (strncmp(refname, "refs/", 5) == 0)
1272 				branchname += 5;
1273 			if (asprintf(&s, "%s\"%s\" ",
1274 			    refs ? refs : "", refname) == -1) {
1275 				err = got_error_from_errno("asprintf");
1276 				goto done;
1277 			}
1278 			free(refs);
1279 			refs = s;
1280 		}
1281 	}
1282 
1283 	/* Create got.conf(5). */
1284 	gotconfig_path = got_repo_get_path_gotconfig(repo);
1285 	if (gotconfig_path == NULL) {
1286 		err = got_error_from_errno("got_repo_get_path_gotconfig");
1287 		goto done;
1288 	}
1289 	gotconfig_file = fopen(gotconfig_path, "ae");
1290 	if (gotconfig_file == NULL) {
1291 		err = got_error_from_errno2("fopen", gotconfig_path);
1292 		goto done;
1293 	}
1294 	if (asprintf(&gotconfig,
1295 	    "remote \"%s\" {\n"
1296 	    "\tserver %s\n"
1297 	    "\tprotocol %s\n"
1298 	    "%s%s%s"
1299 	    "\trepository \"%s\"\n"
1300 	    "%s%s%s"
1301 	    "%s%s%s"
1302 	    "%s"
1303 	    "%s"
1304 	    "}\n",
1305 	    GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1306 	    port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1307 	    remote_repo_path, branches ? "\tbranch { " : "",
1308 	    branches ? branches : "", branches ? "}\n" : "",
1309 	    refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1310 	    mirror_references ? "\tmirror_references yes\n" : "",
1311 	    fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1312 		err = got_error_from_errno("asprintf");
1313 		goto done;
1314 	}
1315 	n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1316 	if (n != strlen(gotconfig)) {
1317 		err = got_ferror(gotconfig_file, GOT_ERR_IO);
1318 		goto done;
1319 	}
1320 
1321 done:
1322 	if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1323 		err = got_error_from_errno2("fclose", gotconfig_path);
1324 	free(gotconfig_path);
1325 	free(branches);
1326 	return err;
1327 }
1328 
1329 static const struct got_error *
1330 create_gitconfig(const char *git_url, const char *default_branch,
1331     int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1332     struct got_pathlist_head *wanted_refs, int mirror_references,
1333     struct got_repository *repo)
1334 {
1335 	const struct got_error *err = NULL;
1336 	char *gitconfig_path = NULL;
1337 	char *gitconfig = NULL;
1338 	FILE *gitconfig_file = NULL;
1339 	char *branches = NULL, *refs = NULL;
1340 	const char *branchname;
1341 	ssize_t n;
1342 
1343 	/* Create a config file Git can understand. */
1344 	gitconfig_path = got_repo_get_path_gitconfig(repo);
1345 	if (gitconfig_path == NULL) {
1346 		err = got_error_from_errno("got_repo_get_path_gitconfig");
1347 		goto done;
1348 	}
1349 	gitconfig_file = fopen(gitconfig_path, "ae");
1350 	if (gitconfig_file == NULL) {
1351 		err = got_error_from_errno2("fopen", gitconfig_path);
1352 		goto done;
1353 	}
1354 	if (fetch_all_branches) {
1355 		if (mirror_references) {
1356 			if (asprintf(&branches,
1357 			    "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1358 				err = got_error_from_errno("asprintf");
1359 				goto done;
1360 			}
1361 		} else if (asprintf(&branches,
1362 		    "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1363 		    GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1364 			err = got_error_from_errno("asprintf");
1365 			goto done;
1366 		}
1367 	} else if (!TAILQ_EMPTY(wanted_branches)) {
1368 		struct got_pathlist_entry *pe;
1369 		TAILQ_FOREACH(pe, wanted_branches, entry) {
1370 			char *s;
1371 			branchname = pe->path;
1372 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1373 				branchname += 11;
1374 			if (mirror_references) {
1375 				if (asprintf(&s,
1376 				    "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1377 				    branches ? branches : "",
1378 				    branchname, branchname) == -1) {
1379 					err = got_error_from_errno("asprintf");
1380 					goto done;
1381 				}
1382 			} else if (asprintf(&s,
1383 			    "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1384 			    branches ? branches : "",
1385 			    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1386 			    branchname) == -1) {
1387 				err = got_error_from_errno("asprintf");
1388 				goto done;
1389 			}
1390 			free(branches);
1391 			branches = s;
1392 		}
1393 	} else {
1394 		/*
1395 		 * If the server specified a default branch, use just that one.
1396 		 * Otherwise fall back to fetching all branches on next fetch.
1397 		 */
1398 		if (default_branch) {
1399 			branchname = default_branch;
1400 			if (strncmp(branchname, "refs/heads/", 11) == 0)
1401 				branchname += 11;
1402 		} else
1403 			branchname = "*"; /* fall back to all branches */
1404 		if (mirror_references) {
1405 			if (asprintf(&branches,
1406 			    "\tfetch = refs/heads/%s:refs/heads/%s\n",
1407 			    branchname, branchname) == -1) {
1408 				err = got_error_from_errno("asprintf");
1409 				goto done;
1410 			}
1411 		} else if (asprintf(&branches,
1412 		    "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1413 		    branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1414 		    branchname) == -1) {
1415 			err = got_error_from_errno("asprintf");
1416 			goto done;
1417 		}
1418 	}
1419 	if (!TAILQ_EMPTY(wanted_refs)) {
1420 		struct got_pathlist_entry *pe;
1421 		TAILQ_FOREACH(pe, wanted_refs, entry) {
1422 			char *s;
1423 			const char *refname = pe->path;
1424 			if (strncmp(refname, "refs/", 5) == 0)
1425 				refname += 5;
1426 			if (mirror_references) {
1427 				if (asprintf(&s,
1428 				    "%s\tfetch = refs/%s:refs/%s\n",
1429 				    refs ? refs : "", refname, refname) == -1) {
1430 					err = got_error_from_errno("asprintf");
1431 					goto done;
1432 				}
1433 			} else if (asprintf(&s,
1434 			    "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1435 			    refs ? refs : "",
1436 			    refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1437 			    refname) == -1) {
1438 				err = got_error_from_errno("asprintf");
1439 				goto done;
1440 			}
1441 			free(refs);
1442 			refs = s;
1443 		}
1444 	}
1445 
1446 	if (asprintf(&gitconfig,
1447 	    "[remote \"%s\"]\n"
1448 	    "\turl = %s\n"
1449 	    "%s"
1450 	    "%s"
1451 	    "\tfetch = refs/tags/*:refs/tags/*\n",
1452 	    GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1453 	    refs ? refs : "") == -1) {
1454 		err = got_error_from_errno("asprintf");
1455 		goto done;
1456 	}
1457 	n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1458 	if (n != strlen(gitconfig)) {
1459 		err = got_ferror(gitconfig_file, GOT_ERR_IO);
1460 		goto done;
1461 	}
1462 done:
1463 	if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1464 		err = got_error_from_errno2("fclose", gitconfig_path);
1465 	free(gitconfig_path);
1466 	free(branches);
1467 	return err;
1468 }
1469 
1470 static const struct got_error *
1471 create_config_files(const char *proto, const char *host, const char *port,
1472     const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1473     int mirror_references, struct got_pathlist_head *symrefs,
1474     struct got_pathlist_head *wanted_branches,
1475     struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1476 {
1477 	const struct got_error *err = NULL;
1478 	const char *default_branch = NULL;
1479 	struct got_pathlist_entry *pe;
1480 
1481 	/*
1482 	 * If we asked for a set of wanted branches then use the first
1483 	 * one of those.
1484 	 */
1485 	if (!TAILQ_EMPTY(wanted_branches)) {
1486 		pe = TAILQ_FIRST(wanted_branches);
1487 		default_branch = pe->path;
1488 	} else {
1489 		/* First HEAD ref listed by server is the default branch. */
1490 		TAILQ_FOREACH(pe, symrefs, entry) {
1491 			const char *refname = pe->path;
1492 			const char *target = pe->data;
1493 
1494 			if (strcmp(refname, GOT_REF_HEAD) != 0)
1495 				continue;
1496 
1497 			default_branch = target;
1498 			break;
1499 		}
1500 	}
1501 
1502 	/* Create got.conf(5). */
1503 	err = create_gotconfig(proto, host, port, remote_repo_path,
1504 	    default_branch, fetch_all_branches, wanted_branches,
1505 	    wanted_refs, mirror_references, repo);
1506 	if (err)
1507 		return err;
1508 
1509 	/* Create a config file Git can understand. */
1510 	return create_gitconfig(git_url, default_branch, fetch_all_branches,
1511 	    wanted_branches, wanted_refs, mirror_references, repo);
1512 }
1513 
1514 static const struct got_error *
1515 cmd_clone(int argc, char *argv[])
1516 {
1517 	const struct got_error *error = NULL;
1518 	const char *uri, *dirname;
1519 	char *proto, *host, *port, *repo_name, *server_path;
1520 	char *default_destdir = NULL, *id_str = NULL;
1521 	const char *repo_path;
1522 	struct got_repository *repo = NULL;
1523 	struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1524 	struct got_pathlist_entry *pe;
1525 	struct got_object_id *pack_hash = NULL;
1526 	int ch, fetchfd = -1, fetchstatus;
1527 	pid_t fetchpid = -1;
1528 	struct got_fetch_progress_arg fpa;
1529 	char *git_url = NULL;
1530 	int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1531 	int bflag = 0, list_refs_only = 0;
1532 	int *pack_fds = NULL;
1533 
1534 	TAILQ_INIT(&refs);
1535 	TAILQ_INIT(&symrefs);
1536 	TAILQ_INIT(&wanted_branches);
1537 	TAILQ_INIT(&wanted_refs);
1538 
1539 	while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1540 		switch (ch) {
1541 		case 'a':
1542 			fetch_all_branches = 1;
1543 			break;
1544 		case 'b':
1545 			error = got_pathlist_append(&wanted_branches,
1546 			    optarg, NULL);
1547 			if (error)
1548 				return error;
1549 			bflag = 1;
1550 			break;
1551 		case 'l':
1552 			list_refs_only = 1;
1553 			break;
1554 		case 'm':
1555 			mirror_references = 1;
1556 			break;
1557 		case 'q':
1558 			verbosity = -1;
1559 			break;
1560 		case 'R':
1561 			error = got_pathlist_append(&wanted_refs,
1562 			    optarg, NULL);
1563 			if (error)
1564 				return error;
1565 			break;
1566 		case 'v':
1567 			if (verbosity < 0)
1568 				verbosity = 0;
1569 			else if (verbosity < 3)
1570 				verbosity++;
1571 			break;
1572 		default:
1573 			usage_clone();
1574 			break;
1575 		}
1576 	}
1577 	argc -= optind;
1578 	argv += optind;
1579 
1580 	if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1581 		option_conflict('a', 'b');
1582 	if (list_refs_only) {
1583 		if (!TAILQ_EMPTY(&wanted_branches))
1584 			option_conflict('l', 'b');
1585 		if (fetch_all_branches)
1586 			option_conflict('l', 'a');
1587 		if (mirror_references)
1588 			option_conflict('l', 'm');
1589 		if (!TAILQ_EMPTY(&wanted_refs))
1590 			option_conflict('l', 'R');
1591 	}
1592 
1593 	uri = argv[0];
1594 
1595 	if (argc == 1)
1596 		dirname = NULL;
1597 	else if (argc == 2)
1598 		dirname = argv[1];
1599 	else
1600 		usage_clone();
1601 
1602 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1603 	    &repo_name, uri);
1604 	if (error)
1605 		goto done;
1606 
1607 	if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1608 	    host, port ? ":" : "", port ? port : "",
1609 	    server_path[0] != '/' ? "/" : "", server_path) == -1) {
1610 		error = got_error_from_errno("asprintf");
1611 		goto done;
1612 	}
1613 
1614 	if (strcmp(proto, "git") == 0) {
1615 #ifndef PROFILE
1616 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1617 		    "sendfd dns inet unveil", NULL) == -1)
1618 			err(1, "pledge");
1619 #endif
1620 	} else if (strcmp(proto, "git+ssh") == 0 ||
1621 	    strcmp(proto, "ssh") == 0) {
1622 #ifndef PROFILE
1623 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1624 		    "sendfd unveil", NULL) == -1)
1625 			err(1, "pledge");
1626 #endif
1627 	} else if (strcmp(proto, "http") == 0 ||
1628 	    strcmp(proto, "git+http") == 0) {
1629 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1630 		goto done;
1631 	} else {
1632 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1633 		goto done;
1634 	}
1635 	if (dirname == NULL) {
1636 		if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1637 			error = got_error_from_errno("asprintf");
1638 			goto done;
1639 		}
1640 		repo_path = default_destdir;
1641 	} else
1642 		repo_path = dirname;
1643 
1644 	if (!list_refs_only) {
1645 		error = got_path_mkdir(repo_path);
1646 		if (error &&
1647 		    (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1648 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1649 			goto done;
1650 		if (!got_path_dir_is_empty(repo_path)) {
1651 			error = got_error_path(repo_path,
1652 			    GOT_ERR_DIR_NOT_EMPTY);
1653 			goto done;
1654 		}
1655 	}
1656 
1657 	error = got_dial_apply_unveil(proto);
1658 	if (error)
1659 		goto done;
1660 
1661 	error = apply_unveil(repo_path, 0, NULL);
1662 	if (error)
1663 		goto done;
1664 
1665 	if (verbosity >= 0)
1666 		printf("Connecting to %s\n", git_url);
1667 
1668 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1669 	    server_path, verbosity);
1670 	if (error)
1671 		goto done;
1672 
1673 	if (!list_refs_only) {
1674 		error = got_repo_init(repo_path, NULL);
1675 		if (error)
1676 			goto done;
1677 		error = got_repo_pack_fds_open(&pack_fds);
1678 		if (error != NULL)
1679 			goto done;
1680 		error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1681 		if (error)
1682 			goto done;
1683 	}
1684 
1685 	fpa.last_scaled_size[0] = '\0';
1686 	fpa.last_p_indexed = -1;
1687 	fpa.last_p_resolved = -1;
1688 	fpa.verbosity = verbosity;
1689 	fpa.create_configs = 1;
1690 	fpa.configs_created = 0;
1691 	fpa.repo = repo;
1692 	fpa.config_info.symrefs = &symrefs;
1693 	fpa.config_info.wanted_branches = &wanted_branches;
1694 	fpa.config_info.wanted_refs = &wanted_refs;
1695 	fpa.config_info.proto = proto;
1696 	fpa.config_info.host = host;
1697 	fpa.config_info.port = port;
1698 	fpa.config_info.remote_repo_path = server_path;
1699 	fpa.config_info.git_url = git_url;
1700 	fpa.config_info.fetch_all_branches = fetch_all_branches;
1701 	fpa.config_info.mirror_references = mirror_references;
1702 	error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1703 	    GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1704 	    fetch_all_branches, &wanted_branches, &wanted_refs,
1705 	    list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1706 	    fetch_progress, &fpa);
1707 	if (error)
1708 		goto done;
1709 
1710 	if (list_refs_only) {
1711 		error = list_remote_refs(&symrefs, &refs);
1712 		goto done;
1713 	}
1714 
1715 	if (pack_hash == NULL) {
1716 		error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1717 		    "server sent an empty pack file");
1718 		goto done;
1719 	}
1720 	error = got_object_id_str(&id_str, pack_hash);
1721 	if (error)
1722 		goto done;
1723 	if (verbosity >= 0)
1724 		printf("\nFetched %s.pack\n", id_str);
1725 	free(id_str);
1726 
1727 	/* Set up references provided with the pack file. */
1728 	TAILQ_FOREACH(pe, &refs, entry) {
1729 		const char *refname = pe->path;
1730 		struct got_object_id *id = pe->data;
1731 		char *remote_refname;
1732 
1733 		if (is_wanted_ref(&wanted_refs, refname) &&
1734 		    !mirror_references) {
1735 			error = create_wanted_ref(refname, id,
1736 			    GOT_FETCH_DEFAULT_REMOTE_NAME,
1737 			    verbosity - 1, repo);
1738 			if (error)
1739 				goto done;
1740 			continue;
1741 		}
1742 
1743 		error = create_ref(refname, id, verbosity - 1, repo);
1744 		if (error)
1745 			goto done;
1746 
1747 		if (mirror_references)
1748 			continue;
1749 
1750 		if (strncmp("refs/heads/", refname, 11) != 0)
1751 			continue;
1752 
1753 		if (asprintf(&remote_refname,
1754 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1755 		    refname + 11) == -1) {
1756 			error = got_error_from_errno("asprintf");
1757 			goto done;
1758 		}
1759 		error = create_ref(remote_refname, id, verbosity - 1, repo);
1760 		free(remote_refname);
1761 		if (error)
1762 			goto done;
1763 	}
1764 
1765 	/* Set the HEAD reference if the server provided one. */
1766 	TAILQ_FOREACH(pe, &symrefs, entry) {
1767 		struct got_reference *target_ref;
1768 		const char *refname = pe->path;
1769 		const char *target = pe->data;
1770 		char *remote_refname = NULL, *remote_target = NULL;
1771 
1772 		if (strcmp(refname, GOT_REF_HEAD) != 0)
1773 			continue;
1774 
1775 		error = got_ref_open(&target_ref, repo, target, 0);
1776 		if (error) {
1777 			if (error->code == GOT_ERR_NOT_REF) {
1778 				error = NULL;
1779 				continue;
1780 			}
1781 			goto done;
1782 		}
1783 
1784 		error = create_symref(refname, target_ref, verbosity, repo);
1785 		got_ref_close(target_ref);
1786 		if (error)
1787 			goto done;
1788 
1789 		if (mirror_references)
1790 			continue;
1791 
1792 		if (strncmp("refs/heads/", target, 11) != 0)
1793 			continue;
1794 
1795 		if (asprintf(&remote_refname,
1796 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1797 		    refname) == -1) {
1798 			error = got_error_from_errno("asprintf");
1799 			goto done;
1800 		}
1801 		if (asprintf(&remote_target,
1802 		    "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1803 		    target + 11) == -1) {
1804 			error = got_error_from_errno("asprintf");
1805 			free(remote_refname);
1806 			goto done;
1807 		}
1808 		error = got_ref_open(&target_ref, repo, remote_target, 0);
1809 		if (error) {
1810 			free(remote_refname);
1811 			free(remote_target);
1812 			if (error->code == GOT_ERR_NOT_REF) {
1813 				error = NULL;
1814 				continue;
1815 			}
1816 			goto done;
1817 		}
1818 		error = create_symref(remote_refname, target_ref,
1819 		    verbosity - 1, repo);
1820 		free(remote_refname);
1821 		free(remote_target);
1822 		got_ref_close(target_ref);
1823 		if (error)
1824 			goto done;
1825 	}
1826 	if (pe == NULL) {
1827 		/*
1828 		 * We failed to set the HEAD reference. If we asked for
1829 		 * a set of wanted branches use the first of one of those
1830 		 * which could be fetched instead.
1831 		 */
1832 		TAILQ_FOREACH(pe, &wanted_branches, entry) {
1833 			const char *target = pe->path;
1834 			struct got_reference *target_ref;
1835 
1836 			error = got_ref_open(&target_ref, repo, target, 0);
1837 			if (error) {
1838 				if (error->code == GOT_ERR_NOT_REF) {
1839 					error = NULL;
1840 					continue;
1841 				}
1842 				goto done;
1843 			}
1844 
1845 			error = create_symref(GOT_REF_HEAD, target_ref,
1846 			    verbosity, repo);
1847 			got_ref_close(target_ref);
1848 			if (error)
1849 				goto done;
1850 			break;
1851 		}
1852 
1853 		if (!fpa.configs_created && pe != NULL) {
1854 			error = create_config_files(fpa.config_info.proto,
1855 			    fpa.config_info.host, fpa.config_info.port,
1856 			    fpa.config_info.remote_repo_path,
1857 			    fpa.config_info.git_url,
1858 			    fpa.config_info.fetch_all_branches,
1859 			    fpa.config_info.mirror_references,
1860 			    fpa.config_info.symrefs,
1861 			    fpa.config_info.wanted_branches,
1862 			    fpa.config_info.wanted_refs, fpa.repo);
1863 			if (error)
1864 				goto done;
1865 		}
1866 	}
1867 
1868 	if (verbosity >= 0)
1869 		printf("Created %s repository '%s'\n",
1870 		    mirror_references ? "mirrored" : "cloned", repo_path);
1871 done:
1872 	if (pack_fds) {
1873 		const struct got_error *pack_err =
1874 		    got_repo_pack_fds_close(pack_fds);
1875 		if (error == NULL)
1876 			error = pack_err;
1877 	}
1878 	if (fetchpid > 0) {
1879 		if (kill(fetchpid, SIGTERM) == -1)
1880 			error = got_error_from_errno("kill");
1881 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1882 			error = got_error_from_errno("waitpid");
1883 	}
1884 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1885 		error = got_error_from_errno("close");
1886 	if (repo) {
1887 		const struct got_error *close_err = got_repo_close(repo);
1888 		if (error == NULL)
1889 			error = close_err;
1890 	}
1891 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1892 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1893 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1894 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1895 	free(pack_hash);
1896 	free(proto);
1897 	free(host);
1898 	free(port);
1899 	free(server_path);
1900 	free(repo_name);
1901 	free(default_destdir);
1902 	free(git_url);
1903 	return error;
1904 }
1905 
1906 static const struct got_error *
1907 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1908     int replace_tags, int verbosity, struct got_repository *repo)
1909 {
1910 	const struct got_error *err = NULL;
1911 	char *new_id_str = NULL;
1912 	struct got_object_id *old_id = NULL;
1913 
1914 	err = got_object_id_str(&new_id_str, new_id);
1915 	if (err)
1916 		goto done;
1917 
1918 	if (!replace_tags &&
1919 	    strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1920 		err = got_ref_resolve(&old_id, repo, ref);
1921 		if (err)
1922 			goto done;
1923 		if (got_object_id_cmp(old_id, new_id) == 0)
1924 			goto done;
1925 		if (verbosity >= 0) {
1926 			printf("Rejecting update of existing tag %s: %s\n",
1927 			    got_ref_get_name(ref), new_id_str);
1928 		}
1929 		goto done;
1930 	}
1931 
1932 	if (got_ref_is_symbolic(ref)) {
1933 		if (verbosity >= 0) {
1934 			printf("Replacing reference %s: %s\n",
1935 			    got_ref_get_name(ref),
1936 			    got_ref_get_symref_target(ref));
1937 		}
1938 		err = got_ref_change_symref_to_ref(ref, new_id);
1939 		if (err)
1940 			goto done;
1941 		err = got_ref_write(ref, repo);
1942 		if (err)
1943 			goto done;
1944 	} else {
1945 		err = got_ref_resolve(&old_id, repo, ref);
1946 		if (err)
1947 			goto done;
1948 		if (got_object_id_cmp(old_id, new_id) == 0)
1949 			goto done;
1950 
1951 		err = got_ref_change_ref(ref, new_id);
1952 		if (err)
1953 			goto done;
1954 		err = got_ref_write(ref, repo);
1955 		if (err)
1956 			goto done;
1957 	}
1958 
1959 	if (verbosity >= 0)
1960 		printf("Updated %s: %s\n", got_ref_get_name(ref),
1961 		    new_id_str);
1962 done:
1963 	free(old_id);
1964 	free(new_id_str);
1965 	return err;
1966 }
1967 
1968 static const struct got_error *
1969 update_wanted_ref(const char *refname, struct got_object_id *id,
1970     const char *remote_repo_name, int verbosity, struct got_repository *repo)
1971 {
1972 	const struct got_error *err, *unlock_err;
1973 	char *remote_refname;
1974 	struct got_reference *ref;
1975 
1976 	if (strncmp("refs/", refname, 5) == 0)
1977 		refname += 5;
1978 
1979 	if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1980 	    remote_repo_name, refname) == -1)
1981 		return got_error_from_errno("asprintf");
1982 
1983 	err = got_ref_open(&ref, repo, remote_refname, 1);
1984 	if (err) {
1985 		if (err->code != GOT_ERR_NOT_REF)
1986 			goto done;
1987 		err = create_ref(remote_refname, id, verbosity, repo);
1988 	} else {
1989 		err = update_ref(ref, id, 0, verbosity, repo);
1990 		unlock_err = got_ref_unlock(ref);
1991 		if (unlock_err && err == NULL)
1992 			err = unlock_err;
1993 		got_ref_close(ref);
1994 	}
1995 done:
1996 	free(remote_refname);
1997 	return err;
1998 }
1999 
2000 __dead static void
2001 usage_checkout(void)
2002 {
2003 	fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2004 	    "[-p path-prefix] repository-path [work-tree-path]\n",
2005 	    getprogname());
2006 	exit(1);
2007 }
2008 
2009 static void
2010 show_worktree_base_ref_warning(void)
2011 {
2012 	fprintf(stderr, "%s: warning: could not create a reference "
2013 	    "to the work tree's base commit; the commit could be "
2014 	    "garbage-collected by Git or 'gotadmin cleanup'; making the "
2015 	    "repository writable and running 'got update' will prevent this\n",
2016 	    getprogname());
2017 }
2018 
2019 struct got_checkout_progress_arg {
2020 	const char *worktree_path;
2021 	int had_base_commit_ref_error;
2022 	int verbosity;
2023 };
2024 
2025 static const struct got_error *
2026 checkout_progress(void *arg, unsigned char status, const char *path)
2027 {
2028 	struct got_checkout_progress_arg *a = arg;
2029 
2030 	/* Base commit bump happens silently. */
2031 	if (status == GOT_STATUS_BUMP_BASE)
2032 		return NULL;
2033 
2034 	if (status == GOT_STATUS_BASE_REF_ERR) {
2035 		a->had_base_commit_ref_error = 1;
2036 		return NULL;
2037 	}
2038 
2039 	while (path[0] == '/')
2040 		path++;
2041 
2042 	if (a->verbosity >= 0)
2043 		printf("%c  %s/%s\n", status, a->worktree_path, path);
2044 
2045 	return NULL;
2046 }
2047 
2048 static const struct got_error *
2049 check_cancelled(void *arg)
2050 {
2051 	if (sigint_received || sigpipe_received)
2052 		return got_error(GOT_ERR_CANCELLED);
2053 	return NULL;
2054 }
2055 
2056 static const struct got_error *
2057 check_linear_ancestry(struct got_object_id *commit_id,
2058     struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2059     struct got_repository *repo)
2060 {
2061 	const struct got_error *err = NULL;
2062 	struct got_object_id *yca_id;
2063 
2064 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2065 	    commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2066 	if (err)
2067 		return err;
2068 
2069 	if (yca_id == NULL)
2070 		return got_error(GOT_ERR_ANCESTRY);
2071 
2072 	/*
2073 	 * Require a straight line of history between the target commit
2074 	 * and the work tree's base commit.
2075 	 *
2076 	 * Non-linear situations such as this require a rebase:
2077 	 *
2078 	 * (commit) D       F (base_commit)
2079 	 *           \     /
2080 	 *            C   E
2081 	 *             \ /
2082 	 *              B (yca)
2083 	 *              |
2084 	 *              A
2085 	 *
2086 	 * 'got update' only handles linear cases:
2087 	 * Update forwards in time:  A (base/yca) - B - C - D (commit)
2088 	 * Update backwards in time: D (base) - C - B - A (commit/yca)
2089 	 */
2090 	if (allow_forwards_in_time_only) {
2091 	    if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2092 		return got_error(GOT_ERR_ANCESTRY);
2093 	} else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2094 	    got_object_id_cmp(base_commit_id, yca_id) != 0)
2095 		return got_error(GOT_ERR_ANCESTRY);
2096 
2097 	free(yca_id);
2098 	return NULL;
2099 }
2100 
2101 static const struct got_error *
2102 check_same_branch(struct got_object_id *commit_id,
2103     struct got_reference *head_ref, struct got_repository *repo)
2104 {
2105 	const struct got_error *err = NULL;
2106 	struct got_commit_graph *graph = NULL;
2107 	struct got_object_id *head_commit_id = NULL;
2108 
2109 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
2110 	if (err)
2111 		goto done;
2112 
2113 	if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2114 		goto done;
2115 
2116 	err = got_commit_graph_open(&graph, "/", 1);
2117 	if (err)
2118 		goto done;
2119 
2120 	err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2121 	    check_cancelled, NULL);
2122 	if (err)
2123 		goto done;
2124 
2125 	for (;;) {
2126 		struct got_object_id id;
2127 
2128 		err = got_commit_graph_iter_next(&id, graph, repo,
2129 		    check_cancelled, NULL);
2130 		if (err) {
2131 			if (err->code == GOT_ERR_ITER_COMPLETED)
2132 				err = got_error(GOT_ERR_ANCESTRY);
2133 			break;
2134 		}
2135 
2136 		if (got_object_id_cmp(&id, commit_id) == 0)
2137 			break;
2138 	}
2139 done:
2140 	if (graph)
2141 		got_commit_graph_close(graph);
2142 	free(head_commit_id);
2143 	return err;
2144 }
2145 
2146 static const struct got_error *
2147 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2148 {
2149 	static char msg[512];
2150 	const char *branch_name;
2151 
2152 	if (got_ref_is_symbolic(ref))
2153 		branch_name = got_ref_get_symref_target(ref);
2154 	else
2155 		branch_name = got_ref_get_name(ref);
2156 
2157 	if (strncmp("refs/heads/", branch_name, 11) == 0)
2158 		branch_name += 11;
2159 
2160 	snprintf(msg, sizeof(msg),
2161 	    "target commit is not contained in branch '%s'; "
2162 	    "the branch to use must be specified with -b; "
2163 	    "if necessary a new branch can be created for "
2164 	    "this commit with 'got branch -c %s BRANCH_NAME'",
2165 	    branch_name, commit_id_str);
2166 
2167 	return got_error_msg(GOT_ERR_ANCESTRY, msg);
2168 }
2169 
2170 static const struct got_error *
2171 cmd_checkout(int argc, char *argv[])
2172 {
2173 	const struct got_error *error = NULL;
2174 	struct got_repository *repo = NULL;
2175 	struct got_reference *head_ref = NULL, *ref = NULL;
2176 	struct got_worktree *worktree = NULL;
2177 	char *repo_path = NULL;
2178 	char *worktree_path = NULL;
2179 	const char *path_prefix = "";
2180 	const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2181 	char *commit_id_str = NULL;
2182 	struct got_object_id *commit_id = NULL;
2183 	char *cwd = NULL;
2184 	int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2185 	struct got_pathlist_head paths;
2186 	struct got_checkout_progress_arg cpa;
2187 	int *pack_fds = NULL;
2188 
2189 	TAILQ_INIT(&paths);
2190 
2191 #ifndef PROFILE
2192 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2193 	    "unveil", NULL) == -1)
2194 		err(1, "pledge");
2195 #endif
2196 
2197 	while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2198 		switch (ch) {
2199 		case 'b':
2200 			branch_name = optarg;
2201 			break;
2202 		case 'c':
2203 			commit_id_str = strdup(optarg);
2204 			if (commit_id_str == NULL)
2205 				return got_error_from_errno("strdup");
2206 			break;
2207 		case 'E':
2208 			allow_nonempty = 1;
2209 			break;
2210 		case 'p':
2211 			path_prefix = optarg;
2212 			break;
2213 		case 'q':
2214 			verbosity = -1;
2215 			break;
2216 		default:
2217 			usage_checkout();
2218 			/* NOTREACHED */
2219 		}
2220 	}
2221 
2222 	argc -= optind;
2223 	argv += optind;
2224 
2225 	if (argc == 1) {
2226 		char *base, *dotgit;
2227 		const char *path;
2228 		repo_path = realpath(argv[0], NULL);
2229 		if (repo_path == NULL)
2230 			return got_error_from_errno2("realpath", argv[0]);
2231 		cwd = getcwd(NULL, 0);
2232 		if (cwd == NULL) {
2233 			error = got_error_from_errno("getcwd");
2234 			goto done;
2235 		}
2236 		if (path_prefix[0])
2237 			path = path_prefix;
2238 		else
2239 			path = repo_path;
2240 		error = got_path_basename(&base, path);
2241 		if (error)
2242 			goto done;
2243 		dotgit = strstr(base, ".git");
2244 		if (dotgit)
2245 			*dotgit = '\0';
2246 		if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2247 			error = got_error_from_errno("asprintf");
2248 			free(base);
2249 			goto done;
2250 		}
2251 		free(base);
2252 	} else if (argc == 2) {
2253 		repo_path = realpath(argv[0], NULL);
2254 		if (repo_path == NULL) {
2255 			error = got_error_from_errno2("realpath", argv[0]);
2256 			goto done;
2257 		}
2258 		worktree_path = realpath(argv[1], NULL);
2259 		if (worktree_path == NULL) {
2260 			if (errno != ENOENT) {
2261 				error = got_error_from_errno2("realpath",
2262 				    argv[1]);
2263 				goto done;
2264 			}
2265 			worktree_path = strdup(argv[1]);
2266 			if (worktree_path == NULL) {
2267 				error = got_error_from_errno("strdup");
2268 				goto done;
2269 			}
2270 		}
2271 	} else
2272 		usage_checkout();
2273 
2274 	got_path_strip_trailing_slashes(repo_path);
2275 	got_path_strip_trailing_slashes(worktree_path);
2276 
2277 	error = got_repo_pack_fds_open(&pack_fds);
2278 	if (error != NULL)
2279 		goto done;
2280 
2281 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2282 	if (error != NULL)
2283 		goto done;
2284 
2285 	/* Pre-create work tree path for unveil(2) */
2286 	error = got_path_mkdir(worktree_path);
2287 	if (error) {
2288 		if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2289 		    !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2290 			goto done;
2291 		if (!allow_nonempty &&
2292 		    !got_path_dir_is_empty(worktree_path)) {
2293 			error = got_error_path(worktree_path,
2294 			    GOT_ERR_DIR_NOT_EMPTY);
2295 			goto done;
2296 		}
2297 	}
2298 
2299 	error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2300 	if (error)
2301 		goto done;
2302 
2303 	error = got_ref_open(&head_ref, repo, branch_name, 0);
2304 	if (error != NULL)
2305 		goto done;
2306 
2307 	error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2308 	if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2309 		goto done;
2310 
2311 	error = got_worktree_open(&worktree, worktree_path);
2312 	if (error != NULL)
2313 		goto done;
2314 
2315 	error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2316 	    path_prefix);
2317 	if (error != NULL)
2318 		goto done;
2319 	if (!same_path_prefix) {
2320 		error = got_error(GOT_ERR_PATH_PREFIX);
2321 		goto done;
2322 	}
2323 
2324 	if (commit_id_str) {
2325 		struct got_reflist_head refs;
2326 		TAILQ_INIT(&refs);
2327 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2328 		    NULL);
2329 		if (error)
2330 			goto done;
2331 		error = got_repo_match_object_id(&commit_id, NULL,
2332 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2333 		got_ref_list_free(&refs);
2334 		if (error)
2335 			goto done;
2336 		error = check_linear_ancestry(commit_id,
2337 		    got_worktree_get_base_commit_id(worktree), 0, repo);
2338 		if (error != NULL) {
2339 			if (error->code == GOT_ERR_ANCESTRY) {
2340 				error = checkout_ancestry_error(
2341 				    head_ref, commit_id_str);
2342 			}
2343 			goto done;
2344 		}
2345 		error = check_same_branch(commit_id, head_ref, repo);
2346 		if (error) {
2347 			if (error->code == GOT_ERR_ANCESTRY) {
2348 				error = checkout_ancestry_error(
2349 				    head_ref, commit_id_str);
2350 			}
2351 			goto done;
2352 		}
2353 		error = got_worktree_set_base_commit_id(worktree, repo,
2354 		    commit_id);
2355 		if (error)
2356 			goto done;
2357 		/* Expand potentially abbreviated commit ID string. */
2358 		free(commit_id_str);
2359 		error = got_object_id_str(&commit_id_str, commit_id);
2360 		if (error)
2361 			goto done;
2362 	} else {
2363 		commit_id = got_object_id_dup(
2364 		    got_worktree_get_base_commit_id(worktree));
2365 		if (commit_id == NULL) {
2366 			error = got_error_from_errno("got_object_id_dup");
2367 			goto done;
2368 		}
2369 		error = got_object_id_str(&commit_id_str, commit_id);
2370 		if (error)
2371 			goto done;
2372 	}
2373 
2374 	error = got_pathlist_append(&paths, "", NULL);
2375 	if (error)
2376 		goto done;
2377 	cpa.worktree_path = worktree_path;
2378 	cpa.had_base_commit_ref_error = 0;
2379 	cpa.verbosity = verbosity;
2380 	error = got_worktree_checkout_files(worktree, &paths, repo,
2381 	    checkout_progress, &cpa, check_cancelled, NULL);
2382 	if (error != NULL)
2383 		goto done;
2384 
2385 	if (got_ref_is_symbolic(head_ref)) {
2386 		error = got_ref_resolve_symbolic(&ref, repo, head_ref);
2387 		if (error)
2388 			goto done;
2389 		refname = got_ref_get_name(ref);
2390 	} else
2391 		refname = got_ref_get_name(head_ref);
2392 	printf("Checked out %s: %s\n", refname, commit_id_str);
2393 	printf("Now shut up and hack\n");
2394 	if (cpa.had_base_commit_ref_error)
2395 		show_worktree_base_ref_warning();
2396 done:
2397 	if (pack_fds) {
2398 		const struct got_error *pack_err =
2399 		    got_repo_pack_fds_close(pack_fds);
2400 		if (error == NULL)
2401 			error = pack_err;
2402 	}
2403 	if (head_ref)
2404 		got_ref_close(head_ref);
2405 	if (ref)
2406 		got_ref_close(ref);
2407 	if (repo) {
2408 		const struct got_error *close_err = got_repo_close(repo);
2409 		if (error == NULL)
2410 			error = close_err;
2411 	}
2412 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
2413 	free(commit_id_str);
2414 	free(commit_id);
2415 	free(repo_path);
2416 	free(worktree_path);
2417 	free(cwd);
2418 	return error;
2419 }
2420 
2421 struct got_update_progress_arg {
2422 	int did_something;
2423 	int conflicts;
2424 	int obstructed;
2425 	int not_updated;
2426 	int missing;
2427 	int not_deleted;
2428 	int unversioned;
2429 	int verbosity;
2430 };
2431 
2432 static void
2433 print_update_progress_stats(struct got_update_progress_arg *upa)
2434 {
2435 	if (!upa->did_something)
2436 		return;
2437 
2438 	if (upa->conflicts > 0)
2439 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
2440 	if (upa->obstructed > 0)
2441 		printf("File paths obstructed by a non-regular file: %d\n",
2442 		    upa->obstructed);
2443 	if (upa->not_updated > 0)
2444 		printf("Files not updated because of existing merge "
2445 		    "conflicts: %d\n", upa->not_updated);
2446 }
2447 
2448 /*
2449  * The meaning of some status codes differs between merge-style operations and
2450  * update operations. For example, the ! status code means "file was missing"
2451  * if changes were merged into the work tree, and "missing file was restored"
2452  * if the work tree was updated. This function should be used by any operation
2453  * which merges changes into the work tree without updating the work tree.
2454  */
2455 static void
2456 print_merge_progress_stats(struct got_update_progress_arg *upa)
2457 {
2458 	if (!upa->did_something)
2459 		return;
2460 
2461 	if (upa->conflicts > 0)
2462 		printf("Files with new merge conflicts: %d\n", upa->conflicts);
2463 	if (upa->obstructed > 0)
2464 		printf("File paths obstructed by a non-regular file: %d\n",
2465 		    upa->obstructed);
2466 	if (upa->missing > 0)
2467 		printf("Files which had incoming changes but could not be "
2468 		    "found in the work tree: %d\n", upa->missing);
2469 	if (upa->not_deleted > 0)
2470 		printf("Files not deleted due to differences in deleted "
2471 		    "content: %d\n", upa->not_deleted);
2472 	if (upa->unversioned > 0)
2473 		printf("Files not merged because an unversioned file was "
2474 		    "found in the work tree: %d\n", upa->unversioned);
2475 }
2476 
2477 __dead static void
2478 usage_update(void)
2479 {
2480 	fprintf(stderr, "usage: %s update [-qtvX] [-c commit] [-r remote] "
2481 	    "[path ...]\n", getprogname());
2482 	exit(1);
2483 }
2484 
2485 static const struct got_error *
2486 update_progress(void *arg, unsigned char status, const char *path)
2487 {
2488 	struct got_update_progress_arg *upa = arg;
2489 
2490 	if (status == GOT_STATUS_EXISTS ||
2491 	    status == GOT_STATUS_BASE_REF_ERR)
2492 		return NULL;
2493 
2494 	upa->did_something = 1;
2495 
2496 	/* Base commit bump happens silently. */
2497 	if (status == GOT_STATUS_BUMP_BASE)
2498 		return NULL;
2499 
2500 	if (status == GOT_STATUS_CONFLICT)
2501 		upa->conflicts++;
2502 	if (status == GOT_STATUS_OBSTRUCTED)
2503 		upa->obstructed++;
2504 	if (status == GOT_STATUS_CANNOT_UPDATE)
2505 		upa->not_updated++;
2506 	if (status == GOT_STATUS_MISSING)
2507 		upa->missing++;
2508 	if (status == GOT_STATUS_CANNOT_DELETE)
2509 		upa->not_deleted++;
2510 	if (status == GOT_STATUS_UNVERSIONED)
2511 		upa->unversioned++;
2512 
2513 	while (path[0] == '/')
2514 		path++;
2515 	if (upa->verbosity >= 0)
2516 		printf("%c  %s\n", status, path);
2517 
2518 	return NULL;
2519 }
2520 
2521 static const struct got_error *
2522 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2523 {
2524 	const struct got_error *err;
2525 	int in_progress;
2526 
2527 	err = got_worktree_rebase_in_progress(&in_progress, worktree);
2528 	if (err)
2529 		return err;
2530 	if (in_progress)
2531 		return got_error(GOT_ERR_REBASING);
2532 
2533 	err = got_worktree_histedit_in_progress(&in_progress, worktree);
2534 	if (err)
2535 		return err;
2536 	if (in_progress)
2537 		return got_error(GOT_ERR_HISTEDIT_BUSY);
2538 
2539 	return NULL;
2540 }
2541 
2542 static const struct got_error *
2543 check_merge_in_progress(struct got_worktree *worktree,
2544     struct got_repository *repo)
2545 {
2546 	const struct got_error *err;
2547 	int in_progress;
2548 
2549 	err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
2550 	if (err)
2551 		return err;
2552 	if (in_progress)
2553 		return got_error(GOT_ERR_MERGE_BUSY);
2554 
2555 	return NULL;
2556 }
2557 
2558 static const struct got_error *
2559 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2560     char *argv[], struct got_worktree *worktree)
2561 {
2562 	const struct got_error *err = NULL;
2563 	char *path;
2564 	struct got_pathlist_entry *new;
2565 	int i;
2566 
2567 	if (argc == 0) {
2568 		path = strdup("");
2569 		if (path == NULL)
2570 			return got_error_from_errno("strdup");
2571 		return got_pathlist_append(paths, path, NULL);
2572 	}
2573 
2574 	for (i = 0; i < argc; i++) {
2575 		err = got_worktree_resolve_path(&path, worktree, argv[i]);
2576 		if (err)
2577 			break;
2578 		err = got_pathlist_insert(&new, paths, path, NULL);
2579 		if (err || new == NULL /* duplicate */) {
2580 			free(path);
2581 			if (err)
2582 				break;
2583 		}
2584 	}
2585 
2586 	return err;
2587 }
2588 
2589 static const struct got_error *
2590 wrap_not_worktree_error(const struct got_error *orig_err,
2591     const char *cmdname, const char *path)
2592 {
2593 	const struct got_error *err;
2594 	struct got_repository *repo;
2595 	static char msg[512];
2596 	int *pack_fds = NULL;
2597 
2598 	err = got_repo_pack_fds_open(&pack_fds);
2599 	if (err)
2600 		return err;
2601 
2602 	err = got_repo_open(&repo, path, NULL, pack_fds);
2603 	if (err)
2604 		return orig_err;
2605 
2606 	snprintf(msg, sizeof(msg),
2607 	    "'got %s' needs a work tree in addition to a git repository\n"
2608 	    "Work trees can be checked out from this Git repository with "
2609 	    "'got checkout'.\n"
2610 	    "The got(1) manual page contains more information.", cmdname);
2611 	err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2612 	if (repo) {
2613 		const struct got_error *close_err = got_repo_close(repo);
2614 		if (err == NULL)
2615 			err = close_err;
2616 	}
2617 	if (pack_fds) {
2618 		const struct got_error *pack_err =
2619 		    got_repo_pack_fds_close(pack_fds);
2620 		if (err == NULL)
2621 			err = pack_err;
2622 	}
2623 	return err;
2624 }
2625 
2626 static const struct got_error *
2627 cmd_update(int argc, char *argv[])
2628 {
2629 	const struct got_error *error = NULL, *unlock_err;
2630 	char *worktree_path = NULL;
2631 	const char *repo_path = NULL;
2632 	const char *remote_name = NULL;
2633 	char *proto = NULL, *host = NULL, *port = NULL;
2634 	char *repo_name = NULL, *server_path = NULL;
2635 	const struct got_remote_repo *remotes, *remote = NULL;
2636 	int nremotes;
2637 	char *id_str = NULL;
2638 	struct got_repository *repo = NULL;
2639 	struct got_worktree *worktree = NULL;
2640 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2641 	struct got_pathlist_head paths, refs, symrefs;
2642 	struct got_pathlist_head wanted_branches, wanted_refs;
2643 	struct got_pathlist_entry *pe;
2644 	struct got_reflist_head remote_refs;
2645 	struct got_reflist_entry *re;
2646 	struct got_object_id *pack_hash = NULL;
2647 	int i, ch, fetchfd = -1, fetchstatus;
2648 	pid_t fetchpid = -1;
2649 	struct got_fetch_progress_arg fpa;
2650 	struct got_update_progress_arg upa;
2651 	int verbosity = 0;
2652 	int delete_remote = 0;
2653 	int replace_tags = 0;
2654 	int *pack_fds = NULL;
2655 	const char *remote_head = NULL, *worktree_branch = NULL;
2656 	struct got_object_id *commit_id = NULL;
2657 	char *commit_id_str = NULL;
2658 	const char *refname;
2659 	struct got_reference *head_ref = NULL;
2660 
2661 	TAILQ_INIT(&paths);
2662 	TAILQ_INIT(&refs);
2663 	TAILQ_INIT(&symrefs);
2664 	TAILQ_INIT(&remote_refs);
2665 	TAILQ_INIT(&wanted_branches);
2666 	TAILQ_INIT(&wanted_refs);
2667 
2668 	while ((ch = getopt(argc, argv, "c:qr:vX")) != -1) {
2669 		switch (ch) {
2670 		case 'c':
2671 			commit_id_str = strdup(optarg);
2672 			if (commit_id_str == NULL)
2673 				return got_error_from_errno("strdup");
2674 			break;
2675 		case 't':
2676 			replace_tags = 1;
2677 			break;
2678 		case 'q':
2679 			verbosity = -1;
2680 			break;
2681 		case 'r':
2682 			remote_name = optarg;
2683 			break;
2684 		case 'v':
2685 			if (verbosity < 0)
2686 				verbosity = 0;
2687 			else if (verbosity < 3)
2688 				verbosity++;
2689 			break;
2690 		case 'X':
2691 			delete_remote = 1;
2692 			break;
2693 		default:
2694 			usage_update();
2695 			break;
2696 		}
2697 	}
2698 	argc -= optind;
2699 	argv += optind;
2700 
2701 	if (delete_remote) {
2702 		if (replace_tags)
2703 			option_conflict('X', 't');
2704 		if (remote_name == NULL)
2705 			errx(1, "-X option requires a remote name");
2706 	}
2707 	if (remote_name == NULL)
2708 		remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2709 
2710 	worktree_path = getcwd(NULL, 0);
2711 	if (worktree_path == NULL) {
2712 		error = got_error_from_errno("getcwd");
2713 		goto done;
2714 	}
2715 	error = got_worktree_open(&worktree, worktree_path);
2716 	if (error) {
2717 		if (error->code == GOT_ERR_NOT_WORKTREE)
2718 			error = wrap_not_worktree_error(error, "update",
2719 			    worktree_path);
2720 		goto done;
2721 	}
2722 	repo_path = got_worktree_get_repo_path(worktree);
2723 
2724 	error = got_repo_pack_fds_open(&pack_fds);
2725 	if (error != NULL)
2726 		goto done;
2727 
2728 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2729 	if (error)
2730 		goto done;
2731 
2732 	error = check_rebase_or_histedit_in_progress(worktree);
2733 	if (error)
2734 		goto done;
2735 	error = check_merge_in_progress(worktree, repo);
2736 	if (error)
2737 		goto done;
2738 
2739 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2740 	if (error)
2741 		goto done;
2742 
2743 	worktree_conf = got_worktree_get_gotconfig(worktree);
2744 	if (worktree_conf) {
2745 		got_gotconfig_get_remotes(&nremotes, &remotes,
2746 		    worktree_conf);
2747 		for (i = 0; i < nremotes; i++) {
2748 			if (strcmp(remotes[i].name, remote_name) == 0) {
2749 				remote = &remotes[i];
2750 				break;
2751 			}
2752 		}
2753 	}
2754 
2755 	if (remote == NULL) {
2756 		repo_conf = got_repo_get_gotconfig(repo);
2757 		if (repo_conf) {
2758 			got_gotconfig_get_remotes(&nremotes, &remotes,
2759 			    repo_conf);
2760 			for (i = 0; i < nremotes; i++) {
2761 				if (strcmp(remotes[i].name, remote_name) == 0) {
2762 					remote = &remotes[i];
2763 					break;
2764 				}
2765 			}
2766 		}
2767 	}
2768 	if (remote == NULL) {
2769 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2770 		for (i = 0; i < nremotes; i++) {
2771 			if (strcmp(remotes[i].name, remote_name) == 0) {
2772 				remote = &remotes[i];
2773 				break;
2774 			}
2775 		}
2776 	}
2777 	if (remote == NULL) {
2778 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2779 		goto done;
2780 	}
2781 
2782 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2783 	    &repo_name, remote->fetch_url);
2784 	if (error)
2785 		goto done;
2786 
2787 	if (strcmp(proto, "git") == 0) {
2788 #ifndef PROFILE
2789 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2790 		    "sendfd dns inet unveil", NULL) == -1)
2791 			err(1, "pledge");
2792 #endif
2793 	} else if (strcmp(proto, "git+ssh") == 0 ||
2794 	    strcmp(proto, "ssh") == 0) {
2795 #ifndef PROFILE
2796 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2797 		    "sendfd unveil", NULL) == -1)
2798 			err(1, "pledge");
2799 #endif
2800 	} else if (strcmp(proto, "http") == 0 ||
2801 	    strcmp(proto, "git+http") == 0) {
2802 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2803 		goto done;
2804 	} else {
2805 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2806 		goto done;
2807 	}
2808 
2809 	error = got_dial_apply_unveil(proto);
2810 	if (error)
2811 		goto done;
2812 
2813 	error = apply_unveil(got_repo_get_path(repo), 0,
2814 	    got_worktree_get_root_path(worktree));
2815 	if (error)
2816 		goto done;
2817 
2818 	if (verbosity >= 0) {
2819 		printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2820 		    remote->name, proto, host,
2821 		    port ? ":" : "", port ? port : "",
2822 		    *server_path == '/' ? "" : "/", server_path);
2823 	}
2824 
2825 	error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2826 	    server_path, verbosity);
2827 	if (error)
2828 		goto done;
2829 
2830 	/*
2831 	 * If set, get this remote's HEAD ref target so
2832 	 * if it has changed on the server we can fetch it.
2833 	 */
2834 	error = got_ref_list(&remote_refs, repo, "refs/remotes",
2835 	    got_ref_cmp_by_name, repo);
2836 	if (error)
2837 		goto done;
2838 
2839 	TAILQ_FOREACH(re, &remote_refs, entry) {
2840 		const char	*remote_refname, *remote_target;
2841 		size_t		 remote_name_len;
2842 
2843 		if (!got_ref_is_symbolic(re->ref))
2844 			continue;
2845 
2846 		remote_name_len = strlen(remote->name);
2847 		remote_refname = got_ref_get_name(re->ref);
2848 
2849 		/* we only want refs/remotes/$remote->name/HEAD */
2850 		if (strncmp(remote_refname + 13, remote->name,
2851 		    remote_name_len) != 0)
2852 			continue;
2853 
2854 		if (strcmp(remote_refname + remote_name_len + 14,
2855 		    GOT_REF_HEAD) != 0)
2856 			continue;
2857 
2858 		/*
2859 		 * Take the name itself because we already
2860 		 * only match with refs/heads/ in fetch_pack().
2861 		 */
2862 		remote_target = got_ref_get_symref_target(re->ref);
2863 		remote_head = remote_target + remote_name_len + 14;
2864 		break;
2865 	}
2866 
2867 	refname = got_worktree_get_head_ref_name(worktree);
2868 	if (strncmp(refname, "refs/heads/", 11) == 0)
2869 		worktree_branch = refname;
2870 
2871 	fpa.last_scaled_size[0] = '\0';
2872 	fpa.last_p_indexed = -1;
2873 	fpa.last_p_resolved = -1;
2874 	fpa.verbosity = verbosity;
2875 	fpa.repo = repo;
2876 	fpa.create_configs = 0;
2877 	fpa.configs_created = 0;
2878 	memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2879 
2880 	error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2881 	    remote->mirror_references, 0, &wanted_branches, &wanted_refs,
2882 	    0, verbosity, fetchfd, repo, worktree_branch, remote_head,
2883 	    0, fetch_progress, &fpa);
2884 	if (error)
2885 		goto done;
2886 
2887 	if (pack_hash != NULL && verbosity >= 0) {
2888 		error = got_object_id_str(&id_str, pack_hash);
2889 		if (error)
2890 			goto done;
2891 		printf("\nFetched %s.pack\n", id_str);
2892 		free(id_str);
2893 		id_str = NULL;
2894 	}
2895 
2896 	/* Update references provided with the pack file. */
2897 	TAILQ_FOREACH(pe, &refs, entry) {
2898 		const char *refname = pe->path;
2899 		struct got_object_id *id = pe->data;
2900 		struct got_reference *ref;
2901 
2902 		if (is_wanted_ref(&wanted_refs, refname)) {
2903 			error = update_wanted_ref(refname, id,
2904 			    remote->name, verbosity, repo);
2905 			if (error)
2906 				goto done;
2907 			continue;
2908 		}
2909 
2910 		error = got_ref_open(&ref, repo, refname, 1);
2911 		if (error) {
2912 			if (error->code != GOT_ERR_NOT_REF)
2913 				goto done;
2914 			error = create_ref(refname, id, verbosity,
2915 			    repo);
2916 			if (error)
2917 				goto done;
2918 		} else {
2919 			error = update_ref(ref, id, replace_tags,
2920 			    verbosity-1, repo);
2921 			unlock_err = got_ref_unlock(ref);
2922 			if (unlock_err && error == NULL)
2923 				error = unlock_err;
2924 			got_ref_close(ref);
2925 			if (error)
2926 				goto done;
2927 		}
2928 	}
2929 
2930 	/* Update worktree */
2931 	error = got_ref_open(&head_ref, repo,
2932 	    got_worktree_get_head_ref_name(worktree), 0);
2933 	if (error != NULL)
2934 		goto done;
2935 	if (commit_id_str == NULL) {
2936 		error = got_ref_resolve(&commit_id, repo, head_ref);
2937 		if (error != NULL)
2938 			goto done;
2939 		error = got_object_id_str(&commit_id_str, commit_id);
2940 		if (error != NULL)
2941 			goto done;
2942 	} else {
2943 		struct got_reflist_head refs;
2944 		TAILQ_INIT(&refs);
2945 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2946 		    NULL);
2947 		if (error)
2948 			goto done;
2949 		error = got_repo_match_object_id(&commit_id, NULL,
2950 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2951 		got_ref_list_free(&refs);
2952 		free(commit_id_str);
2953 		commit_id_str = NULL;
2954 		if (error)
2955 			goto done;
2956 		error = got_object_id_str(&commit_id_str, commit_id);
2957 		if (error)
2958 			goto done;
2959 	}
2960 
2961 
2962 	error = check_linear_ancestry(commit_id,
2963 	    got_worktree_get_base_commit_id(worktree), 0, repo);
2964 	if (error != NULL) {
2965 		if (error->code == GOT_ERR_ANCESTRY)
2966 			error = got_error(GOT_ERR_BRANCH_MOVED);
2967 		goto done;
2968 	}
2969 	error = check_same_branch(commit_id, head_ref, repo);
2970 	if (error)
2971 		goto done;
2972 
2973 	if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2974 	    commit_id) != 0) {
2975 		error = got_worktree_set_base_commit_id(worktree, repo,
2976 		    commit_id);
2977 		if (error)
2978 			goto done;
2979 	}
2980 
2981 	memset(&upa, 0, sizeof(upa));
2982 	upa.verbosity = verbosity;
2983 	error = got_worktree_checkout_files(worktree, &paths, repo,
2984 	    update_progress, &upa, check_cancelled, NULL);
2985 	if (error != NULL)
2986 		goto done;
2987 
2988 	if (upa.did_something) {
2989 		printf("Updated to %s: %s\n",
2990 		    got_worktree_get_head_ref_name(worktree), commit_id_str);
2991 	} else
2992 		printf("Already up-to-date\n");
2993 
2994 	print_update_progress_stats(&upa);
2995 done:
2996 	if (fetchpid > 0) {
2997 		if (kill(fetchpid, SIGTERM) == -1)
2998 			error = got_error_from_errno("kill");
2999 		if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
3000 			error = got_error_from_errno("waitpid");
3001 	}
3002 	if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
3003 		error = got_error_from_errno("close");
3004 	if (repo) {
3005 		const struct got_error *close_err = got_repo_close(repo);
3006 		if (error == NULL)
3007 			error = close_err;
3008 	}
3009 	if (worktree)
3010 		got_worktree_close(worktree);
3011 	if (pack_fds) {
3012 		const struct got_error *pack_err =
3013 		    got_repo_pack_fds_close(pack_fds);
3014 		if (error == NULL)
3015 			error = pack_err;
3016 	}
3017 	got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3018 	got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
3019 	got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
3020 	got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
3021 	got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
3022 	got_ref_list_free(&remote_refs);
3023 	free(id_str);
3024 	free(worktree_path);
3025 	free(pack_hash);
3026 	free(proto);
3027 	free(host);
3028 	free(port);
3029 	free(server_path);
3030 	free(repo_name);
3031 	free(commit_id);
3032 	free(commit_id_str);
3033 	return error;
3034 }
3035 
3036 static const struct got_error *
3037 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3038     const char *path, int diff_context, int ignore_whitespace,
3039     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3040     struct got_repository *repo, FILE *outfile)
3041 {
3042 	const struct got_error *err = NULL;
3043 	struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3044 	FILE *f1 = NULL, *f2 = NULL;
3045 	int fd1 = -1, fd2 = -1;
3046 
3047 	fd1 = got_opentempfd();
3048 	if (fd1 == -1)
3049 		return got_error_from_errno("got_opentempfd");
3050 	fd2 = got_opentempfd();
3051 	if (fd2 == -1) {
3052 		err = got_error_from_errno("got_opentempfd");
3053 		goto done;
3054 	}
3055 
3056 	if (blob_id1) {
3057 		err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3058 		    fd1);
3059 		if (err)
3060 			goto done;
3061 	}
3062 
3063 	err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3064 	if (err)
3065 		goto done;
3066 
3067 	f1 = got_opentemp();
3068 	if (f1 == NULL) {
3069 		err = got_error_from_errno("got_opentemp");
3070 		goto done;
3071 	}
3072 	f2 = got_opentemp();
3073 	if (f2 == NULL) {
3074 		err = got_error_from_errno("got_opentemp");
3075 		goto done;
3076 	}
3077 
3078 	while (path[0] == '/')
3079 		path++;
3080 	err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3081 	    GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3082 	    force_text_diff, dsa, outfile);
3083 done:
3084 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3085 		err = got_error_from_errno("close");
3086 	if (blob1)
3087 		got_object_blob_close(blob1);
3088 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3089 		err = got_error_from_errno("close");
3090 	if (blob2)
3091 		got_object_blob_close(blob2);
3092 	if (f1 && fclose(f1) == EOF && err == NULL)
3093 		err = got_error_from_errno("fclose");
3094 	if (f2 && fclose(f2) == EOF && err == NULL)
3095 		err = got_error_from_errno("fclose");
3096 	return err;
3097 }
3098 
3099 static const struct got_error *
3100 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3101     const char *path, int diff_context, int ignore_whitespace,
3102     int force_text_diff, struct got_diffstat_cb_arg *dsa,
3103     struct got_repository *repo, FILE *outfile)
3104 {
3105 	const struct got_error *err = NULL;
3106 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3107 	struct got_diff_blob_output_unidiff_arg arg;
3108 	FILE *f1 = NULL, *f2 = NULL;
3109 	int fd1 = -1, fd2 = -1;
3110 
3111 	if (tree_id1) {
3112 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3113 		if (err)
3114 			goto done;
3115 		fd1 = got_opentempfd();
3116 		if (fd1 == -1) {
3117 			err = got_error_from_errno("got_opentempfd");
3118 			goto done;
3119 		}
3120 	}
3121 
3122 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3123 	if (err)
3124 		goto done;
3125 
3126 	f1 = got_opentemp();
3127 	if (f1 == NULL) {
3128 		err = got_error_from_errno("got_opentemp");
3129 		goto done;
3130 	}
3131 
3132 	f2 = got_opentemp();
3133 	if (f2 == NULL) {
3134 		err = got_error_from_errno("got_opentemp");
3135 		goto done;
3136 	}
3137 	fd2 = got_opentempfd();
3138 	if (fd2 == -1) {
3139 		err = got_error_from_errno("got_opentempfd");
3140 		goto done;
3141 	}
3142 	arg.diff_context = diff_context;
3143 	arg.ignore_whitespace = ignore_whitespace;
3144 	arg.force_text_diff = force_text_diff;
3145 	arg.diffstat = dsa;
3146 	arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3147 	arg.outfile = outfile;
3148 	arg.lines = NULL;
3149 	arg.nlines = 0;
3150 	while (path[0] == '/')
3151 		path++;
3152 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3153 	    got_diff_blob_output_unidiff, &arg, 1);
3154 done:
3155 	if (tree1)
3156 		got_object_tree_close(tree1);
3157 	if (tree2)
3158 		got_object_tree_close(tree2);
3159 	if (f1 && fclose(f1) == EOF && err == NULL)
3160 		err = got_error_from_errno("fclose");
3161 	if (f2 && fclose(f2) == EOF && err == NULL)
3162 		err = got_error_from_errno("fclose");
3163 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3164 		err = got_error_from_errno("close");
3165 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3166 		err = got_error_from_errno("close");
3167 	return err;
3168 }
3169 
3170 static const struct got_error *
3171 get_changed_paths(struct got_pathlist_head *paths,
3172     struct got_commit_object *commit, struct got_repository *repo,
3173     struct got_diffstat_cb_arg *dsa)
3174 {
3175 	const struct got_error *err = NULL;
3176 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3177 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3178 	struct got_object_qid *qid;
3179 	got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3180 	FILE *f1 = NULL, *f2 = NULL;
3181 	int fd1 = -1, fd2 = -1;
3182 
3183 	if (dsa) {
3184 		cb = got_diff_tree_compute_diffstat;
3185 
3186 		f1 = got_opentemp();
3187 		if (f1 == NULL) {
3188 			err = got_error_from_errno("got_opentemp");
3189 			goto done;
3190 		}
3191 		f2 = got_opentemp();
3192 		if (f2 == NULL) {
3193 			err = got_error_from_errno("got_opentemp");
3194 			goto done;
3195 		}
3196 		fd1 = got_opentempfd();
3197 		if (fd1 == -1) {
3198 			err = got_error_from_errno("got_opentempfd");
3199 			goto done;
3200 		}
3201 		fd2 = got_opentempfd();
3202 		if (fd2 == -1) {
3203 			err = got_error_from_errno("got_opentempfd");
3204 			goto done;
3205 		}
3206 	}
3207 
3208 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3209 	if (qid != NULL) {
3210 		struct got_commit_object *pcommit;
3211 		err = got_object_open_as_commit(&pcommit, repo,
3212 		    &qid->id);
3213 		if (err)
3214 			return err;
3215 
3216 		tree_id1 = got_object_id_dup(
3217 		    got_object_commit_get_tree_id(pcommit));
3218 		if (tree_id1 == NULL) {
3219 			got_object_commit_close(pcommit);
3220 			return got_error_from_errno("got_object_id_dup");
3221 		}
3222 		got_object_commit_close(pcommit);
3223 
3224 	}
3225 
3226 	if (tree_id1) {
3227 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3228 		if (err)
3229 			goto done;
3230 	}
3231 
3232 	tree_id2 = got_object_commit_get_tree_id(commit);
3233 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3234 	if (err)
3235 		goto done;
3236 
3237 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3238 	    cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3239 done:
3240 	if (tree1)
3241 		got_object_tree_close(tree1);
3242 	if (tree2)
3243 		got_object_tree_close(tree2);
3244 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3245 		err = got_error_from_errno("close");
3246 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3247 		err = got_error_from_errno("close");
3248 	if (f1 && fclose(f1) == EOF && err == NULL)
3249 		err = got_error_from_errno("fclose");
3250 	if (f2 && fclose(f2) == EOF && err == NULL)
3251 		err = got_error_from_errno("fclose");
3252 	free(tree_id1);
3253 	return err;
3254 }
3255 
3256 static const struct got_error *
3257 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3258     const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3259     struct got_repository *repo, FILE *outfile)
3260 {
3261 	const struct got_error *err = NULL;
3262 	struct got_commit_object *pcommit = NULL;
3263 	char *id_str1 = NULL, *id_str2 = NULL;
3264 	struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3265 	struct got_object_qid *qid;
3266 
3267 	qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3268 	if (qid != NULL) {
3269 		err = got_object_open_as_commit(&pcommit, repo,
3270 		    &qid->id);
3271 		if (err)
3272 			return err;
3273 		err = got_object_id_str(&id_str1, &qid->id);
3274 		if (err)
3275 			goto done;
3276 	}
3277 
3278 	err = got_object_id_str(&id_str2, id);
3279 	if (err)
3280 		goto done;
3281 
3282 	if (path && path[0] != '\0') {
3283 		int obj_type;
3284 		err = got_object_id_by_path(&obj_id2, repo, commit, path);
3285 		if (err)
3286 			goto done;
3287 		if (pcommit) {
3288 			err = got_object_id_by_path(&obj_id1, repo,
3289 			    pcommit, path);
3290 			if (err) {
3291 				if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3292 					free(obj_id2);
3293 					goto done;
3294 				}
3295 			}
3296 		}
3297 		err = got_object_get_type(&obj_type, repo, obj_id2);
3298 		if (err) {
3299 			free(obj_id2);
3300 			goto done;
3301 		}
3302 		fprintf(outfile,
3303 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3304 		fprintf(outfile, "commit - %s\n",
3305 		    id_str1 ? id_str1 : "/dev/null");
3306 		fprintf(outfile, "commit + %s\n", id_str2);
3307 		switch (obj_type) {
3308 		case GOT_OBJ_TYPE_BLOB:
3309 			err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3310 			    0, 0, dsa, repo, outfile);
3311 			break;
3312 		case GOT_OBJ_TYPE_TREE:
3313 			err = diff_trees(obj_id1, obj_id2, path, diff_context,
3314 			    0, 0, dsa, repo, outfile);
3315 			break;
3316 		default:
3317 			err = got_error(GOT_ERR_OBJ_TYPE);
3318 			break;
3319 		}
3320 		free(obj_id1);
3321 		free(obj_id2);
3322 	} else {
3323 		obj_id2 = got_object_commit_get_tree_id(commit);
3324 		if (pcommit)
3325 			obj_id1 = got_object_commit_get_tree_id(pcommit);
3326 		fprintf(outfile,
3327 		    "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3328 		fprintf(outfile, "commit - %s\n",
3329 		    id_str1 ? id_str1 : "/dev/null");
3330 		fprintf(outfile, "commit + %s\n", id_str2);
3331 		err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3332 		    dsa, repo, outfile);
3333 	}
3334 done:
3335 	free(id_str1);
3336 	free(id_str2);
3337 	if (pcommit)
3338 		got_object_commit_close(pcommit);
3339 	return err;
3340 }
3341 
3342 static char *
3343 get_datestr(time_t *time, char *datebuf)
3344 {
3345 	struct tm mytm, *tm;
3346 	char *p, *s;
3347 
3348 	tm = gmtime_r(time, &mytm);
3349 	if (tm == NULL)
3350 		return NULL;
3351 	s = asctime_r(tm, datebuf);
3352 	if (s == NULL)
3353 		return NULL;
3354 	p = strchr(s, '\n');
3355 	if (p)
3356 		*p = '\0';
3357 	return s;
3358 }
3359 
3360 static const struct got_error *
3361 match_commit(int *have_match, struct got_object_id *id,
3362     struct got_commit_object *commit, regex_t *regex)
3363 {
3364 	const struct got_error *err = NULL;
3365 	regmatch_t regmatch;
3366 	char *id_str = NULL, *logmsg = NULL;
3367 
3368 	*have_match = 0;
3369 
3370 	err = got_object_id_str(&id_str, id);
3371 	if (err)
3372 		return err;
3373 
3374 	err = got_object_commit_get_logmsg(&logmsg, commit);
3375 	if (err)
3376 		goto done;
3377 
3378 	if (regexec(regex, got_object_commit_get_author(commit), 1,
3379 	    &regmatch, 0) == 0 ||
3380 	    regexec(regex, got_object_commit_get_committer(commit), 1,
3381 	    &regmatch, 0) == 0 ||
3382 	    regexec(regex, id_str, 1, &regmatch, 0) == 0 ||
3383 	    regexec(regex, logmsg, 1, &regmatch, 0) == 0)
3384 		*have_match = 1;
3385 done:
3386 	free(id_str);
3387 	free(logmsg);
3388 	return err;
3389 }
3390 
3391 static void
3392 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3393     regex_t *regex)
3394 {
3395 	regmatch_t regmatch;
3396 	struct got_pathlist_entry *pe;
3397 
3398 	*have_match = 0;
3399 
3400 	TAILQ_FOREACH(pe, changed_paths, entry) {
3401 		if (regexec(regex, pe->path, 1, &regmatch, 0) == 0) {
3402 			*have_match = 1;
3403 			break;
3404 		}
3405 	}
3406 }
3407 
3408 static const struct got_error *
3409 match_patch(int *have_match, struct got_commit_object *commit,
3410     struct got_object_id *id, const char *path, int diff_context,
3411     struct got_repository *repo, regex_t *regex, FILE *f)
3412 {
3413 	const struct got_error *err = NULL;
3414 	char *line = NULL;
3415 	size_t linesize = 0;
3416 	regmatch_t regmatch;
3417 
3418 	*have_match = 0;
3419 
3420 	err = got_opentemp_truncate(f);
3421 	if (err)
3422 		return err;
3423 
3424 	err = print_patch(commit, id, path, diff_context, NULL, repo, f);
3425 	if (err)
3426 		goto done;
3427 
3428 	if (fseeko(f, 0L, SEEK_SET) == -1) {
3429 		err = got_error_from_errno("fseeko");
3430 		goto done;
3431 	}
3432 
3433 	while (getline(&line, &linesize, f) != -1) {
3434 		if (regexec(regex, line, 1, &regmatch, 0) == 0) {
3435 			*have_match = 1;
3436 			break;
3437 		}
3438 	}
3439 done:
3440 	free(line);
3441 	return err;
3442 }
3443 
3444 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3445 
3446 static const struct got_error*
3447 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3448     struct got_object_id *id, struct got_repository *repo,
3449     int local_only)
3450 {
3451 	static const struct got_error *err = NULL;
3452 	struct got_reflist_entry *re;
3453 	char *s;
3454 	const char *name;
3455 
3456 	*refs_str = NULL;
3457 
3458 	TAILQ_FOREACH(re, refs, entry) {
3459 		struct got_tag_object *tag = NULL;
3460 		struct got_object_id *ref_id;
3461 		int cmp;
3462 
3463 		name = got_ref_get_name(re->ref);
3464 		if (strcmp(name, GOT_REF_HEAD) == 0)
3465 			continue;
3466 		if (strncmp(name, "refs/", 5) == 0)
3467 			name += 5;
3468 		if (strncmp(name, "got/", 4) == 0)
3469 			continue;
3470 		if (strncmp(name, "heads/", 6) == 0)
3471 			name += 6;
3472 		if (strncmp(name, "remotes/", 8) == 0) {
3473 			if (local_only)
3474 				continue;
3475 			name += 8;
3476 			s = strstr(name, "/" GOT_REF_HEAD);
3477 			if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
3478 				continue;
3479 		}
3480 		err = got_ref_resolve(&ref_id, repo, re->ref);
3481 		if (err)
3482 			break;
3483 		if (strncmp(name, "tags/", 5) == 0) {
3484 			err = got_object_open_as_tag(&tag, repo, ref_id);
3485 			if (err) {
3486 				if (err->code != GOT_ERR_OBJ_TYPE) {
3487 					free(ref_id);
3488 					break;
3489 				}
3490 				/* Ref points at something other than a tag. */
3491 				err = NULL;
3492 				tag = NULL;
3493 			}
3494 		}
3495 		cmp = got_object_id_cmp(tag ?
3496 		    got_object_tag_get_object_id(tag) : ref_id, id);
3497 		free(ref_id);
3498 		if (tag)
3499 			got_object_tag_close(tag);
3500 		if (cmp != 0)
3501 			continue;
3502 		s = *refs_str;
3503 		if (asprintf(refs_str, "%s%s%s", s ? s : "",
3504 		    s ? ", " : "", name) == -1) {
3505 			err = got_error_from_errno("asprintf");
3506 			free(s);
3507 			*refs_str = NULL;
3508 			break;
3509 		}
3510 		free(s);
3511 	}
3512 
3513 	return err;
3514 }
3515 
3516 static const struct got_error *
3517 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3518     struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3519 {
3520 	const struct got_error *err = NULL;
3521 	char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3522 	char *comma, *s, *nl;
3523 	struct got_reflist_head *refs;
3524 	char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3525 	struct tm tm;
3526 	time_t committer_time;
3527 
3528 	refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3529 	if (refs) {
3530 		err = build_refs_str(&ref_str, refs, id, repo, 1);
3531 		if (err)
3532 			return err;
3533 
3534 		/* Display the first matching ref only. */
3535 		if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3536 			*comma = '\0';
3537 	}
3538 
3539 	if (ref_str == NULL) {
3540 		err = got_object_id_str(&id_str, id);
3541 		if (err)
3542 			return err;
3543 	}
3544 
3545 	committer_time = got_object_commit_get_committer_time(commit);
3546 	if (gmtime_r(&committer_time, &tm) == NULL) {
3547 		err = got_error_from_errno("gmtime_r");
3548 		goto done;
3549 	}
3550 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3551 		err = got_error(GOT_ERR_NO_SPACE);
3552 		goto done;
3553 	}
3554 
3555 	err = got_object_commit_get_logmsg(&logmsg0, commit);
3556 	if (err)
3557 		goto done;
3558 
3559 	s = logmsg0;
3560 	while (isspace((unsigned char)s[0]))
3561 		s++;
3562 
3563 	nl = strchr(s, '\n');
3564 	if (nl) {
3565 		*nl = '\0';
3566 	}
3567 
3568 	if (ref_str)
3569 		printf("%s%-7s %s\n", datebuf, ref_str, s);
3570 	else
3571 		printf("%s%.7s %s\n", datebuf, id_str, s);
3572 
3573 	if (fflush(stdout) != 0 && err == NULL)
3574 		err = got_error_from_errno("fflush");
3575 done:
3576 	free(id_str);
3577 	free(ref_str);
3578 	free(logmsg0);
3579 	return err;
3580 }
3581 
3582 static const struct got_error *
3583 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
3584 {
3585 	struct got_pathlist_entry *pe;
3586 
3587 	if (header != NULL)
3588 		printf("%s\n", header);
3589 
3590 	TAILQ_FOREACH(pe, dsa->paths, entry) {
3591 		struct got_diff_changed_path *cp = pe->data;
3592 		int pad = dsa->max_path_len - pe->path_len + 1;
3593 
3594 		printf(" %c  %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
3595 		    ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
3596 	}
3597 	printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
3598 	    dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
3599 	    dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
3600 
3601 	if (fflush(stdout) != 0)
3602 		return got_error_from_errno("fflush");
3603 
3604 	return NULL;
3605 }
3606 
3607 static const struct got_error *
3608 printfile(FILE *f)
3609 {
3610 	char	buf[8192];
3611 	size_t	r;
3612 
3613 	if (fseeko(f, 0L, SEEK_SET) == -1)
3614 		return got_error_from_errno("fseek");
3615 
3616 	for (;;) {
3617 		r = fread(buf, 1, sizeof(buf), f);
3618 		if (r == 0) {
3619 			if (ferror(f))
3620 				return got_error_from_errno("fread");
3621 			if (feof(f))
3622 				break;
3623 		}
3624 		if (fwrite(buf, 1, r, stdout) != r)
3625 			return got_ferror(stdout, GOT_ERR_IO);
3626 	}
3627 
3628 	return NULL;
3629 }
3630 
3631 static const struct got_error *
3632 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3633     struct got_repository *repo, const char *path,
3634     struct got_pathlist_head *changed_paths,
3635     struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
3636     struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
3637     const char *prefix)
3638 {
3639 	const struct got_error *err = NULL;
3640 	FILE *f = NULL;
3641 	char *id_str, *datestr, *logmsg0, *logmsg, *line;
3642 	char datebuf[26];
3643 	time_t committer_time;
3644 	const char *author, *committer;
3645 	char *refs_str = NULL;
3646 
3647 	err = got_object_id_str(&id_str, id);
3648 	if (err)
3649 		return err;
3650 
3651 	if (custom_refs_str == NULL) {
3652 		struct got_reflist_head *refs;
3653 		refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3654 		if (refs) {
3655 			err = build_refs_str(&refs_str, refs, id, repo, 0);
3656 			if (err)
3657 				goto done;
3658 		}
3659 	}
3660 
3661 	printf(GOT_COMMIT_SEP_STR);
3662 	if (custom_refs_str)
3663 		printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
3664 		    custom_refs_str);
3665 	else
3666 		printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
3667 		    refs_str ? " (" : "", refs_str ? refs_str : "",
3668 		    refs_str ? ")" : "");
3669 	free(id_str);
3670 	id_str = NULL;
3671 	free(refs_str);
3672 	refs_str = NULL;
3673 	printf("from: %s\n", got_object_commit_get_author(commit));
3674 	author = got_object_commit_get_author(commit);
3675 	committer = got_object_commit_get_committer(commit);
3676 	if (strcmp(author, committer) != 0)
3677 		printf("via: %s\n", committer);
3678 	committer_time = got_object_commit_get_committer_time(commit);
3679 	datestr = get_datestr(&committer_time, datebuf);
3680 	if (datestr)
3681 		printf("date: %s UTC\n", datestr);
3682 	if (got_object_commit_get_nparents(commit) > 1) {
3683 		const struct got_object_id_queue *parent_ids;
3684 		struct got_object_qid *qid;
3685 		int n = 1;
3686 		parent_ids = got_object_commit_get_parent_ids(commit);
3687 		STAILQ_FOREACH(qid, parent_ids, entry) {
3688 			err = got_object_id_str(&id_str, &qid->id);
3689 			if (err)
3690 				goto done;
3691 			printf("parent %d: %s\n", n++, id_str);
3692 			free(id_str);
3693 			id_str = NULL;
3694 		}
3695 	}
3696 
3697 	err = got_object_commit_get_logmsg(&logmsg0, commit);
3698 	if (err)
3699 		goto done;
3700 
3701 	logmsg = logmsg0;
3702 	do {
3703 		line = strsep(&logmsg, "\n");
3704 		if (line)
3705 			printf(" %s\n", line);
3706 	} while (line);
3707 	free(logmsg0);
3708 
3709 	if (changed_paths && diffstat == NULL) {
3710 		struct got_pathlist_entry *pe;
3711 
3712 		TAILQ_FOREACH(pe, changed_paths, entry) {
3713 			struct got_diff_changed_path *cp = pe->data;
3714 
3715 			printf(" %c  %s\n", cp->status, pe->path);
3716 		}
3717 		printf("\n");
3718 	}
3719 	if (show_patch) {
3720 		if (diffstat) {
3721 			f = got_opentemp();
3722 			if (f == NULL) {
3723 				err = got_error_from_errno("got_opentemp");
3724 				goto done;
3725 			}
3726 		}
3727 
3728 		err = print_patch(commit, id, path, diff_context, diffstat,
3729 		    repo, diffstat == NULL ? stdout : f);
3730 		if (err)
3731 			goto done;
3732 	}
3733 	if (diffstat) {
3734 		err = print_diffstat(diffstat, NULL);
3735 		if (err)
3736 			goto done;
3737 		if (show_patch) {
3738 			err = printfile(f);
3739 			if (err)
3740 				goto done;
3741 		}
3742 	}
3743 	if (show_patch)
3744 		printf("\n");
3745 
3746 	if (fflush(stdout) != 0 && err == NULL)
3747 		err = got_error_from_errno("fflush");
3748 done:
3749 	if (f && fclose(f) == EOF && err == NULL)
3750 		err = got_error_from_errno("fclose");
3751 	free(id_str);
3752 	free(refs_str);
3753 	return err;
3754 }
3755 
3756 static const struct got_error *
3757 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3758     struct got_repository *repo, const char *path, int show_changed_paths,
3759     int show_diffstat, int show_patch, const char *search_pattern,
3760     int diff_context, int limit, int log_branches, int reverse_display_order,
3761     struct got_reflist_object_id_map *refs_idmap, int one_line,
3762     FILE *tmpfile)
3763 {
3764 	const struct got_error *err;
3765 	struct got_commit_graph *graph;
3766 	regex_t regex;
3767 	int have_match;
3768 	struct got_object_id_queue reversed_commits;
3769 	struct got_object_qid *qid;
3770 	struct got_commit_object *commit;
3771 	struct got_pathlist_head changed_paths;
3772 
3773 	STAILQ_INIT(&reversed_commits);
3774 	TAILQ_INIT(&changed_paths);
3775 
3776 	if (search_pattern && regcomp(&regex, search_pattern,
3777 	    REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3778 		return got_error_msg(GOT_ERR_REGEX, search_pattern);
3779 
3780 	err = got_commit_graph_open(&graph, path, !log_branches);
3781 	if (err)
3782 		return err;
3783 	err = got_commit_graph_iter_start(graph, root_id, repo,
3784 	    check_cancelled, NULL);
3785 	if (err)
3786 		goto done;
3787 	for (;;) {
3788 		struct got_object_id id;
3789 		struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3790 		    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3791 
3792 		if (sigint_received || sigpipe_received)
3793 			break;
3794 
3795 		err = got_commit_graph_iter_next(&id, graph, repo,
3796 		    check_cancelled, NULL);
3797 		if (err) {
3798 			if (err->code == GOT_ERR_ITER_COMPLETED)
3799 				err = NULL;
3800 			break;
3801 		}
3802 
3803 		err = got_object_open_as_commit(&commit, repo, &id);
3804 		if (err)
3805 			break;
3806 
3807 		if ((show_changed_paths || (show_diffstat && !show_patch))
3808 		    && !reverse_display_order) {
3809 			err = get_changed_paths(&changed_paths, commit, repo,
3810 			    show_diffstat ? &dsa : NULL);
3811 			if (err)
3812 				break;
3813 		}
3814 
3815 		if (search_pattern) {
3816 			err = match_commit(&have_match, &id, commit, &regex);
3817 			if (err) {
3818 				got_object_commit_close(commit);
3819 				break;
3820 			}
3821 			if (have_match == 0 && show_changed_paths)
3822 				match_changed_paths(&have_match,
3823 				    &changed_paths, &regex);
3824 			if (have_match == 0 && show_patch) {
3825 				err = match_patch(&have_match, commit, &id,
3826 				    path, diff_context, repo, &regex, tmpfile);
3827 				if (err)
3828 					break;
3829 			}
3830 			if (have_match == 0) {
3831 				got_object_commit_close(commit);
3832 				got_pathlist_free(&changed_paths,
3833 				    GOT_PATHLIST_FREE_ALL);
3834 				continue;
3835 			}
3836 		}
3837 
3838 		if (reverse_display_order) {
3839 			err = got_object_qid_alloc(&qid, &id);
3840 			if (err)
3841 				break;
3842 			STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3843 			got_object_commit_close(commit);
3844 		} else {
3845 			if (one_line)
3846 				err = print_commit_oneline(commit, &id,
3847 				    repo, refs_idmap);
3848 			else
3849 				err = print_commit(commit, &id, repo, path,
3850 				    (show_changed_paths || show_diffstat) ?
3851 				    &changed_paths : NULL,
3852 				    show_diffstat ? &dsa : NULL, show_patch,
3853 				    diff_context, refs_idmap, NULL, NULL);
3854 			got_object_commit_close(commit);
3855 			if (err)
3856 				break;
3857 		}
3858 		if ((limit && --limit == 0) ||
3859 		    (end_id && got_object_id_cmp(&id, end_id) == 0))
3860 			break;
3861 
3862 		got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3863 	}
3864 	if (reverse_display_order) {
3865 		STAILQ_FOREACH(qid, &reversed_commits, entry) {
3866 			struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
3867 			    &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
3868 
3869 			err = got_object_open_as_commit(&commit, repo,
3870 			    &qid->id);
3871 			if (err)
3872 				break;
3873 			if (show_changed_paths ||
3874 			    (show_diffstat && !show_patch)) {
3875 				err = get_changed_paths(&changed_paths, commit,
3876 				    repo, show_diffstat ? &dsa : NULL);
3877 				if (err)
3878 					break;
3879 			}
3880 			if (one_line)
3881 				err = print_commit_oneline(commit, &qid->id,
3882 				    repo, refs_idmap);
3883 			else
3884 				err = print_commit(commit, &qid->id, repo, path,
3885 				    (show_changed_paths || show_diffstat) ?
3886 				    &changed_paths : NULL,
3887 				    show_diffstat ? &dsa : NULL, show_patch,
3888 				    diff_context, refs_idmap, NULL, NULL);
3889 			got_object_commit_close(commit);
3890 			if (err)
3891 				break;
3892 			got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3893 		}
3894 	}
3895 done:
3896 	while (!STAILQ_EMPTY(&reversed_commits)) {
3897 		qid = STAILQ_FIRST(&reversed_commits);
3898 		STAILQ_REMOVE_HEAD(&reversed_commits, entry);
3899 		got_object_qid_free(qid);
3900 	}
3901 	got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
3902 	if (search_pattern)
3903 		regfree(&regex);
3904 	got_commit_graph_close(graph);
3905 	return err;
3906 }
3907 
3908 __dead static void
3909 usage_log(void)
3910 {
3911 	fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
3912 	    "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
3913 	    "[path]\n", getprogname());
3914 	exit(1);
3915 }
3916 
3917 static int
3918 get_default_log_limit(void)
3919 {
3920 	const char *got_default_log_limit;
3921 	long long n;
3922 	const char *errstr;
3923 
3924 	got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3925 	if (got_default_log_limit == NULL)
3926 		return 0;
3927 	n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3928 	if (errstr != NULL)
3929 		return 0;
3930 	return n;
3931 }
3932 
3933 static const struct got_error *
3934 cmd_log(int argc, char *argv[])
3935 {
3936 	const struct got_error *error;
3937 	struct got_repository *repo = NULL;
3938 	struct got_worktree *worktree = NULL;
3939 	struct got_object_id *start_id = NULL, *end_id = NULL;
3940 	char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3941 	const char *start_commit = NULL, *end_commit = NULL;
3942 	const char *search_pattern = NULL;
3943 	int diff_context = -1, ch;
3944 	int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3945 	int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
3946 	const char *errstr;
3947 	struct got_reflist_head refs;
3948 	struct got_reflist_object_id_map *refs_idmap = NULL;
3949 	FILE *tmpfile = NULL;
3950 	int *pack_fds = NULL;
3951 
3952 	TAILQ_INIT(&refs);
3953 
3954 #ifndef PROFILE
3955 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3956 	    NULL)
3957 	    == -1)
3958 		err(1, "pledge");
3959 #endif
3960 
3961 	limit = get_default_log_limit();
3962 
3963 	while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
3964 		switch (ch) {
3965 		case 'b':
3966 			log_branches = 1;
3967 			break;
3968 		case 'C':
3969 			diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3970 			    &errstr);
3971 			if (errstr != NULL)
3972 				errx(1, "number of context lines is %s: %s",
3973 				    errstr, optarg);
3974 			break;
3975 		case 'c':
3976 			start_commit = optarg;
3977 			break;
3978 		case 'd':
3979 			show_diffstat = 1;
3980 			break;
3981 		case 'l':
3982 			limit = strtonum(optarg, 0, INT_MAX, &errstr);
3983 			if (errstr != NULL)
3984 				errx(1, "number of commits is %s: %s",
3985 				    errstr, optarg);
3986 			break;
3987 		case 'P':
3988 			show_changed_paths = 1;
3989 			break;
3990 		case 'p':
3991 			show_patch = 1;
3992 			break;
3993 		case 'R':
3994 			reverse_display_order = 1;
3995 			break;
3996 		case 'r':
3997 			repo_path = realpath(optarg, NULL);
3998 			if (repo_path == NULL)
3999 				return got_error_from_errno2("realpath",
4000 				    optarg);
4001 			got_path_strip_trailing_slashes(repo_path);
4002 			break;
4003 		case 'S':
4004 			search_pattern = optarg;
4005 			break;
4006 		case 's':
4007 			one_line = 1;
4008 			break;
4009 		case 'x':
4010 			end_commit = optarg;
4011 			break;
4012 		default:
4013 			usage_log();
4014 			/* NOTREACHED */
4015 		}
4016 	}
4017 
4018 	argc -= optind;
4019 	argv += optind;
4020 
4021 	if (diff_context == -1)
4022 		diff_context = 3;
4023 	else if (!show_patch)
4024 		errx(1, "-C requires -p");
4025 
4026 	if (one_line && (show_patch || show_changed_paths || show_diffstat))
4027 		errx(1, "cannot use -s with -d, -p or -P");
4028 
4029 	cwd = getcwd(NULL, 0);
4030 	if (cwd == NULL) {
4031 		error = got_error_from_errno("getcwd");
4032 		goto done;
4033 	}
4034 
4035 	error = got_repo_pack_fds_open(&pack_fds);
4036 	if (error != NULL)
4037 		goto done;
4038 
4039 	if (repo_path == NULL) {
4040 		error = got_worktree_open(&worktree, cwd);
4041 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
4042 			goto done;
4043 		error = NULL;
4044 	}
4045 
4046 	if (argc == 1) {
4047 		if (worktree) {
4048 			error = got_worktree_resolve_path(&path, worktree,
4049 			    argv[0]);
4050 			if (error)
4051 				goto done;
4052 		} else {
4053 			path = strdup(argv[0]);
4054 			if (path == NULL) {
4055 				error = got_error_from_errno("strdup");
4056 				goto done;
4057 			}
4058 		}
4059 	} else if (argc != 0)
4060 		usage_log();
4061 
4062 	if (repo_path == NULL) {
4063 		repo_path = worktree ?
4064 		    strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4065 	}
4066 	if (repo_path == NULL) {
4067 		error = got_error_from_errno("strdup");
4068 		goto done;
4069 	}
4070 
4071 	error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4072 	if (error != NULL)
4073 		goto done;
4074 
4075 	error = apply_unveil(got_repo_get_path(repo), 1,
4076 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
4077 	if (error)
4078 		goto done;
4079 
4080 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4081 	if (error)
4082 		goto done;
4083 
4084 	error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4085 	if (error)
4086 		goto done;
4087 
4088 	if (start_commit == NULL) {
4089 		struct got_reference *head_ref;
4090 		struct got_commit_object *commit = NULL;
4091 		error = got_ref_open(&head_ref, repo,
4092 		    worktree ? got_worktree_get_head_ref_name(worktree)
4093 		    : GOT_REF_HEAD, 0);
4094 		if (error != NULL)
4095 			goto done;
4096 		error = got_ref_resolve(&start_id, repo, head_ref);
4097 		got_ref_close(head_ref);
4098 		if (error != NULL)
4099 			goto done;
4100 		error = got_object_open_as_commit(&commit, repo,
4101 		    start_id);
4102 		if (error != NULL)
4103 			goto done;
4104 		got_object_commit_close(commit);
4105 	} else {
4106 		error = got_repo_match_object_id(&start_id, NULL,
4107 		    start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4108 		if (error != NULL)
4109 			goto done;
4110 	}
4111 	if (end_commit != NULL) {
4112 		error = got_repo_match_object_id(&end_id, NULL,
4113 		    end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4114 		if (error != NULL)
4115 			goto done;
4116 	}
4117 
4118 	if (worktree) {
4119 		/*
4120 		 * If a path was specified on the command line it was resolved
4121 		 * to a path in the work tree above. Prepend the work tree's
4122 		 * path prefix to obtain the corresponding in-repository path.
4123 		 */
4124 		if (path) {
4125 			const char *prefix;
4126 			prefix = got_worktree_get_path_prefix(worktree);
4127 			if (asprintf(&in_repo_path, "%s%s%s", prefix,
4128 			    (path[0] != '\0') ? "/" : "", path) == -1) {
4129 				error = got_error_from_errno("asprintf");
4130 				goto done;
4131 			}
4132 		}
4133 	} else
4134 		error = got_repo_map_path(&in_repo_path, repo,
4135 		    path ? path : "");
4136 	if (error != NULL)
4137 		goto done;
4138 	if (in_repo_path) {
4139 		free(path);
4140 		path = in_repo_path;
4141 	}
4142 
4143 	if (worktree) {
4144 		/* Release work tree lock. */
4145 		got_worktree_close(worktree);
4146 		worktree = NULL;
4147 	}
4148 
4149 	if (search_pattern && show_patch) {
4150 		tmpfile = got_opentemp();
4151 		if (tmpfile == NULL) {
4152 			error = got_error_from_errno("got_opentemp");
4153 			goto done;
4154 		}
4155 	}
4156 
4157 	error = print_commits(start_id, end_id, repo, path ? path : "",
4158 	    show_changed_paths, show_diffstat, show_patch, search_pattern,
4159 	    diff_context, limit, log_branches, reverse_display_order,
4160 	    refs_idmap, one_line, tmpfile);
4161 done:
4162 	free(path);
4163 	free(repo_path);
4164 	free(cwd);
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 }