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