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, struct got_object_id *id)
4880 {
4881 	const struct got_error *err = NULL;
4882 	struct blame_cb_args *a = arg;
4883 	struct blame_line *bline;
4884 	char *line = NULL;
4885 	size_t linesize = 0;
4886 	struct got_commit_object *commit = NULL;
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 	err = got_object_open_as_commit(&commit, a->repo, id);
4910 	if (err)
4911 		goto done;
4912 
4913 	bline->committer = strdup(got_object_commit_get_committer(commit));
4914 	if (bline->committer == NULL) {
4915 		err = got_error_from_errno("strdup");
4916 		goto done;
4917 	}
4918 
4919 	committer_time = got_object_commit_get_committer_time(commit);
4920 	if (gmtime_r(&committer_time, &tm) == NULL)
4921 		return got_error_from_errno("gmtime_r");
4922 	if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4923 	    &tm) == 0) {
4924 		err = got_error(GOT_ERR_NO_SPACE);
4925 		goto done;
4926 	}
4927 	bline->annotated = 1;
4928 
4929 	/* Print lines annotated so far. */
4930 	bline = &a->lines[a->lineno_cur - 1];
4931 	if (!bline->annotated)
4932 		goto done;
4933 
4934 	offset = a->line_offsets[a->lineno_cur - 1];
4935 	if (fseeko(a->f, offset, SEEK_SET) == -1) {
4936 		err = got_error_from_errno("fseeko");
4937 		goto done;
4938 	}
4939 
4940 	while (bline->annotated) {
4941 		char *smallerthan, *at, *nl, *committer;
4942 		size_t len;
4943 
4944 		if (getline(&line, &linesize, a->f) == -1) {
4945 			if (ferror(a->f))
4946 				err = got_error_from_errno("getline");
4947 			break;
4948 		}
4949 
4950 		committer = bline->committer;
4951 		smallerthan = strchr(committer, '<');
4952 		if (smallerthan && smallerthan[1] != '\0')
4953 			committer = smallerthan + 1;
4954 		at = strchr(committer, '@');
4955 		if (at)
4956 			*at = '\0';
4957 		len = strlen(committer);
4958 		if (len >= 9)
4959 			committer[8] = '\0';
4960 
4961 		nl = strchr(line, '\n');
4962 		if (nl)
4963 			*nl = '\0';
4964 		printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4965 		    bline->id_str, bline->datebuf, committer, line);
4966 
4967 		a->lineno_cur++;
4968 		bline = &a->lines[a->lineno_cur - 1];
4969 	}
4970 done:
4971 	if (commit)
4972 		got_object_commit_close(commit);
4973 	free(line);
4974 	return err;
4975 }
4976 
4977 static const struct got_error *
4978 cmd_blame(int argc, char *argv[])
4979 {
4980 	const struct got_error *error;
4981 	struct got_repository *repo = NULL;
4982 	struct got_worktree *worktree = NULL;
4983 	char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4984 	char *link_target = NULL;
4985 	struct got_object_id *obj_id = NULL;
4986 	struct got_object_id *commit_id = NULL;
4987 	struct got_commit_object *commit = NULL;
4988 	struct got_blob_object *blob = NULL;
4989 	char *commit_id_str = NULL;
4990 	struct blame_cb_args bca;
4991 	int ch, obj_type, i;
4992 	off_t filesize;
4993 
4994 	memset(&bca, 0, sizeof(bca));
4995 
4996 #ifndef PROFILE
4997 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4998 	    NULL) == -1)
4999 		err(1, "pledge");
5000 #endif
5001 
5002 	while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5003 		switch (ch) {
5004 		case 'c':
5005 			commit_id_str = optarg;
5006 			break;
5007 		case 'r':
5008 			repo_path = realpath(optarg, NULL);
5009 			if (repo_path == NULL)
5010 				return got_error_from_errno2("realpath",
5011 				    optarg);
5012 			got_path_strip_trailing_slashes(repo_path);
5013 			break;
5014 		default:
5015 			usage_blame();
5016 			/* NOTREACHED */
5017 		}
5018 	}
5019 
5020 	argc -= optind;
5021 	argv += optind;
5022 
5023 	if (argc == 1)
5024 		path = argv[0];
5025 	else
5026 		usage_blame();
5027 
5028 	cwd = getcwd(NULL, 0);
5029 	if (cwd == NULL) {
5030 		error = got_error_from_errno("getcwd");
5031 		goto done;
5032 	}
5033 	if (repo_path == NULL) {
5034 		error = got_worktree_open(&worktree, cwd);
5035 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5036 			goto done;
5037 		else
5038 			error = NULL;
5039 		if (worktree) {
5040 			repo_path =
5041 			    strdup(got_worktree_get_repo_path(worktree));
5042 			if (repo_path == NULL) {
5043 				error = got_error_from_errno("strdup");
5044 				if (error)
5045 					goto done;
5046 			}
5047 		} else {
5048 			repo_path = strdup(cwd);
5049 			if (repo_path == NULL) {
5050 				error = got_error_from_errno("strdup");
5051 				goto done;
5052 			}
5053 		}
5054 	}
5055 
5056 	error = got_repo_open(&repo, repo_path, NULL);
5057 	if (error != NULL)
5058 		goto done;
5059 
5060 	if (worktree) {
5061 		const char *prefix = got_worktree_get_path_prefix(worktree);
5062 		char *p;
5063 
5064 		error = got_worktree_resolve_path(&p, worktree, path);
5065 		if (error)
5066 			goto done;
5067 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5068 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5069 		    p) == -1) {
5070 			error = got_error_from_errno("asprintf");
5071 			free(p);
5072 			goto done;
5073 		}
5074 		free(p);
5075 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5076 	} else {
5077 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5078 		if (error)
5079 			goto done;
5080 		error = got_repo_map_path(&in_repo_path, repo, path);
5081 	}
5082 	if (error)
5083 		goto done;
5084 
5085 	if (commit_id_str == NULL) {
5086 		struct got_reference *head_ref;
5087 		error = got_ref_open(&head_ref, repo, worktree ?
5088 		    got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5089 		if (error != NULL)
5090 			goto done;
5091 		error = got_ref_resolve(&commit_id, repo, head_ref);
5092 		got_ref_close(head_ref);
5093 		if (error != NULL)
5094 			goto done;
5095 	} else {
5096 		struct got_reflist_head refs;
5097 		TAILQ_INIT(&refs);
5098 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5099 		    NULL);
5100 		if (error)
5101 			goto done;
5102 		error = got_repo_match_object_id(&commit_id, NULL,
5103 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5104 		got_ref_list_free(&refs);
5105 		if (error)
5106 			goto done;
5107 	}
5108 
5109 	if (worktree) {
5110 		/* Release work tree lock. */
5111 		got_worktree_close(worktree);
5112 		worktree = NULL;
5113 	}
5114 
5115 	error = got_object_open_as_commit(&commit, repo, commit_id);
5116 	if (error)
5117 		goto done;
5118 
5119 	error = got_object_resolve_symlinks(&link_target, in_repo_path,
5120 	    commit, repo);
5121 	if (error)
5122 		goto done;
5123 
5124 	error = got_object_id_by_path(&obj_id, repo, commit,
5125 	    link_target ? link_target : in_repo_path);
5126 	if (error)
5127 		goto done;
5128 
5129 	error = got_object_get_type(&obj_type, repo, obj_id);
5130 	if (error)
5131 		goto done;
5132 
5133 	if (obj_type != GOT_OBJ_TYPE_BLOB) {
5134 		error = got_error_path(link_target ? link_target : in_repo_path,
5135 		    GOT_ERR_OBJ_TYPE);
5136 		goto done;
5137 	}
5138 
5139 	error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5140 	if (error)
5141 		goto done;
5142 	bca.f = got_opentemp();
5143 	if (bca.f == NULL) {
5144 		error = got_error_from_errno("got_opentemp");
5145 		goto done;
5146 	}
5147 	error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5148 	    &bca.line_offsets, bca.f, blob);
5149 	if (error || bca.nlines == 0)
5150 		goto done;
5151 
5152 	/* Don't include \n at EOF in the blame line count. */
5153 	if (bca.line_offsets[bca.nlines - 1] == filesize)
5154 		bca.nlines--;
5155 
5156 	bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5157 	if (bca.lines == NULL) {
5158 		error = got_error_from_errno("calloc");
5159 		goto done;
5160 	}
5161 	bca.lineno_cur = 1;
5162 	bca.nlines_prec = 0;
5163 	i = bca.nlines;
5164 	while (i > 0) {
5165 		i /= 10;
5166 		bca.nlines_prec++;
5167 	}
5168 	bca.repo = repo;
5169 
5170 	error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5171 	    repo, blame_cb, &bca, check_cancelled, NULL);
5172 done:
5173 	free(in_repo_path);
5174 	free(link_target);
5175 	free(repo_path);
5176 	free(cwd);
5177 	free(commit_id);
5178 	free(obj_id);
5179 	if (commit)
5180 		got_object_commit_close(commit);
5181 	if (blob)
5182 		got_object_blob_close(blob);
5183 	if (worktree)
5184 		got_worktree_close(worktree);
5185 	if (repo) {
5186 		const struct got_error *close_err = got_repo_close(repo);
5187 		if (error == NULL)
5188 			error = close_err;
5189 	}
5190 	if (bca.lines) {
5191 		for (i = 0; i < bca.nlines; i++) {
5192 			struct blame_line *bline = &bca.lines[i];
5193 			free(bline->id_str);
5194 			free(bline->committer);
5195 		}
5196 		free(bca.lines);
5197 	}
5198 	free(bca.line_offsets);
5199 	if (bca.f && fclose(bca.f) == EOF && error == NULL)
5200 		error = got_error_from_errno("fclose");
5201 	return error;
5202 }
5203 
5204 __dead static void
5205 usage_tree(void)
5206 {
5207 	fprintf(stderr,
5208 	    "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5209 	    getprogname());
5210 	exit(1);
5211 }
5212 
5213 static const struct got_error *
5214 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5215     const char *root_path, struct got_repository *repo)
5216 {
5217 	const struct got_error *err = NULL;
5218 	int is_root_path = (strcmp(path, root_path) == 0);
5219 	const char *modestr = "";
5220 	mode_t mode = got_tree_entry_get_mode(te);
5221 	char *link_target = NULL;
5222 
5223 	path += strlen(root_path);
5224 	while (path[0] == '/')
5225 		path++;
5226 
5227 	if (got_object_tree_entry_is_submodule(te))
5228 		modestr = "$";
5229 	else if (S_ISLNK(mode)) {
5230 		int i;
5231 
5232 		err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5233 		if (err)
5234 			return err;
5235 		for (i = 0; i < strlen(link_target); i++) {
5236 			if (!isprint((unsigned char)link_target[i]))
5237 				link_target[i] = '?';
5238 		}
5239 
5240 		modestr = "@";
5241 	}
5242 	else if (S_ISDIR(mode))
5243 		modestr = "/";
5244 	else if (mode & S_IXUSR)
5245 		modestr = "*";
5246 
5247 	printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5248 	    is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5249 	    link_target ? " -> ": "", link_target ? link_target : "");
5250 
5251 	free(link_target);
5252 	return NULL;
5253 }
5254 
5255 static const struct got_error *
5256 print_tree(const char *path, struct got_commit_object *commit,
5257     int show_ids, int recurse, const char *root_path,
5258     struct got_repository *repo)
5259 {
5260 	const struct got_error *err = NULL;
5261 	struct got_object_id *tree_id = NULL;
5262 	struct got_tree_object *tree = NULL;
5263 	int nentries, i;
5264 
5265 	err = got_object_id_by_path(&tree_id, repo, commit, path);
5266 	if (err)
5267 		goto done;
5268 
5269 	err = got_object_open_as_tree(&tree, repo, tree_id);
5270 	if (err)
5271 		goto done;
5272 	nentries = got_object_tree_get_nentries(tree);
5273 	for (i = 0; i < nentries; i++) {
5274 		struct got_tree_entry *te;
5275 		char *id = NULL;
5276 
5277 		if (sigint_received || sigpipe_received)
5278 			break;
5279 
5280 		te = got_object_tree_get_entry(tree, i);
5281 		if (show_ids) {
5282 			char *id_str;
5283 			err = got_object_id_str(&id_str,
5284 			    got_tree_entry_get_id(te));
5285 			if (err)
5286 				goto done;
5287 			if (asprintf(&id, "%s ", id_str) == -1) {
5288 				err = got_error_from_errno("asprintf");
5289 				free(id_str);
5290 				goto done;
5291 			}
5292 			free(id_str);
5293 		}
5294 		err = print_entry(te, id, path, root_path, repo);
5295 		free(id);
5296 		if (err)
5297 			goto done;
5298 
5299 		if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5300 			char *child_path;
5301 			if (asprintf(&child_path, "%s%s%s", path,
5302 			    path[0] == '/' && path[1] == '\0' ? "" : "/",
5303 			    got_tree_entry_get_name(te)) == -1) {
5304 				err = got_error_from_errno("asprintf");
5305 				goto done;
5306 			}
5307 			err = print_tree(child_path, commit, show_ids, 1,
5308 			    root_path, repo);
5309 			free(child_path);
5310 			if (err)
5311 				goto done;
5312 		}
5313 	}
5314 done:
5315 	if (tree)
5316 		got_object_tree_close(tree);
5317 	free(tree_id);
5318 	return err;
5319 }
5320 
5321 static const struct got_error *
5322 cmd_tree(int argc, char *argv[])
5323 {
5324 	const struct got_error *error;
5325 	struct got_repository *repo = NULL;
5326 	struct got_worktree *worktree = NULL;
5327 	const char *path, *refname = NULL;
5328 	char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5329 	struct got_object_id *commit_id = NULL;
5330 	struct got_commit_object *commit = NULL;
5331 	char *commit_id_str = NULL;
5332 	int show_ids = 0, recurse = 0;
5333 	int ch;
5334 
5335 #ifndef PROFILE
5336 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5337 	    NULL) == -1)
5338 		err(1, "pledge");
5339 #endif
5340 
5341 	while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5342 		switch (ch) {
5343 		case 'c':
5344 			commit_id_str = optarg;
5345 			break;
5346 		case 'r':
5347 			repo_path = realpath(optarg, NULL);
5348 			if (repo_path == NULL)
5349 				return got_error_from_errno2("realpath",
5350 				    optarg);
5351 			got_path_strip_trailing_slashes(repo_path);
5352 			break;
5353 		case 'i':
5354 			show_ids = 1;
5355 			break;
5356 		case 'R':
5357 			recurse = 1;
5358 			break;
5359 		default:
5360 			usage_tree();
5361 			/* NOTREACHED */
5362 		}
5363 	}
5364 
5365 	argc -= optind;
5366 	argv += optind;
5367 
5368 	if (argc == 1)
5369 		path = argv[0];
5370 	else if (argc > 1)
5371 		usage_tree();
5372 	else
5373 		path = NULL;
5374 
5375 	cwd = getcwd(NULL, 0);
5376 	if (cwd == NULL) {
5377 		error = got_error_from_errno("getcwd");
5378 		goto done;
5379 	}
5380 	if (repo_path == NULL) {
5381 		error = got_worktree_open(&worktree, cwd);
5382 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5383 			goto done;
5384 		else
5385 			error = NULL;
5386 		if (worktree) {
5387 			repo_path =
5388 			    strdup(got_worktree_get_repo_path(worktree));
5389 			if (repo_path == NULL)
5390 				error = got_error_from_errno("strdup");
5391 			if (error)
5392 				goto done;
5393 		} else {
5394 			repo_path = strdup(cwd);
5395 			if (repo_path == NULL) {
5396 				error = got_error_from_errno("strdup");
5397 				goto done;
5398 			}
5399 		}
5400 	}
5401 
5402 	error = got_repo_open(&repo, repo_path, NULL);
5403 	if (error != NULL)
5404 		goto done;
5405 
5406 	if (worktree) {
5407 		const char *prefix = got_worktree_get_path_prefix(worktree);
5408 		char *p;
5409 
5410 		if (path == NULL)
5411 			path = "";
5412 		error = got_worktree_resolve_path(&p, worktree, path);
5413 		if (error)
5414 			goto done;
5415 		if (asprintf(&in_repo_path, "%s%s%s", prefix,
5416 		    (p[0] != '\0' && !got_path_is_root_dir(prefix)) ?  "/" : "",
5417 		    p) == -1) {
5418 			error = got_error_from_errno("asprintf");
5419 			free(p);
5420 			goto done;
5421 		}
5422 		free(p);
5423 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5424 		if (error)
5425 			goto done;
5426 	} else {
5427 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5428 		if (error)
5429 			goto done;
5430 		if (path == NULL)
5431 			path = "/";
5432 		error = got_repo_map_path(&in_repo_path, repo, path);
5433 		if (error != NULL)
5434 			goto done;
5435 	}
5436 
5437 	if (commit_id_str == NULL) {
5438 		struct got_reference *head_ref;
5439 		if (worktree)
5440 			refname = got_worktree_get_head_ref_name(worktree);
5441 		else
5442 			refname = GOT_REF_HEAD;
5443 		error = got_ref_open(&head_ref, repo, refname, 0);
5444 		if (error != NULL)
5445 			goto done;
5446 		error = got_ref_resolve(&commit_id, repo, head_ref);
5447 		got_ref_close(head_ref);
5448 		if (error != NULL)
5449 			goto done;
5450 	} else {
5451 		struct got_reflist_head refs;
5452 		TAILQ_INIT(&refs);
5453 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5454 		    NULL);
5455 		if (error)
5456 			goto done;
5457 		error = got_repo_match_object_id(&commit_id, NULL,
5458 		    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5459 		got_ref_list_free(&refs);
5460 		if (error)
5461 			goto done;
5462 	}
5463 
5464 	if (worktree) {
5465 		/* Release work tree lock. */
5466 		got_worktree_close(worktree);
5467 		worktree = NULL;
5468 	}
5469 
5470 	error = got_object_open_as_commit(&commit, repo, commit_id);
5471 	if (error)
5472 		goto done;
5473 
5474 	error = print_tree(in_repo_path, commit, show_ids, recurse,
5475 	    in_repo_path, repo);
5476 done:
5477 	free(in_repo_path);
5478 	free(repo_path);
5479 	free(cwd);
5480 	free(commit_id);
5481 	if (commit)
5482 		got_object_commit_close(commit);
5483 	if (worktree)
5484 		got_worktree_close(worktree);
5485 	if (repo) {
5486 		const struct got_error *close_err = got_repo_close(repo);
5487 		if (error == NULL)
5488 			error = close_err;
5489 	}
5490 	return error;
5491 }
5492 
5493 __dead static void
5494 usage_status(void)
5495 {
5496 	fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5497 	    "[-S status-codes] [path ...]\n", getprogname());
5498 	exit(1);
5499 }
5500 
5501 struct got_status_arg {
5502 	char *status_codes;
5503 	int suppress;
5504 };
5505 
5506 static const struct got_error *
5507 print_status(void *arg, unsigned char status, unsigned char staged_status,
5508     const char *path, struct got_object_id *blob_id,
5509     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5510     int dirfd, const char *de_name)
5511 {
5512 	struct got_status_arg *st = arg;
5513 
5514 	if (status == staged_status && (status == GOT_STATUS_DELETE))
5515 		status = GOT_STATUS_NO_CHANGE;
5516 	if (st != NULL && st->status_codes) {
5517 		size_t ncodes = strlen(st->status_codes);
5518 		int i, j = 0;
5519 
5520 		for (i = 0; i < ncodes ; i++) {
5521 			if (st->suppress) {
5522 				if (status == st->status_codes[i] ||
5523 				    staged_status == st->status_codes[i]) {
5524 					j++;
5525 					continue;
5526 				}
5527 			} else {
5528 				if (status == st->status_codes[i] ||
5529 				    staged_status == st->status_codes[i])
5530 					break;
5531 			}
5532 		}
5533 
5534 		if (st->suppress && j == 0)
5535 			goto print;
5536 
5537 		if (i == ncodes)
5538 			return NULL;
5539 	}
5540 print:
5541 	printf("%c%c %s\n", status, staged_status, path);
5542 	return NULL;
5543 }
5544 
5545 static const struct got_error *
5546 cmd_status(int argc, char *argv[])
5547 {
5548 	const struct got_error *error = NULL;
5549 	struct got_repository *repo = NULL;
5550 	struct got_worktree *worktree = NULL;
5551 	struct got_status_arg st;
5552 	char *cwd = NULL;
5553 	struct got_pathlist_head paths;
5554 	struct got_pathlist_entry *pe;
5555 	int ch, i, no_ignores = 0;
5556 
5557 	TAILQ_INIT(&paths);
5558 
5559 	memset(&st, 0, sizeof(st));
5560 	st.status_codes = NULL;
5561 	st.suppress = 0;
5562 
5563 	while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5564 		switch (ch) {
5565 		case 'I':
5566 			no_ignores = 1;
5567 			break;
5568 		case 'S':
5569 			if (st.status_codes != NULL && st.suppress == 0)
5570 				option_conflict('S', 's');
5571 			st.suppress = 1;
5572 			/* fallthrough */
5573 		case 's':
5574 			for (i = 0; i < strlen(optarg); i++) {
5575 				switch (optarg[i]) {
5576 				case GOT_STATUS_MODIFY:
5577 				case GOT_STATUS_ADD:
5578 				case GOT_STATUS_DELETE:
5579 				case GOT_STATUS_CONFLICT:
5580 				case GOT_STATUS_MISSING:
5581 				case GOT_STATUS_OBSTRUCTED:
5582 				case GOT_STATUS_UNVERSIONED:
5583 				case GOT_STATUS_MODE_CHANGE:
5584 				case GOT_STATUS_NONEXISTENT:
5585 					break;
5586 				default:
5587 					errx(1, "invalid status code '%c'",
5588 					    optarg[i]);
5589 				}
5590 			}
5591 			if (ch == 's' && st.suppress)
5592 				option_conflict('s', 'S');
5593 			st.status_codes = optarg;
5594 			break;
5595 		default:
5596 			usage_status();
5597 			/* NOTREACHED */
5598 		}
5599 	}
5600 
5601 	argc -= optind;
5602 	argv += optind;
5603 
5604 #ifndef PROFILE
5605 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5606 	    NULL) == -1)
5607 		err(1, "pledge");
5608 #endif
5609 	cwd = getcwd(NULL, 0);
5610 	if (cwd == NULL) {
5611 		error = got_error_from_errno("getcwd");
5612 		goto done;
5613 	}
5614 
5615 	error = got_worktree_open(&worktree, cwd);
5616 	if (error) {
5617 		if (error->code == GOT_ERR_NOT_WORKTREE)
5618 			error = wrap_not_worktree_error(error, "status", cwd);
5619 		goto done;
5620 	}
5621 
5622 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5623 	    NULL);
5624 	if (error != NULL)
5625 		goto done;
5626 
5627 	error = apply_unveil(got_repo_get_path(repo), 1,
5628 	    got_worktree_get_root_path(worktree));
5629 	if (error)
5630 		goto done;
5631 
5632 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5633 	if (error)
5634 		goto done;
5635 
5636 	error = got_worktree_status(worktree, &paths, repo, no_ignores,
5637 	    print_status, &st, check_cancelled, NULL);
5638 done:
5639 	TAILQ_FOREACH(pe, &paths, entry)
5640 		free((char *)pe->path);
5641 	got_pathlist_free(&paths);
5642 	free(cwd);
5643 	return error;
5644 }
5645 
5646 __dead static void
5647 usage_ref(void)
5648 {
5649 	fprintf(stderr,
5650 	    "usage: %s ref [-r repository] [-l] [-t] [-c object] "
5651 	        "[-s reference] [-d] [name]\n",
5652 	    getprogname());
5653 	exit(1);
5654 }
5655 
5656 static const struct got_error *
5657 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
5658 {
5659 	static const struct got_error *err = NULL;
5660 	struct got_reflist_head refs;
5661 	struct got_reflist_entry *re;
5662 
5663 	TAILQ_INIT(&refs);
5664 	err = got_ref_list(&refs, repo, refname, sort_by_time ?
5665 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
5666 	    repo);
5667 	if (err)
5668 		return err;
5669 
5670 	TAILQ_FOREACH(re, &refs, entry) {
5671 		char *refstr;
5672 		refstr = got_ref_to_str(re->ref);
5673 		if (refstr == NULL) {
5674 			err = got_error_from_errno("got_ref_to_str");
5675 			break;
5676 		}
5677 		printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5678 		free(refstr);
5679 	}
5680 
5681 	got_ref_list_free(&refs);
5682 	return err;
5683 }
5684 
5685 static const struct got_error *
5686 delete_ref_by_name(struct got_repository *repo, const char *refname)
5687 {
5688 	const struct got_error *err;
5689 	struct got_reference *ref;
5690 
5691 	err = got_ref_open(&ref, repo, refname, 0);
5692 	if (err)
5693 		return err;
5694 
5695 	err = delete_ref(repo, ref);
5696 	got_ref_close(ref);
5697 	return err;
5698 }
5699 
5700 static const struct got_error *
5701 add_ref(struct got_repository *repo, const char *refname, const char *target)
5702 {
5703 	const struct got_error *err = NULL;
5704 	struct got_object_id *id = NULL;
5705 	struct got_reference *ref = NULL;
5706 	struct got_reflist_head refs;
5707 
5708 	/*
5709 	 * Don't let the user create a reference name with a leading '-'.
5710 	 * While technically a valid reference name, this case is usually
5711 	 * an unintended typo.
5712 	 */
5713 	if (refname[0] == '-')
5714 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5715 
5716 	TAILQ_INIT(&refs);
5717 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5718 	if (err)
5719 		goto done;
5720 	err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
5721 	    &refs, repo);
5722 	got_ref_list_free(&refs);
5723 	if (err)
5724 		goto done;
5725 
5726 	err = got_ref_alloc(&ref, refname, id);
5727 	if (err)
5728 		goto done;
5729 
5730 	err = got_ref_write(ref, repo);
5731 done:
5732 	if (ref)
5733 		got_ref_close(ref);
5734 	free(id);
5735 	return err;
5736 }
5737 
5738 static const struct got_error *
5739 add_symref(struct got_repository *repo, const char *refname, const char *target)
5740 {
5741 	const struct got_error *err = NULL;
5742 	struct got_reference *ref = NULL;
5743 	struct got_reference *target_ref = NULL;
5744 
5745 	/*
5746 	 * Don't let the user create a reference name with a leading '-'.
5747 	 * While technically a valid reference name, this case is usually
5748 	 * an unintended typo.
5749 	 */
5750 	if (refname[0] == '-')
5751 		return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5752 
5753 	err = got_ref_open(&target_ref, repo, target, 0);
5754 	if (err)
5755 		return err;
5756 
5757 	err = got_ref_alloc_symref(&ref, refname, target_ref);
5758 	if (err)
5759 		goto done;
5760 
5761 	err = got_ref_write(ref, repo);
5762 done:
5763 	if (target_ref)
5764 		got_ref_close(target_ref);
5765 	if (ref)
5766 		got_ref_close(ref);
5767 	return err;
5768 }
5769 
5770 static const struct got_error *
5771 cmd_ref(int argc, char *argv[])
5772 {
5773 	const struct got_error *error = NULL;
5774 	struct got_repository *repo = NULL;
5775 	struct got_worktree *worktree = NULL;
5776 	char *cwd = NULL, *repo_path = NULL;
5777 	int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
5778 	const char *obj_arg = NULL, *symref_target= NULL;
5779 	char *refname = NULL;
5780 
5781 	while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
5782 		switch (ch) {
5783 		case 'c':
5784 			obj_arg = optarg;
5785 			break;
5786 		case 'd':
5787 			do_delete = 1;
5788 			break;
5789 		case 'r':
5790 			repo_path = realpath(optarg, NULL);
5791 			if (repo_path == NULL)
5792 				return got_error_from_errno2("realpath",
5793 				    optarg);
5794 			got_path_strip_trailing_slashes(repo_path);
5795 			break;
5796 		case 'l':
5797 			do_list = 1;
5798 			break;
5799 		case 's':
5800 			symref_target = optarg;
5801 			break;
5802 		case 't':
5803 			sort_by_time = 1;
5804 			break;
5805 		default:
5806 			usage_ref();
5807 			/* NOTREACHED */
5808 		}
5809 	}
5810 
5811 	if (obj_arg && do_list)
5812 		option_conflict('c', 'l');
5813 	if (obj_arg && do_delete)
5814 		option_conflict('c', 'd');
5815 	if (obj_arg && symref_target)
5816 		option_conflict('c', 's');
5817 	if (symref_target && do_delete)
5818 		option_conflict('s', 'd');
5819 	if (symref_target && do_list)
5820 		option_conflict('s', 'l');
5821 	if (do_delete && do_list)
5822 		option_conflict('d', 'l');
5823 	if (sort_by_time && !do_list)
5824 		errx(1, "-t option requires -l option");
5825 
5826 	argc -= optind;
5827 	argv += optind;
5828 
5829 	if (do_list) {
5830 		if (argc != 0 && argc != 1)
5831 			usage_ref();
5832 		if (argc == 1) {
5833 			refname = strdup(argv[0]);
5834 			if (refname == NULL) {
5835 				error = got_error_from_errno("strdup");
5836 				goto done;
5837 			}
5838 		}
5839 	} else {
5840 		if (argc != 1)
5841 			usage_ref();
5842 		refname = strdup(argv[0]);
5843 		if (refname == NULL) {
5844 			error = got_error_from_errno("strdup");
5845 			goto done;
5846 		}
5847 	}
5848 
5849 	if (refname)
5850 		got_path_strip_trailing_slashes(refname);
5851 
5852 #ifndef PROFILE
5853 	if (do_list) {
5854 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5855 		    NULL) == -1)
5856 			err(1, "pledge");
5857 	} else {
5858 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5859 		    "sendfd unveil", NULL) == -1)
5860 			err(1, "pledge");
5861 	}
5862 #endif
5863 	cwd = getcwd(NULL, 0);
5864 	if (cwd == NULL) {
5865 		error = got_error_from_errno("getcwd");
5866 		goto done;
5867 	}
5868 
5869 	if (repo_path == NULL) {
5870 		error = got_worktree_open(&worktree, cwd);
5871 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
5872 			goto done;
5873 		else
5874 			error = NULL;
5875 		if (worktree) {
5876 			repo_path =
5877 			    strdup(got_worktree_get_repo_path(worktree));
5878 			if (repo_path == NULL)
5879 				error = got_error_from_errno("strdup");
5880 			if (error)
5881 				goto done;
5882 		} else {
5883 			repo_path = strdup(cwd);
5884 			if (repo_path == NULL) {
5885 				error = got_error_from_errno("strdup");
5886 				goto done;
5887 			}
5888 		}
5889 	}
5890 
5891 	error = got_repo_open(&repo, repo_path, NULL);
5892 	if (error != NULL)
5893 		goto done;
5894 
5895 	error = apply_unveil(got_repo_get_path(repo), do_list,
5896 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
5897 	if (error)
5898 		goto done;
5899 
5900 	if (do_list)
5901 		error = list_refs(repo, refname, sort_by_time);
5902 	else if (do_delete)
5903 		error = delete_ref_by_name(repo, refname);
5904 	else if (symref_target)
5905 		error = add_symref(repo, refname, symref_target);
5906 	else {
5907 		if (obj_arg == NULL)
5908 			usage_ref();
5909 		error = add_ref(repo, refname, obj_arg);
5910 	}
5911 done:
5912 	free(refname);
5913 	if (repo) {
5914 		const struct got_error *close_err = got_repo_close(repo);
5915 		if (error == NULL)
5916 			error = close_err;
5917 	}
5918 	if (worktree)
5919 		got_worktree_close(worktree);
5920 	free(cwd);
5921 	free(repo_path);
5922 	return error;
5923 }
5924 
5925 __dead static void
5926 usage_branch(void)
5927 {
5928 	fprintf(stderr,
5929 	    "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
5930 	        "[-n] [name]\n", getprogname());
5931 	exit(1);
5932 }
5933 
5934 static const struct got_error *
5935 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5936     struct got_reference *ref)
5937 {
5938 	const struct got_error *err = NULL;
5939 	const char *refname, *marker = "  ";
5940 	char *refstr;
5941 
5942 	refname = got_ref_get_name(ref);
5943 	if (worktree && strcmp(refname,
5944 	    got_worktree_get_head_ref_name(worktree)) == 0) {
5945 		struct got_object_id *id = NULL;
5946 
5947 		err = got_ref_resolve(&id, repo, ref);
5948 		if (err)
5949 			return err;
5950 		if (got_object_id_cmp(id,
5951 		    got_worktree_get_base_commit_id(worktree)) == 0)
5952 			marker = "* ";
5953 		else
5954 			marker = "~ ";
5955 		free(id);
5956 	}
5957 
5958 	if (strncmp(refname, "refs/heads/", 11) == 0)
5959 		refname += 11;
5960 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5961 		refname += 18;
5962 	if (strncmp(refname, "refs/remotes/", 13) == 0)
5963 		refname += 13;
5964 
5965 	refstr = got_ref_to_str(ref);
5966 	if (refstr == NULL)
5967 		return got_error_from_errno("got_ref_to_str");
5968 
5969 	printf("%s%s: %s\n", marker, refname, refstr);
5970 	free(refstr);
5971 	return NULL;
5972 }
5973 
5974 static const struct got_error *
5975 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5976 {
5977 	const char *refname;
5978 
5979 	if (worktree == NULL)
5980 		return got_error(GOT_ERR_NOT_WORKTREE);
5981 
5982 	refname = got_worktree_get_head_ref_name(worktree);
5983 
5984 	if (strncmp(refname, "refs/heads/", 11) == 0)
5985 		refname += 11;
5986 	if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5987 		refname += 18;
5988 
5989 	printf("%s\n", refname);
5990 
5991 	return NULL;
5992 }
5993 
5994 static const struct got_error *
5995 list_branches(struct got_repository *repo, struct got_worktree *worktree,
5996     int sort_by_time)
5997 {
5998 	static const struct got_error *err = NULL;
5999 	struct got_reflist_head refs;
6000 	struct got_reflist_entry *re;
6001 	struct got_reference *temp_ref = NULL;
6002 	int rebase_in_progress, histedit_in_progress;
6003 
6004 	TAILQ_INIT(&refs);
6005 
6006 	if (worktree) {
6007 		err = got_worktree_rebase_in_progress(&rebase_in_progress,
6008 		    worktree);
6009 		if (err)
6010 			return err;
6011 
6012 		err = got_worktree_histedit_in_progress(&histedit_in_progress,
6013 		    worktree);
6014 		if (err)
6015 			return err;
6016 
6017 		if (rebase_in_progress || histedit_in_progress) {
6018 			err = got_ref_open(&temp_ref, repo,
6019 			    got_worktree_get_head_ref_name(worktree), 0);
6020 			if (err)
6021 				return err;
6022 			list_branch(repo, worktree, temp_ref);
6023 			got_ref_close(temp_ref);
6024 		}
6025 	}
6026 
6027 	err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6028 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6029 	    repo);
6030 	if (err)
6031 		return err;
6032 
6033 	TAILQ_FOREACH(re, &refs, entry)
6034 		list_branch(repo, worktree, re->ref);
6035 
6036 	got_ref_list_free(&refs);
6037 
6038 	err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6039 	    got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6040 	    repo);
6041 	if (err)
6042 		return err;
6043 
6044 	TAILQ_FOREACH(re, &refs, entry)
6045 		list_branch(repo, worktree, re->ref);
6046 
6047 	got_ref_list_free(&refs);
6048 
6049 	return NULL;
6050 }
6051 
6052 static const struct got_error *
6053 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6054     const char *branch_name)
6055 {
6056 	const struct got_error *err = NULL;
6057 	struct got_reference *ref = NULL;
6058 	char *refname, *remote_refname = NULL;
6059 
6060 	if (strncmp(branch_name, "refs/", 5) == 0)
6061 		branch_name += 5;
6062 	if (strncmp(branch_name, "heads/", 6) == 0)
6063 		branch_name += 6;
6064 	else if (strncmp(branch_name, "remotes/", 8) == 0)
6065 		branch_name += 8;
6066 
6067 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6068 		return got_error_from_errno("asprintf");
6069 
6070 	if (asprintf(&remote_refname, "refs/remotes/%s",
6071 	    branch_name) == -1) {
6072 		err = got_error_from_errno("asprintf");
6073 		goto done;
6074 	}
6075 
6076 	err = got_ref_open(&ref, repo, refname, 0);
6077 	if (err) {
6078 		const struct got_error *err2;
6079 		if (err->code != GOT_ERR_NOT_REF)
6080 			goto done;
6081 		/*
6082 		 * Keep 'err' intact such that if neither branch exists
6083 		 * we report "refs/heads" rather than "refs/remotes" in
6084 		 * our error message.
6085 		 */
6086 		err2 = got_ref_open(&ref, repo, remote_refname, 0);
6087 		if (err2)
6088 			goto done;
6089 		err = NULL;
6090 	}
6091 
6092 	if (worktree &&
6093 	    strcmp(got_worktree_get_head_ref_name(worktree),
6094 	    got_ref_get_name(ref)) == 0) {
6095 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
6096 		    "will not delete this work tree's current branch");
6097 		goto done;
6098 	}
6099 
6100 	err = delete_ref(repo, ref);
6101 done:
6102 	if (ref)
6103 		got_ref_close(ref);
6104 	free(refname);
6105 	free(remote_refname);
6106 	return err;
6107 }
6108 
6109 static const struct got_error *
6110 add_branch(struct got_repository *repo, const char *branch_name,
6111     struct got_object_id *base_commit_id)
6112 {
6113 	const struct got_error *err = NULL;
6114 	struct got_reference *ref = NULL;
6115 	char *base_refname = NULL, *refname = NULL;
6116 
6117 	/*
6118 	 * Don't let the user create a branch name with a leading '-'.
6119 	 * While technically a valid reference name, this case is usually
6120 	 * an unintended typo.
6121 	 */
6122 	if (branch_name[0] == '-')
6123 		return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6124 
6125 	if (strncmp(branch_name, "refs/heads/", 11) == 0)
6126 		branch_name += 11;
6127 
6128 	if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6129 		err = got_error_from_errno("asprintf");
6130 		goto done;
6131 	}
6132 
6133 	err = got_ref_open(&ref, repo, refname, 0);
6134 	if (err == NULL) {
6135 		err = got_error(GOT_ERR_BRANCH_EXISTS);
6136 		goto done;
6137 	} else if (err->code != GOT_ERR_NOT_REF)
6138 		goto done;
6139 
6140 	err = got_ref_alloc(&ref, refname, base_commit_id);
6141 	if (err)
6142 		goto done;
6143 
6144 	err = got_ref_write(ref, repo);
6145 done:
6146 	if (ref)
6147 		got_ref_close(ref);
6148 	free(base_refname);
6149 	free(refname);
6150 	return err;
6151 }
6152 
6153 static const struct got_error *
6154 cmd_branch(int argc, char *argv[])
6155 {
6156 	const struct got_error *error = NULL;
6157 	struct got_repository *repo = NULL;
6158 	struct got_worktree *worktree = NULL;
6159 	char *cwd = NULL, *repo_path = NULL;
6160 	int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6161 	const char *delref = NULL, *commit_id_arg = NULL;
6162 	struct got_reference *ref = NULL;
6163 	struct got_pathlist_head paths;
6164 	struct got_pathlist_entry *pe;
6165 	struct got_object_id *commit_id = NULL;
6166 	char *commit_id_str = NULL;
6167 
6168 	TAILQ_INIT(&paths);
6169 
6170 	while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6171 		switch (ch) {
6172 		case 'c':
6173 			commit_id_arg = optarg;
6174 			break;
6175 		case 'd':
6176 			delref = optarg;
6177 			break;
6178 		case 'r':
6179 			repo_path = realpath(optarg, NULL);
6180 			if (repo_path == NULL)
6181 				return got_error_from_errno2("realpath",
6182 				    optarg);
6183 			got_path_strip_trailing_slashes(repo_path);
6184 			break;
6185 		case 'l':
6186 			do_list = 1;
6187 			break;
6188 		case 'n':
6189 			do_update = 0;
6190 			break;
6191 		case 't':
6192 			sort_by_time = 1;
6193 			break;
6194 		default:
6195 			usage_branch();
6196 			/* NOTREACHED */
6197 		}
6198 	}
6199 
6200 	if (do_list && delref)
6201 		option_conflict('l', 'd');
6202 	if (sort_by_time && !do_list)
6203 		errx(1, "-t option requires -l option");
6204 
6205 	argc -= optind;
6206 	argv += optind;
6207 
6208 	if (!do_list && !delref && argc == 0)
6209 		do_show = 1;
6210 
6211 	if ((do_list || delref || do_show) && commit_id_arg != NULL)
6212 		errx(1, "-c option can only be used when creating a branch");
6213 
6214 	if (do_list || delref) {
6215 		if (argc > 0)
6216 			usage_branch();
6217 	} else if (!do_show && argc != 1)
6218 		usage_branch();
6219 
6220 #ifndef PROFILE
6221 	if (do_list || do_show) {
6222 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6223 		    NULL) == -1)
6224 			err(1, "pledge");
6225 	} else {
6226 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6227 		    "sendfd unveil", NULL) == -1)
6228 			err(1, "pledge");
6229 	}
6230 #endif
6231 	cwd = getcwd(NULL, 0);
6232 	if (cwd == NULL) {
6233 		error = got_error_from_errno("getcwd");
6234 		goto done;
6235 	}
6236 
6237 	if (repo_path == NULL) {
6238 		error = got_worktree_open(&worktree, cwd);
6239 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6240 			goto done;
6241 		else
6242 			error = NULL;
6243 		if (worktree) {
6244 			repo_path =
6245 			    strdup(got_worktree_get_repo_path(worktree));
6246 			if (repo_path == NULL)
6247 				error = got_error_from_errno("strdup");
6248 			if (error)
6249 				goto done;
6250 		} else {
6251 			repo_path = strdup(cwd);
6252 			if (repo_path == NULL) {
6253 				error = got_error_from_errno("strdup");
6254 				goto done;
6255 			}
6256 		}
6257 	}
6258 
6259 	error = got_repo_open(&repo, repo_path, NULL);
6260 	if (error != NULL)
6261 		goto done;
6262 
6263 	error = apply_unveil(got_repo_get_path(repo), do_list,
6264 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
6265 	if (error)
6266 		goto done;
6267 
6268 	if (do_show)
6269 		error = show_current_branch(repo, worktree);
6270 	else if (do_list)
6271 		error = list_branches(repo, worktree, sort_by_time);
6272 	else if (delref)
6273 		error = delete_branch(repo, worktree, delref);
6274 	else {
6275 		struct got_reflist_head refs;
6276 		TAILQ_INIT(&refs);
6277 		error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6278 		    NULL);
6279 		if (error)
6280 			goto done;
6281 		if (commit_id_arg == NULL)
6282 			commit_id_arg = worktree ?
6283 			    got_worktree_get_head_ref_name(worktree) :
6284 			    GOT_REF_HEAD;
6285 		error = got_repo_match_object_id(&commit_id, NULL,
6286 		    commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6287 		got_ref_list_free(&refs);
6288 		if (error)
6289 			goto done;
6290 		error = add_branch(repo, argv[0], commit_id);
6291 		if (error)
6292 			goto done;
6293 		if (worktree && do_update) {
6294 			struct got_update_progress_arg upa;
6295 			char *branch_refname = NULL;
6296 
6297 			error = got_object_id_str(&commit_id_str, commit_id);
6298 			if (error)
6299 				goto done;
6300 			error = get_worktree_paths_from_argv(&paths, 0, NULL,
6301 			    worktree);
6302 			if (error)
6303 				goto done;
6304 			if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6305 			    == -1) {
6306 				error = got_error_from_errno("asprintf");
6307 				goto done;
6308 			}
6309 			error = got_ref_open(&ref, repo, branch_refname, 0);
6310 			free(branch_refname);
6311 			if (error)
6312 				goto done;
6313 			error = switch_head_ref(ref, commit_id, worktree,
6314 			    repo);
6315 			if (error)
6316 				goto done;
6317 			error = got_worktree_set_base_commit_id(worktree, repo,
6318 			    commit_id);
6319 			if (error)
6320 				goto done;
6321 			memset(&upa, 0, sizeof(upa));
6322 			error = got_worktree_checkout_files(worktree, &paths,
6323 			    repo, update_progress, &upa, check_cancelled,
6324 			    NULL);
6325 			if (error)
6326 				goto done;
6327 			if (upa.did_something) {
6328 				printf("Updated to %s: %s\n",
6329 				    got_worktree_get_head_ref_name(worktree),
6330 				    commit_id_str);
6331 			}
6332 			print_update_progress_stats(&upa);
6333 		}
6334 	}
6335 done:
6336 	if (ref)
6337 		got_ref_close(ref);
6338 	if (repo) {
6339 		const struct got_error *close_err = got_repo_close(repo);
6340 		if (error == NULL)
6341 			error = close_err;
6342 	}
6343 	if (worktree)
6344 		got_worktree_close(worktree);
6345 	free(cwd);
6346 	free(repo_path);
6347 	free(commit_id);
6348 	free(commit_id_str);
6349 	TAILQ_FOREACH(pe, &paths, entry)
6350 		free((char *)pe->path);
6351 	got_pathlist_free(&paths);
6352 	return error;
6353 }
6354 
6355 
6356 __dead static void
6357 usage_tag(void)
6358 {
6359 	fprintf(stderr,
6360 	    "usage: %s tag [-c commit] [-r repository] [-l] "
6361 	        "[-m message] name\n", getprogname());
6362 	exit(1);
6363 }
6364 
6365 #if 0
6366 static const struct got_error *
6367 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6368 {
6369 	const struct got_error *err = NULL;
6370 	struct got_reflist_entry *re, *se, *new;
6371 	struct got_object_id *re_id, *se_id;
6372 	struct got_tag_object *re_tag, *se_tag;
6373 	time_t re_time, se_time;
6374 
6375 	STAILQ_FOREACH(re, tags, entry) {
6376 		se = STAILQ_FIRST(sorted);
6377 		if (se == NULL) {
6378 			err = got_reflist_entry_dup(&new, re);
6379 			if (err)
6380 				return err;
6381 			STAILQ_INSERT_HEAD(sorted, new, entry);
6382 			continue;
6383 		} else {
6384 			err = got_ref_resolve(&re_id, repo, re->ref);
6385 			if (err)
6386 				break;
6387 			err = got_object_open_as_tag(&re_tag, repo, re_id);
6388 			free(re_id);
6389 			if (err)
6390 				break;
6391 			re_time = got_object_tag_get_tagger_time(re_tag);
6392 			got_object_tag_close(re_tag);
6393 		}
6394 
6395 		while (se) {
6396 			err = got_ref_resolve(&se_id, repo, re->ref);
6397 			if (err)
6398 				break;
6399 			err = got_object_open_as_tag(&se_tag, repo, se_id);
6400 			free(se_id);
6401 			if (err)
6402 				break;
6403 			se_time = got_object_tag_get_tagger_time(se_tag);
6404 			got_object_tag_close(se_tag);
6405 
6406 			if (se_time > re_time) {
6407 				err = got_reflist_entry_dup(&new, re);
6408 				if (err)
6409 					return err;
6410 				STAILQ_INSERT_AFTER(sorted, se, new, entry);
6411 				break;
6412 			}
6413 			se = STAILQ_NEXT(se, entry);
6414 			continue;
6415 		}
6416 	}
6417 done:
6418 	return err;
6419 }
6420 #endif
6421 
6422 static const struct got_error *
6423 list_tags(struct got_repository *repo, struct got_worktree *worktree)
6424 {
6425 	static const struct got_error *err = NULL;
6426 	struct got_reflist_head refs;
6427 	struct got_reflist_entry *re;
6428 
6429 	TAILQ_INIT(&refs);
6430 
6431 	err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6432 	if (err)
6433 		return err;
6434 
6435 	TAILQ_FOREACH(re, &refs, entry) {
6436 		const char *refname;
6437 		char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6438 		char datebuf[26];
6439 		const char *tagger;
6440 		time_t tagger_time;
6441 		struct got_object_id *id;
6442 		struct got_tag_object *tag;
6443 		struct got_commit_object *commit = NULL;
6444 
6445 		refname = got_ref_get_name(re->ref);
6446 		if (strncmp(refname, "refs/tags/", 10) != 0)
6447 			continue;
6448 		refname += 10;
6449 		refstr = got_ref_to_str(re->ref);
6450 		if (refstr == NULL) {
6451 			err = got_error_from_errno("got_ref_to_str");
6452 			break;
6453 		}
6454 		printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6455 		free(refstr);
6456 
6457 		err = got_ref_resolve(&id, repo, re->ref);
6458 		if (err)
6459 			break;
6460 		err = got_object_open_as_tag(&tag, repo, id);
6461 		if (err) {
6462 			if (err->code != GOT_ERR_OBJ_TYPE) {
6463 				free(id);
6464 				break;
6465 			}
6466 			/* "lightweight" tag */
6467 			err = got_object_open_as_commit(&commit, repo, id);
6468 			if (err) {
6469 				free(id);
6470 				break;
6471 			}
6472 			tagger = got_object_commit_get_committer(commit);
6473 			tagger_time =
6474 			    got_object_commit_get_committer_time(commit);
6475 			err = got_object_id_str(&id_str, id);
6476 			free(id);
6477 			if (err)
6478 				break;
6479 		} else {
6480 			free(id);
6481 			tagger = got_object_tag_get_tagger(tag);
6482 			tagger_time = got_object_tag_get_tagger_time(tag);
6483 			err = got_object_id_str(&id_str,
6484 			    got_object_tag_get_object_id(tag));
6485 			if (err)
6486 				break;
6487 		}
6488 		printf("from: %s\n", tagger);
6489 		datestr = get_datestr(&tagger_time, datebuf);
6490 		if (datestr)
6491 			printf("date: %s UTC\n", datestr);
6492 		if (commit)
6493 			printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6494 		else {
6495 			switch (got_object_tag_get_object_type(tag)) {
6496 			case GOT_OBJ_TYPE_BLOB:
6497 				printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6498 				    id_str);
6499 				break;
6500 			case GOT_OBJ_TYPE_TREE:
6501 				printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6502 				    id_str);
6503 				break;
6504 			case GOT_OBJ_TYPE_COMMIT:
6505 				printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6506 				    id_str);
6507 				break;
6508 			case GOT_OBJ_TYPE_TAG:
6509 				printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6510 				    id_str);
6511 				break;
6512 			default:
6513 				break;
6514 			}
6515 		}
6516 		free(id_str);
6517 		if (commit) {
6518 			err = got_object_commit_get_logmsg(&tagmsg0, commit);
6519 			if (err)
6520 				break;
6521 			got_object_commit_close(commit);
6522 		} else {
6523 			tagmsg0 = strdup(got_object_tag_get_message(tag));
6524 			got_object_tag_close(tag);
6525 			if (tagmsg0 == NULL) {
6526 				err = got_error_from_errno("strdup");
6527 				break;
6528 			}
6529 		}
6530 
6531 		tagmsg = tagmsg0;
6532 		do {
6533 			line = strsep(&tagmsg, "\n");
6534 			if (line)
6535 				printf(" %s\n", line);
6536 		} while (line);
6537 		free(tagmsg0);
6538 	}
6539 
6540 	got_ref_list_free(&refs);
6541 	return NULL;
6542 }
6543 
6544 static const struct got_error *
6545 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6546     const char *tag_name, const char *repo_path)
6547 {
6548 	const struct got_error *err = NULL;
6549 	char *template = NULL, *initial_content = NULL;
6550 	char *editor = NULL;
6551 	int initial_content_len;
6552 	int fd = -1;
6553 
6554 	if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6555 		err = got_error_from_errno("asprintf");
6556 		goto done;
6557 	}
6558 
6559 	initial_content_len = asprintf(&initial_content,
6560 	    "\n# tagging commit %s as %s\n",
6561 	    commit_id_str, tag_name);
6562 	if (initial_content_len == -1) {
6563 		err = got_error_from_errno("asprintf");
6564 		goto done;
6565 	}
6566 
6567 	err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6568 	if (err)
6569 		goto done;
6570 
6571 	if (write(fd, initial_content, initial_content_len) == -1) {
6572 		err = got_error_from_errno2("write", *tagmsg_path);
6573 		goto done;
6574 	}
6575 
6576 	err = get_editor(&editor);
6577 	if (err)
6578 		goto done;
6579 	err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6580 	    initial_content_len, 1);
6581 done:
6582 	free(initial_content);
6583 	free(template);
6584 	free(editor);
6585 
6586 	if (fd != -1 && close(fd) == -1 && err == NULL)
6587 		err = got_error_from_errno2("close", *tagmsg_path);
6588 
6589 	/* Editor is done; we can now apply unveil(2) */
6590 	if (err == NULL)
6591 		err = apply_unveil(repo_path, 0, NULL);
6592 	if (err) {
6593 		free(*tagmsg);
6594 		*tagmsg = NULL;
6595 	}
6596 	return err;
6597 }
6598 
6599 static const struct got_error *
6600 add_tag(struct got_repository *repo, struct got_worktree *worktree,
6601     const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6602 {
6603 	const struct got_error *err = NULL;
6604 	struct got_object_id *commit_id = NULL, *tag_id = NULL;
6605 	char *label = NULL, *commit_id_str = NULL;
6606 	struct got_reference *ref = NULL;
6607 	char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6608 	char *tagmsg_path = NULL, *tag_id_str = NULL;
6609 	int preserve_tagmsg = 0;
6610 	struct got_reflist_head refs;
6611 
6612 	TAILQ_INIT(&refs);
6613 
6614 	/*
6615 	 * Don't let the user create a tag name with a leading '-'.
6616 	 * While technically a valid reference name, this case is usually
6617 	 * an unintended typo.
6618 	 */
6619 	if (tag_name[0] == '-')
6620 		return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6621 
6622 	err = get_author(&tagger, repo, worktree);
6623 	if (err)
6624 		return err;
6625 
6626 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6627 	if (err)
6628 		goto done;
6629 
6630 	err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6631 	    GOT_OBJ_TYPE_COMMIT, &refs, repo);
6632 	if (err)
6633 		goto done;
6634 
6635 	err = got_object_id_str(&commit_id_str, commit_id);
6636 	if (err)
6637 		goto done;
6638 
6639 	if (strncmp("refs/tags/", tag_name, 10) == 0) {
6640 		refname = strdup(tag_name);
6641 		if (refname == NULL) {
6642 			err = got_error_from_errno("strdup");
6643 			goto done;
6644 		}
6645 		tag_name += 10;
6646 	} else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6647 		err = got_error_from_errno("asprintf");
6648 		goto done;
6649 	}
6650 
6651 	err = got_ref_open(&ref, repo, refname, 0);
6652 	if (err == NULL) {
6653 		err = got_error(GOT_ERR_TAG_EXISTS);
6654 		goto done;
6655 	} else if (err->code != GOT_ERR_NOT_REF)
6656 		goto done;
6657 
6658 	if (tagmsg_arg == NULL) {
6659 		err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6660 		    tag_name, got_repo_get_path(repo));
6661 		if (err) {
6662 			if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6663 			    tagmsg_path != NULL)
6664 				preserve_tagmsg = 1;
6665 			goto done;
6666 		}
6667 	}
6668 
6669 	err = got_object_tag_create(&tag_id, tag_name, commit_id,
6670 	    tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6671 	if (err) {
6672 		if (tagmsg_path)
6673 			preserve_tagmsg = 1;
6674 		goto done;
6675 	}
6676 
6677 	err = got_ref_alloc(&ref, refname, tag_id);
6678 	if (err) {
6679 		if (tagmsg_path)
6680 			preserve_tagmsg = 1;
6681 		goto done;
6682 	}
6683 
6684 	err = got_ref_write(ref, repo);
6685 	if (err) {
6686 		if (tagmsg_path)
6687 			preserve_tagmsg = 1;
6688 		goto done;
6689 	}
6690 
6691 	err = got_object_id_str(&tag_id_str, tag_id);
6692 	if (err) {
6693 		if (tagmsg_path)
6694 			preserve_tagmsg = 1;
6695 		goto done;
6696 	}
6697 	printf("Created tag %s\n", tag_id_str);
6698 done:
6699 	if (preserve_tagmsg) {
6700 		fprintf(stderr, "%s: tag message preserved in %s\n",
6701 		    getprogname(), tagmsg_path);
6702 	} else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6703 		err = got_error_from_errno2("unlink", tagmsg_path);
6704 	free(tag_id_str);
6705 	if (ref)
6706 		got_ref_close(ref);
6707 	free(commit_id);
6708 	free(commit_id_str);
6709 	free(refname);
6710 	free(tagmsg);
6711 	free(tagmsg_path);
6712 	free(tagger);
6713 	got_ref_list_free(&refs);
6714 	return err;
6715 }
6716 
6717 static const struct got_error *
6718 cmd_tag(int argc, char *argv[])
6719 {
6720 	const struct got_error *error = NULL;
6721 	struct got_repository *repo = NULL;
6722 	struct got_worktree *worktree = NULL;
6723 	char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6724 	char *gitconfig_path = NULL;
6725 	const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6726 	int ch, do_list = 0;
6727 
6728 	while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6729 		switch (ch) {
6730 		case 'c':
6731 			commit_id_arg = optarg;
6732 			break;
6733 		case 'm':
6734 			tagmsg = optarg;
6735 			break;
6736 		case 'r':
6737 			repo_path = realpath(optarg, NULL);
6738 			if (repo_path == NULL)
6739 				return got_error_from_errno2("realpath",
6740 				    optarg);
6741 			got_path_strip_trailing_slashes(repo_path);
6742 			break;
6743 		case 'l':
6744 			do_list = 1;
6745 			break;
6746 		default:
6747 			usage_tag();
6748 			/* NOTREACHED */
6749 		}
6750 	}
6751 
6752 	argc -= optind;
6753 	argv += optind;
6754 
6755 	if (do_list) {
6756 		if (commit_id_arg != NULL)
6757 			errx(1,
6758 			    "-c option can only be used when creating a tag");
6759 		if (tagmsg)
6760 			option_conflict('l', 'm');
6761 		if (argc > 0)
6762 			usage_tag();
6763 	} else if (argc != 1)
6764 		usage_tag();
6765 
6766 	tag_name = argv[0];
6767 
6768 #ifndef PROFILE
6769 	if (do_list) {
6770 		if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6771 		    NULL) == -1)
6772 			err(1, "pledge");
6773 	} else {
6774 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6775 		    "sendfd unveil", NULL) == -1)
6776 			err(1, "pledge");
6777 	}
6778 #endif
6779 	cwd = getcwd(NULL, 0);
6780 	if (cwd == NULL) {
6781 		error = got_error_from_errno("getcwd");
6782 		goto done;
6783 	}
6784 
6785 	if (repo_path == NULL) {
6786 		error = got_worktree_open(&worktree, cwd);
6787 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
6788 			goto done;
6789 		else
6790 			error = NULL;
6791 		if (worktree) {
6792 			repo_path =
6793 			    strdup(got_worktree_get_repo_path(worktree));
6794 			if (repo_path == NULL)
6795 				error = got_error_from_errno("strdup");
6796 			if (error)
6797 				goto done;
6798 		} else {
6799 			repo_path = strdup(cwd);
6800 			if (repo_path == NULL) {
6801 				error = got_error_from_errno("strdup");
6802 				goto done;
6803 			}
6804 		}
6805 	}
6806 
6807 	if (do_list) {
6808 		error = got_repo_open(&repo, repo_path, NULL);
6809 		if (error != NULL)
6810 			goto done;
6811 		error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6812 		if (error)
6813 			goto done;
6814 		error = list_tags(repo, worktree);
6815 	} else {
6816 		error = get_gitconfig_path(&gitconfig_path);
6817 		if (error)
6818 			goto done;
6819 		error = got_repo_open(&repo, repo_path, gitconfig_path);
6820 		if (error != NULL)
6821 			goto done;
6822 
6823 		if (tagmsg) {
6824 			error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6825 			if (error)
6826 				goto done;
6827 		}
6828 
6829 		if (commit_id_arg == NULL) {
6830 			struct got_reference *head_ref;
6831 			struct got_object_id *commit_id;
6832 			error = got_ref_open(&head_ref, repo,
6833 			    worktree ? got_worktree_get_head_ref_name(worktree)
6834 			    : GOT_REF_HEAD, 0);
6835 			if (error)
6836 				goto done;
6837 			error = got_ref_resolve(&commit_id, repo, head_ref);
6838 			got_ref_close(head_ref);
6839 			if (error)
6840 				goto done;
6841 			error = got_object_id_str(&commit_id_str, commit_id);
6842 			free(commit_id);
6843 			if (error)
6844 				goto done;
6845 		}
6846 
6847 		error = add_tag(repo, worktree, tag_name,
6848 		    commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6849 	}
6850 done:
6851 	if (repo) {
6852 		const struct got_error *close_err = got_repo_close(repo);
6853 		if (error == NULL)
6854 			error = close_err;
6855 	}
6856 	if (worktree)
6857 		got_worktree_close(worktree);
6858 	free(cwd);
6859 	free(repo_path);
6860 	free(gitconfig_path);
6861 	free(commit_id_str);
6862 	return error;
6863 }
6864 
6865 __dead static void
6866 usage_add(void)
6867 {
6868 	fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6869 	    getprogname());
6870 	exit(1);
6871 }
6872 
6873 static const struct got_error *
6874 add_progress(void *arg, unsigned char status, const char *path)
6875 {
6876 	while (path[0] == '/')
6877 		path++;
6878 	printf("%c  %s\n", status, path);
6879 	return NULL;
6880 }
6881 
6882 static const struct got_error *
6883 cmd_add(int argc, char *argv[])
6884 {
6885 	const struct got_error *error = NULL;
6886 	struct got_repository *repo = NULL;
6887 	struct got_worktree *worktree = NULL;
6888 	char *cwd = NULL;
6889 	struct got_pathlist_head paths;
6890 	struct got_pathlist_entry *pe;
6891 	int ch, can_recurse = 0, no_ignores = 0;
6892 
6893 	TAILQ_INIT(&paths);
6894 
6895 	while ((ch = getopt(argc, argv, "IR")) != -1) {
6896 		switch (ch) {
6897 		case 'I':
6898 			no_ignores = 1;
6899 			break;
6900 		case 'R':
6901 			can_recurse = 1;
6902 			break;
6903 		default:
6904 			usage_add();
6905 			/* NOTREACHED */
6906 		}
6907 	}
6908 
6909 	argc -= optind;
6910 	argv += optind;
6911 
6912 #ifndef PROFILE
6913 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6914 	    NULL) == -1)
6915 		err(1, "pledge");
6916 #endif
6917 	if (argc < 1)
6918 		usage_add();
6919 
6920 	cwd = getcwd(NULL, 0);
6921 	if (cwd == NULL) {
6922 		error = got_error_from_errno("getcwd");
6923 		goto done;
6924 	}
6925 
6926 	error = got_worktree_open(&worktree, cwd);
6927 	if (error) {
6928 		if (error->code == GOT_ERR_NOT_WORKTREE)
6929 			error = wrap_not_worktree_error(error, "add", cwd);
6930 		goto done;
6931 	}
6932 
6933 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6934 	    NULL);
6935 	if (error != NULL)
6936 		goto done;
6937 
6938 	error = apply_unveil(got_repo_get_path(repo), 1,
6939 	    got_worktree_get_root_path(worktree));
6940 	if (error)
6941 		goto done;
6942 
6943 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6944 	if (error)
6945 		goto done;
6946 
6947 	if (!can_recurse) {
6948 		char *ondisk_path;
6949 		struct stat sb;
6950 		TAILQ_FOREACH(pe, &paths, entry) {
6951 			if (asprintf(&ondisk_path, "%s/%s",
6952 			    got_worktree_get_root_path(worktree),
6953 			    pe->path) == -1) {
6954 				error = got_error_from_errno("asprintf");
6955 				goto done;
6956 			}
6957 			if (lstat(ondisk_path, &sb) == -1) {
6958 				if (errno == ENOENT) {
6959 					free(ondisk_path);
6960 					continue;
6961 				}
6962 				error = got_error_from_errno2("lstat",
6963 				    ondisk_path);
6964 				free(ondisk_path);
6965 				goto done;
6966 			}
6967 			free(ondisk_path);
6968 			if (S_ISDIR(sb.st_mode)) {
6969 				error = got_error_msg(GOT_ERR_BAD_PATH,
6970 				    "adding directories requires -R option");
6971 				goto done;
6972 			}
6973 		}
6974 	}
6975 
6976 	error = got_worktree_schedule_add(worktree, &paths, add_progress,
6977 	    NULL, repo, no_ignores);
6978 done:
6979 	if (repo) {
6980 		const struct got_error *close_err = got_repo_close(repo);
6981 		if (error == NULL)
6982 			error = close_err;
6983 	}
6984 	if (worktree)
6985 		got_worktree_close(worktree);
6986 	TAILQ_FOREACH(pe, &paths, entry)
6987 		free((char *)pe->path);
6988 	got_pathlist_free(&paths);
6989 	free(cwd);
6990 	return error;
6991 }
6992 
6993 __dead static void
6994 usage_remove(void)
6995 {
6996 	fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6997 	    "path ...\n", getprogname());
6998 	exit(1);
6999 }
7000 
7001 static const struct got_error *
7002 print_remove_status(void *arg, unsigned char status,
7003     unsigned char staged_status, const char *path)
7004 {
7005 	while (path[0] == '/')
7006 		path++;
7007 	if (status == GOT_STATUS_NONEXISTENT)
7008 		return NULL;
7009 	if (status == staged_status && (status == GOT_STATUS_DELETE))
7010 		status = GOT_STATUS_NO_CHANGE;
7011 	printf("%c%c %s\n", status, staged_status, path);
7012 	return NULL;
7013 }
7014 
7015 static const struct got_error *
7016 cmd_remove(int argc, char *argv[])
7017 {
7018 	const struct got_error *error = NULL;
7019 	struct got_worktree *worktree = NULL;
7020 	struct got_repository *repo = NULL;
7021 	const char *status_codes = NULL;
7022 	char *cwd = NULL;
7023 	struct got_pathlist_head paths;
7024 	struct got_pathlist_entry *pe;
7025 	int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7026 	int ignore_missing_paths = 0;
7027 
7028 	TAILQ_INIT(&paths);
7029 
7030 	while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7031 		switch (ch) {
7032 		case 'f':
7033 			delete_local_mods = 1;
7034 			ignore_missing_paths = 1;
7035 			break;
7036 		case 'k':
7037 			keep_on_disk = 1;
7038 			break;
7039 		case 'R':
7040 			can_recurse = 1;
7041 			break;
7042 		case 's':
7043 			for (i = 0; i < strlen(optarg); i++) {
7044 				switch (optarg[i]) {
7045 				case GOT_STATUS_MODIFY:
7046 					delete_local_mods = 1;
7047 					break;
7048 				case GOT_STATUS_MISSING:
7049 					ignore_missing_paths = 1;
7050 					break;
7051 				default:
7052 					errx(1, "invalid status code '%c'",
7053 					    optarg[i]);
7054 				}
7055 			}
7056 			status_codes = optarg;
7057 			break;
7058 		default:
7059 			usage_remove();
7060 			/* NOTREACHED */
7061 		}
7062 	}
7063 
7064 	argc -= optind;
7065 	argv += optind;
7066 
7067 #ifndef PROFILE
7068 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7069 	    NULL) == -1)
7070 		err(1, "pledge");
7071 #endif
7072 	if (argc < 1)
7073 		usage_remove();
7074 
7075 	cwd = getcwd(NULL, 0);
7076 	if (cwd == NULL) {
7077 		error = got_error_from_errno("getcwd");
7078 		goto done;
7079 	}
7080 	error = got_worktree_open(&worktree, cwd);
7081 	if (error) {
7082 		if (error->code == GOT_ERR_NOT_WORKTREE)
7083 			error = wrap_not_worktree_error(error, "remove", cwd);
7084 		goto done;
7085 	}
7086 
7087 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7088 	    NULL);
7089 	if (error)
7090 		goto done;
7091 
7092 	error = apply_unveil(got_repo_get_path(repo), 1,
7093 	    got_worktree_get_root_path(worktree));
7094 	if (error)
7095 		goto done;
7096 
7097 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7098 	if (error)
7099 		goto done;
7100 
7101 	if (!can_recurse) {
7102 		char *ondisk_path;
7103 		struct stat sb;
7104 		TAILQ_FOREACH(pe, &paths, entry) {
7105 			if (asprintf(&ondisk_path, "%s/%s",
7106 			    got_worktree_get_root_path(worktree),
7107 			    pe->path) == -1) {
7108 				error = got_error_from_errno("asprintf");
7109 				goto done;
7110 			}
7111 			if (lstat(ondisk_path, &sb) == -1) {
7112 				if (errno == ENOENT) {
7113 					free(ondisk_path);
7114 					continue;
7115 				}
7116 				error = got_error_from_errno2("lstat",
7117 				    ondisk_path);
7118 				free(ondisk_path);
7119 				goto done;
7120 			}
7121 			free(ondisk_path);
7122 			if (S_ISDIR(sb.st_mode)) {
7123 				error = got_error_msg(GOT_ERR_BAD_PATH,
7124 				    "removing directories requires -R option");
7125 				goto done;
7126 			}
7127 		}
7128 	}
7129 
7130 	error = got_worktree_schedule_delete(worktree, &paths,
7131 	    delete_local_mods, status_codes, print_remove_status, NULL,
7132 	    repo, keep_on_disk, ignore_missing_paths);
7133 done:
7134 	if (repo) {
7135 		const struct got_error *close_err = got_repo_close(repo);
7136 		if (error == NULL)
7137 			error = close_err;
7138 	}
7139 	if (worktree)
7140 		got_worktree_close(worktree);
7141 	TAILQ_FOREACH(pe, &paths, entry)
7142 		free((char *)pe->path);
7143 	got_pathlist_free(&paths);
7144 	free(cwd);
7145 	return error;
7146 }
7147 
7148 __dead static void
7149 usage_patch(void)
7150 {
7151 	fprintf(stderr, "usage: %s patch [-n] [patchfile]\n",
7152 	    getprogname());
7153 	exit(1);
7154 }
7155 
7156 static const struct got_error *
7157 patch_from_stdin(int *patchfd)
7158 {
7159 	const struct got_error *err = NULL;
7160 	ssize_t r;
7161 	char *path, buf[BUFSIZ];
7162 	sig_t sighup, sigint, sigquit;
7163 
7164 	err = got_opentemp_named_fd(&path, patchfd,
7165 	    GOT_TMPDIR_STR "/got-patch");
7166 	if (err)
7167 		return err;
7168 	unlink(path);
7169 	free(path);
7170 
7171 	sighup = signal(SIGHUP, SIG_DFL);
7172 	sigint = signal(SIGINT, SIG_DFL);
7173 	sigquit = signal(SIGQUIT, SIG_DFL);
7174 
7175 	for (;;) {
7176 		r = read(0, buf, sizeof(buf));
7177 		if (r == -1) {
7178 			err = got_error_from_errno("read");
7179 			break;
7180 		}
7181 		if (r == 0)
7182 			break;
7183 		if (write(*patchfd, buf, r) == -1) {
7184 			err = got_error_from_errno("write");
7185 			break;
7186 		}
7187 	}
7188 
7189 	signal(SIGHUP, sighup);
7190 	signal(SIGINT, sigint);
7191 	signal(SIGQUIT, sigquit);
7192 
7193 	if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7194 		err = got_error_from_errno("lseek");
7195 
7196 	if (err != NULL) {
7197 		close(*patchfd);
7198 		*patchfd = -1;
7199 	}
7200 
7201 	return err;
7202 }
7203 
7204 static const struct got_error *
7205 patch_progress(void *arg, const char *old, const char *new,
7206     unsigned char status, const struct got_error *error, long old_from,
7207     long old_lines, long new_from, long new_lines, long offset,
7208     const struct got_error *hunk_err)
7209 {
7210 	const char *path = new == NULL ? old : new;
7211 
7212 	while (*path == '/')
7213 		path++;
7214 
7215 	if (status != 0)
7216 		printf("%c  %s\n", status, path);
7217 
7218 	if (error != NULL)
7219 		fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7220 
7221 	if (offset != 0 || hunk_err != NULL) {
7222 		printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
7223 		    old_lines, new_from, new_lines);
7224 		if (hunk_err != NULL)
7225 			printf("%s\n", hunk_err->msg);
7226 		else
7227 			printf("applied with offset %ld\n", offset);
7228 	}
7229 
7230 	return NULL;
7231 }
7232 
7233 static const struct got_error *
7234 cmd_patch(int argc, char *argv[])
7235 {
7236 	const struct got_error *error = NULL, *close_error = NULL;
7237 	struct got_worktree *worktree = NULL;
7238 	struct got_repository *repo = NULL;
7239 	const char *errstr;
7240 	char *cwd = NULL;
7241 	int ch, nop = 0, strip = -1;
7242 	int patchfd;
7243 
7244 	while ((ch = getopt(argc, argv, "np:")) != -1) {
7245 		switch (ch) {
7246 		case 'n':
7247 			nop = 1;
7248 			break;
7249 		case 'p':
7250 			strip = strtonum(optarg, 0, INT_MAX, &errstr);
7251 			if (errstr != NULL)
7252 				errx(1, "pathname strip count is %s: %s",
7253 				     errstr, optarg);
7254 			break;
7255 		default:
7256 			usage_patch();
7257 			/* NOTREACHED */
7258 		}
7259 	}
7260 
7261 	argc -= optind;
7262 	argv += optind;
7263 
7264 	if (argc == 0) {
7265 		error = patch_from_stdin(&patchfd);
7266 		if (error)
7267 			return error;
7268 	} else if (argc == 1) {
7269 		patchfd = open(argv[0], O_RDONLY);
7270 		if (patchfd == -1) {
7271 			error = got_error_from_errno2("open", argv[0]);
7272 			return error;
7273 		}
7274 	} else
7275 		usage_patch();
7276 
7277 	if ((cwd = getcwd(NULL, 0)) == NULL) {
7278 		error = got_error_from_errno("getcwd");
7279 		goto done;
7280 	}
7281 
7282 	error = got_worktree_open(&worktree, cwd);
7283 	if (error != NULL)
7284 		goto done;
7285 
7286 	const char *repo_path = got_worktree_get_repo_path(worktree);
7287 	error = got_repo_open(&repo, repo_path, NULL);
7288 	if (error != NULL)
7289 		goto done;
7290 
7291 	error = apply_unveil(got_repo_get_path(repo), 0,
7292 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
7293 	if (error != NULL)
7294 		goto done;
7295 
7296 #ifndef PROFILE
7297 	if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock",
7298 	    NULL) == -1)
7299 		err(1, "pledge");
7300 #endif
7301 
7302 	error = got_patch(patchfd, worktree, repo, nop, strip,
7303 	    &patch_progress, NULL, check_cancelled, NULL);
7304 
7305 done:
7306 	if (repo) {
7307 		close_error = got_repo_close(repo);
7308 		if (error == NULL)
7309 			error = close_error;
7310 	}
7311 	if (worktree != NULL) {
7312 		close_error = got_worktree_close(worktree);
7313 		if (error == NULL)
7314 			error = close_error;
7315 	}
7316 	free(cwd);
7317 	return error;
7318 }
7319 
7320 __dead static void
7321 usage_revert(void)
7322 {
7323 	fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7324 	    "path ...\n", getprogname());
7325 	exit(1);
7326 }
7327 
7328 static const struct got_error *
7329 revert_progress(void *arg, unsigned char status, const char *path)
7330 {
7331 	if (status == GOT_STATUS_UNVERSIONED)
7332 		return NULL;
7333 
7334 	while (path[0] == '/')
7335 		path++;
7336 	printf("%c  %s\n", status, path);
7337 	return NULL;
7338 }
7339 
7340 struct choose_patch_arg {
7341 	FILE *patch_script_file;
7342 	const char *action;
7343 };
7344 
7345 static const struct got_error *
7346 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7347     int nchanges, const char *action)
7348 {
7349 	char *line = NULL;
7350 	size_t linesize = 0;
7351 	ssize_t linelen;
7352 
7353 	switch (status) {
7354 	case GOT_STATUS_ADD:
7355 		printf("A  %s\n%s this addition? [y/n] ", path, action);
7356 		break;
7357 	case GOT_STATUS_DELETE:
7358 		printf("D  %s\n%s this deletion? [y/n] ", path, action);
7359 		break;
7360 	case GOT_STATUS_MODIFY:
7361 		if (fseek(patch_file, 0L, SEEK_SET) == -1)
7362 			return got_error_from_errno("fseek");
7363 		printf(GOT_COMMIT_SEP_STR);
7364 		while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7365 			printf("%s", line);
7366 		if (ferror(patch_file))
7367 			return got_error_from_errno("getline");
7368 		printf(GOT_COMMIT_SEP_STR);
7369 		printf("M  %s (change %d of %d)\n%s this change? [y/n/q] ",
7370 		    path, n, nchanges, action);
7371 		break;
7372 	default:
7373 		return got_error_path(path, GOT_ERR_FILE_STATUS);
7374 	}
7375 
7376 	return NULL;
7377 }
7378 
7379 static const struct got_error *
7380 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7381     FILE *patch_file, int n, int nchanges)
7382 {
7383 	const struct got_error *err = NULL;
7384 	char *line = NULL;
7385 	size_t linesize = 0;
7386 	ssize_t linelen;
7387 	int resp = ' ';
7388 	struct choose_patch_arg *a = arg;
7389 
7390 	*choice = GOT_PATCH_CHOICE_NONE;
7391 
7392 	if (a->patch_script_file) {
7393 		char *nl;
7394 		err = show_change(status, path, patch_file, n, nchanges,
7395 		    a->action);
7396 		if (err)
7397 			return err;
7398 		linelen = getline(&line, &linesize, a->patch_script_file);
7399 		if (linelen == -1) {
7400 			if (ferror(a->patch_script_file))
7401 				return got_error_from_errno("getline");
7402 			return NULL;
7403 		}
7404 		nl = strchr(line, '\n');
7405 		if (nl)
7406 			*nl = '\0';
7407 		if (strcmp(line, "y") == 0) {
7408 			*choice = GOT_PATCH_CHOICE_YES;
7409 			printf("y\n");
7410 		} else if (strcmp(line, "n") == 0) {
7411 			*choice = GOT_PATCH_CHOICE_NO;
7412 			printf("n\n");
7413 		} else if (strcmp(line, "q") == 0 &&
7414 		    status == GOT_STATUS_MODIFY) {
7415 			*choice = GOT_PATCH_CHOICE_QUIT;
7416 			printf("q\n");
7417 		} else
7418 			printf("invalid response '%s'\n", line);
7419 		free(line);
7420 		return NULL;
7421 	}
7422 
7423 	while (resp != 'y' && resp != 'n' && resp != 'q') {
7424 		err = show_change(status, path, patch_file, n, nchanges,
7425 		    a->action);
7426 		if (err)
7427 			return err;
7428 		resp = getchar();
7429 		if (resp == '\n')
7430 			resp = getchar();
7431 		if (status == GOT_STATUS_MODIFY) {
7432 			if (resp != 'y' && resp != 'n' && resp != 'q') {
7433 				printf("invalid response '%c'\n", resp);
7434 				resp = ' ';
7435 			}
7436 		} else if (resp != 'y' && resp != 'n') {
7437 				printf("invalid response '%c'\n", resp);
7438 				resp = ' ';
7439 		}
7440 	}
7441 
7442 	if (resp == 'y')
7443 		*choice = GOT_PATCH_CHOICE_YES;
7444 	else if (resp == 'n')
7445 		*choice = GOT_PATCH_CHOICE_NO;
7446 	else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7447 		*choice = GOT_PATCH_CHOICE_QUIT;
7448 
7449 	return NULL;
7450 }
7451 
7452 static const struct got_error *
7453 cmd_revert(int argc, char *argv[])
7454 {
7455 	const struct got_error *error = NULL;
7456 	struct got_worktree *worktree = NULL;
7457 	struct got_repository *repo = NULL;
7458 	char *cwd = NULL, *path = NULL;
7459 	struct got_pathlist_head paths;
7460 	struct got_pathlist_entry *pe;
7461 	int ch, can_recurse = 0, pflag = 0;
7462 	FILE *patch_script_file = NULL;
7463 	const char *patch_script_path = NULL;
7464 	struct choose_patch_arg cpa;
7465 
7466 	TAILQ_INIT(&paths);
7467 
7468 	while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7469 		switch (ch) {
7470 		case 'p':
7471 			pflag = 1;
7472 			break;
7473 		case 'F':
7474 			patch_script_path = optarg;
7475 			break;
7476 		case 'R':
7477 			can_recurse = 1;
7478 			break;
7479 		default:
7480 			usage_revert();
7481 			/* NOTREACHED */
7482 		}
7483 	}
7484 
7485 	argc -= optind;
7486 	argv += optind;
7487 
7488 #ifndef PROFILE
7489 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7490 	    "unveil", NULL) == -1)
7491 		err(1, "pledge");
7492 #endif
7493 	if (argc < 1)
7494 		usage_revert();
7495 	if (patch_script_path && !pflag)
7496 		errx(1, "-F option can only be used together with -p option");
7497 
7498 	cwd = getcwd(NULL, 0);
7499 	if (cwd == NULL) {
7500 		error = got_error_from_errno("getcwd");
7501 		goto done;
7502 	}
7503 	error = got_worktree_open(&worktree, cwd);
7504 	if (error) {
7505 		if (error->code == GOT_ERR_NOT_WORKTREE)
7506 			error = wrap_not_worktree_error(error, "revert", cwd);
7507 		goto done;
7508 	}
7509 
7510 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7511 	    NULL);
7512 	if (error != NULL)
7513 		goto done;
7514 
7515 	if (patch_script_path) {
7516 		patch_script_file = fopen(patch_script_path, "re");
7517 		if (patch_script_file == NULL) {
7518 			error = got_error_from_errno2("fopen",
7519 			    patch_script_path);
7520 			goto done;
7521 		}
7522 	}
7523 	error = apply_unveil(got_repo_get_path(repo), 1,
7524 	    got_worktree_get_root_path(worktree));
7525 	if (error)
7526 		goto done;
7527 
7528 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7529 	if (error)
7530 		goto done;
7531 
7532 	if (!can_recurse) {
7533 		char *ondisk_path;
7534 		struct stat sb;
7535 		TAILQ_FOREACH(pe, &paths, entry) {
7536 			if (asprintf(&ondisk_path, "%s/%s",
7537 			    got_worktree_get_root_path(worktree),
7538 			    pe->path) == -1) {
7539 				error = got_error_from_errno("asprintf");
7540 				goto done;
7541 			}
7542 			if (lstat(ondisk_path, &sb) == -1) {
7543 				if (errno == ENOENT) {
7544 					free(ondisk_path);
7545 					continue;
7546 				}
7547 				error = got_error_from_errno2("lstat",
7548 				    ondisk_path);
7549 				free(ondisk_path);
7550 				goto done;
7551 			}
7552 			free(ondisk_path);
7553 			if (S_ISDIR(sb.st_mode)) {
7554 				error = got_error_msg(GOT_ERR_BAD_PATH,
7555 				    "reverting directories requires -R option");
7556 				goto done;
7557 			}
7558 		}
7559 	}
7560 
7561 	cpa.patch_script_file = patch_script_file;
7562 	cpa.action = "revert";
7563 	error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7564 	    pflag ? choose_patch : NULL, &cpa, repo);
7565 done:
7566 	if (patch_script_file && fclose(patch_script_file) == EOF &&
7567 	    error == NULL)
7568 		error = got_error_from_errno2("fclose", patch_script_path);
7569 	if (repo) {
7570 		const struct got_error *close_err = got_repo_close(repo);
7571 		if (error == NULL)
7572 			error = close_err;
7573 	}
7574 	if (worktree)
7575 		got_worktree_close(worktree);
7576 	free(path);
7577 	free(cwd);
7578 	return error;
7579 }
7580 
7581 __dead static void
7582 usage_commit(void)
7583 {
7584 	fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
7585 	    "[path ...]\n", getprogname());
7586 	exit(1);
7587 }
7588 
7589 struct collect_commit_logmsg_arg {
7590 	const char *cmdline_log;
7591 	const char *prepared_log;
7592 	int non_interactive;
7593 	const char *editor;
7594 	const char *worktree_path;
7595 	const char *branch_name;
7596 	const char *repo_path;
7597 	char *logmsg_path;
7598 
7599 };
7600 
7601 static const struct got_error *
7602 read_prepared_logmsg(char **logmsg, const char *path)
7603 {
7604 	const struct got_error *err = NULL;
7605 	FILE *f = NULL;
7606 	struct stat sb;
7607 	size_t r;
7608 
7609 	*logmsg = NULL;
7610 	memset(&sb, 0, sizeof(sb));
7611 
7612 	f = fopen(path, "re");
7613 	if (f == NULL)
7614 		return got_error_from_errno2("fopen", path);
7615 
7616 	if (fstat(fileno(f), &sb) == -1) {
7617 		err = got_error_from_errno2("fstat", path);
7618 		goto done;
7619 	}
7620 	if (sb.st_size == 0) {
7621 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7622 		goto done;
7623 	}
7624 
7625 	*logmsg = malloc(sb.st_size + 1);
7626 	if (*logmsg == NULL) {
7627 		err = got_error_from_errno("malloc");
7628 		goto done;
7629 	}
7630 
7631 	r = fread(*logmsg, 1, sb.st_size, f);
7632 	if (r != sb.st_size) {
7633 		if (ferror(f))
7634 			err = got_error_from_errno2("fread", path);
7635 		else
7636 			err = got_error(GOT_ERR_IO);
7637 		goto done;
7638 	}
7639 	(*logmsg)[sb.st_size] = '\0';
7640 done:
7641 	if (fclose(f) == EOF && err == NULL)
7642 		err = got_error_from_errno2("fclose", path);
7643 	if (err) {
7644 		free(*logmsg);
7645 		*logmsg = NULL;
7646 	}
7647 	return err;
7648 	
7649 }
7650 
7651 static const struct got_error *
7652 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7653     void *arg)
7654 {
7655 	char *initial_content = NULL;
7656 	struct got_pathlist_entry *pe;
7657 	const struct got_error *err = NULL;
7658 	char *template = NULL;
7659 	struct collect_commit_logmsg_arg *a = arg;
7660 	int initial_content_len;
7661 	int fd = -1;
7662 	size_t len;
7663 
7664 	/* if a message was specified on the command line, just use it */
7665 	if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7666 		len = strlen(a->cmdline_log) + 1;
7667 		*logmsg = malloc(len + 1);
7668 		if (*logmsg == NULL)
7669 			return got_error_from_errno("malloc");
7670 		strlcpy(*logmsg, a->cmdline_log, len);
7671 		return NULL;
7672 	} else if (a->prepared_log != NULL && a->non_interactive)
7673 		return read_prepared_logmsg(logmsg, a->prepared_log);
7674 
7675 	if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7676 		return got_error_from_errno("asprintf");
7677 
7678 	err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7679 	if (err)
7680 		goto done;
7681 
7682 	if (a->prepared_log) {
7683 		char *msg;
7684 		err = read_prepared_logmsg(&msg, a->prepared_log);
7685 		if (err)
7686 			goto done;
7687 		if (write(fd, msg, strlen(msg)) == -1) {
7688 			err = got_error_from_errno2("write", a->logmsg_path);
7689 			free(msg);
7690 			goto done;
7691 		}
7692 		free(msg);
7693 	}
7694 
7695 	initial_content_len = asprintf(&initial_content,
7696 	    "\n# changes to be committed on branch %s:\n",
7697 	    a->branch_name);
7698 	if (initial_content_len == -1) {
7699 		err = got_error_from_errno("asprintf");
7700 		goto done;
7701 	}
7702 
7703 	if (write(fd, initial_content, initial_content_len) == -1) {
7704 		err = got_error_from_errno2("write", a->logmsg_path);
7705 		goto done;
7706 	}
7707 
7708 	TAILQ_FOREACH(pe, commitable_paths, entry) {
7709 		struct got_commitable *ct = pe->data;
7710 		dprintf(fd, "#  %c  %s\n",
7711 		    got_commitable_get_status(ct),
7712 		    got_commitable_get_path(ct));
7713 	}
7714 
7715 	err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7716 	    initial_content_len, a->prepared_log ? 0 : 1);
7717 done:
7718 	free(initial_content);
7719 	free(template);
7720 
7721 	if (fd != -1 && close(fd) == -1 && err == NULL)
7722 		err = got_error_from_errno2("close", a->logmsg_path);
7723 
7724 	/* Editor is done; we can now apply unveil(2) */
7725 	if (err == NULL)
7726 		err = apply_unveil(a->repo_path, 0, a->worktree_path);
7727 	if (err) {
7728 		free(*logmsg);
7729 		*logmsg = NULL;
7730 	}
7731 	return err;
7732 }
7733 
7734 static const struct got_error *
7735 cmd_commit(int argc, char *argv[])
7736 {
7737 	const struct got_error *error = NULL;
7738 	struct got_worktree *worktree = NULL;
7739 	struct got_repository *repo = NULL;
7740 	char *cwd = NULL, *id_str = NULL;
7741 	struct got_object_id *id = NULL;
7742 	const char *logmsg = NULL;
7743 	char *prepared_logmsg = NULL;
7744 	struct collect_commit_logmsg_arg cl_arg;
7745 	char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7746 	int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7747 	int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7748 	struct got_pathlist_head paths;
7749 
7750 	TAILQ_INIT(&paths);
7751 	cl_arg.logmsg_path = NULL;
7752 
7753 	while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7754 		switch (ch) {
7755 		case 'F':
7756 			if (logmsg != NULL)
7757 				option_conflict('F', 'm');
7758 			prepared_logmsg = realpath(optarg, NULL);
7759 			if (prepared_logmsg == NULL)
7760 				return got_error_from_errno2("realpath",
7761 				    optarg);
7762 			break;
7763 		case 'm':
7764 			if (prepared_logmsg)
7765 				option_conflict('m', 'F');
7766 			logmsg = optarg;
7767 			break;
7768 		case 'N':
7769 			non_interactive = 1;
7770 			break;
7771 		case 'S':
7772 			allow_bad_symlinks = 1;
7773 			break;
7774 		default:
7775 			usage_commit();
7776 			/* NOTREACHED */
7777 		}
7778 	}
7779 
7780 	argc -= optind;
7781 	argv += optind;
7782 
7783 #ifndef PROFILE
7784 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7785 	    "unveil", NULL) == -1)
7786 		err(1, "pledge");
7787 #endif
7788 	cwd = getcwd(NULL, 0);
7789 	if (cwd == NULL) {
7790 		error = got_error_from_errno("getcwd");
7791 		goto done;
7792 	}
7793 	error = got_worktree_open(&worktree, cwd);
7794 	if (error) {
7795 		if (error->code == GOT_ERR_NOT_WORKTREE)
7796 			error = wrap_not_worktree_error(error, "commit", cwd);
7797 		goto done;
7798 	}
7799 
7800 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7801 	if (error)
7802 		goto done;
7803 	if (rebase_in_progress) {
7804 		error = got_error(GOT_ERR_REBASING);
7805 		goto done;
7806 	}
7807 
7808 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
7809 	    worktree);
7810 	if (error)
7811 		goto done;
7812 
7813 	error = get_gitconfig_path(&gitconfig_path);
7814 	if (error)
7815 		goto done;
7816 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7817 	    gitconfig_path);
7818 	if (error != NULL)
7819 		goto done;
7820 
7821 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7822 	if (error)
7823 		goto done;
7824 	if (merge_in_progress) {
7825 		error = got_error(GOT_ERR_MERGE_BUSY);
7826 		goto done;
7827 	}
7828 
7829 	error = get_author(&author, repo, worktree);
7830 	if (error)
7831 		return error;
7832 
7833 	/*
7834 	 * unveil(2) traverses exec(2); if an editor is used we have
7835 	 * to apply unveil after the log message has been written.
7836 	 */
7837 	if (logmsg == NULL || strlen(logmsg) == 0)
7838 		error = get_editor(&editor);
7839 	else
7840 		error = apply_unveil(got_repo_get_path(repo), 0,
7841 		    got_worktree_get_root_path(worktree));
7842 	if (error)
7843 		goto done;
7844 
7845 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7846 	if (error)
7847 		goto done;
7848 
7849 	cl_arg.editor = editor;
7850 	cl_arg.cmdline_log = logmsg;
7851 	cl_arg.prepared_log = prepared_logmsg;
7852 	cl_arg.non_interactive = non_interactive;
7853 	cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7854 	cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7855 	if (!histedit_in_progress) {
7856 		if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7857 			error = got_error(GOT_ERR_COMMIT_BRANCH);
7858 			goto done;
7859 		}
7860 		cl_arg.branch_name += 11;
7861 	}
7862 	cl_arg.repo_path = got_repo_get_path(repo);
7863 	error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7864 	    allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7865 	    print_status, NULL, repo);
7866 	if (error) {
7867 		if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7868 		    cl_arg.logmsg_path != NULL)
7869 			preserve_logmsg = 1;
7870 		goto done;
7871 	}
7872 
7873 	error = got_object_id_str(&id_str, id);
7874 	if (error)
7875 		goto done;
7876 	printf("Created commit %s\n", id_str);
7877 done:
7878 	if (preserve_logmsg) {
7879 		fprintf(stderr, "%s: log message preserved in %s\n",
7880 		    getprogname(), cl_arg.logmsg_path);
7881 	} else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7882 	    error == NULL)
7883 		error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7884 	free(cl_arg.logmsg_path);
7885 	if (repo) {
7886 		const struct got_error *close_err = got_repo_close(repo);
7887 		if (error == NULL)
7888 			error = close_err;
7889 	}
7890 	if (worktree)
7891 		got_worktree_close(worktree);
7892 	free(cwd);
7893 	free(id_str);
7894 	free(gitconfig_path);
7895 	free(editor);
7896 	free(author);
7897 	free(prepared_logmsg);
7898 	return error;
7899 }
7900 
7901 __dead static void
7902 usage_send(void)
7903 {
7904 	fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
7905 	    "[-r repository-path] [-t tag] [-T] [-q] [-v] "
7906 	    "[remote-repository]\n", getprogname());
7907 	exit(1);
7908 }
7909 
7910 static void
7911 print_load_info(int print_colored, int print_found, int print_trees,
7912     int ncolored, int nfound, int ntrees)
7913 {
7914 	if (print_colored) {
7915 		printf("%d commit%s colored", ncolored,
7916 		    ncolored == 1 ? "" : "s");
7917 	}
7918 	if (print_found) {
7919 		printf("%s%d object%s found",
7920 		    ncolored > 0 ? "; " : "",
7921 		    nfound, nfound == 1 ? "" : "s");
7922 	}
7923 	if (print_trees) {
7924 		printf("; %d tree%s scanned", ntrees,
7925 		    ntrees == 1 ? "" : "s");
7926 	}
7927 }
7928 
7929 struct got_send_progress_arg {
7930 	char last_scaled_packsize[FMT_SCALED_STRSIZE];
7931 	int verbosity;
7932 	int last_ncolored;
7933 	int last_nfound;
7934 	int last_ntrees;
7935 	int loading_done;
7936 	int last_ncommits;
7937 	int last_nobj_total;
7938 	int last_p_deltify;
7939 	int last_p_written;
7940 	int last_p_sent;
7941 	int printed_something;
7942 	int sent_something;
7943 	struct got_pathlist_head *delete_branches;
7944 };
7945 
7946 static const struct got_error *
7947 send_progress(void *arg, int ncolored, int nfound, int ntrees,
7948     off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
7949     int nobj_written, off_t bytes_sent, const char *refname, int success)
7950 {
7951 	struct got_send_progress_arg *a = arg;
7952 	char scaled_packsize[FMT_SCALED_STRSIZE];
7953 	char scaled_sent[FMT_SCALED_STRSIZE];
7954 	int p_deltify = 0, p_written = 0, p_sent = 0;
7955 	int print_colored = 0, print_found = 0, print_trees = 0;
7956 	int print_searching = 0, print_total = 0;
7957 	int print_deltify = 0, print_written = 0, print_sent = 0;
7958 
7959 	if (a->verbosity < 0)
7960 		return NULL;
7961 
7962 	if (refname) {
7963 		const char *status = success ? "accepted" : "rejected";
7964 
7965 		if (success) {
7966 			struct got_pathlist_entry *pe;
7967 			TAILQ_FOREACH(pe, a->delete_branches, entry) {
7968 				const char *branchname = pe->path;
7969 				if (got_path_cmp(branchname, refname,
7970 				    strlen(branchname), strlen(refname)) == 0) {
7971 					status = "deleted";
7972 					a->sent_something = 1;
7973 					break;
7974 				}
7975 			}
7976 		}
7977 
7978 		if (a->printed_something)
7979 			putchar('\n');
7980 		printf("Server has %s %s", status, refname);
7981 		a->printed_something = 1;
7982 		return NULL;
7983 	}
7984 
7985 	if (a->last_ncolored != ncolored) {
7986 		print_colored = 1;
7987 		a->last_ncolored = ncolored;
7988 	}
7989 
7990 	if (a->last_nfound != nfound) {
7991 		print_colored = 1;
7992 		print_found = 1;
7993 		a->last_nfound = nfound;
7994 	}
7995 
7996 	if (a->last_ntrees != ntrees) {
7997 		print_colored = 1;
7998 		print_found = 1;
7999 		print_trees = 1;
8000 		a->last_ntrees = ntrees;
8001 	}
8002 
8003 	if ((print_colored || print_found || print_trees) &&
8004 	    !a->loading_done) {
8005 		printf("\r");
8006 		print_load_info(print_colored, print_found, print_trees,
8007 		    ncolored, nfound, ntrees);
8008 		a->printed_something = 1;
8009 		fflush(stdout);
8010 		return NULL;
8011 	} else if (!a->loading_done) {
8012 		printf("\r");
8013 		print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8014 		printf("\n");
8015 		a->loading_done = 1;
8016 	}
8017 
8018 	if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8019 		return got_error_from_errno("fmt_scaled");
8020 	if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8021 		return got_error_from_errno("fmt_scaled");
8022 
8023 	if (a->last_ncommits != ncommits) {
8024 		print_searching = 1;
8025 		a->last_ncommits = ncommits;
8026 	}
8027 
8028 	if (a->last_nobj_total != nobj_total) {
8029 		print_searching = 1;
8030 		print_total = 1;
8031 		a->last_nobj_total = nobj_total;
8032 	}
8033 
8034 	if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8035 	    strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8036 		if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8037 		    FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8038 			return got_error(GOT_ERR_NO_SPACE);
8039 	}
8040 
8041 	if (nobj_deltify > 0 || nobj_written > 0) {
8042 		if (nobj_deltify > 0) {
8043 			p_deltify = (nobj_deltify * 100) / nobj_total;
8044 			if (p_deltify != a->last_p_deltify) {
8045 				a->last_p_deltify = p_deltify;
8046 				print_searching = 1;
8047 				print_total = 1;
8048 				print_deltify = 1;
8049 			}
8050 		}
8051 		if (nobj_written > 0) {
8052 			p_written = (nobj_written * 100) / nobj_total;
8053 			if (p_written != a->last_p_written) {
8054 				a->last_p_written = p_written;
8055 				print_searching = 1;
8056 				print_total = 1;
8057 				print_deltify = 1;
8058 				print_written = 1;
8059 			}
8060 		}
8061 	}
8062 
8063 	if (bytes_sent > 0) {
8064 		p_sent = (bytes_sent * 100) / packfile_size;
8065 		if (p_sent != a->last_p_sent) {
8066 			a->last_p_sent = p_sent;
8067 			print_searching = 1;
8068 			print_total = 1;
8069 			print_deltify = 1;
8070 			print_written = 1;
8071 			print_sent = 1;
8072 		}
8073 		a->sent_something = 1;
8074 	}
8075 
8076 	if (print_searching || print_total || print_deltify || print_written ||
8077 	    print_sent)
8078 		printf("\r");
8079 	if (print_searching)
8080 		printf("packing %d reference%s", ncommits,
8081 		    ncommits == 1 ? "" : "s");
8082 	if (print_total)
8083 		printf("; %d object%s", nobj_total,
8084 		    nobj_total == 1 ? "" : "s");
8085 	if (print_deltify)
8086 		printf("; deltify: %d%%", p_deltify);
8087 	if (print_sent)
8088 		printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8089 		    scaled_packsize, p_sent);
8090 	else if (print_written)
8091 		printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8092 		    scaled_packsize, p_written);
8093 	if (print_searching || print_total || print_deltify ||
8094 	    print_written || print_sent) {
8095 		a->printed_something = 1;
8096 		fflush(stdout);
8097 	}
8098 	return NULL;
8099 }
8100 
8101 static const struct got_error *
8102 cmd_send(int argc, char *argv[])
8103 {
8104 	const struct got_error *error = NULL;
8105 	char *cwd = NULL, *repo_path = NULL;
8106 	const char *remote_name;
8107 	char *proto = NULL, *host = NULL, *port = NULL;
8108 	char *repo_name = NULL, *server_path = NULL;
8109 	const struct got_remote_repo *remotes, *remote = NULL;
8110 	int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
8111 	struct got_repository *repo = NULL;
8112 	struct got_worktree *worktree = NULL;
8113 	const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8114 	struct got_pathlist_head branches;
8115 	struct got_pathlist_head tags;
8116 	struct got_reflist_head all_branches;
8117 	struct got_reflist_head all_tags;
8118 	struct got_pathlist_head delete_args;
8119 	struct got_pathlist_head delete_branches;
8120 	struct got_reflist_entry *re;
8121 	struct got_pathlist_entry *pe;
8122 	int i, ch, sendfd = -1, sendstatus;
8123 	pid_t sendpid = -1;
8124 	struct got_send_progress_arg spa;
8125 	int verbosity = 0, overwrite_refs = 0;
8126 	int send_all_branches = 0, send_all_tags = 0;
8127 	struct got_reference *ref = NULL;
8128 
8129 	TAILQ_INIT(&branches);
8130 	TAILQ_INIT(&tags);
8131 	TAILQ_INIT(&all_branches);
8132 	TAILQ_INIT(&all_tags);
8133 	TAILQ_INIT(&delete_args);
8134 	TAILQ_INIT(&delete_branches);
8135 
8136 	while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8137 		switch (ch) {
8138 		case 'a':
8139 			send_all_branches = 1;
8140 			break;
8141 		case 'b':
8142 			error = got_pathlist_append(&branches, optarg, NULL);
8143 			if (error)
8144 				return error;
8145 			nbranches++;
8146 			break;
8147 		case 'd':
8148 			error = got_pathlist_append(&delete_args, optarg, NULL);
8149 			if (error)
8150 				return error;
8151 			break;
8152 		case 'f':
8153 			overwrite_refs = 1;
8154 			break;
8155 		case 'r':
8156 			repo_path = realpath(optarg, NULL);
8157 			if (repo_path == NULL)
8158 				return got_error_from_errno2("realpath",
8159 				    optarg);
8160 			got_path_strip_trailing_slashes(repo_path);
8161 			break;
8162 		case 't':
8163 			error = got_pathlist_append(&tags, optarg, NULL);
8164 			if (error)
8165 				return error;
8166 			ntags++;
8167 			break;
8168 		case 'T':
8169 			send_all_tags = 1;
8170 			break;
8171 		case 'v':
8172 			if (verbosity < 0)
8173 				verbosity = 0;
8174 			else if (verbosity < 3)
8175 				verbosity++;
8176 			break;
8177 		case 'q':
8178 			verbosity = -1;
8179 			break;
8180 		default:
8181 			usage_send();
8182 			/* NOTREACHED */
8183 		}
8184 	}
8185 	argc -= optind;
8186 	argv += optind;
8187 
8188 	if (send_all_branches && !TAILQ_EMPTY(&branches))
8189 		option_conflict('a', 'b');
8190 	if (send_all_tags && !TAILQ_EMPTY(&tags))
8191 		option_conflict('T', 't');
8192 
8193 
8194 	if (argc == 0)
8195 		remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8196 	else if (argc == 1)
8197 		remote_name = argv[0];
8198 	else
8199 		usage_send();
8200 
8201 	cwd = getcwd(NULL, 0);
8202 	if (cwd == NULL) {
8203 		error = got_error_from_errno("getcwd");
8204 		goto done;
8205 	}
8206 
8207 	if (repo_path == NULL) {
8208 		error = got_worktree_open(&worktree, cwd);
8209 		if (error && error->code != GOT_ERR_NOT_WORKTREE)
8210 			goto done;
8211 		else
8212 			error = NULL;
8213 		if (worktree) {
8214 			repo_path =
8215 			    strdup(got_worktree_get_repo_path(worktree));
8216 			if (repo_path == NULL)
8217 				error = got_error_from_errno("strdup");
8218 			if (error)
8219 				goto done;
8220 		} else {
8221 			repo_path = strdup(cwd);
8222 			if (repo_path == NULL) {
8223 				error = got_error_from_errno("strdup");
8224 				goto done;
8225 			}
8226 		}
8227 	}
8228 
8229 	error = got_repo_open(&repo, repo_path, NULL);
8230 	if (error)
8231 		goto done;
8232 
8233 	if (worktree) {
8234 		worktree_conf = got_worktree_get_gotconfig(worktree);
8235 		if (worktree_conf) {
8236 			got_gotconfig_get_remotes(&nremotes, &remotes,
8237 			    worktree_conf);
8238 			for (i = 0; i < nremotes; i++) {
8239 				if (strcmp(remotes[i].name, remote_name) == 0) {
8240 					remote = &remotes[i];
8241 					break;
8242 				}
8243 			}
8244 		}
8245 	}
8246 	if (remote == NULL) {
8247 		repo_conf = got_repo_get_gotconfig(repo);
8248 		if (repo_conf) {
8249 			got_gotconfig_get_remotes(&nremotes, &remotes,
8250 			    repo_conf);
8251 			for (i = 0; i < nremotes; i++) {
8252 				if (strcmp(remotes[i].name, remote_name) == 0) {
8253 					remote = &remotes[i];
8254 					break;
8255 				}
8256 			}
8257 		}
8258 	}
8259 	if (remote == NULL) {
8260 		got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8261 		for (i = 0; i < nremotes; i++) {
8262 			if (strcmp(remotes[i].name, remote_name) == 0) {
8263 				remote = &remotes[i];
8264 				break;
8265 			}
8266 		}
8267 	}
8268 	if (remote == NULL) {
8269 		error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8270 		goto done;
8271 	}
8272 
8273 	error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8274 	    &repo_name, remote->send_url);
8275 	if (error)
8276 		goto done;
8277 
8278 	if (strcmp(proto, "git") == 0) {
8279 #ifndef PROFILE
8280 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8281 		    "sendfd dns inet unveil", NULL) == -1)
8282 			err(1, "pledge");
8283 #endif
8284 	} else if (strcmp(proto, "git+ssh") == 0 ||
8285 	    strcmp(proto, "ssh") == 0) {
8286 #ifndef PROFILE
8287 		if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8288 		    "sendfd unveil", NULL) == -1)
8289 			err(1, "pledge");
8290 #endif
8291 	} else if (strcmp(proto, "http") == 0 ||
8292 	    strcmp(proto, "git+http") == 0) {
8293 		error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8294 		goto done;
8295 	} else {
8296 		error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8297 		goto done;
8298 	}
8299 
8300 	error = got_dial_apply_unveil(proto);
8301 	if (error)
8302 		goto done;
8303 
8304 	error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8305 	if (error)
8306 		goto done;
8307 
8308 	if (send_all_branches) {
8309 		error = got_ref_list(&all_branches, repo, "refs/heads",
8310 		    got_ref_cmp_by_name, NULL);
8311 		if (error)
8312 			goto done;
8313 		TAILQ_FOREACH(re, &all_branches, entry) {
8314 			const char *branchname = got_ref_get_name(re->ref);
8315 			error = got_pathlist_append(&branches,
8316 			    branchname, NULL);
8317 			if (error)
8318 				goto done;
8319 			nbranches++;
8320 		}
8321 	} else if (nbranches == 0) {
8322 		for (i = 0; i < remote->nsend_branches; i++) {
8323 			got_pathlist_append(&branches,
8324 			    remote->send_branches[i], NULL);
8325 		}
8326 	}
8327 
8328 	if (send_all_tags) {
8329 		error = got_ref_list(&all_tags, repo, "refs/tags",
8330 		    got_ref_cmp_by_name, NULL);
8331 		if (error)
8332 			goto done;
8333 		TAILQ_FOREACH(re, &all_tags, entry) {
8334 			const char *tagname = got_ref_get_name(re->ref);
8335 			error = got_pathlist_append(&tags,
8336 			    tagname, NULL);
8337 			if (error)
8338 				goto done;
8339 			ntags++;
8340 		}
8341 	}
8342 
8343 	/*
8344 	 * To prevent accidents only branches in refs/heads/ can be deleted
8345 	 * with 'got send -d'.
8346 	 * Deleting anything else requires local repository access or Git.
8347 	 */
8348 	TAILQ_FOREACH(pe, &delete_args, entry) {
8349 		const char *branchname = pe->path;
8350 		char *s;
8351 		struct got_pathlist_entry *new;
8352 		if (strncmp(branchname, "refs/heads/", 11) == 0) {
8353 			s = strdup(branchname);
8354 			if (s == NULL) {
8355 				error = got_error_from_errno("strdup");
8356 				goto done;
8357 			}
8358 		} else {
8359 			if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8360 				error = got_error_from_errno("asprintf");
8361 				goto done;
8362 			}
8363 		}
8364 		error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8365 		if (error || new == NULL /* duplicate */)
8366 			free(s);
8367 		if (error)
8368 			goto done;
8369 		ndelete_branches++;
8370 	}
8371 
8372 	if (nbranches == 0 && ndelete_branches == 0) {
8373 		struct got_reference *head_ref;
8374 		if (worktree)
8375 			error = got_ref_open(&head_ref, repo,
8376 			    got_worktree_get_head_ref_name(worktree), 0);
8377 		else
8378 			error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8379 		if (error)
8380 			goto done;
8381 		if (got_ref_is_symbolic(head_ref)) {
8382 			error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8383 			got_ref_close(head_ref);
8384 			if (error)
8385 				goto done;
8386 		} else
8387 			ref = head_ref;
8388 		error = got_pathlist_append(&branches, got_ref_get_name(ref),
8389 		    NULL);
8390 		if (error)
8391 			goto done;
8392 		nbranches++;
8393 	}
8394 
8395 	if (verbosity >= 0)
8396 		printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8397 		    port ? ":" : "", port ? port : "");
8398 
8399 	error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8400 	    server_path, verbosity);
8401 	if (error)
8402 		goto done;
8403 
8404 	memset(&spa, 0, sizeof(spa));
8405 	spa.last_scaled_packsize[0] = '\0';
8406 	spa.last_p_deltify = -1;
8407 	spa.last_p_written = -1;
8408 	spa.verbosity = verbosity;
8409 	spa.delete_branches = &delete_branches;
8410 	error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8411 	    verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8412 	    check_cancelled, NULL);
8413 	if (spa.printed_something)
8414 		putchar('\n');
8415 	if (error)
8416 		goto done;
8417 	if (!spa.sent_something && verbosity >= 0)
8418 		printf("Already up-to-date\n");
8419 done:
8420 	if (sendpid > 0) {
8421 		if (kill(sendpid, SIGTERM) == -1)
8422 			error = got_error_from_errno("kill");
8423 		if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8424 			error = got_error_from_errno("waitpid");
8425 	}
8426 	if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8427 		error = got_error_from_errno("close");
8428 	if (repo) {
8429 		const struct got_error *close_err = got_repo_close(repo);
8430 		if (error == NULL)
8431 			error = close_err;
8432 	}
8433 	if (worktree)
8434 		got_worktree_close(worktree);
8435 	if (ref)
8436 		got_ref_close(ref);
8437 	got_pathlist_free(&branches);
8438 	got_pathlist_free(&tags);
8439 	got_ref_list_free(&all_branches);
8440 	got_ref_list_free(&all_tags);
8441 	got_pathlist_free(&delete_args);
8442 	TAILQ_FOREACH(pe, &delete_branches, entry)
8443 		free((char *)pe->path);
8444 	got_pathlist_free(&delete_branches);
8445 	free(cwd);
8446 	free(repo_path);
8447 	free(proto);
8448 	free(host);
8449 	free(port);
8450 	free(server_path);
8451 	free(repo_name);
8452 	return error;
8453 }
8454 
8455 __dead static void
8456 usage_cherrypick(void)
8457 {
8458 	fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8459 	exit(1);
8460 }
8461 
8462 static const struct got_error *
8463 cmd_cherrypick(int argc, char *argv[])
8464 {
8465 	const struct got_error *error = NULL;
8466 	struct got_worktree *worktree = NULL;
8467 	struct got_repository *repo = NULL;
8468 	char *cwd = NULL, *commit_id_str = NULL;
8469 	struct got_object_id *commit_id = NULL;
8470 	struct got_commit_object *commit = NULL;
8471 	struct got_object_qid *pid;
8472 	int ch;
8473 	struct got_update_progress_arg upa;
8474 
8475 	while ((ch = getopt(argc, argv, "")) != -1) {
8476 		switch (ch) {
8477 		default:
8478 			usage_cherrypick();
8479 			/* NOTREACHED */
8480 		}
8481 	}
8482 
8483 	argc -= optind;
8484 	argv += optind;
8485 
8486 #ifndef PROFILE
8487 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8488 	    "unveil", NULL) == -1)
8489 		err(1, "pledge");
8490 #endif
8491 	if (argc != 1)
8492 		usage_cherrypick();
8493 
8494 	cwd = getcwd(NULL, 0);
8495 	if (cwd == NULL) {
8496 		error = got_error_from_errno("getcwd");
8497 		goto done;
8498 	}
8499 	error = got_worktree_open(&worktree, cwd);
8500 	if (error) {
8501 		if (error->code == GOT_ERR_NOT_WORKTREE)
8502 			error = wrap_not_worktree_error(error, "cherrypick",
8503 			    cwd);
8504 		goto done;
8505 	}
8506 
8507 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8508 	    NULL);
8509 	if (error != NULL)
8510 		goto done;
8511 
8512 	error = apply_unveil(got_repo_get_path(repo), 0,
8513 	    got_worktree_get_root_path(worktree));
8514 	if (error)
8515 		goto done;
8516 
8517 	error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8518 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
8519 	if (error)
8520 		goto done;
8521 	error = got_object_id_str(&commit_id_str, commit_id);
8522 	if (error)
8523 		goto done;
8524 
8525 	error = got_object_open_as_commit(&commit, repo, commit_id);
8526 	if (error)
8527 		goto done;
8528 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8529 	memset(&upa, 0, sizeof(upa));
8530 	error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
8531 	    commit_id, repo, update_progress, &upa, check_cancelled,
8532 	    NULL);
8533 	if (error != NULL)
8534 		goto done;
8535 
8536 	if (upa.did_something)
8537 		printf("Merged commit %s\n", commit_id_str);
8538 	print_merge_progress_stats(&upa);
8539 done:
8540 	if (commit)
8541 		got_object_commit_close(commit);
8542 	free(commit_id_str);
8543 	if (worktree)
8544 		got_worktree_close(worktree);
8545 	if (repo) {
8546 		const struct got_error *close_err = got_repo_close(repo);
8547 		if (error == NULL)
8548 			error = close_err;
8549 	}
8550 	return error;
8551 }
8552 
8553 __dead static void
8554 usage_backout(void)
8555 {
8556 	fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
8557 	exit(1);
8558 }
8559 
8560 static const struct got_error *
8561 cmd_backout(int argc, char *argv[])
8562 {
8563 	const struct got_error *error = NULL;
8564 	struct got_worktree *worktree = NULL;
8565 	struct got_repository *repo = NULL;
8566 	char *cwd = NULL, *commit_id_str = NULL;
8567 	struct got_object_id *commit_id = NULL;
8568 	struct got_commit_object *commit = NULL;
8569 	struct got_object_qid *pid;
8570 	int ch;
8571 	struct got_update_progress_arg upa;
8572 
8573 	while ((ch = getopt(argc, argv, "")) != -1) {
8574 		switch (ch) {
8575 		default:
8576 			usage_backout();
8577 			/* NOTREACHED */
8578 		}
8579 	}
8580 
8581 	argc -= optind;
8582 	argv += optind;
8583 
8584 #ifndef PROFILE
8585 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8586 	    "unveil", NULL) == -1)
8587 		err(1, "pledge");
8588 #endif
8589 	if (argc != 1)
8590 		usage_backout();
8591 
8592 	cwd = getcwd(NULL, 0);
8593 	if (cwd == NULL) {
8594 		error = got_error_from_errno("getcwd");
8595 		goto done;
8596 	}
8597 	error = got_worktree_open(&worktree, cwd);
8598 	if (error) {
8599 		if (error->code == GOT_ERR_NOT_WORKTREE)
8600 			error = wrap_not_worktree_error(error, "backout", cwd);
8601 		goto done;
8602 	}
8603 
8604 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8605 	    NULL);
8606 	if (error != NULL)
8607 		goto done;
8608 
8609 	error = apply_unveil(got_repo_get_path(repo), 0,
8610 	    got_worktree_get_root_path(worktree));
8611 	if (error)
8612 		goto done;
8613 
8614 	error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8615 	    GOT_OBJ_TYPE_COMMIT, NULL, repo);
8616 	if (error)
8617 		goto done;
8618 	error = got_object_id_str(&commit_id_str, commit_id);
8619 	if (error)
8620 		goto done;
8621 
8622 	error = got_object_open_as_commit(&commit, repo, commit_id);
8623 	if (error)
8624 		goto done;
8625 	pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8626 	if (pid == NULL) {
8627 		error = got_error(GOT_ERR_ROOT_COMMIT);
8628 		goto done;
8629 	}
8630 
8631 	memset(&upa, 0, sizeof(upa));
8632 	error = got_worktree_merge_files(worktree, commit_id, pid->id,
8633 	    repo, update_progress, &upa, check_cancelled, NULL);
8634 	if (error != NULL)
8635 		goto done;
8636 
8637 	if (upa.did_something)
8638 		printf("Backed out commit %s\n", commit_id_str);
8639 	print_merge_progress_stats(&upa);
8640 done:
8641 	if (commit)
8642 		got_object_commit_close(commit);
8643 	free(commit_id_str);
8644 	if (worktree)
8645 		got_worktree_close(worktree);
8646 	if (repo) {
8647 		const struct got_error *close_err = got_repo_close(repo);
8648 		if (error == NULL)
8649 			error = close_err;
8650 	}
8651 	return error;
8652 }
8653 
8654 __dead static void
8655 usage_rebase(void)
8656 {
8657 	fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
8658 	    getprogname());
8659 	exit(1);
8660 }
8661 
8662 void
8663 trim_logmsg(char *logmsg, int limit)
8664 {
8665 	char *nl;
8666 	size_t len;
8667 
8668 	len = strlen(logmsg);
8669 	if (len > limit)
8670 		len = limit;
8671 	logmsg[len] = '\0';
8672 	nl = strchr(logmsg, '\n');
8673 	if (nl)
8674 		*nl = '\0';
8675 }
8676 
8677 static const struct got_error *
8678 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
8679 {
8680 	const struct got_error *err;
8681 	char *logmsg0 = NULL;
8682 	const char *s;
8683 
8684 	err = got_object_commit_get_logmsg(&logmsg0, commit);
8685 	if (err)
8686 		return err;
8687 
8688 	s = logmsg0;
8689 	while (isspace((unsigned char)s[0]))
8690 		s++;
8691 
8692 	*logmsg = strdup(s);
8693 	if (*logmsg == NULL) {
8694 		err = got_error_from_errno("strdup");
8695 		goto done;
8696 	}
8697 
8698 	trim_logmsg(*logmsg, limit);
8699 done:
8700 	free(logmsg0);
8701 	return err;
8702 }
8703 
8704 static const struct got_error *
8705 show_rebase_merge_conflict(struct got_object_id *id,
8706     struct got_repository *repo)
8707 {
8708 	const struct got_error *err;
8709 	struct got_commit_object *commit = NULL;
8710 	char *id_str = NULL, *logmsg = NULL;
8711 
8712 	err = got_object_open_as_commit(&commit, repo, id);
8713 	if (err)
8714 		return err;
8715 
8716 	err = got_object_id_str(&id_str, id);
8717 	if (err)
8718 		goto done;
8719 
8720 	id_str[12] = '\0';
8721 
8722 	err = get_short_logmsg(&logmsg, 42, commit);
8723 	if (err)
8724 		goto done;
8725 
8726 	printf("%s -> merge conflict: %s\n", id_str, logmsg);
8727 done:
8728 	free(id_str);
8729 	got_object_commit_close(commit);
8730 	free(logmsg);
8731 	return err;
8732 }
8733 
8734 static const struct got_error *
8735 show_rebase_progress(struct got_commit_object *commit,
8736     struct got_object_id *old_id, struct got_object_id *new_id)
8737 {
8738 	const struct got_error *err;
8739 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8740 
8741 	err = got_object_id_str(&old_id_str, old_id);
8742 	if (err)
8743 		goto done;
8744 
8745 	if (new_id) {
8746 		err = got_object_id_str(&new_id_str, new_id);
8747 		if (err)
8748 			goto done;
8749 	}
8750 
8751 	old_id_str[12] = '\0';
8752 	if (new_id_str)
8753 		new_id_str[12] = '\0';
8754 
8755 	err = get_short_logmsg(&logmsg, 42, commit);
8756 	if (err)
8757 		goto done;
8758 
8759 	printf("%s -> %s: %s\n", old_id_str,
8760 	    new_id_str ? new_id_str : "no-op change", logmsg);
8761 done:
8762 	free(old_id_str);
8763 	free(new_id_str);
8764 	free(logmsg);
8765 	return err;
8766 }
8767 
8768 static const struct got_error *
8769 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
8770     struct got_reference *branch, struct got_reference *new_base_branch,
8771     struct got_reference *tmp_branch, struct got_repository *repo,
8772     int create_backup)
8773 {
8774 	printf("Switching work tree to %s\n", got_ref_get_name(branch));
8775 	return got_worktree_rebase_complete(worktree, fileindex,
8776 	    new_base_branch, tmp_branch, branch, repo, create_backup);
8777 }
8778 
8779 static const struct got_error *
8780 rebase_commit(struct got_pathlist_head *merged_paths,
8781     struct got_worktree *worktree, struct got_fileindex *fileindex,
8782     struct got_reference *tmp_branch,
8783     struct got_object_id *commit_id, struct got_repository *repo)
8784 {
8785 	const struct got_error *error;
8786 	struct got_commit_object *commit;
8787 	struct got_object_id *new_commit_id;
8788 
8789 	error = got_object_open_as_commit(&commit, repo, commit_id);
8790 	if (error)
8791 		return error;
8792 
8793 	error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
8794 	    worktree, fileindex, tmp_branch, commit, commit_id, repo);
8795 	if (error) {
8796 		if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
8797 			goto done;
8798 		error = show_rebase_progress(commit, commit_id, NULL);
8799 	} else {
8800 		error = show_rebase_progress(commit, commit_id, new_commit_id);
8801 		free(new_commit_id);
8802 	}
8803 done:
8804 	got_object_commit_close(commit);
8805 	return error;
8806 }
8807 
8808 struct check_path_prefix_arg {
8809 	const char *path_prefix;
8810 	size_t len;
8811 	int errcode;
8812 };
8813 
8814 static const struct got_error *
8815 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
8816     struct got_blob_object *blob2, struct got_object_id *id1,
8817     struct got_object_id *id2, const char *path1, const char *path2,
8818     mode_t mode1, mode_t mode2, struct got_repository *repo)
8819 {
8820 	struct check_path_prefix_arg *a = arg;
8821 
8822 	if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
8823 	    (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
8824 		return got_error(a->errcode);
8825 
8826 	return NULL;
8827 }
8828 
8829 static const struct got_error *
8830 check_path_prefix(struct got_object_id *parent_id,
8831     struct got_object_id *commit_id, const char *path_prefix,
8832     int errcode, struct got_repository *repo)
8833 {
8834 	const struct got_error *err;
8835 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
8836 	struct got_commit_object *commit = NULL, *parent_commit = NULL;
8837 	struct check_path_prefix_arg cpp_arg;
8838 
8839 	if (got_path_is_root_dir(path_prefix))
8840 		return NULL;
8841 
8842 	err = got_object_open_as_commit(&commit, repo, commit_id);
8843 	if (err)
8844 		goto done;
8845 
8846 	err = got_object_open_as_commit(&parent_commit, repo, parent_id);
8847 	if (err)
8848 		goto done;
8849 
8850 	err = got_object_open_as_tree(&tree1, repo,
8851 	    got_object_commit_get_tree_id(parent_commit));
8852 	if (err)
8853 		goto done;
8854 
8855 	err = got_object_open_as_tree(&tree2, repo,
8856 	    got_object_commit_get_tree_id(commit));
8857 	if (err)
8858 		goto done;
8859 
8860 	cpp_arg.path_prefix = path_prefix;
8861 	while (cpp_arg.path_prefix[0] == '/')
8862 		cpp_arg.path_prefix++;
8863 	cpp_arg.len = strlen(cpp_arg.path_prefix);
8864 	cpp_arg.errcode = errcode;
8865 	err = got_diff_tree(tree1, tree2, "", "", repo,
8866 	    check_path_prefix_in_diff, &cpp_arg, 0);
8867 done:
8868 	if (tree1)
8869 		got_object_tree_close(tree1);
8870 	if (tree2)
8871 		got_object_tree_close(tree2);
8872 	if (commit)
8873 		got_object_commit_close(commit);
8874 	if (parent_commit)
8875 		got_object_commit_close(parent_commit);
8876 	return err;
8877 }
8878 
8879 static const struct got_error *
8880 collect_commits(struct got_object_id_queue *commits,
8881     struct got_object_id *initial_commit_id,
8882     struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
8883     const char *path_prefix, int path_prefix_errcode,
8884     struct got_repository *repo)
8885 {
8886 	const struct got_error *err = NULL;
8887 	struct got_commit_graph *graph = NULL;
8888 	struct got_object_id *parent_id = NULL;
8889 	struct got_object_qid *qid;
8890         struct got_object_id *commit_id = initial_commit_id;
8891 
8892 	err = got_commit_graph_open(&graph, "/", 1);
8893 	if (err)
8894 		return err;
8895 
8896 	err = got_commit_graph_iter_start(graph, iter_start_id, repo,
8897 	    check_cancelled, NULL);
8898 	if (err)
8899 		goto done;
8900 	while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
8901 		err = got_commit_graph_iter_next(&parent_id, graph, repo,
8902 		    check_cancelled, NULL);
8903 		if (err) {
8904 			if (err->code == GOT_ERR_ITER_COMPLETED) {
8905 				err = got_error_msg(GOT_ERR_ANCESTRY,
8906 				    "ran out of commits to rebase before "
8907 				    "youngest common ancestor commit has "
8908 				    "been reached?!?");
8909 			}
8910 			goto done;
8911 		} else {
8912 			err = check_path_prefix(parent_id, commit_id,
8913 			    path_prefix, path_prefix_errcode, repo);
8914 			if (err)
8915 				goto done;
8916 
8917 			err = got_object_qid_alloc(&qid, commit_id);
8918 			if (err)
8919 				goto done;
8920 			STAILQ_INSERT_HEAD(commits, qid, entry);
8921 			commit_id = parent_id;
8922 		}
8923 	}
8924 done:
8925 	got_commit_graph_close(graph);
8926 	return err;
8927 }
8928 
8929 static const struct got_error *
8930 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
8931 {
8932 	const struct got_error *err = NULL;
8933 	time_t committer_time;
8934 	struct tm tm;
8935 	char datebuf[11]; /* YYYY-MM-DD + NUL */
8936 	char *author0 = NULL, *author, *smallerthan;
8937 	char *logmsg0 = NULL, *logmsg, *newline;
8938 
8939 	committer_time = got_object_commit_get_committer_time(commit);
8940 	if (gmtime_r(&committer_time, &tm) == NULL)
8941 		return got_error_from_errno("gmtime_r");
8942 	if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
8943 		return got_error(GOT_ERR_NO_SPACE);
8944 
8945 	author0 = strdup(got_object_commit_get_author(commit));
8946 	if (author0 == NULL)
8947 		return got_error_from_errno("strdup");
8948 	author = author0;
8949 	smallerthan = strchr(author, '<');
8950 	if (smallerthan && smallerthan[1] != '\0')
8951 		author = smallerthan + 1;
8952 	author[strcspn(author, "@>")] = '\0';
8953 
8954 	err = got_object_commit_get_logmsg(&logmsg0, commit);
8955 	if (err)
8956 		goto done;
8957 	logmsg = logmsg0;
8958 	while (*logmsg == '\n')
8959 		logmsg++;
8960 	newline = strchr(logmsg, '\n');
8961 	if (newline)
8962 		*newline = '\0';
8963 
8964 	if (asprintf(brief_str, "%s %s  %s",
8965 	    datebuf, author, logmsg) == -1)
8966 		err = got_error_from_errno("asprintf");
8967 done:
8968 	free(author0);
8969 	free(logmsg0);
8970 	return err;
8971 }
8972 
8973 static const struct got_error *
8974 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
8975     struct got_repository *repo)
8976 {
8977 	const struct got_error *err;
8978 	char *id_str;
8979 
8980 	err = got_object_id_str(&id_str, id);
8981 	if (err)
8982 		return err;
8983 
8984 	err = got_ref_delete(ref, repo);
8985 	if (err)
8986 		goto done;
8987 
8988 	printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
8989 done:
8990 	free(id_str);
8991 	return err;
8992 }
8993 
8994 static const struct got_error *
8995 print_backup_ref(const char *branch_name, const char *new_id_str,
8996     struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
8997     struct got_reflist_object_id_map *refs_idmap,
8998     struct got_repository *repo)
8999 {
9000 	const struct got_error *err = NULL;
9001 	struct got_reflist_head *refs;
9002 	char *refs_str = NULL;
9003 	struct got_object_id *new_commit_id = NULL;
9004 	struct got_commit_object *new_commit = NULL;
9005 	char *new_commit_brief_str = NULL;
9006 	struct got_object_id *yca_id = NULL;
9007 	struct got_commit_object *yca_commit = NULL;
9008 	char *yca_id_str = NULL, *yca_brief_str = NULL;
9009 	char *custom_refs_str;
9010 
9011 	if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9012 		return got_error_from_errno("asprintf");
9013 
9014 	err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9015 	    0, 0, refs_idmap, custom_refs_str);
9016 	if (err)
9017 		goto done;
9018 
9019 	err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9020 	if (err)
9021 		goto done;
9022 
9023 	refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9024 	if (refs) {
9025 		err = build_refs_str(&refs_str, refs, new_commit_id, repo);
9026 		if (err)
9027 			goto done;
9028 	}
9029 
9030 	err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9031 	if (err)
9032 		goto done;
9033 
9034 	err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9035 	if (err)
9036 		goto done;
9037 
9038 	err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9039 	    old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9040 	if (err)
9041 		goto done;
9042 
9043 	printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9044 	    refs_str ? " (" : "", refs_str ? refs_str : "",
9045 	    refs_str ? ")" : "", new_commit_brief_str);
9046 	if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9047 	    got_object_id_cmp(yca_id, old_commit_id) != 0) {
9048 		free(refs_str);
9049 		refs_str = NULL;
9050 
9051 		err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9052 		if (err)
9053 			goto done;
9054 
9055 		err = get_commit_brief_str(&yca_brief_str, yca_commit);
9056 		if (err)
9057 			goto done;
9058 
9059 		err = got_object_id_str(&yca_id_str, yca_id);
9060 		if (err)
9061 			goto done;
9062 
9063 		refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9064 		if (refs) {
9065 			err = build_refs_str(&refs_str, refs, yca_id, repo);
9066 			if (err)
9067 				goto done;
9068 		}
9069 		printf("history forked at %s%s%s%s\n %s\n",
9070 		    yca_id_str,
9071 		    refs_str ? " (" : "", refs_str ? refs_str : "",
9072 		    refs_str ? ")" : "", yca_brief_str);
9073 	}
9074 done:
9075 	free(custom_refs_str);
9076 	free(new_commit_id);
9077 	free(refs_str);
9078 	free(yca_id);
9079 	free(yca_id_str);
9080 	free(yca_brief_str);
9081 	if (new_commit)
9082 		got_object_commit_close(new_commit);
9083 	if (yca_commit)
9084 		got_object_commit_close(yca_commit);
9085 
9086 	return NULL;
9087 }
9088 
9089 static const struct got_error *
9090 process_backup_refs(const char *backup_ref_prefix,
9091     const char *wanted_branch_name,
9092     int delete, struct got_repository *repo)
9093 {
9094 	const struct got_error *err;
9095 	struct got_reflist_head refs, backup_refs;
9096 	struct got_reflist_entry *re;
9097 	const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9098 	struct got_object_id *old_commit_id = NULL;
9099 	char *branch_name = NULL;
9100 	struct got_commit_object *old_commit = NULL;
9101 	struct got_reflist_object_id_map *refs_idmap = NULL;
9102 	int wanted_branch_found = 0;
9103 
9104 	TAILQ_INIT(&refs);
9105 	TAILQ_INIT(&backup_refs);
9106 
9107 	err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9108 	if (err)
9109 		return err;
9110 
9111 	err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9112 	if (err)
9113 		goto done;
9114 
9115 	if (wanted_branch_name) {
9116 		if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9117 			wanted_branch_name += 11;
9118 	}
9119 
9120 	err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9121 	    got_ref_cmp_by_commit_timestamp_descending, repo);
9122 	if (err)
9123 		goto done;
9124 
9125 	TAILQ_FOREACH(re, &backup_refs, entry) {
9126 		const char *refname = got_ref_get_name(re->ref);
9127 		char *slash;
9128 
9129 		err = check_cancelled(NULL);
9130 		if (err)
9131 			break;
9132 
9133 		err = got_ref_resolve(&old_commit_id, repo, re->ref);
9134 		if (err)
9135 			break;
9136 
9137 		err = got_object_open_as_commit(&old_commit, repo,
9138 		    old_commit_id);
9139 		if (err)
9140 			break;
9141 
9142 		if (strncmp(backup_ref_prefix, refname,
9143 		    backup_ref_prefix_len) == 0)
9144 			refname += backup_ref_prefix_len;
9145 
9146 		while (refname[0] == '/')
9147 			refname++;
9148 
9149 		branch_name = strdup(refname);
9150 		if (branch_name == NULL) {
9151 			err = got_error_from_errno("strdup");
9152 			break;
9153 		}
9154 		slash = strrchr(branch_name, '/');
9155 		if (slash) {
9156 			*slash = '\0';
9157 			refname += strlen(branch_name) + 1;
9158 		}
9159 
9160 		if (wanted_branch_name == NULL ||
9161 		    strcmp(wanted_branch_name, branch_name) == 0) {
9162 			wanted_branch_found = 1;
9163 			if (delete) {
9164 				err = delete_backup_ref(re->ref,
9165 				    old_commit_id, repo);
9166 			} else {
9167 				err = print_backup_ref(branch_name, refname,
9168 				    old_commit_id, old_commit, refs_idmap,
9169 				    repo);
9170 			}
9171 			if (err)
9172 				break;
9173 		}
9174 
9175 		free(old_commit_id);
9176 		old_commit_id = NULL;
9177 		free(branch_name);
9178 		branch_name = NULL;
9179 		got_object_commit_close(old_commit);
9180 		old_commit = NULL;
9181 	}
9182 
9183 	if (wanted_branch_name && !wanted_branch_found) {
9184 		err = got_error_fmt(GOT_ERR_NOT_REF,
9185 		    "%s/%s/", backup_ref_prefix, wanted_branch_name);
9186 	}
9187 done:
9188 	if (refs_idmap)
9189 		got_reflist_object_id_map_free(refs_idmap);
9190 	got_ref_list_free(&refs);
9191 	got_ref_list_free(&backup_refs);
9192 	free(old_commit_id);
9193 	free(branch_name);
9194 	if (old_commit)
9195 		got_object_commit_close(old_commit);
9196 	return err;
9197 }
9198 
9199 static const struct got_error *
9200 abort_progress(void *arg, unsigned char status, const char *path)
9201 {
9202 	/*
9203 	 * Unversioned files should not clutter progress output when
9204 	 * an operation is aborted.
9205 	 */
9206 	if (status == GOT_STATUS_UNVERSIONED)
9207 		return NULL;
9208 
9209 	return update_progress(arg, status, path);
9210 }
9211 
9212 static const struct got_error *
9213 cmd_rebase(int argc, char *argv[])
9214 {
9215 	const struct got_error *error = NULL;
9216 	struct got_worktree *worktree = NULL;
9217 	struct got_repository *repo = NULL;
9218 	struct got_fileindex *fileindex = NULL;
9219 	char *cwd = NULL;
9220 	struct got_reference *branch = NULL;
9221 	struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9222 	struct got_object_id *commit_id = NULL, *parent_id = NULL;
9223 	struct got_object_id *resume_commit_id = NULL;
9224 	struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9225 	struct got_commit_object *commit = NULL;
9226 	int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9227 	int histedit_in_progress = 0, merge_in_progress = 0;
9228 	int create_backup = 1, list_backups = 0, delete_backups = 0;
9229 	struct got_object_id_queue commits;
9230 	struct got_pathlist_head merged_paths;
9231 	const struct got_object_id_queue *parent_ids;
9232 	struct got_object_qid *qid, *pid;
9233 	struct got_update_progress_arg upa;
9234 
9235 	STAILQ_INIT(&commits);
9236 	TAILQ_INIT(&merged_paths);
9237 	memset(&upa, 0, sizeof(upa));
9238 
9239 	while ((ch = getopt(argc, argv, "aclX")) != -1) {
9240 		switch (ch) {
9241 		case 'a':
9242 			abort_rebase = 1;
9243 			break;
9244 		case 'c':
9245 			continue_rebase = 1;
9246 			break;
9247 		case 'l':
9248 			list_backups = 1;
9249 			break;
9250 		case 'X':
9251 			delete_backups = 1;
9252 			break;
9253 		default:
9254 			usage_rebase();
9255 			/* NOTREACHED */
9256 		}
9257 	}
9258 
9259 	argc -= optind;
9260 	argv += optind;
9261 
9262 #ifndef PROFILE
9263 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9264 	    "unveil", NULL) == -1)
9265 		err(1, "pledge");
9266 #endif
9267 	if (list_backups) {
9268 		if (abort_rebase)
9269 			option_conflict('l', 'a');
9270 		if (continue_rebase)
9271 			option_conflict('l', 'c');
9272 		if (delete_backups)
9273 			option_conflict('l', 'X');
9274 		if (argc != 0 && argc != 1)
9275 			usage_rebase();
9276 	} else if (delete_backups) {
9277 		if (abort_rebase)
9278 			option_conflict('X', 'a');
9279 		if (continue_rebase)
9280 			option_conflict('X', 'c');
9281 		if (list_backups)
9282 			option_conflict('l', 'X');
9283 		if (argc != 0 && argc != 1)
9284 			usage_rebase();
9285 	} else {
9286 		if (abort_rebase && continue_rebase)
9287 			usage_rebase();
9288 		else if (abort_rebase || continue_rebase) {
9289 			if (argc != 0)
9290 				usage_rebase();
9291 		} else if (argc != 1)
9292 			usage_rebase();
9293 	}
9294 
9295 	cwd = getcwd(NULL, 0);
9296 	if (cwd == NULL) {
9297 		error = got_error_from_errno("getcwd");
9298 		goto done;
9299 	}
9300 	error = got_worktree_open(&worktree, cwd);
9301 	if (error) {
9302 		if (list_backups || delete_backups) {
9303 			if (error->code != GOT_ERR_NOT_WORKTREE)
9304 				goto done;
9305 		} else {
9306 			if (error->code == GOT_ERR_NOT_WORKTREE)
9307 				error = wrap_not_worktree_error(error,
9308 				    "rebase", cwd);
9309 			goto done;
9310 		}
9311 	}
9312 
9313 	error = got_repo_open(&repo,
9314 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
9315 	if (error != NULL)
9316 		goto done;
9317 
9318 	error = apply_unveil(got_repo_get_path(repo), 0,
9319 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
9320 	if (error)
9321 		goto done;
9322 
9323 	if (list_backups || delete_backups) {
9324 		error = process_backup_refs(
9325 		    GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9326 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
9327 		goto done; /* nothing else to do */
9328 	}
9329 
9330 	error = got_worktree_histedit_in_progress(&histedit_in_progress,
9331 	    worktree);
9332 	if (error)
9333 		goto done;
9334 	if (histedit_in_progress) {
9335 		error = got_error(GOT_ERR_HISTEDIT_BUSY);
9336 		goto done;
9337 	}
9338 
9339 	error = got_worktree_merge_in_progress(&merge_in_progress,
9340 	    worktree, repo);
9341 	if (error)
9342 		goto done;
9343 	if (merge_in_progress) {
9344 		error = got_error(GOT_ERR_MERGE_BUSY);
9345 		goto done;
9346 	}
9347 
9348 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9349 	if (error)
9350 		goto done;
9351 
9352 	if (abort_rebase) {
9353 		if (!rebase_in_progress) {
9354 			error = got_error(GOT_ERR_NOT_REBASING);
9355 			goto done;
9356 		}
9357 		error = got_worktree_rebase_continue(&resume_commit_id,
9358 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
9359 		    worktree, repo);
9360 		if (error)
9361 			goto done;
9362 		printf("Switching work tree to %s\n",
9363 		    got_ref_get_symref_target(new_base_branch));
9364 		error = got_worktree_rebase_abort(worktree, fileindex, repo,
9365 		    new_base_branch, abort_progress, &upa);
9366 		if (error)
9367 			goto done;
9368 		printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9369 		print_merge_progress_stats(&upa);
9370 		goto done; /* nothing else to do */
9371 	}
9372 
9373 	if (continue_rebase) {
9374 		if (!rebase_in_progress) {
9375 			error = got_error(GOT_ERR_NOT_REBASING);
9376 			goto done;
9377 		}
9378 		error = got_worktree_rebase_continue(&resume_commit_id,
9379 		    &new_base_branch, &tmp_branch, &branch, &fileindex,
9380 		    worktree, repo);
9381 		if (error)
9382 			goto done;
9383 
9384 		error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9385 		    resume_commit_id, repo);
9386 		if (error)
9387 			goto done;
9388 
9389 		yca_id = got_object_id_dup(resume_commit_id);
9390 		if (yca_id == NULL) {
9391 			error = got_error_from_errno("got_object_id_dup");
9392 			goto done;
9393 		}
9394 	} else {
9395 		error = got_ref_open(&branch, repo, argv[0], 0);
9396 		if (error != NULL)
9397 			goto done;
9398 	}
9399 
9400 	error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9401 	if (error)
9402 		goto done;
9403 
9404 	if (!continue_rebase) {
9405 		struct got_object_id *base_commit_id;
9406 
9407 		base_commit_id = got_worktree_get_base_commit_id(worktree);
9408 		error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9409 		    base_commit_id, branch_head_commit_id, 1, repo,
9410 		    check_cancelled, NULL);
9411 		if (error)
9412 			goto done;
9413 		if (yca_id == NULL) {
9414 			error = got_error_msg(GOT_ERR_ANCESTRY,
9415 			    "specified branch shares no common ancestry "
9416 			    "with work tree's branch");
9417 			goto done;
9418 		}
9419 
9420 		error = check_same_branch(base_commit_id, branch, yca_id, repo);
9421 		if (error) {
9422 			if (error->code != GOT_ERR_ANCESTRY)
9423 				goto done;
9424 			error = NULL;
9425 		} else {
9426 			struct got_pathlist_head paths;
9427 			printf("%s is already based on %s\n",
9428 			    got_ref_get_name(branch),
9429 			    got_worktree_get_head_ref_name(worktree));
9430 			error = switch_head_ref(branch, branch_head_commit_id,
9431 			    worktree, repo);
9432 			if (error)
9433 				goto done;
9434 			error = got_worktree_set_base_commit_id(worktree, repo,
9435 			    branch_head_commit_id);
9436 			if (error)
9437 				goto done;
9438 			TAILQ_INIT(&paths);
9439 			error = got_pathlist_append(&paths, "", NULL);
9440 			if (error)
9441 				goto done;
9442 			error = got_worktree_checkout_files(worktree,
9443 			    &paths, repo, update_progress, &upa,
9444 			    check_cancelled, NULL);
9445 			got_pathlist_free(&paths);
9446 			if (error)
9447 				goto done;
9448 			if (upa.did_something) {
9449 				char *id_str;
9450 				error = got_object_id_str(&id_str,
9451 				    branch_head_commit_id);
9452 				if (error)
9453 					goto done;
9454 				printf("Updated to %s: %s\n",
9455 				    got_worktree_get_head_ref_name(worktree),
9456 				    id_str);
9457 				free(id_str);
9458 			} else
9459 				printf("Already up-to-date\n");
9460 			print_update_progress_stats(&upa);
9461 			goto done;
9462 		}
9463 		error = got_worktree_rebase_prepare(&new_base_branch,
9464 		    &tmp_branch, &fileindex, worktree, branch, repo);
9465 		if (error)
9466 			goto done;
9467 	}
9468 
9469 	commit_id = branch_head_commit_id;
9470 	error = got_object_open_as_commit(&commit, repo, commit_id);
9471 	if (error)
9472 		goto done;
9473 
9474 	parent_ids = got_object_commit_get_parent_ids(commit);
9475 	pid = STAILQ_FIRST(parent_ids);
9476 	if (pid == NULL) {
9477 		if (!continue_rebase) {
9478 			error = got_worktree_rebase_abort(worktree, fileindex,
9479 			    repo, new_base_branch, abort_progress, &upa);
9480 			if (error)
9481 				goto done;
9482 			printf("Rebase of %s aborted\n",
9483 			    got_ref_get_name(branch));
9484 			print_merge_progress_stats(&upa);
9485 
9486 		}
9487 		error = got_error(GOT_ERR_EMPTY_REBASE);
9488 		goto done;
9489 	}
9490 	error = collect_commits(&commits, commit_id, pid->id,
9491 	    yca_id, got_worktree_get_path_prefix(worktree),
9492 	    GOT_ERR_REBASE_PATH, repo);
9493 	got_object_commit_close(commit);
9494 	commit = NULL;
9495 	if (error)
9496 		goto done;
9497 
9498 	if (STAILQ_EMPTY(&commits)) {
9499 		if (continue_rebase) {
9500 			error = rebase_complete(worktree, fileindex,
9501 			    branch, new_base_branch, tmp_branch, repo,
9502 			    create_backup);
9503 			goto done;
9504 		} else {
9505 			/* Fast-forward the reference of the branch. */
9506 			struct got_object_id *new_head_commit_id;
9507 			char *id_str;
9508 			error = got_ref_resolve(&new_head_commit_id, repo,
9509 			    new_base_branch);
9510 			if (error)
9511 				goto done;
9512 			error = got_object_id_str(&id_str, new_head_commit_id);
9513 			printf("Forwarding %s to commit %s\n",
9514 			    got_ref_get_name(branch), id_str);
9515 			free(id_str);
9516 			error = got_ref_change_ref(branch,
9517 			    new_head_commit_id);
9518 			if (error)
9519 				goto done;
9520 			/* No backup needed since objects did not change. */
9521 			create_backup = 0;
9522 		}
9523 	}
9524 
9525 	pid = NULL;
9526 	STAILQ_FOREACH(qid, &commits, entry) {
9527 
9528 		commit_id = qid->id;
9529 		parent_id = pid ? pid->id : yca_id;
9530 		pid = qid;
9531 
9532 		memset(&upa, 0, sizeof(upa));
9533 		error = got_worktree_rebase_merge_files(&merged_paths,
9534 		    worktree, fileindex, parent_id, commit_id, repo,
9535 		    update_progress, &upa, check_cancelled, NULL);
9536 		if (error)
9537 			goto done;
9538 
9539 		print_merge_progress_stats(&upa);
9540 		if (upa.conflicts > 0 || upa.missing > 0 ||
9541 		    upa.not_deleted > 0 || upa.unversioned > 0) {
9542 			if (upa.conflicts > 0) {
9543 				error = show_rebase_merge_conflict(qid->id,
9544 				    repo);
9545 				if (error)
9546 					goto done;
9547 			}
9548 			got_worktree_rebase_pathlist_free(&merged_paths);
9549 			break;
9550 		}
9551 
9552 		error = rebase_commit(&merged_paths, worktree, fileindex,
9553 		    tmp_branch, commit_id, repo);
9554 		got_worktree_rebase_pathlist_free(&merged_paths);
9555 		if (error)
9556 			goto done;
9557 	}
9558 
9559 	if (upa.conflicts > 0 || upa.missing > 0 ||
9560 	    upa.not_deleted > 0 || upa.unversioned > 0) {
9561 		error = got_worktree_rebase_postpone(worktree, fileindex);
9562 		if (error)
9563 			goto done;
9564 		if (upa.conflicts > 0 && upa.missing == 0 &&
9565 		    upa.not_deleted == 0 && upa.unversioned == 0) {
9566 			error = got_error_msg(GOT_ERR_CONFLICTS,
9567 			    "conflicts must be resolved before rebasing "
9568 			    "can continue");
9569 		} else if (upa.conflicts > 0) {
9570 			error = got_error_msg(GOT_ERR_CONFLICTS,
9571 			    "conflicts must be resolved before rebasing "
9572 			    "can continue; changes destined for some "
9573 			    "files were not yet merged and should be "
9574 			    "merged manually if required before the "
9575 			    "rebase operation is continued");
9576 		} else {
9577 			error = got_error_msg(GOT_ERR_CONFLICTS,
9578 			    "changes destined for some files were not "
9579 			    "yet merged and should be merged manually "
9580 			    "if required before the rebase operation "
9581 			    "is continued");
9582 		}
9583 	} else
9584 		error = rebase_complete(worktree, fileindex, branch,
9585 		    new_base_branch, tmp_branch, repo, create_backup);
9586 done:
9587 	got_object_id_queue_free(&commits);
9588 	free(branch_head_commit_id);
9589 	free(resume_commit_id);
9590 	free(yca_id);
9591 	if (commit)
9592 		got_object_commit_close(commit);
9593 	if (branch)
9594 		got_ref_close(branch);
9595 	if (new_base_branch)
9596 		got_ref_close(new_base_branch);
9597 	if (tmp_branch)
9598 		got_ref_close(tmp_branch);
9599 	if (worktree)
9600 		got_worktree_close(worktree);
9601 	if (repo) {
9602 		const struct got_error *close_err = got_repo_close(repo);
9603 		if (error == NULL)
9604 			error = close_err;
9605 	}
9606 	return error;
9607 }
9608 
9609 __dead static void
9610 usage_histedit(void)
9611 {
9612 	fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
9613 	    "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
9614 	    getprogname());
9615 	exit(1);
9616 }
9617 
9618 #define GOT_HISTEDIT_PICK 'p'
9619 #define GOT_HISTEDIT_EDIT 'e'
9620 #define GOT_HISTEDIT_FOLD 'f'
9621 #define GOT_HISTEDIT_DROP 'd'
9622 #define GOT_HISTEDIT_MESG 'm'
9623 
9624 static const struct got_histedit_cmd {
9625 	unsigned char code;
9626 	const char *name;
9627 	const char *desc;
9628 } got_histedit_cmds[] = {
9629 	{ GOT_HISTEDIT_PICK, "pick", "use commit" },
9630 	{ GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
9631 	{ GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
9632 	    "be used" },
9633 	{ GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
9634 	{ GOT_HISTEDIT_MESG, "mesg",
9635 	    "single-line log message for commit above (open editor if empty)" },
9636 };
9637 
9638 struct got_histedit_list_entry {
9639 	TAILQ_ENTRY(got_histedit_list_entry) entry;
9640 	struct got_object_id *commit_id;
9641 	const struct got_histedit_cmd *cmd;
9642 	char *logmsg;
9643 };
9644 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
9645 
9646 static const struct got_error *
9647 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
9648     FILE *f, struct got_repository *repo)
9649 {
9650 	const struct got_error *err = NULL;
9651 	char *logmsg = NULL, *id_str = NULL;
9652 	struct got_commit_object *commit = NULL;
9653 	int n;
9654 
9655 	err = got_object_open_as_commit(&commit, repo, commit_id);
9656 	if (err)
9657 		goto done;
9658 
9659 	err = get_short_logmsg(&logmsg, 34, commit);
9660 	if (err)
9661 		goto done;
9662 
9663 	err = got_object_id_str(&id_str, commit_id);
9664 	if (err)
9665 		goto done;
9666 
9667 	n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
9668 	if (n < 0)
9669 		err = got_ferror(f, GOT_ERR_IO);
9670 done:
9671 	if (commit)
9672 		got_object_commit_close(commit);
9673 	free(id_str);
9674 	free(logmsg);
9675 	return err;
9676 }
9677 
9678 static const struct got_error *
9679 histedit_write_commit_list(struct got_object_id_queue *commits,
9680     FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
9681     struct got_repository *repo)
9682 {
9683 	const struct got_error *err = NULL;
9684 	struct got_object_qid *qid;
9685 	const char *histedit_cmd = NULL;
9686 
9687 	if (STAILQ_EMPTY(commits))
9688 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
9689 
9690 	STAILQ_FOREACH(qid, commits, entry) {
9691 		histedit_cmd = got_histedit_cmds[0].name;
9692 		if (edit_only)
9693 			histedit_cmd = "edit";
9694 		else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
9695 			histedit_cmd = "fold";
9696 		err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
9697 		if (err)
9698 			break;
9699 		if (edit_logmsg_only) {
9700 			int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
9701 			if (n < 0) {
9702 				err = got_ferror(f, GOT_ERR_IO);
9703 				break;
9704 			}
9705 		}
9706 	}
9707 
9708 	return err;
9709 }
9710 
9711 static const struct got_error *
9712 write_cmd_list(FILE *f, const char *branch_name,
9713     struct got_object_id_queue *commits)
9714 {
9715 	const struct got_error *err = NULL;
9716 	size_t i;
9717 	int n;
9718 	char *id_str;
9719 	struct got_object_qid *qid;
9720 
9721 	qid = STAILQ_FIRST(commits);
9722 	err = got_object_id_str(&id_str, qid->id);
9723 	if (err)
9724 		return err;
9725 
9726 	n = fprintf(f,
9727 	    "# Editing the history of branch '%s' starting at\n"
9728 	    "# commit %s\n"
9729 	    "# Commits will be processed in order from top to "
9730 	    "bottom of this file.\n", branch_name, id_str);
9731 	if (n < 0) {
9732 		err = got_ferror(f, GOT_ERR_IO);
9733 		goto done;
9734 	}
9735 
9736 	n = fprintf(f, "# Available histedit commands:\n");
9737 	if (n < 0) {
9738 		err = got_ferror(f, GOT_ERR_IO);
9739 		goto done;
9740 	}
9741 
9742 	for (i = 0; i < nitems(got_histedit_cmds); i++) {
9743 		const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
9744 		n = fprintf(f, "#   %s (%c): %s\n", cmd->name, cmd->code,
9745 		    cmd->desc);
9746 		if (n < 0) {
9747 			err = got_ferror(f, GOT_ERR_IO);
9748 			break;
9749 		}
9750 	}
9751 done:
9752 	free(id_str);
9753 	return err;
9754 }
9755 
9756 static const struct got_error *
9757 histedit_syntax_error(int lineno)
9758 {
9759 	static char msg[42];
9760 	int ret;
9761 
9762 	ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
9763 	    lineno);
9764 	if (ret == -1 || ret >= sizeof(msg))
9765 		return got_error(GOT_ERR_HISTEDIT_SYNTAX);
9766 
9767 	return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
9768 }
9769 
9770 static const struct got_error *
9771 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
9772     char *logmsg, struct got_repository *repo)
9773 {
9774 	const struct got_error *err;
9775 	struct got_commit_object *folded_commit = NULL;
9776 	char *id_str, *folded_logmsg = NULL;
9777 
9778 	err = got_object_id_str(&id_str, hle->commit_id);
9779 	if (err)
9780 		return err;
9781 
9782 	err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
9783 	if (err)
9784 		goto done;
9785 
9786 	err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
9787 	if (err)
9788 		goto done;
9789 	if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
9790 	    logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
9791 	    folded_logmsg) == -1) {
9792 		err = got_error_from_errno("asprintf");
9793 	}
9794 done:
9795 	if (folded_commit)
9796 		got_object_commit_close(folded_commit);
9797 	free(id_str);
9798 	free(folded_logmsg);
9799 	return err;
9800 }
9801 
9802 static struct got_histedit_list_entry *
9803 get_folded_commits(struct got_histedit_list_entry *hle)
9804 {
9805 	struct got_histedit_list_entry *prev, *folded = NULL;
9806 
9807 	prev = TAILQ_PREV(hle, got_histedit_list, entry);
9808 	while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
9809 	    prev->cmd->code == GOT_HISTEDIT_DROP)) {
9810 		if (prev->cmd->code == GOT_HISTEDIT_FOLD)
9811 			folded = prev;
9812 		prev = TAILQ_PREV(prev, got_histedit_list, entry);
9813 	}
9814 
9815 	return folded;
9816 }
9817 
9818 static const struct got_error *
9819 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
9820     struct got_repository *repo)
9821 {
9822 	char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
9823 	char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
9824 	const struct got_error *err = NULL;
9825 	struct got_commit_object *commit = NULL;
9826 	int logmsg_len;
9827 	int fd;
9828 	struct got_histedit_list_entry *folded = NULL;
9829 
9830 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9831 	if (err)
9832 		return err;
9833 
9834 	folded = get_folded_commits(hle);
9835 	if (folded) {
9836 		while (folded != hle) {
9837 			if (folded->cmd->code == GOT_HISTEDIT_DROP) {
9838 				folded = TAILQ_NEXT(folded, entry);
9839 				continue;
9840 			}
9841 			err = append_folded_commit_msg(&new_msg, folded,
9842 			    logmsg, repo);
9843 			if (err)
9844 				goto done;
9845 			free(logmsg);
9846 			logmsg = new_msg;
9847 			folded = TAILQ_NEXT(folded, entry);
9848 		}
9849 	}
9850 
9851 	err = got_object_id_str(&id_str, hle->commit_id);
9852 	if (err)
9853 		goto done;
9854 	err = got_object_commit_get_logmsg(&orig_logmsg, commit);
9855 	if (err)
9856 		goto done;
9857 	logmsg_len = asprintf(&new_msg,
9858 	    "%s\n# original log message of commit %s: %s",
9859 	    logmsg ? logmsg : "", id_str, orig_logmsg);
9860 	if (logmsg_len == -1) {
9861 		err = got_error_from_errno("asprintf");
9862 		goto done;
9863 	}
9864 	free(logmsg);
9865 	logmsg = new_msg;
9866 
9867 	err = got_object_id_str(&id_str, hle->commit_id);
9868 	if (err)
9869 		goto done;
9870 
9871 	err = got_opentemp_named_fd(&logmsg_path, &fd,
9872 	    GOT_TMPDIR_STR "/got-logmsg");
9873 	if (err)
9874 		goto done;
9875 
9876 	write(fd, logmsg, logmsg_len);
9877 	close(fd);
9878 
9879 	err = get_editor(&editor);
9880 	if (err)
9881 		goto done;
9882 
9883 	err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
9884 	    logmsg_len, 0);
9885 	if (err) {
9886 		if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
9887 			goto done;
9888 		err = NULL;
9889 		hle->logmsg = strdup(new_msg);
9890 		if (hle->logmsg == NULL)
9891 			err = got_error_from_errno("strdup");
9892 	}
9893 done:
9894 	if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
9895 		err = got_error_from_errno2("unlink", logmsg_path);
9896 	free(logmsg_path);
9897 	free(logmsg);
9898 	free(orig_logmsg);
9899 	free(editor);
9900 	if (commit)
9901 		got_object_commit_close(commit);
9902 	return err;
9903 }
9904 
9905 static const struct got_error *
9906 histedit_parse_list(struct got_histedit_list *histedit_cmds,
9907     FILE *f, struct got_repository *repo)
9908 {
9909 	const struct got_error *err = NULL;
9910 	char *line = NULL, *p, *end;
9911 	size_t i, size;
9912 	ssize_t len;
9913 	int lineno = 0;
9914 	const struct got_histedit_cmd *cmd;
9915 	struct got_object_id *commit_id = NULL;
9916 	struct got_histedit_list_entry *hle = NULL;
9917 
9918 	for (;;) {
9919 		len = getline(&line, &size, f);
9920 		if (len == -1) {
9921 			const struct got_error *getline_err;
9922 			if (feof(f))
9923 				break;
9924 			getline_err = got_error_from_errno("getline");
9925 			err = got_ferror(f, getline_err->code);
9926 			break;
9927 		}
9928 		lineno++;
9929 		p = line;
9930 		while (isspace((unsigned char)p[0]))
9931 			p++;
9932 		if (p[0] == '#' || p[0] == '\0') {
9933 			free(line);
9934 			line = NULL;
9935 			continue;
9936 		}
9937 		cmd = NULL;
9938 		for (i = 0; i < nitems(got_histedit_cmds); i++) {
9939 			cmd = &got_histedit_cmds[i];
9940 			if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
9941 			    isspace((unsigned char)p[strlen(cmd->name)])) {
9942 				p += strlen(cmd->name);
9943 				break;
9944 			}
9945 			if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
9946 				p++;
9947 				break;
9948 			}
9949 		}
9950 		if (i == nitems(got_histedit_cmds)) {
9951 			err = histedit_syntax_error(lineno);
9952 			break;
9953 		}
9954 		while (isspace((unsigned char)p[0]))
9955 			p++;
9956 		if (cmd->code == GOT_HISTEDIT_MESG) {
9957 			if (hle == NULL || hle->logmsg != NULL) {
9958 				err = got_error(GOT_ERR_HISTEDIT_CMD);
9959 				break;
9960 			}
9961 			if (p[0] == '\0') {
9962 				err = histedit_edit_logmsg(hle, repo);
9963 				if (err)
9964 					break;
9965 			} else {
9966 				hle->logmsg = strdup(p);
9967 				if (hle->logmsg == NULL) {
9968 					err = got_error_from_errno("strdup");
9969 					break;
9970 				}
9971 			}
9972 			free(line);
9973 			line = NULL;
9974 			continue;
9975 		} else {
9976 			end = p;
9977 			while (end[0] && !isspace((unsigned char)end[0]))
9978 				end++;
9979 			*end = '\0';
9980 
9981 			err = got_object_resolve_id_str(&commit_id, repo, p);
9982 			if (err) {
9983 				/* override error code */
9984 				err = histedit_syntax_error(lineno);
9985 				break;
9986 			}
9987 		}
9988 		hle = malloc(sizeof(*hle));
9989 		if (hle == NULL) {
9990 			err = got_error_from_errno("malloc");
9991 			break;
9992 		}
9993 		hle->cmd = cmd;
9994 		hle->commit_id = commit_id;
9995 		hle->logmsg = NULL;
9996 		commit_id = NULL;
9997 		free(line);
9998 		line = NULL;
9999 		TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10000 	}
10001 
10002 	free(line);
10003 	free(commit_id);
10004 	return err;
10005 }
10006 
10007 static const struct got_error *
10008 histedit_check_script(struct got_histedit_list *histedit_cmds,
10009     struct got_object_id_queue *commits, struct got_repository *repo)
10010 {
10011 	const struct got_error *err = NULL;
10012 	struct got_object_qid *qid;
10013 	struct got_histedit_list_entry *hle;
10014 	static char msg[92];
10015 	char *id_str;
10016 
10017 	if (TAILQ_EMPTY(histedit_cmds))
10018 		return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10019 		    "histedit script contains no commands");
10020 	if (STAILQ_EMPTY(commits))
10021 		return got_error(GOT_ERR_EMPTY_HISTEDIT);
10022 
10023 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
10024 		struct got_histedit_list_entry *hle2;
10025 		TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10026 			if (hle == hle2)
10027 				continue;
10028 			if (got_object_id_cmp(hle->commit_id,
10029 			    hle2->commit_id) != 0)
10030 				continue;
10031 			err = got_object_id_str(&id_str, hle->commit_id);
10032 			if (err)
10033 				return err;
10034 			snprintf(msg, sizeof(msg), "commit %s is listed "
10035 			    "more than once in histedit script", id_str);
10036 			free(id_str);
10037 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10038 		}
10039 	}
10040 
10041 	STAILQ_FOREACH(qid, commits, entry) {
10042 		TAILQ_FOREACH(hle, histedit_cmds, entry) {
10043 			if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
10044 				break;
10045 		}
10046 		if (hle == NULL) {
10047 			err = got_object_id_str(&id_str, qid->id);
10048 			if (err)
10049 				return err;
10050 			snprintf(msg, sizeof(msg),
10051 			    "commit %s missing from histedit script", id_str);
10052 			free(id_str);
10053 			return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10054 		}
10055 	}
10056 
10057 	hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10058 	if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10059 		return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10060 		    "last commit in histedit script cannot be folded");
10061 
10062 	return NULL;
10063 }
10064 
10065 static const struct got_error *
10066 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10067     const char *path, struct got_object_id_queue *commits,
10068     struct got_repository *repo)
10069 {
10070 	const struct got_error *err = NULL;
10071 	char *editor;
10072 	FILE *f = NULL;
10073 
10074 	err = get_editor(&editor);
10075 	if (err)
10076 		return err;
10077 
10078 	if (spawn_editor(editor, path) == -1) {
10079 		err = got_error_from_errno("failed spawning editor");
10080 		goto done;
10081 	}
10082 
10083 	f = fopen(path, "re");
10084 	if (f == NULL) {
10085 		err = got_error_from_errno("fopen");
10086 		goto done;
10087 	}
10088 	err = histedit_parse_list(histedit_cmds, f, repo);
10089 	if (err)
10090 		goto done;
10091 
10092 	err = histedit_check_script(histedit_cmds, commits, repo);
10093 done:
10094 	if (f && fclose(f) == EOF && err == NULL)
10095 		err = got_error_from_errno("fclose");
10096 	free(editor);
10097 	return err;
10098 }
10099 
10100 static const struct got_error *
10101 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10102     struct got_object_id_queue *, const char *, const char *,
10103     struct got_repository *);
10104 
10105 static const struct got_error *
10106 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10107     struct got_object_id_queue *commits, const char *branch_name,
10108     int edit_logmsg_only, int fold_only, int edit_only,
10109     struct got_repository *repo)
10110 {
10111 	const struct got_error *err;
10112 	FILE *f = NULL;
10113 	char *path = NULL;
10114 
10115 	err = got_opentemp_named(&path, &f, "got-histedit");
10116 	if (err)
10117 		return err;
10118 
10119 	err = write_cmd_list(f, branch_name, commits);
10120 	if (err)
10121 		goto done;
10122 
10123 	err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10124 	    fold_only, edit_only, repo);
10125 	if (err)
10126 		goto done;
10127 
10128 	if (edit_logmsg_only || fold_only || edit_only) {
10129 		rewind(f);
10130 		err = histedit_parse_list(histedit_cmds, f, repo);
10131 	} else {
10132 		if (fclose(f) == EOF) {
10133 			err = got_error_from_errno("fclose");
10134 			goto done;
10135 		}
10136 		f = NULL;
10137 		err = histedit_run_editor(histedit_cmds, path, commits, repo);
10138 		if (err) {
10139 			if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10140 			    err->code != GOT_ERR_HISTEDIT_CMD)
10141 				goto done;
10142 			err = histedit_edit_list_retry(histedit_cmds, err,
10143 			    commits, path, branch_name, repo);
10144 		}
10145 	}
10146 done:
10147 	if (f && fclose(f) == EOF && err == NULL)
10148 		err = got_error_from_errno("fclose");
10149 	if (path && unlink(path) != 0 && err == NULL)
10150 		err = got_error_from_errno2("unlink", path);
10151 	free(path);
10152 	return err;
10153 }
10154 
10155 static const struct got_error *
10156 histedit_save_list(struct got_histedit_list *histedit_cmds,
10157     struct got_worktree *worktree, struct got_repository *repo)
10158 {
10159 	const struct got_error *err = NULL;
10160 	char *path = NULL;
10161 	FILE *f = NULL;
10162 	struct got_histedit_list_entry *hle;
10163 	struct got_commit_object *commit = NULL;
10164 
10165 	err = got_worktree_get_histedit_script_path(&path, worktree);
10166 	if (err)
10167 		return err;
10168 
10169 	f = fopen(path, "we");
10170 	if (f == NULL) {
10171 		err = got_error_from_errno2("fopen", path);
10172 		goto done;
10173 	}
10174 	TAILQ_FOREACH(hle, histedit_cmds, entry) {
10175 		err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10176 		    repo);
10177 		if (err)
10178 			break;
10179 
10180 		if (hle->logmsg) {
10181 			int n = fprintf(f, "%c %s\n",
10182 			    GOT_HISTEDIT_MESG, hle->logmsg);
10183 			if (n < 0) {
10184 				err = got_ferror(f, GOT_ERR_IO);
10185 				break;
10186 			}
10187 		}
10188 	}
10189 done:
10190 	if (f && fclose(f) == EOF && err == NULL)
10191 		err = got_error_from_errno("fclose");
10192 	free(path);
10193 	if (commit)
10194 		got_object_commit_close(commit);
10195 	return err;
10196 }
10197 
10198 void
10199 histedit_free_list(struct got_histedit_list *histedit_cmds)
10200 {
10201 	struct got_histedit_list_entry *hle;
10202 
10203 	while ((hle = TAILQ_FIRST(histedit_cmds))) {
10204 		TAILQ_REMOVE(histedit_cmds, hle, entry);
10205 		free(hle);
10206 	}
10207 }
10208 
10209 static const struct got_error *
10210 histedit_load_list(struct got_histedit_list *histedit_cmds,
10211     const char *path, struct got_repository *repo)
10212 {
10213 	const struct got_error *err = NULL;
10214 	FILE *f = NULL;
10215 
10216 	f = fopen(path, "re");
10217 	if (f == NULL) {
10218 		err = got_error_from_errno2("fopen", path);
10219 		goto done;
10220 	}
10221 
10222 	err = histedit_parse_list(histedit_cmds, f, repo);
10223 done:
10224 	if (f && fclose(f) == EOF && err == NULL)
10225 		err = got_error_from_errno("fclose");
10226 	return err;
10227 }
10228 
10229 static const struct got_error *
10230 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10231     const struct got_error *edit_err, struct got_object_id_queue *commits,
10232     const char *path, const char *branch_name, struct got_repository *repo)
10233 {
10234 	const struct got_error *err = NULL, *prev_err = edit_err;
10235 	int resp = ' ';
10236 
10237 	while (resp != 'c' && resp != 'r' && resp != 'a') {
10238 		printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10239 		    "or (a)bort: ", getprogname(), prev_err->msg);
10240 		resp = getchar();
10241 		if (resp == '\n')
10242 			resp = getchar();
10243 		if (resp == 'c') {
10244 			histedit_free_list(histedit_cmds);
10245 			err = histedit_run_editor(histedit_cmds, path, commits,
10246 			    repo);
10247 			if (err) {
10248 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10249 				    err->code != GOT_ERR_HISTEDIT_CMD)
10250 					break;
10251 				prev_err = err;
10252 				resp = ' ';
10253 				continue;
10254 			}
10255 			break;
10256 		} else if (resp == 'r') {
10257 			histedit_free_list(histedit_cmds);
10258 			err = histedit_edit_script(histedit_cmds,
10259 			    commits, branch_name, 0, 0, 0, repo);
10260 			if (err) {
10261 				if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10262 				    err->code != GOT_ERR_HISTEDIT_CMD)
10263 					break;
10264 				prev_err = err;
10265 				resp = ' ';
10266 				continue;
10267 			}
10268 			break;
10269 		} else if (resp == 'a') {
10270 			err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10271 			break;
10272 		} else
10273 			printf("invalid response '%c'\n", resp);
10274 	}
10275 
10276 	return err;
10277 }
10278 
10279 static const struct got_error *
10280 histedit_complete(struct got_worktree *worktree,
10281     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10282     struct got_reference *branch, struct got_repository *repo)
10283 {
10284 	printf("Switching work tree to %s\n",
10285 	    got_ref_get_symref_target(branch));
10286 	return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10287 	    branch, repo);
10288 }
10289 
10290 static const struct got_error *
10291 show_histedit_progress(struct got_commit_object *commit,
10292     struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10293 {
10294 	const struct got_error *err;
10295 	char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10296 
10297 	err = got_object_id_str(&old_id_str, hle->commit_id);
10298 	if (err)
10299 		goto done;
10300 
10301 	if (new_id) {
10302 		err = got_object_id_str(&new_id_str, new_id);
10303 		if (err)
10304 			goto done;
10305 	}
10306 
10307 	old_id_str[12] = '\0';
10308 	if (new_id_str)
10309 		new_id_str[12] = '\0';
10310 
10311 	if (hle->logmsg) {
10312 		logmsg = strdup(hle->logmsg);
10313 		if (logmsg == NULL) {
10314 			err = got_error_from_errno("strdup");
10315 			goto done;
10316 		}
10317 		trim_logmsg(logmsg, 42);
10318 	} else {
10319 		err = get_short_logmsg(&logmsg, 42, commit);
10320 		if (err)
10321 			goto done;
10322 	}
10323 
10324 	switch (hle->cmd->code) {
10325 	case GOT_HISTEDIT_PICK:
10326 	case GOT_HISTEDIT_EDIT:
10327 		printf("%s -> %s: %s\n", old_id_str,
10328 		    new_id_str ? new_id_str : "no-op change", logmsg);
10329 		break;
10330 	case GOT_HISTEDIT_DROP:
10331 	case GOT_HISTEDIT_FOLD:
10332 		printf("%s ->  %s commit: %s\n", old_id_str, hle->cmd->name,
10333 		    logmsg);
10334 		break;
10335 	default:
10336 		break;
10337 	}
10338 done:
10339 	free(old_id_str);
10340 	free(new_id_str);
10341 	return err;
10342 }
10343 
10344 static const struct got_error *
10345 histedit_commit(struct got_pathlist_head *merged_paths,
10346     struct got_worktree *worktree, struct got_fileindex *fileindex,
10347     struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10348     struct got_repository *repo)
10349 {
10350 	const struct got_error *err;
10351 	struct got_commit_object *commit;
10352 	struct got_object_id *new_commit_id;
10353 
10354 	if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10355 	    && hle->logmsg == NULL) {
10356 		err = histedit_edit_logmsg(hle, repo);
10357 		if (err)
10358 			return err;
10359 	}
10360 
10361 	err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10362 	if (err)
10363 		return err;
10364 
10365 	err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10366 	    worktree, fileindex, tmp_branch, commit, hle->commit_id,
10367 	    hle->logmsg, repo);
10368 	if (err) {
10369 		if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10370 			goto done;
10371 		err = show_histedit_progress(commit, hle, NULL);
10372 	} else {
10373 		err = show_histedit_progress(commit, hle, new_commit_id);
10374 		free(new_commit_id);
10375 	}
10376 done:
10377 	got_object_commit_close(commit);
10378 	return err;
10379 }
10380 
10381 static const struct got_error *
10382 histedit_skip_commit(struct got_histedit_list_entry *hle,
10383     struct got_worktree *worktree, struct got_repository *repo)
10384 {
10385 	const struct got_error *error;
10386 	struct got_commit_object *commit;
10387 
10388 	error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10389 	    repo);
10390 	if (error)
10391 		return error;
10392 
10393 	error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10394 	if (error)
10395 		return error;
10396 
10397 	error = show_histedit_progress(commit, hle, NULL);
10398 	got_object_commit_close(commit);
10399 	return error;
10400 }
10401 
10402 static const struct got_error *
10403 check_local_changes(void *arg, unsigned char status,
10404     unsigned char staged_status, const char *path,
10405     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10406     struct got_object_id *commit_id, int dirfd, const char *de_name)
10407 {
10408 	int *have_local_changes = arg;
10409 
10410 	switch (status) {
10411 	case GOT_STATUS_ADD:
10412 	case GOT_STATUS_DELETE:
10413 	case GOT_STATUS_MODIFY:
10414 	case GOT_STATUS_CONFLICT:
10415 		*have_local_changes = 1;
10416 		return got_error(GOT_ERR_CANCELLED);
10417 	default:
10418 		break;
10419 	}
10420 
10421 	switch (staged_status) {
10422 	case GOT_STATUS_ADD:
10423 	case GOT_STATUS_DELETE:
10424 	case GOT_STATUS_MODIFY:
10425 		*have_local_changes = 1;
10426 		return got_error(GOT_ERR_CANCELLED);
10427 	default:
10428 		break;
10429 	}
10430 
10431 	return NULL;
10432 }
10433 
10434 static const struct got_error *
10435 cmd_histedit(int argc, char *argv[])
10436 {
10437 	const struct got_error *error = NULL;
10438 	struct got_worktree *worktree = NULL;
10439 	struct got_fileindex *fileindex = NULL;
10440 	struct got_repository *repo = NULL;
10441 	char *cwd = NULL;
10442 	struct got_reference *branch = NULL;
10443 	struct got_reference *tmp_branch = NULL;
10444 	struct got_object_id *resume_commit_id = NULL;
10445 	struct got_object_id *base_commit_id = NULL;
10446 	struct got_object_id *head_commit_id = NULL;
10447 	struct got_commit_object *commit = NULL;
10448 	int ch, rebase_in_progress = 0, merge_in_progress = 0;
10449 	struct got_update_progress_arg upa;
10450 	int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10451 	int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10452 	int list_backups = 0, delete_backups = 0;
10453 	const char *edit_script_path = NULL;
10454 	struct got_object_id_queue commits;
10455 	struct got_pathlist_head merged_paths;
10456 	const struct got_object_id_queue *parent_ids;
10457 	struct got_object_qid *pid;
10458 	struct got_histedit_list histedit_cmds;
10459 	struct got_histedit_list_entry *hle;
10460 
10461 	STAILQ_INIT(&commits);
10462 	TAILQ_INIT(&histedit_cmds);
10463 	TAILQ_INIT(&merged_paths);
10464 	memset(&upa, 0, sizeof(upa));
10465 
10466 	while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10467 		switch (ch) {
10468 		case 'a':
10469 			abort_edit = 1;
10470 			break;
10471 		case 'c':
10472 			continue_edit = 1;
10473 			break;
10474 		case 'e':
10475 			edit_only = 1;
10476 			break;
10477 		case 'f':
10478 			fold_only = 1;
10479 			break;
10480 		case 'F':
10481 			edit_script_path = optarg;
10482 			break;
10483 		case 'm':
10484 			edit_logmsg_only = 1;
10485 			break;
10486 		case 'l':
10487 			list_backups = 1;
10488 			break;
10489 		case 'X':
10490 			delete_backups = 1;
10491 			break;
10492 		default:
10493 			usage_histedit();
10494 			/* NOTREACHED */
10495 		}
10496 	}
10497 
10498 	argc -= optind;
10499 	argv += optind;
10500 
10501 #ifndef PROFILE
10502 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10503 	    "unveil", NULL) == -1)
10504 		err(1, "pledge");
10505 #endif
10506 	if (abort_edit && continue_edit)
10507 		option_conflict('a', 'c');
10508 	if (edit_script_path && edit_logmsg_only)
10509 		option_conflict('F', 'm');
10510 	if (abort_edit && edit_logmsg_only)
10511 		option_conflict('a', 'm');
10512 	if (continue_edit && edit_logmsg_only)
10513 		option_conflict('c', 'm');
10514 	if (abort_edit && fold_only)
10515 		option_conflict('a', 'f');
10516 	if (continue_edit && fold_only)
10517 		option_conflict('c', 'f');
10518 	if (fold_only && edit_logmsg_only)
10519 		option_conflict('f', 'm');
10520 	if (edit_script_path && fold_only)
10521 		option_conflict('F', 'f');
10522 	if (abort_edit && edit_only)
10523 		option_conflict('a', 'e');
10524 	if (continue_edit && edit_only)
10525 		option_conflict('c', 'e');
10526 	if (edit_only && edit_logmsg_only)
10527 		option_conflict('e', 'm');
10528 	if (edit_script_path && edit_only)
10529 		option_conflict('F', 'e');
10530 	if (list_backups) {
10531 		if (abort_edit)
10532 			option_conflict('l', 'a');
10533 		if (continue_edit)
10534 			option_conflict('l', 'c');
10535 		if (edit_script_path)
10536 			option_conflict('l', 'F');
10537 		if (edit_logmsg_only)
10538 			option_conflict('l', 'm');
10539 		if (fold_only)
10540 			option_conflict('l', 'f');
10541 		if (edit_only)
10542 			option_conflict('l', 'e');
10543 		if (delete_backups)
10544 			option_conflict('l', 'X');
10545 		if (argc != 0 && argc != 1)
10546 			usage_histedit();
10547 	} else if (delete_backups) {
10548 		if (abort_edit)
10549 			option_conflict('X', 'a');
10550 		if (continue_edit)
10551 			option_conflict('X', 'c');
10552 		if (edit_script_path)
10553 			option_conflict('X', 'F');
10554 		if (edit_logmsg_only)
10555 			option_conflict('X', 'm');
10556 		if (fold_only)
10557 			option_conflict('X', 'f');
10558 		if (edit_only)
10559 			option_conflict('X', 'e');
10560 		if (list_backups)
10561 			option_conflict('X', 'l');
10562 		if (argc != 0 && argc != 1)
10563 			usage_histedit();
10564 	} else if (argc != 0)
10565 		usage_histedit();
10566 
10567 	/*
10568 	 * This command cannot apply unveil(2) in all cases because the
10569 	 * user may choose to run an editor to edit the histedit script
10570 	 * and to edit individual commit log messages.
10571 	 * unveil(2) traverses exec(2); if an editor is used we have to
10572 	 * apply unveil after edit script and log messages have been written.
10573 	 * XXX TODO: Make use of unveil(2) where possible.
10574 	 */
10575 
10576 	cwd = getcwd(NULL, 0);
10577 	if (cwd == NULL) {
10578 		error = got_error_from_errno("getcwd");
10579 		goto done;
10580 	}
10581 	error = got_worktree_open(&worktree, cwd);
10582 	if (error) {
10583 		if (list_backups || delete_backups) {
10584 			if (error->code != GOT_ERR_NOT_WORKTREE)
10585 				goto done;
10586 		} else {
10587 			if (error->code == GOT_ERR_NOT_WORKTREE)
10588 				error = wrap_not_worktree_error(error,
10589 				    "histedit", cwd);
10590 			goto done;
10591 		}
10592 	}
10593 
10594 	if (list_backups || delete_backups) {
10595 		error = got_repo_open(&repo,
10596 		    worktree ? got_worktree_get_repo_path(worktree) : cwd,
10597 		    NULL);
10598 		if (error != NULL)
10599 			goto done;
10600 		error = apply_unveil(got_repo_get_path(repo), 0,
10601 		    worktree ? got_worktree_get_root_path(worktree) : NULL);
10602 		if (error)
10603 			goto done;
10604 		error = process_backup_refs(
10605 		    GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
10606 		    argc == 1 ? argv[0] : NULL, delete_backups, repo);
10607 		goto done; /* nothing else to do */
10608 	}
10609 
10610 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10611 	    NULL);
10612 	if (error != NULL)
10613 		goto done;
10614 
10615 	error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10616 	if (error)
10617 		goto done;
10618 	if (rebase_in_progress) {
10619 		error = got_error(GOT_ERR_REBASING);
10620 		goto done;
10621 	}
10622 
10623 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10624 	    repo);
10625 	if (error)
10626 		goto done;
10627 	if (merge_in_progress) {
10628 		error = got_error(GOT_ERR_MERGE_BUSY);
10629 		goto done;
10630 	}
10631 
10632 	error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
10633 	if (error)
10634 		goto done;
10635 
10636 	if (edit_in_progress && edit_logmsg_only) {
10637 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10638 		    "histedit operation is in progress in this "
10639 		    "work tree and must be continued or aborted "
10640 		    "before the -m option can be used");
10641 		goto done;
10642 	}
10643 	if (edit_in_progress && fold_only) {
10644 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10645 		    "histedit operation is in progress in this "
10646 		    "work tree and must be continued or aborted "
10647 		    "before the -f option can be used");
10648 		goto done;
10649 	}
10650 	if (edit_in_progress && edit_only) {
10651 		error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10652 		    "histedit operation is in progress in this "
10653 		    "work tree and must be continued or aborted "
10654 		    "before the -e option can be used");
10655 		goto done;
10656 	}
10657 
10658 	if (edit_in_progress && abort_edit) {
10659 		error = got_worktree_histedit_continue(&resume_commit_id,
10660 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
10661 		    worktree, repo);
10662 		if (error)
10663 			goto done;
10664 		printf("Switching work tree to %s\n",
10665 		    got_ref_get_symref_target(branch));
10666 		error = got_worktree_histedit_abort(worktree, fileindex, repo,
10667 		    branch, base_commit_id, abort_progress, &upa);
10668 		if (error)
10669 			goto done;
10670 		printf("Histedit of %s aborted\n",
10671 		    got_ref_get_symref_target(branch));
10672 		print_merge_progress_stats(&upa);
10673 		goto done; /* nothing else to do */
10674 	} else if (abort_edit) {
10675 		error = got_error(GOT_ERR_NOT_HISTEDIT);
10676 		goto done;
10677 	}
10678 
10679 	if (continue_edit) {
10680 		char *path;
10681 
10682 		if (!edit_in_progress) {
10683 			error = got_error(GOT_ERR_NOT_HISTEDIT);
10684 			goto done;
10685 		}
10686 
10687 		error = got_worktree_get_histedit_script_path(&path, worktree);
10688 		if (error)
10689 			goto done;
10690 
10691 		error = histedit_load_list(&histedit_cmds, path, repo);
10692 		free(path);
10693 		if (error)
10694 			goto done;
10695 
10696 		error = got_worktree_histedit_continue(&resume_commit_id,
10697 		    &tmp_branch, &branch, &base_commit_id, &fileindex,
10698 		    worktree, repo);
10699 		if (error)
10700 			goto done;
10701 
10702 		error = got_ref_resolve(&head_commit_id, repo, branch);
10703 		if (error)
10704 			goto done;
10705 
10706 		error = got_object_open_as_commit(&commit, repo,
10707 		    head_commit_id);
10708 		if (error)
10709 			goto done;
10710 		parent_ids = got_object_commit_get_parent_ids(commit);
10711 		pid = STAILQ_FIRST(parent_ids);
10712 		if (pid == NULL) {
10713 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10714 			goto done;
10715 		}
10716 		error = collect_commits(&commits, head_commit_id, pid->id,
10717 		    base_commit_id, got_worktree_get_path_prefix(worktree),
10718 		    GOT_ERR_HISTEDIT_PATH, repo);
10719 		got_object_commit_close(commit);
10720 		commit = NULL;
10721 		if (error)
10722 			goto done;
10723 	} else {
10724 		if (edit_in_progress) {
10725 			error = got_error(GOT_ERR_HISTEDIT_BUSY);
10726 			goto done;
10727 		}
10728 
10729 		error = got_ref_open(&branch, repo,
10730 		    got_worktree_get_head_ref_name(worktree), 0);
10731 		if (error != NULL)
10732 			goto done;
10733 
10734 		if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10735 			error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10736 			    "will not edit commit history of a branch outside "
10737 			    "the \"refs/heads/\" reference namespace");
10738 			goto done;
10739 		}
10740 
10741 		error = got_ref_resolve(&head_commit_id, repo, branch);
10742 		got_ref_close(branch);
10743 		branch = NULL;
10744 		if (error)
10745 			goto done;
10746 
10747 		error = got_object_open_as_commit(&commit, repo,
10748 		    head_commit_id);
10749 		if (error)
10750 			goto done;
10751 		parent_ids = got_object_commit_get_parent_ids(commit);
10752 		pid = STAILQ_FIRST(parent_ids);
10753 		if (pid == NULL) {
10754 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10755 			goto done;
10756 		}
10757 		error = collect_commits(&commits, head_commit_id, pid->id,
10758 		    got_worktree_get_base_commit_id(worktree),
10759 		    got_worktree_get_path_prefix(worktree),
10760 		    GOT_ERR_HISTEDIT_PATH, repo);
10761 		got_object_commit_close(commit);
10762 		commit = NULL;
10763 		if (error)
10764 			goto done;
10765 
10766 		if (STAILQ_EMPTY(&commits)) {
10767 			error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10768 			goto done;
10769 		}
10770 
10771 		error = got_worktree_histedit_prepare(&tmp_branch, &branch,
10772 		    &base_commit_id, &fileindex, worktree, repo);
10773 		if (error)
10774 			goto done;
10775 
10776 		if (edit_script_path) {
10777 			error = histedit_load_list(&histedit_cmds,
10778 			    edit_script_path, repo);
10779 			if (error) {
10780 				got_worktree_histedit_abort(worktree, fileindex,
10781 				    repo, branch, base_commit_id,
10782 				    abort_progress, &upa);
10783 				print_merge_progress_stats(&upa);
10784 				goto done;
10785 			}
10786 		} else {
10787 			const char *branch_name;
10788 			branch_name = got_ref_get_symref_target(branch);
10789 			if (strncmp(branch_name, "refs/heads/", 11) == 0)
10790 				branch_name += 11;
10791 			error = histedit_edit_script(&histedit_cmds, &commits,
10792 			    branch_name, edit_logmsg_only, fold_only,
10793 			    edit_only, repo);
10794 			if (error) {
10795 				got_worktree_histedit_abort(worktree, fileindex,
10796 				    repo, branch, base_commit_id,
10797 				    abort_progress, &upa);
10798 				print_merge_progress_stats(&upa);
10799 				goto done;
10800 			}
10801 
10802 		}
10803 
10804 		error = histedit_save_list(&histedit_cmds, worktree,
10805 		    repo);
10806 		if (error) {
10807 			got_worktree_histedit_abort(worktree, fileindex,
10808 			    repo, branch, base_commit_id,
10809 			    abort_progress, &upa);
10810 			print_merge_progress_stats(&upa);
10811 			goto done;
10812 		}
10813 
10814 	}
10815 
10816 	error = histedit_check_script(&histedit_cmds, &commits, repo);
10817 	if (error)
10818 		goto done;
10819 
10820 	TAILQ_FOREACH(hle, &histedit_cmds, entry) {
10821 		if (resume_commit_id) {
10822 			if (got_object_id_cmp(hle->commit_id,
10823 			    resume_commit_id) != 0)
10824 				continue;
10825 
10826 			resume_commit_id = NULL;
10827 			if (hle->cmd->code == GOT_HISTEDIT_DROP ||
10828 			    hle->cmd->code == GOT_HISTEDIT_FOLD) {
10829 				error = histedit_skip_commit(hle, worktree,
10830 				    repo);
10831 				if (error)
10832 					goto done;
10833 			} else {
10834 				struct got_pathlist_head paths;
10835 				int have_changes = 0;
10836 
10837 				TAILQ_INIT(&paths);
10838 				error = got_pathlist_append(&paths, "", NULL);
10839 				if (error)
10840 					goto done;
10841 				error = got_worktree_status(worktree, &paths,
10842 				    repo, 0, check_local_changes, &have_changes,
10843 				    check_cancelled, NULL);
10844 				got_pathlist_free(&paths);
10845 				if (error) {
10846 					if (error->code != GOT_ERR_CANCELLED)
10847 						goto done;
10848 					if (sigint_received || sigpipe_received)
10849 						goto done;
10850 				}
10851 				if (have_changes) {
10852 					error = histedit_commit(NULL, worktree,
10853 					    fileindex, tmp_branch, hle, repo);
10854 					if (error)
10855 						goto done;
10856 				} else {
10857 					error = got_object_open_as_commit(
10858 					    &commit, repo, hle->commit_id);
10859 					if (error)
10860 						goto done;
10861 					error = show_histedit_progress(commit,
10862 					    hle, NULL);
10863 					got_object_commit_close(commit);
10864 					commit = NULL;
10865 					if (error)
10866 						goto done;
10867 				}
10868 			}
10869 			continue;
10870 		}
10871 
10872 		if (hle->cmd->code == GOT_HISTEDIT_DROP) {
10873 			error = histedit_skip_commit(hle, worktree, repo);
10874 			if (error)
10875 				goto done;
10876 			continue;
10877 		}
10878 
10879 		error = got_object_open_as_commit(&commit, repo,
10880 		    hle->commit_id);
10881 		if (error)
10882 			goto done;
10883 		parent_ids = got_object_commit_get_parent_ids(commit);
10884 		pid = STAILQ_FIRST(parent_ids);
10885 
10886 		error = got_worktree_histedit_merge_files(&merged_paths,
10887 		    worktree, fileindex, pid->id, hle->commit_id, repo,
10888 		    update_progress, &upa, check_cancelled, NULL);
10889 		if (error)
10890 			goto done;
10891 		got_object_commit_close(commit);
10892 		commit = NULL;
10893 
10894 		print_merge_progress_stats(&upa);
10895 		if (upa.conflicts > 0 || upa.missing > 0 ||
10896 		    upa.not_deleted > 0 || upa.unversioned > 0) {
10897 			if (upa.conflicts > 0) {
10898 				error = show_rebase_merge_conflict(
10899 				    hle->commit_id, repo);
10900 				if (error)
10901 					goto done;
10902 			}
10903 			got_worktree_rebase_pathlist_free(&merged_paths);
10904 			break;
10905 		}
10906 
10907 		if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
10908 			char *id_str;
10909 			error = got_object_id_str(&id_str, hle->commit_id);
10910 			if (error)
10911 				goto done;
10912 			printf("Stopping histedit for amending commit %s\n",
10913 			    id_str);
10914 			free(id_str);
10915 			got_worktree_rebase_pathlist_free(&merged_paths);
10916 			error = got_worktree_histedit_postpone(worktree,
10917 			    fileindex);
10918 			goto done;
10919 		}
10920 
10921 		if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
10922 			error = histedit_skip_commit(hle, worktree, repo);
10923 			if (error)
10924 				goto done;
10925 			continue;
10926 		}
10927 
10928 		error = histedit_commit(&merged_paths, worktree, fileindex,
10929 		    tmp_branch, hle, repo);
10930 		got_worktree_rebase_pathlist_free(&merged_paths);
10931 		if (error)
10932 			goto done;
10933 	}
10934 
10935 	if (upa.conflicts > 0 || upa.missing > 0 ||
10936 	    upa.not_deleted > 0 || upa.unversioned > 0) {
10937 		error = got_worktree_histedit_postpone(worktree, fileindex);
10938 		if (error)
10939 			goto done;
10940 		if (upa.conflicts > 0 && upa.missing == 0 &&
10941 		    upa.not_deleted == 0 && upa.unversioned == 0) {
10942 			error = got_error_msg(GOT_ERR_CONFLICTS,
10943 			    "conflicts must be resolved before histedit "
10944 			    "can continue");
10945 		} else if (upa.conflicts > 0) {
10946 			error = got_error_msg(GOT_ERR_CONFLICTS,
10947 			    "conflicts must be resolved before histedit "
10948 			    "can continue; changes destined for some "
10949 			    "files were not yet merged and should be "
10950 			    "merged manually if required before the "
10951 			    "histedit operation is continued");
10952 		} else {
10953 			error = got_error_msg(GOT_ERR_CONFLICTS,
10954 			    "changes destined for some files were not "
10955 			    "yet merged and should be merged manually "
10956 			    "if required before the histedit operation "
10957 			    "is continued");
10958 		}
10959 	} else
10960 		error = histedit_complete(worktree, fileindex, tmp_branch,
10961 		    branch, repo);
10962 done:
10963 	got_object_id_queue_free(&commits);
10964 	histedit_free_list(&histedit_cmds);
10965 	free(head_commit_id);
10966 	free(base_commit_id);
10967 	free(resume_commit_id);
10968 	if (commit)
10969 		got_object_commit_close(commit);
10970 	if (branch)
10971 		got_ref_close(branch);
10972 	if (tmp_branch)
10973 		got_ref_close(tmp_branch);
10974 	if (worktree)
10975 		got_worktree_close(worktree);
10976 	if (repo) {
10977 		const struct got_error *close_err = got_repo_close(repo);
10978 		if (error == NULL)
10979 			error = close_err;
10980 	}
10981 	return error;
10982 }
10983 
10984 __dead static void
10985 usage_integrate(void)
10986 {
10987 	fprintf(stderr, "usage: %s integrate branch\n", getprogname());
10988 	exit(1);
10989 }
10990 
10991 static const struct got_error *
10992 cmd_integrate(int argc, char *argv[])
10993 {
10994 	const struct got_error *error = NULL;
10995 	struct got_repository *repo = NULL;
10996 	struct got_worktree *worktree = NULL;
10997 	char *cwd = NULL, *refname = NULL, *base_refname = NULL;
10998 	const char *branch_arg = NULL;
10999 	struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11000 	struct got_fileindex *fileindex = NULL;
11001 	struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11002 	int ch;
11003 	struct got_update_progress_arg upa;
11004 
11005 	while ((ch = getopt(argc, argv, "")) != -1) {
11006 		switch (ch) {
11007 		default:
11008 			usage_integrate();
11009 			/* NOTREACHED */
11010 		}
11011 	}
11012 
11013 	argc -= optind;
11014 	argv += optind;
11015 
11016 	if (argc != 1)
11017 		usage_integrate();
11018 	branch_arg = argv[0];
11019 #ifndef PROFILE
11020 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11021 	    "unveil", NULL) == -1)
11022 		err(1, "pledge");
11023 #endif
11024 	cwd = getcwd(NULL, 0);
11025 	if (cwd == NULL) {
11026 		error = got_error_from_errno("getcwd");
11027 		goto done;
11028 	}
11029 
11030 	error = got_worktree_open(&worktree, cwd);
11031 	if (error) {
11032 		if (error->code == GOT_ERR_NOT_WORKTREE)
11033 			error = wrap_not_worktree_error(error, "integrate",
11034 			    cwd);
11035 		goto done;
11036 	}
11037 
11038 	error = check_rebase_or_histedit_in_progress(worktree);
11039 	if (error)
11040 		goto done;
11041 
11042 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11043 	    NULL);
11044 	if (error != NULL)
11045 		goto done;
11046 
11047 	error = apply_unveil(got_repo_get_path(repo), 0,
11048 	    got_worktree_get_root_path(worktree));
11049 	if (error)
11050 		goto done;
11051 
11052 	error = check_merge_in_progress(worktree, repo);
11053 	if (error)
11054 		goto done;
11055 
11056 	if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11057 		error = got_error_from_errno("asprintf");
11058 		goto done;
11059 	}
11060 
11061 	error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11062 	    &base_branch_ref, worktree, refname, repo);
11063 	if (error)
11064 		goto done;
11065 
11066 	refname = strdup(got_ref_get_name(branch_ref));
11067 	if (refname == NULL) {
11068 		error = got_error_from_errno("strdup");
11069 		got_worktree_integrate_abort(worktree, fileindex, repo,
11070 		    branch_ref, base_branch_ref);
11071 		goto done;
11072 	}
11073 	base_refname = strdup(got_ref_get_name(base_branch_ref));
11074 	if (base_refname == NULL) {
11075 		error = got_error_from_errno("strdup");
11076 		got_worktree_integrate_abort(worktree, fileindex, repo,
11077 		    branch_ref, base_branch_ref);
11078 		goto done;
11079 	}
11080 
11081 	error = got_ref_resolve(&commit_id, repo, branch_ref);
11082 	if (error)
11083 		goto done;
11084 
11085 	error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11086 	if (error)
11087 		goto done;
11088 
11089 	if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11090 		error = got_error_msg(GOT_ERR_SAME_BRANCH,
11091 		    "specified branch has already been integrated");
11092 		got_worktree_integrate_abort(worktree, fileindex, repo,
11093 		    branch_ref, base_branch_ref);
11094 		goto done;
11095 	}
11096 
11097 	error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11098 	if (error) {
11099 		if (error->code == GOT_ERR_ANCESTRY)
11100 			error = got_error(GOT_ERR_REBASE_REQUIRED);
11101 		got_worktree_integrate_abort(worktree, fileindex, repo,
11102 		    branch_ref, base_branch_ref);
11103 		goto done;
11104 	}
11105 
11106 	memset(&upa, 0, sizeof(upa));
11107 	error = got_worktree_integrate_continue(worktree, fileindex, repo,
11108 	    branch_ref, base_branch_ref, update_progress, &upa,
11109 	    check_cancelled, NULL);
11110 	if (error)
11111 		goto done;
11112 
11113 	printf("Integrated %s into %s\n", refname, base_refname);
11114 	print_update_progress_stats(&upa);
11115 done:
11116 	if (repo) {
11117 		const struct got_error *close_err = got_repo_close(repo);
11118 		if (error == NULL)
11119 			error = close_err;
11120 	}
11121 	if (worktree)
11122 		got_worktree_close(worktree);
11123 	free(cwd);
11124 	free(base_commit_id);
11125 	free(commit_id);
11126 	free(refname);
11127 	free(base_refname);
11128 	return error;
11129 }
11130 
11131 __dead static void
11132 usage_merge(void)
11133 {
11134 	fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11135 	    getprogname());
11136 	exit(1);
11137 }
11138 
11139 static const struct got_error *
11140 cmd_merge(int argc, char *argv[])
11141 {
11142 	const struct got_error *error = NULL;
11143 	struct got_worktree *worktree = NULL;
11144 	struct got_repository *repo = NULL;
11145 	struct got_fileindex *fileindex = NULL;
11146 	char *cwd = NULL, *id_str = NULL, *author = NULL;
11147 	struct got_reference *branch = NULL, *wt_branch = NULL;
11148 	struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11149 	struct got_object_id *wt_branch_tip = NULL;
11150 	int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11151 	int interrupt_merge = 0;
11152 	struct got_update_progress_arg upa;
11153 	struct got_object_id *merge_commit_id = NULL;
11154 	char *branch_name = NULL;
11155 
11156 	memset(&upa, 0, sizeof(upa));
11157 
11158 	while ((ch = getopt(argc, argv, "acn")) != -1) {
11159 		switch (ch) {
11160 		case 'a':
11161 			abort_merge = 1;
11162 			break;
11163 		case 'c':
11164 			continue_merge = 1;
11165 			break;
11166 		case 'n':
11167 			interrupt_merge = 1;
11168 			break;
11169 		default:
11170 			usage_rebase();
11171 			/* NOTREACHED */
11172 		}
11173 	}
11174 
11175 	argc -= optind;
11176 	argv += optind;
11177 
11178 #ifndef PROFILE
11179 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11180 	    "unveil", NULL) == -1)
11181 		err(1, "pledge");
11182 #endif
11183 
11184 	if (abort_merge && continue_merge)
11185 		option_conflict('a', 'c');
11186 	if (abort_merge || continue_merge) {
11187 		if (argc != 0)
11188 			usage_merge();
11189 	} else if (argc != 1)
11190 		usage_merge();
11191 
11192 	cwd = getcwd(NULL, 0);
11193 	if (cwd == NULL) {
11194 		error = got_error_from_errno("getcwd");
11195 		goto done;
11196 	}
11197 
11198 	error = got_worktree_open(&worktree, cwd);
11199 	if (error) {
11200 		if (error->code == GOT_ERR_NOT_WORKTREE)
11201 			error = wrap_not_worktree_error(error,
11202 			    "merge", cwd);
11203 		goto done;
11204 	}
11205 
11206 	error = got_repo_open(&repo,
11207 	    worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
11208 	if (error != NULL)
11209 		goto done;
11210 
11211 	error = apply_unveil(got_repo_get_path(repo), 0,
11212 	    worktree ? got_worktree_get_root_path(worktree) : NULL);
11213 	if (error)
11214 		goto done;
11215 
11216 	error = check_rebase_or_histedit_in_progress(worktree);
11217 	if (error)
11218 		goto done;
11219 
11220 	error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11221 	    repo);
11222 	if (error)
11223 		goto done;
11224 
11225 	if (abort_merge) {
11226 		if (!merge_in_progress) {
11227 			error = got_error(GOT_ERR_NOT_MERGING);
11228 			goto done;
11229 		}
11230 		error = got_worktree_merge_continue(&branch_name,
11231 		    &branch_tip, &fileindex, worktree, repo);
11232 		if (error)
11233 			goto done;
11234 		error = got_worktree_merge_abort(worktree, fileindex, repo,
11235 		    abort_progress, &upa);
11236 		if (error)
11237 			goto done;
11238 		printf("Merge of %s aborted\n", branch_name);
11239 		goto done; /* nothing else to do */
11240 	}
11241 
11242 	error = get_author(&author, repo, worktree);
11243 	if (error)
11244 		goto done;
11245 
11246 	if (continue_merge) {
11247 		if (!merge_in_progress) {
11248 			error = got_error(GOT_ERR_NOT_MERGING);
11249 			goto done;
11250 		}
11251 		error = got_worktree_merge_continue(&branch_name,
11252 		    &branch_tip, &fileindex, worktree, repo);
11253 		if (error)
11254 			goto done;
11255 	} else {
11256 		error = got_ref_open(&branch, repo, argv[0], 0);
11257 		if (error != NULL)
11258 			goto done;
11259 		branch_name = strdup(got_ref_get_name(branch));
11260 		if (branch_name == NULL) {
11261 			error = got_error_from_errno("strdup");
11262 			goto done;
11263 		}
11264 		error = got_ref_resolve(&branch_tip, repo, branch);
11265 		if (error)
11266 			goto done;
11267 	}
11268 
11269 	error = got_ref_open(&wt_branch, repo,
11270 	    got_worktree_get_head_ref_name(worktree), 0);
11271 	if (error)
11272 		goto done;
11273 	error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11274 	if (error)
11275 		goto done;
11276 	error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11277 	    wt_branch_tip, branch_tip, 0, repo,
11278 	    check_cancelled, NULL);
11279 	if (error && error->code != GOT_ERR_ANCESTRY)
11280 		goto done;
11281 
11282 	if (!continue_merge) {
11283 		error = check_path_prefix(wt_branch_tip, branch_tip,
11284 		    got_worktree_get_path_prefix(worktree),
11285 		    GOT_ERR_MERGE_PATH, repo);
11286 		if (error)
11287 			goto done;
11288 		if (yca_id) {
11289 			error = check_same_branch(wt_branch_tip, branch,
11290 			    yca_id, repo);
11291 			if (error) {
11292 				if (error->code != GOT_ERR_ANCESTRY)
11293 					goto done;
11294 				error = NULL;
11295 			} else {
11296 				static char msg[512];
11297 				snprintf(msg, sizeof(msg),
11298 				    "cannot create a merge commit because "
11299 				    "%s is based on %s; %s can be integrated "
11300 				    "with 'got integrate' instead", branch_name,
11301 				    got_worktree_get_head_ref_name(worktree),
11302 				    branch_name);
11303 				error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11304 				goto done;
11305 			}
11306 		}
11307 		error = got_worktree_merge_prepare(&fileindex, worktree,
11308 		    branch, repo);
11309 		if (error)
11310 			goto done;
11311 
11312 		error = got_worktree_merge_branch(worktree, fileindex,
11313 		    yca_id, branch_tip, repo, update_progress, &upa,
11314 		    check_cancelled, NULL);
11315 		if (error)
11316 			goto done;
11317 		print_merge_progress_stats(&upa);
11318 		if (!upa.did_something) {
11319 			error = got_worktree_merge_abort(worktree, fileindex,
11320 			    repo, abort_progress, &upa);
11321 			if (error)
11322 				goto done;
11323 			printf("Already up-to-date\n");
11324 			goto done;
11325 		}
11326 	}
11327 
11328 	if (interrupt_merge) {
11329 		error = got_worktree_merge_postpone(worktree, fileindex);
11330 		if (error)
11331 			goto done;
11332 		printf("Merge of %s interrupted on request\n", branch_name);
11333 	} else if (upa.conflicts > 0 || upa.missing > 0 ||
11334 	    upa.not_deleted > 0 || upa.unversioned > 0) {
11335 		error = got_worktree_merge_postpone(worktree, fileindex);
11336 		if (error)
11337 			goto done;
11338 		if (upa.conflicts > 0 && upa.missing == 0 &&
11339 		    upa.not_deleted == 0 && upa.unversioned == 0) {
11340 			error = got_error_msg(GOT_ERR_CONFLICTS,
11341 			    "conflicts must be resolved before merging "
11342 			    "can continue");
11343 		} else if (upa.conflicts > 0) {
11344 			error = got_error_msg(GOT_ERR_CONFLICTS,
11345 			    "conflicts must be resolved before merging "
11346 			    "can continue; changes destined for some "
11347 			    "files were not yet merged and "
11348 			    "should be merged manually if required before the "
11349 			    "merge operation is continued");
11350 		} else {
11351 			error = got_error_msg(GOT_ERR_CONFLICTS,
11352 			    "changes destined for some "
11353 			    "files were not yet merged and should be "
11354 			    "merged manually if required before the "
11355 			    "merge operation is continued");
11356 		}
11357 		goto done;
11358 	} else {
11359 		error = got_worktree_merge_commit(&merge_commit_id, worktree,
11360 		    fileindex, author, NULL, 1, branch_tip, branch_name,
11361 		    repo, continue_merge ? print_status : NULL, NULL);
11362 		if (error)
11363 			goto done;
11364 		error = got_worktree_merge_complete(worktree, fileindex, repo);
11365 		if (error)
11366 			goto done;
11367 		error = got_object_id_str(&id_str, merge_commit_id);
11368 		if (error)
11369 			goto done;
11370 		printf("Merged %s into %s: %s\n", branch_name,
11371 		    got_worktree_get_head_ref_name(worktree),
11372 		    id_str);
11373 
11374 	}
11375 done:
11376 	free(id_str);
11377 	free(merge_commit_id);
11378 	free(author);
11379 	free(branch_tip);
11380 	free(branch_name);
11381 	free(yca_id);
11382 	if (branch)
11383 		got_ref_close(branch);
11384 	if (wt_branch)
11385 		got_ref_close(wt_branch);
11386 	if (worktree)
11387 		got_worktree_close(worktree);
11388 	if (repo) {
11389 		const struct got_error *close_err = got_repo_close(repo);
11390 		if (error == NULL)
11391 			error = close_err;
11392 	}
11393 	return error;
11394 }
11395 
11396 __dead static void
11397 usage_stage(void)
11398 {
11399 	fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11400 	    "[-S] [file-path ...]\n",
11401 	    getprogname());
11402 	exit(1);
11403 }
11404 
11405 static const struct got_error *
11406 print_stage(void *arg, unsigned char status, unsigned char staged_status,
11407     const char *path, struct got_object_id *blob_id,
11408     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11409     int dirfd, const char *de_name)
11410 {
11411 	const struct got_error *err = NULL;
11412 	char *id_str = NULL;
11413 
11414 	if (staged_status != GOT_STATUS_ADD &&
11415 	    staged_status != GOT_STATUS_MODIFY &&
11416 	    staged_status != GOT_STATUS_DELETE)
11417 		return NULL;
11418 
11419 	if (staged_status == GOT_STATUS_ADD ||
11420 	    staged_status == GOT_STATUS_MODIFY)
11421 		err = got_object_id_str(&id_str, staged_blob_id);
11422 	else
11423 		err = got_object_id_str(&id_str, blob_id);
11424 	if (err)
11425 		return err;
11426 
11427 	printf("%s %c %s\n", id_str, staged_status, path);
11428 	free(id_str);
11429 	return NULL;
11430 }
11431 
11432 static const struct got_error *
11433 cmd_stage(int argc, char *argv[])
11434 {
11435 	const struct got_error *error = NULL;
11436 	struct got_repository *repo = NULL;
11437 	struct got_worktree *worktree = NULL;
11438 	char *cwd = NULL;
11439 	struct got_pathlist_head paths;
11440 	struct got_pathlist_entry *pe;
11441 	int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11442 	FILE *patch_script_file = NULL;
11443 	const char *patch_script_path = NULL;
11444 	struct choose_patch_arg cpa;
11445 
11446 	TAILQ_INIT(&paths);
11447 
11448 	while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11449 		switch (ch) {
11450 		case 'l':
11451 			list_stage = 1;
11452 			break;
11453 		case 'p':
11454 			pflag = 1;
11455 			break;
11456 		case 'F':
11457 			patch_script_path = optarg;
11458 			break;
11459 		case 'S':
11460 			allow_bad_symlinks = 1;
11461 			break;
11462 		default:
11463 			usage_stage();
11464 			/* NOTREACHED */
11465 		}
11466 	}
11467 
11468 	argc -= optind;
11469 	argv += optind;
11470 
11471 #ifndef PROFILE
11472 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11473 	    "unveil", NULL) == -1)
11474 		err(1, "pledge");
11475 #endif
11476 	if (list_stage && (pflag || patch_script_path))
11477 		errx(1, "-l option cannot be used with other options");
11478 	if (patch_script_path && !pflag)
11479 		errx(1, "-F option can only be used together with -p option");
11480 
11481 	cwd = getcwd(NULL, 0);
11482 	if (cwd == NULL) {
11483 		error = got_error_from_errno("getcwd");
11484 		goto done;
11485 	}
11486 
11487 	error = got_worktree_open(&worktree, cwd);
11488 	if (error) {
11489 		if (error->code == GOT_ERR_NOT_WORKTREE)
11490 			error = wrap_not_worktree_error(error, "stage", cwd);
11491 		goto done;
11492 	}
11493 
11494 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11495 	    NULL);
11496 	if (error != NULL)
11497 		goto done;
11498 
11499 	if (patch_script_path) {
11500 		patch_script_file = fopen(patch_script_path, "re");
11501 		if (patch_script_file == NULL) {
11502 			error = got_error_from_errno2("fopen",
11503 			    patch_script_path);
11504 			goto done;
11505 		}
11506 	}
11507 	error = apply_unveil(got_repo_get_path(repo), 0,
11508 	    got_worktree_get_root_path(worktree));
11509 	if (error)
11510 		goto done;
11511 
11512 	error = check_merge_in_progress(worktree, repo);
11513 	if (error)
11514 		goto done;
11515 
11516 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11517 	if (error)
11518 		goto done;
11519 
11520 	if (list_stage)
11521 		error = got_worktree_status(worktree, &paths, repo, 0,
11522 		    print_stage, NULL, check_cancelled, NULL);
11523 	else {
11524 		cpa.patch_script_file = patch_script_file;
11525 		cpa.action = "stage";
11526 		error = got_worktree_stage(worktree, &paths,
11527 		    pflag ? NULL : print_status, NULL,
11528 		    pflag ? choose_patch : NULL, &cpa,
11529 		    allow_bad_symlinks, repo);
11530 	}
11531 done:
11532 	if (patch_script_file && fclose(patch_script_file) == EOF &&
11533 	    error == NULL)
11534 		error = got_error_from_errno2("fclose", patch_script_path);
11535 	if (repo) {
11536 		const struct got_error *close_err = got_repo_close(repo);
11537 		if (error == NULL)
11538 			error = close_err;
11539 	}
11540 	if (worktree)
11541 		got_worktree_close(worktree);
11542 	TAILQ_FOREACH(pe, &paths, entry)
11543 		free((char *)pe->path);
11544 	got_pathlist_free(&paths);
11545 	free(cwd);
11546 	return error;
11547 }
11548 
11549 __dead static void
11550 usage_unstage(void)
11551 {
11552 	fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
11553 	    "[file-path ...]\n",
11554 	    getprogname());
11555 	exit(1);
11556 }
11557 
11558 
11559 static const struct got_error *
11560 cmd_unstage(int argc, char *argv[])
11561 {
11562 	const struct got_error *error = NULL;
11563 	struct got_repository *repo = NULL;
11564 	struct got_worktree *worktree = NULL;
11565 	char *cwd = NULL;
11566 	struct got_pathlist_head paths;
11567 	struct got_pathlist_entry *pe;
11568 	int ch, pflag = 0;
11569 	struct got_update_progress_arg upa;
11570 	FILE *patch_script_file = NULL;
11571 	const char *patch_script_path = NULL;
11572 	struct choose_patch_arg cpa;
11573 
11574 	TAILQ_INIT(&paths);
11575 
11576 	while ((ch = getopt(argc, argv, "pF:")) != -1) {
11577 		switch (ch) {
11578 		case 'p':
11579 			pflag = 1;
11580 			break;
11581 		case 'F':
11582 			patch_script_path = optarg;
11583 			break;
11584 		default:
11585 			usage_unstage();
11586 			/* NOTREACHED */
11587 		}
11588 	}
11589 
11590 	argc -= optind;
11591 	argv += optind;
11592 
11593 #ifndef PROFILE
11594 	if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11595 	    "unveil", NULL) == -1)
11596 		err(1, "pledge");
11597 #endif
11598 	if (patch_script_path && !pflag)
11599 		errx(1, "-F option can only be used together with -p option");
11600 
11601 	cwd = getcwd(NULL, 0);
11602 	if (cwd == NULL) {
11603 		error = got_error_from_errno("getcwd");
11604 		goto done;
11605 	}
11606 
11607 	error = got_worktree_open(&worktree, cwd);
11608 	if (error) {
11609 		if (error->code == GOT_ERR_NOT_WORKTREE)
11610 			error = wrap_not_worktree_error(error, "unstage", cwd);
11611 		goto done;
11612 	}
11613 
11614 	error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11615 	    NULL);
11616 	if (error != NULL)
11617 		goto done;
11618 
11619 	if (patch_script_path) {
11620 		patch_script_file = fopen(patch_script_path, "re");
11621 		if (patch_script_file == NULL) {
11622 			error = got_error_from_errno2("fopen",
11623 			    patch_script_path);
11624 			goto done;
11625 		}
11626 	}
11627 
11628 	error = apply_unveil(got_repo_get_path(repo), 0,
11629 	    got_worktree_get_root_path(worktree));
11630 	if (error)
11631 		goto done;
11632 
11633 	error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11634 	if (error)
11635 		goto done;
11636 
11637 	cpa.patch_script_file = patch_script_file;
11638 	cpa.action = "unstage";
11639 	memset(&upa, 0, sizeof(upa));
11640 	error = got_worktree_unstage(worktree, &paths, update_progress,
11641 	    &upa, pflag ? choose_patch : NULL, &cpa, repo);
11642 	if (!error)
11643 		print_merge_progress_stats(&upa);
11644 done:
11645 	if (patch_script_file && fclose(patch_script_file) == EOF &&
11646 	    error == NULL)
11647 		error = got_error_from_errno2("fclose", patch_script_path);
11648 	if (repo) {
11649 		const struct got_error *close_err = got_repo_close(repo);
11650 		if (error == NULL)
11651 			error = close_err;
11652 	}
11653 	if (worktree)
11654 		got_worktree_close(worktree);
11655 	TAILQ_FOREACH(pe, &paths, entry)
11656 		free((char *)pe->path);
11657 	got_pathlist_free(&paths);
11658 	free(cwd);
11659 	return error;
11660 }
11661 
11662 __dead static void
11663 usage_cat(void)
11664 {
11665 	fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
11666 	    "arg1 [arg2 ...]\n", getprogname());
11667 	exit(1);
11668 }
11669 
11670 static const struct got_error *
11671 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11672 {
11673 	const struct got_error *err;
11674 	struct got_blob_object *blob;
11675 
11676 	err = got_object_open_as_blob(&blob, repo, id, 8192);
11677 	if (err)
11678 		return err;
11679 
11680 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
11681 	got_object_blob_close(blob);
11682 	return err;
11683 }
11684 
11685 static const struct got_error *
11686 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11687 {
11688 	const struct got_error *err;
11689 	struct got_tree_object *tree;
11690 	int nentries, i;
11691 
11692 	err = got_object_open_as_tree(&tree, repo, id);
11693 	if (err)
11694 		return err;
11695 
11696 	nentries = got_object_tree_get_nentries(tree);
11697 	for (i = 0; i < nentries; i++) {
11698 		struct got_tree_entry *te;
11699 		char *id_str;
11700 		if (sigint_received || sigpipe_received)
11701 			break;
11702 		te = got_object_tree_get_entry(tree, i);
11703 		err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
11704 		if (err)
11705 			break;
11706 		fprintf(outfile, "%s %.7o %s\n", id_str,
11707 		    got_tree_entry_get_mode(te),
11708 		    got_tree_entry_get_name(te));
11709 		free(id_str);
11710 	}
11711 
11712 	got_object_tree_close(tree);
11713 	return err;
11714 }
11715 
11716 static void
11717 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
11718 {
11719 	long long h, m;
11720 	char sign = '+';
11721 
11722 	if (gmtoff < 0) {
11723 		sign = '-';
11724 		gmtoff = -gmtoff;
11725 	}
11726 
11727 	h = (long long)gmtoff / 3600;
11728 	m = ((long long)gmtoff - h*3600) / 60;
11729 	snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
11730 }
11731 
11732 static const struct got_error *
11733 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11734 {
11735 	const struct got_error *err;
11736 	struct got_commit_object *commit;
11737 	const struct got_object_id_queue *parent_ids;
11738 	struct got_object_qid *pid;
11739 	char *id_str = NULL;
11740 	const char *logmsg = NULL;
11741 	char gmtoff[6];
11742 
11743 	err = got_object_open_as_commit(&commit, repo, id);
11744 	if (err)
11745 		return err;
11746 
11747 	err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
11748 	if (err)
11749 		goto done;
11750 
11751 	fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
11752 	parent_ids = got_object_commit_get_parent_ids(commit);
11753 	fprintf(outfile, "numparents %d\n",
11754 	    got_object_commit_get_nparents(commit));
11755 	STAILQ_FOREACH(pid, parent_ids, entry) {
11756 		char *pid_str;
11757 		err = got_object_id_str(&pid_str, pid->id);
11758 		if (err)
11759 			goto done;
11760 		fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
11761 		free(pid_str);
11762 	}
11763 	format_gmtoff(gmtoff, sizeof(gmtoff),
11764 	    got_object_commit_get_author_gmtoff(commit));
11765 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
11766 	    got_object_commit_get_author(commit),
11767 	    (long long)got_object_commit_get_author_time(commit),
11768 	    gmtoff);
11769 
11770 	format_gmtoff(gmtoff, sizeof(gmtoff),
11771 	    got_object_commit_get_committer_gmtoff(commit));
11772 	fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
11773 	    got_object_commit_get_author(commit),
11774 	    (long long)got_object_commit_get_committer_time(commit),
11775 	    gmtoff);
11776 
11777 	logmsg = got_object_commit_get_logmsg_raw(commit);
11778 	fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
11779 	fprintf(outfile, "%s", logmsg);
11780 done:
11781 	free(id_str);
11782 	got_object_commit_close(commit);
11783 	return err;
11784 }
11785 
11786 static const struct got_error *
11787 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11788 {
11789 	const struct got_error *err;
11790 	struct got_tag_object *tag;
11791 	char *id_str = NULL;
11792 	const char *tagmsg = NULL;
11793 	char gmtoff[6];
11794 
11795 	err = got_object_open_as_tag(&tag, repo, id);
11796 	if (err)
11797 		return err;
11798 
11799 	err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
11800 	if (err)
11801 		goto done;
11802 
11803 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
11804 
11805 	switch (got_object_tag_get_object_type(tag)) {
11806 	case GOT_OBJ_TYPE_BLOB:
11807 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11808 		    GOT_OBJ_LABEL_BLOB);
11809 		break;
11810 	case GOT_OBJ_TYPE_TREE:
11811 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11812 		    GOT_OBJ_LABEL_TREE);
11813 		break;
11814 	case GOT_OBJ_TYPE_COMMIT:
11815 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11816 		    GOT_OBJ_LABEL_COMMIT);
11817 		break;
11818 	case GOT_OBJ_TYPE_TAG:
11819 		fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11820 		    GOT_OBJ_LABEL_TAG);
11821 		break;
11822 	default:
11823 		break;
11824 	}
11825 
11826 	fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
11827 	    got_object_tag_get_name(tag));
11828 
11829 	format_gmtoff(gmtoff, sizeof(gmtoff),
11830 	    got_object_tag_get_tagger_gmtoff(tag));
11831 	fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
11832 	    got_object_tag_get_tagger(tag),
11833 	    (long long)got_object_tag_get_tagger_time(tag),
11834 	    gmtoff);
11835 
11836 	tagmsg = got_object_tag_get_message(tag);
11837 	fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
11838 	fprintf(outfile, "%s", tagmsg);
11839 done:
11840 	free(id_str);
11841 	got_object_tag_close(tag);
11842 	return err;
11843 }
11844 
11845 static const struct got_error *
11846 cmd_cat(int argc, char *argv[])
11847 {
11848 	const struct got_error *error;
11849 	struct got_repository *repo = NULL;
11850 	struct got_worktree *worktree = NULL;
11851 	char *cwd = NULL, *repo_path = NULL, *label = NULL;
11852 	const char *commit_id_str = NULL;
11853 	struct got_object_id *id = NULL, *commit_id = NULL;
11854 	struct got_commit_object *commit = NULL;
11855 	int ch, obj_type, i, force_path = 0;
11856 	struct got_reflist_head refs;
11857 
11858 	TAILQ_INIT(&refs);
11859 
11860 #ifndef PROFILE
11861 	if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
11862 	    NULL) == -1)
11863 		err(1, "pledge");
11864 #endif
11865 
11866 	while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
11867 		switch (ch) {
11868 		case 'c':
11869 			commit_id_str = optarg;
11870 			break;
11871 		case 'r':
11872 			repo_path = realpath(optarg, NULL);
11873 			if (repo_path == NULL)
11874 				return got_error_from_errno2("realpath",
11875 				    optarg);
11876 			got_path_strip_trailing_slashes(repo_path);
11877 			break;
11878 		case 'P':
11879 			force_path = 1;
11880 			break;
11881 		default:
11882 			usage_cat();
11883 			/* NOTREACHED */
11884 		}
11885 	}
11886 
11887 	argc -= optind;
11888 	argv += optind;
11889 
11890 	cwd = getcwd(NULL, 0);
11891 	if (cwd == NULL) {
11892 		error = got_error_from_errno("getcwd");
11893 		goto done;
11894 	}
11895 	error = got_worktree_open(&worktree, cwd);
11896 	if (error && error->code != GOT_ERR_NOT_WORKTREE)
11897 		goto done;
11898 	if (worktree) {
11899 		if (repo_path == NULL) {
11900 			repo_path = strdup(
11901 			    got_worktree_get_repo_path(worktree));
11902 			if (repo_path == NULL) {
11903 				error = got_error_from_errno("strdup");
11904 				goto done;
11905 			}
11906 		}
11907 
11908 		/* Release work tree lock. */
11909 		got_worktree_close(worktree);
11910 		worktree = NULL;
11911 	}
11912 
11913 	if (repo_path == NULL) {
11914 		repo_path = getcwd(NULL, 0);
11915 		if (repo_path == NULL)
11916 			return got_error_from_errno("getcwd");
11917 	}
11918 
11919 	error = got_repo_open(&repo, repo_path, NULL);
11920 	free(repo_path);
11921 	if (error != NULL)
11922 		goto done;
11923 
11924 	error = apply_unveil(got_repo_get_path(repo), 1, NULL);
11925 	if (error)
11926 		goto done;
11927 
11928 	error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11929 	if (error)
11930 		goto done;
11931 
11932 	if (commit_id_str == NULL)
11933 		commit_id_str = GOT_REF_HEAD;
11934 	error = got_repo_match_object_id(&commit_id, NULL,
11935 	    commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
11936 	if (error)
11937 		goto done;
11938 
11939 	error = got_object_open_as_commit(&commit, repo, commit_id);
11940 	if (error)
11941 		goto done;
11942 
11943 	for (i = 0; i < argc; i++) {
11944 		if (force_path) {
11945 			error = got_object_id_by_path(&id, repo, commit,
11946 			    argv[i]);
11947 			if (error)
11948 				break;
11949 		} else {
11950 			error = got_repo_match_object_id(&id, &label, argv[i],
11951 			    GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
11952 			    repo);
11953 			if (error) {
11954 				if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
11955 				    error->code != GOT_ERR_NOT_REF)
11956 					break;
11957 				error = got_object_id_by_path(&id, repo,
11958 				    commit, argv[i]);
11959 				if (error)
11960 					break;
11961 			}
11962 		}
11963 
11964 		error = got_object_get_type(&obj_type, repo, id);
11965 		if (error)
11966 			break;
11967 
11968 		switch (obj_type) {
11969 		case GOT_OBJ_TYPE_BLOB:
11970 			error = cat_blob(id, repo, stdout);
11971 			break;
11972 		case GOT_OBJ_TYPE_TREE:
11973 			error = cat_tree(id, repo, stdout);
11974 			break;
11975 		case GOT_OBJ_TYPE_COMMIT:
11976 			error = cat_commit(id, repo, stdout);
11977 			break;
11978 		case GOT_OBJ_TYPE_TAG:
11979 			error = cat_tag(id, repo, stdout);
11980 			break;
11981 		default:
11982 			error = got_error(GOT_ERR_OBJ_TYPE);
11983 			break;
11984 		}
11985 		if (error)
11986 			break;
11987 		free(label);
11988 		label = NULL;
11989 		free(id);
11990 		id = NULL;
11991 	}
11992 done:
11993 	free(label);
11994 	free(id);
11995 	free(commit_id);
11996 	if (commit)
11997 		got_object_commit_close(commit);
11998 	if (worktree)
11999 		got_worktree_close(worktree);
12000 	if (repo) {
12001 		const struct got_error *close_err = got_repo_close(repo);
12002 		if (error == NULL)
12003 			error = close_err;
12004 	}
12005 	got_ref_list_free(&refs);
12006 	return error;
12007 }
12008 
12009 __dead static void
12010 usage_info(void)
12011 {
12012 	fprintf(stderr, "usage: %s info [path ...]\n",
12013 	    getprogname());
12014 	exit(1);
12015 }
12016 
12017 static const struct got_error *
12018 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12019     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12020     struct got_object_id *commit_id)
12021 {
12022 	const struct got_error *err = NULL;
12023 	char *id_str = NULL;
12024 	char datebuf[128];
12025 	struct tm mytm, *tm;
12026 	struct got_pathlist_head *paths = arg;
12027 	struct got_pathlist_entry *pe;
12028 
12029 	/*
12030 	 * Clear error indication from any of the path arguments which
12031 	 * would cause this file index entry to be displayed.
12032 	 */
12033 	TAILQ_FOREACH(pe, paths, entry) {
12034 		if (got_path_cmp(path, pe->path, strlen(path),
12035 		    pe->path_len) == 0 ||
12036 		    got_path_is_child(path, pe->path, pe->path_len))
12037 			pe->data = NULL; /* no error */
12038 	}
12039 
12040 	printf(GOT_COMMIT_SEP_STR);
12041 	if (S_ISLNK(mode))
12042 		printf("symlink: %s\n", path);
12043 	else if (S_ISREG(mode)) {
12044 		printf("file: %s\n", path);
12045 		printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12046 	} else if (S_ISDIR(mode))
12047 		printf("directory: %s\n", path);
12048 	else
12049 		printf("something: %s\n", path);
12050 
12051 	tm = localtime_r(&mtime, &mytm);
12052 	if (tm == NULL)
12053 		return NULL;
12054 	if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12055 		return got_error(GOT_ERR_NO_SPACE);
12056 	printf("timestamp: %s\n", datebuf);
12057 
12058 	if (blob_id) {
12059 		err = got_object_id_str(&id_str, blob_id);
12060 		if (err)
12061 			return err;
12062 		printf("based on blob: %s\n", id_str);
12063 		free(id_str);
12064 	}
12065 
12066 	if (staged_blob_id) {
12067 		err = got_object_id_str(&id_str, staged_blob_id);
12068 		if (err)
12069 			return err;
12070 		printf("based on staged blob: %s\n", id_str);
12071 		free(id_str);
12072 	}
12073 
12074 	if (commit_id) {
12075 		err = got_object_id_str(&id_str, commit_id);
12076 		if (err)
12077 			return err;
12078 		printf("based on commit: %s\n", id_str);
12079 		free(id_str);
12080 	}
12081 
12082 	return NULL;
12083 }
12084 
12085 static const struct got_error *
12086 cmd_info(int argc, char *argv[])
12087 {
12088 	const struct got_error *error = NULL;
12089 	struct got_worktree *worktree = NULL;
12090 	char *cwd = NULL, *id_str = NULL;
12091 	struct got_pathlist_head paths;
12092 	struct got_pathlist_entry *pe;
12093 	char *uuidstr = NULL;
12094 	int ch, show_files = 0;
12095 
12096 	TAILQ_INIT(&paths);
12097 
12098 	while ((ch = getopt(argc, argv, "")) != -1) {
12099 		switch (ch) {
12100 		default:
12101 			usage_info();
12102 			/* NOTREACHED */
12103 		}
12104 	}
12105 
12106 	argc -= optind;
12107 	argv += optind;
12108 
12109 #ifndef PROFILE
12110 	if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
12111 	    NULL) == -1)
12112 		err(1, "pledge");
12113 #endif
12114 	cwd = getcwd(NULL, 0);
12115 	if (cwd == NULL) {
12116 		error = got_error_from_errno("getcwd");
12117 		goto done;
12118 	}
12119 
12120 	error = got_worktree_open(&worktree, cwd);
12121 	if (error) {
12122 		if (error->code == GOT_ERR_NOT_WORKTREE)
12123 			error = wrap_not_worktree_error(error, "info", cwd);
12124 		goto done;
12125 	}
12126 
12127 	error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
12128 	if (error)
12129 		goto done;
12130 
12131 	if (argc >= 1) {
12132 		error = get_worktree_paths_from_argv(&paths, argc, argv,
12133 		    worktree);
12134 		if (error)
12135 			goto done;
12136 		show_files = 1;
12137 	}
12138 
12139 	error = got_object_id_str(&id_str,
12140 	    got_worktree_get_base_commit_id(worktree));
12141 	if (error)
12142 		goto done;
12143 
12144 	error = got_worktree_get_uuid(&uuidstr, worktree);
12145 	if (error)
12146 		goto done;
12147 
12148 	printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12149 	printf("work tree base commit: %s\n", id_str);
12150 	printf("work tree path prefix: %s\n",
12151 	    got_worktree_get_path_prefix(worktree));
12152 	printf("work tree branch reference: %s\n",
12153 	    got_worktree_get_head_ref_name(worktree));
12154 	printf("work tree UUID: %s\n", uuidstr);
12155 	printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12156 
12157 	if (show_files) {
12158 		struct got_pathlist_entry *pe;
12159 		TAILQ_FOREACH(pe, &paths, entry) {
12160 			if (pe->path_len == 0)
12161 				continue;
12162 			/*
12163 			 * Assume this path will fail. This will be corrected
12164 			 * in print_path_info() in case the path does suceeed.
12165 			 */
12166 			pe->data = (void *)got_error_path(pe->path,
12167 			    GOT_ERR_BAD_PATH);
12168 		}
12169 		error = got_worktree_path_info(worktree, &paths,
12170 		    print_path_info, &paths, check_cancelled, NULL);
12171 		if (error)
12172 			goto done;
12173 		TAILQ_FOREACH(pe, &paths, entry) {
12174 			if (pe->data != NULL) {
12175 				error = pe->data; /* bad path */
12176 				break;
12177 			}
12178 		}
12179 	}
12180 done:
12181 	TAILQ_FOREACH(pe, &paths, entry)
12182 		free((char *)pe->path);
12183 	got_pathlist_free(&paths);
12184 	free(cwd);
12185 	free(id_str);
12186 	free(uuidstr);
12187 	return error;
12188 }