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