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