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, 1);
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, GOT_REF_HEAD, 0);
2629 error = got_ref_resolve(&commit_id, repo, head_ref);
2630 got_ref_close(head_ref);
2634 error = got_repo_match_object_id(&commit_id, NULL,
2635 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2640 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2644 error = got_object_get_type(&obj_type, repo, obj_id);
2648 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2649 error = got_error(GOT_ERR_OBJ_TYPE);
2653 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2656 bca.f = got_opentemp();
2657 if (bca.f == NULL) {
2658 error = got_error_from_errno("got_opentemp");
2661 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2662 &bca.line_offsets, bca.f, blob);
2663 if (error || bca.nlines == 0)
2666 /* Don't include \n at EOF in the blame line count. */
2667 if (bca.line_offsets[bca.nlines - 1] == filesize)
2670 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2671 if (bca.lines == NULL) {
2672 error = got_error_from_errno("calloc");
2676 bca.nlines_prec = 0;
2684 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2685 check_cancelled, NULL);
2693 got_object_blob_close(blob);
2695 got_worktree_close(worktree);
2697 const struct got_error *repo_error;
2698 repo_error = got_repo_close(repo);
2703 for (i = 0; i < bca.nlines; i++) {
2704 struct blame_line *bline = &bca.lines[i];
2705 free(bline->id_str);
2706 free(bline->committer);
2710 free(bca.line_offsets);
2711 if (bca.f && fclose(bca.f) == EOF && error == NULL)
2712 error = got_error_from_errno("fclose");
2720 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2726 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2727 const char *root_path)
2729 int is_root_path = (strcmp(path, root_path) == 0);
2730 const char *modestr = "";
2731 mode_t mode = got_tree_entry_get_mode(te);
2733 path += strlen(root_path);
2734 while (path[0] == '/')
2737 if (got_object_tree_entry_is_submodule(te))
2739 else if (S_ISLNK(mode))
2741 else if (S_ISDIR(mode))
2743 else if (mode & S_IXUSR)
2746 printf("%s%s%s%s%s\n", id ? id : "", path,
2747 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
2750 static const struct got_error *
2751 print_tree(const char *path, struct got_object_id *commit_id,
2752 int show_ids, int recurse, const char *root_path,
2753 struct got_repository *repo)
2755 const struct got_error *err = NULL;
2756 struct got_object_id *tree_id = NULL;
2757 struct got_tree_object *tree = NULL;
2760 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2764 err = got_object_open_as_tree(&tree, repo, tree_id);
2767 nentries = got_object_tree_get_nentries(tree);
2768 for (i = 0; i < nentries; i++) {
2769 struct got_tree_entry *te;
2772 if (sigint_received || sigpipe_received)
2775 te = got_object_tree_get_entry(tree, i);
2778 err = got_object_id_str(&id_str,
2779 got_tree_entry_get_id(te));
2782 if (asprintf(&id, "%s ", id_str) == -1) {
2783 err = got_error_from_errno("asprintf");
2789 print_entry(te, id, path, root_path);
2792 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
2794 if (asprintf(&child_path, "%s%s%s", path,
2795 path[0] == '/' && path[1] == '\0' ? "" : "/",
2796 got_tree_entry_get_name(te)) == -1) {
2797 err = got_error_from_errno("asprintf");
2800 err = print_tree(child_path, commit_id, show_ids, 1,
2809 got_object_tree_close(tree);
2814 static const struct got_error *
2815 cmd_tree(int argc, char *argv[])
2817 const struct got_error *error;
2818 struct got_repository *repo = NULL;
2819 struct got_worktree *worktree = NULL;
2821 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2822 struct got_object_id *commit_id = NULL;
2823 char *commit_id_str = NULL;
2824 int show_ids = 0, recurse = 0;
2828 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2833 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2836 commit_id_str = optarg;
2839 repo_path = realpath(optarg, NULL);
2840 if (repo_path == NULL)
2841 return got_error_from_errno2("realpath",
2843 got_path_strip_trailing_slashes(repo_path);
2867 cwd = getcwd(NULL, 0);
2869 error = got_error_from_errno("getcwd");
2872 if (repo_path == NULL) {
2873 error = got_worktree_open(&worktree, cwd);
2874 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2880 strdup(got_worktree_get_repo_path(worktree));
2881 if (repo_path == NULL)
2882 error = got_error_from_errno("strdup");
2886 repo_path = strdup(cwd);
2887 if (repo_path == NULL) {
2888 error = got_error_from_errno("strdup");
2894 error = got_repo_open(&repo, repo_path, NULL);
2898 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2904 char *p, *worktree_subdir = cwd +
2905 strlen(got_worktree_get_root_path(worktree));
2906 if (asprintf(&p, "%s/%s",
2907 got_worktree_get_path_prefix(worktree),
2908 worktree_subdir) == -1) {
2909 error = got_error_from_errno("asprintf");
2912 error = got_repo_map_path(&in_repo_path, repo, p, 1);
2919 if (in_repo_path == NULL) {
2920 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2925 if (commit_id_str == NULL) {
2926 struct got_reference *head_ref;
2927 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2930 error = got_ref_resolve(&commit_id, repo, head_ref);
2931 got_ref_close(head_ref);
2935 error = got_repo_match_object_id(&commit_id, NULL,
2936 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2941 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2942 in_repo_path, repo);
2949 got_worktree_close(worktree);
2951 const struct got_error *repo_error;
2952 repo_error = got_repo_close(repo);
2962 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2966 static const struct got_error *
2967 print_status(void *arg, unsigned char status, unsigned char staged_status,
2968 const char *path, struct got_object_id *blob_id,
2969 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
2970 int dirfd, const char *de_name)
2972 if (status == staged_status && (status == GOT_STATUS_DELETE))
2973 status = GOT_STATUS_NO_CHANGE;
2974 printf("%c%c %s\n", status, staged_status, path);
2978 static const struct got_error *
2979 cmd_status(int argc, char *argv[])
2981 const struct got_error *error = NULL;
2982 struct got_repository *repo = NULL;
2983 struct got_worktree *worktree = NULL;
2985 struct got_pathlist_head paths;
2986 struct got_pathlist_entry *pe;
2991 while ((ch = getopt(argc, argv, "")) != -1) {
3003 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3007 cwd = getcwd(NULL, 0);
3009 error = got_error_from_errno("getcwd");
3013 error = got_worktree_open(&worktree, cwd);
3017 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3022 error = apply_unveil(got_repo_get_path(repo), 1,
3023 got_worktree_get_root_path(worktree));
3027 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3031 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
3032 check_cancelled, NULL);
3034 TAILQ_FOREACH(pe, &paths, entry)
3035 free((char *)pe->path);
3036 got_pathlist_free(&paths);
3045 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
3050 static const struct got_error *
3051 list_refs(struct got_repository *repo)
3053 static const struct got_error *err = NULL;
3054 struct got_reflist_head refs;
3055 struct got_reflist_entry *re;
3057 SIMPLEQ_INIT(&refs);
3058 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3062 SIMPLEQ_FOREACH(re, &refs, entry) {
3064 refstr = got_ref_to_str(re->ref);
3066 return got_error_from_errno("got_ref_to_str");
3067 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
3071 got_ref_list_free(&refs);
3075 static const struct got_error *
3076 delete_ref(struct got_repository *repo, const char *refname)
3078 const struct got_error *err = NULL;
3079 struct got_reference *ref;
3081 err = got_ref_open(&ref, repo, refname, 0);
3085 err = got_ref_delete(ref, repo);
3090 static const struct got_error *
3091 add_ref(struct got_repository *repo, const char *refname, const char *target)
3093 const struct got_error *err = NULL;
3094 struct got_object_id *id;
3095 struct got_reference *ref = NULL;
3098 * Don't let the user create a reference name with a leading '-'.
3099 * While technically a valid reference name, this case is usually
3100 * an unintended typo.
3102 if (refname[0] == '-')
3103 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3105 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3108 struct got_reference *target_ref;
3110 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3112 err = got_ref_open(&target_ref, repo, target, 0);
3115 err = got_ref_resolve(&id, repo, target_ref);
3116 got_ref_close(target_ref);
3121 err = got_ref_alloc(&ref, refname, id);
3125 err = got_ref_write(ref, repo);
3133 static const struct got_error *
3134 add_symref(struct got_repository *repo, const char *refname, const char *target)
3136 const struct got_error *err = NULL;
3137 struct got_reference *ref = NULL;
3138 struct got_reference *target_ref = NULL;
3141 * Don't let the user create a reference name with a leading '-'.
3142 * While technically a valid reference name, this case is usually
3143 * an unintended typo.
3145 if (refname[0] == '-')
3146 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
3148 err = got_ref_open(&target_ref, repo, target, 0);
3152 err = got_ref_alloc_symref(&ref, refname, target_ref);
3156 err = got_ref_write(ref, repo);
3159 got_ref_close(target_ref);
3165 static const struct got_error *
3166 cmd_ref(int argc, char *argv[])
3168 const struct got_error *error = NULL;
3169 struct got_repository *repo = NULL;
3170 struct got_worktree *worktree = NULL;
3171 char *cwd = NULL, *repo_path = NULL;
3172 int ch, do_list = 0, create_symref = 0;
3173 const char *delref = NULL;
3175 /* TODO: Add -s option for adding symbolic references. */
3176 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3182 repo_path = realpath(optarg, NULL);
3183 if (repo_path == NULL)
3184 return got_error_from_errno2("realpath",
3186 got_path_strip_trailing_slashes(repo_path);
3200 if (do_list && delref)
3201 errx(1, "-l and -d options are mutually exclusive\n");
3206 if (do_list || delref) {
3208 errx(1, "-s option cannot be used together with the "
3209 "-l or -d options");
3212 } else if (argc != 2)
3217 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3221 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3222 "sendfd unveil", NULL) == -1)
3226 cwd = getcwd(NULL, 0);
3228 error = got_error_from_errno("getcwd");
3232 if (repo_path == NULL) {
3233 error = got_worktree_open(&worktree, cwd);
3234 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3240 strdup(got_worktree_get_repo_path(worktree));
3241 if (repo_path == NULL)
3242 error = got_error_from_errno("strdup");
3246 repo_path = strdup(cwd);
3247 if (repo_path == NULL) {
3248 error = got_error_from_errno("strdup");
3254 error = got_repo_open(&repo, repo_path, NULL);
3258 error = apply_unveil(got_repo_get_path(repo), do_list,
3259 worktree ? got_worktree_get_root_path(worktree) : NULL);
3264 error = list_refs(repo);
3266 error = delete_ref(repo, delref);
3267 else if (create_symref)
3268 error = add_symref(repo, argv[0], argv[1]);
3270 error = add_ref(repo, argv[0], argv[1]);
3273 got_repo_close(repo);
3275 got_worktree_close(worktree);
3285 "usage: %s branch [-c commit] [-r repository] [-l] | -d name | "
3286 "[name]\n", getprogname());
3290 static const struct got_error *
3291 list_branch(struct got_repository *repo, struct got_worktree *worktree,
3292 struct got_reference *ref)
3294 const struct got_error *err = NULL;
3295 const char *refname, *marker = " ";
3298 refname = got_ref_get_name(ref);
3299 if (worktree && strcmp(refname,
3300 got_worktree_get_head_ref_name(worktree)) == 0) {
3301 struct got_object_id *id = NULL;
3303 err = got_ref_resolve(&id, repo, ref);
3306 if (got_object_id_cmp(id,
3307 got_worktree_get_base_commit_id(worktree)) == 0)
3314 if (strncmp(refname, "refs/heads/", 11) == 0)
3316 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3319 refstr = got_ref_to_str(ref);
3321 return got_error_from_errno("got_ref_to_str");
3323 printf("%s%s: %s\n", marker, refname, refstr);
3328 static const struct got_error *
3329 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
3331 const char *refname;
3333 if (worktree == NULL)
3334 return got_error(GOT_ERR_NOT_WORKTREE);
3336 refname = got_worktree_get_head_ref_name(worktree);
3338 if (strncmp(refname, "refs/heads/", 11) == 0)
3340 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
3343 printf("%s\n", refname);
3348 static const struct got_error *
3349 list_branches(struct got_repository *repo, struct got_worktree *worktree)
3351 static const struct got_error *err = NULL;
3352 struct got_reflist_head refs;
3353 struct got_reflist_entry *re;
3354 struct got_reference *temp_ref = NULL;
3355 int rebase_in_progress, histedit_in_progress;
3357 SIMPLEQ_INIT(&refs);
3360 err = got_worktree_rebase_in_progress(&rebase_in_progress,
3365 err = got_worktree_histedit_in_progress(&histedit_in_progress,
3370 if (rebase_in_progress || histedit_in_progress) {
3371 err = got_ref_open(&temp_ref, repo,
3372 got_worktree_get_head_ref_name(worktree), 0);
3375 list_branch(repo, worktree, temp_ref);
3376 got_ref_close(temp_ref);
3380 err = got_ref_list(&refs, repo, "refs/heads",
3381 got_ref_cmp_by_name, NULL);
3385 SIMPLEQ_FOREACH(re, &refs, entry)
3386 list_branch(repo, worktree, re->ref);
3388 got_ref_list_free(&refs);
3392 static const struct got_error *
3393 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3394 const char *branch_name)
3396 const struct got_error *err = NULL;
3397 struct got_reference *ref = NULL;
3400 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3401 return got_error_from_errno("asprintf");
3403 err = got_ref_open(&ref, repo, refname, 0);
3408 strcmp(got_worktree_get_head_ref_name(worktree),
3409 got_ref_get_name(ref)) == 0) {
3410 err = got_error_msg(GOT_ERR_SAME_BRANCH,
3411 "will not delete this work tree's current branch");
3415 err = got_ref_delete(ref, repo);
3423 static const struct got_error *
3424 add_branch(struct got_repository *repo, const char *branch_name,
3425 struct got_object_id *base_commit_id)
3427 const struct got_error *err = NULL;
3428 struct got_reference *ref = NULL;
3429 char *base_refname = NULL, *refname = NULL;
3432 * Don't let the user create a branch name with a leading '-'.
3433 * While technically a valid reference name, this case is usually
3434 * an unintended typo.
3436 if (branch_name[0] == '-')
3437 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
3439 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3440 err = got_error_from_errno("asprintf");
3444 err = got_ref_open(&ref, repo, refname, 0);
3446 err = got_error(GOT_ERR_BRANCH_EXISTS);
3448 } else if (err->code != GOT_ERR_NOT_REF)
3451 err = got_ref_alloc(&ref, refname, base_commit_id);
3455 err = got_ref_write(ref, repo);
3464 static const struct got_error *
3465 cmd_branch(int argc, char *argv[])
3467 const struct got_error *error = NULL;
3468 struct got_repository *repo = NULL;
3469 struct got_worktree *worktree = NULL;
3470 char *cwd = NULL, *repo_path = NULL;
3471 int ch, do_list = 0, do_show = 0;
3472 const char *delref = NULL, *commit_id_arg = NULL;
3474 while ((ch = getopt(argc, argv, "c:d:r:l")) != -1) {
3477 commit_id_arg = optarg;
3483 repo_path = realpath(optarg, NULL);
3484 if (repo_path == NULL)
3485 return got_error_from_errno2("realpath",
3487 got_path_strip_trailing_slashes(repo_path);
3498 if (do_list && delref)
3499 errx(1, "-l and -d options are mutually exclusive\n");
3504 if (!do_list && !delref && argc == 0)
3507 if ((do_list || delref || do_show) && commit_id_arg != NULL)
3508 errx(1, "-c option can only be used when creating a branch");
3510 if (do_list || delref) {
3513 } else if (!do_show && argc != 1)
3517 if (do_list || do_show) {
3518 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3522 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3523 "sendfd unveil", NULL) == -1)
3527 cwd = getcwd(NULL, 0);
3529 error = got_error_from_errno("getcwd");
3533 if (repo_path == NULL) {
3534 error = got_worktree_open(&worktree, cwd);
3535 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3541 strdup(got_worktree_get_repo_path(worktree));
3542 if (repo_path == NULL)
3543 error = got_error_from_errno("strdup");
3547 repo_path = strdup(cwd);
3548 if (repo_path == NULL) {
3549 error = got_error_from_errno("strdup");
3555 error = got_repo_open(&repo, repo_path, NULL);
3559 error = apply_unveil(got_repo_get_path(repo), do_list,
3560 worktree ? got_worktree_get_root_path(worktree) : NULL);
3565 error = show_current_branch(repo, worktree);
3567 error = list_branches(repo, worktree);
3569 error = delete_branch(repo, worktree, delref);
3571 struct got_object_id *commit_id;
3572 if (commit_id_arg == NULL)
3573 commit_id_arg = worktree ?
3574 got_worktree_get_head_ref_name(worktree) :
3576 error = got_repo_match_object_id(&commit_id, NULL,
3577 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
3580 error = add_branch(repo, argv[0], commit_id);
3585 got_repo_close(repo);
3587 got_worktree_close(worktree);
3598 "usage: %s tag [-r repository] | -l | "
3599 "[-m message] name [commit]\n", getprogname());
3604 static const struct got_error *
3605 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3607 const struct got_error *err = NULL;
3608 struct got_reflist_entry *re, *se, *new;
3609 struct got_object_id *re_id, *se_id;
3610 struct got_tag_object *re_tag, *se_tag;
3611 time_t re_time, se_time;
3613 SIMPLEQ_FOREACH(re, tags, entry) {
3614 se = SIMPLEQ_FIRST(sorted);
3616 err = got_reflist_entry_dup(&new, re);
3619 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3622 err = got_ref_resolve(&re_id, repo, re->ref);
3625 err = got_object_open_as_tag(&re_tag, repo, re_id);
3629 re_time = got_object_tag_get_tagger_time(re_tag);
3630 got_object_tag_close(re_tag);
3634 err = got_ref_resolve(&se_id, repo, re->ref);
3637 err = got_object_open_as_tag(&se_tag, repo, se_id);
3641 se_time = got_object_tag_get_tagger_time(se_tag);
3642 got_object_tag_close(se_tag);
3644 if (se_time > re_time) {
3645 err = got_reflist_entry_dup(&new, re);
3648 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3651 se = SIMPLEQ_NEXT(se, entry);
3660 static const struct got_error *
3661 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3663 static const struct got_error *err = NULL;
3664 struct got_reflist_head refs;
3665 struct got_reflist_entry *re;
3667 SIMPLEQ_INIT(&refs);
3669 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
3673 SIMPLEQ_FOREACH(re, &refs, entry) {
3674 const char *refname;
3675 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3679 struct got_object_id *id;
3680 struct got_tag_object *tag;
3681 struct got_commit_object *commit = NULL;
3683 refname = got_ref_get_name(re->ref);
3684 if (strncmp(refname, "refs/tags/", 10) != 0)
3687 refstr = got_ref_to_str(re->ref);
3688 if (refstr == NULL) {
3689 err = got_error_from_errno("got_ref_to_str");
3692 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3695 err = got_ref_resolve(&id, repo, re->ref);
3698 err = got_object_open_as_tag(&tag, repo, id);
3700 if (err->code != GOT_ERR_OBJ_TYPE) {
3704 /* "lightweight" tag */
3705 err = got_object_open_as_commit(&commit, repo, id);
3710 tagger = got_object_commit_get_committer(commit);
3712 got_object_commit_get_committer_time(commit);
3713 err = got_object_id_str(&id_str, id);
3719 tagger = got_object_tag_get_tagger(tag);
3720 tagger_time = got_object_tag_get_tagger_time(tag);
3721 err = got_object_id_str(&id_str,
3722 got_object_tag_get_object_id(tag));
3726 printf("from: %s\n", tagger);
3727 datestr = get_datestr(&tagger_time, datebuf);
3729 printf("date: %s UTC\n", datestr);
3731 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3733 switch (got_object_tag_get_object_type(tag)) {
3734 case GOT_OBJ_TYPE_BLOB:
3735 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
3738 case GOT_OBJ_TYPE_TREE:
3739 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
3742 case GOT_OBJ_TYPE_COMMIT:
3743 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
3746 case GOT_OBJ_TYPE_TAG:
3747 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
3756 err = got_object_commit_get_logmsg(&tagmsg0, commit);
3759 got_object_commit_close(commit);
3761 tagmsg0 = strdup(got_object_tag_get_message(tag));
3762 got_object_tag_close(tag);
3763 if (tagmsg0 == NULL) {
3764 err = got_error_from_errno("strdup");
3771 line = strsep(&tagmsg, "\n");
3773 printf(" %s\n", line);
3778 got_ref_list_free(&refs);
3782 static const struct got_error *
3783 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
3784 const char *tag_name, const char *repo_path)
3786 const struct got_error *err = NULL;
3787 char *template = NULL, *initial_content = NULL;
3788 char *editor = NULL;
3791 if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3792 err = got_error_from_errno("asprintf");
3796 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3797 commit_id_str, tag_name) == -1) {
3798 err = got_error_from_errno("asprintf");
3802 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
3806 dprintf(fd, initial_content);
3809 err = get_editor(&editor);
3812 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
3814 free(initial_content);
3818 /* Editor is done; we can now apply unveil(2) */
3820 err = apply_unveil(repo_path, 0, NULL);
3829 static const struct got_error *
3830 add_tag(struct got_repository *repo, const char *tag_name,
3831 const char *commit_arg, const char *tagmsg_arg)
3833 const struct got_error *err = NULL;
3834 struct got_object_id *commit_id = NULL, *tag_id = NULL;
3835 char *label = NULL, *commit_id_str = NULL;
3836 struct got_reference *ref = NULL;
3837 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3838 char *tagmsg_path = NULL, *tag_id_str = NULL;
3839 int preserve_tagmsg = 0;
3842 * Don't let the user create a tag name with a leading '-'.
3843 * While technically a valid reference name, this case is usually
3844 * an unintended typo.
3846 if (tag_name[0] == '-')
3847 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
3849 err = get_author(&tagger, repo);
3853 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
3854 GOT_OBJ_TYPE_COMMIT, 1, repo);
3858 err = got_object_id_str(&commit_id_str, commit_id);
3862 if (strncmp("refs/tags/", tag_name, 10) == 0) {
3863 refname = strdup(tag_name);
3864 if (refname == NULL) {
3865 err = got_error_from_errno("strdup");
3869 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3870 err = got_error_from_errno("asprintf");
3874 err = got_ref_open(&ref, repo, refname, 0);
3876 err = got_error(GOT_ERR_TAG_EXISTS);
3878 } else if (err->code != GOT_ERR_NOT_REF)
3881 if (tagmsg_arg == NULL) {
3882 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
3883 tag_name, got_repo_get_path(repo));
3885 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
3886 tagmsg_path != NULL)
3887 preserve_tagmsg = 1;
3892 err = got_object_tag_create(&tag_id, tag_name, commit_id,
3893 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3896 preserve_tagmsg = 1;
3900 err = got_ref_alloc(&ref, refname, tag_id);
3903 preserve_tagmsg = 1;
3907 err = got_ref_write(ref, repo);
3910 preserve_tagmsg = 1;
3914 err = got_object_id_str(&tag_id_str, tag_id);
3917 preserve_tagmsg = 1;
3920 printf("Created tag %s\n", tag_id_str);
3922 if (preserve_tagmsg) {
3923 fprintf(stderr, "%s: tag message preserved in %s\n",
3924 getprogname(), tagmsg_path);
3925 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
3926 err = got_error_from_errno2("unlink", tagmsg_path);
3931 free(commit_id_str);
3939 static const struct got_error *
3940 cmd_tag(int argc, char *argv[])
3942 const struct got_error *error = NULL;
3943 struct got_repository *repo = NULL;
3944 struct got_worktree *worktree = NULL;
3945 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3946 char *gitconfig_path = NULL;
3947 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3948 int ch, do_list = 0;
3950 while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3956 repo_path = realpath(optarg, NULL);
3957 if (repo_path == NULL)
3958 return got_error_from_errno2("realpath",
3960 got_path_strip_trailing_slashes(repo_path);
3976 errx(1, "-l and -m options are mutually exclusive\n");
3979 } else if (argc < 1 || argc > 2)
3982 commit_id_arg = argv[1];
3987 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3991 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3992 "sendfd unveil", NULL) == -1)
3996 cwd = getcwd(NULL, 0);
3998 error = got_error_from_errno("getcwd");
4002 if (repo_path == NULL) {
4003 error = got_worktree_open(&worktree, cwd);
4004 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4010 strdup(got_worktree_get_repo_path(worktree));
4011 if (repo_path == NULL)
4012 error = got_error_from_errno("strdup");
4016 repo_path = strdup(cwd);
4017 if (repo_path == NULL) {
4018 error = got_error_from_errno("strdup");
4025 error = got_repo_open(&repo, repo_path, NULL);
4028 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4031 error = list_tags(repo, worktree);
4033 error = get_gitconfig_path(&gitconfig_path);
4036 error = got_repo_open(&repo, repo_path, gitconfig_path);
4041 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4046 if (commit_id_arg == NULL) {
4047 struct got_reference *head_ref;
4048 struct got_object_id *commit_id;
4049 error = got_ref_open(&head_ref, repo,
4050 worktree ? got_worktree_get_head_ref_name(worktree)
4054 error = got_ref_resolve(&commit_id, repo, head_ref);
4055 got_ref_close(head_ref);
4058 error = got_object_id_str(&commit_id_str, commit_id);
4064 error = add_tag(repo, tag_name,
4065 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
4069 got_repo_close(repo);
4071 got_worktree_close(worktree);
4074 free(gitconfig_path);
4075 free(commit_id_str);
4082 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
4087 static const struct got_error *
4088 add_progress(void *arg, unsigned char status, const char *path)
4090 while (path[0] == '/')
4092 printf("%c %s\n", status, path);
4096 static const struct got_error *
4097 cmd_add(int argc, char *argv[])
4099 const struct got_error *error = NULL;
4100 struct got_repository *repo = NULL;
4101 struct got_worktree *worktree = NULL;
4103 struct got_pathlist_head paths;
4104 struct got_pathlist_entry *pe;
4105 int ch, can_recurse = 0, no_ignores = 0;
4109 while ((ch = getopt(argc, argv, "IR")) != -1) {
4127 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4134 cwd = getcwd(NULL, 0);
4136 error = got_error_from_errno("getcwd");
4140 error = got_worktree_open(&worktree, cwd);
4144 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4149 error = apply_unveil(got_repo_get_path(repo), 1,
4150 got_worktree_get_root_path(worktree));
4154 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4158 if (!can_recurse && no_ignores) {
4159 error = got_error_msg(GOT_ERR_BAD_PATH,
4160 "disregarding ignores requires -R option");
4168 TAILQ_FOREACH(pe, &paths, entry) {
4169 if (asprintf(&ondisk_path, "%s/%s",
4170 got_worktree_get_root_path(worktree),
4172 error = got_error_from_errno("asprintf");
4175 if (lstat(ondisk_path, &sb) == -1) {
4176 if (errno == ENOENT) {
4180 error = got_error_from_errno2("lstat",
4186 if (S_ISDIR(sb.st_mode)) {
4187 error = got_error_msg(GOT_ERR_BAD_PATH,
4188 "adding directories requires -R option");
4194 error = got_worktree_schedule_add(worktree, &paths, add_progress,
4195 NULL, repo, no_ignores);
4198 got_repo_close(repo);
4200 got_worktree_close(worktree);
4201 TAILQ_FOREACH(pe, &paths, entry)
4202 free((char *)pe->path);
4203 got_pathlist_free(&paths);
4211 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
4216 static const struct got_error *
4217 print_remove_status(void *arg, unsigned char status,
4218 unsigned char staged_status, const char *path)
4220 while (path[0] == '/')
4222 if (status == GOT_STATUS_NONEXISTENT)
4224 if (status == staged_status && (status == GOT_STATUS_DELETE))
4225 status = GOT_STATUS_NO_CHANGE;
4226 printf("%c%c %s\n", status, staged_status, path);
4230 static const struct got_error *
4231 cmd_remove(int argc, char *argv[])
4233 const struct got_error *error = NULL;
4234 struct got_worktree *worktree = NULL;
4235 struct got_repository *repo = NULL;
4237 struct got_pathlist_head paths;
4238 struct got_pathlist_entry *pe;
4239 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
4243 while ((ch = getopt(argc, argv, "fkR")) != -1) {
4246 delete_local_mods = 1;
4264 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4271 cwd = getcwd(NULL, 0);
4273 error = got_error_from_errno("getcwd");
4276 error = got_worktree_open(&worktree, cwd);
4280 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4285 error = apply_unveil(got_repo_get_path(repo), 1,
4286 got_worktree_get_root_path(worktree));
4290 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4297 TAILQ_FOREACH(pe, &paths, entry) {
4298 if (asprintf(&ondisk_path, "%s/%s",
4299 got_worktree_get_root_path(worktree),
4301 error = got_error_from_errno("asprintf");
4304 if (lstat(ondisk_path, &sb) == -1) {
4305 if (errno == ENOENT) {
4309 error = got_error_from_errno2("lstat",
4315 if (S_ISDIR(sb.st_mode)) {
4316 error = got_error_msg(GOT_ERR_BAD_PATH,
4317 "removing directories requires -R option");
4323 error = got_worktree_schedule_delete(worktree, &paths,
4324 delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
4327 got_repo_close(repo);
4329 got_worktree_close(worktree);
4330 TAILQ_FOREACH(pe, &paths, entry)
4331 free((char *)pe->path);
4332 got_pathlist_free(&paths);
4340 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4341 "path ...\n", getprogname());
4345 static const struct got_error *
4346 revert_progress(void *arg, unsigned char status, const char *path)
4348 if (status == GOT_STATUS_UNVERSIONED)
4351 while (path[0] == '/')
4353 printf("%c %s\n", status, path);
4357 struct choose_patch_arg {
4358 FILE *patch_script_file;
4362 static const struct got_error *
4363 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4364 int nchanges, const char *action)
4367 size_t linesize = 0;
4371 case GOT_STATUS_ADD:
4372 printf("A %s\n%s this addition? [y/n] ", path, action);
4374 case GOT_STATUS_DELETE:
4375 printf("D %s\n%s this deletion? [y/n] ", path, action);
4377 case GOT_STATUS_MODIFY:
4378 if (fseek(patch_file, 0L, SEEK_SET) == -1)
4379 return got_error_from_errno("fseek");
4380 printf(GOT_COMMIT_SEP_STR);
4381 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4383 if (ferror(patch_file))
4384 return got_error_from_errno("getline");
4385 printf(GOT_COMMIT_SEP_STR);
4386 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4387 path, n, nchanges, action);
4390 return got_error_path(path, GOT_ERR_FILE_STATUS);
4396 static const struct got_error *
4397 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4398 FILE *patch_file, int n, int nchanges)
4400 const struct got_error *err = NULL;
4402 size_t linesize = 0;
4405 struct choose_patch_arg *a = arg;
4407 *choice = GOT_PATCH_CHOICE_NONE;
4409 if (a->patch_script_file) {
4411 err = show_change(status, path, patch_file, n, nchanges,
4415 linelen = getline(&line, &linesize, a->patch_script_file);
4416 if (linelen == -1) {
4417 if (ferror(a->patch_script_file))
4418 return got_error_from_errno("getline");
4421 nl = strchr(line, '\n');
4424 if (strcmp(line, "y") == 0) {
4425 *choice = GOT_PATCH_CHOICE_YES;
4427 } else if (strcmp(line, "n") == 0) {
4428 *choice = GOT_PATCH_CHOICE_NO;
4430 } else if (strcmp(line, "q") == 0 &&
4431 status == GOT_STATUS_MODIFY) {
4432 *choice = GOT_PATCH_CHOICE_QUIT;
4435 printf("invalid response '%s'\n", line);
4440 while (resp != 'y' && resp != 'n' && resp != 'q') {
4441 err = show_change(status, path, patch_file, n, nchanges,
4448 if (status == GOT_STATUS_MODIFY) {
4449 if (resp != 'y' && resp != 'n' && resp != 'q') {
4450 printf("invalid response '%c'\n", resp);
4453 } else if (resp != 'y' && resp != 'n') {
4454 printf("invalid response '%c'\n", resp);
4460 *choice = GOT_PATCH_CHOICE_YES;
4461 else if (resp == 'n')
4462 *choice = GOT_PATCH_CHOICE_NO;
4463 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4464 *choice = GOT_PATCH_CHOICE_QUIT;
4470 static const struct got_error *
4471 cmd_revert(int argc, char *argv[])
4473 const struct got_error *error = NULL;
4474 struct got_worktree *worktree = NULL;
4475 struct got_repository *repo = NULL;
4476 char *cwd = NULL, *path = NULL;
4477 struct got_pathlist_head paths;
4478 struct got_pathlist_entry *pe;
4479 int ch, can_recurse = 0, pflag = 0;
4480 FILE *patch_script_file = NULL;
4481 const char *patch_script_path = NULL;
4482 struct choose_patch_arg cpa;
4486 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4492 patch_script_path = optarg;
4507 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4508 "unveil", NULL) == -1)
4513 if (patch_script_path && !pflag)
4514 errx(1, "-F option can only be used together with -p option");
4516 cwd = getcwd(NULL, 0);
4518 error = got_error_from_errno("getcwd");
4521 error = got_worktree_open(&worktree, cwd);
4525 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4530 if (patch_script_path) {
4531 patch_script_file = fopen(patch_script_path, "r");
4532 if (patch_script_file == NULL) {
4533 error = got_error_from_errno2("fopen",
4538 error = apply_unveil(got_repo_get_path(repo), 1,
4539 got_worktree_get_root_path(worktree));
4543 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4550 TAILQ_FOREACH(pe, &paths, entry) {
4551 if (asprintf(&ondisk_path, "%s/%s",
4552 got_worktree_get_root_path(worktree),
4554 error = got_error_from_errno("asprintf");
4557 if (lstat(ondisk_path, &sb) == -1) {
4558 if (errno == ENOENT) {
4562 error = got_error_from_errno2("lstat",
4568 if (S_ISDIR(sb.st_mode)) {
4569 error = got_error_msg(GOT_ERR_BAD_PATH,
4570 "reverting directories requires -R option");
4576 cpa.patch_script_file = patch_script_file;
4577 cpa.action = "revert";
4578 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4579 pflag ? choose_patch : NULL, &cpa, repo);
4581 if (patch_script_file && fclose(patch_script_file) == EOF &&
4583 error = got_error_from_errno2("fclose", patch_script_path);
4585 got_repo_close(repo);
4587 got_worktree_close(worktree);
4596 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4601 struct collect_commit_logmsg_arg {
4602 const char *cmdline_log;
4604 const char *worktree_path;
4605 const char *branch_name;
4606 const char *repo_path;
4611 static const struct got_error *
4612 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4615 char *initial_content = NULL;
4616 struct got_pathlist_entry *pe;
4617 const struct got_error *err = NULL;
4618 char *template = NULL;
4619 struct collect_commit_logmsg_arg *a = arg;
4623 /* if a message was specified on the command line, just use it */
4624 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4625 len = strlen(a->cmdline_log) + 1;
4626 *logmsg = malloc(len + 1);
4627 if (*logmsg == NULL)
4628 return got_error_from_errno("malloc");
4629 strlcpy(*logmsg, a->cmdline_log, len);
4633 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4634 return got_error_from_errno("asprintf");
4636 if (asprintf(&initial_content,
4637 "\n# changes to be committed on branch %s:\n",
4638 a->branch_name) == -1)
4639 return got_error_from_errno("asprintf");
4641 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4645 dprintf(fd, initial_content);
4647 TAILQ_FOREACH(pe, commitable_paths, entry) {
4648 struct got_commitable *ct = pe->data;
4649 dprintf(fd, "# %c %s\n",
4650 got_commitable_get_status(ct),
4651 got_commitable_get_path(ct));
4655 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4657 free(initial_content);
4660 /* Editor is done; we can now apply unveil(2) */
4662 err = apply_unveil(a->repo_path, 0, a->worktree_path);
4671 static const struct got_error *
4672 cmd_commit(int argc, char *argv[])
4674 const struct got_error *error = NULL;
4675 struct got_worktree *worktree = NULL;
4676 struct got_repository *repo = NULL;
4677 char *cwd = NULL, *id_str = NULL;
4678 struct got_object_id *id = NULL;
4679 const char *logmsg = NULL;
4680 struct collect_commit_logmsg_arg cl_arg;
4681 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4682 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
4683 struct got_pathlist_head paths;
4686 cl_arg.logmsg_path = NULL;
4688 while ((ch = getopt(argc, argv, "m:")) != -1) {
4703 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4704 "unveil", NULL) == -1)
4707 cwd = getcwd(NULL, 0);
4709 error = got_error_from_errno("getcwd");
4712 error = got_worktree_open(&worktree, cwd);
4716 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4719 if (rebase_in_progress) {
4720 error = got_error(GOT_ERR_REBASING);
4724 error = got_worktree_histedit_in_progress(&histedit_in_progress,
4729 error = get_gitconfig_path(&gitconfig_path);
4732 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4737 error = get_author(&author, repo);
4742 * unveil(2) traverses exec(2); if an editor is used we have
4743 * to apply unveil after the log message has been written.
4745 if (logmsg == NULL || strlen(logmsg) == 0)
4746 error = get_editor(&editor);
4748 error = apply_unveil(got_repo_get_path(repo), 0,
4749 got_worktree_get_root_path(worktree));
4753 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4757 cl_arg.editor = editor;
4758 cl_arg.cmdline_log = logmsg;
4759 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4760 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4761 if (!histedit_in_progress) {
4762 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4763 error = got_error(GOT_ERR_COMMIT_BRANCH);
4766 cl_arg.branch_name += 11;
4768 cl_arg.repo_path = got_repo_get_path(repo);
4769 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4770 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4772 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
4773 cl_arg.logmsg_path != NULL)
4774 preserve_logmsg = 1;
4778 error = got_object_id_str(&id_str, id);
4781 printf("Created commit %s\n", id_str);
4783 if (preserve_logmsg) {
4784 fprintf(stderr, "%s: log message preserved in %s\n",
4785 getprogname(), cl_arg.logmsg_path);
4786 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
4788 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
4789 free(cl_arg.logmsg_path);
4791 got_repo_close(repo);
4793 got_worktree_close(worktree);
4796 free(gitconfig_path);
4803 usage_cherrypick(void)
4805 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4809 static const struct got_error *
4810 cmd_cherrypick(int argc, char *argv[])
4812 const struct got_error *error = NULL;
4813 struct got_worktree *worktree = NULL;
4814 struct got_repository *repo = NULL;
4815 char *cwd = NULL, *commit_id_str = NULL;
4816 struct got_object_id *commit_id = NULL;
4817 struct got_commit_object *commit = NULL;
4818 struct got_object_qid *pid;
4819 struct got_reference *head_ref = NULL;
4820 int ch, did_something = 0;
4822 while ((ch = getopt(argc, argv, "")) != -1) {
4834 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4835 "unveil", NULL) == -1)
4841 cwd = getcwd(NULL, 0);
4843 error = got_error_from_errno("getcwd");
4846 error = got_worktree_open(&worktree, cwd);
4850 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4855 error = apply_unveil(got_repo_get_path(repo), 0,
4856 got_worktree_get_root_path(worktree));
4860 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4861 GOT_OBJ_TYPE_COMMIT, repo);
4862 if (error != NULL) {
4863 struct got_reference *ref;
4864 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4866 error = got_ref_open(&ref, repo, argv[0], 0);
4869 error = got_ref_resolve(&commit_id, repo, ref);
4874 error = got_object_id_str(&commit_id_str, commit_id);
4878 error = got_ref_open(&head_ref, repo,
4879 got_worktree_get_head_ref_name(worktree), 0);
4883 error = check_same_branch(commit_id, head_ref, NULL, repo);
4885 if (error->code != GOT_ERR_ANCESTRY)
4889 error = got_error(GOT_ERR_SAME_BRANCH);
4893 error = got_object_open_as_commit(&commit, repo, commit_id);
4896 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4897 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4898 commit_id, repo, update_progress, &did_something, check_cancelled,
4904 printf("Merged commit %s\n", commit_id_str);
4907 got_object_commit_close(commit);
4908 free(commit_id_str);
4910 got_ref_close(head_ref);
4912 got_worktree_close(worktree);
4914 got_repo_close(repo);
4921 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4925 static const struct got_error *
4926 cmd_backout(int argc, char *argv[])
4928 const struct got_error *error = NULL;
4929 struct got_worktree *worktree = NULL;
4930 struct got_repository *repo = NULL;
4931 char *cwd = NULL, *commit_id_str = NULL;
4932 struct got_object_id *commit_id = NULL;
4933 struct got_commit_object *commit = NULL;
4934 struct got_object_qid *pid;
4935 struct got_reference *head_ref = NULL;
4936 int ch, did_something = 0;
4938 while ((ch = getopt(argc, argv, "")) != -1) {
4950 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4951 "unveil", NULL) == -1)
4957 cwd = getcwd(NULL, 0);
4959 error = got_error_from_errno("getcwd");
4962 error = got_worktree_open(&worktree, cwd);
4966 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4971 error = apply_unveil(got_repo_get_path(repo), 0,
4972 got_worktree_get_root_path(worktree));
4976 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4977 GOT_OBJ_TYPE_COMMIT, repo);
4978 if (error != NULL) {
4979 struct got_reference *ref;
4980 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4982 error = got_ref_open(&ref, repo, argv[0], 0);
4985 error = got_ref_resolve(&commit_id, repo, ref);
4990 error = got_object_id_str(&commit_id_str, commit_id);
4994 error = got_ref_open(&head_ref, repo,
4995 got_worktree_get_head_ref_name(worktree), 0);
4999 error = check_same_branch(commit_id, head_ref, NULL, repo);
5003 error = got_object_open_as_commit(&commit, repo, commit_id);
5006 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
5008 error = got_error(GOT_ERR_ROOT_COMMIT);
5012 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
5013 update_progress, &did_something, check_cancelled, NULL);
5018 printf("Backed out commit %s\n", commit_id_str);
5021 got_object_commit_close(commit);
5022 free(commit_id_str);
5024 got_ref_close(head_ref);
5026 got_worktree_close(worktree);
5028 got_repo_close(repo);
5035 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
5041 trim_logmsg(char *logmsg, int limit)
5046 len = strlen(logmsg);
5050 nl = strchr(logmsg, '\n');
5055 static const struct got_error *
5056 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
5058 const struct got_error *err;
5059 char *logmsg0 = NULL;
5062 err = got_object_commit_get_logmsg(&logmsg0, commit);
5067 while (isspace((unsigned char)s[0]))
5070 *logmsg = strdup(s);
5071 if (*logmsg == NULL) {
5072 err = got_error_from_errno("strdup");
5076 trim_logmsg(*logmsg, limit);
5082 static const struct got_error *
5083 show_rebase_progress(struct got_commit_object *commit,
5084 struct got_object_id *old_id, struct got_object_id *new_id)
5086 const struct got_error *err;
5087 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5089 err = got_object_id_str(&old_id_str, old_id);
5094 err = got_object_id_str(&new_id_str, new_id);
5099 old_id_str[12] = '\0';
5101 new_id_str[12] = '\0';
5103 err = get_short_logmsg(&logmsg, 42, commit);
5107 printf("%s -> %s: %s\n", old_id_str,
5108 new_id_str ? new_id_str : "no-op change", logmsg);
5115 static const struct got_error *
5116 rebase_progress(void *arg, unsigned char status, const char *path)
5118 unsigned char *rebase_status = arg;
5120 while (path[0] == '/')
5122 printf("%c %s\n", status, path);
5124 if (*rebase_status == GOT_STATUS_CONFLICT)
5126 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
5127 *rebase_status = status;
5131 static const struct got_error *
5132 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
5133 struct got_reference *branch, struct got_reference *new_base_branch,
5134 struct got_reference *tmp_branch, struct got_repository *repo)
5136 printf("Switching work tree to %s\n", got_ref_get_name(branch));
5137 return got_worktree_rebase_complete(worktree, fileindex,
5138 new_base_branch, tmp_branch, branch, repo);
5141 static const struct got_error *
5142 rebase_commit(struct got_pathlist_head *merged_paths,
5143 struct got_worktree *worktree, struct got_fileindex *fileindex,
5144 struct got_reference *tmp_branch,
5145 struct got_object_id *commit_id, struct got_repository *repo)
5147 const struct got_error *error;
5148 struct got_commit_object *commit;
5149 struct got_object_id *new_commit_id;
5151 error = got_object_open_as_commit(&commit, repo, commit_id);
5155 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
5156 worktree, fileindex, tmp_branch, commit, commit_id, repo);
5158 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
5160 error = show_rebase_progress(commit, commit_id, NULL);
5162 error = show_rebase_progress(commit, commit_id, new_commit_id);
5163 free(new_commit_id);
5166 got_object_commit_close(commit);
5170 struct check_path_prefix_arg {
5171 const char *path_prefix;
5176 static const struct got_error *
5177 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
5178 struct got_blob_object *blob2, struct got_object_id *id1,
5179 struct got_object_id *id2, const char *path1, const char *path2,
5180 mode_t mode1, mode_t mode2, struct got_repository *repo)
5182 struct check_path_prefix_arg *a = arg;
5184 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
5185 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
5186 return got_error(a->errcode);
5191 static const struct got_error *
5192 check_path_prefix(struct got_object_id *parent_id,
5193 struct got_object_id *commit_id, const char *path_prefix,
5194 int errcode, struct got_repository *repo)
5196 const struct got_error *err;
5197 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
5198 struct got_commit_object *commit = NULL, *parent_commit = NULL;
5199 struct check_path_prefix_arg cpp_arg;
5201 if (got_path_is_root_dir(path_prefix))
5204 err = got_object_open_as_commit(&commit, repo, commit_id);
5208 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
5212 err = got_object_open_as_tree(&tree1, repo,
5213 got_object_commit_get_tree_id(parent_commit));
5217 err = got_object_open_as_tree(&tree2, repo,
5218 got_object_commit_get_tree_id(commit));
5222 cpp_arg.path_prefix = path_prefix;
5223 while (cpp_arg.path_prefix[0] == '/')
5224 cpp_arg.path_prefix++;
5225 cpp_arg.len = strlen(cpp_arg.path_prefix);
5226 cpp_arg.errcode = errcode;
5227 err = got_diff_tree(tree1, tree2, "", "", repo,
5228 check_path_prefix_in_diff, &cpp_arg, 0);
5231 got_object_tree_close(tree1);
5233 got_object_tree_close(tree2);
5235 got_object_commit_close(commit);
5237 got_object_commit_close(parent_commit);
5241 static const struct got_error *
5242 collect_commits(struct got_object_id_queue *commits,
5243 struct got_object_id *initial_commit_id,
5244 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5245 const char *path_prefix, int path_prefix_errcode,
5246 struct got_repository *repo)
5248 const struct got_error *err = NULL;
5249 struct got_commit_graph *graph = NULL;
5250 struct got_object_id *parent_id = NULL;
5251 struct got_object_qid *qid;
5252 struct got_object_id *commit_id = initial_commit_id;
5254 err = got_commit_graph_open(&graph, "/", 1);
5258 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5259 check_cancelled, NULL);
5262 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5263 err = got_commit_graph_iter_next(&parent_id, graph, repo,
5264 check_cancelled, NULL);
5266 if (err->code == GOT_ERR_ITER_COMPLETED) {
5267 err = got_error_msg(GOT_ERR_ANCESTRY,
5268 "ran out of commits to rebase before "
5269 "youngest common ancestor commit has "
5274 err = check_path_prefix(parent_id, commit_id,
5275 path_prefix, path_prefix_errcode, repo);
5279 err = got_object_qid_alloc(&qid, commit_id);
5282 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5283 commit_id = parent_id;
5287 got_commit_graph_close(graph);
5291 static const struct got_error *
5292 cmd_rebase(int argc, char *argv[])
5294 const struct got_error *error = NULL;
5295 struct got_worktree *worktree = NULL;
5296 struct got_repository *repo = NULL;
5297 struct got_fileindex *fileindex = NULL;
5299 struct got_reference *branch = NULL;
5300 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5301 struct got_object_id *commit_id = NULL, *parent_id = NULL;
5302 struct got_object_id *resume_commit_id = NULL;
5303 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5304 struct got_commit_object *commit = NULL;
5305 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5306 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5307 struct got_object_id_queue commits;
5308 struct got_pathlist_head merged_paths;
5309 const struct got_object_id_queue *parent_ids;
5310 struct got_object_qid *qid, *pid;
5312 SIMPLEQ_INIT(&commits);
5313 TAILQ_INIT(&merged_paths);
5315 while ((ch = getopt(argc, argv, "ac")) != -1) {
5321 continue_rebase = 1;
5333 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5334 "unveil", NULL) == -1)
5337 if (abort_rebase && continue_rebase)
5339 else if (abort_rebase || continue_rebase) {
5342 } else if (argc != 1)
5345 cwd = getcwd(NULL, 0);
5347 error = got_error_from_errno("getcwd");
5350 error = got_worktree_open(&worktree, cwd);
5354 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5359 error = apply_unveil(got_repo_get_path(repo), 0,
5360 got_worktree_get_root_path(worktree));
5364 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5370 if (!rebase_in_progress) {
5371 error = got_error(GOT_ERR_NOT_REBASING);
5374 error = got_worktree_rebase_continue(&resume_commit_id,
5375 &new_base_branch, &tmp_branch, &branch, &fileindex,
5379 printf("Switching work tree to %s\n",
5380 got_ref_get_symref_target(new_base_branch));
5381 error = got_worktree_rebase_abort(worktree, fileindex, repo,
5382 new_base_branch, update_progress, &did_something);
5385 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5386 goto done; /* nothing else to do */
5389 if (continue_rebase) {
5390 if (!rebase_in_progress) {
5391 error = got_error(GOT_ERR_NOT_REBASING);
5394 error = got_worktree_rebase_continue(&resume_commit_id,
5395 &new_base_branch, &tmp_branch, &branch, &fileindex,
5400 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5401 resume_commit_id, repo);
5405 yca_id = got_object_id_dup(resume_commit_id);
5406 if (yca_id == NULL) {
5407 error = got_error_from_errno("got_object_id_dup");
5411 error = got_ref_open(&branch, repo, argv[0], 0);
5416 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5420 if (!continue_rebase) {
5421 struct got_object_id *base_commit_id;
5423 base_commit_id = got_worktree_get_base_commit_id(worktree);
5424 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5425 base_commit_id, branch_head_commit_id, repo,
5426 check_cancelled, NULL);
5429 if (yca_id == NULL) {
5430 error = got_error_msg(GOT_ERR_ANCESTRY,
5431 "specified branch shares no common ancestry "
5432 "with work tree's branch");
5436 error = check_same_branch(base_commit_id, branch, yca_id, repo);
5438 if (error->code != GOT_ERR_ANCESTRY)
5442 error = got_error_msg(GOT_ERR_SAME_BRANCH,
5443 "specified branch resolves to a commit which "
5444 "is already contained in work tree's branch");
5447 error = got_worktree_rebase_prepare(&new_base_branch,
5448 &tmp_branch, &fileindex, worktree, branch, repo);
5453 commit_id = branch_head_commit_id;
5454 error = got_object_open_as_commit(&commit, repo, commit_id);
5458 parent_ids = got_object_commit_get_parent_ids(commit);
5459 pid = SIMPLEQ_FIRST(parent_ids);
5461 if (!continue_rebase) {
5463 error = got_worktree_rebase_abort(worktree, fileindex,
5464 repo, new_base_branch, update_progress,
5468 printf("Rebase of %s aborted\n",
5469 got_ref_get_name(branch));
5471 error = got_error(GOT_ERR_EMPTY_REBASE);
5474 error = collect_commits(&commits, commit_id, pid->id,
5475 yca_id, got_worktree_get_path_prefix(worktree),
5476 GOT_ERR_REBASE_PATH, repo);
5477 got_object_commit_close(commit);
5482 if (SIMPLEQ_EMPTY(&commits)) {
5483 if (continue_rebase) {
5484 error = rebase_complete(worktree, fileindex,
5485 branch, new_base_branch, tmp_branch, repo);
5488 /* Fast-forward the reference of the branch. */
5489 struct got_object_id *new_head_commit_id;
5491 error = got_ref_resolve(&new_head_commit_id, repo,
5495 error = got_object_id_str(&id_str, new_head_commit_id);
5496 printf("Forwarding %s to commit %s\n",
5497 got_ref_get_name(branch), id_str);
5499 error = got_ref_change_ref(branch,
5500 new_head_commit_id);
5507 SIMPLEQ_FOREACH(qid, &commits, entry) {
5508 commit_id = qid->id;
5509 parent_id = pid ? pid->id : yca_id;
5512 error = got_worktree_rebase_merge_files(&merged_paths,
5513 worktree, fileindex, parent_id, commit_id, repo,
5514 rebase_progress, &rebase_status, check_cancelled, NULL);
5518 if (rebase_status == GOT_STATUS_CONFLICT) {
5519 got_worktree_rebase_pathlist_free(&merged_paths);
5523 error = rebase_commit(&merged_paths, worktree, fileindex,
5524 tmp_branch, commit_id, repo);
5525 got_worktree_rebase_pathlist_free(&merged_paths);
5530 if (rebase_status == GOT_STATUS_CONFLICT) {
5531 error = got_worktree_rebase_postpone(worktree, fileindex);
5534 error = got_error_msg(GOT_ERR_CONFLICTS,
5535 "conflicts must be resolved before rebasing can continue");
5537 error = rebase_complete(worktree, fileindex, branch,
5538 new_base_branch, tmp_branch, repo);
5540 got_object_id_queue_free(&commits);
5541 free(branch_head_commit_id);
5542 free(resume_commit_id);
5545 got_object_commit_close(commit);
5547 got_ref_close(branch);
5548 if (new_base_branch)
5549 got_ref_close(new_base_branch);
5551 got_ref_close(tmp_branch);
5553 got_worktree_close(worktree);
5555 got_repo_close(repo);
5560 usage_histedit(void)
5562 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5567 #define GOT_HISTEDIT_PICK 'p'
5568 #define GOT_HISTEDIT_EDIT 'e'
5569 #define GOT_HISTEDIT_FOLD 'f'
5570 #define GOT_HISTEDIT_DROP 'd'
5571 #define GOT_HISTEDIT_MESG 'm'
5573 static struct got_histedit_cmd {
5577 } got_histedit_cmds[] = {
5578 { GOT_HISTEDIT_PICK, "pick", "use commit" },
5579 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5580 { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5581 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5582 { GOT_HISTEDIT_MESG, "mesg",
5583 "single-line log message for commit above (open editor if empty)" },
5586 struct got_histedit_list_entry {
5587 TAILQ_ENTRY(got_histedit_list_entry) entry;
5588 struct got_object_id *commit_id;
5589 const struct got_histedit_cmd *cmd;
5592 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5594 static const struct got_error *
5595 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5596 FILE *f, struct got_repository *repo)
5598 const struct got_error *err = NULL;
5599 char *logmsg = NULL, *id_str = NULL;
5600 struct got_commit_object *commit = NULL;
5603 err = got_object_open_as_commit(&commit, repo, commit_id);
5607 err = get_short_logmsg(&logmsg, 34, commit);
5611 err = got_object_id_str(&id_str, commit_id);
5615 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5617 err = got_ferror(f, GOT_ERR_IO);
5620 got_object_commit_close(commit);
5626 static const struct got_error *
5627 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5628 struct got_repository *repo)
5630 const struct got_error *err = NULL;
5631 struct got_object_qid *qid;
5633 if (SIMPLEQ_EMPTY(commits))
5634 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5636 SIMPLEQ_FOREACH(qid, commits, entry) {
5637 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5646 static const struct got_error *
5647 write_cmd_list(FILE *f)
5649 const struct got_error *err = NULL;
5652 n = fprintf(f, "# Available histedit commands:\n");
5654 return got_ferror(f, GOT_ERR_IO);
5656 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5657 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5658 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5661 err = got_ferror(f, GOT_ERR_IO);
5665 n = fprintf(f, "# Commits will be processed in order from top to "
5666 "bottom of this file.\n");
5668 return got_ferror(f, GOT_ERR_IO);
5672 static const struct got_error *
5673 histedit_syntax_error(int lineno)
5675 static char msg[42];
5678 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5680 if (ret == -1 || ret >= sizeof(msg))
5681 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5683 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5686 static const struct got_error *
5687 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5688 char *logmsg, struct got_repository *repo)
5690 const struct got_error *err;
5691 struct got_commit_object *folded_commit = NULL;
5692 char *id_str, *folded_logmsg = NULL;
5694 err = got_object_id_str(&id_str, hle->commit_id);
5698 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5702 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5705 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5706 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5707 folded_logmsg) == -1) {
5708 err = got_error_from_errno("asprintf");
5712 got_object_commit_close(folded_commit);
5714 free(folded_logmsg);
5718 static struct got_histedit_list_entry *
5719 get_folded_commits(struct got_histedit_list_entry *hle)
5721 struct got_histedit_list_entry *prev, *folded = NULL;
5723 prev = TAILQ_PREV(hle, got_histedit_list, entry);
5724 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5725 prev->cmd->code == GOT_HISTEDIT_DROP)) {
5726 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5728 prev = TAILQ_PREV(prev, got_histedit_list, entry);
5734 static const struct got_error *
5735 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5736 struct got_repository *repo)
5738 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5739 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5740 const struct got_error *err = NULL;
5741 struct got_commit_object *commit = NULL;
5743 struct got_histedit_list_entry *folded = NULL;
5745 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5749 folded = get_folded_commits(hle);
5751 while (folded != hle) {
5752 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5753 folded = TAILQ_NEXT(folded, entry);
5756 err = append_folded_commit_msg(&new_msg, folded,
5762 folded = TAILQ_NEXT(folded, entry);
5766 err = got_object_id_str(&id_str, hle->commit_id);
5769 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5772 if (asprintf(&new_msg,
5773 "%s\n# original log message of commit %s: %s",
5774 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5775 err = got_error_from_errno("asprintf");
5781 err = got_object_id_str(&id_str, hle->commit_id);
5785 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5789 dprintf(fd, logmsg);
5792 err = get_editor(&editor);
5796 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5798 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5800 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5803 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5804 err = got_error_from_errno2("unlink", logmsg_path);
5810 got_object_commit_close(commit);
5814 static const struct got_error *
5815 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5816 FILE *f, struct got_repository *repo)
5818 const struct got_error *err = NULL;
5819 char *line = NULL, *p, *end;
5823 const struct got_histedit_cmd *cmd;
5824 struct got_object_id *commit_id = NULL;
5825 struct got_histedit_list_entry *hle = NULL;
5828 len = getline(&line, &size, f);
5830 const struct got_error *getline_err;
5833 getline_err = got_error_from_errno("getline");
5834 err = got_ferror(f, getline_err->code);
5839 while (isspace((unsigned char)p[0]))
5841 if (p[0] == '#' || p[0] == '\0') {
5847 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5848 cmd = &got_histedit_cmds[i];
5849 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5850 isspace((unsigned char)p[strlen(cmd->name)])) {
5851 p += strlen(cmd->name);
5854 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5859 if (i == nitems(got_histedit_cmds)) {
5860 err = histedit_syntax_error(lineno);
5863 while (isspace((unsigned char)p[0]))
5865 if (cmd->code == GOT_HISTEDIT_MESG) {
5866 if (hle == NULL || hle->logmsg != NULL) {
5867 err = got_error(GOT_ERR_HISTEDIT_CMD);
5871 err = histedit_edit_logmsg(hle, repo);
5875 hle->logmsg = strdup(p);
5876 if (hle->logmsg == NULL) {
5877 err = got_error_from_errno("strdup");
5886 while (end[0] && !isspace((unsigned char)end[0]))
5890 err = got_object_resolve_id_str(&commit_id, repo, p);
5892 /* override error code */
5893 err = histedit_syntax_error(lineno);
5897 hle = malloc(sizeof(*hle));
5899 err = got_error_from_errno("malloc");
5903 hle->commit_id = commit_id;
5908 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5916 static const struct got_error *
5917 histedit_check_script(struct got_histedit_list *histedit_cmds,
5918 struct got_object_id_queue *commits, struct got_repository *repo)
5920 const struct got_error *err = NULL;
5921 struct got_object_qid *qid;
5922 struct got_histedit_list_entry *hle;
5923 static char msg[80];
5926 if (TAILQ_EMPTY(histedit_cmds))
5927 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5928 "histedit script contains no commands");
5929 if (SIMPLEQ_EMPTY(commits))
5930 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5932 SIMPLEQ_FOREACH(qid, commits, entry) {
5933 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5934 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5938 err = got_object_id_str(&id_str, qid->id);
5941 snprintf(msg, sizeof(msg),
5942 "commit %s missing from histedit script", id_str);
5944 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5948 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5949 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5950 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5951 "last commit in histedit script cannot be folded");
5956 static const struct got_error *
5957 histedit_run_editor(struct got_histedit_list *histedit_cmds,
5958 const char *path, struct got_object_id_queue *commits,
5959 struct got_repository *repo)
5961 const struct got_error *err = NULL;
5965 err = get_editor(&editor);
5969 if (spawn_editor(editor, path) == -1) {
5970 err = got_error_from_errno("failed spawning editor");
5974 f = fopen(path, "r");
5976 err = got_error_from_errno("fopen");
5979 err = histedit_parse_list(histedit_cmds, f, repo);
5983 err = histedit_check_script(histedit_cmds, commits, repo);
5985 if (f && fclose(f) != 0 && err == NULL)
5986 err = got_error_from_errno("fclose");
5991 static const struct got_error *
5992 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5993 struct got_object_id_queue *, const char *, struct got_repository *);
5995 static const struct got_error *
5996 histedit_edit_script(struct got_histedit_list *histedit_cmds,
5997 struct got_object_id_queue *commits, struct got_repository *repo)
5999 const struct got_error *err;
6003 err = got_opentemp_named(&path, &f, "got-histedit");
6007 err = write_cmd_list(f);
6011 err = histedit_write_commit_list(commits, f, repo);
6015 if (fclose(f) != 0) {
6016 err = got_error_from_errno("fclose");
6021 err = histedit_run_editor(histedit_cmds, path, commits, repo);
6023 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6024 err->code != GOT_ERR_HISTEDIT_CMD)
6026 err = histedit_edit_list_retry(histedit_cmds, err,
6027 commits, path, repo);
6030 if (f && fclose(f) != 0 && err == NULL)
6031 err = got_error_from_errno("fclose");
6032 if (path && unlink(path) != 0 && err == NULL)
6033 err = got_error_from_errno2("unlink", path);
6038 static const struct got_error *
6039 histedit_save_list(struct got_histedit_list *histedit_cmds,
6040 struct got_worktree *worktree, struct got_repository *repo)
6042 const struct got_error *err = NULL;
6045 struct got_histedit_list_entry *hle;
6046 struct got_commit_object *commit = NULL;
6048 err = got_worktree_get_histedit_script_path(&path, worktree);
6052 f = fopen(path, "w");
6054 err = got_error_from_errno2("fopen", path);
6057 TAILQ_FOREACH(hle, histedit_cmds, entry) {
6058 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
6064 int n = fprintf(f, "%c %s\n",
6065 GOT_HISTEDIT_MESG, hle->logmsg);
6067 err = got_ferror(f, GOT_ERR_IO);
6073 if (f && fclose(f) != 0 && err == NULL)
6074 err = got_error_from_errno("fclose");
6077 got_object_commit_close(commit);
6082 histedit_free_list(struct got_histedit_list *histedit_cmds)
6084 struct got_histedit_list_entry *hle;
6086 while ((hle = TAILQ_FIRST(histedit_cmds))) {
6087 TAILQ_REMOVE(histedit_cmds, hle, entry);
6092 static const struct got_error *
6093 histedit_load_list(struct got_histedit_list *histedit_cmds,
6094 const char *path, struct got_repository *repo)
6096 const struct got_error *err = NULL;
6099 f = fopen(path, "r");
6101 err = got_error_from_errno2("fopen", path);
6105 err = histedit_parse_list(histedit_cmds, f, repo);
6107 if (f && fclose(f) != 0 && err == NULL)
6108 err = got_error_from_errno("fclose");
6112 static const struct got_error *
6113 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
6114 const struct got_error *edit_err, struct got_object_id_queue *commits,
6115 const char *path, struct got_repository *repo)
6117 const struct got_error *err = NULL, *prev_err = edit_err;
6120 while (resp != 'c' && resp != 'r' && resp != 'a') {
6121 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
6122 "or (a)bort: ", getprogname(), prev_err->msg);
6127 histedit_free_list(histedit_cmds);
6128 err = histedit_run_editor(histedit_cmds, path, commits,
6131 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6132 err->code != GOT_ERR_HISTEDIT_CMD)
6139 } else if (resp == 'r') {
6140 histedit_free_list(histedit_cmds);
6141 err = histedit_edit_script(histedit_cmds,
6144 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
6145 err->code != GOT_ERR_HISTEDIT_CMD)
6152 } else if (resp == 'a') {
6153 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
6156 printf("invalid response '%c'\n", resp);
6162 static const struct got_error *
6163 histedit_complete(struct got_worktree *worktree,
6164 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6165 struct got_reference *branch, struct got_repository *repo)
6167 printf("Switching work tree to %s\n",
6168 got_ref_get_symref_target(branch));
6169 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
6173 static const struct got_error *
6174 show_histedit_progress(struct got_commit_object *commit,
6175 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
6177 const struct got_error *err;
6178 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6180 err = got_object_id_str(&old_id_str, hle->commit_id);
6185 err = got_object_id_str(&new_id_str, new_id);
6190 old_id_str[12] = '\0';
6192 new_id_str[12] = '\0';
6195 logmsg = strdup(hle->logmsg);
6196 if (logmsg == NULL) {
6197 err = got_error_from_errno("strdup");
6200 trim_logmsg(logmsg, 42);
6202 err = get_short_logmsg(&logmsg, 42, commit);
6207 switch (hle->cmd->code) {
6208 case GOT_HISTEDIT_PICK:
6209 case GOT_HISTEDIT_EDIT:
6210 printf("%s -> %s: %s\n", old_id_str,
6211 new_id_str ? new_id_str : "no-op change", logmsg);
6213 case GOT_HISTEDIT_DROP:
6214 case GOT_HISTEDIT_FOLD:
6215 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
6227 static const struct got_error *
6228 histedit_commit(struct got_pathlist_head *merged_paths,
6229 struct got_worktree *worktree, struct got_fileindex *fileindex,
6230 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
6231 struct got_repository *repo)
6233 const struct got_error *err;
6234 struct got_commit_object *commit;
6235 struct got_object_id *new_commit_id;
6237 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
6238 && hle->logmsg == NULL) {
6239 err = histedit_edit_logmsg(hle, repo);
6244 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6248 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6249 worktree, fileindex, tmp_branch, commit, hle->commit_id,
6252 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6254 err = show_histedit_progress(commit, hle, NULL);
6256 err = show_histedit_progress(commit, hle, new_commit_id);
6257 free(new_commit_id);
6260 got_object_commit_close(commit);
6264 static const struct got_error *
6265 histedit_skip_commit(struct got_histedit_list_entry *hle,
6266 struct got_worktree *worktree, struct got_repository *repo)
6268 const struct got_error *error;
6269 struct got_commit_object *commit;
6271 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6276 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6280 error = show_histedit_progress(commit, hle, NULL);
6281 got_object_commit_close(commit);
6285 static const struct got_error *
6286 cmd_histedit(int argc, char *argv[])
6288 const struct got_error *error = NULL;
6289 struct got_worktree *worktree = NULL;
6290 struct got_fileindex *fileindex = NULL;
6291 struct got_repository *repo = NULL;
6293 struct got_reference *branch = NULL;
6294 struct got_reference *tmp_branch = NULL;
6295 struct got_object_id *resume_commit_id = NULL;
6296 struct got_object_id *base_commit_id = NULL;
6297 struct got_object_id *head_commit_id = NULL;
6298 struct got_commit_object *commit = NULL;
6299 int ch, rebase_in_progress = 0, did_something;
6300 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6301 const char *edit_script_path = NULL;
6302 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6303 struct got_object_id_queue commits;
6304 struct got_pathlist_head merged_paths;
6305 const struct got_object_id_queue *parent_ids;
6306 struct got_object_qid *pid;
6307 struct got_histedit_list histedit_cmds;
6308 struct got_histedit_list_entry *hle;
6310 SIMPLEQ_INIT(&commits);
6311 TAILQ_INIT(&histedit_cmds);
6312 TAILQ_INIT(&merged_paths);
6314 while ((ch = getopt(argc, argv, "acF:")) != -1) {
6323 edit_script_path = optarg;
6335 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6336 "unveil", NULL) == -1)
6339 if (abort_edit && continue_edit)
6345 * This command cannot apply unveil(2) in all cases because the
6346 * user may choose to run an editor to edit the histedit script
6347 * and to edit individual commit log messages.
6348 * unveil(2) traverses exec(2); if an editor is used we have to
6349 * apply unveil after edit script and log messages have been written.
6350 * XXX TODO: Make use of unveil(2) where possible.
6353 cwd = getcwd(NULL, 0);
6355 error = got_error_from_errno("getcwd");
6358 error = got_worktree_open(&worktree, cwd);
6362 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6367 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6370 if (rebase_in_progress) {
6371 error = got_error(GOT_ERR_REBASING);
6375 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6379 if (edit_in_progress && abort_edit) {
6380 error = got_worktree_histedit_continue(&resume_commit_id,
6381 &tmp_branch, &branch, &base_commit_id, &fileindex,
6385 printf("Switching work tree to %s\n",
6386 got_ref_get_symref_target(branch));
6387 error = got_worktree_histedit_abort(worktree, fileindex, repo,
6388 branch, base_commit_id, update_progress, &did_something);
6391 printf("Histedit of %s aborted\n",
6392 got_ref_get_symref_target(branch));
6393 goto done; /* nothing else to do */
6394 } else if (abort_edit) {
6395 error = got_error(GOT_ERR_NOT_HISTEDIT);
6399 if (continue_edit) {
6402 if (!edit_in_progress) {
6403 error = got_error(GOT_ERR_NOT_HISTEDIT);
6407 error = got_worktree_get_histedit_script_path(&path, worktree);
6411 error = histedit_load_list(&histedit_cmds, path, repo);
6416 error = got_worktree_histedit_continue(&resume_commit_id,
6417 &tmp_branch, &branch, &base_commit_id, &fileindex,
6422 error = got_ref_resolve(&head_commit_id, repo, branch);
6426 error = got_object_open_as_commit(&commit, repo,
6430 parent_ids = got_object_commit_get_parent_ids(commit);
6431 pid = SIMPLEQ_FIRST(parent_ids);
6433 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6436 error = collect_commits(&commits, head_commit_id, pid->id,
6437 base_commit_id, got_worktree_get_path_prefix(worktree),
6438 GOT_ERR_HISTEDIT_PATH, repo);
6439 got_object_commit_close(commit);
6444 if (edit_in_progress) {
6445 error = got_error(GOT_ERR_HISTEDIT_BUSY);
6449 error = got_ref_open(&branch, repo,
6450 got_worktree_get_head_ref_name(worktree), 0);
6454 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6455 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6456 "will not edit commit history of a branch outside "
6457 "the \"refs/heads/\" reference namespace");
6461 error = got_ref_resolve(&head_commit_id, repo, branch);
6462 got_ref_close(branch);
6467 error = got_object_open_as_commit(&commit, repo,
6471 parent_ids = got_object_commit_get_parent_ids(commit);
6472 pid = SIMPLEQ_FIRST(parent_ids);
6474 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6477 error = collect_commits(&commits, head_commit_id, pid->id,
6478 got_worktree_get_base_commit_id(worktree),
6479 got_worktree_get_path_prefix(worktree),
6480 GOT_ERR_HISTEDIT_PATH, repo);
6481 got_object_commit_close(commit);
6486 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6487 &base_commit_id, &fileindex, worktree, repo);
6491 if (edit_script_path) {
6492 error = histedit_load_list(&histedit_cmds,
6493 edit_script_path, repo);
6495 got_worktree_histedit_abort(worktree, fileindex,
6496 repo, branch, base_commit_id,
6497 update_progress, &did_something);
6501 error = histedit_edit_script(&histedit_cmds, &commits,
6504 got_worktree_histedit_abort(worktree, fileindex,
6505 repo, branch, base_commit_id,
6506 update_progress, &did_something);
6512 error = histedit_save_list(&histedit_cmds, worktree,
6515 got_worktree_histedit_abort(worktree, fileindex,
6516 repo, branch, base_commit_id,
6517 update_progress, &did_something);
6523 error = histedit_check_script(&histedit_cmds, &commits, repo);
6527 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6528 if (resume_commit_id) {
6529 if (got_object_id_cmp(hle->commit_id,
6530 resume_commit_id) != 0)
6533 resume_commit_id = NULL;
6534 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6535 hle->cmd->code == GOT_HISTEDIT_FOLD) {
6536 error = histedit_skip_commit(hle, worktree,
6539 error = histedit_commit(NULL, worktree,
6540 fileindex, tmp_branch, hle, repo);
6547 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6548 error = histedit_skip_commit(hle, worktree, repo);
6554 error = got_object_open_as_commit(&commit, repo,
6558 parent_ids = got_object_commit_get_parent_ids(commit);
6559 pid = SIMPLEQ_FIRST(parent_ids);
6561 error = got_worktree_histedit_merge_files(&merged_paths,
6562 worktree, fileindex, pid->id, hle->commit_id, repo,
6563 rebase_progress, &rebase_status, check_cancelled, NULL);
6566 got_object_commit_close(commit);
6569 if (rebase_status == GOT_STATUS_CONFLICT) {
6570 got_worktree_rebase_pathlist_free(&merged_paths);
6574 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6576 error = got_object_id_str(&id_str, hle->commit_id);
6579 printf("Stopping histedit for amending commit %s\n",
6582 got_worktree_rebase_pathlist_free(&merged_paths);
6583 error = got_worktree_histedit_postpone(worktree,
6588 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6589 error = histedit_skip_commit(hle, worktree, repo);
6595 error = histedit_commit(&merged_paths, worktree, fileindex,
6596 tmp_branch, hle, repo);
6597 got_worktree_rebase_pathlist_free(&merged_paths);
6602 if (rebase_status == GOT_STATUS_CONFLICT) {
6603 error = got_worktree_histedit_postpone(worktree, fileindex);
6606 error = got_error_msg(GOT_ERR_CONFLICTS,
6607 "conflicts must be resolved before rebasing can continue");
6609 error = histedit_complete(worktree, fileindex, tmp_branch,
6612 got_object_id_queue_free(&commits);
6613 histedit_free_list(&histedit_cmds);
6614 free(head_commit_id);
6615 free(base_commit_id);
6616 free(resume_commit_id);
6618 got_object_commit_close(commit);
6620 got_ref_close(branch);
6622 got_ref_close(tmp_branch);
6624 got_worktree_close(worktree);
6626 got_repo_close(repo);
6631 usage_integrate(void)
6633 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
6637 static const struct got_error *
6638 cmd_integrate(int argc, char *argv[])
6640 const struct got_error *error = NULL;
6641 struct got_repository *repo = NULL;
6642 struct got_worktree *worktree = NULL;
6643 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
6644 const char *branch_arg = NULL;
6645 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
6646 struct got_fileindex *fileindex = NULL;
6647 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
6648 int ch, did_something = 0;
6650 while ((ch = getopt(argc, argv, "")) != -1) {
6663 branch_arg = argv[0];
6665 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6666 "unveil", NULL) == -1)
6669 cwd = getcwd(NULL, 0);
6671 error = got_error_from_errno("getcwd");
6675 error = got_worktree_open(&worktree, cwd);
6679 error = check_rebase_or_histedit_in_progress(worktree);
6683 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6688 error = apply_unveil(got_repo_get_path(repo), 0,
6689 got_worktree_get_root_path(worktree));
6693 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
6694 error = got_error_from_errno("asprintf");
6698 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
6699 &base_branch_ref, worktree, refname, repo);
6703 refname = strdup(got_ref_get_name(branch_ref));
6704 if (refname == NULL) {
6705 error = got_error_from_errno("strdup");
6706 got_worktree_integrate_abort(worktree, fileindex, repo,
6707 branch_ref, base_branch_ref);
6710 base_refname = strdup(got_ref_get_name(base_branch_ref));
6711 if (base_refname == NULL) {
6712 error = got_error_from_errno("strdup");
6713 got_worktree_integrate_abort(worktree, fileindex, repo,
6714 branch_ref, base_branch_ref);
6718 error = got_ref_resolve(&commit_id, repo, branch_ref);
6722 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
6726 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
6727 error = got_error_msg(GOT_ERR_SAME_BRANCH,
6728 "specified branch has already been integrated");
6729 got_worktree_integrate_abort(worktree, fileindex, repo,
6730 branch_ref, base_branch_ref);
6734 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
6736 if (error->code == GOT_ERR_ANCESTRY)
6737 error = got_error(GOT_ERR_REBASE_REQUIRED);
6738 got_worktree_integrate_abort(worktree, fileindex, repo,
6739 branch_ref, base_branch_ref);
6743 error = got_worktree_integrate_continue(worktree, fileindex, repo,
6744 branch_ref, base_branch_ref, update_progress, &did_something,
6745 check_cancelled, NULL);
6749 printf("Integrated %s into %s\n", refname, base_refname);
6752 got_repo_close(repo);
6754 got_worktree_close(worktree);
6756 free(base_commit_id);
6766 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6767 "[file-path ...]\n",
6772 static const struct got_error *
6773 print_stage(void *arg, unsigned char status, unsigned char staged_status,
6774 const char *path, struct got_object_id *blob_id,
6775 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6776 int dirfd, const char *de_name)
6778 const struct got_error *err = NULL;
6779 char *id_str = NULL;
6781 if (staged_status != GOT_STATUS_ADD &&
6782 staged_status != GOT_STATUS_MODIFY &&
6783 staged_status != GOT_STATUS_DELETE)
6786 if (staged_status == GOT_STATUS_ADD ||
6787 staged_status == GOT_STATUS_MODIFY)
6788 err = got_object_id_str(&id_str, staged_blob_id);
6790 err = got_object_id_str(&id_str, blob_id);
6794 printf("%s %c %s\n", id_str, staged_status, path);
6799 static const struct got_error *
6800 cmd_stage(int argc, char *argv[])
6802 const struct got_error *error = NULL;
6803 struct got_repository *repo = NULL;
6804 struct got_worktree *worktree = NULL;
6806 struct got_pathlist_head paths;
6807 struct got_pathlist_entry *pe;
6808 int ch, list_stage = 0, pflag = 0;
6809 FILE *patch_script_file = NULL;
6810 const char *patch_script_path = NULL;
6811 struct choose_patch_arg cpa;
6815 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6824 patch_script_path = optarg;
6836 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6837 "unveil", NULL) == -1)
6840 if (list_stage && (pflag || patch_script_path))
6841 errx(1, "-l option cannot be used with other options");
6842 if (patch_script_path && !pflag)
6843 errx(1, "-F option can only be used together with -p option");
6845 cwd = getcwd(NULL, 0);
6847 error = got_error_from_errno("getcwd");
6851 error = got_worktree_open(&worktree, cwd);
6855 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6860 if (patch_script_path) {
6861 patch_script_file = fopen(patch_script_path, "r");
6862 if (patch_script_file == NULL) {
6863 error = got_error_from_errno2("fopen",
6868 error = apply_unveil(got_repo_get_path(repo), 0,
6869 got_worktree_get_root_path(worktree));
6873 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6878 error = got_worktree_status(worktree, &paths, repo,
6879 print_stage, NULL, check_cancelled, NULL);
6881 cpa.patch_script_file = patch_script_file;
6882 cpa.action = "stage";
6883 error = got_worktree_stage(worktree, &paths,
6884 pflag ? NULL : print_status, NULL,
6885 pflag ? choose_patch : NULL, &cpa, repo);
6888 if (patch_script_file && fclose(patch_script_file) == EOF &&
6890 error = got_error_from_errno2("fclose", patch_script_path);
6892 got_repo_close(repo);
6894 got_worktree_close(worktree);
6895 TAILQ_FOREACH(pe, &paths, entry)
6896 free((char *)pe->path);
6897 got_pathlist_free(&paths);
6905 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6906 "[file-path ...]\n",
6912 static const struct got_error *
6913 cmd_unstage(int argc, char *argv[])
6915 const struct got_error *error = NULL;
6916 struct got_repository *repo = NULL;
6917 struct got_worktree *worktree = NULL;
6919 struct got_pathlist_head paths;
6920 struct got_pathlist_entry *pe;
6921 int ch, did_something = 0, pflag = 0;
6922 FILE *patch_script_file = NULL;
6923 const char *patch_script_path = NULL;
6924 struct choose_patch_arg cpa;
6928 while ((ch = getopt(argc, argv, "pF:")) != -1) {
6934 patch_script_path = optarg;
6946 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6947 "unveil", NULL) == -1)
6950 if (patch_script_path && !pflag)
6951 errx(1, "-F option can only be used together with -p option");
6953 cwd = getcwd(NULL, 0);
6955 error = got_error_from_errno("getcwd");
6959 error = got_worktree_open(&worktree, cwd);
6963 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6968 if (patch_script_path) {
6969 patch_script_file = fopen(patch_script_path, "r");
6970 if (patch_script_file == NULL) {
6971 error = got_error_from_errno2("fopen",
6977 error = apply_unveil(got_repo_get_path(repo), 0,
6978 got_worktree_get_root_path(worktree));
6982 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6986 cpa.patch_script_file = patch_script_file;
6987 cpa.action = "unstage";
6988 error = got_worktree_unstage(worktree, &paths, update_progress,
6989 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6991 if (patch_script_file && fclose(patch_script_file) == EOF &&
6993 error = got_error_from_errno2("fclose", patch_script_path);
6995 got_repo_close(repo);
6997 got_worktree_close(worktree);
6998 TAILQ_FOREACH(pe, &paths, entry)
6999 free((char *)pe->path);
7000 got_pathlist_free(&paths);
7008 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
7009 "arg1 [arg2 ...]\n", getprogname());
7013 static const struct got_error *
7014 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7016 const struct got_error *err;
7017 struct got_blob_object *blob;
7019 err = got_object_open_as_blob(&blob, repo, id, 8192);
7023 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
7024 got_object_blob_close(blob);
7028 static const struct got_error *
7029 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7031 const struct got_error *err;
7032 struct got_tree_object *tree;
7035 err = got_object_open_as_tree(&tree, repo, id);
7039 nentries = got_object_tree_get_nentries(tree);
7040 for (i = 0; i < nentries; i++) {
7041 struct got_tree_entry *te;
7043 if (sigint_received || sigpipe_received)
7045 te = got_object_tree_get_entry(tree, i);
7046 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
7049 fprintf(outfile, "%s %.7o %s\n", id_str,
7050 got_tree_entry_get_mode(te),
7051 got_tree_entry_get_name(te));
7055 got_object_tree_close(tree);
7059 static const struct got_error *
7060 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7062 const struct got_error *err;
7063 struct got_commit_object *commit;
7064 const struct got_object_id_queue *parent_ids;
7065 struct got_object_qid *pid;
7066 char *id_str = NULL;
7067 const char *logmsg = NULL;
7069 err = got_object_open_as_commit(&commit, repo, id);
7073 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
7077 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
7078 parent_ids = got_object_commit_get_parent_ids(commit);
7079 fprintf(outfile, "numparents %d\n",
7080 got_object_commit_get_nparents(commit));
7081 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
7083 err = got_object_id_str(&pid_str, pid->id);
7086 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
7089 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
7090 got_object_commit_get_author(commit),
7091 got_object_commit_get_author_time(commit));
7093 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
7094 got_object_commit_get_author(commit),
7095 got_object_commit_get_committer_time(commit));
7097 logmsg = got_object_commit_get_logmsg_raw(commit);
7098 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
7099 fprintf(outfile, "%s", logmsg);
7102 got_object_commit_close(commit);
7106 static const struct got_error *
7107 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
7109 const struct got_error *err;
7110 struct got_tag_object *tag;
7111 char *id_str = NULL;
7112 const char *tagmsg = NULL;
7114 err = got_object_open_as_tag(&tag, repo, id);
7118 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
7122 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
7124 switch (got_object_tag_get_object_type(tag)) {
7125 case GOT_OBJ_TYPE_BLOB:
7126 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7127 GOT_OBJ_LABEL_BLOB);
7129 case GOT_OBJ_TYPE_TREE:
7130 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7131 GOT_OBJ_LABEL_TREE);
7133 case GOT_OBJ_TYPE_COMMIT:
7134 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7135 GOT_OBJ_LABEL_COMMIT);
7137 case GOT_OBJ_TYPE_TAG:
7138 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
7145 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
7146 got_object_tag_get_name(tag));
7148 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
7149 got_object_tag_get_tagger(tag),
7150 got_object_tag_get_tagger_time(tag));
7152 tagmsg = got_object_tag_get_message(tag);
7153 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
7154 fprintf(outfile, "%s", tagmsg);
7157 got_object_tag_close(tag);
7161 static const struct got_error *
7162 cmd_cat(int argc, char *argv[])
7164 const struct got_error *error;
7165 struct got_repository *repo = NULL;
7166 struct got_worktree *worktree = NULL;
7167 char *cwd = NULL, *repo_path = NULL, *label = NULL;
7168 const char *commit_id_str = NULL;
7169 struct got_object_id *id = NULL, *commit_id = NULL;
7170 int ch, obj_type, i, force_path = 0;
7173 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7178 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
7181 commit_id_str = optarg;
7184 repo_path = realpath(optarg, NULL);
7185 if (repo_path == NULL)
7186 return got_error_from_errno2("realpath",
7188 got_path_strip_trailing_slashes(repo_path);
7202 cwd = getcwd(NULL, 0);
7204 error = got_error_from_errno("getcwd");
7207 error = got_worktree_open(&worktree, cwd);
7208 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7211 if (repo_path == NULL) {
7213 got_worktree_get_repo_path(worktree));
7214 if (repo_path == NULL) {
7215 error = got_error_from_errno("strdup");
7221 if (repo_path == NULL) {
7222 repo_path = getcwd(NULL, 0);
7223 if (repo_path == NULL)
7224 return got_error_from_errno("getcwd");
7227 error = got_repo_open(&repo, repo_path, NULL);
7232 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7236 if (commit_id_str == NULL)
7237 commit_id_str = GOT_REF_HEAD;
7238 error = got_repo_match_object_id(&commit_id, NULL,
7239 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
7243 for (i = 0; i < argc; i++) {
7245 error = got_object_id_by_path(&id, repo, commit_id,
7250 error = got_repo_match_object_id(&id, &label, argv[i],
7251 GOT_OBJ_TYPE_ANY, 0, repo);
7253 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
7254 error->code != GOT_ERR_NOT_REF)
7256 error = got_object_id_by_path(&id, repo,
7257 commit_id, argv[i]);
7263 error = got_object_get_type(&obj_type, repo, id);
7268 case GOT_OBJ_TYPE_BLOB:
7269 error = cat_blob(id, repo, stdout);
7271 case GOT_OBJ_TYPE_TREE:
7272 error = cat_tree(id, repo, stdout);
7274 case GOT_OBJ_TYPE_COMMIT:
7275 error = cat_commit(id, repo, stdout);
7277 case GOT_OBJ_TYPE_TAG:
7278 error = cat_tag(id, repo, stdout);
7281 error = got_error(GOT_ERR_OBJ_TYPE);
7296 got_worktree_close(worktree);
7298 const struct got_error *repo_error;
7299 repo_error = got_repo_close(repo);