2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
5 * Permission to use, copy, modify, and distribute this software for any
6 * purpose with or without fee is hereby granted, provided that the above
7 * copyright notice and this permission notice appear in all copies.
9 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 #include <sys/queue.h>
19 #include <sys/types.h>
21 #include <sys/param.h>
41 #include "got_version.h"
42 #include "got_error.h"
43 #include "got_object.h"
44 #include "got_reference.h"
45 #include "got_repository.h"
47 #include "got_cancel.h"
48 #include "got_worktree.h"
50 #include "got_commit_graph.h"
51 #include "got_blame.h"
52 #include "got_privsep.h"
53 #include "got_opentemp.h"
56 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
59 static volatile sig_atomic_t sigint_received;
60 static volatile sig_atomic_t sigpipe_received;
63 catch_sigint(int signo)
69 catch_sigpipe(int signo)
77 const struct got_error *(*cmd_main)(int, char *[]);
78 void (*cmd_usage)(void);
79 const char *cmd_alias;
82 __dead static void usage(int);
83 __dead static void usage_init(void);
84 __dead static void usage_import(void);
85 __dead static void usage_checkout(void);
86 __dead static void usage_update(void);
87 __dead static void usage_log(void);
88 __dead static void usage_diff(void);
89 __dead static void usage_blame(void);
90 __dead static void usage_tree(void);
91 __dead static void usage_status(void);
92 __dead static void usage_ref(void);
93 __dead static void usage_branch(void);
94 __dead static void usage_tag(void);
95 __dead static void usage_add(void);
96 __dead static void usage_remove(void);
97 __dead static void usage_revert(void);
98 __dead static void usage_commit(void);
99 __dead static void usage_cherrypick(void);
100 __dead static void usage_backout(void);
101 __dead static void usage_rebase(void);
102 __dead static void usage_histedit(void);
103 __dead static void usage_integrate(void);
104 __dead static void usage_stage(void);
105 __dead static void usage_unstage(void);
106 __dead static void usage_cat(void);
108 static const struct got_error* cmd_init(int, char *[]);
109 static const struct got_error* cmd_import(int, char *[]);
110 static const struct got_error* cmd_checkout(int, char *[]);
111 static const struct got_error* cmd_update(int, char *[]);
112 static const struct got_error* cmd_log(int, char *[]);
113 static const struct got_error* cmd_diff(int, char *[]);
114 static const struct got_error* cmd_blame(int, char *[]);
115 static const struct got_error* cmd_tree(int, char *[]);
116 static const struct got_error* cmd_status(int, char *[]);
117 static const struct got_error* cmd_ref(int, char *[]);
118 static const struct got_error* cmd_branch(int, char *[]);
119 static const struct got_error* cmd_tag(int, char *[]);
120 static const struct got_error* cmd_add(int, char *[]);
121 static const struct got_error* cmd_remove(int, char *[]);
122 static const struct got_error* cmd_revert(int, char *[]);
123 static const struct got_error* cmd_commit(int, char *[]);
124 static const struct got_error* cmd_cherrypick(int, char *[]);
125 static const struct got_error* cmd_backout(int, char *[]);
126 static const struct got_error* cmd_rebase(int, char *[]);
127 static const struct got_error* cmd_histedit(int, char *[]);
128 static const struct got_error* cmd_integrate(int, char *[]);
129 static const struct got_error* cmd_stage(int, char *[]);
130 static const struct got_error* cmd_unstage(int, char *[]);
131 static const struct got_error* cmd_cat(int, char *[]);
133 static struct got_cmd got_commands[] = {
134 { "init", cmd_init, usage_init, "in" },
135 { "import", cmd_import, usage_import, "im" },
136 { "checkout", cmd_checkout, usage_checkout, "co" },
137 { "update", cmd_update, usage_update, "up" },
138 { "log", cmd_log, usage_log, "" },
139 { "diff", cmd_diff, usage_diff, "di" },
140 { "blame", cmd_blame, usage_blame, "bl" },
141 { "tree", cmd_tree, usage_tree, "tr" },
142 { "status", cmd_status, usage_status, "st" },
143 { "ref", cmd_ref, usage_ref, "" },
144 { "branch", cmd_branch, usage_branch, "br" },
145 { "tag", cmd_tag, usage_tag, "" },
146 { "add", cmd_add, usage_add, "" },
147 { "remove", cmd_remove, usage_remove, "rm" },
148 { "revert", cmd_revert, usage_revert, "rv" },
149 { "commit", cmd_commit, usage_commit, "ci" },
150 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
151 { "backout", cmd_backout, usage_backout, "bo" },
152 { "rebase", cmd_rebase, usage_rebase, "rb" },
153 { "histedit", cmd_histedit, usage_histedit, "he" },
154 { "integrate", cmd_integrate, usage_integrate,"ig" },
155 { "stage", cmd_stage, usage_stage, "sg" },
156 { "unstage", cmd_unstage, usage_unstage, "ug" },
157 { "cat", cmd_cat, usage_cat, "" },
165 fprintf(stderr, "commands:");
166 for (i = 0; i < nitems(got_commands); i++) {
167 struct got_cmd *cmd = &got_commands[i];
168 fprintf(stderr, " %s", cmd->cmd_name);
174 main(int argc, char *argv[])
179 int hflag = 0, Vflag = 0;
180 static struct option longopts[] = {
181 { "version", no_argument, NULL, 'V' },
185 setlocale(LC_CTYPE, "");
187 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
206 got_version_print_str();
213 signal(SIGINT, catch_sigint);
214 signal(SIGPIPE, catch_sigpipe);
216 for (i = 0; i < nitems(got_commands); i++) {
217 const struct got_error *error;
219 cmd = &got_commands[i];
221 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
222 strcmp(cmd->cmd_alias, argv[0]) != 0)
226 got_commands[i].cmd_usage();
228 error = got_commands[i].cmd_main(argc, argv);
229 if (error && error->code != GOT_ERR_CANCELLED &&
230 error->code != GOT_ERR_PRIVSEP_EXIT &&
231 !(sigpipe_received &&
232 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
234 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
235 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
242 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
250 fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
257 static const struct got_error *
258 get_editor(char **abspath)
260 const struct got_error *err = NULL;
265 editor = getenv("VISUAL");
267 editor = getenv("EDITOR");
270 err = got_path_find_prog(abspath, editor);
275 if (*abspath == NULL) {
276 *abspath = strdup("/bin/ed");
277 if (*abspath == NULL)
278 return got_error_from_errno("strdup");
284 static const struct got_error *
285 apply_unveil(const char *repo_path, int repo_read_only,
286 const char *worktree_path)
288 const struct got_error *err;
291 if (unveil("gmon.out", "rwc") != 0)
292 return got_error_from_errno2("unveil", "gmon.out");
294 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
295 return got_error_from_errno2("unveil", repo_path);
297 if (worktree_path && unveil(worktree_path, "rwc") != 0)
298 return got_error_from_errno2("unveil", worktree_path);
300 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
301 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
303 err = got_privsep_unveil_exec_helpers();
307 if (unveil(NULL, NULL) != 0)
308 return got_error_from_errno("unveil");
316 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
320 static const struct got_error *
321 cmd_init(int argc, char *argv[])
323 const struct got_error *error = NULL;
324 char *repo_path = NULL;
327 while ((ch = getopt(argc, argv, "")) != -1) {
339 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
345 repo_path = strdup(argv[0]);
346 if (repo_path == NULL)
347 return got_error_from_errno("strdup");
349 got_path_strip_trailing_slashes(repo_path);
351 error = got_path_mkdir(repo_path);
353 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
356 error = apply_unveil(repo_path, 0, NULL);
360 error = got_repo_init(repo_path);
369 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
370 "[-r repository-path] [-I pattern] path\n", getprogname());
375 spawn_editor(const char *editor, const char *file)
378 sig_t sighup, sigint, sigquit;
381 sighup = signal(SIGHUP, SIG_IGN);
382 sigint = signal(SIGINT, SIG_IGN);
383 sigquit = signal(SIGQUIT, SIG_IGN);
385 switch (pid = fork()) {
389 execl(editor, editor, file, (char *)NULL);
393 while (waitpid(pid, &st, 0) == -1)
398 (void)signal(SIGHUP, sighup);
399 (void)signal(SIGINT, sigint);
400 (void)signal(SIGQUIT, sigquit);
402 if (!WIFEXITED(st)) {
407 return WEXITSTATUS(st);
410 static const struct got_error *
411 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
412 const char *initial_content)
414 const struct got_error *err = NULL;
418 int content_changed = 0;
423 if (stat(logmsg_path, &st) == -1)
424 return got_error_from_errno2("stat", logmsg_path);
426 if (spawn_editor(editor, logmsg_path) == -1)
427 return got_error_from_errno("failed spawning editor");
429 if (stat(logmsg_path, &st2) == -1)
430 return got_error_from_errno("stat");
432 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
433 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
434 "no changes made to commit message, aborting");
436 *logmsg = malloc(st2.st_size + 1);
438 return got_error_from_errno("malloc");
442 fp = fopen(logmsg_path, "r");
444 err = got_error_from_errno("fopen");
447 while (fgets(buf, sizeof(buf), fp) != NULL) {
448 if (!content_changed && strcmp(buf, initial_content) != 0)
450 if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
451 continue; /* remove comments and leading empty lines */
452 len = strlcat(*logmsg, buf, st2.st_size);
456 while (len > 0 && (*logmsg)[len - 1] == '\n') {
457 (*logmsg)[len - 1] = '\0';
461 if (len == 0 || !content_changed)
462 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
463 "commit message cannot be empty, aborting");
472 static const struct got_error *
473 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
474 const char *path_dir, const char *branch_name)
476 char *initial_content = NULL;
477 const struct got_error *err = NULL;
480 if (asprintf(&initial_content,
481 "\n# %s to be imported to branch %s\n", path_dir,
483 return got_error_from_errno("asprintf");
485 err = got_opentemp_named_fd(logmsg_path, &fd,
486 GOT_TMPDIR_STR "/got-importmsg");
490 dprintf(fd, initial_content);
493 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
495 free(initial_content);
499 static const struct got_error *
500 import_progress(void *arg, const char *path)
502 printf("A %s\n", path);
506 static const struct got_error *
507 get_author(char **author, struct got_repository *repo)
509 const struct got_error *err = NULL;
510 const char *got_author, *name, *email;
514 name = got_repo_get_gitconfig_author_name(repo);
515 email = got_repo_get_gitconfig_author_email(repo);
517 if (asprintf(author, "%s <%s>", name, email) == -1)
518 return got_error_from_errno("asprintf");
522 got_author = getenv("GOT_AUTHOR");
523 if (got_author == NULL) {
524 name = got_repo_get_global_gitconfig_author_name(repo);
525 email = got_repo_get_global_gitconfig_author_email(repo);
527 if (asprintf(author, "%s <%s>", name, email) == -1)
528 return got_error_from_errno("asprintf");
531 /* TODO: Look up user in password database? */
532 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
535 *author = strdup(got_author);
537 return got_error_from_errno("strdup");
540 * Really dumb email address check; we're only doing this to
541 * avoid git's object parser breaking on commits we create.
543 while (*got_author && *got_author != '<')
545 if (*got_author != '<') {
546 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
549 while (*got_author && *got_author != '@')
551 if (*got_author != '@') {
552 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
555 while (*got_author && *got_author != '>')
557 if (*got_author != '>')
558 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
567 static const struct got_error *
568 get_gitconfig_path(char **gitconfig_path)
570 const char *homedir = getenv("HOME");
572 *gitconfig_path = NULL;
574 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
575 return got_error_from_errno("asprintf");
581 static const struct got_error *
582 cmd_import(int argc, char *argv[])
584 const struct got_error *error = NULL;
585 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
586 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
587 const char *branch_name = "main";
588 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
589 struct got_repository *repo = NULL;
590 struct got_reference *branch_ref = NULL, *head_ref = NULL;
591 struct got_object_id *new_commit_id = NULL;
593 struct got_pathlist_head ignores;
594 struct got_pathlist_entry *pe;
595 int preserve_logmsg = 0;
597 TAILQ_INIT(&ignores);
599 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
602 branch_name = optarg;
605 logmsg = strdup(optarg);
606 if (logmsg == NULL) {
607 error = got_error_from_errno("strdup");
612 repo_path = realpath(optarg, NULL);
613 if (repo_path == NULL) {
614 error = got_error_from_errno2("realpath",
620 if (optarg[0] == '\0')
622 error = got_pathlist_insert(&pe, &ignores, optarg,
637 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
645 if (repo_path == NULL) {
646 repo_path = getcwd(NULL, 0);
647 if (repo_path == NULL)
648 return got_error_from_errno("getcwd");
650 got_path_strip_trailing_slashes(repo_path);
651 error = get_gitconfig_path(&gitconfig_path);
654 error = got_repo_open(&repo, repo_path, gitconfig_path);
658 error = get_author(&author, repo);
663 * Don't let the user create a branch name with a leading '-'.
664 * While technically a valid reference name, this case is usually
665 * an unintended typo.
667 if (branch_name[0] == '-')
668 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
670 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
671 error = got_error_from_errno("asprintf");
675 error = got_ref_open(&branch_ref, repo, refname, 0);
677 if (error->code != GOT_ERR_NOT_REF)
680 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
681 "import target branch already exists");
685 path_dir = realpath(argv[0], NULL);
686 if (path_dir == NULL) {
687 error = got_error_from_errno2("realpath", argv[0]);
690 got_path_strip_trailing_slashes(path_dir);
693 * unveil(2) traverses exec(2); if an editor is used we have
694 * to apply unveil after the log message has been written.
696 if (logmsg == NULL || strlen(logmsg) == 0) {
697 error = get_editor(&editor);
701 error = collect_import_msg(&logmsg, &logmsg_path, editor,
704 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
711 if (unveil(path_dir, "r") != 0) {
712 error = got_error_from_errno2("unveil", path_dir);
718 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
725 error = got_repo_import(&new_commit_id, path_dir, logmsg,
726 author, &ignores, repo, import_progress, NULL);
733 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
740 error = got_ref_write(branch_ref, repo);
747 error = got_object_id_str(&id_str, new_commit_id);
754 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
756 if (error->code != GOT_ERR_NOT_REF) {
762 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
770 error = got_ref_write(head_ref, repo);
778 printf("Created branch %s with commit %s\n",
779 got_ref_get_name(branch_ref), id_str);
781 if (preserve_logmsg) {
782 fprintf(stderr, "%s: log message preserved in %s\n",
783 getprogname(), logmsg_path);
784 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
785 error = got_error_from_errno2("unlink", logmsg_path);
794 free(gitconfig_path);
796 got_ref_close(branch_ref);
798 got_ref_close(head_ref);
805 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
806 "[-p prefix] repository-path [worktree-path]\n", getprogname());
811 show_worktree_base_ref_warning(void)
813 fprintf(stderr, "%s: warning: could not create a reference "
814 "to the work tree's base commit; the commit could be "
815 "garbage-collected by Git; making the repository "
816 "writable and running 'got update' will prevent this\n",
820 struct got_checkout_progress_arg {
821 const char *worktree_path;
822 int had_base_commit_ref_error;
825 static const struct got_error *
826 checkout_progress(void *arg, unsigned char status, const char *path)
828 struct got_checkout_progress_arg *a = arg;
830 /* Base commit bump happens silently. */
831 if (status == GOT_STATUS_BUMP_BASE)
834 if (status == GOT_STATUS_BASE_REF_ERR) {
835 a->had_base_commit_ref_error = 1;
839 while (path[0] == '/')
842 printf("%c %s/%s\n", status, a->worktree_path, path);
846 static const struct got_error *
847 check_cancelled(void *arg)
849 if (sigint_received || sigpipe_received)
850 return got_error(GOT_ERR_CANCELLED);
854 static const struct got_error *
855 check_linear_ancestry(struct got_object_id *commit_id,
856 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
857 struct got_repository *repo)
859 const struct got_error *err = NULL;
860 struct got_object_id *yca_id;
862 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
863 commit_id, base_commit_id, repo, check_cancelled, NULL);
868 return got_error(GOT_ERR_ANCESTRY);
871 * Require a straight line of history between the target commit
872 * and the work tree's base commit.
874 * Non-linear situations such as this require a rebase:
876 * (commit) D F (base_commit)
884 * 'got update' only handles linear cases:
885 * Update forwards in time: A (base/yca) - B - C - D (commit)
886 * Update backwards in time: D (base) - C - B - A (commit/yca)
888 if (allow_forwards_in_time_only) {
889 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
890 return got_error(GOT_ERR_ANCESTRY);
891 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
892 got_object_id_cmp(base_commit_id, yca_id) != 0)
893 return got_error(GOT_ERR_ANCESTRY);
899 static const struct got_error *
900 check_same_branch(struct got_object_id *commit_id,
901 struct got_reference *head_ref, struct got_object_id *yca_id,
902 struct got_repository *repo)
904 const struct got_error *err = NULL;
905 struct got_commit_graph *graph = NULL;
906 struct got_object_id *head_commit_id = NULL;
907 int is_same_branch = 0;
909 err = got_ref_resolve(&head_commit_id, repo, head_ref);
913 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
917 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
922 err = got_commit_graph_open(&graph, "/", 1);
926 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
927 check_cancelled, NULL);
932 struct got_object_id *id;
933 err = got_commit_graph_iter_next(&id, graph, repo,
934 check_cancelled, NULL);
936 if (err->code == GOT_ERR_ITER_COMPLETED)
942 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
944 if (got_object_id_cmp(id, commit_id) == 0) {
952 got_commit_graph_close(graph);
953 free(head_commit_id);
954 if (!err && !is_same_branch)
955 err = got_error(GOT_ERR_ANCESTRY);
959 static const struct got_error *
960 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
962 static char msg[512];
963 const char *branch_name;
965 if (got_ref_is_symbolic(ref))
966 branch_name = got_ref_get_symref_target(ref);
968 branch_name = got_ref_get_name(ref);
970 if (strncmp("refs/heads/", branch_name, 11) == 0)
973 snprintf(msg, sizeof(msg),
974 "target commit is not contained in branch '%s'; "
975 "the branch to use must be specified with -b; "
976 "if necessary a new branch can be created for "
977 "this commit with 'got branch -c %s BRANCH_NAME'",
978 branch_name, commit_id_str);
980 return got_error_msg(GOT_ERR_ANCESTRY, msg);
983 static const struct got_error *
984 cmd_checkout(int argc, char *argv[])
986 const struct got_error *error = NULL;
987 struct got_repository *repo = NULL;
988 struct got_reference *head_ref = NULL;
989 struct got_worktree *worktree = NULL;
990 char *repo_path = NULL;
991 char *worktree_path = NULL;
992 const char *path_prefix = "";
993 const char *branch_name = GOT_REF_HEAD;
994 char *commit_id_str = NULL;
995 int ch, same_path_prefix, allow_nonempty = 0;
996 struct got_pathlist_head paths;
997 struct got_checkout_progress_arg cpa;
1001 while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
1004 branch_name = optarg;
1007 commit_id_str = strdup(optarg);
1008 if (commit_id_str == NULL)
1009 return got_error_from_errno("strdup");
1015 path_prefix = optarg;
1027 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1028 "unveil", NULL) == -1)
1032 char *cwd, *base, *dotgit;
1033 repo_path = realpath(argv[0], NULL);
1034 if (repo_path == NULL)
1035 return got_error_from_errno2("realpath", argv[0]);
1036 cwd = getcwd(NULL, 0);
1038 error = got_error_from_errno("getcwd");
1041 if (path_prefix[0]) {
1042 base = basename(path_prefix);
1044 error = got_error_from_errno2("basename",
1049 base = basename(repo_path);
1051 error = got_error_from_errno2("basename",
1056 dotgit = strstr(base, ".git");
1059 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1060 error = got_error_from_errno("asprintf");
1065 } else if (argc == 2) {
1066 repo_path = realpath(argv[0], NULL);
1067 if (repo_path == NULL) {
1068 error = got_error_from_errno2("realpath", argv[0]);
1071 worktree_path = realpath(argv[1], NULL);
1072 if (worktree_path == NULL) {
1073 if (errno != ENOENT) {
1074 error = got_error_from_errno2("realpath",
1078 worktree_path = strdup(argv[1]);
1079 if (worktree_path == NULL) {
1080 error = got_error_from_errno("strdup");
1087 got_path_strip_trailing_slashes(repo_path);
1088 got_path_strip_trailing_slashes(worktree_path);
1090 error = got_repo_open(&repo, repo_path, NULL);
1094 /* Pre-create work tree path for unveil(2) */
1095 error = got_path_mkdir(worktree_path);
1097 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1098 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1100 if (!allow_nonempty &&
1101 !got_path_dir_is_empty(worktree_path)) {
1102 error = got_error_path(worktree_path,
1103 GOT_ERR_DIR_NOT_EMPTY);
1108 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1112 error = got_ref_open(&head_ref, repo, branch_name, 0);
1116 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1117 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1120 error = got_worktree_open(&worktree, worktree_path);
1124 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1128 if (!same_path_prefix) {
1129 error = got_error(GOT_ERR_PATH_PREFIX);
1133 if (commit_id_str) {
1134 struct got_object_id *commit_id;
1135 error = got_repo_match_object_id(&commit_id, NULL,
1136 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1139 error = check_linear_ancestry(commit_id,
1140 got_worktree_get_base_commit_id(worktree), 0, repo);
1141 if (error != NULL) {
1143 if (error->code == GOT_ERR_ANCESTRY) {
1144 error = checkout_ancestry_error(
1145 head_ref, commit_id_str);
1149 error = check_same_branch(commit_id, head_ref, NULL, repo);
1151 if (error->code == GOT_ERR_ANCESTRY) {
1152 error = checkout_ancestry_error(
1153 head_ref, commit_id_str);
1157 error = got_worktree_set_base_commit_id(worktree, repo,
1164 error = got_pathlist_append(&paths, "", NULL);
1167 cpa.worktree_path = worktree_path;
1168 cpa.had_base_commit_ref_error = 0;
1169 error = got_worktree_checkout_files(worktree, &paths, repo,
1170 checkout_progress, &cpa, check_cancelled, NULL);
1174 printf("Now shut up and hack\n");
1175 if (cpa.had_base_commit_ref_error)
1176 show_worktree_base_ref_warning();
1178 got_pathlist_free(&paths);
1179 free(commit_id_str);
1181 free(worktree_path);
1188 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1193 static const struct got_error *
1194 update_progress(void *arg, unsigned char status, const char *path)
1196 int *did_something = arg;
1198 if (status == GOT_STATUS_EXISTS ||
1199 status == GOT_STATUS_BASE_REF_ERR)
1204 /* Base commit bump happens silently. */
1205 if (status == GOT_STATUS_BUMP_BASE)
1208 while (path[0] == '/')
1210 printf("%c %s\n", status, path);
1214 static const struct got_error *
1215 switch_head_ref(struct got_reference *head_ref,
1216 struct got_object_id *commit_id, struct got_worktree *worktree,
1217 struct got_repository *repo)
1219 const struct got_error *err = NULL;
1221 int ref_has_moved = 0;
1223 /* Trivial case: switching between two different references. */
1224 if (strcmp(got_ref_get_name(head_ref),
1225 got_worktree_get_head_ref_name(worktree)) != 0) {
1226 printf("Switching work tree from %s to %s\n",
1227 got_worktree_get_head_ref_name(worktree),
1228 got_ref_get_name(head_ref));
1229 return got_worktree_set_head_ref(worktree, head_ref);
1232 err = check_linear_ancestry(commit_id,
1233 got_worktree_get_base_commit_id(worktree), 0, repo);
1235 if (err->code != GOT_ERR_ANCESTRY)
1242 /* Switching to a rebased branch with the same reference name. */
1243 err = got_object_id_str(&base_id_str,
1244 got_worktree_get_base_commit_id(worktree));
1247 printf("Reference %s now points at a different branch\n",
1248 got_worktree_get_head_ref_name(worktree));
1249 printf("Switching work tree from %s to %s\n", base_id_str,
1250 got_worktree_get_head_ref_name(worktree));
1254 static const struct got_error *
1255 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1257 const struct got_error *err;
1260 err = got_worktree_rebase_in_progress(&in_progress, worktree);
1264 return got_error(GOT_ERR_REBASING);
1266 err = got_worktree_histedit_in_progress(&in_progress, worktree);
1270 return got_error(GOT_ERR_HISTEDIT_BUSY);
1275 static const struct got_error *
1276 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1277 char *argv[], struct got_worktree *worktree)
1279 const struct got_error *err = NULL;
1286 return got_error_from_errno("strdup");
1287 return got_pathlist_append(paths, path, NULL);
1290 for (i = 0; i < argc; i++) {
1291 err = got_worktree_resolve_path(&path, worktree, argv[i]);
1294 err = got_pathlist_append(paths, path, NULL);
1304 static const struct got_error *
1305 cmd_update(int argc, char *argv[])
1307 const struct got_error *error = NULL;
1308 struct got_repository *repo = NULL;
1309 struct got_worktree *worktree = NULL;
1310 char *worktree_path = NULL;
1311 struct got_object_id *commit_id = NULL;
1312 char *commit_id_str = NULL;
1313 const char *branch_name = NULL;
1314 struct got_reference *head_ref = NULL;
1315 struct got_pathlist_head paths;
1316 struct got_pathlist_entry *pe;
1317 int ch, did_something = 0;
1321 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1324 branch_name = optarg;
1327 commit_id_str = strdup(optarg);
1328 if (commit_id_str == NULL)
1329 return got_error_from_errno("strdup");
1341 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1342 "unveil", NULL) == -1)
1345 worktree_path = getcwd(NULL, 0);
1346 if (worktree_path == NULL) {
1347 error = got_error_from_errno("getcwd");
1350 error = got_worktree_open(&worktree, worktree_path);
1354 error = check_rebase_or_histedit_in_progress(worktree);
1358 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1363 error = apply_unveil(got_repo_get_path(repo), 0,
1364 got_worktree_get_root_path(worktree));
1368 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1372 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1373 got_worktree_get_head_ref_name(worktree), 0);
1376 if (commit_id_str == NULL) {
1377 error = got_ref_resolve(&commit_id, repo, head_ref);
1380 error = got_object_id_str(&commit_id_str, commit_id);
1384 error = got_repo_match_object_id(&commit_id, NULL,
1385 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1386 free(commit_id_str);
1387 commit_id_str = NULL;
1390 error = got_object_id_str(&commit_id_str, commit_id);
1396 struct got_object_id *head_commit_id;
1397 TAILQ_FOREACH(pe, &paths, entry) {
1398 if (pe->path_len == 0)
1400 error = got_error_msg(GOT_ERR_BAD_PATH,
1401 "switching between branches requires that "
1402 "the entire work tree gets updated");
1405 error = got_ref_resolve(&head_commit_id, repo, head_ref);
1408 error = check_linear_ancestry(commit_id, head_commit_id, 0,
1410 free(head_commit_id);
1413 error = check_same_branch(commit_id, head_ref, NULL, repo);
1416 error = switch_head_ref(head_ref, commit_id, worktree, repo);
1420 error = check_linear_ancestry(commit_id,
1421 got_worktree_get_base_commit_id(worktree), 0, repo);
1422 if (error != NULL) {
1423 if (error->code == GOT_ERR_ANCESTRY)
1424 error = got_error(GOT_ERR_BRANCH_MOVED);
1427 error = check_same_branch(commit_id, head_ref, NULL, repo);
1432 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1434 error = got_worktree_set_base_commit_id(worktree, repo,
1440 error = got_worktree_checkout_files(worktree, &paths, repo,
1441 update_progress, &did_something, check_cancelled, NULL);
1446 printf("Updated to commit %s\n", commit_id_str);
1448 printf("Already up-to-date\n");
1450 free(worktree_path);
1451 TAILQ_FOREACH(pe, &paths, entry)
1452 free((char *)pe->path);
1453 got_pathlist_free(&paths);
1455 free(commit_id_str);
1459 static const struct got_error *
1460 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1461 const char *path, int diff_context, int ignore_whitespace,
1462 struct got_repository *repo)
1464 const struct got_error *err = NULL;
1465 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1468 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1473 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1477 while (path[0] == '/')
1479 err = got_diff_blob(blob1, blob2, path, path, diff_context,
1480 ignore_whitespace, stdout);
1483 got_object_blob_close(blob1);
1484 got_object_blob_close(blob2);
1488 static const struct got_error *
1489 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1490 const char *path, int diff_context, int ignore_whitespace,
1491 struct got_repository *repo)
1493 const struct got_error *err = NULL;
1494 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1495 struct got_diff_blob_output_unidiff_arg arg;
1498 err = got_object_open_as_tree(&tree1, repo, tree_id1);
1503 err = got_object_open_as_tree(&tree2, repo, tree_id2);
1507 arg.diff_context = diff_context;
1508 arg.ignore_whitespace = ignore_whitespace;
1509 arg.outfile = stdout;
1510 while (path[0] == '/')
1512 err = got_diff_tree(tree1, tree2, path, path, repo,
1513 got_diff_blob_output_unidiff, &arg, 1);
1516 got_object_tree_close(tree1);
1518 got_object_tree_close(tree2);
1522 static const struct got_error *
1523 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1524 const char *path, int diff_context, struct got_repository *repo)
1526 const struct got_error *err = NULL;
1527 struct got_commit_object *pcommit = NULL;
1528 char *id_str1 = NULL, *id_str2 = NULL;
1529 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1530 struct got_object_qid *qid;
1532 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1534 err = got_object_open_as_commit(&pcommit, repo,
1540 if (path && path[0] != '\0') {
1542 err = got_object_id_by_path(&obj_id2, repo, id, path);
1545 err = got_object_id_str(&id_str2, obj_id2);
1551 err = got_object_id_by_path(&obj_id1, repo,
1557 err = got_object_id_str(&id_str1, obj_id1);
1563 err = got_object_get_type(&obj_type, repo, obj_id2);
1568 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1570 case GOT_OBJ_TYPE_BLOB:
1571 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1574 case GOT_OBJ_TYPE_TREE:
1575 err = diff_trees(obj_id1, obj_id2, path, diff_context,
1579 err = got_error(GOT_ERR_OBJ_TYPE);
1585 obj_id2 = got_object_commit_get_tree_id(commit);
1586 err = got_object_id_str(&id_str2, obj_id2);
1589 obj_id1 = got_object_commit_get_tree_id(pcommit);
1590 err = got_object_id_str(&id_str1, obj_id1);
1593 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1594 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1600 got_object_commit_close(pcommit);
1605 get_datestr(time_t *time, char *datebuf)
1607 struct tm mytm, *tm;
1610 tm = gmtime_r(time, &mytm);
1613 s = asctime_r(tm, datebuf);
1616 p = strchr(s, '\n');
1622 static const struct got_error *
1623 match_logmsg(int *have_match, struct got_object_id *id,
1624 struct got_commit_object *commit, regex_t *regex)
1626 const struct got_error *err = NULL;
1627 regmatch_t regmatch;
1628 char *id_str = NULL, *logmsg = NULL;
1632 err = got_object_id_str(&id_str, id);
1636 err = got_object_commit_get_logmsg(&logmsg, commit);
1640 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1648 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1650 static const struct got_error *
1651 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1652 struct got_repository *repo, const char *path, int show_patch,
1653 int diff_context, struct got_reflist_head *refs)
1655 const struct got_error *err = NULL;
1656 char *id_str, *datestr, *logmsg0, *logmsg, *line;
1658 time_t committer_time;
1659 const char *author, *committer;
1660 char *refs_str = NULL;
1661 struct got_reflist_entry *re;
1663 SIMPLEQ_FOREACH(re, refs, entry) {
1666 struct got_tag_object *tag = NULL;
1669 name = got_ref_get_name(re->ref);
1670 if (strcmp(name, GOT_REF_HEAD) == 0)
1672 if (strncmp(name, "refs/", 5) == 0)
1674 if (strncmp(name, "got/", 4) == 0)
1676 if (strncmp(name, "heads/", 6) == 0)
1678 if (strncmp(name, "remotes/", 8) == 0)
1680 if (strncmp(name, "tags/", 5) == 0) {
1681 err = got_object_open_as_tag(&tag, repo, re->id);
1683 if (err->code != GOT_ERR_OBJ_TYPE)
1685 /* Ref points at something other than a tag. */
1690 cmp = got_object_id_cmp(tag ?
1691 got_object_tag_get_object_id(tag) : re->id, id);
1693 got_object_tag_close(tag);
1697 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1699 err = got_error_from_errno("asprintf");
1705 err = got_object_id_str(&id_str, id);
1709 printf(GOT_COMMIT_SEP_STR);
1710 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1711 refs_str ? refs_str : "", refs_str ? ")" : "");
1716 printf("from: %s\n", got_object_commit_get_author(commit));
1717 committer_time = got_object_commit_get_committer_time(commit);
1718 datestr = get_datestr(&committer_time, datebuf);
1720 printf("date: %s UTC\n", datestr);
1721 author = got_object_commit_get_author(commit);
1722 committer = got_object_commit_get_committer(commit);
1723 if (strcmp(author, committer) != 0)
1724 printf("via: %s\n", committer);
1725 if (got_object_commit_get_nparents(commit) > 1) {
1726 const struct got_object_id_queue *parent_ids;
1727 struct got_object_qid *qid;
1729 parent_ids = got_object_commit_get_parent_ids(commit);
1730 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1731 err = got_object_id_str(&id_str, qid->id);
1734 printf("parent %d: %s\n", n++, id_str);
1739 err = got_object_commit_get_logmsg(&logmsg0, commit);
1745 line = strsep(&logmsg, "\n");
1747 printf(" %s\n", line);
1752 err = print_patch(commit, id, path, diff_context, repo);
1757 if (fflush(stdout) != 0 && err == NULL)
1758 err = got_error_from_errno("fflush");
1762 static const struct got_error *
1763 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1764 const char *path, int show_patch, const char *search_pattern,
1765 int diff_context, int limit, int log_branches,
1766 struct got_reflist_head *refs)
1768 const struct got_error *err;
1769 struct got_commit_graph *graph;
1773 if (search_pattern &&
1774 regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1775 return got_error_msg(GOT_ERR_REGEX, search_pattern);
1777 err = got_commit_graph_open(&graph, path, !log_branches);
1780 err = got_commit_graph_iter_start(graph, root_id, repo,
1781 check_cancelled, NULL);
1785 struct got_commit_object *commit;
1786 struct got_object_id *id;
1788 if (sigint_received || sigpipe_received)
1791 err = got_commit_graph_iter_next(&id, graph, repo,
1792 check_cancelled, NULL);
1794 if (err->code == GOT_ERR_ITER_COMPLETED)
1801 err = got_object_open_as_commit(&commit, repo, id);
1805 if (search_pattern) {
1806 err = match_logmsg(&have_match, id, commit, ®ex);
1808 got_object_commit_close(commit);
1811 if (have_match == 0) {
1812 got_object_commit_close(commit);
1817 err = print_commit(commit, id, repo, path, show_patch,
1818 diff_context, refs);
1819 got_object_commit_close(commit);
1820 if (err || (limit && --limit == 0))
1826 got_commit_graph_close(graph);
1833 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
1834 "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1839 get_default_log_limit(void)
1841 const char *got_default_log_limit;
1845 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1846 if (got_default_log_limit == NULL)
1848 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1854 static const struct got_error *
1855 cmd_log(int argc, char *argv[])
1857 const struct got_error *error;
1858 struct got_repository *repo = NULL;
1859 struct got_worktree *worktree = NULL;
1860 struct got_commit_object *commit = NULL;
1861 struct got_object_id *id = NULL;
1862 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1863 const char *start_commit = NULL, *search_pattern = NULL;
1864 int diff_context = -1, ch;
1865 int show_patch = 0, limit = 0, log_branches = 0;
1867 struct got_reflist_head refs;
1869 SIMPLEQ_INIT(&refs);
1872 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1878 limit = get_default_log_limit();
1880 while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
1886 start_commit = optarg;
1889 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1892 err(1, "-C option %s", errstr);
1895 limit = strtonum(optarg, 0, INT_MAX, &errstr);
1897 err(1, "-l option %s", errstr);
1903 repo_path = realpath(optarg, NULL);
1904 if (repo_path == NULL)
1905 return got_error_from_errno2("realpath",
1907 got_path_strip_trailing_slashes(repo_path);
1910 search_pattern = optarg;
1921 if (diff_context == -1)
1923 else if (!show_patch)
1924 errx(1, "-C reguires -p");
1926 cwd = getcwd(NULL, 0);
1928 error = got_error_from_errno("getcwd");
1932 error = got_worktree_open(&worktree, cwd);
1933 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1940 error = got_error_from_errno("strdup");
1943 } else if (argc == 1) {
1945 error = got_worktree_resolve_path(&path, worktree,
1950 path = strdup(argv[0]);
1952 error = got_error_from_errno("strdup");
1959 if (repo_path == NULL) {
1960 repo_path = worktree ?
1961 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1963 if (repo_path == NULL) {
1964 error = got_error_from_errno("strdup");
1968 error = got_repo_open(&repo, repo_path, NULL);
1972 error = apply_unveil(got_repo_get_path(repo), 1,
1973 worktree ? got_worktree_get_root_path(worktree) : NULL);
1977 if (start_commit == NULL) {
1978 struct got_reference *head_ref;
1979 error = got_ref_open(&head_ref, repo,
1980 worktree ? got_worktree_get_head_ref_name(worktree)
1984 error = got_ref_resolve(&id, repo, head_ref);
1985 got_ref_close(head_ref);
1988 error = got_object_open_as_commit(&commit, repo, id);
1990 struct got_reference *ref;
1991 error = got_ref_open(&ref, repo, start_commit, 0);
1992 if (error == NULL) {
1994 error = got_ref_resolve(&id, repo, ref);
1998 error = got_object_get_type(&obj_type, repo, id);
2001 if (obj_type == GOT_OBJ_TYPE_TAG) {
2002 struct got_tag_object *tag;
2003 error = got_object_open_as_tag(&tag, repo, id);
2006 if (got_object_tag_get_object_type(tag) !=
2007 GOT_OBJ_TYPE_COMMIT) {
2008 got_object_tag_close(tag);
2009 error = got_error(GOT_ERR_OBJ_TYPE);
2013 id = got_object_id_dup(
2014 got_object_tag_get_object_id(tag));
2016 error = got_error_from_errno(
2017 "got_object_id_dup");
2018 got_object_tag_close(tag);
2021 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
2022 error = got_error(GOT_ERR_OBJ_TYPE);
2025 error = got_object_open_as_commit(&commit, repo, id);
2029 if (commit == NULL) {
2030 error = got_repo_match_object_id_prefix(&id,
2031 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2040 const char *prefix = got_worktree_get_path_prefix(worktree);
2042 if (asprintf(&p, "%s%s%s", prefix,
2043 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2044 error = got_error_from_errno("asprintf");
2047 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2050 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2055 path = in_repo_path;
2058 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2062 error = print_commits(id, repo, path, show_patch, search_pattern,
2063 diff_context, limit, log_branches, &refs);
2070 got_worktree_close(worktree);
2072 const struct got_error *repo_error;
2073 repo_error = got_repo_close(repo);
2077 got_ref_list_free(&refs);
2084 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2085 "[-w] [object1 object2 | path]\n", getprogname());
2089 struct print_diff_arg {
2090 struct got_repository *repo;
2091 struct got_worktree *worktree;
2096 int ignore_whitespace;
2099 static const struct got_error *
2100 print_diff(void *arg, unsigned char status, unsigned char staged_status,
2101 const char *path, struct got_object_id *blob_id,
2102 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2103 int dirfd, const char *de_name)
2105 struct print_diff_arg *a = arg;
2106 const struct got_error *err = NULL;
2107 struct got_blob_object *blob1 = NULL;
2110 char *abspath = NULL, *label1 = NULL;
2113 if (a->diff_staged) {
2114 if (staged_status != GOT_STATUS_MODIFY &&
2115 staged_status != GOT_STATUS_ADD &&
2116 staged_status != GOT_STATUS_DELETE)
2119 if (staged_status == GOT_STATUS_DELETE)
2121 if (status == GOT_STATUS_NONEXISTENT)
2122 return got_error_set_errno(ENOENT, path);
2123 if (status != GOT_STATUS_MODIFY &&
2124 status != GOT_STATUS_ADD &&
2125 status != GOT_STATUS_DELETE &&
2126 status != GOT_STATUS_CONFLICT)
2130 if (!a->header_shown) {
2131 printf("diff %s %s%s\n", a->id_str,
2132 got_worktree_get_root_path(a->worktree),
2133 a->diff_staged ? " (staged changes)" : "");
2134 a->header_shown = 1;
2137 if (a->diff_staged) {
2138 const char *label1 = NULL, *label2 = NULL;
2139 switch (staged_status) {
2140 case GOT_STATUS_MODIFY:
2144 case GOT_STATUS_ADD:
2147 case GOT_STATUS_DELETE:
2151 return got_error(GOT_ERR_FILE_STATUS);
2153 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2154 label1, label2, a->diff_context, a->ignore_whitespace,
2158 if (staged_status == GOT_STATUS_ADD ||
2159 staged_status == GOT_STATUS_MODIFY) {
2161 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2165 err = got_object_id_str(&id_str, staged_blob_id);
2168 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2169 err = got_error_from_errno("asprintf");
2174 } else if (status != GOT_STATUS_ADD) {
2175 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2180 if (status != GOT_STATUS_DELETE) {
2181 if (asprintf(&abspath, "%s/%s",
2182 got_worktree_get_root_path(a->worktree), path) == -1) {
2183 err = got_error_from_errno("asprintf");
2188 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2190 err = got_error_from_errno2("openat", abspath);
2194 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2196 err = got_error_from_errno2("open", abspath);
2200 if (fstat(fd, &sb) == -1) {
2201 err = got_error_from_errno2("fstat", abspath);
2204 f2 = fdopen(fd, "r");
2206 err = got_error_from_errno2("fdopen", abspath);
2213 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2214 a->diff_context, a->ignore_whitespace, stdout);
2217 got_object_blob_close(blob1);
2218 if (f2 && fclose(f2) == EOF && err == NULL)
2219 err = got_error_from_errno("fclose");
2220 if (fd != -1 && close(fd) == -1 && err == NULL)
2221 err = got_error_from_errno("close");
2226 static const struct got_error *
2227 cmd_diff(int argc, char *argv[])
2229 const struct got_error *error;
2230 struct got_repository *repo = NULL;
2231 struct got_worktree *worktree = NULL;
2232 char *cwd = NULL, *repo_path = NULL;
2233 struct got_object_id *id1 = NULL, *id2 = NULL;
2234 const char *id_str1 = NULL, *id_str2 = NULL;
2235 char *label1 = NULL, *label2 = NULL;
2237 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2242 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2247 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2250 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2253 err(1, "-C option %s", errstr);
2256 repo_path = realpath(optarg, NULL);
2257 if (repo_path == NULL)
2258 return got_error_from_errno2("realpath",
2260 got_path_strip_trailing_slashes(repo_path);
2266 ignore_whitespace = 1;
2277 cwd = getcwd(NULL, 0);
2279 error = got_error_from_errno("getcwd");
2282 error = got_worktree_open(&worktree, cwd);
2283 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2286 if (worktree == NULL) {
2287 error = got_error(GOT_ERR_NOT_WORKTREE);
2292 "-r option can't be used when diffing a work tree");
2293 repo_path = strdup(got_worktree_get_repo_path(worktree));
2294 if (repo_path == NULL) {
2295 error = got_error_from_errno("strdup");
2299 error = got_worktree_resolve_path(&path, worktree,
2306 error = got_error_from_errno("strdup");
2310 } else if (argc == 2) {
2312 errx(1, "-s option can't be used when diffing "
2313 "objects in repository");
2316 if (worktree && repo_path == NULL) {
2318 strdup(got_worktree_get_repo_path(worktree));
2319 if (repo_path == NULL) {
2320 error = got_error_from_errno("strdup");
2327 if (repo_path == NULL) {
2328 repo_path = getcwd(NULL, 0);
2329 if (repo_path == NULL)
2330 return got_error_from_errno("getcwd");
2333 error = got_repo_open(&repo, repo_path, NULL);
2338 error = apply_unveil(got_repo_get_path(repo), 1,
2339 worktree ? got_worktree_get_root_path(worktree) : NULL);
2344 struct print_diff_arg arg;
2345 struct got_pathlist_head paths;
2350 error = got_object_id_str(&id_str,
2351 got_worktree_get_base_commit_id(worktree));
2355 arg.worktree = worktree;
2356 arg.diff_context = diff_context;
2357 arg.id_str = id_str;
2358 arg.header_shown = 0;
2359 arg.diff_staged = diff_staged;
2360 arg.ignore_whitespace = ignore_whitespace;
2362 error = got_pathlist_append(&paths, path, NULL);
2366 error = got_worktree_status(worktree, &paths, repo, print_diff,
2367 &arg, check_cancelled, NULL);
2369 got_pathlist_free(&paths);
2373 error = got_repo_match_object_id(&id1, &label1, id_str1,
2374 GOT_OBJ_TYPE_ANY, 1, repo);
2378 error = got_repo_match_object_id(&id2, &label2, id_str2,
2379 GOT_OBJ_TYPE_ANY, 1, repo);
2383 error = got_object_get_type(&type1, repo, id1);
2387 error = got_object_get_type(&type2, repo, id2);
2391 if (type1 != type2) {
2392 error = got_error(GOT_ERR_OBJ_TYPE);
2397 case GOT_OBJ_TYPE_BLOB:
2398 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2399 diff_context, ignore_whitespace, repo, stdout);
2401 case GOT_OBJ_TYPE_TREE:
2402 error = got_diff_objects_as_trees(id1, id2, "", "",
2403 diff_context, ignore_whitespace, repo, stdout);
2405 case GOT_OBJ_TYPE_COMMIT:
2406 printf("diff %s %s\n", label1, label2);
2407 error = got_diff_objects_as_commits(id1, id2, diff_context,
2408 ignore_whitespace, repo, stdout);
2411 error = got_error(GOT_ERR_OBJ_TYPE);
2420 got_worktree_close(worktree);
2422 const struct got_error *repo_error;
2423 repo_error = got_repo_close(repo);
2434 "usage: %s blame [-c commit] [-r repository-path] path\n",
2443 char datebuf[11]; /* YYYY-MM-DD + NUL */
2446 struct blame_cb_args {
2447 struct blame_line *lines;
2451 off_t *line_offsets;
2453 struct got_repository *repo;
2456 static const struct got_error *
2457 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2459 const struct got_error *err = NULL;
2460 struct blame_cb_args *a = arg;
2461 struct blame_line *bline;
2463 size_t linesize = 0;
2464 struct got_commit_object *commit = NULL;
2467 time_t committer_time;
2469 if (nlines != a->nlines ||
2470 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2471 return got_error(GOT_ERR_RANGE);
2473 if (sigint_received)
2474 return got_error(GOT_ERR_ITER_COMPLETED);
2477 return NULL; /* no change in this commit */
2479 /* Annotate this line. */
2480 bline = &a->lines[lineno - 1];
2481 if (bline->annotated)
2483 err = got_object_id_str(&bline->id_str, id);
2487 err = got_object_open_as_commit(&commit, a->repo, id);
2491 bline->committer = strdup(got_object_commit_get_committer(commit));
2492 if (bline->committer == NULL) {
2493 err = got_error_from_errno("strdup");
2497 committer_time = got_object_commit_get_committer_time(commit);
2498 if (localtime_r(&committer_time, &tm) == NULL)
2499 return got_error_from_errno("localtime_r");
2500 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2501 &tm) >= sizeof(bline->datebuf)) {
2502 err = got_error(GOT_ERR_NO_SPACE);
2505 bline->annotated = 1;
2507 /* Print lines annotated so far. */
2508 bline = &a->lines[a->lineno_cur - 1];
2509 if (!bline->annotated)
2512 offset = a->line_offsets[a->lineno_cur - 1];
2513 if (fseeko(a->f, offset, SEEK_SET) == -1) {
2514 err = got_error_from_errno("fseeko");
2518 while (bline->annotated) {
2519 char *smallerthan, *at, *nl, *committer;
2522 if (getline(&line, &linesize, a->f) == -1) {
2524 err = got_error_from_errno("getline");
2528 committer = bline->committer;
2529 smallerthan = strchr(committer, '<');
2530 if (smallerthan && smallerthan[1] != '\0')
2531 committer = smallerthan + 1;
2532 at = strchr(committer, '@');
2535 len = strlen(committer);
2537 committer[8] = '\0';
2539 nl = strchr(line, '\n');
2542 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2543 bline->id_str, bline->datebuf, committer, line);
2546 bline = &a->lines[a->lineno_cur - 1];
2550 got_object_commit_close(commit);
2555 static const struct got_error *
2556 cmd_blame(int argc, char *argv[])
2558 const struct got_error *error;
2559 struct got_repository *repo = NULL;
2560 struct got_worktree *worktree = NULL;
2561 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2562 struct got_object_id *obj_id = NULL;
2563 struct got_object_id *commit_id = NULL;
2564 struct got_blob_object *blob = NULL;
2565 char *commit_id_str = NULL;
2566 struct blame_cb_args bca;
2567 int ch, obj_type, i;
2570 memset(&bca, 0, sizeof(bca));
2573 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2578 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2581 commit_id_str = optarg;
2584 repo_path = realpath(optarg, NULL);
2585 if (repo_path == NULL)
2586 return got_error_from_errno2("realpath",
2588 got_path_strip_trailing_slashes(repo_path);
2604 cwd = getcwd(NULL, 0);
2606 error = got_error_from_errno("getcwd");
2609 if (repo_path == NULL) {
2610 error = got_worktree_open(&worktree, cwd);
2611 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2617 strdup(got_worktree_get_repo_path(worktree));
2618 if (repo_path == NULL)
2619 error = got_error_from_errno("strdup");
2623 repo_path = strdup(cwd);
2624 if (repo_path == NULL) {
2625 error = got_error_from_errno("strdup");
2631 error = got_repo_open(&repo, repo_path, NULL);
2635 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2640 const char *prefix = got_worktree_get_path_prefix(worktree);
2641 char *p, *worktree_subdir = cwd +
2642 strlen(got_worktree_get_root_path(worktree));
2643 if (asprintf(&p, "%s%s%s%s%s",
2644 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2645 worktree_subdir, worktree_subdir[0] ? "/" : "",
2647 error = got_error_from_errno("asprintf");
2650 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2653 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2658 if (commit_id_str == NULL) {
2659 struct got_reference *head_ref;
2660 error = got_ref_open(&head_ref, repo, worktree ?
2661 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
2664 error = got_ref_resolve(&commit_id, repo, head_ref);
2665 got_ref_close(head_ref);
2669 error = got_repo_match_object_id(&commit_id, NULL,
2670 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2675 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2679 error = got_object_get_type(&obj_type, repo, obj_id);
2683 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2684 error = got_error(GOT_ERR_OBJ_TYPE);
2688 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2691 bca.f = got_opentemp();
2692 if (bca.f == NULL) {
2693 error = got_error_from_errno("got_opentemp");
2696 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2697 &bca.line_offsets, bca.f, blob);
2698 if (error || bca.nlines == 0)
2701 /* Don't include \n at EOF in the blame line count. */
2702 if (bca.line_offsets[bca.nlines - 1] == filesize)
2705 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2706 if (bca.lines == NULL) {
2707 error = got_error_from_errno("calloc");
2711 bca.nlines_prec = 0;
2719 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2720 check_cancelled, NULL);
2728 got_object_blob_close(blob);
2730 got_worktree_close(worktree);
2732 const struct got_error *repo_error;
2733 repo_error = got_repo_close(repo);
2738 for (i = 0; i < bca.nlines; i++) {
2739 struct blame_line *bline = &bca.lines[i];
2740 free(bline->id_str);
2741 free(bline->committer);
2745 free(bca.line_offsets);
2746 if (bca.f && fclose(bca.f) == EOF && error == NULL)
2747 error = got_error_from_errno("fclose");
2755 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2761 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2762 const char *root_path)
2764 int is_root_path = (strcmp(path, root_path) == 0);
2765 const char *modestr = "";
2766 mode_t mode = got_tree_entry_get_mode(te);
2768 path += strlen(root_path);
2769 while (path[0] == '/')
2772 if (got_object_tree_entry_is_submodule(te))
2774 else if (S_ISLNK(mode))
2776 else if (S_ISDIR(mode))
2778 else if (mode & S_IXUSR)
2781 printf("%s%s%s%s%s\n", id ? id : "", path,
2782 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2785 static const struct got_error *
2786 print_tree(const char *path, struct got_object_id *commit_id,
2787 int show_ids, int recurse, const char *root_path,
2788 struct got_repository *repo)
2790 const struct got_error *err = NULL;
2791 struct got_object_id *tree_id = NULL;
2792 struct got_tree_object *tree = NULL;
2795 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2799 err = got_object_open_as_tree(&tree, repo, tree_id);
2802 nentries = got_object_tree_get_nentries(tree);
2803 for (i = 0; i < nentries; i++) {
2804 struct got_tree_entry *te;
2807 if (sigint_received || sigpipe_received)
2810 te = got_object_tree_get_entry(tree, i);
2813 err = got_object_id_str(&id_str,
2814 got_tree_entry_get_id(te));
2817 if (asprintf(&id, "%s ", id_str) == -1) {
2818 err = got_error_from_errno("asprintf");
2824 print_entry(te, id, path, root_path);
2827 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2829 if (asprintf(&child_path, "%s%s%s", path,
2830 path[0] == '/' && path[1] == '\0' ? "" : "/",
2831 got_tree_entry_get_name(te)) == -1) {
2832 err = got_error_from_errno("asprintf");
2835 err = print_tree(child_path, commit_id, show_ids, 1,
2844 got_object_tree_close(tree);
2849 static const struct got_error *
2850 cmd_tree(int argc, char *argv[])
2852 const struct got_error *error;
2853 struct got_repository *repo = NULL;
2854 struct got_worktree *worktree = NULL;
2856 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2857 struct got_object_id *commit_id = NULL;
2858 char *commit_id_str = NULL;
2859 int show_ids = 0, recurse = 0;
2863 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2868 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2871 commit_id_str = optarg;
2874 repo_path = realpath(optarg, NULL);
2875 if (repo_path == NULL)
2876 return got_error_from_errno2("realpath",
2878 got_path_strip_trailing_slashes(repo_path);
2902 cwd = getcwd(NULL, 0);
2904 error = got_error_from_errno("getcwd");
2907 if (repo_path == NULL) {
2908 error = got_worktree_open(&worktree, cwd);
2909 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2915 strdup(got_worktree_get_repo_path(worktree));
2916 if (repo_path == NULL)
2917 error = got_error_from_errno("strdup");
2921 repo_path = strdup(cwd);
2922 if (repo_path == NULL) {
2923 error = got_error_from_errno("strdup");
2929 error = got_repo_open(&repo, repo_path, NULL);
2933 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2939 char *p, *worktree_subdir = cwd +
2940 strlen(got_worktree_get_root_path(worktree));
2941 if (asprintf(&p, "%s/%s",
2942 got_worktree_get_path_prefix(worktree),
2943 worktree_subdir) == -1) {
2944 error = got_error_from_errno("asprintf");
2947 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2954 if (in_repo_path == NULL) {
2955 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2960 if (commit_id_str == NULL) {
2961 struct got_reference *head_ref;
2962 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2965 error = got_ref_resolve(&commit_id, repo, head_ref);
2966 got_ref_close(head_ref);
2970 error = got_repo_match_object_id(&commit_id, NULL,
2971 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2976 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2977 in_repo_path, repo);
2984 got_worktree_close(worktree);
2986 const struct got_error *repo_error;
2987 repo_error = got_repo_close(repo);
2997 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
3001 static const struct got_error *
3002 print_status(void *arg, unsigned char status, unsigned char staged_status,
3003 const char *path, struct got_object_id *blob_id,
3004 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3005 int dirfd, const char *de_name)
3007 if (status == staged_status && (status == GOT_STATUS_DELETE))
3008 status = GOT_STATUS_NO_CHANGE;
3009 printf("%c%c %s\n", status, staged_status, path);
3013 static const struct got_error *
3014 cmd_status(int argc, char *argv[])
3016 const struct got_error *error = NULL;
3017 struct got_repository *repo = NULL;
3018 struct got_worktree *worktree = NULL;
3020 struct got_pathlist_head paths;
3021 struct got_pathlist_entry *pe;
3026 while ((ch = getopt(argc, argv, "")) != -1) {
3038 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3042 cwd = getcwd(NULL, 0);
3044 error = got_error_from_errno("getcwd");
3048 error = got_worktree_open(&worktree, cwd);
3052 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3057 error = apply_unveil(got_repo_get_path(repo), 1,
3058 got_worktree_get_root_path(worktree));
3062 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3066 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3067 check_cancelled, NULL);
3069 TAILQ_FOREACH(pe, &paths, entry)
3070 free((char *)pe->path);
3071 got_pathlist_free(&paths);
3080 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3085 static const struct got_error *
3086 list_refs(struct got_repository *repo)
3088 static const struct got_error *err = NULL;
3089 struct got_reflist_head refs;
3090 struct got_reflist_entry *re;
3092 SIMPLEQ_INIT(&refs);
3093 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3097 SIMPLEQ_FOREACH(re, &refs, entry) {
3099 refstr = got_ref_to_str(re->ref);
3101 return got_error_from_errno("got_ref_to_str");
3102 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3106 got_ref_list_free(&refs);
3110 static const struct got_error *
3111 delete_ref(struct got_repository *repo, const char *refname)
3113 const struct got_error *err = NULL;
3114 struct got_reference *ref;
3116 err = got_ref_open(&ref, repo, refname, 0);
3120 err = got_ref_delete(ref, repo);
3125 static const struct got_error *
3126 add_ref(struct got_repository *repo, const char *refname, const char *target)
3128 const struct got_error *err = NULL;
3129 struct got_object_id *id;
3130 struct got_reference *ref = NULL;
3133 * Don't let the user create a reference name with a leading '-'.
3134 * While technically a valid reference name, this case is usually
3135 * an unintended typo.
3137 if (refname[0] == '-')
3138 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3140 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3143 struct got_reference *target_ref;
3145 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3147 err = got_ref_open(&target_ref, repo, target, 0);
3150 err = got_ref_resolve(&id, repo, target_ref);
3151 got_ref_close(target_ref);
3156 err = got_ref_alloc(&ref, refname, id);
3160 err = got_ref_write(ref, repo);
3168 static const struct got_error *
3169 add_symref(struct got_repository *repo, const char *refname, const char *target)
3171 const struct got_error *err = NULL;
3172 struct got_reference *ref = NULL;
3173 struct got_reference *target_ref = NULL;
3176 * Don't let the user create a reference name with a leading '-'.
3177 * While technically a valid reference name, this case is usually
3178 * an unintended typo.
3180 if (refname[0] == '-')
3181 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3183 err = got_ref_open(&target_ref, repo, target, 0);
3187 err = got_ref_alloc_symref(&ref, refname, target_ref);
3191 err = got_ref_write(ref, repo);
3194 got_ref_close(target_ref);
3200 static const struct got_error *
3201 cmd_ref(int argc, char *argv[])
3203 const struct got_error *error = NULL;
3204 struct got_repository *repo = NULL;
3205 struct got_worktree *worktree = NULL;
3206 char *cwd = NULL, *repo_path = NULL;
3207 int ch, do_list = 0, create_symref = 0;
3208 const char *delref = NULL;
3210 /* TODO: Add -s option for adding symbolic references. */
3211 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3217 repo_path = realpath(optarg, NULL);
3218 if (repo_path == NULL)
3219 return got_error_from_errno2("realpath",
3221 got_path_strip_trailing_slashes(repo_path);
3235 if (do_list && delref)
3236 errx(1, "-l and -d options are mutually exclusive\n");
3241 if (do_list || delref) {
3243 errx(1, "-s option cannot be used together with the "
3244 "-l or -d options");
3247 } else if (argc != 2)
3252 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3256 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3257 "sendfd unveil", NULL) == -1)
3261 cwd = getcwd(NULL, 0);
3263 error = got_error_from_errno("getcwd");
3267 if (repo_path == NULL) {
3268 error = got_worktree_open(&worktree, cwd);
3269 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3275 strdup(got_worktree_get_repo_path(worktree));
3276 if (repo_path == NULL)
3277 error = got_error_from_errno("strdup");
3281 repo_path = strdup(cwd);
3282 if (repo_path == NULL) {
3283 error = got_error_from_errno("strdup");
3289 error = got_repo_open(&repo, repo_path, NULL);
3293 error = apply_unveil(got_repo_get_path(repo), do_list,
3294 worktree ? got_worktree_get_root_path(worktree) : NULL);
3299 error = list_refs(repo);
3301 error = delete_ref(repo, delref);
3302 else if (create_symref)
3303 error = add_symref(repo, argv[0], argv[1]);
3305 error = add_ref(repo, argv[0], argv[1]);
3308 got_repo_close(repo);
3310 got_worktree_close(worktree);
3320 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
3321 "[name]\n", getprogname());
3325 static const struct got_error *
3326 list_branch(struct got_repository *repo, struct got_worktree *worktree,
3327 struct got_reference *ref)
3329 const struct got_error *err = NULL;
3330 const char *refname, *marker = " ";
3333 refname = got_ref_get_name(ref);
3334 if (worktree && strcmp(refname,
3335 got_worktree_get_head_ref_name(worktree)) == 0) {
3336 struct got_object_id *id = NULL;
3338 err = got_ref_resolve(&id, repo, ref);
3341 if (got_object_id_cmp(id,
3342 got_worktree_get_base_commit_id(worktree)) == 0)
3349 if (strncmp(refname, "refs/heads/", 11) == 0)
3351 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3354 refstr = got_ref_to_str(ref);
3356 return got_error_from_errno("got_ref_to_str");
3358 printf("%s%s: %s\n", marker, refname, refstr);
3363 static const struct got_error *
3364 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3366 const char *refname;
3368 if (worktree == NULL)
3369 return got_error(GOT_ERR_NOT_WORKTREE);
3371 refname = got_worktree_get_head_ref_name(worktree);
3373 if (strncmp(refname, "refs/heads/", 11) == 0)
3375 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3378 printf("%s\n", refname);
3383 static const struct got_error *
3384 list_branches(struct got_repository *repo, struct got_worktree *worktree)
3386 static const struct got_error *err = NULL;
3387 struct got_reflist_head refs;
3388 struct got_reflist_entry *re;
3389 struct got_reference *temp_ref = NULL;
3390 int rebase_in_progress, histedit_in_progress;
3392 SIMPLEQ_INIT(&refs);
3395 err = got_worktree_rebase_in_progress(&rebase_in_progress,
3400 err = got_worktree_histedit_in_progress(&histedit_in_progress,
3405 if (rebase_in_progress || histedit_in_progress) {
3406 err = got_ref_open(&temp_ref, repo,
3407 got_worktree_get_head_ref_name(worktree), 0);
3410 list_branch(repo, worktree, temp_ref);
3411 got_ref_close(temp_ref);
3415 err = got_ref_list(&refs, repo, "refs/heads",
3416 got_ref_cmp_by_name, NULL);
3420 SIMPLEQ_FOREACH(re, &refs, entry)
3421 list_branch(repo, worktree, re->ref);
3423 got_ref_list_free(&refs);
3427 static const struct got_error *
3428 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3429 const char *branch_name)
3431 const struct got_error *err = NULL;
3432 struct got_reference *ref = NULL;
3435 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3436 return got_error_from_errno("asprintf");
3438 err = got_ref_open(&ref, repo, refname, 0);
3443 strcmp(got_worktree_get_head_ref_name(worktree),
3444 got_ref_get_name(ref)) == 0) {
3445 err = got_error_msg(GOT_ERR_SAME_BRANCH,
3446 "will not delete this work tree's current branch");
3450 err = got_ref_delete(ref, repo);
3458 static const struct got_error *
3459 add_branch(struct got_repository *repo, const char *branch_name,
3460 struct got_object_id *base_commit_id)
3462 const struct got_error *err = NULL;
3463 struct got_reference *ref = NULL;
3464 char *base_refname = NULL, *refname = NULL;
3467 * Don't let the user create a branch name with a leading '-'.
3468 * While technically a valid reference name, this case is usually
3469 * an unintended typo.
3471 if (branch_name[0] == '-')
3472 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3474 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3475 err = got_error_from_errno("asprintf");
3479 err = got_ref_open(&ref, repo, refname, 0);
3481 err = got_error(GOT_ERR_BRANCH_EXISTS);
3483 } else if (err->code != GOT_ERR_NOT_REF)
3486 err = got_ref_alloc(&ref, refname, base_commit_id);
3490 err = got_ref_write(ref, repo);
3499 static const struct got_error *
3500 cmd_branch(int argc, char *argv[])
3502 const struct got_error *error = NULL;
3503 struct got_repository *repo = NULL;
3504 struct got_worktree *worktree = NULL;
3505 char *cwd = NULL, *repo_path = NULL;
3506 int ch, do_list = 0, do_show = 0, do_update = 1;
3507 const char *delref = NULL, *commit_id_arg = NULL;
3508 struct got_reference *ref = NULL;
3509 struct got_pathlist_head paths;
3510 struct got_pathlist_entry *pe;
3511 struct got_object_id *commit_id = NULL;
3512 char *commit_id_str = NULL;
3516 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
3519 commit_id_arg = optarg;
3525 repo_path = realpath(optarg, NULL);
3526 if (repo_path == NULL)
3527 return got_error_from_errno2("realpath",
3529 got_path_strip_trailing_slashes(repo_path);
3543 if (do_list && delref)
3544 errx(1, "-l and -d options are mutually exclusive\n");
3549 if (!do_list && !delref && argc == 0)
3552 if ((do_list || delref || do_show) && commit_id_arg != NULL)
3553 errx(1, "-c option can only be used when creating a branch");
3555 if (do_list || delref) {
3558 } else if (!do_show && argc != 1)
3562 if (do_list || do_show) {
3563 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3567 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3568 "sendfd unveil", NULL) == -1)
3572 cwd = getcwd(NULL, 0);
3574 error = got_error_from_errno("getcwd");
3578 if (repo_path == NULL) {
3579 error = got_worktree_open(&worktree, cwd);
3580 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3586 strdup(got_worktree_get_repo_path(worktree));
3587 if (repo_path == NULL)
3588 error = got_error_from_errno("strdup");
3592 repo_path = strdup(cwd);
3593 if (repo_path == NULL) {
3594 error = got_error_from_errno("strdup");
3600 error = got_repo_open(&repo, repo_path, NULL);
3604 error = apply_unveil(got_repo_get_path(repo), do_list,
3605 worktree ? got_worktree_get_root_path(worktree) : NULL);
3610 error = show_current_branch(repo, worktree);
3612 error = list_branches(repo, worktree);
3614 error = delete_branch(repo, worktree, delref);
3616 if (commit_id_arg == NULL)
3617 commit_id_arg = worktree ?
3618 got_worktree_get_head_ref_name(worktree) :
3620 error = got_repo_match_object_id(&commit_id, NULL,
3621 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3624 error = add_branch(repo, argv[0], commit_id);
3627 if (worktree && do_update) {
3628 int did_something = 0;
3629 char *branch_refname = NULL;
3631 error = got_object_id_str(&commit_id_str, commit_id);
3634 error = get_worktree_paths_from_argv(&paths, 0, NULL,
3638 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
3640 error = got_error_from_errno("asprintf");
3643 error = got_ref_open(&ref, repo, branch_refname, 0);
3644 free(branch_refname);
3647 error = switch_head_ref(ref, commit_id, worktree,
3651 error = got_worktree_set_base_commit_id(worktree, repo,
3655 error = got_worktree_checkout_files(worktree, &paths,
3656 repo, update_progress, &did_something,
3657 check_cancelled, NULL);
3661 printf("Updated to commit %s\n", commit_id_str);
3668 got_repo_close(repo);
3670 got_worktree_close(worktree);
3674 free(commit_id_str);
3675 TAILQ_FOREACH(pe, &paths, entry)
3676 free((char *)pe->path);
3677 got_pathlist_free(&paths);
3686 "usage: %s tag [-c commit] [-r repository] [-l] "
3687 "[-m message] name\n", getprogname());
3692 static const struct got_error *
3693 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3695 const struct got_error *err = NULL;
3696 struct got_reflist_entry *re, *se, *new;
3697 struct got_object_id *re_id, *se_id;
3698 struct got_tag_object *re_tag, *se_tag;
3699 time_t re_time, se_time;
3701 SIMPLEQ_FOREACH(re, tags, entry) {
3702 se = SIMPLEQ_FIRST(sorted);
3704 err = got_reflist_entry_dup(&new, re);
3707 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3710 err = got_ref_resolve(&re_id, repo, re->ref);
3713 err = got_object_open_as_tag(&re_tag, repo, re_id);
3717 re_time = got_object_tag_get_tagger_time(re_tag);
3718 got_object_tag_close(re_tag);
3722 err = got_ref_resolve(&se_id, repo, re->ref);
3725 err = got_object_open_as_tag(&se_tag, repo, se_id);
3729 se_time = got_object_tag_get_tagger_time(se_tag);
3730 got_object_tag_close(se_tag);
3732 if (se_time > re_time) {
3733 err = got_reflist_entry_dup(&new, re);
3736 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3739 se = SIMPLEQ_NEXT(se, entry);
3748 static const struct got_error *
3749 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3751 static const struct got_error *err = NULL;
3752 struct got_reflist_head refs;
3753 struct got_reflist_entry *re;
3755 SIMPLEQ_INIT(&refs);
3757 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
3761 SIMPLEQ_FOREACH(re, &refs, entry) {
3762 const char *refname;
3763 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3767 struct got_object_id *id;
3768 struct got_tag_object *tag;
3769 struct got_commit_object *commit = NULL;
3771 refname = got_ref_get_name(re->ref);
3772 if (strncmp(refname, "refs/tags/", 10) != 0)
3775 refstr = got_ref_to_str(re->ref);
3776 if (refstr == NULL) {
3777 err = got_error_from_errno("got_ref_to_str");
3780 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3783 err = got_ref_resolve(&id, repo, re->ref);
3786 err = got_object_open_as_tag(&tag, repo, id);
3788 if (err->code != GOT_ERR_OBJ_TYPE) {
3792 /* "lightweight" tag */
3793 err = got_object_open_as_commit(&commit, repo, id);
3798 tagger = got_object_commit_get_committer(commit);
3800 got_object_commit_get_committer_time(commit);
3801 err = got_object_id_str(&id_str, id);
3807 tagger = got_object_tag_get_tagger(tag);
3808 tagger_time = got_object_tag_get_tagger_time(tag);
3809 err = got_object_id_str(&id_str,
3810 got_object_tag_get_object_id(tag));
3814 printf("from: %s\n", tagger);
3815 datestr = get_datestr(&tagger_time, datebuf);
3817 printf("date: %s UTC\n", datestr);
3819 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3821 switch (got_object_tag_get_object_type(tag)) {
3822 case GOT_OBJ_TYPE_BLOB:
3823 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
3826 case GOT_OBJ_TYPE_TREE:
3827 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
3830 case GOT_OBJ_TYPE_COMMIT:
3831 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
3834 case GOT_OBJ_TYPE_TAG:
3835 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
3844 err = got_object_commit_get_logmsg(&tagmsg0, commit);
3847 got_object_commit_close(commit);
3849 tagmsg0 = strdup(got_object_tag_get_message(tag));
3850 got_object_tag_close(tag);
3851 if (tagmsg0 == NULL) {
3852 err = got_error_from_errno("strdup");
3859 line = strsep(&tagmsg, "\n");
3861 printf(" %s\n", line);
3866 got_ref_list_free(&refs);
3870 static const struct got_error *
3871 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3872 const char *tag_name, const char *repo_path)
3874 const struct got_error *err = NULL;
3875 char *template = NULL, *initial_content = NULL;
3876 char *editor = NULL;
3879 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
3880 err = got_error_from_errno("asprintf");
3884 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3885 commit_id_str, tag_name) == -1) {
3886 err = got_error_from_errno("asprintf");
3890 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3894 dprintf(fd, initial_content);
3897 err = get_editor(&editor);
3900 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3902 free(initial_content);
3906 /* Editor is done; we can now apply unveil(2) */
3908 err = apply_unveil(repo_path, 0, NULL);
3917 static const struct got_error *
3918 add_tag(struct got_repository *repo, const char *tag_name,
3919 const char *commit_arg, const char *tagmsg_arg)
3921 const struct got_error *err = NULL;
3922 struct got_object_id *commit_id = NULL, *tag_id = NULL;
3923 char *label = NULL, *commit_id_str = NULL;
3924 struct got_reference *ref = NULL;
3925 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3926 char *tagmsg_path = NULL, *tag_id_str = NULL;
3927 int preserve_tagmsg = 0;
3930 * Don't let the user create a tag name with a leading '-'.
3931 * While technically a valid reference name, this case is usually
3932 * an unintended typo.
3934 if (tag_name[0] == '-')
3935 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3937 err = get_author(&tagger, repo);
3941 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
3942 GOT_OBJ_TYPE_COMMIT, 1, repo);
3946 err = got_object_id_str(&commit_id_str, commit_id);
3950 if (strncmp("refs/tags/", tag_name, 10) == 0) {
3951 refname = strdup(tag_name);
3952 if (refname == NULL) {
3953 err = got_error_from_errno("strdup");
3957 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3958 err = got_error_from_errno("asprintf");
3962 err = got_ref_open(&ref, repo, refname, 0);
3964 err = got_error(GOT_ERR_TAG_EXISTS);
3966 } else if (err->code != GOT_ERR_NOT_REF)
3969 if (tagmsg_arg == NULL) {
3970 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3971 tag_name, got_repo_get_path(repo));
3973 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3974 tagmsg_path != NULL)
3975 preserve_tagmsg = 1;
3980 err = got_object_tag_create(&tag_id, tag_name, commit_id,
3981 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3984 preserve_tagmsg = 1;
3988 err = got_ref_alloc(&ref, refname, tag_id);
3991 preserve_tagmsg = 1;
3995 err = got_ref_write(ref, repo);
3998 preserve_tagmsg = 1;
4002 err = got_object_id_str(&tag_id_str, tag_id);
4005 preserve_tagmsg = 1;
4008 printf("Created tag %s\n", tag_id_str);
4010 if (preserve_tagmsg) {
4011 fprintf(stderr, "%s: tag message preserved in %s\n",
4012 getprogname(), tagmsg_path);
4013 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
4014 err = got_error_from_errno2("unlink", tagmsg_path);
4019 free(commit_id_str);
4027 static const struct got_error *
4028 cmd_tag(int argc, char *argv[])
4030 const struct got_error *error = NULL;
4031 struct got_repository *repo = NULL;
4032 struct got_worktree *worktree = NULL;
4033 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
4034 char *gitconfig_path = NULL;
4035 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
4036 int ch, do_list = 0;
4038 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
4041 commit_id_arg = optarg;
4047 repo_path = realpath(optarg, NULL);
4048 if (repo_path == NULL)
4049 return got_error_from_errno2("realpath",
4051 got_path_strip_trailing_slashes(repo_path);
4066 if (commit_id_arg != NULL)
4067 errx(1, "-c option can only be used when creating a tag");
4069 errx(1, "-l and -m options are mutually exclusive");
4072 } else if (argc != 1)
4079 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4083 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4084 "sendfd unveil", NULL) == -1)
4088 cwd = getcwd(NULL, 0);
4090 error = got_error_from_errno("getcwd");
4094 if (repo_path == NULL) {
4095 error = got_worktree_open(&worktree, cwd);
4096 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4102 strdup(got_worktree_get_repo_path(worktree));
4103 if (repo_path == NULL)
4104 error = got_error_from_errno("strdup");
4108 repo_path = strdup(cwd);
4109 if (repo_path == NULL) {
4110 error = got_error_from_errno("strdup");
4117 error = got_repo_open(&repo, repo_path, NULL);
4120 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4123 error = list_tags(repo, worktree);
4125 error = get_gitconfig_path(&gitconfig_path);
4128 error = got_repo_open(&repo, repo_path, gitconfig_path);
4133 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4138 if (commit_id_arg == NULL) {
4139 struct got_reference *head_ref;
4140 struct got_object_id *commit_id;
4141 error = got_ref_open(&head_ref, repo,
4142 worktree ? got_worktree_get_head_ref_name(worktree)
4146 error = got_ref_resolve(&commit_id, repo, head_ref);
4147 got_ref_close(head_ref);
4150 error = got_object_id_str(&commit_id_str, commit_id);
4156 error = add_tag(repo, tag_name,
4157 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4161 got_repo_close(repo);
4163 got_worktree_close(worktree);
4166 free(gitconfig_path);
4167 free(commit_id_str);
4174 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4179 static const struct got_error *
4180 add_progress(void *arg, unsigned char status, const char *path)
4182 while (path[0] == '/')
4184 printf("%c %s\n", status, path);
4188 static const struct got_error *
4189 cmd_add(int argc, char *argv[])
4191 const struct got_error *error = NULL;
4192 struct got_repository *repo = NULL;
4193 struct got_worktree *worktree = NULL;
4195 struct got_pathlist_head paths;
4196 struct got_pathlist_entry *pe;
4197 int ch, can_recurse = 0, no_ignores = 0;
4201 while ((ch = getopt(argc, argv, "IR")) != -1) {
4219 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4226 cwd = getcwd(NULL, 0);
4228 error = got_error_from_errno("getcwd");
4232 error = got_worktree_open(&worktree, cwd);
4236 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4241 error = apply_unveil(got_repo_get_path(repo), 1,
4242 got_worktree_get_root_path(worktree));
4246 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4250 if (!can_recurse && no_ignores) {
4251 error = got_error_msg(GOT_ERR_BAD_PATH,
4252 "disregarding ignores requires -R option");
4260 TAILQ_FOREACH(pe, &paths, entry) {
4261 if (asprintf(&ondisk_path, "%s/%s",
4262 got_worktree_get_root_path(worktree),
4264 error = got_error_from_errno("asprintf");
4267 if (lstat(ondisk_path, &sb) == -1) {
4268 if (errno == ENOENT) {
4272 error = got_error_from_errno2("lstat",
4278 if (S_ISDIR(sb.st_mode)) {
4279 error = got_error_msg(GOT_ERR_BAD_PATH,
4280 "adding directories requires -R option");
4286 error = got_worktree_schedule_add(worktree, &paths, add_progress,
4287 NULL, repo, no_ignores);
4290 got_repo_close(repo);
4292 got_worktree_close(worktree);
4293 TAILQ_FOREACH(pe, &paths, entry)
4294 free((char *)pe->path);
4295 got_pathlist_free(&paths);
4303 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4308 static const struct got_error *
4309 print_remove_status(void *arg, unsigned char status,
4310 unsigned char staged_status, const char *path)
4312 while (path[0] == '/')
4314 if (status == GOT_STATUS_NONEXISTENT)
4316 if (status == staged_status && (status == GOT_STATUS_DELETE))
4317 status = GOT_STATUS_NO_CHANGE;
4318 printf("%c%c %s\n", status, staged_status, path);
4322 static const struct got_error *
4323 cmd_remove(int argc, char *argv[])
4325 const struct got_error *error = NULL;
4326 struct got_worktree *worktree = NULL;
4327 struct got_repository *repo = NULL;
4329 struct got_pathlist_head paths;
4330 struct got_pathlist_entry *pe;
4331 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4335 while ((ch = getopt(argc, argv, "fkR")) != -1) {
4338 delete_local_mods = 1;
4356 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4363 cwd = getcwd(NULL, 0);
4365 error = got_error_from_errno("getcwd");
4368 error = got_worktree_open(&worktree, cwd);
4372 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4377 error = apply_unveil(got_repo_get_path(repo), 1,
4378 got_worktree_get_root_path(worktree));
4382 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4389 TAILQ_FOREACH(pe, &paths, entry) {
4390 if (asprintf(&ondisk_path, "%s/%s",
4391 got_worktree_get_root_path(worktree),
4393 error = got_error_from_errno("asprintf");
4396 if (lstat(ondisk_path, &sb) == -1) {
4397 if (errno == ENOENT) {
4401 error = got_error_from_errno2("lstat",
4407 if (S_ISDIR(sb.st_mode)) {
4408 error = got_error_msg(GOT_ERR_BAD_PATH,
4409 "removing directories requires -R option");
4415 error = got_worktree_schedule_delete(worktree, &paths,
4416 delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4419 got_repo_close(repo);
4421 got_worktree_close(worktree);
4422 TAILQ_FOREACH(pe, &paths, entry)
4423 free((char *)pe->path);
4424 got_pathlist_free(&paths);
4432 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4433 "path ...\n", getprogname());
4437 static const struct got_error *
4438 revert_progress(void *arg, unsigned char status, const char *path)
4440 if (status == GOT_STATUS_UNVERSIONED)
4443 while (path[0] == '/')
4445 printf("%c %s\n", status, path);
4449 struct choose_patch_arg {
4450 FILE *patch_script_file;
4454 static const struct got_error *
4455 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4456 int nchanges, const char *action)
4459 size_t linesize = 0;
4463 case GOT_STATUS_ADD:
4464 printf("A %s\n%s this addition? [y/n] ", path, action);
4466 case GOT_STATUS_DELETE:
4467 printf("D %s\n%s this deletion? [y/n] ", path, action);
4469 case GOT_STATUS_MODIFY:
4470 if (fseek(patch_file, 0L, SEEK_SET) == -1)
4471 return got_error_from_errno("fseek");
4472 printf(GOT_COMMIT_SEP_STR);
4473 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4475 if (ferror(patch_file))
4476 return got_error_from_errno("getline");
4477 printf(GOT_COMMIT_SEP_STR);
4478 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4479 path, n, nchanges, action);
4482 return got_error_path(path, GOT_ERR_FILE_STATUS);
4488 static const struct got_error *
4489 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4490 FILE *patch_file, int n, int nchanges)
4492 const struct got_error *err = NULL;
4494 size_t linesize = 0;
4497 struct choose_patch_arg *a = arg;
4499 *choice = GOT_PATCH_CHOICE_NONE;
4501 if (a->patch_script_file) {
4503 err = show_change(status, path, patch_file, n, nchanges,
4507 linelen = getline(&line, &linesize, a->patch_script_file);
4508 if (linelen == -1) {
4509 if (ferror(a->patch_script_file))
4510 return got_error_from_errno("getline");
4513 nl = strchr(line, '\n');
4516 if (strcmp(line, "y") == 0) {
4517 *choice = GOT_PATCH_CHOICE_YES;
4519 } else if (strcmp(line, "n") == 0) {
4520 *choice = GOT_PATCH_CHOICE_NO;
4522 } else if (strcmp(line, "q") == 0 &&
4523 status == GOT_STATUS_MODIFY) {
4524 *choice = GOT_PATCH_CHOICE_QUIT;
4527 printf("invalid response '%s'\n", line);
4532 while (resp != 'y' && resp != 'n' && resp != 'q') {
4533 err = show_change(status, path, patch_file, n, nchanges,
4540 if (status == GOT_STATUS_MODIFY) {
4541 if (resp != 'y' && resp != 'n' && resp != 'q') {
4542 printf("invalid response '%c'\n", resp);
4545 } else if (resp != 'y' && resp != 'n') {
4546 printf("invalid response '%c'\n", resp);
4552 *choice = GOT_PATCH_CHOICE_YES;
4553 else if (resp == 'n')
4554 *choice = GOT_PATCH_CHOICE_NO;
4555 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4556 *choice = GOT_PATCH_CHOICE_QUIT;
4562 static const struct got_error *
4563 cmd_revert(int argc, char *argv[])
4565 const struct got_error *error = NULL;
4566 struct got_worktree *worktree = NULL;
4567 struct got_repository *repo = NULL;
4568 char *cwd = NULL, *path = NULL;
4569 struct got_pathlist_head paths;
4570 struct got_pathlist_entry *pe;
4571 int ch, can_recurse = 0, pflag = 0;
4572 FILE *patch_script_file = NULL;
4573 const char *patch_script_path = NULL;
4574 struct choose_patch_arg cpa;
4578 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4584 patch_script_path = optarg;
4599 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4600 "unveil", NULL) == -1)
4605 if (patch_script_path && !pflag)
4606 errx(1, "-F option can only be used together with -p option");
4608 cwd = getcwd(NULL, 0);
4610 error = got_error_from_errno("getcwd");
4613 error = got_worktree_open(&worktree, cwd);
4617 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4622 if (patch_script_path) {
4623 patch_script_file = fopen(patch_script_path, "r");
4624 if (patch_script_file == NULL) {
4625 error = got_error_from_errno2("fopen",
4630 error = apply_unveil(got_repo_get_path(repo), 1,
4631 got_worktree_get_root_path(worktree));
4635 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4642 TAILQ_FOREACH(pe, &paths, entry) {
4643 if (asprintf(&ondisk_path, "%s/%s",
4644 got_worktree_get_root_path(worktree),
4646 error = got_error_from_errno("asprintf");
4649 if (lstat(ondisk_path, &sb) == -1) {
4650 if (errno == ENOENT) {
4654 error = got_error_from_errno2("lstat",
4660 if (S_ISDIR(sb.st_mode)) {
4661 error = got_error_msg(GOT_ERR_BAD_PATH,
4662 "reverting directories requires -R option");
4668 cpa.patch_script_file = patch_script_file;
4669 cpa.action = "revert";
4670 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4671 pflag ? choose_patch : NULL, &cpa, repo);
4673 if (patch_script_file && fclose(patch_script_file) == EOF &&
4675 error = got_error_from_errno2("fclose", patch_script_path);
4677 got_repo_close(repo);
4679 got_worktree_close(worktree);
4688 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4693 struct collect_commit_logmsg_arg {
4694 const char *cmdline_log;
4696 const char *worktree_path;
4697 const char *branch_name;
4698 const char *repo_path;
4703 static const struct got_error *
4704 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4707 char *initial_content = NULL;
4708 struct got_pathlist_entry *pe;
4709 const struct got_error *err = NULL;
4710 char *template = NULL;
4711 struct collect_commit_logmsg_arg *a = arg;
4715 /* if a message was specified on the command line, just use it */
4716 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4717 len = strlen(a->cmdline_log) + 1;
4718 *logmsg = malloc(len + 1);
4719 if (*logmsg == NULL)
4720 return got_error_from_errno("malloc");
4721 strlcpy(*logmsg, a->cmdline_log, len);
4725 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4726 return got_error_from_errno("asprintf");
4728 if (asprintf(&initial_content,
4729 "\n# changes to be committed on branch %s:\n",
4730 a->branch_name) == -1)
4731 return got_error_from_errno("asprintf");
4733 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4737 dprintf(fd, initial_content);
4739 TAILQ_FOREACH(pe, commitable_paths, entry) {
4740 struct got_commitable *ct = pe->data;
4741 dprintf(fd, "# %c %s\n",
4742 got_commitable_get_status(ct),
4743 got_commitable_get_path(ct));
4747 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4749 free(initial_content);
4752 /* Editor is done; we can now apply unveil(2) */
4754 err = apply_unveil(a->repo_path, 0, a->worktree_path);
4763 static const struct got_error *
4764 cmd_commit(int argc, char *argv[])
4766 const struct got_error *error = NULL;
4767 struct got_worktree *worktree = NULL;
4768 struct got_repository *repo = NULL;
4769 char *cwd = NULL, *id_str = NULL;
4770 struct got_object_id *id = NULL;
4771 const char *logmsg = NULL;
4772 struct collect_commit_logmsg_arg cl_arg;
4773 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4774 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4775 struct got_pathlist_head paths;
4778 cl_arg.logmsg_path = NULL;
4780 while ((ch = getopt(argc, argv, "m:")) != -1) {
4795 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4796 "unveil", NULL) == -1)
4799 cwd = getcwd(NULL, 0);
4801 error = got_error_from_errno("getcwd");
4804 error = got_worktree_open(&worktree, cwd);
4808 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4811 if (rebase_in_progress) {
4812 error = got_error(GOT_ERR_REBASING);
4816 error = got_worktree_histedit_in_progress(&histedit_in_progress,
4821 error = get_gitconfig_path(&gitconfig_path);
4824 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4829 error = get_author(&author, repo);
4834 * unveil(2) traverses exec(2); if an editor is used we have
4835 * to apply unveil after the log message has been written.
4837 if (logmsg == NULL || strlen(logmsg) == 0)
4838 error = get_editor(&editor);
4840 error = apply_unveil(got_repo_get_path(repo), 0,
4841 got_worktree_get_root_path(worktree));
4845 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4849 cl_arg.editor = editor;
4850 cl_arg.cmdline_log = logmsg;
4851 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4852 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4853 if (!histedit_in_progress) {
4854 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4855 error = got_error(GOT_ERR_COMMIT_BRANCH);
4858 cl_arg.branch_name += 11;
4860 cl_arg.repo_path = got_repo_get_path(repo);
4861 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4862 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4864 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4865 cl_arg.logmsg_path != NULL)
4866 preserve_logmsg = 1;
4870 error = got_object_id_str(&id_str, id);
4873 printf("Created commit %s\n", id_str);
4875 if (preserve_logmsg) {
4876 fprintf(stderr, "%s: log message preserved in %s\n",
4877 getprogname(), cl_arg.logmsg_path);
4878 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4880 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4881 free(cl_arg.logmsg_path);
4883 got_repo_close(repo);
4885 got_worktree_close(worktree);
4888 free(gitconfig_path);
4895 usage_cherrypick(void)
4897 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4901 static const struct got_error *
4902 cmd_cherrypick(int argc, char *argv[])
4904 const struct got_error *error = NULL;
4905 struct got_worktree *worktree = NULL;
4906 struct got_repository *repo = NULL;
4907 char *cwd = NULL, *commit_id_str = NULL;
4908 struct got_object_id *commit_id = NULL;
4909 struct got_commit_object *commit = NULL;
4910 struct got_object_qid *pid;
4911 struct got_reference *head_ref = NULL;
4912 int ch, did_something = 0;
4914 while ((ch = getopt(argc, argv, "")) != -1) {
4926 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4927 "unveil", NULL) == -1)
4933 cwd = getcwd(NULL, 0);
4935 error = got_error_from_errno("getcwd");
4938 error = got_worktree_open(&worktree, cwd);
4942 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4947 error = apply_unveil(got_repo_get_path(repo), 0,
4948 got_worktree_get_root_path(worktree));
4952 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4953 GOT_OBJ_TYPE_COMMIT, repo);
4954 if (error != NULL) {
4955 struct got_reference *ref;
4956 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4958 error = got_ref_open(&ref, repo, argv[0], 0);
4961 error = got_ref_resolve(&commit_id, repo, ref);
4966 error = got_object_id_str(&commit_id_str, commit_id);
4970 error = got_ref_open(&head_ref, repo,
4971 got_worktree_get_head_ref_name(worktree), 0);
4975 error = check_same_branch(commit_id, head_ref, NULL, repo);
4977 if (error->code != GOT_ERR_ANCESTRY)
4981 error = got_error(GOT_ERR_SAME_BRANCH);
4985 error = got_object_open_as_commit(&commit, repo, commit_id);
4988 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4989 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4990 commit_id, repo, update_progress, &did_something, check_cancelled,
4996 printf("Merged commit %s\n", commit_id_str);
4999 got_object_commit_close(commit);
5000 free(commit_id_str);
5002 got_ref_close(head_ref);
5004 got_worktree_close(worktree);
5006 got_repo_close(repo);
5013 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
5017 static const struct got_error *
5018 cmd_backout(int argc, char *argv[])
5020 const struct got_error *error = NULL;
5021 struct got_worktree *worktree = NULL;
5022 struct got_repository *repo = NULL;
5023 char *cwd = NULL, *commit_id_str = NULL;
5024 struct got_object_id *commit_id = NULL;
5025 struct got_commit_object *commit = NULL;
5026 struct got_object_qid *pid;
5027 struct got_reference *head_ref = NULL;
5028 int ch, did_something = 0;
5030 while ((ch = getopt(argc, argv, "")) != -1) {
5042 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5043 "unveil", NULL) == -1)
5049 cwd = getcwd(NULL, 0);
5051 error = got_error_from_errno("getcwd");
5054 error = got_worktree_open(&worktree, cwd);
5058 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5063 error = apply_unveil(got_repo_get_path(repo), 0,
5064 got_worktree_get_root_path(worktree));
5068 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
5069 GOT_OBJ_TYPE_COMMIT, repo);
5070 if (error != NULL) {
5071 struct got_reference *ref;
5072 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
5074 error = got_ref_open(&ref, repo, argv[0], 0);
5077 error = got_ref_resolve(&commit_id, repo, ref);
5082 error = got_object_id_str(&commit_id_str, commit_id);
5086 error = got_ref_open(&head_ref, repo,
5087 got_worktree_get_head_ref_name(worktree), 0);
5091 error = check_same_branch(commit_id, head_ref, NULL, repo);
5095 error = got_object_open_as_commit(&commit, repo, commit_id);
5098 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5100 error = got_error(GOT_ERR_ROOT_COMMIT);
5104 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5105 update_progress, &did_something, check_cancelled, NULL);
5110 printf("Backed out commit %s\n", commit_id_str);
5113 got_object_commit_close(commit);
5114 free(commit_id_str);
5116 got_ref_close(head_ref);
5118 got_worktree_close(worktree);
5120 got_repo_close(repo);
5127 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5133 trim_logmsg(char *logmsg, int limit)
5138 len = strlen(logmsg);
5142 nl = strchr(logmsg, '\n');
5147 static const struct got_error *
5148 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5150 const struct got_error *err;
5151 char *logmsg0 = NULL;
5154 err = got_object_commit_get_logmsg(&logmsg0, commit);
5159 while (isspace((unsigned char)s[0]))
5162 *logmsg = strdup(s);
5163 if (*logmsg == NULL) {
5164 err = got_error_from_errno("strdup");
5168 trim_logmsg(*logmsg, limit);
5174 static const struct got_error *
5175 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
5177 const struct got_error *err;
5178 struct got_commit_object *commit = NULL;
5179 char *id_str = NULL, *logmsg = NULL;
5181 err = got_object_open_as_commit(&commit, repo, id);
5185 err = got_object_id_str(&id_str, id);
5191 err = get_short_logmsg(&logmsg, 42, commit);
5195 printf("%s -> merge conflict: %s\n", id_str, logmsg);
5198 got_object_commit_close(commit);
5203 static const struct got_error *
5204 show_rebase_progress(struct got_commit_object *commit,
5205 struct got_object_id *old_id, struct got_object_id *new_id)
5207 const struct got_error *err;
5208 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5210 err = got_object_id_str(&old_id_str, old_id);
5215 err = got_object_id_str(&new_id_str, new_id);
5220 old_id_str[12] = '\0';
5222 new_id_str[12] = '\0';
5224 err = get_short_logmsg(&logmsg, 42, commit);
5228 printf("%s -> %s: %s\n", old_id_str,
5229 new_id_str ? new_id_str : "no-op change", logmsg);
5237 static const struct got_error *
5238 rebase_progress(void *arg, unsigned char status, const char *path)
5240 unsigned char *rebase_status = arg;
5242 while (path[0] == '/')
5244 printf("%c %s\n", status, path);
5246 if (*rebase_status == GOT_STATUS_CONFLICT)
5248 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5249 *rebase_status = status;
5253 static const struct got_error *
5254 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5255 struct got_reference *branch, struct got_reference *new_base_branch,
5256 struct got_reference *tmp_branch, struct got_repository *repo)
5258 printf("Switching work tree to %s\n", got_ref_get_name(branch));
5259 return got_worktree_rebase_complete(worktree, fileindex,
5260 new_base_branch, tmp_branch, branch, repo);
5263 static const struct got_error *
5264 rebase_commit(struct got_pathlist_head *merged_paths,
5265 struct got_worktree *worktree, struct got_fileindex *fileindex,
5266 struct got_reference *tmp_branch,
5267 struct got_object_id *commit_id, struct got_repository *repo)
5269 const struct got_error *error;
5270 struct got_commit_object *commit;
5271 struct got_object_id *new_commit_id;
5273 error = got_object_open_as_commit(&commit, repo, commit_id);
5277 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5278 worktree, fileindex, tmp_branch, commit, commit_id, repo);
5280 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5282 error = show_rebase_progress(commit, commit_id, NULL);
5284 error = show_rebase_progress(commit, commit_id, new_commit_id);
5285 free(new_commit_id);
5288 got_object_commit_close(commit);
5292 struct check_path_prefix_arg {
5293 const char *path_prefix;
5298 static const struct got_error *
5299 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5300 struct got_blob_object *blob2, struct got_object_id *id1,
5301 struct got_object_id *id2, const char *path1, const char *path2,
5302 mode_t mode1, mode_t mode2, struct got_repository *repo)
5304 struct check_path_prefix_arg *a = arg;
5306 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5307 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5308 return got_error(a->errcode);
5313 static const struct got_error *
5314 check_path_prefix(struct got_object_id *parent_id,
5315 struct got_object_id *commit_id, const char *path_prefix,
5316 int errcode, struct got_repository *repo)
5318 const struct got_error *err;
5319 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5320 struct got_commit_object *commit = NULL, *parent_commit = NULL;
5321 struct check_path_prefix_arg cpp_arg;
5323 if (got_path_is_root_dir(path_prefix))
5326 err = got_object_open_as_commit(&commit, repo, commit_id);
5330 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5334 err = got_object_open_as_tree(&tree1, repo,
5335 got_object_commit_get_tree_id(parent_commit));
5339 err = got_object_open_as_tree(&tree2, repo,
5340 got_object_commit_get_tree_id(commit));
5344 cpp_arg.path_prefix = path_prefix;
5345 while (cpp_arg.path_prefix[0] == '/')
5346 cpp_arg.path_prefix++;
5347 cpp_arg.len = strlen(cpp_arg.path_prefix);
5348 cpp_arg.errcode = errcode;
5349 err = got_diff_tree(tree1, tree2, "", "", repo,
5350 check_path_prefix_in_diff, &cpp_arg, 0);
5353 got_object_tree_close(tree1);
5355 got_object_tree_close(tree2);
5357 got_object_commit_close(commit);
5359 got_object_commit_close(parent_commit);
5363 static const struct got_error *
5364 collect_commits(struct got_object_id_queue *commits,
5365 struct got_object_id *initial_commit_id,
5366 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5367 const char *path_prefix, int path_prefix_errcode,
5368 struct got_repository *repo)
5370 const struct got_error *err = NULL;
5371 struct got_commit_graph *graph = NULL;
5372 struct got_object_id *parent_id = NULL;
5373 struct got_object_qid *qid;
5374 struct got_object_id *commit_id = initial_commit_id;
5376 err = got_commit_graph_open(&graph, "/", 1);
5380 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5381 check_cancelled, NULL);
5384 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5385 err = got_commit_graph_iter_next(&parent_id, graph, repo,
5386 check_cancelled, NULL);
5388 if (err->code == GOT_ERR_ITER_COMPLETED) {
5389 err = got_error_msg(GOT_ERR_ANCESTRY,
5390 "ran out of commits to rebase before "
5391 "youngest common ancestor commit has "
5396 err = check_path_prefix(parent_id, commit_id,
5397 path_prefix, path_prefix_errcode, repo);
5401 err = got_object_qid_alloc(&qid, commit_id);
5404 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5405 commit_id = parent_id;
5409 got_commit_graph_close(graph);
5413 static const struct got_error *
5414 cmd_rebase(int argc, char *argv[])
5416 const struct got_error *error = NULL;
5417 struct got_worktree *worktree = NULL;
5418 struct got_repository *repo = NULL;
5419 struct got_fileindex *fileindex = NULL;
5421 struct got_reference *branch = NULL;
5422 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5423 struct got_object_id *commit_id = NULL, *parent_id = NULL;
5424 struct got_object_id *resume_commit_id = NULL;
5425 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5426 struct got_commit_object *commit = NULL;
5427 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5428 int histedit_in_progress = 0;
5429 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5430 struct got_object_id_queue commits;
5431 struct got_pathlist_head merged_paths;
5432 const struct got_object_id_queue *parent_ids;
5433 struct got_object_qid *qid, *pid;
5435 SIMPLEQ_INIT(&commits);
5436 TAILQ_INIT(&merged_paths);
5438 while ((ch = getopt(argc, argv, "ac")) != -1) {
5444 continue_rebase = 1;
5456 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5457 "unveil", NULL) == -1)
5460 if (abort_rebase && continue_rebase)
5462 else if (abort_rebase || continue_rebase) {
5465 } else if (argc != 1)
5468 cwd = getcwd(NULL, 0);
5470 error = got_error_from_errno("getcwd");
5473 error = got_worktree_open(&worktree, cwd);
5477 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5482 error = apply_unveil(got_repo_get_path(repo), 0,
5483 got_worktree_get_root_path(worktree));
5487 error = got_worktree_histedit_in_progress(&histedit_in_progress,
5491 if (histedit_in_progress) {
5492 error = got_error(GOT_ERR_HISTEDIT_BUSY);
5496 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5502 if (!rebase_in_progress) {
5503 error = got_error(GOT_ERR_NOT_REBASING);
5506 error = got_worktree_rebase_continue(&resume_commit_id,
5507 &new_base_branch, &tmp_branch, &branch, &fileindex,
5511 printf("Switching work tree to %s\n",
5512 got_ref_get_symref_target(new_base_branch));
5513 error = got_worktree_rebase_abort(worktree, fileindex, repo,
5514 new_base_branch, update_progress, &did_something);
5517 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5518 goto done; /* nothing else to do */
5521 if (continue_rebase) {
5522 if (!rebase_in_progress) {
5523 error = got_error(GOT_ERR_NOT_REBASING);
5526 error = got_worktree_rebase_continue(&resume_commit_id,
5527 &new_base_branch, &tmp_branch, &branch, &fileindex,
5532 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5533 resume_commit_id, repo);
5537 yca_id = got_object_id_dup(resume_commit_id);
5538 if (yca_id == NULL) {
5539 error = got_error_from_errno("got_object_id_dup");
5543 error = got_ref_open(&branch, repo, argv[0], 0);
5548 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5552 if (!continue_rebase) {
5553 struct got_object_id *base_commit_id;
5555 base_commit_id = got_worktree_get_base_commit_id(worktree);
5556 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5557 base_commit_id, branch_head_commit_id, repo,
5558 check_cancelled, NULL);
5561 if (yca_id == NULL) {
5562 error = got_error_msg(GOT_ERR_ANCESTRY,
5563 "specified branch shares no common ancestry "
5564 "with work tree's branch");
5568 error = check_same_branch(base_commit_id, branch, yca_id, repo);
5570 if (error->code != GOT_ERR_ANCESTRY)
5574 error = got_error_msg(GOT_ERR_SAME_BRANCH,
5575 "specified branch resolves to a commit which "
5576 "is already contained in work tree's branch");
5579 error = got_worktree_rebase_prepare(&new_base_branch,
5580 &tmp_branch, &fileindex, worktree, branch, repo);
5585 commit_id = branch_head_commit_id;
5586 error = got_object_open_as_commit(&commit, repo, commit_id);
5590 parent_ids = got_object_commit_get_parent_ids(commit);
5591 pid = SIMPLEQ_FIRST(parent_ids);
5593 if (!continue_rebase) {
5595 error = got_worktree_rebase_abort(worktree, fileindex,
5596 repo, new_base_branch, update_progress,
5600 printf("Rebase of %s aborted\n",
5601 got_ref_get_name(branch));
5603 error = got_error(GOT_ERR_EMPTY_REBASE);
5606 error = collect_commits(&commits, commit_id, pid->id,
5607 yca_id, got_worktree_get_path_prefix(worktree),
5608 GOT_ERR_REBASE_PATH, repo);
5609 got_object_commit_close(commit);
5614 if (SIMPLEQ_EMPTY(&commits)) {
5615 if (continue_rebase) {
5616 error = rebase_complete(worktree, fileindex,
5617 branch, new_base_branch, tmp_branch, repo);
5620 /* Fast-forward the reference of the branch. */
5621 struct got_object_id *new_head_commit_id;
5623 error = got_ref_resolve(&new_head_commit_id, repo,
5627 error = got_object_id_str(&id_str, new_head_commit_id);
5628 printf("Forwarding %s to commit %s\n",
5629 got_ref_get_name(branch), id_str);
5631 error = got_ref_change_ref(branch,
5632 new_head_commit_id);
5639 SIMPLEQ_FOREACH(qid, &commits, entry) {
5640 commit_id = qid->id;
5641 parent_id = pid ? pid->id : yca_id;
5644 error = got_worktree_rebase_merge_files(&merged_paths,
5645 worktree, fileindex, parent_id, commit_id, repo,
5646 rebase_progress, &rebase_status, check_cancelled, NULL);
5650 if (rebase_status == GOT_STATUS_CONFLICT) {
5651 error = show_rebase_merge_conflict(qid->id, repo);
5654 got_worktree_rebase_pathlist_free(&merged_paths);
5658 error = rebase_commit(&merged_paths, worktree, fileindex,
5659 tmp_branch, commit_id, repo);
5660 got_worktree_rebase_pathlist_free(&merged_paths);
5665 if (rebase_status == GOT_STATUS_CONFLICT) {
5666 error = got_worktree_rebase_postpone(worktree, fileindex);
5669 error = got_error_msg(GOT_ERR_CONFLICTS,
5670 "conflicts must be resolved before rebasing can continue");
5672 error = rebase_complete(worktree, fileindex, branch,
5673 new_base_branch, tmp_branch, repo);
5675 got_object_id_queue_free(&commits);
5676 free(branch_head_commit_id);
5677 free(resume_commit_id);
5680 got_object_commit_close(commit);
5682 got_ref_close(branch);
5683 if (new_base_branch)
5684 got_ref_close(new_base_branch);
5686 got_ref_close(tmp_branch);
5688 got_worktree_close(worktree);
5690 got_repo_close(repo);
5695 usage_histedit(void)
5697 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
5702 #define GOT_HISTEDIT_PICK 'p'
5703 #define GOT_HISTEDIT_EDIT 'e'
5704 #define GOT_HISTEDIT_FOLD 'f'
5705 #define GOT_HISTEDIT_DROP 'd'
5706 #define GOT_HISTEDIT_MESG 'm'
5708 static struct got_histedit_cmd {
5712 } got_histedit_cmds[] = {
5713 { GOT_HISTEDIT_PICK, "pick", "use commit" },
5714 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5715 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
5717 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5718 { GOT_HISTEDIT_MESG, "mesg",
5719 "single-line log message for commit above (open editor if empty)" },
5722 struct got_histedit_list_entry {
5723 TAILQ_ENTRY(got_histedit_list_entry) entry;
5724 struct got_object_id *commit_id;
5725 const struct got_histedit_cmd *cmd;
5728 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5730 static const struct got_error *
5731 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5732 FILE *f, struct got_repository *repo)
5734 const struct got_error *err = NULL;
5735 char *logmsg = NULL, *id_str = NULL;
5736 struct got_commit_object *commit = NULL;
5739 err = got_object_open_as_commit(&commit, repo, commit_id);
5743 err = get_short_logmsg(&logmsg, 34, commit);
5747 err = got_object_id_str(&id_str, commit_id);
5751 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5753 err = got_ferror(f, GOT_ERR_IO);
5756 got_object_commit_close(commit);
5762 static const struct got_error *
5763 histedit_write_commit_list(struct got_object_id_queue *commits,
5764 FILE *f, int edit_logmsg_only, struct got_repository *repo)
5766 const struct got_error *err = NULL;
5767 struct got_object_qid *qid;
5769 if (SIMPLEQ_EMPTY(commits))
5770 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5772 SIMPLEQ_FOREACH(qid, commits, entry) {
5773 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5777 if (edit_logmsg_only) {
5778 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
5780 err = got_ferror(f, GOT_ERR_IO);
5789 static const struct got_error *
5790 write_cmd_list(FILE *f, const char *branch_name,
5791 struct got_object_id_queue *commits)
5793 const struct got_error *err = NULL;
5796 struct got_object_qid *qid;
5798 qid = SIMPLEQ_FIRST(commits);
5799 err = got_object_id_str(&id_str, qid->id);
5804 "# Editing the history of branch '%s' starting at\n"
5806 "# Commits will be processed in order from top to "
5807 "bottom of this file.\n", branch_name, id_str);
5809 err = got_ferror(f, GOT_ERR_IO);
5813 n = fprintf(f, "# Available histedit commands:\n");
5815 err = got_ferror(f, GOT_ERR_IO);
5819 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5820 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5821 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5824 err = got_ferror(f, GOT_ERR_IO);
5833 static const struct got_error *
5834 histedit_syntax_error(int lineno)
5836 static char msg[42];
5839 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5841 if (ret == -1 || ret >= sizeof(msg))
5842 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5844 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5847 static const struct got_error *
5848 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5849 char *logmsg, struct got_repository *repo)
5851 const struct got_error *err;
5852 struct got_commit_object *folded_commit = NULL;
5853 char *id_str, *folded_logmsg = NULL;
5855 err = got_object_id_str(&id_str, hle->commit_id);
5859 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5863 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5866 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5867 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5868 folded_logmsg) == -1) {
5869 err = got_error_from_errno("asprintf");
5873 got_object_commit_close(folded_commit);
5875 free(folded_logmsg);
5879 static struct got_histedit_list_entry *
5880 get_folded_commits(struct got_histedit_list_entry *hle)
5882 struct got_histedit_list_entry *prev, *folded = NULL;
5884 prev = TAILQ_PREV(hle, got_histedit_list, entry);
5885 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5886 prev->cmd->code == GOT_HISTEDIT_DROP)) {
5887 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5889 prev = TAILQ_PREV(prev, got_histedit_list, entry);
5895 static const struct got_error *
5896 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5897 struct got_repository *repo)
5899 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5900 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5901 const struct got_error *err = NULL;
5902 struct got_commit_object *commit = NULL;
5904 struct got_histedit_list_entry *folded = NULL;
5906 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5910 folded = get_folded_commits(hle);
5912 while (folded != hle) {
5913 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5914 folded = TAILQ_NEXT(folded, entry);
5917 err = append_folded_commit_msg(&new_msg, folded,
5923 folded = TAILQ_NEXT(folded, entry);
5927 err = got_object_id_str(&id_str, hle->commit_id);
5930 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5933 if (asprintf(&new_msg,
5934 "%s\n# original log message of commit %s: %s",
5935 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5936 err = got_error_from_errno("asprintf");
5942 err = got_object_id_str(&id_str, hle->commit_id);
5946 err = got_opentemp_named_fd(&logmsg_path, &fd,
5947 GOT_TMPDIR_STR "/got-logmsg");
5951 dprintf(fd, logmsg);
5954 err = get_editor(&editor);
5958 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5960 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5962 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5965 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5966 err = got_error_from_errno2("unlink", logmsg_path);
5972 got_object_commit_close(commit);
5976 static const struct got_error *
5977 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5978 FILE *f, struct got_repository *repo)
5980 const struct got_error *err = NULL;
5981 char *line = NULL, *p, *end;
5985 const struct got_histedit_cmd *cmd;
5986 struct got_object_id *commit_id = NULL;
5987 struct got_histedit_list_entry *hle = NULL;
5990 len = getline(&line, &size, f);
5992 const struct got_error *getline_err;
5995 getline_err = got_error_from_errno("getline");
5996 err = got_ferror(f, getline_err->code);
6001 while (isspace((unsigned char)p[0]))
6003 if (p[0] == '#' || p[0] == '\0') {
6009 for (i = 0; i < nitems(got_histedit_cmds); i++) {
6010 cmd = &got_histedit_cmds[i];
6011 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
6012 isspace((unsigned char)p[strlen(cmd->name)])) {
6013 p += strlen(cmd->name);
6016 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
6021 if (i == nitems(got_histedit_cmds)) {
6022 err = histedit_syntax_error(lineno);
6025 while (isspace((unsigned char)p[0]))
6027 if (cmd->code == GOT_HISTEDIT_MESG) {
6028 if (hle == NULL || hle->logmsg != NULL) {
6029 err = got_error(GOT_ERR_HISTEDIT_CMD);
6033 err = histedit_edit_logmsg(hle, repo);
6037 hle->logmsg = strdup(p);
6038 if (hle->logmsg == NULL) {
6039 err = got_error_from_errno("strdup");
6048 while (end[0] && !isspace((unsigned char)end[0]))
6052 err = got_object_resolve_id_str(&commit_id, repo, p);
6054 /* override error code */
6055 err = histedit_syntax_error(lineno);
6059 hle = malloc(sizeof(*hle));
6061 err = got_error_from_errno("malloc");
6065 hle->commit_id = commit_id;
6070 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
6078 static const struct got_error *
6079 histedit_check_script(struct got_histedit_list *histedit_cmds,
6080 struct got_object_id_queue *commits, struct got_repository *repo)
6082 const struct got_error *err = NULL;
6083 struct got_object_qid *qid;
6084 struct got_histedit_list_entry *hle;
6085 static char msg[92];
6088 if (TAILQ_EMPTY(histedit_cmds))
6089 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
6090 "histedit script contains no commands");
6091 if (SIMPLEQ_EMPTY(commits))
6092 return got_error(GOT_ERR_EMPTY_HISTEDIT);
6094 TAILQ_FOREACH(hle, histedit_cmds, entry) {
6095 struct got_histedit_list_entry *hle2;
6096 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
6099 if (got_object_id_cmp(hle->commit_id,
6100 hle2->commit_id) != 0)
6102 err = got_object_id_str(&id_str, hle->commit_id);
6105 snprintf(msg, sizeof(msg), "commit %s is listed "
6106 "more than once in histedit script", id_str);
6108 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6112 SIMPLEQ_FOREACH(qid, commits, entry) {
6113 TAILQ_FOREACH(hle, histedit_cmds, entry) {
6114 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
6118 err = got_object_id_str(&id_str, qid->id);
6121 snprintf(msg, sizeof(msg),
6122 "commit %s missing from histedit script", id_str);
6124 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
6128 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
6129 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
6130 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
6131 "last commit in histedit script cannot be folded");
6136 static const struct got_error *
6137 histedit_run_editor(struct got_histedit_list *histedit_cmds,
6138 const char *path, struct got_object_id_queue *commits,
6139 struct got_repository *repo)
6141 const struct got_error *err = NULL;
6145 err = get_editor(&editor);
6149 if (spawn_editor(editor, path) == -1) {
6150 err = got_error_from_errno("failed spawning editor");
6154 f = fopen(path, "r");
6156 err = got_error_from_errno("fopen");
6159 err = histedit_parse_list(histedit_cmds, f, repo);
6163 err = histedit_check_script(histedit_cmds, commits, repo);
6165 if (f && fclose(f) != 0 && err == NULL)
6166 err = got_error_from_errno("fclose");
6171 static const struct got_error *
6172 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6173 struct got_object_id_queue *, const char *, const char *,
6174 struct got_repository *);
6176 static const struct got_error *
6177 histedit_edit_script(struct got_histedit_list *histedit_cmds,
6178 struct got_object_id_queue *commits, const char *branch_name,
6179 int edit_logmsg_only, struct got_repository *repo)
6181 const struct got_error *err;
6185 err = got_opentemp_named(&path, &f, "got-histedit");
6189 err = write_cmd_list(f, branch_name, commits);
6193 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
6197 if (edit_logmsg_only) {
6199 err = histedit_parse_list(histedit_cmds, f, repo);
6201 if (fclose(f) != 0) {
6202 err = got_error_from_errno("fclose");
6206 err = histedit_run_editor(histedit_cmds, path, commits, repo);
6208 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6209 err->code != GOT_ERR_HISTEDIT_CMD)
6211 err = histedit_edit_list_retry(histedit_cmds, err,
6212 commits, path, branch_name, repo);
6216 if (f && fclose(f) != 0 && err == NULL)
6217 err = got_error_from_errno("fclose");
6218 if (path && unlink(path) != 0 && err == NULL)
6219 err = got_error_from_errno2("unlink", path);
6224 static const struct got_error *
6225 histedit_save_list(struct got_histedit_list *histedit_cmds,
6226 struct got_worktree *worktree, struct got_repository *repo)
6228 const struct got_error *err = NULL;
6231 struct got_histedit_list_entry *hle;
6232 struct got_commit_object *commit = NULL;
6234 err = got_worktree_get_histedit_script_path(&path, worktree);
6238 f = fopen(path, "w");
6240 err = got_error_from_errno2("fopen", path);
6243 TAILQ_FOREACH(hle, histedit_cmds, entry) {
6244 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6250 int n = fprintf(f, "%c %s\n",
6251 GOT_HISTEDIT_MESG, hle->logmsg);
6253 err = got_ferror(f, GOT_ERR_IO);
6259 if (f && fclose(f) != 0 && err == NULL)
6260 err = got_error_from_errno("fclose");
6263 got_object_commit_close(commit);
6268 histedit_free_list(struct got_histedit_list *histedit_cmds)
6270 struct got_histedit_list_entry *hle;
6272 while ((hle = TAILQ_FIRST(histedit_cmds))) {
6273 TAILQ_REMOVE(histedit_cmds, hle, entry);
6278 static const struct got_error *
6279 histedit_load_list(struct got_histedit_list *histedit_cmds,
6280 const char *path, struct got_repository *repo)
6282 const struct got_error *err = NULL;
6285 f = fopen(path, "r");
6287 err = got_error_from_errno2("fopen", path);
6291 err = histedit_parse_list(histedit_cmds, f, repo);
6293 if (f && fclose(f) != 0 && err == NULL)
6294 err = got_error_from_errno("fclose");
6298 static const struct got_error *
6299 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6300 const struct got_error *edit_err, struct got_object_id_queue *commits,
6301 const char *path, const char *branch_name, struct got_repository *repo)
6303 const struct got_error *err = NULL, *prev_err = edit_err;
6306 while (resp != 'c' && resp != 'r' && resp != 'a') {
6307 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6308 "or (a)bort: ", getprogname(), prev_err->msg);
6313 histedit_free_list(histedit_cmds);
6314 err = histedit_run_editor(histedit_cmds, path, commits,
6317 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6318 err->code != GOT_ERR_HISTEDIT_CMD)
6325 } else if (resp == 'r') {
6326 histedit_free_list(histedit_cmds);
6327 err = histedit_edit_script(histedit_cmds,
6328 commits, branch_name, 0, repo);
6330 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6331 err->code != GOT_ERR_HISTEDIT_CMD)
6338 } else if (resp == 'a') {
6339 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6342 printf("invalid response '%c'\n", resp);
6348 static const struct got_error *
6349 histedit_complete(struct got_worktree *worktree,
6350 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6351 struct got_reference *branch, struct got_repository *repo)
6353 printf("Switching work tree to %s\n",
6354 got_ref_get_symref_target(branch));
6355 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6359 static const struct got_error *
6360 show_histedit_progress(struct got_commit_object *commit,
6361 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6363 const struct got_error *err;
6364 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6366 err = got_object_id_str(&old_id_str, hle->commit_id);
6371 err = got_object_id_str(&new_id_str, new_id);
6376 old_id_str[12] = '\0';
6378 new_id_str[12] = '\0';
6381 logmsg = strdup(hle->logmsg);
6382 if (logmsg == NULL) {
6383 err = got_error_from_errno("strdup");
6386 trim_logmsg(logmsg, 42);
6388 err = get_short_logmsg(&logmsg, 42, commit);
6393 switch (hle->cmd->code) {
6394 case GOT_HISTEDIT_PICK:
6395 case GOT_HISTEDIT_EDIT:
6396 printf("%s -> %s: %s\n", old_id_str,
6397 new_id_str ? new_id_str : "no-op change", logmsg);
6399 case GOT_HISTEDIT_DROP:
6400 case GOT_HISTEDIT_FOLD:
6401 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6413 static const struct got_error *
6414 histedit_commit(struct got_pathlist_head *merged_paths,
6415 struct got_worktree *worktree, struct got_fileindex *fileindex,
6416 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6417 struct got_repository *repo)
6419 const struct got_error *err;
6420 struct got_commit_object *commit;
6421 struct got_object_id *new_commit_id;
6423 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6424 && hle->logmsg == NULL) {
6425 err = histedit_edit_logmsg(hle, repo);
6430 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6434 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6435 worktree, fileindex, tmp_branch, commit, hle->commit_id,
6438 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6440 err = show_histedit_progress(commit, hle, NULL);
6442 err = show_histedit_progress(commit, hle, new_commit_id);
6443 free(new_commit_id);
6446 got_object_commit_close(commit);
6450 static const struct got_error *
6451 histedit_skip_commit(struct got_histedit_list_entry *hle,
6452 struct got_worktree *worktree, struct got_repository *repo)
6454 const struct got_error *error;
6455 struct got_commit_object *commit;
6457 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6462 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6466 error = show_histedit_progress(commit, hle, NULL);
6467 got_object_commit_close(commit);
6471 static const struct got_error *
6472 check_local_changes(void *arg, unsigned char status,
6473 unsigned char staged_status, const char *path,
6474 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6475 struct got_object_id *commit_id, int dirfd, const char *de_name)
6477 int *have_local_changes = arg;
6480 case GOT_STATUS_ADD:
6481 case GOT_STATUS_DELETE:
6482 case GOT_STATUS_MODIFY:
6483 case GOT_STATUS_CONFLICT:
6484 *have_local_changes = 1;
6485 return got_error(GOT_ERR_CANCELLED);
6490 switch (staged_status) {
6491 case GOT_STATUS_ADD:
6492 case GOT_STATUS_DELETE:
6493 case GOT_STATUS_MODIFY:
6494 *have_local_changes = 1;
6495 return got_error(GOT_ERR_CANCELLED);
6503 static const struct got_error *
6504 cmd_histedit(int argc, char *argv[])
6506 const struct got_error *error = NULL;
6507 struct got_worktree *worktree = NULL;
6508 struct got_fileindex *fileindex = NULL;
6509 struct got_repository *repo = NULL;
6511 struct got_reference *branch = NULL;
6512 struct got_reference *tmp_branch = NULL;
6513 struct got_object_id *resume_commit_id = NULL;
6514 struct got_object_id *base_commit_id = NULL;
6515 struct got_object_id *head_commit_id = NULL;
6516 struct got_commit_object *commit = NULL;
6517 int ch, rebase_in_progress = 0, did_something;
6518 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6519 int edit_logmsg_only = 0;
6520 const char *edit_script_path = NULL;
6521 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6522 struct got_object_id_queue commits;
6523 struct got_pathlist_head merged_paths;
6524 const struct got_object_id_queue *parent_ids;
6525 struct got_object_qid *pid;
6526 struct got_histedit_list histedit_cmds;
6527 struct got_histedit_list_entry *hle;
6529 SIMPLEQ_INIT(&commits);
6530 TAILQ_INIT(&histedit_cmds);
6531 TAILQ_INIT(&merged_paths);
6533 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
6542 edit_script_path = optarg;
6545 edit_logmsg_only = 1;
6557 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6558 "unveil", NULL) == -1)
6561 if (abort_edit && continue_edit)
6562 errx(1, "histedit's -a and -c options are mutually exclusive");
6563 if (edit_script_path && edit_logmsg_only)
6564 errx(1, "histedit's -F and -m options are mutually exclusive");
6565 if (abort_edit && edit_logmsg_only)
6566 errx(1, "histedit's -a and -m options are mutually exclusive");
6567 if (continue_edit && edit_logmsg_only)
6568 errx(1, "histedit's -c and -m options are mutually exclusive");
6573 * This command cannot apply unveil(2) in all cases because the
6574 * user may choose to run an editor to edit the histedit script
6575 * and to edit individual commit log messages.
6576 * unveil(2) traverses exec(2); if an editor is used we have to
6577 * apply unveil after edit script and log messages have been written.
6578 * XXX TODO: Make use of unveil(2) where possible.
6581 cwd = getcwd(NULL, 0);
6583 error = got_error_from_errno("getcwd");
6586 error = got_worktree_open(&worktree, cwd);
6590 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6595 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6598 if (rebase_in_progress) {
6599 error = got_error(GOT_ERR_REBASING);
6603 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6607 if (edit_in_progress && edit_logmsg_only) {
6608 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
6609 "histedit operation is in progress in this "
6610 "work tree and must be continued or aborted "
6611 "before the -m option can be used");
6615 if (edit_in_progress && abort_edit) {
6616 error = got_worktree_histedit_continue(&resume_commit_id,
6617 &tmp_branch, &branch, &base_commit_id, &fileindex,
6621 printf("Switching work tree to %s\n",
6622 got_ref_get_symref_target(branch));
6623 error = got_worktree_histedit_abort(worktree, fileindex, repo,
6624 branch, base_commit_id, update_progress, &did_something);
6627 printf("Histedit of %s aborted\n",
6628 got_ref_get_symref_target(branch));
6629 goto done; /* nothing else to do */
6630 } else if (abort_edit) {
6631 error = got_error(GOT_ERR_NOT_HISTEDIT);
6635 if (continue_edit) {
6638 if (!edit_in_progress) {
6639 error = got_error(GOT_ERR_NOT_HISTEDIT);
6643 error = got_worktree_get_histedit_script_path(&path, worktree);
6647 error = histedit_load_list(&histedit_cmds, path, repo);
6652 error = got_worktree_histedit_continue(&resume_commit_id,
6653 &tmp_branch, &branch, &base_commit_id, &fileindex,
6658 error = got_ref_resolve(&head_commit_id, repo, branch);
6662 error = got_object_open_as_commit(&commit, repo,
6666 parent_ids = got_object_commit_get_parent_ids(commit);
6667 pid = SIMPLEQ_FIRST(parent_ids);
6669 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6672 error = collect_commits(&commits, head_commit_id, pid->id,
6673 base_commit_id, got_worktree_get_path_prefix(worktree),
6674 GOT_ERR_HISTEDIT_PATH, repo);
6675 got_object_commit_close(commit);
6680 if (edit_in_progress) {
6681 error = got_error(GOT_ERR_HISTEDIT_BUSY);
6685 error = got_ref_open(&branch, repo,
6686 got_worktree_get_head_ref_name(worktree), 0);
6690 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6691 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6692 "will not edit commit history of a branch outside "
6693 "the \"refs/heads/\" reference namespace");
6697 error = got_ref_resolve(&head_commit_id, repo, branch);
6698 got_ref_close(branch);
6703 error = got_object_open_as_commit(&commit, repo,
6707 parent_ids = got_object_commit_get_parent_ids(commit);
6708 pid = SIMPLEQ_FIRST(parent_ids);
6710 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6713 error = collect_commits(&commits, head_commit_id, pid->id,
6714 got_worktree_get_base_commit_id(worktree),
6715 got_worktree_get_path_prefix(worktree),
6716 GOT_ERR_HISTEDIT_PATH, repo);
6717 got_object_commit_close(commit);
6722 if (SIMPLEQ_EMPTY(&commits)) {
6723 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6727 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6728 &base_commit_id, &fileindex, worktree, repo);
6732 if (edit_script_path) {
6733 error = histedit_load_list(&histedit_cmds,
6734 edit_script_path, repo);
6736 got_worktree_histedit_abort(worktree, fileindex,
6737 repo, branch, base_commit_id,
6738 update_progress, &did_something);
6742 const char *branch_name;
6743 branch_name = got_ref_get_symref_target(branch);
6744 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6746 error = histedit_edit_script(&histedit_cmds, &commits,
6747 branch_name, edit_logmsg_only, repo);
6749 got_worktree_histedit_abort(worktree, fileindex,
6750 repo, branch, base_commit_id,
6751 update_progress, &did_something);
6757 error = histedit_save_list(&histedit_cmds, worktree,
6760 got_worktree_histedit_abort(worktree, fileindex,
6761 repo, branch, base_commit_id,
6762 update_progress, &did_something);
6768 error = histedit_check_script(&histedit_cmds, &commits, repo);
6772 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6773 if (resume_commit_id) {
6774 if (got_object_id_cmp(hle->commit_id,
6775 resume_commit_id) != 0)
6778 resume_commit_id = NULL;
6779 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6780 hle->cmd->code == GOT_HISTEDIT_FOLD) {
6781 error = histedit_skip_commit(hle, worktree,
6786 struct got_pathlist_head paths;
6787 int have_changes = 0;
6790 error = got_pathlist_append(&paths, "", NULL);
6793 error = got_worktree_status(worktree, &paths,
6794 repo, check_local_changes, &have_changes,
6795 check_cancelled, NULL);
6796 got_pathlist_free(&paths);
6798 if (error->code != GOT_ERR_CANCELLED)
6800 if (sigint_received || sigpipe_received)
6804 error = histedit_commit(NULL, worktree,
6805 fileindex, tmp_branch, hle, repo);
6809 error = got_object_open_as_commit(
6810 &commit, repo, hle->commit_id);
6813 error = show_histedit_progress(commit,
6815 got_object_commit_close(commit);
6824 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6825 error = histedit_skip_commit(hle, worktree, repo);
6831 error = got_object_open_as_commit(&commit, repo,
6835 parent_ids = got_object_commit_get_parent_ids(commit);
6836 pid = SIMPLEQ_FIRST(parent_ids);
6838 error = got_worktree_histedit_merge_files(&merged_paths,
6839 worktree, fileindex, pid->id, hle->commit_id, repo,
6840 rebase_progress, &rebase_status, check_cancelled, NULL);
6843 got_object_commit_close(commit);
6846 if (rebase_status == GOT_STATUS_CONFLICT) {
6847 error = show_rebase_merge_conflict(hle->commit_id,
6851 got_worktree_rebase_pathlist_free(&merged_paths);
6855 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6857 error = got_object_id_str(&id_str, hle->commit_id);
6860 printf("Stopping histedit for amending commit %s\n",
6863 got_worktree_rebase_pathlist_free(&merged_paths);
6864 error = got_worktree_histedit_postpone(worktree,
6869 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6870 error = histedit_skip_commit(hle, worktree, repo);
6876 error = histedit_commit(&merged_paths, worktree, fileindex,
6877 tmp_branch, hle, repo);
6878 got_worktree_rebase_pathlist_free(&merged_paths);
6883 if (rebase_status == GOT_STATUS_CONFLICT) {
6884 error = got_worktree_histedit_postpone(worktree, fileindex);
6887 error = got_error_msg(GOT_ERR_CONFLICTS,
6888 "conflicts must be resolved before histedit can continue");
6890 error = histedit_complete(worktree, fileindex, tmp_branch,
6893 got_object_id_queue_free(&commits);
6894 histedit_free_list(&histedit_cmds);
6895 free(head_commit_id);
6896 free(base_commit_id);
6897 free(resume_commit_id);
6899 got_object_commit_close(commit);
6901 got_ref_close(branch);
6903 got_ref_close(tmp_branch);
6905 got_worktree_close(worktree);
6907 got_repo_close(repo);
6912 usage_integrate(void)
6914 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6918 static const struct got_error *
6919 cmd_integrate(int argc, char *argv[])
6921 const struct got_error *error = NULL;
6922 struct got_repository *repo = NULL;
6923 struct got_worktree *worktree = NULL;
6924 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6925 const char *branch_arg = NULL;
6926 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6927 struct got_fileindex *fileindex = NULL;
6928 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6929 int ch, did_something = 0;
6931 while ((ch = getopt(argc, argv, "")) != -1) {
6944 branch_arg = argv[0];
6946 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6947 "unveil", NULL) == -1)
6950 cwd = getcwd(NULL, 0);
6952 error = got_error_from_errno("getcwd");
6956 error = got_worktree_open(&worktree, cwd);
6960 error = check_rebase_or_histedit_in_progress(worktree);
6964 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6969 error = apply_unveil(got_repo_get_path(repo), 0,
6970 got_worktree_get_root_path(worktree));
6974 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6975 error = got_error_from_errno("asprintf");
6979 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6980 &base_branch_ref, worktree, refname, repo);
6984 refname = strdup(got_ref_get_name(branch_ref));
6985 if (refname == NULL) {
6986 error = got_error_from_errno("strdup");
6987 got_worktree_integrate_abort(worktree, fileindex, repo,
6988 branch_ref, base_branch_ref);
6991 base_refname = strdup(got_ref_get_name(base_branch_ref));
6992 if (base_refname == NULL) {
6993 error = got_error_from_errno("strdup");
6994 got_worktree_integrate_abort(worktree, fileindex, repo,
6995 branch_ref, base_branch_ref);
6999 error = got_ref_resolve(&commit_id, repo, branch_ref);
7003 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
7007 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
7008 error = got_error_msg(GOT_ERR_SAME_BRANCH,
7009 "specified branch has already been integrated");
7010 got_worktree_integrate_abort(worktree, fileindex, repo,
7011 branch_ref, base_branch_ref);
7015 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
7017 if (error->code == GOT_ERR_ANCESTRY)
7018 error = got_error(GOT_ERR_REBASE_REQUIRED);
7019 got_worktree_integrate_abort(worktree, fileindex, repo,
7020 branch_ref, base_branch_ref);
7024 error = got_worktree_integrate_continue(worktree, fileindex, repo,
7025 branch_ref, base_branch_ref, update_progress, &did_something,
7026 check_cancelled, NULL);
7030 printf("Integrated %s into %s\n", refname, base_refname);
7033 got_repo_close(repo);
7035 got_worktree_close(worktree);
7037 free(base_commit_id);
7047 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
7048 "[file-path ...]\n",
7053 static const struct got_error *
7054 print_stage(void *arg, unsigned char status, unsigned char staged_status,
7055 const char *path, struct got_object_id *blob_id,
7056 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
7057 int dirfd, const char *de_name)
7059 const struct got_error *err = NULL;
7060 char *id_str = NULL;
7062 if (staged_status != GOT_STATUS_ADD &&
7063 staged_status != GOT_STATUS_MODIFY &&
7064 staged_status != GOT_STATUS_DELETE)
7067 if (staged_status == GOT_STATUS_ADD ||
7068 staged_status == GOT_STATUS_MODIFY)
7069 err = got_object_id_str(&id_str, staged_blob_id);
7071 err = got_object_id_str(&id_str, blob_id);
7075 printf("%s %c %s\n", id_str, staged_status, path);
7080 static const struct got_error *
7081 cmd_stage(int argc, char *argv[])
7083 const struct got_error *error = NULL;
7084 struct got_repository *repo = NULL;
7085 struct got_worktree *worktree = NULL;
7087 struct got_pathlist_head paths;
7088 struct got_pathlist_entry *pe;
7089 int ch, list_stage = 0, pflag = 0;
7090 FILE *patch_script_file = NULL;
7091 const char *patch_script_path = NULL;
7092 struct choose_patch_arg cpa;
7096 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
7105 patch_script_path = optarg;
7117 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7118 "unveil", NULL) == -1)
7121 if (list_stage && (pflag || patch_script_path))
7122 errx(1, "-l option cannot be used with other options");
7123 if (patch_script_path && !pflag)
7124 errx(1, "-F option can only be used together with -p option");
7126 cwd = getcwd(NULL, 0);
7128 error = got_error_from_errno("getcwd");
7132 error = got_worktree_open(&worktree, cwd);
7136 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7141 if (patch_script_path) {
7142 patch_script_file = fopen(patch_script_path, "r");
7143 if (patch_script_file == NULL) {
7144 error = got_error_from_errno2("fopen",
7149 error = apply_unveil(got_repo_get_path(repo), 0,
7150 got_worktree_get_root_path(worktree));
7154 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7159 error = got_worktree_status(worktree, &paths, repo,
7160 print_stage, NULL, check_cancelled, NULL);
7162 cpa.patch_script_file = patch_script_file;
7163 cpa.action = "stage";
7164 error = got_worktree_stage(worktree, &paths,
7165 pflag ? NULL : print_status, NULL,
7166 pflag ? choose_patch : NULL, &cpa, repo);
7169 if (patch_script_file && fclose(patch_script_file) == EOF &&
7171 error = got_error_from_errno2("fclose", patch_script_path);
7173 got_repo_close(repo);
7175 got_worktree_close(worktree);
7176 TAILQ_FOREACH(pe, &paths, entry)
7177 free((char *)pe->path);
7178 got_pathlist_free(&paths);
7186 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7187 "[file-path ...]\n",
7193 static const struct got_error *
7194 cmd_unstage(int argc, char *argv[])
7196 const struct got_error *error = NULL;
7197 struct got_repository *repo = NULL;
7198 struct got_worktree *worktree = NULL;
7200 struct got_pathlist_head paths;
7201 struct got_pathlist_entry *pe;
7202 int ch, did_something = 0, pflag = 0;
7203 FILE *patch_script_file = NULL;
7204 const char *patch_script_path = NULL;
7205 struct choose_patch_arg cpa;
7209 while ((ch = getopt(argc, argv, "pF:")) != -1) {
7215 patch_script_path = optarg;
7227 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7228 "unveil", NULL) == -1)
7231 if (patch_script_path && !pflag)
7232 errx(1, "-F option can only be used together with -p option");
7234 cwd = getcwd(NULL, 0);
7236 error = got_error_from_errno("getcwd");
7240 error = got_worktree_open(&worktree, cwd);
7244 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7249 if (patch_script_path) {
7250 patch_script_file = fopen(patch_script_path, "r");
7251 if (patch_script_file == NULL) {
7252 error = got_error_from_errno2("fopen",
7258 error = apply_unveil(got_repo_get_path(repo), 0,
7259 got_worktree_get_root_path(worktree));
7263 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7267 cpa.patch_script_file = patch_script_file;
7268 cpa.action = "unstage";
7269 error = got_worktree_unstage(worktree, &paths, update_progress,
7270 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7272 if (patch_script_file && fclose(patch_script_file) == EOF &&
7274 error = got_error_from_errno2("fclose", patch_script_path);
7276 got_repo_close(repo);
7278 got_worktree_close(worktree);
7279 TAILQ_FOREACH(pe, &paths, entry)
7280 free((char *)pe->path);
7281 got_pathlist_free(&paths);
7289 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7290 "arg1 [arg2 ...]\n", getprogname());
7294 static const struct got_error *
7295 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7297 const struct got_error *err;
7298 struct got_blob_object *blob;
7300 err = got_object_open_as_blob(&blob, repo, id, 8192);
7304 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7305 got_object_blob_close(blob);
7309 static const struct got_error *
7310 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7312 const struct got_error *err;
7313 struct got_tree_object *tree;
7316 err = got_object_open_as_tree(&tree, repo, id);
7320 nentries = got_object_tree_get_nentries(tree);
7321 for (i = 0; i < nentries; i++) {
7322 struct got_tree_entry *te;
7324 if (sigint_received || sigpipe_received)
7326 te = got_object_tree_get_entry(tree, i);
7327 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7330 fprintf(outfile, "%s %.7o %s\n", id_str,
7331 got_tree_entry_get_mode(te),
7332 got_tree_entry_get_name(te));
7336 got_object_tree_close(tree);
7340 static const struct got_error *
7341 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7343 const struct got_error *err;
7344 struct got_commit_object *commit;
7345 const struct got_object_id_queue *parent_ids;
7346 struct got_object_qid *pid;
7347 char *id_str = NULL;
7348 const char *logmsg = NULL;
7350 err = got_object_open_as_commit(&commit, repo, id);
7354 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7358 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7359 parent_ids = got_object_commit_get_parent_ids(commit);
7360 fprintf(outfile, "numparents %d\n",
7361 got_object_commit_get_nparents(commit));
7362 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7364 err = got_object_id_str(&pid_str, pid->id);
7367 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7370 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7371 got_object_commit_get_author(commit),
7372 got_object_commit_get_author_time(commit));
7374 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7375 got_object_commit_get_author(commit),
7376 got_object_commit_get_committer_time(commit));
7378 logmsg = got_object_commit_get_logmsg_raw(commit);
7379 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7380 fprintf(outfile, "%s", logmsg);
7383 got_object_commit_close(commit);
7387 static const struct got_error *
7388 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7390 const struct got_error *err;
7391 struct got_tag_object *tag;
7392 char *id_str = NULL;
7393 const char *tagmsg = NULL;
7395 err = got_object_open_as_tag(&tag, repo, id);
7399 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7403 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7405 switch (got_object_tag_get_object_type(tag)) {
7406 case GOT_OBJ_TYPE_BLOB:
7407 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7408 GOT_OBJ_LABEL_BLOB);
7410 case GOT_OBJ_TYPE_TREE:
7411 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7412 GOT_OBJ_LABEL_TREE);
7414 case GOT_OBJ_TYPE_COMMIT:
7415 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7416 GOT_OBJ_LABEL_COMMIT);
7418 case GOT_OBJ_TYPE_TAG:
7419 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7426 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7427 got_object_tag_get_name(tag));
7429 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7430 got_object_tag_get_tagger(tag),
7431 got_object_tag_get_tagger_time(tag));
7433 tagmsg = got_object_tag_get_message(tag);
7434 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7435 fprintf(outfile, "%s", tagmsg);
7438 got_object_tag_close(tag);
7442 static const struct got_error *
7443 cmd_cat(int argc, char *argv[])
7445 const struct got_error *error;
7446 struct got_repository *repo = NULL;
7447 struct got_worktree *worktree = NULL;
7448 char *cwd = NULL, *repo_path = NULL, *label = NULL;
7449 const char *commit_id_str = NULL;
7450 struct got_object_id *id = NULL, *commit_id = NULL;
7451 int ch, obj_type, i, force_path = 0;
7454 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7459 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7462 commit_id_str = optarg;
7465 repo_path = realpath(optarg, NULL);
7466 if (repo_path == NULL)
7467 return got_error_from_errno2("realpath",
7469 got_path_strip_trailing_slashes(repo_path);
7483 cwd = getcwd(NULL, 0);
7485 error = got_error_from_errno("getcwd");
7488 error = got_worktree_open(&worktree, cwd);
7489 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7492 if (repo_path == NULL) {
7494 got_worktree_get_repo_path(worktree));
7495 if (repo_path == NULL) {
7496 error = got_error_from_errno("strdup");
7502 if (repo_path == NULL) {
7503 repo_path = getcwd(NULL, 0);
7504 if (repo_path == NULL)
7505 return got_error_from_errno("getcwd");
7508 error = got_repo_open(&repo, repo_path, NULL);
7513 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7517 if (commit_id_str == NULL)
7518 commit_id_str = GOT_REF_HEAD;
7519 error = got_repo_match_object_id(&commit_id, NULL,
7520 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7524 for (i = 0; i < argc; i++) {
7526 error = got_object_id_by_path(&id, repo, commit_id,
7531 error = got_repo_match_object_id(&id, &label, argv[i],
7532 GOT_OBJ_TYPE_ANY, 0, repo);
7534 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7535 error->code != GOT_ERR_NOT_REF)
7537 error = got_object_id_by_path(&id, repo,
7538 commit_id, argv[i]);
7544 error = got_object_get_type(&obj_type, repo, id);
7549 case GOT_OBJ_TYPE_BLOB:
7550 error = cat_blob(id, repo, stdout);
7552 case GOT_OBJ_TYPE_TREE:
7553 error = cat_tree(id, repo, stdout);
7555 case GOT_OBJ_TYPE_COMMIT:
7556 error = cat_commit(id, repo, stdout);
7558 case GOT_OBJ_TYPE_TAG:
7559 error = cat_tag(id, repo, stdout);
7562 error = got_error(GOT_ERR_OBJ_TYPE);
7577 got_worktree_close(worktree);
7579 const struct got_error *repo_error;
7580 repo_error = got_repo_close(repo);