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