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