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