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("/tmp", "rwc") != 0)
301 return got_error_from_errno2("unveil", "/tmp");
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, "/tmp/got-importmsg");
489 dprintf(fd, initial_content);
492 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
494 free(initial_content);
498 static const struct got_error *
499 import_progress(void *arg, const char *path)
501 printf("A %s\n", path);
505 static const struct got_error *
506 get_author(char **author, struct got_repository *repo)
508 const struct got_error *err = NULL;
509 const char *got_author, *name, *email;
513 name = got_repo_get_gitconfig_author_name(repo);
514 email = got_repo_get_gitconfig_author_email(repo);
516 if (asprintf(author, "%s <%s>", name, email) == -1)
517 return got_error_from_errno("asprintf");
521 got_author = getenv("GOT_AUTHOR");
522 if (got_author == NULL) {
523 name = got_repo_get_global_gitconfig_author_name(repo);
524 email = got_repo_get_global_gitconfig_author_email(repo);
526 if (asprintf(author, "%s <%s>", name, email) == -1)
527 return got_error_from_errno("asprintf");
530 /* TODO: Look up user in password database? */
531 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
534 *author = strdup(got_author);
536 return got_error_from_errno("strdup");
539 * Really dumb email address check; we're only doing this to
540 * avoid git's object parser breaking on commits we create.
542 while (*got_author && *got_author != '<')
544 if (*got_author != '<') {
545 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
548 while (*got_author && *got_author != '@')
550 if (*got_author != '@') {
551 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
554 while (*got_author && *got_author != '>')
556 if (*got_author != '>')
557 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
566 static const struct got_error *
567 get_gitconfig_path(char **gitconfig_path)
569 const char *homedir = getenv("HOME");
571 *gitconfig_path = NULL;
573 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
574 return got_error_from_errno("asprintf");
580 static const struct got_error *
581 cmd_import(int argc, char *argv[])
583 const struct got_error *error = NULL;
584 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
585 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
586 const char *branch_name = "main";
587 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
588 struct got_repository *repo = NULL;
589 struct got_reference *branch_ref = NULL, *head_ref = NULL;
590 struct got_object_id *new_commit_id = NULL;
592 struct got_pathlist_head ignores;
593 struct got_pathlist_entry *pe;
594 int preserve_logmsg = 0;
596 TAILQ_INIT(&ignores);
598 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
601 branch_name = optarg;
604 logmsg = strdup(optarg);
605 if (logmsg == NULL) {
606 error = got_error_from_errno("strdup");
611 repo_path = realpath(optarg, NULL);
612 if (repo_path == NULL) {
613 error = got_error_from_errno2("realpath",
619 if (optarg[0] == '\0')
621 error = got_pathlist_insert(&pe, &ignores, optarg,
636 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
644 if (repo_path == NULL) {
645 repo_path = getcwd(NULL, 0);
646 if (repo_path == NULL)
647 return got_error_from_errno("getcwd");
649 got_path_strip_trailing_slashes(repo_path);
650 error = get_gitconfig_path(&gitconfig_path);
653 error = got_repo_open(&repo, repo_path, gitconfig_path);
657 error = get_author(&author, repo);
662 * Don't let the user create a branch name with a leading '-'.
663 * While technically a valid reference name, this case is usually
664 * an unintended typo.
666 if (branch_name[0] == '-')
667 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
669 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
670 error = got_error_from_errno("asprintf");
674 error = got_ref_open(&branch_ref, repo, refname, 0);
676 if (error->code != GOT_ERR_NOT_REF)
679 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
680 "import target branch already exists");
684 path_dir = realpath(argv[0], NULL);
685 if (path_dir == NULL) {
686 error = got_error_from_errno2("realpath", argv[0]);
689 got_path_strip_trailing_slashes(path_dir);
692 * unveil(2) traverses exec(2); if an editor is used we have
693 * to apply unveil after the log message has been written.
695 if (logmsg == NULL || strlen(logmsg) == 0) {
696 error = get_editor(&editor);
700 error = collect_import_msg(&logmsg, &logmsg_path, editor,
703 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
710 if (unveil(path_dir, "r") != 0) {
711 error = got_error_from_errno2("unveil", path_dir);
717 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
724 error = got_repo_import(&new_commit_id, path_dir, logmsg,
725 author, &ignores, repo, import_progress, NULL);
732 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
739 error = got_ref_write(branch_ref, repo);
746 error = got_object_id_str(&id_str, new_commit_id);
753 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
755 if (error->code != GOT_ERR_NOT_REF) {
761 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
769 error = got_ref_write(head_ref, repo);
777 printf("Created branch %s with commit %s\n",
778 got_ref_get_name(branch_ref), id_str);
780 if (preserve_logmsg) {
781 fprintf(stderr, "%s: log message preserved in %s\n",
782 getprogname(), logmsg_path);
783 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
784 error = got_error_from_errno2("unlink", logmsg_path);
793 free(gitconfig_path);
795 got_ref_close(branch_ref);
797 got_ref_close(head_ref);
804 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
805 "[-p prefix] repository-path [worktree-path]\n", getprogname());
810 show_worktree_base_ref_warning(void)
812 fprintf(stderr, "%s: warning: could not create a reference "
813 "to the work tree's base commit; the commit could be "
814 "garbage-collected by Git; making the repository "
815 "writable and running 'got update' will prevent this\n",
819 struct got_checkout_progress_arg {
820 const char *worktree_path;
821 int had_base_commit_ref_error;
824 static const struct got_error *
825 checkout_progress(void *arg, unsigned char status, const char *path)
827 struct got_checkout_progress_arg *a = arg;
829 /* Base commit bump happens silently. */
830 if (status == GOT_STATUS_BUMP_BASE)
833 if (status == GOT_STATUS_BASE_REF_ERR) {
834 a->had_base_commit_ref_error = 1;
838 while (path[0] == '/')
841 printf("%c %s/%s\n", status, a->worktree_path, path);
845 static const struct got_error *
846 check_cancelled(void *arg)
848 if (sigint_received || sigpipe_received)
849 return got_error(GOT_ERR_CANCELLED);
853 static const struct got_error *
854 check_linear_ancestry(struct got_object_id *commit_id,
855 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
856 struct got_repository *repo)
858 const struct got_error *err = NULL;
859 struct got_object_id *yca_id;
861 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
862 commit_id, base_commit_id, repo, check_cancelled, NULL);
867 return got_error(GOT_ERR_ANCESTRY);
870 * Require a straight line of history between the target commit
871 * and the work tree's base commit.
873 * Non-linear situations such as this require a rebase:
875 * (commit) D F (base_commit)
883 * 'got update' only handles linear cases:
884 * Update forwards in time: A (base/yca) - B - C - D (commit)
885 * Update backwards in time: D (base) - C - B - A (commit/yca)
887 if (allow_forwards_in_time_only) {
888 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
889 return got_error(GOT_ERR_ANCESTRY);
890 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
891 got_object_id_cmp(base_commit_id, yca_id) != 0)
892 return got_error(GOT_ERR_ANCESTRY);
898 static const struct got_error *
899 check_same_branch(struct got_object_id *commit_id,
900 struct got_reference *head_ref, struct got_object_id *yca_id,
901 struct got_repository *repo)
903 const struct got_error *err = NULL;
904 struct got_commit_graph *graph = NULL;
905 struct got_object_id *head_commit_id = NULL;
906 int is_same_branch = 0;
908 err = got_ref_resolve(&head_commit_id, repo, head_ref);
912 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
916 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
921 err = got_commit_graph_open(&graph, "/", 1);
925 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
926 check_cancelled, NULL);
931 struct got_object_id *id;
932 err = got_commit_graph_iter_next(&id, graph, repo,
933 check_cancelled, NULL);
935 if (err->code == GOT_ERR_ITER_COMPLETED)
941 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
943 if (got_object_id_cmp(id, commit_id) == 0) {
951 got_commit_graph_close(graph);
952 free(head_commit_id);
953 if (!err && !is_same_branch)
954 err = got_error(GOT_ERR_ANCESTRY);
958 static const struct got_error *
959 cmd_checkout(int argc, char *argv[])
961 const struct got_error *error = NULL;
962 struct got_repository *repo = NULL;
963 struct got_reference *head_ref = NULL;
964 struct got_worktree *worktree = NULL;
965 char *repo_path = NULL;
966 char *worktree_path = NULL;
967 const char *path_prefix = "";
968 const char *branch_name = GOT_REF_HEAD;
969 char *commit_id_str = NULL;
970 int ch, same_path_prefix, allow_nonempty = 0;
971 struct got_pathlist_head paths;
972 struct got_checkout_progress_arg cpa;
976 while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
979 branch_name = optarg;
982 commit_id_str = strdup(optarg);
983 if (commit_id_str == NULL)
984 return got_error_from_errno("strdup");
990 path_prefix = optarg;
1002 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1003 "unveil", NULL) == -1)
1007 char *cwd, *base, *dotgit;
1008 repo_path = realpath(argv[0], NULL);
1009 if (repo_path == NULL)
1010 return got_error_from_errno2("realpath", argv[0]);
1011 cwd = getcwd(NULL, 0);
1013 error = got_error_from_errno("getcwd");
1016 if (path_prefix[0]) {
1017 base = basename(path_prefix);
1019 error = got_error_from_errno2("basename",
1024 base = basename(repo_path);
1026 error = got_error_from_errno2("basename",
1031 dotgit = strstr(base, ".git");
1034 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
1035 error = got_error_from_errno("asprintf");
1040 } else if (argc == 2) {
1041 repo_path = realpath(argv[0], NULL);
1042 if (repo_path == NULL) {
1043 error = got_error_from_errno2("realpath", argv[0]);
1046 worktree_path = realpath(argv[1], NULL);
1047 if (worktree_path == NULL) {
1048 if (errno != ENOENT) {
1049 error = got_error_from_errno2("realpath",
1053 worktree_path = strdup(argv[1]);
1054 if (worktree_path == NULL) {
1055 error = got_error_from_errno("strdup");
1062 got_path_strip_trailing_slashes(repo_path);
1063 got_path_strip_trailing_slashes(worktree_path);
1065 error = got_repo_open(&repo, repo_path, NULL);
1069 /* Pre-create work tree path for unveil(2) */
1070 error = got_path_mkdir(worktree_path);
1072 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1073 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1075 if (!allow_nonempty &&
1076 !got_path_dir_is_empty(worktree_path)) {
1077 error = got_error_path(worktree_path,
1078 GOT_ERR_DIR_NOT_EMPTY);
1083 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1087 error = got_ref_open(&head_ref, repo, branch_name, 0);
1091 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1092 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1095 error = got_worktree_open(&worktree, worktree_path);
1099 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1103 if (!same_path_prefix) {
1104 error = got_error(GOT_ERR_PATH_PREFIX);
1108 if (commit_id_str) {
1109 struct got_object_id *commit_id;
1110 error = got_repo_match_object_id(&commit_id, NULL,
1111 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1114 error = check_linear_ancestry(commit_id,
1115 got_worktree_get_base_commit_id(worktree), 0, repo);
1116 if (error != NULL) {
1120 error = check_same_branch(commit_id, head_ref, NULL, repo);
1123 error = got_worktree_set_base_commit_id(worktree, repo,
1130 error = got_pathlist_append(&paths, "", NULL);
1133 cpa.worktree_path = worktree_path;
1134 cpa.had_base_commit_ref_error = 0;
1135 error = got_worktree_checkout_files(worktree, &paths, repo,
1136 checkout_progress, &cpa, check_cancelled, NULL);
1140 printf("Now shut up and hack\n");
1141 if (cpa.had_base_commit_ref_error)
1142 show_worktree_base_ref_warning();
1144 got_pathlist_free(&paths);
1145 free(commit_id_str);
1147 free(worktree_path);
1154 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1159 static const struct got_error *
1160 update_progress(void *arg, unsigned char status, const char *path)
1162 int *did_something = arg;
1164 if (status == GOT_STATUS_EXISTS ||
1165 status == GOT_STATUS_BASE_REF_ERR)
1170 /* Base commit bump happens silently. */
1171 if (status == GOT_STATUS_BUMP_BASE)
1174 while (path[0] == '/')
1176 printf("%c %s\n", status, path);
1180 static const struct got_error *
1181 switch_head_ref(struct got_reference *head_ref,
1182 struct got_object_id *commit_id, struct got_worktree *worktree,
1183 struct got_repository *repo)
1185 const struct got_error *err = NULL;
1187 int ref_has_moved = 0;
1189 /* Trivial case: switching between two different references. */
1190 if (strcmp(got_ref_get_name(head_ref),
1191 got_worktree_get_head_ref_name(worktree)) != 0) {
1192 printf("Switching work tree from %s to %s\n",
1193 got_worktree_get_head_ref_name(worktree),
1194 got_ref_get_name(head_ref));
1195 return got_worktree_set_head_ref(worktree, head_ref);
1198 err = check_linear_ancestry(commit_id,
1199 got_worktree_get_base_commit_id(worktree), 0, repo);
1201 if (err->code != GOT_ERR_ANCESTRY)
1208 /* Switching to a rebased branch with the same reference name. */
1209 err = got_object_id_str(&base_id_str,
1210 got_worktree_get_base_commit_id(worktree));
1213 printf("Reference %s now points at a different branch\n",
1214 got_worktree_get_head_ref_name(worktree));
1215 printf("Switching work tree from %s to %s\n", base_id_str,
1216 got_worktree_get_head_ref_name(worktree));
1220 static const struct got_error *
1221 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1223 const struct got_error *err;
1226 err = got_worktree_rebase_in_progress(&in_progress, worktree);
1230 return got_error(GOT_ERR_REBASING);
1232 err = got_worktree_histedit_in_progress(&in_progress, worktree);
1236 return got_error(GOT_ERR_HISTEDIT_BUSY);
1241 static const struct got_error *
1242 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1243 char *argv[], struct got_worktree *worktree)
1245 const struct got_error *err = NULL;
1252 return got_error_from_errno("strdup");
1253 return got_pathlist_append(paths, path, NULL);
1256 for (i = 0; i < argc; i++) {
1257 err = got_worktree_resolve_path(&path, worktree, argv[i]);
1260 err = got_pathlist_append(paths, path, NULL);
1270 static const struct got_error *
1271 cmd_update(int argc, char *argv[])
1273 const struct got_error *error = NULL;
1274 struct got_repository *repo = NULL;
1275 struct got_worktree *worktree = NULL;
1276 char *worktree_path = NULL;
1277 struct got_object_id *commit_id = NULL;
1278 char *commit_id_str = NULL;
1279 const char *branch_name = NULL;
1280 struct got_reference *head_ref = NULL;
1281 struct got_pathlist_head paths;
1282 struct got_pathlist_entry *pe;
1283 int ch, did_something = 0;
1287 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1290 branch_name = optarg;
1293 commit_id_str = strdup(optarg);
1294 if (commit_id_str == NULL)
1295 return got_error_from_errno("strdup");
1307 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1308 "unveil", NULL) == -1)
1311 worktree_path = getcwd(NULL, 0);
1312 if (worktree_path == NULL) {
1313 error = got_error_from_errno("getcwd");
1316 error = got_worktree_open(&worktree, worktree_path);
1320 error = check_rebase_or_histedit_in_progress(worktree);
1324 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1329 error = apply_unveil(got_repo_get_path(repo), 0,
1330 got_worktree_get_root_path(worktree));
1334 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1338 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1339 got_worktree_get_head_ref_name(worktree), 0);
1342 if (commit_id_str == NULL) {
1343 error = got_ref_resolve(&commit_id, repo, head_ref);
1346 error = got_object_id_str(&commit_id_str, commit_id);
1350 error = got_repo_match_object_id(&commit_id, NULL,
1351 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
1352 free(commit_id_str);
1353 commit_id_str = NULL;
1356 error = got_object_id_str(&commit_id_str, commit_id);
1362 struct got_object_id *head_commit_id;
1363 TAILQ_FOREACH(pe, &paths, entry) {
1364 if (pe->path_len == 0)
1366 error = got_error_msg(GOT_ERR_BAD_PATH,
1367 "switching between branches requires that "
1368 "the entire work tree gets updated");
1371 error = got_ref_resolve(&head_commit_id, repo, head_ref);
1374 error = check_linear_ancestry(commit_id, head_commit_id, 0,
1376 free(head_commit_id);
1379 error = check_same_branch(commit_id, head_ref, NULL, repo);
1382 error = switch_head_ref(head_ref, commit_id, worktree, repo);
1386 error = check_linear_ancestry(commit_id,
1387 got_worktree_get_base_commit_id(worktree), 0, repo);
1388 if (error != NULL) {
1389 if (error->code == GOT_ERR_ANCESTRY)
1390 error = got_error(GOT_ERR_BRANCH_MOVED);
1393 error = check_same_branch(commit_id, head_ref, NULL, repo);
1398 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1400 error = got_worktree_set_base_commit_id(worktree, repo,
1406 error = got_worktree_checkout_files(worktree, &paths, repo,
1407 update_progress, &did_something, check_cancelled, NULL);
1412 printf("Updated to commit %s\n", commit_id_str);
1414 printf("Already up-to-date\n");
1416 free(worktree_path);
1417 TAILQ_FOREACH(pe, &paths, entry)
1418 free((char *)pe->path);
1419 got_pathlist_free(&paths);
1421 free(commit_id_str);
1425 static const struct got_error *
1426 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1427 const char *path, int diff_context, int ignore_whitespace,
1428 struct got_repository *repo)
1430 const struct got_error *err = NULL;
1431 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1434 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1439 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1443 while (path[0] == '/')
1445 err = got_diff_blob(blob1, blob2, path, path, diff_context,
1446 ignore_whitespace, stdout);
1449 got_object_blob_close(blob1);
1450 got_object_blob_close(blob2);
1454 static const struct got_error *
1455 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1456 const char *path, int diff_context, int ignore_whitespace,
1457 struct got_repository *repo)
1459 const struct got_error *err = NULL;
1460 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1461 struct got_diff_blob_output_unidiff_arg arg;
1464 err = got_object_open_as_tree(&tree1, repo, tree_id1);
1469 err = got_object_open_as_tree(&tree2, repo, tree_id2);
1473 arg.diff_context = diff_context;
1474 arg.ignore_whitespace = ignore_whitespace;
1475 arg.outfile = stdout;
1476 while (path[0] == '/')
1478 err = got_diff_tree(tree1, tree2, path, path, repo,
1479 got_diff_blob_output_unidiff, &arg, 1);
1482 got_object_tree_close(tree1);
1484 got_object_tree_close(tree2);
1488 static const struct got_error *
1489 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1490 const char *path, int diff_context, struct got_repository *repo)
1492 const struct got_error *err = NULL;
1493 struct got_commit_object *pcommit = NULL;
1494 char *id_str1 = NULL, *id_str2 = NULL;
1495 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1496 struct got_object_qid *qid;
1498 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1500 err = got_object_open_as_commit(&pcommit, repo,
1506 if (path && path[0] != '\0') {
1508 err = got_object_id_by_path(&obj_id2, repo, id, path);
1511 err = got_object_id_str(&id_str2, obj_id2);
1517 err = got_object_id_by_path(&obj_id1, repo,
1523 err = got_object_id_str(&id_str1, obj_id1);
1529 err = got_object_get_type(&obj_type, repo, obj_id2);
1534 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1536 case GOT_OBJ_TYPE_BLOB:
1537 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1540 case GOT_OBJ_TYPE_TREE:
1541 err = diff_trees(obj_id1, obj_id2, path, diff_context,
1545 err = got_error(GOT_ERR_OBJ_TYPE);
1551 obj_id2 = got_object_commit_get_tree_id(commit);
1552 err = got_object_id_str(&id_str2, obj_id2);
1555 obj_id1 = got_object_commit_get_tree_id(pcommit);
1556 err = got_object_id_str(&id_str1, obj_id1);
1559 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1560 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
1566 got_object_commit_close(pcommit);
1571 get_datestr(time_t *time, char *datebuf)
1573 struct tm mytm, *tm;
1576 tm = gmtime_r(time, &mytm);
1579 s = asctime_r(tm, datebuf);
1582 p = strchr(s, '\n');
1588 static const struct got_error *
1589 match_logmsg(int *have_match, struct got_object_id *id,
1590 struct got_commit_object *commit, regex_t *regex)
1592 const struct got_error *err = NULL;
1593 regmatch_t regmatch;
1594 char *id_str = NULL, *logmsg = NULL;
1598 err = got_object_id_str(&id_str, id);
1602 err = got_object_commit_get_logmsg(&logmsg, commit);
1606 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
1614 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1616 static const struct got_error *
1617 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1618 struct got_repository *repo, const char *path, int show_patch,
1619 int diff_context, struct got_reflist_head *refs)
1621 const struct got_error *err = NULL;
1622 char *id_str, *datestr, *logmsg0, *logmsg, *line;
1624 time_t committer_time;
1625 const char *author, *committer;
1626 char *refs_str = NULL;
1627 struct got_reflist_entry *re;
1629 SIMPLEQ_FOREACH(re, refs, entry) {
1632 struct got_tag_object *tag = NULL;
1635 name = got_ref_get_name(re->ref);
1636 if (strcmp(name, GOT_REF_HEAD) == 0)
1638 if (strncmp(name, "refs/", 5) == 0)
1640 if (strncmp(name, "got/", 4) == 0)
1642 if (strncmp(name, "heads/", 6) == 0)
1644 if (strncmp(name, "remotes/", 8) == 0)
1646 if (strncmp(name, "tags/", 5) == 0) {
1647 err = got_object_open_as_tag(&tag, repo, re->id);
1649 if (err->code != GOT_ERR_OBJ_TYPE)
1651 /* Ref points at something other than a tag. */
1656 cmp = got_object_id_cmp(tag ?
1657 got_object_tag_get_object_id(tag) : re->id, id);
1659 got_object_tag_close(tag);
1663 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1665 err = got_error_from_errno("asprintf");
1671 err = got_object_id_str(&id_str, id);
1675 printf(GOT_COMMIT_SEP_STR);
1676 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1677 refs_str ? refs_str : "", refs_str ? ")" : "");
1682 printf("from: %s\n", got_object_commit_get_author(commit));
1683 committer_time = got_object_commit_get_committer_time(commit);
1684 datestr = get_datestr(&committer_time, datebuf);
1686 printf("date: %s UTC\n", datestr);
1687 author = got_object_commit_get_author(commit);
1688 committer = got_object_commit_get_committer(commit);
1689 if (strcmp(author, committer) != 0)
1690 printf("via: %s\n", committer);
1691 if (got_object_commit_get_nparents(commit) > 1) {
1692 const struct got_object_id_queue *parent_ids;
1693 struct got_object_qid *qid;
1695 parent_ids = got_object_commit_get_parent_ids(commit);
1696 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1697 err = got_object_id_str(&id_str, qid->id);
1700 printf("parent %d: %s\n", n++, id_str);
1705 err = got_object_commit_get_logmsg(&logmsg0, commit);
1711 line = strsep(&logmsg, "\n");
1713 printf(" %s\n", line);
1718 err = print_patch(commit, id, path, diff_context, repo);
1723 if (fflush(stdout) != 0 && err == NULL)
1724 err = got_error_from_errno("fflush");
1728 static const struct got_error *
1729 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1730 const char *path, int show_patch, const char *search_pattern,
1731 int diff_context, int limit, int log_branches,
1732 struct got_reflist_head *refs)
1734 const struct got_error *err;
1735 struct got_commit_graph *graph;
1739 if (search_pattern &&
1740 regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
1741 return got_error_msg(GOT_ERR_REGEX, search_pattern);
1743 err = got_commit_graph_open(&graph, path, !log_branches);
1746 err = got_commit_graph_iter_start(graph, root_id, repo,
1747 check_cancelled, NULL);
1751 struct got_commit_object *commit;
1752 struct got_object_id *id;
1754 if (sigint_received || sigpipe_received)
1757 err = got_commit_graph_iter_next(&id, graph, repo,
1758 check_cancelled, NULL);
1760 if (err->code == GOT_ERR_ITER_COMPLETED)
1767 err = got_object_open_as_commit(&commit, repo, id);
1771 if (search_pattern) {
1772 err = match_logmsg(&have_match, id, commit, ®ex);
1774 got_object_commit_close(commit);
1777 if (have_match == 0) {
1778 got_object_commit_close(commit);
1783 err = print_commit(commit, id, repo, path, show_patch,
1784 diff_context, refs);
1785 got_object_commit_close(commit);
1786 if (err || (limit && --limit == 0))
1792 got_commit_graph_close(graph);
1799 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
1800 "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
1805 get_default_log_limit(void)
1807 const char *got_default_log_limit;
1811 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1812 if (got_default_log_limit == NULL)
1814 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1820 static const struct got_error *
1821 cmd_log(int argc, char *argv[])
1823 const struct got_error *error;
1824 struct got_repository *repo = NULL;
1825 struct got_worktree *worktree = NULL;
1826 struct got_commit_object *commit = NULL;
1827 struct got_object_id *id = NULL;
1828 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1829 const char *start_commit = NULL, *search_pattern = NULL;
1830 int diff_context = -1, ch;
1831 int show_patch = 0, limit = 0, log_branches = 0;
1833 struct got_reflist_head refs;
1835 SIMPLEQ_INIT(&refs);
1838 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1844 limit = get_default_log_limit();
1846 while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
1852 start_commit = optarg;
1855 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1858 err(1, "-C option %s", errstr);
1861 limit = strtonum(optarg, 0, INT_MAX, &errstr);
1863 err(1, "-l option %s", errstr);
1869 repo_path = realpath(optarg, NULL);
1870 if (repo_path == NULL)
1871 return got_error_from_errno2("realpath",
1873 got_path_strip_trailing_slashes(repo_path);
1876 search_pattern = optarg;
1887 if (diff_context == -1)
1889 else if (!show_patch)
1890 errx(1, "-C reguires -p");
1892 cwd = getcwd(NULL, 0);
1894 error = got_error_from_errno("getcwd");
1898 error = got_worktree_open(&worktree, cwd);
1899 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1906 error = got_error_from_errno("strdup");
1909 } else if (argc == 1) {
1911 error = got_worktree_resolve_path(&path, worktree,
1916 path = strdup(argv[0]);
1918 error = got_error_from_errno("strdup");
1925 if (repo_path == NULL) {
1926 repo_path = worktree ?
1927 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1929 if (repo_path == NULL) {
1930 error = got_error_from_errno("strdup");
1934 error = got_repo_open(&repo, repo_path, NULL);
1938 error = apply_unveil(got_repo_get_path(repo), 1,
1939 worktree ? got_worktree_get_root_path(worktree) : NULL);
1943 if (start_commit == NULL) {
1944 struct got_reference *head_ref;
1945 error = got_ref_open(&head_ref, repo,
1946 worktree ? got_worktree_get_head_ref_name(worktree)
1950 error = got_ref_resolve(&id, repo, head_ref);
1951 got_ref_close(head_ref);
1954 error = got_object_open_as_commit(&commit, repo, id);
1956 struct got_reference *ref;
1957 error = got_ref_open(&ref, repo, start_commit, 0);
1958 if (error == NULL) {
1960 error = got_ref_resolve(&id, repo, ref);
1964 error = got_object_get_type(&obj_type, repo, id);
1967 if (obj_type == GOT_OBJ_TYPE_TAG) {
1968 struct got_tag_object *tag;
1969 error = got_object_open_as_tag(&tag, repo, id);
1972 if (got_object_tag_get_object_type(tag) !=
1973 GOT_OBJ_TYPE_COMMIT) {
1974 got_object_tag_close(tag);
1975 error = got_error(GOT_ERR_OBJ_TYPE);
1979 id = got_object_id_dup(
1980 got_object_tag_get_object_id(tag));
1982 error = got_error_from_errno(
1983 "got_object_id_dup");
1984 got_object_tag_close(tag);
1987 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1988 error = got_error(GOT_ERR_OBJ_TYPE);
1991 error = got_object_open_as_commit(&commit, repo, id);
1995 if (commit == NULL) {
1996 error = got_repo_match_object_id_prefix(&id,
1997 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
2006 const char *prefix = got_worktree_get_path_prefix(worktree);
2008 if (asprintf(&p, "%s%s%s", prefix,
2009 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
2010 error = got_error_from_errno("asprintf");
2013 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2016 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2021 path = in_repo_path;
2024 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2028 error = print_commits(id, repo, path, show_patch, search_pattern,
2029 diff_context, limit, log_branches, &refs);
2036 got_worktree_close(worktree);
2038 const struct got_error *repo_error;
2039 repo_error = got_repo_close(repo);
2043 got_ref_list_free(&refs);
2050 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
2051 "[-w] [object1 object2 | path]\n", getprogname());
2055 struct print_diff_arg {
2056 struct got_repository *repo;
2057 struct got_worktree *worktree;
2062 int ignore_whitespace;
2065 static const struct got_error *
2066 print_diff(void *arg, unsigned char status, unsigned char staged_status,
2067 const char *path, struct got_object_id *blob_id,
2068 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2069 int dirfd, const char *de_name)
2071 struct print_diff_arg *a = arg;
2072 const struct got_error *err = NULL;
2073 struct got_blob_object *blob1 = NULL;
2076 char *abspath = NULL, *label1 = NULL;
2079 if (a->diff_staged) {
2080 if (staged_status != GOT_STATUS_MODIFY &&
2081 staged_status != GOT_STATUS_ADD &&
2082 staged_status != GOT_STATUS_DELETE)
2085 if (staged_status == GOT_STATUS_DELETE)
2087 if (status == GOT_STATUS_NONEXISTENT)
2088 return got_error_set_errno(ENOENT, path);
2089 if (status != GOT_STATUS_MODIFY &&
2090 status != GOT_STATUS_ADD &&
2091 status != GOT_STATUS_DELETE &&
2092 status != GOT_STATUS_CONFLICT)
2096 if (!a->header_shown) {
2097 printf("diff %s %s%s\n", a->id_str,
2098 got_worktree_get_root_path(a->worktree),
2099 a->diff_staged ? " (staged changes)" : "");
2100 a->header_shown = 1;
2103 if (a->diff_staged) {
2104 const char *label1 = NULL, *label2 = NULL;
2105 switch (staged_status) {
2106 case GOT_STATUS_MODIFY:
2110 case GOT_STATUS_ADD:
2113 case GOT_STATUS_DELETE:
2117 return got_error(GOT_ERR_FILE_STATUS);
2119 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2120 label1, label2, a->diff_context, a->ignore_whitespace,
2124 if (staged_status == GOT_STATUS_ADD ||
2125 staged_status == GOT_STATUS_MODIFY) {
2127 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2131 err = got_object_id_str(&id_str, staged_blob_id);
2134 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2135 err = got_error_from_errno("asprintf");
2140 } else if (status != GOT_STATUS_ADD) {
2141 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2146 if (status != GOT_STATUS_DELETE) {
2147 if (asprintf(&abspath, "%s/%s",
2148 got_worktree_get_root_path(a->worktree), path) == -1) {
2149 err = got_error_from_errno("asprintf");
2154 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
2156 err = got_error_from_errno2("openat", abspath);
2160 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
2162 err = got_error_from_errno2("open", abspath);
2166 if (fstat(fd, &sb) == -1) {
2167 err = got_error_from_errno2("fstat", abspath);
2170 f2 = fdopen(fd, "r");
2172 err = got_error_from_errno2("fdopen", abspath);
2179 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2180 a->diff_context, a->ignore_whitespace, stdout);
2183 got_object_blob_close(blob1);
2184 if (f2 && fclose(f2) == EOF && err == NULL)
2185 err = got_error_from_errno("fclose");
2186 if (fd != -1 && close(fd) == -1 && err == NULL)
2187 err = got_error_from_errno("close");
2192 static const struct got_error *
2193 cmd_diff(int argc, char *argv[])
2195 const struct got_error *error;
2196 struct got_repository *repo = NULL;
2197 struct got_worktree *worktree = NULL;
2198 char *cwd = NULL, *repo_path = NULL;
2199 struct got_object_id *id1 = NULL, *id2 = NULL;
2200 const char *id_str1 = NULL, *id_str2 = NULL;
2201 char *label1 = NULL, *label2 = NULL;
2203 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
2208 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2213 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
2216 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2219 err(1, "-C option %s", errstr);
2222 repo_path = realpath(optarg, NULL);
2223 if (repo_path == NULL)
2224 return got_error_from_errno2("realpath",
2226 got_path_strip_trailing_slashes(repo_path);
2232 ignore_whitespace = 1;
2243 cwd = getcwd(NULL, 0);
2245 error = got_error_from_errno("getcwd");
2248 error = got_worktree_open(&worktree, cwd);
2249 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2252 if (worktree == NULL) {
2253 error = got_error(GOT_ERR_NOT_WORKTREE);
2258 "-r option can't be used when diffing a work tree");
2259 repo_path = strdup(got_worktree_get_repo_path(worktree));
2260 if (repo_path == NULL) {
2261 error = got_error_from_errno("strdup");
2265 error = got_worktree_resolve_path(&path, worktree,
2272 error = got_error_from_errno("strdup");
2276 } else if (argc == 2) {
2278 errx(1, "-s option can't be used when diffing "
2279 "objects in repository");
2282 if (worktree && repo_path == NULL) {
2284 strdup(got_worktree_get_repo_path(worktree));
2285 if (repo_path == NULL) {
2286 error = got_error_from_errno("strdup");
2293 if (repo_path == NULL) {
2294 repo_path = getcwd(NULL, 0);
2295 if (repo_path == NULL)
2296 return got_error_from_errno("getcwd");
2299 error = got_repo_open(&repo, repo_path, NULL);
2304 error = apply_unveil(got_repo_get_path(repo), 1,
2305 worktree ? got_worktree_get_root_path(worktree) : NULL);
2310 struct print_diff_arg arg;
2311 struct got_pathlist_head paths;
2316 error = got_object_id_str(&id_str,
2317 got_worktree_get_base_commit_id(worktree));
2321 arg.worktree = worktree;
2322 arg.diff_context = diff_context;
2323 arg.id_str = id_str;
2324 arg.header_shown = 0;
2325 arg.diff_staged = diff_staged;
2326 arg.ignore_whitespace = ignore_whitespace;
2328 error = got_pathlist_append(&paths, path, NULL);
2332 error = got_worktree_status(worktree, &paths, repo, print_diff,
2333 &arg, check_cancelled, NULL);
2335 got_pathlist_free(&paths);
2339 error = got_repo_match_object_id(&id1, &label1, id_str1,
2340 GOT_OBJ_TYPE_ANY, 1, repo);
2344 error = got_repo_match_object_id(&id2, &label2, id_str2,
2345 GOT_OBJ_TYPE_ANY, 1, repo);
2349 error = got_object_get_type(&type1, repo, id1);
2353 error = got_object_get_type(&type2, repo, id2);
2357 if (type1 != type2) {
2358 error = got_error(GOT_ERR_OBJ_TYPE);
2363 case GOT_OBJ_TYPE_BLOB:
2364 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2365 diff_context, ignore_whitespace, repo, stdout);
2367 case GOT_OBJ_TYPE_TREE:
2368 error = got_diff_objects_as_trees(id1, id2, "", "",
2369 diff_context, ignore_whitespace, repo, stdout);
2371 case GOT_OBJ_TYPE_COMMIT:
2372 printf("diff %s %s\n", label1, label2);
2373 error = got_diff_objects_as_commits(id1, id2, diff_context,
2374 ignore_whitespace, repo, stdout);
2377 error = got_error(GOT_ERR_OBJ_TYPE);
2386 got_worktree_close(worktree);
2388 const struct got_error *repo_error;
2389 repo_error = got_repo_close(repo);
2400 "usage: %s blame [-c commit] [-r repository-path] path\n",
2409 char datebuf[11]; /* YYYY-MM-DD + NUL */
2412 struct blame_cb_args {
2413 struct blame_line *lines;
2417 off_t *line_offsets;
2419 struct got_repository *repo;
2422 static const struct got_error *
2423 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2425 const struct got_error *err = NULL;
2426 struct blame_cb_args *a = arg;
2427 struct blame_line *bline;
2429 size_t linesize = 0;
2430 struct got_commit_object *commit = NULL;
2433 time_t committer_time;
2435 if (nlines != a->nlines ||
2436 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2437 return got_error(GOT_ERR_RANGE);
2439 if (sigint_received)
2440 return got_error(GOT_ERR_ITER_COMPLETED);
2443 return NULL; /* no change in this commit */
2445 /* Annotate this line. */
2446 bline = &a->lines[lineno - 1];
2447 if (bline->annotated)
2449 err = got_object_id_str(&bline->id_str, id);
2453 err = got_object_open_as_commit(&commit, a->repo, id);
2457 bline->committer = strdup(got_object_commit_get_committer(commit));
2458 if (bline->committer == NULL) {
2459 err = got_error_from_errno("strdup");
2463 committer_time = got_object_commit_get_committer_time(commit);
2464 if (localtime_r(&committer_time, &tm) == NULL)
2465 return got_error_from_errno("localtime_r");
2466 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
2467 &tm) >= sizeof(bline->datebuf)) {
2468 err = got_error(GOT_ERR_NO_SPACE);
2471 bline->annotated = 1;
2473 /* Print lines annotated so far. */
2474 bline = &a->lines[a->lineno_cur - 1];
2475 if (!bline->annotated)
2478 offset = a->line_offsets[a->lineno_cur - 1];
2479 if (fseeko(a->f, offset, SEEK_SET) == -1) {
2480 err = got_error_from_errno("fseeko");
2484 while (bline->annotated) {
2485 char *smallerthan, *at, *nl, *committer;
2488 if (getline(&line, &linesize, a->f) == -1) {
2490 err = got_error_from_errno("getline");
2494 committer = bline->committer;
2495 smallerthan = strchr(committer, '<');
2496 if (smallerthan && smallerthan[1] != '\0')
2497 committer = smallerthan + 1;
2498 at = strchr(committer, '@');
2501 len = strlen(committer);
2503 committer[8] = '\0';
2505 nl = strchr(line, '\n');
2508 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2509 bline->id_str, bline->datebuf, committer, line);
2512 bline = &a->lines[a->lineno_cur - 1];
2516 got_object_commit_close(commit);
2521 static const struct got_error *
2522 cmd_blame(int argc, char *argv[])
2524 const struct got_error *error;
2525 struct got_repository *repo = NULL;
2526 struct got_worktree *worktree = NULL;
2527 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2528 struct got_object_id *obj_id = NULL;
2529 struct got_object_id *commit_id = NULL;
2530 struct got_blob_object *blob = NULL;
2531 char *commit_id_str = NULL;
2532 struct blame_cb_args bca;
2533 int ch, obj_type, i;
2536 memset(&bca, 0, sizeof(bca));
2539 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2544 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2547 commit_id_str = optarg;
2550 repo_path = realpath(optarg, NULL);
2551 if (repo_path == NULL)
2552 return got_error_from_errno2("realpath",
2554 got_path_strip_trailing_slashes(repo_path);
2570 cwd = getcwd(NULL, 0);
2572 error = got_error_from_errno("getcwd");
2575 if (repo_path == NULL) {
2576 error = got_worktree_open(&worktree, cwd);
2577 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2583 strdup(got_worktree_get_repo_path(worktree));
2584 if (repo_path == NULL)
2585 error = got_error_from_errno("strdup");
2589 repo_path = strdup(cwd);
2590 if (repo_path == NULL) {
2591 error = got_error_from_errno("strdup");
2597 error = got_repo_open(&repo, repo_path, NULL);
2601 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2606 const char *prefix = got_worktree_get_path_prefix(worktree);
2607 char *p, *worktree_subdir = cwd +
2608 strlen(got_worktree_get_root_path(worktree));
2609 if (asprintf(&p, "%s%s%s%s%s",
2610 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2611 worktree_subdir, worktree_subdir[0] ? "/" : "",
2613 error = got_error_from_errno("asprintf");
2616 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2619 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2624 if (commit_id_str == NULL) {
2625 struct got_reference *head_ref;
2626 error = got_ref_open(&head_ref, repo, worktree ?
2627 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
2630 error = got_ref_resolve(&commit_id, repo, head_ref);
2631 got_ref_close(head_ref);
2635 error = got_repo_match_object_id(&commit_id, NULL,
2636 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2641 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2645 error = got_object_get_type(&obj_type, repo, obj_id);
2649 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2650 error = got_error(GOT_ERR_OBJ_TYPE);
2654 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2657 bca.f = got_opentemp();
2658 if (bca.f == NULL) {
2659 error = got_error_from_errno("got_opentemp");
2662 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2663 &bca.line_offsets, bca.f, blob);
2664 if (error || bca.nlines == 0)
2667 /* Don't include \n at EOF in the blame line count. */
2668 if (bca.line_offsets[bca.nlines - 1] == filesize)
2671 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2672 if (bca.lines == NULL) {
2673 error = got_error_from_errno("calloc");
2677 bca.nlines_prec = 0;
2685 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2686 check_cancelled, NULL);
2694 got_object_blob_close(blob);
2696 got_worktree_close(worktree);
2698 const struct got_error *repo_error;
2699 repo_error = got_repo_close(repo);
2704 for (i = 0; i < bca.nlines; i++) {
2705 struct blame_line *bline = &bca.lines[i];
2706 free(bline->id_str);
2707 free(bline->committer);
2711 free(bca.line_offsets);
2712 if (bca.f && fclose(bca.f) == EOF && error == NULL)
2713 error = got_error_from_errno("fclose");
2721 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2727 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2728 const char *root_path)
2730 int is_root_path = (strcmp(path, root_path) == 0);
2731 const char *modestr = "";
2732 mode_t mode = got_tree_entry_get_mode(te);
2734 path += strlen(root_path);
2735 while (path[0] == '/')
2738 if (got_object_tree_entry_is_submodule(te))
2740 else if (S_ISLNK(mode))
2742 else if (S_ISDIR(mode))
2744 else if (mode & S_IXUSR)
2747 printf("%s%s%s%s%s\n", id ? id : "", path,
2748 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2751 static const struct got_error *
2752 print_tree(const char *path, struct got_object_id *commit_id,
2753 int show_ids, int recurse, const char *root_path,
2754 struct got_repository *repo)
2756 const struct got_error *err = NULL;
2757 struct got_object_id *tree_id = NULL;
2758 struct got_tree_object *tree = NULL;
2761 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2765 err = got_object_open_as_tree(&tree, repo, tree_id);
2768 nentries = got_object_tree_get_nentries(tree);
2769 for (i = 0; i < nentries; i++) {
2770 struct got_tree_entry *te;
2773 if (sigint_received || sigpipe_received)
2776 te = got_object_tree_get_entry(tree, i);
2779 err = got_object_id_str(&id_str,
2780 got_tree_entry_get_id(te));
2783 if (asprintf(&id, "%s ", id_str) == -1) {
2784 err = got_error_from_errno("asprintf");
2790 print_entry(te, id, path, root_path);
2793 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2795 if (asprintf(&child_path, "%s%s%s", path,
2796 path[0] == '/' && path[1] == '\0' ? "" : "/",
2797 got_tree_entry_get_name(te)) == -1) {
2798 err = got_error_from_errno("asprintf");
2801 err = print_tree(child_path, commit_id, show_ids, 1,
2810 got_object_tree_close(tree);
2815 static const struct got_error *
2816 cmd_tree(int argc, char *argv[])
2818 const struct got_error *error;
2819 struct got_repository *repo = NULL;
2820 struct got_worktree *worktree = NULL;
2822 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2823 struct got_object_id *commit_id = NULL;
2824 char *commit_id_str = NULL;
2825 int show_ids = 0, recurse = 0;
2829 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2834 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2837 commit_id_str = optarg;
2840 repo_path = realpath(optarg, NULL);
2841 if (repo_path == NULL)
2842 return got_error_from_errno2("realpath",
2844 got_path_strip_trailing_slashes(repo_path);
2868 cwd = getcwd(NULL, 0);
2870 error = got_error_from_errno("getcwd");
2873 if (repo_path == NULL) {
2874 error = got_worktree_open(&worktree, cwd);
2875 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2881 strdup(got_worktree_get_repo_path(worktree));
2882 if (repo_path == NULL)
2883 error = got_error_from_errno("strdup");
2887 repo_path = strdup(cwd);
2888 if (repo_path == NULL) {
2889 error = got_error_from_errno("strdup");
2895 error = got_repo_open(&repo, repo_path, NULL);
2899 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2905 char *p, *worktree_subdir = cwd +
2906 strlen(got_worktree_get_root_path(worktree));
2907 if (asprintf(&p, "%s/%s",
2908 got_worktree_get_path_prefix(worktree),
2909 worktree_subdir) == -1) {
2910 error = got_error_from_errno("asprintf");
2913 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2920 if (in_repo_path == NULL) {
2921 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2926 if (commit_id_str == NULL) {
2927 struct got_reference *head_ref;
2928 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2931 error = got_ref_resolve(&commit_id, repo, head_ref);
2932 got_ref_close(head_ref);
2936 error = got_repo_match_object_id(&commit_id, NULL,
2937 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2942 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2943 in_repo_path, repo);
2950 got_worktree_close(worktree);
2952 const struct got_error *repo_error;
2953 repo_error = got_repo_close(repo);
2963 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2967 static const struct got_error *
2968 print_status(void *arg, unsigned char status, unsigned char staged_status,
2969 const char *path, struct got_object_id *blob_id,
2970 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2971 int dirfd, const char *de_name)
2973 if (status == staged_status && (status == GOT_STATUS_DELETE))
2974 status = GOT_STATUS_NO_CHANGE;
2975 printf("%c%c %s\n", status, staged_status, path);
2979 static const struct got_error *
2980 cmd_status(int argc, char *argv[])
2982 const struct got_error *error = NULL;
2983 struct got_repository *repo = NULL;
2984 struct got_worktree *worktree = NULL;
2986 struct got_pathlist_head paths;
2987 struct got_pathlist_entry *pe;
2992 while ((ch = getopt(argc, argv, "")) != -1) {
3004 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3008 cwd = getcwd(NULL, 0);
3010 error = got_error_from_errno("getcwd");
3014 error = got_worktree_open(&worktree, cwd);
3018 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3023 error = apply_unveil(got_repo_get_path(repo), 1,
3024 got_worktree_get_root_path(worktree));
3028 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3032 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3033 check_cancelled, NULL);
3035 TAILQ_FOREACH(pe, &paths, entry)
3036 free((char *)pe->path);
3037 got_pathlist_free(&paths);
3046 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3051 static const struct got_error *
3052 list_refs(struct got_repository *repo)
3054 static const struct got_error *err = NULL;
3055 struct got_reflist_head refs;
3056 struct got_reflist_entry *re;
3058 SIMPLEQ_INIT(&refs);
3059 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3063 SIMPLEQ_FOREACH(re, &refs, entry) {
3065 refstr = got_ref_to_str(re->ref);
3067 return got_error_from_errno("got_ref_to_str");
3068 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3072 got_ref_list_free(&refs);
3076 static const struct got_error *
3077 delete_ref(struct got_repository *repo, const char *refname)
3079 const struct got_error *err = NULL;
3080 struct got_reference *ref;
3082 err = got_ref_open(&ref, repo, refname, 0);
3086 err = got_ref_delete(ref, repo);
3091 static const struct got_error *
3092 add_ref(struct got_repository *repo, const char *refname, const char *target)
3094 const struct got_error *err = NULL;
3095 struct got_object_id *id;
3096 struct got_reference *ref = NULL;
3099 * Don't let the user create a reference name with a leading '-'.
3100 * While technically a valid reference name, this case is usually
3101 * an unintended typo.
3103 if (refname[0] == '-')
3104 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3106 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3109 struct got_reference *target_ref;
3111 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3113 err = got_ref_open(&target_ref, repo, target, 0);
3116 err = got_ref_resolve(&id, repo, target_ref);
3117 got_ref_close(target_ref);
3122 err = got_ref_alloc(&ref, refname, id);
3126 err = got_ref_write(ref, repo);
3134 static const struct got_error *
3135 add_symref(struct got_repository *repo, const char *refname, const char *target)
3137 const struct got_error *err = NULL;
3138 struct got_reference *ref = NULL;
3139 struct got_reference *target_ref = NULL;
3142 * Don't let the user create a reference name with a leading '-'.
3143 * While technically a valid reference name, this case is usually
3144 * an unintended typo.
3146 if (refname[0] == '-')
3147 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3149 err = got_ref_open(&target_ref, repo, target, 0);
3153 err = got_ref_alloc_symref(&ref, refname, target_ref);
3157 err = got_ref_write(ref, repo);
3160 got_ref_close(target_ref);
3166 static const struct got_error *
3167 cmd_ref(int argc, char *argv[])
3169 const struct got_error *error = NULL;
3170 struct got_repository *repo = NULL;
3171 struct got_worktree *worktree = NULL;
3172 char *cwd = NULL, *repo_path = NULL;
3173 int ch, do_list = 0, create_symref = 0;
3174 const char *delref = NULL;
3176 /* TODO: Add -s option for adding symbolic references. */
3177 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3183 repo_path = realpath(optarg, NULL);
3184 if (repo_path == NULL)
3185 return got_error_from_errno2("realpath",
3187 got_path_strip_trailing_slashes(repo_path);
3201 if (do_list && delref)
3202 errx(1, "-l and -d options are mutually exclusive\n");
3207 if (do_list || delref) {
3209 errx(1, "-s option cannot be used together with the "
3210 "-l or -d options");
3213 } else if (argc != 2)
3218 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3222 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3223 "sendfd unveil", NULL) == -1)
3227 cwd = getcwd(NULL, 0);
3229 error = got_error_from_errno("getcwd");
3233 if (repo_path == NULL) {
3234 error = got_worktree_open(&worktree, cwd);
3235 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3241 strdup(got_worktree_get_repo_path(worktree));
3242 if (repo_path == NULL)
3243 error = got_error_from_errno("strdup");
3247 repo_path = strdup(cwd);
3248 if (repo_path == NULL) {
3249 error = got_error_from_errno("strdup");
3255 error = got_repo_open(&repo, repo_path, NULL);
3259 error = apply_unveil(got_repo_get_path(repo), do_list,
3260 worktree ? got_worktree_get_root_path(worktree) : NULL);
3265 error = list_refs(repo);
3267 error = delete_ref(repo, delref);
3268 else if (create_symref)
3269 error = add_symref(repo, argv[0], argv[1]);
3271 error = add_ref(repo, argv[0], argv[1]);
3274 got_repo_close(repo);
3276 got_worktree_close(worktree);
3286 "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3287 "[name]\n", getprogname());
3291 static const struct got_error *
3292 list_branch(struct got_repository *repo, struct got_worktree *worktree,
3293 struct got_reference *ref)
3295 const struct got_error *err = NULL;
3296 const char *refname, *marker = " ";
3299 refname = got_ref_get_name(ref);
3300 if (worktree && strcmp(refname,
3301 got_worktree_get_head_ref_name(worktree)) == 0) {
3302 struct got_object_id *id = NULL;
3304 err = got_ref_resolve(&id, repo, ref);
3307 if (got_object_id_cmp(id,
3308 got_worktree_get_base_commit_id(worktree)) == 0)
3315 if (strncmp(refname, "refs/heads/", 11) == 0)
3317 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3320 refstr = got_ref_to_str(ref);
3322 return got_error_from_errno("got_ref_to_str");
3324 printf("%s%s: %s\n", marker, refname, refstr);
3329 static const struct got_error *
3330 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3332 const char *refname;
3334 if (worktree == NULL)
3335 return got_error(GOT_ERR_NOT_WORKTREE);
3337 refname = got_worktree_get_head_ref_name(worktree);
3339 if (strncmp(refname, "refs/heads/", 11) == 0)
3341 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3344 printf("%s\n", refname);
3349 static const struct got_error *
3350 list_branches(struct got_repository *repo, struct got_worktree *worktree)
3352 static const struct got_error *err = NULL;
3353 struct got_reflist_head refs;
3354 struct got_reflist_entry *re;
3355 struct got_reference *temp_ref = NULL;
3356 int rebase_in_progress, histedit_in_progress;
3358 SIMPLEQ_INIT(&refs);
3361 err = got_worktree_rebase_in_progress(&rebase_in_progress,
3366 err = got_worktree_histedit_in_progress(&histedit_in_progress,
3371 if (rebase_in_progress || histedit_in_progress) {
3372 err = got_ref_open(&temp_ref, repo,
3373 got_worktree_get_head_ref_name(worktree), 0);
3376 list_branch(repo, worktree, temp_ref);
3377 got_ref_close(temp_ref);
3381 err = got_ref_list(&refs, repo, "refs/heads",
3382 got_ref_cmp_by_name, NULL);
3386 SIMPLEQ_FOREACH(re, &refs, entry)
3387 list_branch(repo, worktree, re->ref);
3389 got_ref_list_free(&refs);
3393 static const struct got_error *
3394 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3395 const char *branch_name)
3397 const struct got_error *err = NULL;
3398 struct got_reference *ref = NULL;
3401 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3402 return got_error_from_errno("asprintf");
3404 err = got_ref_open(&ref, repo, refname, 0);
3409 strcmp(got_worktree_get_head_ref_name(worktree),
3410 got_ref_get_name(ref)) == 0) {
3411 err = got_error_msg(GOT_ERR_SAME_BRANCH,
3412 "will not delete this work tree's current branch");
3416 err = got_ref_delete(ref, repo);
3424 static const struct got_error *
3425 add_branch(struct got_repository *repo, const char *branch_name,
3426 struct got_object_id *base_commit_id)
3428 const struct got_error *err = NULL;
3429 struct got_reference *ref = NULL;
3430 char *base_refname = NULL, *refname = NULL;
3433 * Don't let the user create a branch name with a leading '-'.
3434 * While technically a valid reference name, this case is usually
3435 * an unintended typo.
3437 if (branch_name[0] == '-')
3438 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3440 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3441 err = got_error_from_errno("asprintf");
3445 err = got_ref_open(&ref, repo, refname, 0);
3447 err = got_error(GOT_ERR_BRANCH_EXISTS);
3449 } else if (err->code != GOT_ERR_NOT_REF)
3452 err = got_ref_alloc(&ref, refname, base_commit_id);
3456 err = got_ref_write(ref, repo);
3465 static const struct got_error *
3466 cmd_branch(int argc, char *argv[])
3468 const struct got_error *error = NULL;
3469 struct got_repository *repo = NULL;
3470 struct got_worktree *worktree = NULL;
3471 char *cwd = NULL, *repo_path = NULL;
3472 int ch, do_list = 0, do_show = 0;
3473 const char *delref = NULL, *commit_id_arg = NULL;
3475 while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3478 commit_id_arg = optarg;
3484 repo_path = realpath(optarg, NULL);
3485 if (repo_path == NULL)
3486 return got_error_from_errno2("realpath",
3488 got_path_strip_trailing_slashes(repo_path);
3499 if (do_list && delref)
3500 errx(1, "-l and -d options are mutually exclusive\n");
3505 if (!do_list && !delref && argc == 0)
3508 if ((do_list || delref || do_show) && commit_id_arg != NULL)
3509 errx(1, "-c option can only be used when creating a branch");
3511 if (do_list || delref) {
3514 } else if (!do_show && argc != 1)
3518 if (do_list || do_show) {
3519 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3523 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3524 "sendfd unveil", NULL) == -1)
3528 cwd = getcwd(NULL, 0);
3530 error = got_error_from_errno("getcwd");
3534 if (repo_path == NULL) {
3535 error = got_worktree_open(&worktree, cwd);
3536 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3542 strdup(got_worktree_get_repo_path(worktree));
3543 if (repo_path == NULL)
3544 error = got_error_from_errno("strdup");
3548 repo_path = strdup(cwd);
3549 if (repo_path == NULL) {
3550 error = got_error_from_errno("strdup");
3556 error = got_repo_open(&repo, repo_path, NULL);
3560 error = apply_unveil(got_repo_get_path(repo), do_list,
3561 worktree ? got_worktree_get_root_path(worktree) : NULL);
3566 error = show_current_branch(repo, worktree);
3568 error = list_branches(repo, worktree);
3570 error = delete_branch(repo, worktree, delref);
3572 struct got_object_id *commit_id;
3573 if (commit_id_arg == NULL)
3574 commit_id_arg = worktree ?
3575 got_worktree_get_head_ref_name(worktree) :
3577 error = got_repo_match_object_id(&commit_id, NULL,
3578 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3581 error = add_branch(repo, argv[0], commit_id);
3586 got_repo_close(repo);
3588 got_worktree_close(worktree);
3599 "usage: %s tag [-r repository] | -l | "
3600 "[-m message] name [commit]\n", getprogname());
3605 static const struct got_error *
3606 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3608 const struct got_error *err = NULL;
3609 struct got_reflist_entry *re, *se, *new;
3610 struct got_object_id *re_id, *se_id;
3611 struct got_tag_object *re_tag, *se_tag;
3612 time_t re_time, se_time;
3614 SIMPLEQ_FOREACH(re, tags, entry) {
3615 se = SIMPLEQ_FIRST(sorted);
3617 err = got_reflist_entry_dup(&new, re);
3620 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3623 err = got_ref_resolve(&re_id, repo, re->ref);
3626 err = got_object_open_as_tag(&re_tag, repo, re_id);
3630 re_time = got_object_tag_get_tagger_time(re_tag);
3631 got_object_tag_close(re_tag);
3635 err = got_ref_resolve(&se_id, repo, re->ref);
3638 err = got_object_open_as_tag(&se_tag, repo, se_id);
3642 se_time = got_object_tag_get_tagger_time(se_tag);
3643 got_object_tag_close(se_tag);
3645 if (se_time > re_time) {
3646 err = got_reflist_entry_dup(&new, re);
3649 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3652 se = SIMPLEQ_NEXT(se, entry);
3661 static const struct got_error *
3662 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3664 static const struct got_error *err = NULL;
3665 struct got_reflist_head refs;
3666 struct got_reflist_entry *re;
3668 SIMPLEQ_INIT(&refs);
3670 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
3674 SIMPLEQ_FOREACH(re, &refs, entry) {
3675 const char *refname;
3676 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3680 struct got_object_id *id;
3681 struct got_tag_object *tag;
3682 struct got_commit_object *commit = NULL;
3684 refname = got_ref_get_name(re->ref);
3685 if (strncmp(refname, "refs/tags/", 10) != 0)
3688 refstr = got_ref_to_str(re->ref);
3689 if (refstr == NULL) {
3690 err = got_error_from_errno("got_ref_to_str");
3693 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3696 err = got_ref_resolve(&id, repo, re->ref);
3699 err = got_object_open_as_tag(&tag, repo, id);
3701 if (err->code != GOT_ERR_OBJ_TYPE) {
3705 /* "lightweight" tag */
3706 err = got_object_open_as_commit(&commit, repo, id);
3711 tagger = got_object_commit_get_committer(commit);
3713 got_object_commit_get_committer_time(commit);
3714 err = got_object_id_str(&id_str, id);
3720 tagger = got_object_tag_get_tagger(tag);
3721 tagger_time = got_object_tag_get_tagger_time(tag);
3722 err = got_object_id_str(&id_str,
3723 got_object_tag_get_object_id(tag));
3727 printf("from: %s\n", tagger);
3728 datestr = get_datestr(&tagger_time, datebuf);
3730 printf("date: %s UTC\n", datestr);
3732 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3734 switch (got_object_tag_get_object_type(tag)) {
3735 case GOT_OBJ_TYPE_BLOB:
3736 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
3739 case GOT_OBJ_TYPE_TREE:
3740 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
3743 case GOT_OBJ_TYPE_COMMIT:
3744 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
3747 case GOT_OBJ_TYPE_TAG:
3748 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
3757 err = got_object_commit_get_logmsg(&tagmsg0, commit);
3760 got_object_commit_close(commit);
3762 tagmsg0 = strdup(got_object_tag_get_message(tag));
3763 got_object_tag_close(tag);
3764 if (tagmsg0 == NULL) {
3765 err = got_error_from_errno("strdup");
3772 line = strsep(&tagmsg, "\n");
3774 printf(" %s\n", line);
3779 got_ref_list_free(&refs);
3783 static const struct got_error *
3784 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3785 const char *tag_name, const char *repo_path)
3787 const struct got_error *err = NULL;
3788 char *template = NULL, *initial_content = NULL;
3789 char *editor = NULL;
3792 if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3793 err = got_error_from_errno("asprintf");
3797 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3798 commit_id_str, tag_name) == -1) {
3799 err = got_error_from_errno("asprintf");
3803 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3807 dprintf(fd, initial_content);
3810 err = get_editor(&editor);
3813 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3815 free(initial_content);
3819 /* Editor is done; we can now apply unveil(2) */
3821 err = apply_unveil(repo_path, 0, NULL);
3830 static const struct got_error *
3831 add_tag(struct got_repository *repo, const char *tag_name,
3832 const char *commit_arg, const char *tagmsg_arg)
3834 const struct got_error *err = NULL;
3835 struct got_object_id *commit_id = NULL, *tag_id = NULL;
3836 char *label = NULL, *commit_id_str = NULL;
3837 struct got_reference *ref = NULL;
3838 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3839 char *tagmsg_path = NULL, *tag_id_str = NULL;
3840 int preserve_tagmsg = 0;
3843 * Don't let the user create a tag name with a leading '-'.
3844 * While technically a valid reference name, this case is usually
3845 * an unintended typo.
3847 if (tag_name[0] == '-')
3848 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3850 err = get_author(&tagger, repo);
3854 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
3855 GOT_OBJ_TYPE_COMMIT, 1, repo);
3859 err = got_object_id_str(&commit_id_str, commit_id);
3863 if (strncmp("refs/tags/", tag_name, 10) == 0) {
3864 refname = strdup(tag_name);
3865 if (refname == NULL) {
3866 err = got_error_from_errno("strdup");
3870 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3871 err = got_error_from_errno("asprintf");
3875 err = got_ref_open(&ref, repo, refname, 0);
3877 err = got_error(GOT_ERR_TAG_EXISTS);
3879 } else if (err->code != GOT_ERR_NOT_REF)
3882 if (tagmsg_arg == NULL) {
3883 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3884 tag_name, got_repo_get_path(repo));
3886 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3887 tagmsg_path != NULL)
3888 preserve_tagmsg = 1;
3893 err = got_object_tag_create(&tag_id, tag_name, commit_id,
3894 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3897 preserve_tagmsg = 1;
3901 err = got_ref_alloc(&ref, refname, tag_id);
3904 preserve_tagmsg = 1;
3908 err = got_ref_write(ref, repo);
3911 preserve_tagmsg = 1;
3915 err = got_object_id_str(&tag_id_str, tag_id);
3918 preserve_tagmsg = 1;
3921 printf("Created tag %s\n", tag_id_str);
3923 if (preserve_tagmsg) {
3924 fprintf(stderr, "%s: tag message preserved in %s\n",
3925 getprogname(), tagmsg_path);
3926 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3927 err = got_error_from_errno2("unlink", tagmsg_path);
3932 free(commit_id_str);
3940 static const struct got_error *
3941 cmd_tag(int argc, char *argv[])
3943 const struct got_error *error = NULL;
3944 struct got_repository *repo = NULL;
3945 struct got_worktree *worktree = NULL;
3946 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3947 char *gitconfig_path = NULL;
3948 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3949 int ch, do_list = 0;
3951 while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3957 repo_path = realpath(optarg, NULL);
3958 if (repo_path == NULL)
3959 return got_error_from_errno2("realpath",
3961 got_path_strip_trailing_slashes(repo_path);
3977 errx(1, "-l and -m options are mutually exclusive\n");
3980 } else if (argc < 1 || argc > 2)
3983 commit_id_arg = argv[1];
3988 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3992 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3993 "sendfd unveil", NULL) == -1)
3997 cwd = getcwd(NULL, 0);
3999 error = got_error_from_errno("getcwd");
4003 if (repo_path == NULL) {
4004 error = got_worktree_open(&worktree, cwd);
4005 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4011 strdup(got_worktree_get_repo_path(worktree));
4012 if (repo_path == NULL)
4013 error = got_error_from_errno("strdup");
4017 repo_path = strdup(cwd);
4018 if (repo_path == NULL) {
4019 error = got_error_from_errno("strdup");
4026 error = got_repo_open(&repo, repo_path, NULL);
4029 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4032 error = list_tags(repo, worktree);
4034 error = get_gitconfig_path(&gitconfig_path);
4037 error = got_repo_open(&repo, repo_path, gitconfig_path);
4042 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4047 if (commit_id_arg == NULL) {
4048 struct got_reference *head_ref;
4049 struct got_object_id *commit_id;
4050 error = got_ref_open(&head_ref, repo,
4051 worktree ? got_worktree_get_head_ref_name(worktree)
4055 error = got_ref_resolve(&commit_id, repo, head_ref);
4056 got_ref_close(head_ref);
4059 error = got_object_id_str(&commit_id_str, commit_id);
4065 error = add_tag(repo, tag_name,
4066 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4070 got_repo_close(repo);
4072 got_worktree_close(worktree);
4075 free(gitconfig_path);
4076 free(commit_id_str);
4083 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4088 static const struct got_error *
4089 add_progress(void *arg, unsigned char status, const char *path)
4091 while (path[0] == '/')
4093 printf("%c %s\n", status, path);
4097 static const struct got_error *
4098 cmd_add(int argc, char *argv[])
4100 const struct got_error *error = NULL;
4101 struct got_repository *repo = NULL;
4102 struct got_worktree *worktree = NULL;
4104 struct got_pathlist_head paths;
4105 struct got_pathlist_entry *pe;
4106 int ch, can_recurse = 0, no_ignores = 0;
4110 while ((ch = getopt(argc, argv, "IR")) != -1) {
4128 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4135 cwd = getcwd(NULL, 0);
4137 error = got_error_from_errno("getcwd");
4141 error = got_worktree_open(&worktree, cwd);
4145 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4150 error = apply_unveil(got_repo_get_path(repo), 1,
4151 got_worktree_get_root_path(worktree));
4155 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4159 if (!can_recurse && no_ignores) {
4160 error = got_error_msg(GOT_ERR_BAD_PATH,
4161 "disregarding ignores requires -R option");
4169 TAILQ_FOREACH(pe, &paths, entry) {
4170 if (asprintf(&ondisk_path, "%s/%s",
4171 got_worktree_get_root_path(worktree),
4173 error = got_error_from_errno("asprintf");
4176 if (lstat(ondisk_path, &sb) == -1) {
4177 if (errno == ENOENT) {
4181 error = got_error_from_errno2("lstat",
4187 if (S_ISDIR(sb.st_mode)) {
4188 error = got_error_msg(GOT_ERR_BAD_PATH,
4189 "adding directories requires -R option");
4195 error = got_worktree_schedule_add(worktree, &paths, add_progress,
4196 NULL, repo, no_ignores);
4199 got_repo_close(repo);
4201 got_worktree_close(worktree);
4202 TAILQ_FOREACH(pe, &paths, entry)
4203 free((char *)pe->path);
4204 got_pathlist_free(&paths);
4212 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4217 static const struct got_error *
4218 print_remove_status(void *arg, unsigned char status,
4219 unsigned char staged_status, const char *path)
4221 while (path[0] == '/')
4223 if (status == GOT_STATUS_NONEXISTENT)
4225 if (status == staged_status && (status == GOT_STATUS_DELETE))
4226 status = GOT_STATUS_NO_CHANGE;
4227 printf("%c%c %s\n", status, staged_status, path);
4231 static const struct got_error *
4232 cmd_remove(int argc, char *argv[])
4234 const struct got_error *error = NULL;
4235 struct got_worktree *worktree = NULL;
4236 struct got_repository *repo = NULL;
4238 struct got_pathlist_head paths;
4239 struct got_pathlist_entry *pe;
4240 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4244 while ((ch = getopt(argc, argv, "fkR")) != -1) {
4247 delete_local_mods = 1;
4265 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4272 cwd = getcwd(NULL, 0);
4274 error = got_error_from_errno("getcwd");
4277 error = got_worktree_open(&worktree, cwd);
4281 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4286 error = apply_unveil(got_repo_get_path(repo), 1,
4287 got_worktree_get_root_path(worktree));
4291 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4298 TAILQ_FOREACH(pe, &paths, entry) {
4299 if (asprintf(&ondisk_path, "%s/%s",
4300 got_worktree_get_root_path(worktree),
4302 error = got_error_from_errno("asprintf");
4305 if (lstat(ondisk_path, &sb) == -1) {
4306 if (errno == ENOENT) {
4310 error = got_error_from_errno2("lstat",
4316 if (S_ISDIR(sb.st_mode)) {
4317 error = got_error_msg(GOT_ERR_BAD_PATH,
4318 "removing directories requires -R option");
4324 error = got_worktree_schedule_delete(worktree, &paths,
4325 delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4328 got_repo_close(repo);
4330 got_worktree_close(worktree);
4331 TAILQ_FOREACH(pe, &paths, entry)
4332 free((char *)pe->path);
4333 got_pathlist_free(&paths);
4341 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4342 "path ...\n", getprogname());
4346 static const struct got_error *
4347 revert_progress(void *arg, unsigned char status, const char *path)
4349 if (status == GOT_STATUS_UNVERSIONED)
4352 while (path[0] == '/')
4354 printf("%c %s\n", status, path);
4358 struct choose_patch_arg {
4359 FILE *patch_script_file;
4363 static const struct got_error *
4364 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4365 int nchanges, const char *action)
4368 size_t linesize = 0;
4372 case GOT_STATUS_ADD:
4373 printf("A %s\n%s this addition? [y/n] ", path, action);
4375 case GOT_STATUS_DELETE:
4376 printf("D %s\n%s this deletion? [y/n] ", path, action);
4378 case GOT_STATUS_MODIFY:
4379 if (fseek(patch_file, 0L, SEEK_SET) == -1)
4380 return got_error_from_errno("fseek");
4381 printf(GOT_COMMIT_SEP_STR);
4382 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4384 if (ferror(patch_file))
4385 return got_error_from_errno("getline");
4386 printf(GOT_COMMIT_SEP_STR);
4387 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4388 path, n, nchanges, action);
4391 return got_error_path(path, GOT_ERR_FILE_STATUS);
4397 static const struct got_error *
4398 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4399 FILE *patch_file, int n, int nchanges)
4401 const struct got_error *err = NULL;
4403 size_t linesize = 0;
4406 struct choose_patch_arg *a = arg;
4408 *choice = GOT_PATCH_CHOICE_NONE;
4410 if (a->patch_script_file) {
4412 err = show_change(status, path, patch_file, n, nchanges,
4416 linelen = getline(&line, &linesize, a->patch_script_file);
4417 if (linelen == -1) {
4418 if (ferror(a->patch_script_file))
4419 return got_error_from_errno("getline");
4422 nl = strchr(line, '\n');
4425 if (strcmp(line, "y") == 0) {
4426 *choice = GOT_PATCH_CHOICE_YES;
4428 } else if (strcmp(line, "n") == 0) {
4429 *choice = GOT_PATCH_CHOICE_NO;
4431 } else if (strcmp(line, "q") == 0 &&
4432 status == GOT_STATUS_MODIFY) {
4433 *choice = GOT_PATCH_CHOICE_QUIT;
4436 printf("invalid response '%s'\n", line);
4441 while (resp != 'y' && resp != 'n' && resp != 'q') {
4442 err = show_change(status, path, patch_file, n, nchanges,
4449 if (status == GOT_STATUS_MODIFY) {
4450 if (resp != 'y' && resp != 'n' && resp != 'q') {
4451 printf("invalid response '%c'\n", resp);
4454 } else if (resp != 'y' && resp != 'n') {
4455 printf("invalid response '%c'\n", resp);
4461 *choice = GOT_PATCH_CHOICE_YES;
4462 else if (resp == 'n')
4463 *choice = GOT_PATCH_CHOICE_NO;
4464 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4465 *choice = GOT_PATCH_CHOICE_QUIT;
4471 static const struct got_error *
4472 cmd_revert(int argc, char *argv[])
4474 const struct got_error *error = NULL;
4475 struct got_worktree *worktree = NULL;
4476 struct got_repository *repo = NULL;
4477 char *cwd = NULL, *path = NULL;
4478 struct got_pathlist_head paths;
4479 struct got_pathlist_entry *pe;
4480 int ch, can_recurse = 0, pflag = 0;
4481 FILE *patch_script_file = NULL;
4482 const char *patch_script_path = NULL;
4483 struct choose_patch_arg cpa;
4487 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4493 patch_script_path = optarg;
4508 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4509 "unveil", NULL) == -1)
4514 if (patch_script_path && !pflag)
4515 errx(1, "-F option can only be used together with -p option");
4517 cwd = getcwd(NULL, 0);
4519 error = got_error_from_errno("getcwd");
4522 error = got_worktree_open(&worktree, cwd);
4526 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4531 if (patch_script_path) {
4532 patch_script_file = fopen(patch_script_path, "r");
4533 if (patch_script_file == NULL) {
4534 error = got_error_from_errno2("fopen",
4539 error = apply_unveil(got_repo_get_path(repo), 1,
4540 got_worktree_get_root_path(worktree));
4544 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4551 TAILQ_FOREACH(pe, &paths, entry) {
4552 if (asprintf(&ondisk_path, "%s/%s",
4553 got_worktree_get_root_path(worktree),
4555 error = got_error_from_errno("asprintf");
4558 if (lstat(ondisk_path, &sb) == -1) {
4559 if (errno == ENOENT) {
4563 error = got_error_from_errno2("lstat",
4569 if (S_ISDIR(sb.st_mode)) {
4570 error = got_error_msg(GOT_ERR_BAD_PATH,
4571 "reverting directories requires -R option");
4577 cpa.patch_script_file = patch_script_file;
4578 cpa.action = "revert";
4579 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4580 pflag ? choose_patch : NULL, &cpa, repo);
4582 if (patch_script_file && fclose(patch_script_file) == EOF &&
4584 error = got_error_from_errno2("fclose", patch_script_path);
4586 got_repo_close(repo);
4588 got_worktree_close(worktree);
4597 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4602 struct collect_commit_logmsg_arg {
4603 const char *cmdline_log;
4605 const char *worktree_path;
4606 const char *branch_name;
4607 const char *repo_path;
4612 static const struct got_error *
4613 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4616 char *initial_content = NULL;
4617 struct got_pathlist_entry *pe;
4618 const struct got_error *err = NULL;
4619 char *template = NULL;
4620 struct collect_commit_logmsg_arg *a = arg;
4624 /* if a message was specified on the command line, just use it */
4625 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4626 len = strlen(a->cmdline_log) + 1;
4627 *logmsg = malloc(len + 1);
4628 if (*logmsg == NULL)
4629 return got_error_from_errno("malloc");
4630 strlcpy(*logmsg, a->cmdline_log, len);
4634 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4635 return got_error_from_errno("asprintf");
4637 if (asprintf(&initial_content,
4638 "\n# changes to be committed on branch %s:\n",
4639 a->branch_name) == -1)
4640 return got_error_from_errno("asprintf");
4642 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4646 dprintf(fd, initial_content);
4648 TAILQ_FOREACH(pe, commitable_paths, entry) {
4649 struct got_commitable *ct = pe->data;
4650 dprintf(fd, "# %c %s\n",
4651 got_commitable_get_status(ct),
4652 got_commitable_get_path(ct));
4656 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4658 free(initial_content);
4661 /* Editor is done; we can now apply unveil(2) */
4663 err = apply_unveil(a->repo_path, 0, a->worktree_path);
4672 static const struct got_error *
4673 cmd_commit(int argc, char *argv[])
4675 const struct got_error *error = NULL;
4676 struct got_worktree *worktree = NULL;
4677 struct got_repository *repo = NULL;
4678 char *cwd = NULL, *id_str = NULL;
4679 struct got_object_id *id = NULL;
4680 const char *logmsg = NULL;
4681 struct collect_commit_logmsg_arg cl_arg;
4682 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4683 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4684 struct got_pathlist_head paths;
4687 cl_arg.logmsg_path = NULL;
4689 while ((ch = getopt(argc, argv, "m:")) != -1) {
4704 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4705 "unveil", NULL) == -1)
4708 cwd = getcwd(NULL, 0);
4710 error = got_error_from_errno("getcwd");
4713 error = got_worktree_open(&worktree, cwd);
4717 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4720 if (rebase_in_progress) {
4721 error = got_error(GOT_ERR_REBASING);
4725 error = got_worktree_histedit_in_progress(&histedit_in_progress,
4730 error = get_gitconfig_path(&gitconfig_path);
4733 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4738 error = get_author(&author, repo);
4743 * unveil(2) traverses exec(2); if an editor is used we have
4744 * to apply unveil after the log message has been written.
4746 if (logmsg == NULL || strlen(logmsg) == 0)
4747 error = get_editor(&editor);
4749 error = apply_unveil(got_repo_get_path(repo), 0,
4750 got_worktree_get_root_path(worktree));
4754 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4758 cl_arg.editor = editor;
4759 cl_arg.cmdline_log = logmsg;
4760 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4761 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4762 if (!histedit_in_progress) {
4763 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4764 error = got_error(GOT_ERR_COMMIT_BRANCH);
4767 cl_arg.branch_name += 11;
4769 cl_arg.repo_path = got_repo_get_path(repo);
4770 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4771 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4773 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4774 cl_arg.logmsg_path != NULL)
4775 preserve_logmsg = 1;
4779 error = got_object_id_str(&id_str, id);
4782 printf("Created commit %s\n", id_str);
4784 if (preserve_logmsg) {
4785 fprintf(stderr, "%s: log message preserved in %s\n",
4786 getprogname(), cl_arg.logmsg_path);
4787 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4789 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4790 free(cl_arg.logmsg_path);
4792 got_repo_close(repo);
4794 got_worktree_close(worktree);
4797 free(gitconfig_path);
4804 usage_cherrypick(void)
4806 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4810 static const struct got_error *
4811 cmd_cherrypick(int argc, char *argv[])
4813 const struct got_error *error = NULL;
4814 struct got_worktree *worktree = NULL;
4815 struct got_repository *repo = NULL;
4816 char *cwd = NULL, *commit_id_str = NULL;
4817 struct got_object_id *commit_id = NULL;
4818 struct got_commit_object *commit = NULL;
4819 struct got_object_qid *pid;
4820 struct got_reference *head_ref = NULL;
4821 int ch, did_something = 0;
4823 while ((ch = getopt(argc, argv, "")) != -1) {
4835 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4836 "unveil", NULL) == -1)
4842 cwd = getcwd(NULL, 0);
4844 error = got_error_from_errno("getcwd");
4847 error = got_worktree_open(&worktree, cwd);
4851 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4856 error = apply_unveil(got_repo_get_path(repo), 0,
4857 got_worktree_get_root_path(worktree));
4861 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4862 GOT_OBJ_TYPE_COMMIT, repo);
4863 if (error != NULL) {
4864 struct got_reference *ref;
4865 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4867 error = got_ref_open(&ref, repo, argv[0], 0);
4870 error = got_ref_resolve(&commit_id, repo, ref);
4875 error = got_object_id_str(&commit_id_str, commit_id);
4879 error = got_ref_open(&head_ref, repo,
4880 got_worktree_get_head_ref_name(worktree), 0);
4884 error = check_same_branch(commit_id, head_ref, NULL, repo);
4886 if (error->code != GOT_ERR_ANCESTRY)
4890 error = got_error(GOT_ERR_SAME_BRANCH);
4894 error = got_object_open_as_commit(&commit, repo, commit_id);
4897 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4898 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4899 commit_id, repo, update_progress, &did_something, check_cancelled,
4905 printf("Merged commit %s\n", commit_id_str);
4908 got_object_commit_close(commit);
4909 free(commit_id_str);
4911 got_ref_close(head_ref);
4913 got_worktree_close(worktree);
4915 got_repo_close(repo);
4922 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4926 static const struct got_error *
4927 cmd_backout(int argc, char *argv[])
4929 const struct got_error *error = NULL;
4930 struct got_worktree *worktree = NULL;
4931 struct got_repository *repo = NULL;
4932 char *cwd = NULL, *commit_id_str = NULL;
4933 struct got_object_id *commit_id = NULL;
4934 struct got_commit_object *commit = NULL;
4935 struct got_object_qid *pid;
4936 struct got_reference *head_ref = NULL;
4937 int ch, did_something = 0;
4939 while ((ch = getopt(argc, argv, "")) != -1) {
4951 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4952 "unveil", NULL) == -1)
4958 cwd = getcwd(NULL, 0);
4960 error = got_error_from_errno("getcwd");
4963 error = got_worktree_open(&worktree, cwd);
4967 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4972 error = apply_unveil(got_repo_get_path(repo), 0,
4973 got_worktree_get_root_path(worktree));
4977 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4978 GOT_OBJ_TYPE_COMMIT, repo);
4979 if (error != NULL) {
4980 struct got_reference *ref;
4981 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4983 error = got_ref_open(&ref, repo, argv[0], 0);
4986 error = got_ref_resolve(&commit_id, repo, ref);
4991 error = got_object_id_str(&commit_id_str, commit_id);
4995 error = got_ref_open(&head_ref, repo,
4996 got_worktree_get_head_ref_name(worktree), 0);
5000 error = check_same_branch(commit_id, head_ref, NULL, repo);
5004 error = got_object_open_as_commit(&commit, repo, commit_id);
5007 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5009 error = got_error(GOT_ERR_ROOT_COMMIT);
5013 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5014 update_progress, &did_something, check_cancelled, NULL);
5019 printf("Backed out commit %s\n", commit_id_str);
5022 got_object_commit_close(commit);
5023 free(commit_id_str);
5025 got_ref_close(head_ref);
5027 got_worktree_close(worktree);
5029 got_repo_close(repo);
5036 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5042 trim_logmsg(char *logmsg, int limit)
5047 len = strlen(logmsg);
5051 nl = strchr(logmsg, '\n');
5056 static const struct got_error *
5057 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5059 const struct got_error *err;
5060 char *logmsg0 = NULL;
5063 err = got_object_commit_get_logmsg(&logmsg0, commit);
5068 while (isspace((unsigned char)s[0]))
5071 *logmsg = strdup(s);
5072 if (*logmsg == NULL) {
5073 err = got_error_from_errno("strdup");
5077 trim_logmsg(*logmsg, limit);
5083 static const struct got_error *
5084 show_rebase_progress(struct got_commit_object *commit,
5085 struct got_object_id *old_id, struct got_object_id *new_id)
5087 const struct got_error *err;
5088 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5090 err = got_object_id_str(&old_id_str, old_id);
5095 err = got_object_id_str(&new_id_str, new_id);
5100 old_id_str[12] = '\0';
5102 new_id_str[12] = '\0';
5104 err = get_short_logmsg(&logmsg, 42, commit);
5108 printf("%s -> %s: %s\n", old_id_str,
5109 new_id_str ? new_id_str : "no-op change", logmsg);
5116 static const struct got_error *
5117 rebase_progress(void *arg, unsigned char status, const char *path)
5119 unsigned char *rebase_status = arg;
5121 while (path[0] == '/')
5123 printf("%c %s\n", status, path);
5125 if (*rebase_status == GOT_STATUS_CONFLICT)
5127 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5128 *rebase_status = status;
5132 static const struct got_error *
5133 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5134 struct got_reference *branch, struct got_reference *new_base_branch,
5135 struct got_reference *tmp_branch, struct got_repository *repo)
5137 printf("Switching work tree to %s\n", got_ref_get_name(branch));
5138 return got_worktree_rebase_complete(worktree, fileindex,
5139 new_base_branch, tmp_branch, branch, repo);
5142 static const struct got_error *
5143 rebase_commit(struct got_pathlist_head *merged_paths,
5144 struct got_worktree *worktree, struct got_fileindex *fileindex,
5145 struct got_reference *tmp_branch,
5146 struct got_object_id *commit_id, struct got_repository *repo)
5148 const struct got_error *error;
5149 struct got_commit_object *commit;
5150 struct got_object_id *new_commit_id;
5152 error = got_object_open_as_commit(&commit, repo, commit_id);
5156 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5157 worktree, fileindex, tmp_branch, commit, commit_id, repo);
5159 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5161 error = show_rebase_progress(commit, commit_id, NULL);
5163 error = show_rebase_progress(commit, commit_id, new_commit_id);
5164 free(new_commit_id);
5167 got_object_commit_close(commit);
5171 struct check_path_prefix_arg {
5172 const char *path_prefix;
5177 static const struct got_error *
5178 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5179 struct got_blob_object *blob2, struct got_object_id *id1,
5180 struct got_object_id *id2, const char *path1, const char *path2,
5181 mode_t mode1, mode_t mode2, struct got_repository *repo)
5183 struct check_path_prefix_arg *a = arg;
5185 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5186 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5187 return got_error(a->errcode);
5192 static const struct got_error *
5193 check_path_prefix(struct got_object_id *parent_id,
5194 struct got_object_id *commit_id, const char *path_prefix,
5195 int errcode, struct got_repository *repo)
5197 const struct got_error *err;
5198 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5199 struct got_commit_object *commit = NULL, *parent_commit = NULL;
5200 struct check_path_prefix_arg cpp_arg;
5202 if (got_path_is_root_dir(path_prefix))
5205 err = got_object_open_as_commit(&commit, repo, commit_id);
5209 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5213 err = got_object_open_as_tree(&tree1, repo,
5214 got_object_commit_get_tree_id(parent_commit));
5218 err = got_object_open_as_tree(&tree2, repo,
5219 got_object_commit_get_tree_id(commit));
5223 cpp_arg.path_prefix = path_prefix;
5224 while (cpp_arg.path_prefix[0] == '/')
5225 cpp_arg.path_prefix++;
5226 cpp_arg.len = strlen(cpp_arg.path_prefix);
5227 cpp_arg.errcode = errcode;
5228 err = got_diff_tree(tree1, tree2, "", "", repo,
5229 check_path_prefix_in_diff, &cpp_arg, 0);
5232 got_object_tree_close(tree1);
5234 got_object_tree_close(tree2);
5236 got_object_commit_close(commit);
5238 got_object_commit_close(parent_commit);
5242 static const struct got_error *
5243 collect_commits(struct got_object_id_queue *commits,
5244 struct got_object_id *initial_commit_id,
5245 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5246 const char *path_prefix, int path_prefix_errcode,
5247 struct got_repository *repo)
5249 const struct got_error *err = NULL;
5250 struct got_commit_graph *graph = NULL;
5251 struct got_object_id *parent_id = NULL;
5252 struct got_object_qid *qid;
5253 struct got_object_id *commit_id = initial_commit_id;
5255 err = got_commit_graph_open(&graph, "/", 1);
5259 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5260 check_cancelled, NULL);
5263 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5264 err = got_commit_graph_iter_next(&parent_id, graph, repo,
5265 check_cancelled, NULL);
5267 if (err->code == GOT_ERR_ITER_COMPLETED) {
5268 err = got_error_msg(GOT_ERR_ANCESTRY,
5269 "ran out of commits to rebase before "
5270 "youngest common ancestor commit has "
5275 err = check_path_prefix(parent_id, commit_id,
5276 path_prefix, path_prefix_errcode, repo);
5280 err = got_object_qid_alloc(&qid, commit_id);
5283 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5284 commit_id = parent_id;
5288 got_commit_graph_close(graph);
5292 static const struct got_error *
5293 cmd_rebase(int argc, char *argv[])
5295 const struct got_error *error = NULL;
5296 struct got_worktree *worktree = NULL;
5297 struct got_repository *repo = NULL;
5298 struct got_fileindex *fileindex = NULL;
5300 struct got_reference *branch = NULL;
5301 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5302 struct got_object_id *commit_id = NULL, *parent_id = NULL;
5303 struct got_object_id *resume_commit_id = NULL;
5304 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5305 struct got_commit_object *commit = NULL;
5306 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5307 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5308 struct got_object_id_queue commits;
5309 struct got_pathlist_head merged_paths;
5310 const struct got_object_id_queue *parent_ids;
5311 struct got_object_qid *qid, *pid;
5313 SIMPLEQ_INIT(&commits);
5314 TAILQ_INIT(&merged_paths);
5316 while ((ch = getopt(argc, argv, "ac")) != -1) {
5322 continue_rebase = 1;
5334 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5335 "unveil", NULL) == -1)
5338 if (abort_rebase && continue_rebase)
5340 else if (abort_rebase || continue_rebase) {
5343 } else if (argc != 1)
5346 cwd = getcwd(NULL, 0);
5348 error = got_error_from_errno("getcwd");
5351 error = got_worktree_open(&worktree, cwd);
5355 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5360 error = apply_unveil(got_repo_get_path(repo), 0,
5361 got_worktree_get_root_path(worktree));
5365 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5371 if (!rebase_in_progress) {
5372 error = got_error(GOT_ERR_NOT_REBASING);
5375 error = got_worktree_rebase_continue(&resume_commit_id,
5376 &new_base_branch, &tmp_branch, &branch, &fileindex,
5380 printf("Switching work tree to %s\n",
5381 got_ref_get_symref_target(new_base_branch));
5382 error = got_worktree_rebase_abort(worktree, fileindex, repo,
5383 new_base_branch, update_progress, &did_something);
5386 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5387 goto done; /* nothing else to do */
5390 if (continue_rebase) {
5391 if (!rebase_in_progress) {
5392 error = got_error(GOT_ERR_NOT_REBASING);
5395 error = got_worktree_rebase_continue(&resume_commit_id,
5396 &new_base_branch, &tmp_branch, &branch, &fileindex,
5401 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5402 resume_commit_id, repo);
5406 yca_id = got_object_id_dup(resume_commit_id);
5407 if (yca_id == NULL) {
5408 error = got_error_from_errno("got_object_id_dup");
5412 error = got_ref_open(&branch, repo, argv[0], 0);
5417 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5421 if (!continue_rebase) {
5422 struct got_object_id *base_commit_id;
5424 base_commit_id = got_worktree_get_base_commit_id(worktree);
5425 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5426 base_commit_id, branch_head_commit_id, repo,
5427 check_cancelled, NULL);
5430 if (yca_id == NULL) {
5431 error = got_error_msg(GOT_ERR_ANCESTRY,
5432 "specified branch shares no common ancestry "
5433 "with work tree's branch");
5437 error = check_same_branch(base_commit_id, branch, yca_id, repo);
5439 if (error->code != GOT_ERR_ANCESTRY)
5443 error = got_error_msg(GOT_ERR_SAME_BRANCH,
5444 "specified branch resolves to a commit which "
5445 "is already contained in work tree's branch");
5448 error = got_worktree_rebase_prepare(&new_base_branch,
5449 &tmp_branch, &fileindex, worktree, branch, repo);
5454 commit_id = branch_head_commit_id;
5455 error = got_object_open_as_commit(&commit, repo, commit_id);
5459 parent_ids = got_object_commit_get_parent_ids(commit);
5460 pid = SIMPLEQ_FIRST(parent_ids);
5462 if (!continue_rebase) {
5464 error = got_worktree_rebase_abort(worktree, fileindex,
5465 repo, new_base_branch, update_progress,
5469 printf("Rebase of %s aborted\n",
5470 got_ref_get_name(branch));
5472 error = got_error(GOT_ERR_EMPTY_REBASE);
5475 error = collect_commits(&commits, commit_id, pid->id,
5476 yca_id, got_worktree_get_path_prefix(worktree),
5477 GOT_ERR_REBASE_PATH, repo);
5478 got_object_commit_close(commit);
5483 if (SIMPLEQ_EMPTY(&commits)) {
5484 if (continue_rebase) {
5485 error = rebase_complete(worktree, fileindex,
5486 branch, new_base_branch, tmp_branch, repo);
5489 /* Fast-forward the reference of the branch. */
5490 struct got_object_id *new_head_commit_id;
5492 error = got_ref_resolve(&new_head_commit_id, repo,
5496 error = got_object_id_str(&id_str, new_head_commit_id);
5497 printf("Forwarding %s to commit %s\n",
5498 got_ref_get_name(branch), id_str);
5500 error = got_ref_change_ref(branch,
5501 new_head_commit_id);
5508 SIMPLEQ_FOREACH(qid, &commits, entry) {
5509 commit_id = qid->id;
5510 parent_id = pid ? pid->id : yca_id;
5513 error = got_worktree_rebase_merge_files(&merged_paths,
5514 worktree, fileindex, parent_id, commit_id, repo,
5515 rebase_progress, &rebase_status, check_cancelled, NULL);
5519 if (rebase_status == GOT_STATUS_CONFLICT) {
5520 got_worktree_rebase_pathlist_free(&merged_paths);
5524 error = rebase_commit(&merged_paths, worktree, fileindex,
5525 tmp_branch, commit_id, repo);
5526 got_worktree_rebase_pathlist_free(&merged_paths);
5531 if (rebase_status == GOT_STATUS_CONFLICT) {
5532 error = got_worktree_rebase_postpone(worktree, fileindex);
5535 error = got_error_msg(GOT_ERR_CONFLICTS,
5536 "conflicts must be resolved before rebasing can continue");
5538 error = rebase_complete(worktree, fileindex, branch,
5539 new_base_branch, tmp_branch, repo);
5541 got_object_id_queue_free(&commits);
5542 free(branch_head_commit_id);
5543 free(resume_commit_id);
5546 got_object_commit_close(commit);
5548 got_ref_close(branch);
5549 if (new_base_branch)
5550 got_ref_close(new_base_branch);
5552 got_ref_close(tmp_branch);
5554 got_worktree_close(worktree);
5556 got_repo_close(repo);
5561 usage_histedit(void)
5563 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5568 #define GOT_HISTEDIT_PICK 'p'
5569 #define GOT_HISTEDIT_EDIT 'e'
5570 #define GOT_HISTEDIT_FOLD 'f'
5571 #define GOT_HISTEDIT_DROP 'd'
5572 #define GOT_HISTEDIT_MESG 'm'
5574 static struct got_histedit_cmd {
5578 } got_histedit_cmds[] = {
5579 { GOT_HISTEDIT_PICK, "pick", "use commit" },
5580 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5581 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
5583 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5584 { GOT_HISTEDIT_MESG, "mesg",
5585 "single-line log message for commit above (open editor if empty)" },
5588 struct got_histedit_list_entry {
5589 TAILQ_ENTRY(got_histedit_list_entry) entry;
5590 struct got_object_id *commit_id;
5591 const struct got_histedit_cmd *cmd;
5594 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5596 static const struct got_error *
5597 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5598 FILE *f, struct got_repository *repo)
5600 const struct got_error *err = NULL;
5601 char *logmsg = NULL, *id_str = NULL;
5602 struct got_commit_object *commit = NULL;
5605 err = got_object_open_as_commit(&commit, repo, commit_id);
5609 err = get_short_logmsg(&logmsg, 34, commit);
5613 err = got_object_id_str(&id_str, commit_id);
5617 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5619 err = got_ferror(f, GOT_ERR_IO);
5622 got_object_commit_close(commit);
5628 static const struct got_error *
5629 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5630 struct got_repository *repo)
5632 const struct got_error *err = NULL;
5633 struct got_object_qid *qid;
5635 if (SIMPLEQ_EMPTY(commits))
5636 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5638 SIMPLEQ_FOREACH(qid, commits, entry) {
5639 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5648 static const struct got_error *
5649 write_cmd_list(FILE *f, const char *branch_name,
5650 struct got_object_id_queue *commits)
5652 const struct got_error *err = NULL;
5655 struct got_object_qid *qid;
5657 qid = SIMPLEQ_FIRST(commits);
5658 err = got_object_id_str(&id_str, qid->id);
5663 "# Editing the history of branch '%s' starting at\n"
5665 "# Commits will be processed in order from top to "
5666 "bottom of this file.\n", branch_name, id_str);
5668 err = got_ferror(f, GOT_ERR_IO);
5672 n = fprintf(f, "# Available histedit commands:\n");
5674 err = got_ferror(f, GOT_ERR_IO);
5678 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5679 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5680 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5683 err = got_ferror(f, GOT_ERR_IO);
5692 static const struct got_error *
5693 histedit_syntax_error(int lineno)
5695 static char msg[42];
5698 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5700 if (ret == -1 || ret >= sizeof(msg))
5701 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5703 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5706 static const struct got_error *
5707 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5708 char *logmsg, struct got_repository *repo)
5710 const struct got_error *err;
5711 struct got_commit_object *folded_commit = NULL;
5712 char *id_str, *folded_logmsg = NULL;
5714 err = got_object_id_str(&id_str, hle->commit_id);
5718 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5722 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5725 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5726 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5727 folded_logmsg) == -1) {
5728 err = got_error_from_errno("asprintf");
5732 got_object_commit_close(folded_commit);
5734 free(folded_logmsg);
5738 static struct got_histedit_list_entry *
5739 get_folded_commits(struct got_histedit_list_entry *hle)
5741 struct got_histedit_list_entry *prev, *folded = NULL;
5743 prev = TAILQ_PREV(hle, got_histedit_list, entry);
5744 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5745 prev->cmd->code == GOT_HISTEDIT_DROP)) {
5746 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5748 prev = TAILQ_PREV(prev, got_histedit_list, entry);
5754 static const struct got_error *
5755 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5756 struct got_repository *repo)
5758 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5759 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5760 const struct got_error *err = NULL;
5761 struct got_commit_object *commit = NULL;
5763 struct got_histedit_list_entry *folded = NULL;
5765 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5769 folded = get_folded_commits(hle);
5771 while (folded != hle) {
5772 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5773 folded = TAILQ_NEXT(folded, entry);
5776 err = append_folded_commit_msg(&new_msg, folded,
5782 folded = TAILQ_NEXT(folded, entry);
5786 err = got_object_id_str(&id_str, hle->commit_id);
5789 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5792 if (asprintf(&new_msg,
5793 "%s\n# original log message of commit %s: %s",
5794 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5795 err = got_error_from_errno("asprintf");
5801 err = got_object_id_str(&id_str, hle->commit_id);
5805 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5809 dprintf(fd, logmsg);
5812 err = get_editor(&editor);
5816 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5818 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5820 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5823 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5824 err = got_error_from_errno2("unlink", logmsg_path);
5830 got_object_commit_close(commit);
5834 static const struct got_error *
5835 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5836 FILE *f, struct got_repository *repo)
5838 const struct got_error *err = NULL;
5839 char *line = NULL, *p, *end;
5843 const struct got_histedit_cmd *cmd;
5844 struct got_object_id *commit_id = NULL;
5845 struct got_histedit_list_entry *hle = NULL;
5848 len = getline(&line, &size, f);
5850 const struct got_error *getline_err;
5853 getline_err = got_error_from_errno("getline");
5854 err = got_ferror(f, getline_err->code);
5859 while (isspace((unsigned char)p[0]))
5861 if (p[0] == '#' || p[0] == '\0') {
5867 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5868 cmd = &got_histedit_cmds[i];
5869 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5870 isspace((unsigned char)p[strlen(cmd->name)])) {
5871 p += strlen(cmd->name);
5874 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5879 if (i == nitems(got_histedit_cmds)) {
5880 err = histedit_syntax_error(lineno);
5883 while (isspace((unsigned char)p[0]))
5885 if (cmd->code == GOT_HISTEDIT_MESG) {
5886 if (hle == NULL || hle->logmsg != NULL) {
5887 err = got_error(GOT_ERR_HISTEDIT_CMD);
5891 err = histedit_edit_logmsg(hle, repo);
5895 hle->logmsg = strdup(p);
5896 if (hle->logmsg == NULL) {
5897 err = got_error_from_errno("strdup");
5906 while (end[0] && !isspace((unsigned char)end[0]))
5910 err = got_object_resolve_id_str(&commit_id, repo, p);
5912 /* override error code */
5913 err = histedit_syntax_error(lineno);
5917 hle = malloc(sizeof(*hle));
5919 err = got_error_from_errno("malloc");
5923 hle->commit_id = commit_id;
5928 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5936 static const struct got_error *
5937 histedit_check_script(struct got_histedit_list *histedit_cmds,
5938 struct got_object_id_queue *commits, struct got_repository *repo)
5940 const struct got_error *err = NULL;
5941 struct got_object_qid *qid;
5942 struct got_histedit_list_entry *hle;
5943 static char msg[80];
5946 if (TAILQ_EMPTY(histedit_cmds))
5947 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5948 "histedit script contains no commands");
5949 if (SIMPLEQ_EMPTY(commits))
5950 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5952 SIMPLEQ_FOREACH(qid, commits, entry) {
5953 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5954 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5958 err = got_object_id_str(&id_str, qid->id);
5961 snprintf(msg, sizeof(msg),
5962 "commit %s missing from histedit script", id_str);
5964 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5968 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5969 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5970 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5971 "last commit in histedit script cannot be folded");
5976 static const struct got_error *
5977 histedit_run_editor(struct got_histedit_list *histedit_cmds,
5978 const char *path, struct got_object_id_queue *commits,
5979 struct got_repository *repo)
5981 const struct got_error *err = NULL;
5985 err = get_editor(&editor);
5989 if (spawn_editor(editor, path) == -1) {
5990 err = got_error_from_errno("failed spawning editor");
5994 f = fopen(path, "r");
5996 err = got_error_from_errno("fopen");
5999 err = histedit_parse_list(histedit_cmds, f, repo);
6003 err = histedit_check_script(histedit_cmds, commits, repo);
6005 if (f && fclose(f) != 0 && err == NULL)
6006 err = got_error_from_errno("fclose");
6011 static const struct got_error *
6012 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
6013 struct got_object_id_queue *, const char *, const char *,
6014 struct got_repository *);
6016 static const struct got_error *
6017 histedit_edit_script(struct got_histedit_list *histedit_cmds,
6018 struct got_object_id_queue *commits, const char *branch_name,
6019 struct got_repository *repo)
6021 const struct got_error *err;
6025 err = got_opentemp_named(&path, &f, "got-histedit");
6029 err = write_cmd_list(f, branch_name, commits);
6033 err = histedit_write_commit_list(commits, f, repo);
6037 if (fclose(f) != 0) {
6038 err = got_error_from_errno("fclose");
6043 err = histedit_run_editor(histedit_cmds, path, commits, repo);
6045 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6046 err->code != GOT_ERR_HISTEDIT_CMD)
6048 err = histedit_edit_list_retry(histedit_cmds, err,
6049 commits, path, branch_name, repo);
6052 if (f && fclose(f) != 0 && err == NULL)
6053 err = got_error_from_errno("fclose");
6054 if (path && unlink(path) != 0 && err == NULL)
6055 err = got_error_from_errno2("unlink", path);
6060 static const struct got_error *
6061 histedit_save_list(struct got_histedit_list *histedit_cmds,
6062 struct got_worktree *worktree, struct got_repository *repo)
6064 const struct got_error *err = NULL;
6067 struct got_histedit_list_entry *hle;
6068 struct got_commit_object *commit = NULL;
6070 err = got_worktree_get_histedit_script_path(&path, worktree);
6074 f = fopen(path, "w");
6076 err = got_error_from_errno2("fopen", path);
6079 TAILQ_FOREACH(hle, histedit_cmds, entry) {
6080 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6086 int n = fprintf(f, "%c %s\n",
6087 GOT_HISTEDIT_MESG, hle->logmsg);
6089 err = got_ferror(f, GOT_ERR_IO);
6095 if (f && fclose(f) != 0 && err == NULL)
6096 err = got_error_from_errno("fclose");
6099 got_object_commit_close(commit);
6104 histedit_free_list(struct got_histedit_list *histedit_cmds)
6106 struct got_histedit_list_entry *hle;
6108 while ((hle = TAILQ_FIRST(histedit_cmds))) {
6109 TAILQ_REMOVE(histedit_cmds, hle, entry);
6114 static const struct got_error *
6115 histedit_load_list(struct got_histedit_list *histedit_cmds,
6116 const char *path, struct got_repository *repo)
6118 const struct got_error *err = NULL;
6121 f = fopen(path, "r");
6123 err = got_error_from_errno2("fopen", path);
6127 err = histedit_parse_list(histedit_cmds, f, repo);
6129 if (f && fclose(f) != 0 && err == NULL)
6130 err = got_error_from_errno("fclose");
6134 static const struct got_error *
6135 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6136 const struct got_error *edit_err, struct got_object_id_queue *commits,
6137 const char *path, const char *branch_name, struct got_repository *repo)
6139 const struct got_error *err = NULL, *prev_err = edit_err;
6142 while (resp != 'c' && resp != 'r' && resp != 'a') {
6143 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6144 "or (a)bort: ", getprogname(), prev_err->msg);
6149 histedit_free_list(histedit_cmds);
6150 err = histedit_run_editor(histedit_cmds, path, commits,
6153 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6154 err->code != GOT_ERR_HISTEDIT_CMD)
6161 } else if (resp == 'r') {
6162 histedit_free_list(histedit_cmds);
6163 err = histedit_edit_script(histedit_cmds,
6164 commits, branch_name, repo);
6166 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6167 err->code != GOT_ERR_HISTEDIT_CMD)
6174 } else if (resp == 'a') {
6175 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6178 printf("invalid response '%c'\n", resp);
6184 static const struct got_error *
6185 histedit_complete(struct got_worktree *worktree,
6186 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6187 struct got_reference *branch, struct got_repository *repo)
6189 printf("Switching work tree to %s\n",
6190 got_ref_get_symref_target(branch));
6191 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6195 static const struct got_error *
6196 show_histedit_progress(struct got_commit_object *commit,
6197 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6199 const struct got_error *err;
6200 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6202 err = got_object_id_str(&old_id_str, hle->commit_id);
6207 err = got_object_id_str(&new_id_str, new_id);
6212 old_id_str[12] = '\0';
6214 new_id_str[12] = '\0';
6217 logmsg = strdup(hle->logmsg);
6218 if (logmsg == NULL) {
6219 err = got_error_from_errno("strdup");
6222 trim_logmsg(logmsg, 42);
6224 err = get_short_logmsg(&logmsg, 42, commit);
6229 switch (hle->cmd->code) {
6230 case GOT_HISTEDIT_PICK:
6231 case GOT_HISTEDIT_EDIT:
6232 printf("%s -> %s: %s\n", old_id_str,
6233 new_id_str ? new_id_str : "no-op change", logmsg);
6235 case GOT_HISTEDIT_DROP:
6236 case GOT_HISTEDIT_FOLD:
6237 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6249 static const struct got_error *
6250 histedit_commit(struct got_pathlist_head *merged_paths,
6251 struct got_worktree *worktree, struct got_fileindex *fileindex,
6252 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6253 struct got_repository *repo)
6255 const struct got_error *err;
6256 struct got_commit_object *commit;
6257 struct got_object_id *new_commit_id;
6259 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6260 && hle->logmsg == NULL) {
6261 err = histedit_edit_logmsg(hle, repo);
6266 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6270 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6271 worktree, fileindex, tmp_branch, commit, hle->commit_id,
6274 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6276 err = show_histedit_progress(commit, hle, NULL);
6278 err = show_histedit_progress(commit, hle, new_commit_id);
6279 free(new_commit_id);
6282 got_object_commit_close(commit);
6286 static const struct got_error *
6287 histedit_skip_commit(struct got_histedit_list_entry *hle,
6288 struct got_worktree *worktree, struct got_repository *repo)
6290 const struct got_error *error;
6291 struct got_commit_object *commit;
6293 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6298 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6302 error = show_histedit_progress(commit, hle, NULL);
6303 got_object_commit_close(commit);
6307 static const struct got_error *
6308 check_local_changes(void *arg, unsigned char status,
6309 unsigned char staged_status, const char *path,
6310 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
6311 struct got_object_id *commit_id, int dirfd, const char *de_name)
6313 int *have_local_changes = arg;
6316 case GOT_STATUS_ADD:
6317 case GOT_STATUS_DELETE:
6318 case GOT_STATUS_MODIFY:
6319 case GOT_STATUS_CONFLICT:
6320 *have_local_changes = 1;
6321 return got_error(GOT_ERR_CANCELLED);
6326 switch (staged_status) {
6327 case GOT_STATUS_ADD:
6328 case GOT_STATUS_DELETE:
6329 case GOT_STATUS_MODIFY:
6330 *have_local_changes = 1;
6331 return got_error(GOT_ERR_CANCELLED);
6339 static const struct got_error *
6340 cmd_histedit(int argc, char *argv[])
6342 const struct got_error *error = NULL;
6343 struct got_worktree *worktree = NULL;
6344 struct got_fileindex *fileindex = NULL;
6345 struct got_repository *repo = NULL;
6347 struct got_reference *branch = NULL;
6348 struct got_reference *tmp_branch = NULL;
6349 struct got_object_id *resume_commit_id = NULL;
6350 struct got_object_id *base_commit_id = NULL;
6351 struct got_object_id *head_commit_id = NULL;
6352 struct got_commit_object *commit = NULL;
6353 int ch, rebase_in_progress = 0, did_something;
6354 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6355 const char *edit_script_path = NULL;
6356 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6357 struct got_object_id_queue commits;
6358 struct got_pathlist_head merged_paths;
6359 const struct got_object_id_queue *parent_ids;
6360 struct got_object_qid *pid;
6361 struct got_histedit_list histedit_cmds;
6362 struct got_histedit_list_entry *hle;
6364 SIMPLEQ_INIT(&commits);
6365 TAILQ_INIT(&histedit_cmds);
6366 TAILQ_INIT(&merged_paths);
6368 while ((ch = getopt(argc, argv, "acF:")) != -1) {
6377 edit_script_path = optarg;
6389 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6390 "unveil", NULL) == -1)
6393 if (abort_edit && continue_edit)
6399 * This command cannot apply unveil(2) in all cases because the
6400 * user may choose to run an editor to edit the histedit script
6401 * and to edit individual commit log messages.
6402 * unveil(2) traverses exec(2); if an editor is used we have to
6403 * apply unveil after edit script and log messages have been written.
6404 * XXX TODO: Make use of unveil(2) where possible.
6407 cwd = getcwd(NULL, 0);
6409 error = got_error_from_errno("getcwd");
6412 error = got_worktree_open(&worktree, cwd);
6416 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6421 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6424 if (rebase_in_progress) {
6425 error = got_error(GOT_ERR_REBASING);
6429 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6433 if (edit_in_progress && abort_edit) {
6434 error = got_worktree_histedit_continue(&resume_commit_id,
6435 &tmp_branch, &branch, &base_commit_id, &fileindex,
6439 printf("Switching work tree to %s\n",
6440 got_ref_get_symref_target(branch));
6441 error = got_worktree_histedit_abort(worktree, fileindex, repo,
6442 branch, base_commit_id, update_progress, &did_something);
6445 printf("Histedit of %s aborted\n",
6446 got_ref_get_symref_target(branch));
6447 goto done; /* nothing else to do */
6448 } else if (abort_edit) {
6449 error = got_error(GOT_ERR_NOT_HISTEDIT);
6453 if (continue_edit) {
6456 if (!edit_in_progress) {
6457 error = got_error(GOT_ERR_NOT_HISTEDIT);
6461 error = got_worktree_get_histedit_script_path(&path, worktree);
6465 error = histedit_load_list(&histedit_cmds, path, repo);
6470 error = got_worktree_histedit_continue(&resume_commit_id,
6471 &tmp_branch, &branch, &base_commit_id, &fileindex,
6476 error = got_ref_resolve(&head_commit_id, repo, branch);
6480 error = got_object_open_as_commit(&commit, repo,
6484 parent_ids = got_object_commit_get_parent_ids(commit);
6485 pid = SIMPLEQ_FIRST(parent_ids);
6487 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6490 error = collect_commits(&commits, head_commit_id, pid->id,
6491 base_commit_id, got_worktree_get_path_prefix(worktree),
6492 GOT_ERR_HISTEDIT_PATH, repo);
6493 got_object_commit_close(commit);
6498 if (edit_in_progress) {
6499 error = got_error(GOT_ERR_HISTEDIT_BUSY);
6503 error = got_ref_open(&branch, repo,
6504 got_worktree_get_head_ref_name(worktree), 0);
6508 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6509 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6510 "will not edit commit history of a branch outside "
6511 "the \"refs/heads/\" reference namespace");
6515 error = got_ref_resolve(&head_commit_id, repo, branch);
6516 got_ref_close(branch);
6521 error = got_object_open_as_commit(&commit, repo,
6525 parent_ids = got_object_commit_get_parent_ids(commit);
6526 pid = SIMPLEQ_FIRST(parent_ids);
6528 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6531 error = collect_commits(&commits, head_commit_id, pid->id,
6532 got_worktree_get_base_commit_id(worktree),
6533 got_worktree_get_path_prefix(worktree),
6534 GOT_ERR_HISTEDIT_PATH, repo);
6535 got_object_commit_close(commit);
6540 if (SIMPLEQ_EMPTY(&commits)) {
6541 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6545 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6546 &base_commit_id, &fileindex, worktree, repo);
6550 if (edit_script_path) {
6551 error = histedit_load_list(&histedit_cmds,
6552 edit_script_path, repo);
6554 got_worktree_histedit_abort(worktree, fileindex,
6555 repo, branch, base_commit_id,
6556 update_progress, &did_something);
6560 const char *branch_name;
6561 branch_name = got_ref_get_symref_target(branch);
6562 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6564 error = histedit_edit_script(&histedit_cmds, &commits,
6567 got_worktree_histedit_abort(worktree, fileindex,
6568 repo, branch, base_commit_id,
6569 update_progress, &did_something);
6575 error = histedit_save_list(&histedit_cmds, worktree,
6578 got_worktree_histedit_abort(worktree, fileindex,
6579 repo, branch, base_commit_id,
6580 update_progress, &did_something);
6586 error = histedit_check_script(&histedit_cmds, &commits, repo);
6590 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6591 if (resume_commit_id) {
6592 if (got_object_id_cmp(hle->commit_id,
6593 resume_commit_id) != 0)
6596 resume_commit_id = NULL;
6597 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6598 hle->cmd->code == GOT_HISTEDIT_FOLD) {
6599 error = histedit_skip_commit(hle, worktree,
6604 struct got_pathlist_head paths;
6605 int have_changes = 0;
6608 error = got_pathlist_append(&paths, "", NULL);
6611 error = got_worktree_status(worktree, &paths,
6612 repo, check_local_changes, &have_changes,
6613 check_cancelled, NULL);
6614 got_pathlist_free(&paths);
6616 if (error->code != GOT_ERR_CANCELLED)
6618 if (sigint_received || sigpipe_received)
6622 error = histedit_commit(NULL, worktree,
6623 fileindex, tmp_branch, hle, repo);
6627 error = got_object_open_as_commit(
6628 &commit, repo, hle->commit_id);
6631 error = show_histedit_progress(commit,
6633 got_object_commit_close(commit);
6642 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6643 error = histedit_skip_commit(hle, worktree, repo);
6649 error = got_object_open_as_commit(&commit, repo,
6653 parent_ids = got_object_commit_get_parent_ids(commit);
6654 pid = SIMPLEQ_FIRST(parent_ids);
6656 error = got_worktree_histedit_merge_files(&merged_paths,
6657 worktree, fileindex, pid->id, hle->commit_id, repo,
6658 rebase_progress, &rebase_status, check_cancelled, NULL);
6661 got_object_commit_close(commit);
6664 if (rebase_status == GOT_STATUS_CONFLICT) {
6665 got_worktree_rebase_pathlist_free(&merged_paths);
6669 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6671 error = got_object_id_str(&id_str, hle->commit_id);
6674 printf("Stopping histedit for amending commit %s\n",
6677 got_worktree_rebase_pathlist_free(&merged_paths);
6678 error = got_worktree_histedit_postpone(worktree,
6683 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6684 error = histedit_skip_commit(hle, worktree, repo);
6690 error = histedit_commit(&merged_paths, worktree, fileindex,
6691 tmp_branch, hle, repo);
6692 got_worktree_rebase_pathlist_free(&merged_paths);
6697 if (rebase_status == GOT_STATUS_CONFLICT) {
6698 error = got_worktree_histedit_postpone(worktree, fileindex);
6701 error = got_error_msg(GOT_ERR_CONFLICTS,
6702 "conflicts must be resolved before rebasing can continue");
6704 error = histedit_complete(worktree, fileindex, tmp_branch,
6707 got_object_id_queue_free(&commits);
6708 histedit_free_list(&histedit_cmds);
6709 free(head_commit_id);
6710 free(base_commit_id);
6711 free(resume_commit_id);
6713 got_object_commit_close(commit);
6715 got_ref_close(branch);
6717 got_ref_close(tmp_branch);
6719 got_worktree_close(worktree);
6721 got_repo_close(repo);
6726 usage_integrate(void)
6728 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6732 static const struct got_error *
6733 cmd_integrate(int argc, char *argv[])
6735 const struct got_error *error = NULL;
6736 struct got_repository *repo = NULL;
6737 struct got_worktree *worktree = NULL;
6738 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6739 const char *branch_arg = NULL;
6740 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6741 struct got_fileindex *fileindex = NULL;
6742 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6743 int ch, did_something = 0;
6745 while ((ch = getopt(argc, argv, "")) != -1) {
6758 branch_arg = argv[0];
6760 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6761 "unveil", NULL) == -1)
6764 cwd = getcwd(NULL, 0);
6766 error = got_error_from_errno("getcwd");
6770 error = got_worktree_open(&worktree, cwd);
6774 error = check_rebase_or_histedit_in_progress(worktree);
6778 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6783 error = apply_unveil(got_repo_get_path(repo), 0,
6784 got_worktree_get_root_path(worktree));
6788 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6789 error = got_error_from_errno("asprintf");
6793 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6794 &base_branch_ref, worktree, refname, repo);
6798 refname = strdup(got_ref_get_name(branch_ref));
6799 if (refname == NULL) {
6800 error = got_error_from_errno("strdup");
6801 got_worktree_integrate_abort(worktree, fileindex, repo,
6802 branch_ref, base_branch_ref);
6805 base_refname = strdup(got_ref_get_name(base_branch_ref));
6806 if (base_refname == NULL) {
6807 error = got_error_from_errno("strdup");
6808 got_worktree_integrate_abort(worktree, fileindex, repo,
6809 branch_ref, base_branch_ref);
6813 error = got_ref_resolve(&commit_id, repo, branch_ref);
6817 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6821 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6822 error = got_error_msg(GOT_ERR_SAME_BRANCH,
6823 "specified branch has already been integrated");
6824 got_worktree_integrate_abort(worktree, fileindex, repo,
6825 branch_ref, base_branch_ref);
6829 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6831 if (error->code == GOT_ERR_ANCESTRY)
6832 error = got_error(GOT_ERR_REBASE_REQUIRED);
6833 got_worktree_integrate_abort(worktree, fileindex, repo,
6834 branch_ref, base_branch_ref);
6838 error = got_worktree_integrate_continue(worktree, fileindex, repo,
6839 branch_ref, base_branch_ref, update_progress, &did_something,
6840 check_cancelled, NULL);
6844 printf("Integrated %s into %s\n", refname, base_refname);
6847 got_repo_close(repo);
6849 got_worktree_close(worktree);
6851 free(base_commit_id);
6861 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6862 "[file-path ...]\n",
6867 static const struct got_error *
6868 print_stage(void *arg, unsigned char status, unsigned char staged_status,
6869 const char *path, struct got_object_id *blob_id,
6870 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6871 int dirfd, const char *de_name)
6873 const struct got_error *err = NULL;
6874 char *id_str = NULL;
6876 if (staged_status != GOT_STATUS_ADD &&
6877 staged_status != GOT_STATUS_MODIFY &&
6878 staged_status != GOT_STATUS_DELETE)
6881 if (staged_status == GOT_STATUS_ADD ||
6882 staged_status == GOT_STATUS_MODIFY)
6883 err = got_object_id_str(&id_str, staged_blob_id);
6885 err = got_object_id_str(&id_str, blob_id);
6889 printf("%s %c %s\n", id_str, staged_status, path);
6894 static const struct got_error *
6895 cmd_stage(int argc, char *argv[])
6897 const struct got_error *error = NULL;
6898 struct got_repository *repo = NULL;
6899 struct got_worktree *worktree = NULL;
6901 struct got_pathlist_head paths;
6902 struct got_pathlist_entry *pe;
6903 int ch, list_stage = 0, pflag = 0;
6904 FILE *patch_script_file = NULL;
6905 const char *patch_script_path = NULL;
6906 struct choose_patch_arg cpa;
6910 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6919 patch_script_path = optarg;
6931 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6932 "unveil", NULL) == -1)
6935 if (list_stage && (pflag || patch_script_path))
6936 errx(1, "-l option cannot be used with other options");
6937 if (patch_script_path && !pflag)
6938 errx(1, "-F option can only be used together with -p option");
6940 cwd = getcwd(NULL, 0);
6942 error = got_error_from_errno("getcwd");
6946 error = got_worktree_open(&worktree, cwd);
6950 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6955 if (patch_script_path) {
6956 patch_script_file = fopen(patch_script_path, "r");
6957 if (patch_script_file == NULL) {
6958 error = got_error_from_errno2("fopen",
6963 error = apply_unveil(got_repo_get_path(repo), 0,
6964 got_worktree_get_root_path(worktree));
6968 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6973 error = got_worktree_status(worktree, &paths, repo,
6974 print_stage, NULL, check_cancelled, NULL);
6976 cpa.patch_script_file = patch_script_file;
6977 cpa.action = "stage";
6978 error = got_worktree_stage(worktree, &paths,
6979 pflag ? NULL : print_status, NULL,
6980 pflag ? choose_patch : NULL, &cpa, repo);
6983 if (patch_script_file && fclose(patch_script_file) == EOF &&
6985 error = got_error_from_errno2("fclose", patch_script_path);
6987 got_repo_close(repo);
6989 got_worktree_close(worktree);
6990 TAILQ_FOREACH(pe, &paths, entry)
6991 free((char *)pe->path);
6992 got_pathlist_free(&paths);
7000 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
7001 "[file-path ...]\n",
7007 static const struct got_error *
7008 cmd_unstage(int argc, char *argv[])
7010 const struct got_error *error = NULL;
7011 struct got_repository *repo = NULL;
7012 struct got_worktree *worktree = NULL;
7014 struct got_pathlist_head paths;
7015 struct got_pathlist_entry *pe;
7016 int ch, did_something = 0, pflag = 0;
7017 FILE *patch_script_file = NULL;
7018 const char *patch_script_path = NULL;
7019 struct choose_patch_arg cpa;
7023 while ((ch = getopt(argc, argv, "pF:")) != -1) {
7029 patch_script_path = optarg;
7041 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7042 "unveil", NULL) == -1)
7045 if (patch_script_path && !pflag)
7046 errx(1, "-F option can only be used together with -p option");
7048 cwd = getcwd(NULL, 0);
7050 error = got_error_from_errno("getcwd");
7054 error = got_worktree_open(&worktree, cwd);
7058 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7063 if (patch_script_path) {
7064 patch_script_file = fopen(patch_script_path, "r");
7065 if (patch_script_file == NULL) {
7066 error = got_error_from_errno2("fopen",
7072 error = apply_unveil(got_repo_get_path(repo), 0,
7073 got_worktree_get_root_path(worktree));
7077 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7081 cpa.patch_script_file = patch_script_file;
7082 cpa.action = "unstage";
7083 error = got_worktree_unstage(worktree, &paths, update_progress,
7084 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
7086 if (patch_script_file && fclose(patch_script_file) == EOF &&
7088 error = got_error_from_errno2("fclose", patch_script_path);
7090 got_repo_close(repo);
7092 got_worktree_close(worktree);
7093 TAILQ_FOREACH(pe, &paths, entry)
7094 free((char *)pe->path);
7095 got_pathlist_free(&paths);
7103 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7104 "arg1 [arg2 ...]\n", getprogname());
7108 static const struct got_error *
7109 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7111 const struct got_error *err;
7112 struct got_blob_object *blob;
7114 err = got_object_open_as_blob(&blob, repo, id, 8192);
7118 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7119 got_object_blob_close(blob);
7123 static const struct got_error *
7124 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7126 const struct got_error *err;
7127 struct got_tree_object *tree;
7130 err = got_object_open_as_tree(&tree, repo, id);
7134 nentries = got_object_tree_get_nentries(tree);
7135 for (i = 0; i < nentries; i++) {
7136 struct got_tree_entry *te;
7138 if (sigint_received || sigpipe_received)
7140 te = got_object_tree_get_entry(tree, i);
7141 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7144 fprintf(outfile, "%s %.7o %s\n", id_str,
7145 got_tree_entry_get_mode(te),
7146 got_tree_entry_get_name(te));
7150 got_object_tree_close(tree);
7154 static const struct got_error *
7155 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7157 const struct got_error *err;
7158 struct got_commit_object *commit;
7159 const struct got_object_id_queue *parent_ids;
7160 struct got_object_qid *pid;
7161 char *id_str = NULL;
7162 const char *logmsg = NULL;
7164 err = got_object_open_as_commit(&commit, repo, id);
7168 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7172 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7173 parent_ids = got_object_commit_get_parent_ids(commit);
7174 fprintf(outfile, "numparents %d\n",
7175 got_object_commit_get_nparents(commit));
7176 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7178 err = got_object_id_str(&pid_str, pid->id);
7181 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7184 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7185 got_object_commit_get_author(commit),
7186 got_object_commit_get_author_time(commit));
7188 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7189 got_object_commit_get_author(commit),
7190 got_object_commit_get_committer_time(commit));
7192 logmsg = got_object_commit_get_logmsg_raw(commit);
7193 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7194 fprintf(outfile, "%s", logmsg);
7197 got_object_commit_close(commit);
7201 static const struct got_error *
7202 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7204 const struct got_error *err;
7205 struct got_tag_object *tag;
7206 char *id_str = NULL;
7207 const char *tagmsg = NULL;
7209 err = got_object_open_as_tag(&tag, repo, id);
7213 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7217 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7219 switch (got_object_tag_get_object_type(tag)) {
7220 case GOT_OBJ_TYPE_BLOB:
7221 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7222 GOT_OBJ_LABEL_BLOB);
7224 case GOT_OBJ_TYPE_TREE:
7225 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7226 GOT_OBJ_LABEL_TREE);
7228 case GOT_OBJ_TYPE_COMMIT:
7229 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7230 GOT_OBJ_LABEL_COMMIT);
7232 case GOT_OBJ_TYPE_TAG:
7233 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7240 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7241 got_object_tag_get_name(tag));
7243 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7244 got_object_tag_get_tagger(tag),
7245 got_object_tag_get_tagger_time(tag));
7247 tagmsg = got_object_tag_get_message(tag);
7248 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7249 fprintf(outfile, "%s", tagmsg);
7252 got_object_tag_close(tag);
7256 static const struct got_error *
7257 cmd_cat(int argc, char *argv[])
7259 const struct got_error *error;
7260 struct got_repository *repo = NULL;
7261 struct got_worktree *worktree = NULL;
7262 char *cwd = NULL, *repo_path = NULL, *label = NULL;
7263 const char *commit_id_str = NULL;
7264 struct got_object_id *id = NULL, *commit_id = NULL;
7265 int ch, obj_type, i, force_path = 0;
7268 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7273 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7276 commit_id_str = optarg;
7279 repo_path = realpath(optarg, NULL);
7280 if (repo_path == NULL)
7281 return got_error_from_errno2("realpath",
7283 got_path_strip_trailing_slashes(repo_path);
7297 cwd = getcwd(NULL, 0);
7299 error = got_error_from_errno("getcwd");
7302 error = got_worktree_open(&worktree, cwd);
7303 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7306 if (repo_path == NULL) {
7308 got_worktree_get_repo_path(worktree));
7309 if (repo_path == NULL) {
7310 error = got_error_from_errno("strdup");
7316 if (repo_path == NULL) {
7317 repo_path = getcwd(NULL, 0);
7318 if (repo_path == NULL)
7319 return got_error_from_errno("getcwd");
7322 error = got_repo_open(&repo, repo_path, NULL);
7327 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7331 if (commit_id_str == NULL)
7332 commit_id_str = GOT_REF_HEAD;
7333 error = got_repo_match_object_id(&commit_id, NULL,
7334 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7338 for (i = 0; i < argc; i++) {
7340 error = got_object_id_by_path(&id, repo, commit_id,
7345 error = got_repo_match_object_id(&id, &label, argv[i],
7346 GOT_OBJ_TYPE_ANY, 0, repo);
7348 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7349 error->code != GOT_ERR_NOT_REF)
7351 error = got_object_id_by_path(&id, repo,
7352 commit_id, argv[i]);
7358 error = got_object_get_type(&obj_type, repo, id);
7363 case GOT_OBJ_TYPE_BLOB:
7364 error = cat_blob(id, repo, stdout);
7366 case GOT_OBJ_TYPE_TREE:
7367 error = cat_tree(id, repo, stdout);
7369 case GOT_OBJ_TYPE_COMMIT:
7370 error = cat_commit(id, repo, stdout);
7372 case GOT_OBJ_TYPE_TAG:
7373 error = cat_tag(id, repo, stdout);
7376 error = got_error(GOT_ERR_OBJ_TYPE);
7391 got_worktree_close(worktree);
7393 const struct got_error *repo_error;
7394 repo_error = got_repo_close(repo);