2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019 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>
38 #include "got_version.h"
39 #include "got_error.h"
40 #include "got_object.h"
41 #include "got_reference.h"
42 #include "got_repository.h"
44 #include "got_worktree.h"
46 #include "got_commit_graph.h"
47 #include "got_blame.h"
48 #include "got_privsep.h"
49 #include "got_opentemp.h"
52 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
55 static volatile sig_atomic_t sigint_received;
56 static volatile sig_atomic_t sigpipe_received;
59 catch_sigint(int signo)
65 catch_sigpipe(int signo)
73 const struct got_error *(*cmd_main)(int, char *[]);
74 void (*cmd_usage)(void);
75 const char *cmd_alias;
78 __dead static void usage(int);
79 __dead static void usage_init(void);
80 __dead static void usage_import(void);
81 __dead static void usage_checkout(void);
82 __dead static void usage_update(void);
83 __dead static void usage_log(void);
84 __dead static void usage_diff(void);
85 __dead static void usage_blame(void);
86 __dead static void usage_tree(void);
87 __dead static void usage_status(void);
88 __dead static void usage_ref(void);
89 __dead static void usage_branch(void);
90 __dead static void usage_add(void);
91 __dead static void usage_remove(void);
92 __dead static void usage_revert(void);
93 __dead static void usage_commit(void);
94 __dead static void usage_cherrypick(void);
95 __dead static void usage_backout(void);
96 __dead static void usage_rebase(void);
97 __dead static void usage_histedit(void);
98 __dead static void usage_stage(void);
99 __dead static void usage_unstage(void);
101 static const struct got_error* cmd_init(int, char *[]);
102 static const struct got_error* cmd_import(int, char *[]);
103 static const struct got_error* cmd_checkout(int, char *[]);
104 static const struct got_error* cmd_update(int, char *[]);
105 static const struct got_error* cmd_log(int, char *[]);
106 static const struct got_error* cmd_diff(int, char *[]);
107 static const struct got_error* cmd_blame(int, char *[]);
108 static const struct got_error* cmd_tree(int, char *[]);
109 static const struct got_error* cmd_status(int, char *[]);
110 static const struct got_error* cmd_ref(int, char *[]);
111 static const struct got_error* cmd_branch(int, char *[]);
112 static const struct got_error* cmd_add(int, char *[]);
113 static const struct got_error* cmd_remove(int, char *[]);
114 static const struct got_error* cmd_revert(int, char *[]);
115 static const struct got_error* cmd_commit(int, char *[]);
116 static const struct got_error* cmd_cherrypick(int, char *[]);
117 static const struct got_error* cmd_backout(int, char *[]);
118 static const struct got_error* cmd_rebase(int, char *[]);
119 static const struct got_error* cmd_histedit(int, char *[]);
120 static const struct got_error* cmd_stage(int, char *[]);
121 static const struct got_error* cmd_unstage(int, char *[]);
123 static struct got_cmd got_commands[] = {
124 { "init", cmd_init, usage_init, "in" },
125 { "import", cmd_import, usage_import, "im" },
126 { "checkout", cmd_checkout, usage_checkout, "co" },
127 { "update", cmd_update, usage_update, "up" },
128 { "log", cmd_log, usage_log, "" },
129 { "diff", cmd_diff, usage_diff, "di" },
130 { "blame", cmd_blame, usage_blame, "bl" },
131 { "tree", cmd_tree, usage_tree, "tr" },
132 { "status", cmd_status, usage_status, "st" },
133 { "ref", cmd_ref, usage_ref, "" },
134 { "branch", cmd_branch, usage_branch, "br" },
135 { "add", cmd_add, usage_add, "" },
136 { "remove", cmd_remove, usage_remove, "rm" },
137 { "revert", cmd_revert, usage_revert, "rv" },
138 { "commit", cmd_commit, usage_commit, "ci" },
139 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
140 { "backout", cmd_backout, usage_backout, "bo" },
141 { "rebase", cmd_rebase, usage_rebase, "rb" },
142 { "histedit", cmd_histedit, usage_histedit, "he" },
143 { "stage", cmd_stage, usage_stage, "sg" },
144 { "unstage", cmd_unstage, usage_unstage, "ug" },
152 fprintf(stderr, "commands:");
153 for (i = 0; i < nitems(got_commands); i++) {
154 struct got_cmd *cmd = &got_commands[i];
155 fprintf(stderr, " %s", cmd->cmd_name);
161 main(int argc, char *argv[])
166 int hflag = 0, Vflag = 0;
168 setlocale(LC_CTYPE, "");
170 while ((ch = getopt(argc, argv, "hV")) != -1) {
189 got_version_print_str();
196 signal(SIGINT, catch_sigint);
197 signal(SIGPIPE, catch_sigpipe);
199 for (i = 0; i < nitems(got_commands); i++) {
200 const struct got_error *error;
202 cmd = &got_commands[i];
204 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
205 strcmp(cmd->cmd_alias, argv[0]) != 0)
209 got_commands[i].cmd_usage();
211 error = got_commands[i].cmd_main(argc, argv);
212 if (error && !(sigint_received || sigpipe_received)) {
213 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
220 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
228 fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
235 static const struct got_error *
236 get_editor(char **abspath)
238 const struct got_error *err = NULL;
241 editor = getenv("VISUAL");
243 editor = getenv("EDITOR");
246 err = got_path_find_prog(abspath, editor);
251 if (*abspath == NULL) {
252 *abspath = strdup("/bin/ed");
253 if (*abspath == NULL)
254 return got_error_from_errno("strdup");
260 static const struct got_error *
261 apply_unveil(const char *repo_path, int repo_read_only,
262 const char *worktree_path)
264 const struct got_error *err;
267 if (unveil("gmon.out", "rwc") != 0)
268 return got_error_from_errno2("unveil", "gmon.out");
270 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
271 return got_error_from_errno2("unveil", repo_path);
273 if (worktree_path && unveil(worktree_path, "rwc") != 0)
274 return got_error_from_errno2("unveil", worktree_path);
276 if (unveil("/tmp", "rwc") != 0)
277 return got_error_from_errno2("unveil", "/tmp");
279 err = got_privsep_unveil_exec_helpers();
283 if (unveil(NULL, NULL) != 0)
284 return got_error_from_errno("unveil");
292 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
296 static const struct got_error *
297 cmd_init(int argc, char *argv[])
299 const struct got_error *error = NULL;
300 char *repo_path = NULL;
303 while ((ch = getopt(argc, argv, "")) != -1) {
315 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
321 repo_path = strdup(argv[0]);
322 if (repo_path == NULL)
323 return got_error_from_errno("strdup");
325 got_path_strip_trailing_slashes(repo_path);
327 error = got_path_mkdir(repo_path);
329 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
332 error = apply_unveil(repo_path, 0, NULL);
336 error = got_repo_init(repo_path);
348 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
349 "[-r repository-path] [-I pattern] path\n", getprogname());
354 spawn_editor(const char *editor, const char *file)
357 sig_t sighup, sigint, sigquit;
360 sighup = signal(SIGHUP, SIG_IGN);
361 sigint = signal(SIGINT, SIG_IGN);
362 sigquit = signal(SIGQUIT, SIG_IGN);
364 switch (pid = fork()) {
368 execl(editor, editor, file, (char *)NULL);
372 while (waitpid(pid, &st, 0) == -1)
377 (void)signal(SIGHUP, sighup);
378 (void)signal(SIGINT, sigint);
379 (void)signal(SIGQUIT, sigquit);
381 if (!WIFEXITED(st)) {
386 return WEXITSTATUS(st);
389 static const struct got_error *
390 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
391 const char *initial_content)
393 const struct got_error *err = NULL;
397 int content_changed = 0;
402 if (stat(logmsg_path, &st) == -1)
403 return got_error_from_errno2("stat", logmsg_path);
405 if (spawn_editor(editor, logmsg_path) == -1)
406 return got_error_from_errno("failed spawning editor");
408 if (stat(logmsg_path, &st2) == -1)
409 return got_error_from_errno("stat");
411 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
412 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
413 "no changes made to commit message, aborting");
415 *logmsg = malloc(st2.st_size + 1);
417 return got_error_from_errno("malloc");
421 fp = fopen(logmsg_path, "r");
423 err = got_error_from_errno("fopen");
426 while (fgets(buf, sizeof(buf), fp) != NULL) {
427 if (!content_changed && strcmp(buf, initial_content) != 0)
429 if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
430 continue; /* remove comments and leading empty lines */
431 len = strlcat(*logmsg, buf, st2.st_size);
435 while (len > 0 && (*logmsg)[len - 1] == '\n') {
436 (*logmsg)[len - 1] = '\0';
440 if (len == 0 || !content_changed)
441 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
442 "commit message cannot be empty, aborting");
451 static const struct got_error *
452 collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
453 const char *branch_name)
455 char *initial_content = NULL, *logmsg_path = NULL;
456 const struct got_error *err = NULL;
459 if (asprintf(&initial_content,
460 "\n# %s to be imported to branch %s\n", path_dir,
462 return got_error_from_errno("asprintf");
464 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
468 dprintf(fd, initial_content);
471 err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
473 free(initial_content);
478 static const struct got_error *
479 import_progress(void *arg, const char *path)
481 printf("A %s\n", path);
485 static const struct got_error *
486 get_author(const char **author)
488 const char *got_author;
492 got_author = getenv("GOT_AUTHOR");
493 if (got_author == NULL) {
494 /* TODO: Look up user in password database? */
495 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
498 *author = got_author;
501 * Really dumb email address check; we're only doing this to
502 * avoid git's object parser breaking on commits we create.
504 while (*got_author && *got_author != '<')
506 if (*got_author != '<')
507 return got_error(GOT_ERR_COMMIT_NO_EMAIL);
508 while (*got_author && *got_author != '@')
510 if (*got_author != '@')
511 return got_error(GOT_ERR_COMMIT_NO_EMAIL);
512 while (*got_author && *got_author != '>')
514 if (*got_author != '>')
515 return got_error(GOT_ERR_COMMIT_NO_EMAIL);
520 static const struct got_error *
521 cmd_import(int argc, char *argv[])
523 const struct got_error *error = NULL;
524 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
527 const char *branch_name = "master";
528 char *refname = NULL, *id_str = NULL;
529 struct got_repository *repo = NULL;
530 struct got_reference *branch_ref = NULL, *head_ref = NULL;
531 struct got_object_id *new_commit_id = NULL;
533 struct got_pathlist_head ignores;
534 struct got_pathlist_entry *pe;
536 TAILQ_INIT(&ignores);
538 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
541 branch_name = optarg;
544 logmsg = strdup(optarg);
545 if (logmsg == NULL) {
546 error = got_error_from_errno("strdup");
551 repo_path = realpath(optarg, NULL);
552 if (repo_path == NULL) {
553 error = got_error_from_errno("realpath");
558 if (optarg[0] == '\0')
560 error = got_pathlist_insert(&pe, &ignores, optarg,
575 if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
582 error = get_author(&author);
586 if (repo_path == NULL) {
587 repo_path = getcwd(NULL, 0);
588 if (repo_path == NULL)
589 return got_error_from_errno("getcwd");
591 got_path_strip_trailing_slashes(repo_path);
592 error = got_repo_open(&repo, repo_path);
596 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
597 error = got_error_from_errno("asprintf");
601 error = got_ref_open(&branch_ref, repo, refname, 0);
603 if (error->code != GOT_ERR_NOT_REF)
606 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
607 "import target branch already exists");
611 path_dir = realpath(argv[0], NULL);
612 if (path_dir == NULL) {
613 error = got_error_from_errno("realpath");
616 got_path_strip_trailing_slashes(path_dir);
619 * unveil(2) traverses exec(2); if an editor is used we have
620 * to apply unveil after the log message has been written.
622 if (logmsg == NULL || strlen(logmsg) == 0) {
623 error = get_editor(&editor);
626 error = collect_import_msg(&logmsg, editor, path_dir, refname);
631 if (unveil(path_dir, "r") != 0)
632 return got_error_from_errno2("unveil", path_dir);
634 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
638 error = got_repo_import(&new_commit_id, path_dir, logmsg,
639 author, &ignores, repo, import_progress, NULL);
643 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
647 error = got_ref_write(branch_ref, repo);
651 error = got_object_id_str(&id_str, new_commit_id);
655 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
657 if (error->code != GOT_ERR_NOT_REF)
660 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
665 error = got_ref_write(head_ref, repo);
670 printf("Created branch %s with commit %s\n",
671 got_ref_get_name(branch_ref), id_str);
679 got_ref_close(branch_ref);
681 got_ref_close(head_ref);
688 fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
689 "[-p prefix] repository-path [worktree-path]\n", getprogname());
693 static const struct got_error *
694 checkout_progress(void *arg, unsigned char status, const char *path)
696 char *worktree_path = arg;
698 /* Base commit bump happens silently. */
699 if (status == GOT_STATUS_BUMP_BASE)
702 while (path[0] == '/')
705 printf("%c %s/%s\n", status, worktree_path, path);
709 static const struct got_error *
710 check_cancelled(void *arg)
712 if (sigint_received || sigpipe_received)
713 return got_error(GOT_ERR_CANCELLED);
717 static const struct got_error *
718 check_linear_ancestry(struct got_object_id *commit_id,
719 struct got_object_id *base_commit_id, struct got_repository *repo)
721 const struct got_error *err = NULL;
722 struct got_object_id *yca_id;
724 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
725 commit_id, base_commit_id, repo);
730 return got_error(GOT_ERR_ANCESTRY);
733 * Require a straight line of history between the target commit
734 * and the work tree's base commit.
736 * Non-linear situations such as this require a rebase:
738 * (commit) D F (base_commit)
746 * 'got update' only handles linear cases:
747 * Update forwards in time: A (base/yca) - B - C - D (commit)
748 * Update backwards in time: D (base) - C - B - A (commit/yca)
750 if (got_object_id_cmp(commit_id, yca_id) != 0 &&
751 got_object_id_cmp(base_commit_id, yca_id) != 0)
752 return got_error(GOT_ERR_ANCESTRY);
758 static const struct got_error *
759 check_same_branch(struct got_object_id *commit_id,
760 struct got_reference *head_ref, struct got_object_id *yca_id,
761 struct got_repository *repo)
763 const struct got_error *err = NULL;
764 struct got_commit_graph *graph = NULL;
765 struct got_object_id *head_commit_id = NULL;
766 int is_same_branch = 0;
768 err = got_ref_resolve(&head_commit_id, repo, head_ref);
772 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
776 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
781 err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
785 err = got_commit_graph_iter_start(graph, head_commit_id, repo);
790 struct got_object_id *id;
791 err = got_commit_graph_iter_next(&id, graph);
793 if (err->code == GOT_ERR_ITER_COMPLETED) {
796 } else if (err->code != GOT_ERR_ITER_NEED_MORE)
798 err = got_commit_graph_fetch_commits(graph, 1,
805 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
807 if (got_object_id_cmp(id, commit_id) == 0) {
815 got_commit_graph_close(graph);
816 free(head_commit_id);
817 if (!err && !is_same_branch)
818 err = got_error(GOT_ERR_ANCESTRY);
822 static const struct got_error *
823 resolve_commit_arg(struct got_object_id **commit_id,
824 const char *commit_id_arg, struct got_repository *repo)
826 const struct got_error *err;
827 struct got_reference *ref;
828 struct got_tag_object *tag;
830 err = got_repo_object_match_tag(&tag, commit_id_arg,
831 GOT_OBJ_TYPE_COMMIT, repo);
833 *commit_id = got_object_id_dup(
834 got_object_tag_get_object_id(tag));
835 if (*commit_id == NULL)
836 err = got_error_from_errno("got_object_id_dup");
837 got_object_tag_close(tag);
839 } else if (err->code != GOT_ERR_NO_OBJ)
842 err = got_ref_open(&ref, repo, commit_id_arg, 0);
844 err = got_ref_resolve(commit_id, repo, ref);
847 if (err->code != GOT_ERR_NOT_REF)
849 err = got_repo_match_object_id_prefix(commit_id,
850 commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
855 static const struct got_error *
856 cmd_checkout(int argc, char *argv[])
858 const struct got_error *error = NULL;
859 struct got_repository *repo = NULL;
860 struct got_reference *head_ref = NULL;
861 struct got_worktree *worktree = NULL;
862 char *repo_path = NULL;
863 char *worktree_path = NULL;
864 const char *path_prefix = "";
865 const char *branch_name = GOT_REF_HEAD;
866 char *commit_id_str = NULL;
867 int ch, same_path_prefix;
868 struct got_pathlist_head paths;
872 while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
875 branch_name = optarg;
878 commit_id_str = strdup(optarg);
879 if (commit_id_str == NULL)
880 return got_error_from_errno("strdup");
883 path_prefix = optarg;
895 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
896 "unveil", NULL) == -1)
900 char *cwd, *base, *dotgit;
901 repo_path = realpath(argv[0], NULL);
902 if (repo_path == NULL)
903 return got_error_from_errno2("realpath", argv[0]);
904 cwd = getcwd(NULL, 0);
906 error = got_error_from_errno("getcwd");
909 if (path_prefix[0]) {
910 base = basename(path_prefix);
912 error = got_error_from_errno2("basename",
917 base = basename(repo_path);
919 error = got_error_from_errno2("basename",
924 dotgit = strstr(base, ".git");
927 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
928 error = got_error_from_errno("asprintf");
933 } else if (argc == 2) {
934 repo_path = realpath(argv[0], NULL);
935 if (repo_path == NULL) {
936 error = got_error_from_errno2("realpath", argv[0]);
939 worktree_path = realpath(argv[1], NULL);
940 if (worktree_path == NULL) {
941 if (errno != ENOENT) {
942 error = got_error_from_errno2("realpath",
946 worktree_path = strdup(argv[1]);
947 if (worktree_path == NULL) {
948 error = got_error_from_errno("strdup");
955 got_path_strip_trailing_slashes(repo_path);
956 got_path_strip_trailing_slashes(worktree_path);
958 error = got_repo_open(&repo, repo_path);
962 /* Pre-create work tree path for unveil(2) */
963 error = got_path_mkdir(worktree_path);
965 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
966 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
968 if (!got_path_dir_is_empty(worktree_path)) {
969 error = got_error_path(worktree_path,
970 GOT_ERR_DIR_NOT_EMPTY);
975 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
979 error = got_ref_open(&head_ref, repo, branch_name, 0);
983 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
984 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
987 error = got_worktree_open(&worktree, worktree_path);
991 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
995 if (!same_path_prefix) {
996 error = got_error(GOT_ERR_PATH_PREFIX);
1000 if (commit_id_str) {
1001 struct got_object_id *commit_id;
1002 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1005 error = check_linear_ancestry(commit_id,
1006 got_worktree_get_base_commit_id(worktree), repo);
1007 if (error != NULL) {
1011 error = check_same_branch(commit_id, head_ref, NULL, repo);
1014 error = got_worktree_set_base_commit_id(worktree, repo,
1021 error = got_pathlist_append(&paths, "", NULL);
1024 error = got_worktree_checkout_files(worktree, &paths, repo,
1025 checkout_progress, worktree_path, check_cancelled, NULL);
1029 printf("Now shut up and hack\n");
1032 got_pathlist_free(&paths);
1033 free(commit_id_str);
1035 free(worktree_path);
1042 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1047 static const struct got_error *
1048 update_progress(void *arg, unsigned char status, const char *path)
1050 int *did_something = arg;
1052 if (status == GOT_STATUS_EXISTS)
1057 /* Base commit bump happens silently. */
1058 if (status == GOT_STATUS_BUMP_BASE)
1061 while (path[0] == '/')
1063 printf("%c %s\n", status, path);
1067 static const struct got_error *
1068 switch_head_ref(struct got_reference *head_ref,
1069 struct got_object_id *commit_id, struct got_worktree *worktree,
1070 struct got_repository *repo)
1072 const struct got_error *err = NULL;
1074 int ref_has_moved = 0;
1076 /* Trivial case: switching between two different references. */
1077 if (strcmp(got_ref_get_name(head_ref),
1078 got_worktree_get_head_ref_name(worktree)) != 0) {
1079 printf("Switching work tree from %s to %s\n",
1080 got_worktree_get_head_ref_name(worktree),
1081 got_ref_get_name(head_ref));
1082 return got_worktree_set_head_ref(worktree, head_ref);
1085 err = check_linear_ancestry(commit_id,
1086 got_worktree_get_base_commit_id(worktree), repo);
1088 if (err->code != GOT_ERR_ANCESTRY)
1095 /* Switching to a rebased branch with the same reference name. */
1096 err = got_object_id_str(&base_id_str,
1097 got_worktree_get_base_commit_id(worktree));
1100 printf("Reference %s now points at a different branch\n",
1101 got_worktree_get_head_ref_name(worktree));
1102 printf("Switching work tree from %s to %s\n", base_id_str,
1103 got_worktree_get_head_ref_name(worktree));
1107 static const struct got_error *
1108 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1110 const struct got_error *err;
1113 err = got_worktree_rebase_in_progress(&in_progress, worktree);
1117 return got_error(GOT_ERR_REBASING);
1119 err = got_worktree_histedit_in_progress(&in_progress, worktree);
1123 return got_error(GOT_ERR_HISTEDIT_BUSY);
1128 static const struct got_error *
1129 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1130 char *argv[], struct got_worktree *worktree)
1132 const struct got_error *err = NULL;
1139 return got_error_from_errno("strdup");
1140 return got_pathlist_append(paths, path, NULL);
1143 for (i = 0; i < argc; i++) {
1144 err = got_worktree_resolve_path(&path, worktree, argv[i]);
1147 err = got_pathlist_append(paths, path, NULL);
1157 static const struct got_error *
1158 cmd_update(int argc, char *argv[])
1160 const struct got_error *error = NULL;
1161 struct got_repository *repo = NULL;
1162 struct got_worktree *worktree = NULL;
1163 char *worktree_path = NULL;
1164 struct got_object_id *commit_id = NULL;
1165 char *commit_id_str = NULL;
1166 const char *branch_name = NULL;
1167 struct got_reference *head_ref = NULL;
1168 struct got_pathlist_head paths;
1169 struct got_pathlist_entry *pe;
1170 int ch, did_something = 0;
1174 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1177 branch_name = optarg;
1180 commit_id_str = strdup(optarg);
1181 if (commit_id_str == NULL)
1182 return got_error_from_errno("strdup");
1194 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1195 "unveil", NULL) == -1)
1198 worktree_path = getcwd(NULL, 0);
1199 if (worktree_path == NULL) {
1200 error = got_error_from_errno("getcwd");
1203 error = got_worktree_open(&worktree, worktree_path);
1207 error = check_rebase_or_histedit_in_progress(worktree);
1211 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1215 error = apply_unveil(got_repo_get_path(repo), 0,
1216 got_worktree_get_root_path(worktree));
1220 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1224 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1225 got_worktree_get_head_ref_name(worktree), 0);
1228 if (commit_id_str == NULL) {
1229 error = got_ref_resolve(&commit_id, repo, head_ref);
1232 error = got_object_id_str(&commit_id_str, commit_id);
1236 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1237 free(commit_id_str);
1238 commit_id_str = NULL;
1241 error = got_object_id_str(&commit_id_str, commit_id);
1247 struct got_object_id *head_commit_id;
1248 TAILQ_FOREACH(pe, &paths, entry) {
1249 if (pe->path_len == 0)
1251 error = got_error_msg(GOT_ERR_BAD_PATH,
1252 "switching between branches requires that "
1253 "the entire work tree gets updated");
1256 error = got_ref_resolve(&head_commit_id, repo, head_ref);
1259 error = check_linear_ancestry(commit_id, head_commit_id, repo);
1260 free(head_commit_id);
1263 error = check_same_branch(commit_id, head_ref, NULL, repo);
1266 error = switch_head_ref(head_ref, commit_id, worktree, repo);
1270 error = check_linear_ancestry(commit_id,
1271 got_worktree_get_base_commit_id(worktree), repo);
1272 if (error != NULL) {
1273 if (error->code == GOT_ERR_ANCESTRY)
1274 error = got_error(GOT_ERR_BRANCH_MOVED);
1277 error = check_same_branch(commit_id, head_ref, NULL, repo);
1282 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1284 error = got_worktree_set_base_commit_id(worktree, repo,
1290 error = got_worktree_checkout_files(worktree, &paths, repo,
1291 update_progress, &did_something, check_cancelled, NULL);
1296 printf("Updated to commit %s\n", commit_id_str);
1298 printf("Already up-to-date\n");
1300 free(worktree_path);
1301 TAILQ_FOREACH(pe, &paths, entry)
1302 free((char *)pe->path);
1303 got_pathlist_free(&paths);
1305 free(commit_id_str);
1309 static const struct got_error *
1310 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1311 int diff_context, struct got_repository *repo)
1313 const struct got_error *err = NULL;
1314 struct got_tree_object *tree1 = NULL, *tree2;
1315 struct got_object_qid *qid;
1316 char *id_str1 = NULL, *id_str2;
1317 struct got_diff_blob_output_unidiff_arg arg;
1319 err = got_object_open_as_tree(&tree2, repo,
1320 got_object_commit_get_tree_id(commit));
1324 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1326 struct got_commit_object *pcommit;
1328 err = got_object_open_as_commit(&pcommit, repo, qid->id);
1332 err = got_object_open_as_tree(&tree1, repo,
1333 got_object_commit_get_tree_id(pcommit));
1334 got_object_commit_close(pcommit);
1338 err = got_object_id_str(&id_str1, qid->id);
1343 err = got_object_id_str(&id_str2, id);
1347 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1348 arg.diff_context = diff_context;
1349 arg.outfile = stdout;
1350 err = got_diff_tree(tree1, tree2, "", "", repo,
1351 got_diff_blob_output_unidiff, &arg, 1);
1354 got_object_tree_close(tree1);
1355 got_object_tree_close(tree2);
1362 get_datestr(time_t *time, char *datebuf)
1364 char *p, *s = ctime_r(time, datebuf);
1365 p = strchr(s, '\n');
1371 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1373 static const struct got_error *
1374 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1375 struct got_repository *repo, int show_patch, int diff_context,
1376 struct got_reflist_head *refs)
1378 const struct got_error *err = NULL;
1379 char *id_str, *datestr, *logmsg0, *logmsg, *line;
1381 time_t committer_time;
1382 const char *author, *committer;
1383 char *refs_str = NULL;
1384 struct got_reflist_entry *re;
1386 SIMPLEQ_FOREACH(re, refs, entry) {
1389 struct got_tag_object *tag = NULL;
1392 name = got_ref_get_name(re->ref);
1393 if (strcmp(name, GOT_REF_HEAD) == 0)
1395 if (strncmp(name, "refs/", 5) == 0)
1397 if (strncmp(name, "got/", 4) == 0)
1399 if (strncmp(name, "heads/", 6) == 0)
1401 if (strncmp(name, "remotes/", 8) == 0)
1403 if (strncmp(name, "tags/", 5) == 0) {
1404 err = got_object_open_as_tag(&tag, repo, re->id);
1408 cmp = got_object_id_cmp(tag ?
1409 got_object_tag_get_object_id(tag) : re->id, id);
1411 got_object_tag_close(tag);
1415 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1417 err = got_error_from_errno("asprintf");
1423 err = got_object_id_str(&id_str, id);
1427 printf(GOT_COMMIT_SEP_STR);
1428 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1429 refs_str ? refs_str : "", refs_str ? ")" : "");
1434 printf("from: %s\n", got_object_commit_get_author(commit));
1435 committer_time = got_object_commit_get_committer_time(commit);
1436 datestr = get_datestr(&committer_time, datebuf);
1437 printf("date: %s UTC\n", datestr);
1438 author = got_object_commit_get_author(commit);
1439 committer = got_object_commit_get_committer(commit);
1440 if (strcmp(author, committer) != 0)
1441 printf("via: %s\n", committer);
1442 if (got_object_commit_get_nparents(commit) > 1) {
1443 const struct got_object_id_queue *parent_ids;
1444 struct got_object_qid *qid;
1446 parent_ids = got_object_commit_get_parent_ids(commit);
1447 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1448 err = got_object_id_str(&id_str, qid->id);
1451 printf("parent %d: %s\n", n++, id_str);
1456 logmsg0 = strdup(got_object_commit_get_logmsg(commit));
1457 if (logmsg0 == NULL)
1458 return got_error_from_errno("strdup");
1462 line = strsep(&logmsg, "\n");
1464 printf(" %s\n", line);
1469 err = print_patch(commit, id, diff_context, repo);
1474 if (fflush(stdout) != 0 && err == NULL)
1475 err = got_error_from_errno("fflush");
1479 static const struct got_error *
1480 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1481 char *path, int show_patch, int diff_context, int limit,
1482 int first_parent_traversal, struct got_reflist_head *refs)
1484 const struct got_error *err;
1485 struct got_commit_graph *graph;
1487 err = got_commit_graph_open(&graph, root_id, path,
1488 first_parent_traversal, repo);
1491 err = got_commit_graph_iter_start(graph, root_id, repo);
1495 struct got_commit_object *commit;
1496 struct got_object_id *id;
1498 if (sigint_received || sigpipe_received)
1501 err = got_commit_graph_iter_next(&id, graph);
1503 if (err->code == GOT_ERR_ITER_COMPLETED) {
1507 if (err->code != GOT_ERR_ITER_NEED_MORE)
1509 err = got_commit_graph_fetch_commits(graph, 1, repo);
1518 err = got_object_open_as_commit(&commit, repo, id);
1521 err = print_commit(commit, id, repo, show_patch, diff_context,
1523 got_object_commit_close(commit);
1524 if (err || (limit && --limit == 0))
1528 got_commit_graph_close(graph);
1535 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1536 "[-r repository-path] [path]\n", getprogname());
1540 static const struct got_error *
1541 cmd_log(int argc, char *argv[])
1543 const struct got_error *error;
1544 struct got_repository *repo = NULL;
1545 struct got_worktree *worktree = NULL;
1546 struct got_commit_object *commit = NULL;
1547 struct got_object_id *id = NULL;
1548 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1549 char *start_commit = NULL;
1550 int diff_context = 3, ch;
1551 int show_patch = 0, limit = 0, first_parent_traversal = 0;
1553 struct got_reflist_head refs;
1555 SIMPLEQ_INIT(&refs);
1558 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1564 while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1570 start_commit = optarg;
1573 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1576 err(1, "-C option %s", errstr);
1579 limit = strtonum(optarg, 1, INT_MAX, &errstr);
1581 err(1, "-l option %s", errstr);
1584 first_parent_traversal = 1;
1587 repo_path = realpath(optarg, NULL);
1588 if (repo_path == NULL)
1589 err(1, "-r option");
1590 got_path_strip_trailing_slashes(repo_path);
1601 cwd = getcwd(NULL, 0);
1603 error = got_error_from_errno("getcwd");
1607 error = got_worktree_open(&worktree, cwd);
1608 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1615 error = got_error_from_errno("strdup");
1618 } else if (argc == 1) {
1620 error = got_worktree_resolve_path(&path, worktree,
1625 path = strdup(argv[0]);
1627 error = got_error_from_errno("strdup");
1634 if (repo_path == NULL) {
1635 repo_path = worktree ?
1636 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1638 if (repo_path == NULL) {
1639 error = got_error_from_errno("strdup");
1643 error = got_repo_open(&repo, repo_path);
1647 error = apply_unveil(got_repo_get_path(repo), 1,
1648 worktree ? got_worktree_get_root_path(worktree) : NULL);
1652 if (start_commit == NULL) {
1653 struct got_reference *head_ref;
1654 error = got_ref_open(&head_ref, repo,
1655 worktree ? got_worktree_get_head_ref_name(worktree)
1659 error = got_ref_resolve(&id, repo, head_ref);
1660 got_ref_close(head_ref);
1663 error = got_object_open_as_commit(&commit, repo, id);
1665 struct got_reference *ref;
1666 error = got_ref_open(&ref, repo, start_commit, 0);
1667 if (error == NULL) {
1669 error = got_ref_resolve(&id, repo, ref);
1673 error = got_object_get_type(&obj_type, repo, id);
1676 if (obj_type == GOT_OBJ_TYPE_TAG) {
1677 struct got_tag_object *tag;
1678 error = got_object_open_as_tag(&tag, repo, id);
1681 if (got_object_tag_get_object_type(tag) !=
1682 GOT_OBJ_TYPE_COMMIT) {
1683 got_object_tag_close(tag);
1684 error = got_error(GOT_ERR_OBJ_TYPE);
1688 id = got_object_id_dup(
1689 got_object_tag_get_object_id(tag));
1691 error = got_error_from_errno(
1692 "got_object_id_dup");
1693 got_object_tag_close(tag);
1696 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1697 error = got_error(GOT_ERR_OBJ_TYPE);
1700 error = got_object_open_as_commit(&commit, repo, id);
1704 if (commit == NULL) {
1705 error = got_repo_match_object_id_prefix(&id,
1706 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1714 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1719 path = in_repo_path;
1722 error = got_ref_list(&refs, repo);
1726 error = print_commits(id, repo, path, show_patch,
1727 diff_context, limit, first_parent_traversal, &refs);
1734 got_worktree_close(worktree);
1736 const struct got_error *repo_error;
1737 repo_error = got_repo_close(repo);
1741 got_ref_list_free(&refs);
1748 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1749 "[object1 object2 | path]\n", getprogname());
1753 struct print_diff_arg {
1754 struct got_repository *repo;
1755 struct got_worktree *worktree;
1762 static const struct got_error *
1763 print_diff(void *arg, unsigned char status, unsigned char staged_status,
1764 const char *path, struct got_object_id *blob_id,
1765 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1767 struct print_diff_arg *a = arg;
1768 const struct got_error *err = NULL;
1769 struct got_blob_object *blob1 = NULL;
1771 char *abspath = NULL, *label1 = NULL;
1774 if (a->diff_staged) {
1775 if (staged_status != GOT_STATUS_MODIFY &&
1776 staged_status != GOT_STATUS_ADD &&
1777 staged_status != GOT_STATUS_DELETE)
1780 if (staged_status == GOT_STATUS_DELETE)
1782 if (status != GOT_STATUS_MODIFY &&
1783 status != GOT_STATUS_ADD &&
1784 status != GOT_STATUS_DELETE &&
1785 status != GOT_STATUS_CONFLICT)
1789 if (!a->header_shown) {
1790 printf("diff %s %s%s\n", a->id_str,
1791 got_worktree_get_root_path(a->worktree),
1792 a->diff_staged ? " (staged changes)" : "");
1793 a->header_shown = 1;
1796 if (a->diff_staged) {
1797 const char *label1 = NULL, *label2 = NULL;
1798 switch (staged_status) {
1799 case GOT_STATUS_MODIFY:
1803 case GOT_STATUS_ADD:
1806 case GOT_STATUS_DELETE:
1810 return got_error(GOT_ERR_FILE_STATUS);
1812 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1813 label1, label2, a->diff_context, a->repo, stdout);
1816 if (staged_status == GOT_STATUS_ADD ||
1817 staged_status == GOT_STATUS_MODIFY) {
1819 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1823 err = got_object_id_str(&id_str, staged_blob_id);
1826 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1827 err = got_error_from_errno("asprintf");
1832 } else if (status != GOT_STATUS_ADD) {
1833 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1838 if (status != GOT_STATUS_DELETE) {
1839 if (asprintf(&abspath, "%s/%s",
1840 got_worktree_get_root_path(a->worktree), path) == -1) {
1841 err = got_error_from_errno("asprintf");
1845 f2 = fopen(abspath, "r");
1847 err = got_error_from_errno2("fopen", abspath);
1850 if (lstat(abspath, &sb) == -1) {
1851 err = got_error_from_errno2("lstat", abspath);
1857 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1858 a->diff_context, stdout);
1861 got_object_blob_close(blob1);
1862 if (f2 && fclose(f2) != 0 && err == NULL)
1863 err = got_error_from_errno("fclose");
1868 static const struct got_error *
1869 match_object_id(struct got_object_id **id, char **label,
1870 const char *id_str, int obj_type, struct got_repository *repo)
1872 const struct got_error *err;
1873 struct got_tag_object *tag;
1874 struct got_reference *ref = NULL;
1879 err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY, repo);
1881 *id = got_object_id_dup(got_object_tag_get_object_id(tag));
1883 err = got_error_from_errno("got_object_id_dup");
1884 if (asprintf(label, "refs/tags/%s",
1885 got_object_tag_get_name(tag)) == -1)
1886 err = got_error_from_errno("asprintf");
1887 got_object_tag_close(tag);
1889 } else if (err->code != GOT_ERR_NO_OBJ)
1892 err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
1894 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1896 err = got_ref_open(&ref, repo, id_str, 0);
1899 *label = strdup(got_ref_get_name(ref));
1900 if (*label == NULL) {
1901 err = got_error_from_errno("strdup");
1904 err = got_ref_resolve(id, repo, ref);
1906 err = got_object_id_str(label, *id);
1907 if (*label == NULL) {
1908 err = got_error_from_errno("strdup");
1919 static const struct got_error *
1920 cmd_diff(int argc, char *argv[])
1922 const struct got_error *error;
1923 struct got_repository *repo = NULL;
1924 struct got_worktree *worktree = NULL;
1925 char *cwd = NULL, *repo_path = NULL;
1926 struct got_object_id *id1 = NULL, *id2 = NULL;
1927 const char *id_str1 = NULL, *id_str2 = NULL;
1928 char *label1 = NULL, *label2 = NULL;
1930 int diff_context = 3, diff_staged = 0, ch;
1935 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1940 while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
1943 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1945 err(1, "-C option %s", errstr);
1948 repo_path = realpath(optarg, NULL);
1949 if (repo_path == NULL)
1950 err(1, "-r option");
1951 got_path_strip_trailing_slashes(repo_path);
1965 cwd = getcwd(NULL, 0);
1967 error = got_error_from_errno("getcwd");
1970 error = got_worktree_open(&worktree, cwd);
1971 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1974 if (worktree == NULL) {
1975 error = got_error(GOT_ERR_NOT_WORKTREE);
1980 "-r option can't be used when diffing a work tree");
1981 repo_path = strdup(got_worktree_get_repo_path(worktree));
1982 if (repo_path == NULL) {
1983 error = got_error_from_errno("strdup");
1987 error = got_worktree_resolve_path(&path, worktree,
1994 error = got_error_from_errno("strdup");
1998 } else if (argc == 2) {
2000 errx(1, "-s option can't be used when diffing "
2001 "objects in repository");
2004 if (worktree && repo_path == NULL) {
2006 strdup(got_worktree_get_repo_path(worktree));
2007 if (repo_path == NULL) {
2008 error = got_error_from_errno("strdup");
2015 if (repo_path == NULL) {
2016 repo_path = getcwd(NULL, 0);
2017 if (repo_path == NULL)
2018 return got_error_from_errno("getcwd");
2021 error = got_repo_open(&repo, repo_path);
2026 error = apply_unveil(got_repo_get_path(repo), 1,
2027 worktree ? got_worktree_get_root_path(worktree) : NULL);
2032 struct print_diff_arg arg;
2033 struct got_pathlist_head paths;
2038 error = got_object_id_str(&id_str,
2039 got_worktree_get_base_commit_id(worktree));
2043 arg.worktree = worktree;
2044 arg.diff_context = diff_context;
2045 arg.id_str = id_str;
2046 arg.header_shown = 0;
2047 arg.diff_staged = diff_staged;
2049 error = got_pathlist_append(&paths, path, NULL);
2053 error = got_worktree_status(worktree, &paths, repo, print_diff,
2054 &arg, check_cancelled, NULL);
2056 got_pathlist_free(&paths);
2060 error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, repo);
2064 error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, repo);
2068 error = got_object_get_type(&type1, repo, id1);
2072 error = got_object_get_type(&type2, repo, id2);
2076 if (type1 != type2) {
2077 error = got_error(GOT_ERR_OBJ_TYPE);
2082 case GOT_OBJ_TYPE_BLOB:
2083 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2084 diff_context, repo, stdout);
2086 case GOT_OBJ_TYPE_TREE:
2087 error = got_diff_objects_as_trees(id1, id2, "", "",
2088 diff_context, repo, stdout);
2090 case GOT_OBJ_TYPE_COMMIT:
2091 printf("diff %s %s\n", label1, label2);
2092 error = got_diff_objects_as_commits(id1, id2, diff_context,
2096 error = got_error(GOT_ERR_OBJ_TYPE);
2106 got_worktree_close(worktree);
2108 const struct got_error *repo_error;
2109 repo_error = got_repo_close(repo);
2120 "usage: %s blame [-c commit] [-r repository-path] path\n",
2125 static const struct got_error *
2126 cmd_blame(int argc, char *argv[])
2128 const struct got_error *error;
2129 struct got_repository *repo = NULL;
2130 struct got_worktree *worktree = NULL;
2131 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2132 struct got_object_id *commit_id = NULL;
2133 char *commit_id_str = NULL;
2137 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2142 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2145 commit_id_str = optarg;
2148 repo_path = realpath(optarg, NULL);
2149 if (repo_path == NULL)
2150 err(1, "-r option");
2151 got_path_strip_trailing_slashes(repo_path);
2167 cwd = getcwd(NULL, 0);
2169 error = got_error_from_errno("getcwd");
2172 if (repo_path == NULL) {
2173 error = got_worktree_open(&worktree, cwd);
2174 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2180 strdup(got_worktree_get_repo_path(worktree));
2181 if (repo_path == NULL)
2182 error = got_error_from_errno("strdup");
2186 repo_path = strdup(cwd);
2187 if (repo_path == NULL) {
2188 error = got_error_from_errno("strdup");
2194 error = got_repo_open(&repo, repo_path);
2198 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2203 const char *prefix = got_worktree_get_path_prefix(worktree);
2204 char *p, *worktree_subdir = cwd +
2205 strlen(got_worktree_get_root_path(worktree));
2206 if (asprintf(&p, "%s%s%s%s%s",
2207 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2208 worktree_subdir, worktree_subdir[0] ? "/" : "",
2210 error = got_error_from_errno("asprintf");
2213 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2216 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2221 if (commit_id_str == NULL) {
2222 struct got_reference *head_ref;
2223 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2226 error = got_ref_resolve(&commit_id, repo, head_ref);
2227 got_ref_close(head_ref);
2231 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2236 error = got_blame(in_repo_path, commit_id, repo, stdout);
2243 got_worktree_close(worktree);
2245 const struct got_error *repo_error;
2246 repo_error = got_repo_close(repo);
2257 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2263 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2264 const char *root_path)
2266 int is_root_path = (strcmp(path, root_path) == 0);
2267 const char *modestr = "";
2269 path += strlen(root_path);
2270 while (path[0] == '/')
2273 if (S_ISLNK(te->mode))
2275 else if (S_ISDIR(te->mode))
2277 else if (te->mode & S_IXUSR)
2280 printf("%s%s%s%s%s\n", id ? id : "", path,
2281 is_root_path ? "" : "/", te->name, modestr);
2284 static const struct got_error *
2285 print_tree(const char *path, struct got_object_id *commit_id,
2286 int show_ids, int recurse, const char *root_path,
2287 struct got_repository *repo)
2289 const struct got_error *err = NULL;
2290 struct got_object_id *tree_id = NULL;
2291 struct got_tree_object *tree = NULL;
2292 const struct got_tree_entries *entries;
2293 struct got_tree_entry *te;
2295 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2299 err = got_object_open_as_tree(&tree, repo, tree_id);
2302 entries = got_object_tree_get_entries(tree);
2303 te = SIMPLEQ_FIRST(&entries->head);
2307 if (sigint_received || sigpipe_received)
2312 err = got_object_id_str(&id_str, te->id);
2315 if (asprintf(&id, "%s ", id_str) == -1) {
2316 err = got_error_from_errno("asprintf");
2322 print_entry(te, id, path, root_path);
2325 if (recurse && S_ISDIR(te->mode)) {
2327 if (asprintf(&child_path, "%s%s%s", path,
2328 path[0] == '/' && path[1] == '\0' ? "" : "/",
2330 err = got_error_from_errno("asprintf");
2333 err = print_tree(child_path, commit_id, show_ids, 1,
2340 te = SIMPLEQ_NEXT(te, entry);
2344 got_object_tree_close(tree);
2349 static const struct got_error *
2350 cmd_tree(int argc, char *argv[])
2352 const struct got_error *error;
2353 struct got_repository *repo = NULL;
2354 struct got_worktree *worktree = NULL;
2356 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2357 struct got_object_id *commit_id = NULL;
2358 char *commit_id_str = NULL;
2359 int show_ids = 0, recurse = 0;
2363 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2368 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2371 commit_id_str = optarg;
2374 repo_path = realpath(optarg, NULL);
2375 if (repo_path == NULL)
2376 err(1, "-r option");
2377 got_path_strip_trailing_slashes(repo_path);
2401 cwd = getcwd(NULL, 0);
2403 error = got_error_from_errno("getcwd");
2406 if (repo_path == NULL) {
2407 error = got_worktree_open(&worktree, cwd);
2408 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2414 strdup(got_worktree_get_repo_path(worktree));
2415 if (repo_path == NULL)
2416 error = got_error_from_errno("strdup");
2420 repo_path = strdup(cwd);
2421 if (repo_path == NULL) {
2422 error = got_error_from_errno("strdup");
2428 error = got_repo_open(&repo, repo_path);
2432 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2438 char *p, *worktree_subdir = cwd +
2439 strlen(got_worktree_get_root_path(worktree));
2440 if (asprintf(&p, "%s/%s",
2441 got_worktree_get_path_prefix(worktree),
2442 worktree_subdir) == -1) {
2443 error = got_error_from_errno("asprintf");
2446 error = got_repo_map_path(&in_repo_path, repo, p, 1);
2453 if (in_repo_path == NULL) {
2454 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2459 if (commit_id_str == NULL) {
2460 struct got_reference *head_ref;
2461 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2464 error = got_ref_resolve(&commit_id, repo, head_ref);
2465 got_ref_close(head_ref);
2469 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2474 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2475 in_repo_path, repo);
2482 got_worktree_close(worktree);
2484 const struct got_error *repo_error;
2485 repo_error = got_repo_close(repo);
2495 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2499 static const struct got_error *
2500 print_status(void *arg, unsigned char status, unsigned char staged_status,
2501 const char *path, struct got_object_id *blob_id,
2502 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2504 if (status == staged_status && (status == GOT_STATUS_DELETE))
2505 status = GOT_STATUS_NO_CHANGE;
2506 printf("%c%c %s\n", status, staged_status, path);
2510 static const struct got_error *
2511 cmd_status(int argc, char *argv[])
2513 const struct got_error *error = NULL;
2514 struct got_repository *repo = NULL;
2515 struct got_worktree *worktree = NULL;
2517 struct got_pathlist_head paths;
2518 struct got_pathlist_entry *pe;
2523 while ((ch = getopt(argc, argv, "")) != -1) {
2535 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2539 cwd = getcwd(NULL, 0);
2541 error = got_error_from_errno("getcwd");
2545 error = got_worktree_open(&worktree, cwd);
2549 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2553 error = apply_unveil(got_repo_get_path(repo), 1,
2554 got_worktree_get_root_path(worktree));
2558 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2562 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2563 check_cancelled, NULL);
2565 TAILQ_FOREACH(pe, &paths, entry)
2566 free((char *)pe->path);
2567 got_pathlist_free(&paths);
2576 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2581 static const struct got_error *
2582 list_refs(struct got_repository *repo)
2584 static const struct got_error *err = NULL;
2585 struct got_reflist_head refs;
2586 struct got_reflist_entry *re;
2588 SIMPLEQ_INIT(&refs);
2589 err = got_ref_list(&refs, repo);
2593 SIMPLEQ_FOREACH(re, &refs, entry) {
2595 refstr = got_ref_to_str(re->ref);
2597 return got_error_from_errno("got_ref_to_str");
2598 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2602 got_ref_list_free(&refs);
2606 static const struct got_error *
2607 delete_ref(struct got_repository *repo, const char *refname)
2609 const struct got_error *err = NULL;
2610 struct got_reference *ref;
2612 err = got_ref_open(&ref, repo, refname, 0);
2616 err = got_ref_delete(ref, repo);
2621 static const struct got_error *
2622 add_ref(struct got_repository *repo, const char *refname, const char *target)
2624 const struct got_error *err = NULL;
2625 struct got_object_id *id;
2626 struct got_reference *ref = NULL;
2629 * Don't let the user create a reference named '-'.
2630 * While technically a valid reference name, this case is usually
2631 * an unintended typo.
2633 if (refname[0] == '-' && refname[1] == '\0')
2634 return got_error(GOT_ERR_BAD_REF_NAME);
2636 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2639 struct got_reference *target_ref;
2641 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2643 err = got_ref_open(&target_ref, repo, target, 0);
2646 err = got_ref_resolve(&id, repo, target_ref);
2647 got_ref_close(target_ref);
2652 err = got_ref_alloc(&ref, refname, id);
2656 err = got_ref_write(ref, repo);
2664 static const struct got_error *
2665 add_symref(struct got_repository *repo, const char *refname, const char *target)
2667 const struct got_error *err = NULL;
2668 struct got_reference *ref = NULL;
2669 struct got_reference *target_ref = NULL;
2672 * Don't let the user create a reference named '-'.
2673 * While technically a valid reference name, this case is usually
2674 * an unintended typo.
2676 if (refname[0] == '-' && refname[1] == '\0')
2677 return got_error(GOT_ERR_BAD_REF_NAME);
2679 err = got_ref_open(&target_ref, repo, target, 0);
2683 err = got_ref_alloc_symref(&ref, refname, target_ref);
2687 err = got_ref_write(ref, repo);
2690 got_ref_close(target_ref);
2696 static const struct got_error *
2697 cmd_ref(int argc, char *argv[])
2699 const struct got_error *error = NULL;
2700 struct got_repository *repo = NULL;
2701 struct got_worktree *worktree = NULL;
2702 char *cwd = NULL, *repo_path = NULL;
2703 int ch, do_list = 0, create_symref = 0;
2704 const char *delref = NULL;
2706 /* TODO: Add -s option for adding symbolic references. */
2707 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
2713 repo_path = realpath(optarg, NULL);
2714 if (repo_path == NULL)
2715 err(1, "-r option");
2716 got_path_strip_trailing_slashes(repo_path);
2730 if (do_list && delref)
2731 errx(1, "-l and -d options are mutually exclusive\n");
2736 if (do_list || delref) {
2738 errx(1, "-s option cannot be used together with the "
2739 "-l or -d options");
2742 } else if (argc != 2)
2747 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2751 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2752 "sendfd unveil", NULL) == -1)
2756 cwd = getcwd(NULL, 0);
2758 error = got_error_from_errno("getcwd");
2762 if (repo_path == NULL) {
2763 error = got_worktree_open(&worktree, cwd);
2764 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2770 strdup(got_worktree_get_repo_path(worktree));
2771 if (repo_path == NULL)
2772 error = got_error_from_errno("strdup");
2776 repo_path = strdup(cwd);
2777 if (repo_path == NULL) {
2778 error = got_error_from_errno("strdup");
2784 error = got_repo_open(&repo, repo_path);
2788 error = apply_unveil(got_repo_get_path(repo), do_list,
2789 worktree ? got_worktree_get_root_path(worktree) : NULL);
2794 error = list_refs(repo);
2796 error = delete_ref(repo, delref);
2797 else if (create_symref)
2798 error = add_symref(repo, argv[0], argv[1]);
2800 error = add_ref(repo, argv[0], argv[1]);
2803 got_repo_close(repo);
2805 got_worktree_close(worktree);
2815 "usage: %s branch [-r repository] -l | -d name | "
2816 "name [base-branch]\n", getprogname());
2820 static const struct got_error *
2821 list_branches(struct got_repository *repo, struct got_worktree *worktree)
2823 static const struct got_error *err = NULL;
2824 struct got_reflist_head refs;
2825 struct got_reflist_entry *re;
2827 SIMPLEQ_INIT(&refs);
2829 err = got_ref_list(&refs, repo);
2833 SIMPLEQ_FOREACH(re, &refs, entry) {
2834 const char *refname, *marker = " ";
2836 refname = got_ref_get_name(re->ref);
2837 if (strncmp(refname, "refs/heads/", 11) != 0)
2839 if (worktree && strcmp(refname,
2840 got_worktree_get_head_ref_name(worktree)) == 0) {
2841 struct got_object_id *id = NULL;
2842 err = got_ref_resolve(&id, repo, re->ref);
2845 if (got_object_id_cmp(id,
2846 got_worktree_get_base_commit_id(worktree)) == 0)
2853 refstr = got_ref_to_str(re->ref);
2855 return got_error_from_errno("got_ref_to_str");
2856 printf("%s%s: %s\n", marker, refname, refstr);
2860 got_ref_list_free(&refs);
2864 static const struct got_error *
2865 delete_branch(struct got_repository *repo, const char *branch_name)
2867 const struct got_error *err = NULL;
2868 struct got_reference *ref;
2871 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
2872 return got_error_from_errno("asprintf");
2874 err = got_ref_open(&ref, repo, refname, 0);
2878 err = got_ref_delete(ref, repo);
2885 static const struct got_error *
2886 add_branch(struct got_repository *repo, const char *branch_name,
2887 const char *base_branch)
2889 const struct got_error *err = NULL;
2890 struct got_object_id *id = NULL;
2891 struct got_reference *ref = NULL;
2892 char *base_refname = NULL, *refname = NULL;
2893 struct got_reference *base_ref;
2896 * Don't let the user create a branch named '-'.
2897 * While technically a valid reference name, this case is usually
2898 * an unintended typo.
2900 if (branch_name[0] == '-' && branch_name[1] == '\0')
2901 return got_error(GOT_ERR_BAD_REF_NAME);
2903 if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
2904 base_refname = strdup(GOT_REF_HEAD);
2905 if (base_refname == NULL)
2906 return got_error_from_errno("strdup");
2907 } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
2908 return got_error_from_errno("asprintf");
2910 err = got_ref_open(&base_ref, repo, base_refname, 0);
2913 err = got_ref_resolve(&id, repo, base_ref);
2914 got_ref_close(base_ref);
2918 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
2919 err = got_error_from_errno("asprintf");
2923 err = got_ref_open(&ref, repo, refname, 0);
2925 err = got_error(GOT_ERR_BRANCH_EXISTS);
2927 } else if (err->code != GOT_ERR_NOT_REF)
2930 err = got_ref_alloc(&ref, refname, id);
2934 err = got_ref_write(ref, repo);
2944 static const struct got_error *
2945 cmd_branch(int argc, char *argv[])
2947 const struct got_error *error = NULL;
2948 struct got_repository *repo = NULL;
2949 struct got_worktree *worktree = NULL;
2950 char *cwd = NULL, *repo_path = NULL;
2951 int ch, do_list = 0;
2952 const char *delref = NULL;
2954 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
2960 repo_path = realpath(optarg, NULL);
2961 if (repo_path == NULL)
2962 err(1, "-r option");
2963 got_path_strip_trailing_slashes(repo_path);
2974 if (do_list && delref)
2975 errx(1, "-l and -d options are mutually exclusive\n");
2980 if (do_list || delref) {
2983 } else if (argc < 1 || argc > 2)
2988 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2992 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2993 "sendfd unveil", NULL) == -1)
2997 cwd = getcwd(NULL, 0);
2999 error = got_error_from_errno("getcwd");
3003 if (repo_path == NULL) {
3004 error = got_worktree_open(&worktree, cwd);
3005 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3011 strdup(got_worktree_get_repo_path(worktree));
3012 if (repo_path == NULL)
3013 error = got_error_from_errno("strdup");
3017 repo_path = strdup(cwd);
3018 if (repo_path == NULL) {
3019 error = got_error_from_errno("strdup");
3025 error = got_repo_open(&repo, repo_path);
3029 error = apply_unveil(got_repo_get_path(repo), do_list,
3030 worktree ? got_worktree_get_root_path(worktree) : NULL);
3035 error = list_branches(repo, worktree);
3037 error = delete_branch(repo, delref);
3039 const char *base_branch;
3041 base_branch = worktree ?
3042 got_worktree_get_head_ref_name(worktree) :
3044 if (strncmp(base_branch, "refs/heads/", 11) == 0)
3047 base_branch = argv[1];
3048 error = add_branch(repo, argv[0], base_branch);
3052 got_repo_close(repo);
3054 got_worktree_close(worktree);
3063 fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3067 static const struct got_error *
3068 cmd_add(int argc, char *argv[])
3070 const struct got_error *error = NULL;
3071 struct got_repository *repo = NULL;
3072 struct got_worktree *worktree = NULL;
3074 struct got_pathlist_head paths;
3075 struct got_pathlist_entry *pe;
3080 while ((ch = getopt(argc, argv, "")) != -1) {
3092 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3099 cwd = getcwd(NULL, 0);
3101 error = got_error_from_errno("getcwd");
3105 error = got_worktree_open(&worktree, cwd);
3109 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3113 error = apply_unveil(got_repo_get_path(repo), 1,
3114 got_worktree_get_root_path(worktree));
3118 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3122 error = got_worktree_schedule_add(worktree, &paths, print_status,
3126 got_repo_close(repo);
3128 got_worktree_close(worktree);
3129 TAILQ_FOREACH(pe, &paths, entry)
3130 free((char *)pe->path);
3131 got_pathlist_free(&paths);
3139 fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3143 static const struct got_error *
3144 cmd_remove(int argc, char *argv[])
3146 const struct got_error *error = NULL;
3147 struct got_worktree *worktree = NULL;
3148 struct got_repository *repo = NULL;
3150 struct got_pathlist_head paths;
3151 struct got_pathlist_entry *pe;
3152 int ch, delete_local_mods = 0;
3156 while ((ch = getopt(argc, argv, "f")) != -1) {
3159 delete_local_mods = 1;
3171 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3178 cwd = getcwd(NULL, 0);
3180 error = got_error_from_errno("getcwd");
3183 error = got_worktree_open(&worktree, cwd);
3187 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3191 error = apply_unveil(got_repo_get_path(repo), 1,
3192 got_worktree_get_root_path(worktree));
3196 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3200 error = got_worktree_schedule_delete(worktree, &paths,
3201 delete_local_mods, print_status, NULL, repo);
3206 got_repo_close(repo);
3208 got_worktree_close(worktree);
3209 TAILQ_FOREACH(pe, &paths, entry)
3210 free((char *)pe->path);
3211 got_pathlist_free(&paths);
3219 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
3220 "path ...\n", getprogname());
3224 static const struct got_error *
3225 revert_progress(void *arg, unsigned char status, const char *path)
3227 while (path[0] == '/')
3229 printf("%c %s\n", status, path);
3233 struct choose_patch_arg {
3234 FILE *patch_script_file;
3238 static const struct got_error *
3239 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
3240 int nchanges, const char *action)
3243 size_t linesize = 0;
3247 case GOT_STATUS_ADD:
3248 printf("A %s\n%s this addition? [y/n] ", path, action);
3250 case GOT_STATUS_DELETE:
3251 printf("D %s\n%s this deletion? [y/n] ", path, action);
3253 case GOT_STATUS_MODIFY:
3254 if (fseek(patch_file, 0L, SEEK_SET) == -1)
3255 return got_error_from_errno("fseek");
3256 printf(GOT_COMMIT_SEP_STR);
3257 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
3259 if (ferror(patch_file))
3260 return got_error_from_errno("getline");
3261 printf(GOT_COMMIT_SEP_STR);
3262 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
3263 path, n, nchanges, action);
3266 return got_error_path(path, GOT_ERR_FILE_STATUS);
3272 static const struct got_error *
3273 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
3274 FILE *patch_file, int n, int nchanges)
3276 const struct got_error *err = NULL;
3278 size_t linesize = 0;
3281 struct choose_patch_arg *a = arg;
3283 *choice = GOT_PATCH_CHOICE_NONE;
3285 if (a->patch_script_file) {
3287 err = show_change(status, path, patch_file, n, nchanges,
3291 linelen = getline(&line, &linesize, a->patch_script_file);
3292 if (linelen == -1) {
3293 if (ferror(a->patch_script_file))
3294 return got_error_from_errno("getline");
3297 nl = strchr(line, '\n');
3300 if (strcmp(line, "y") == 0) {
3301 *choice = GOT_PATCH_CHOICE_YES;
3303 } else if (strcmp(line, "n") == 0) {
3304 *choice = GOT_PATCH_CHOICE_NO;
3306 } else if (strcmp(line, "q") == 0 &&
3307 status == GOT_STATUS_MODIFY) {
3308 *choice = GOT_PATCH_CHOICE_QUIT;
3311 printf("invalid response '%s'\n", line);
3316 while (resp != 'y' && resp != 'n' && resp != 'q') {
3317 err = show_change(status, path, patch_file, n, nchanges,
3324 if (status == GOT_STATUS_MODIFY) {
3325 if (resp != 'y' && resp != 'n' && resp != 'q') {
3326 printf("invalid response '%c'\n", resp);
3329 } else if (resp != 'y' && resp != 'n') {
3330 printf("invalid response '%c'\n", resp);
3336 *choice = GOT_PATCH_CHOICE_YES;
3337 else if (resp == 'n')
3338 *choice = GOT_PATCH_CHOICE_NO;
3339 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
3340 *choice = GOT_PATCH_CHOICE_QUIT;
3346 static const struct got_error *
3347 cmd_revert(int argc, char *argv[])
3349 const struct got_error *error = NULL;
3350 struct got_worktree *worktree = NULL;
3351 struct got_repository *repo = NULL;
3352 char *cwd = NULL, *path = NULL;
3353 struct got_pathlist_head paths;
3354 struct got_pathlist_entry *pe;
3355 int ch, can_recurse = 0, pflag = 0;
3356 FILE *patch_script_file = NULL;
3357 const char *patch_script_path = NULL;
3358 struct choose_patch_arg cpa;
3362 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
3368 patch_script_path = optarg;
3383 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3384 "unveil", NULL) == -1)
3389 if (patch_script_path && !pflag)
3390 errx(1, "-F option can only be used together with -p option");
3392 cwd = getcwd(NULL, 0);
3394 error = got_error_from_errno("getcwd");
3397 error = got_worktree_open(&worktree, cwd);
3401 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3405 if (patch_script_path) {
3406 patch_script_file = fopen(patch_script_path, "r");
3407 if (patch_script_file == NULL) {
3408 error = got_error_from_errno2("fopen",
3413 error = apply_unveil(got_repo_get_path(repo), 1,
3414 got_worktree_get_root_path(worktree));
3418 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3425 TAILQ_FOREACH(pe, &paths, entry) {
3426 if (asprintf(&ondisk_path, "%s/%s",
3427 got_worktree_get_root_path(worktree),
3429 error = got_error_from_errno("asprintf");
3432 if (lstat(ondisk_path, &sb) == -1) {
3433 if (errno == ENOENT) {
3437 error = got_error_from_errno2("lstat",
3443 if (S_ISDIR(sb.st_mode)) {
3444 error = got_error_msg(GOT_ERR_BAD_PATH,
3445 "reverting directories requires -R option");
3451 cpa.patch_script_file = patch_script_file;
3452 cpa.action = "revert";
3453 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
3454 pflag ? choose_patch : NULL, &cpa, repo);
3458 if (patch_script_file && fclose(patch_script_file) == EOF &&
3460 error = got_error_from_errno2("fclose", patch_script_path);
3462 got_repo_close(repo);
3464 got_worktree_close(worktree);
3473 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
3478 struct collect_commit_logmsg_arg {
3479 const char *cmdline_log;
3481 const char *worktree_path;
3482 const char *branch_name;
3483 const char *repo_path;
3488 static const struct got_error *
3489 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
3492 char *initial_content = NULL;
3493 struct got_pathlist_entry *pe;
3494 const struct got_error *err = NULL;
3495 char *template = NULL;
3496 struct collect_commit_logmsg_arg *a = arg;
3500 /* if a message was specified on the command line, just use it */
3501 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
3502 len = strlen(a->cmdline_log) + 1;
3503 *logmsg = malloc(len + 1);
3504 if (*logmsg == NULL)
3505 return got_error_from_errno("malloc");
3506 strlcpy(*logmsg, a->cmdline_log, len);
3510 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
3511 return got_error_from_errno("asprintf");
3513 if (asprintf(&initial_content,
3514 "\n# changes to be committed on branch %s:\n",
3515 a->branch_name) == -1)
3516 return got_error_from_errno("asprintf");
3518 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
3522 dprintf(fd, initial_content);
3524 TAILQ_FOREACH(pe, commitable_paths, entry) {
3525 struct got_commitable *ct = pe->data;
3526 dprintf(fd, "# %c %s\n",
3527 got_commitable_get_status(ct),
3528 got_commitable_get_path(ct));
3532 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
3534 if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3535 unlink(a->logmsg_path);
3536 free(a->logmsg_path);
3537 a->logmsg_path = NULL;
3539 free(initial_content);
3542 /* Editor is done; we can now apply unveil(2) */
3544 err = apply_unveil(a->repo_path, 0, a->worktree_path);
3553 static const struct got_error *
3554 cmd_commit(int argc, char *argv[])
3556 const struct got_error *error = NULL;
3557 struct got_worktree *worktree = NULL;
3558 struct got_repository *repo = NULL;
3559 char *cwd = NULL, *id_str = NULL;
3560 struct got_object_id *id = NULL;
3561 const char *logmsg = NULL;
3563 struct collect_commit_logmsg_arg cl_arg;
3564 char *editor = NULL;
3565 int ch, rebase_in_progress, histedit_in_progress;
3566 struct got_pathlist_head paths;
3569 cl_arg.logmsg_path = NULL;
3571 while ((ch = getopt(argc, argv, "m:")) != -1) {
3586 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3587 "unveil", NULL) == -1)
3590 error = get_author(&author);
3594 cwd = getcwd(NULL, 0);
3596 error = got_error_from_errno("getcwd");
3599 error = got_worktree_open(&worktree, cwd);
3603 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
3606 if (rebase_in_progress) {
3607 error = got_error(GOT_ERR_REBASING);
3611 error = got_worktree_histedit_in_progress(&histedit_in_progress,
3616 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3621 * unveil(2) traverses exec(2); if an editor is used we have
3622 * to apply unveil after the log message has been written.
3624 if (logmsg == NULL || strlen(logmsg) == 0)
3625 error = get_editor(&editor);
3627 error = apply_unveil(got_repo_get_path(repo), 0,
3628 got_worktree_get_root_path(worktree));
3632 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3636 cl_arg.editor = editor;
3637 cl_arg.cmdline_log = logmsg;
3638 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
3639 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
3640 if (!histedit_in_progress) {
3641 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
3642 error = got_error(GOT_ERR_COMMIT_BRANCH);
3645 cl_arg.branch_name += 11;
3647 cl_arg.repo_path = got_repo_get_path(repo);
3648 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
3649 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
3651 if (cl_arg.logmsg_path)
3652 fprintf(stderr, "%s: log message preserved in %s\n",
3653 getprogname(), cl_arg.logmsg_path);
3657 if (cl_arg.logmsg_path)
3658 unlink(cl_arg.logmsg_path);
3660 error = got_object_id_str(&id_str, id);
3663 printf("Created commit %s\n", id_str);
3665 free(cl_arg.logmsg_path);
3667 got_repo_close(repo);
3669 got_worktree_close(worktree);
3677 usage_cherrypick(void)
3679 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
3683 static const struct got_error *
3684 cmd_cherrypick(int argc, char *argv[])
3686 const struct got_error *error = NULL;
3687 struct got_worktree *worktree = NULL;
3688 struct got_repository *repo = NULL;
3689 char *cwd = NULL, *commit_id_str = NULL;
3690 struct got_object_id *commit_id = NULL;
3691 struct got_commit_object *commit = NULL;
3692 struct got_object_qid *pid;
3693 struct got_reference *head_ref = NULL;
3694 int ch, did_something = 0;
3696 while ((ch = getopt(argc, argv, "")) != -1) {
3708 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3709 "unveil", NULL) == -1)
3715 cwd = getcwd(NULL, 0);
3717 error = got_error_from_errno("getcwd");
3720 error = got_worktree_open(&worktree, cwd);
3724 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3728 error = apply_unveil(got_repo_get_path(repo), 0,
3729 got_worktree_get_root_path(worktree));
3733 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3734 GOT_OBJ_TYPE_COMMIT, repo);
3735 if (error != NULL) {
3736 struct got_reference *ref;
3737 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3739 error = got_ref_open(&ref, repo, argv[0], 0);
3742 error = got_ref_resolve(&commit_id, repo, ref);
3747 error = got_object_id_str(&commit_id_str, commit_id);
3751 error = got_ref_open(&head_ref, repo,
3752 got_worktree_get_head_ref_name(worktree), 0);
3756 error = check_same_branch(commit_id, head_ref, NULL, repo);
3758 if (error->code != GOT_ERR_ANCESTRY)
3762 error = got_error(GOT_ERR_SAME_BRANCH);
3766 error = got_object_open_as_commit(&commit, repo, commit_id);
3769 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3770 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
3771 commit_id, repo, update_progress, &did_something, check_cancelled,
3777 printf("Merged commit %s\n", commit_id_str);
3780 got_object_commit_close(commit);
3781 free(commit_id_str);
3783 got_ref_close(head_ref);
3785 got_worktree_close(worktree);
3787 got_repo_close(repo);
3794 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
3798 static const struct got_error *
3799 cmd_backout(int argc, char *argv[])
3801 const struct got_error *error = NULL;
3802 struct got_worktree *worktree = NULL;
3803 struct got_repository *repo = NULL;
3804 char *cwd = NULL, *commit_id_str = NULL;
3805 struct got_object_id *commit_id = NULL;
3806 struct got_commit_object *commit = NULL;
3807 struct got_object_qid *pid;
3808 struct got_reference *head_ref = NULL;
3809 int ch, did_something = 0;
3811 while ((ch = getopt(argc, argv, "")) != -1) {
3823 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3824 "unveil", NULL) == -1)
3830 cwd = getcwd(NULL, 0);
3832 error = got_error_from_errno("getcwd");
3835 error = got_worktree_open(&worktree, cwd);
3839 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3843 error = apply_unveil(got_repo_get_path(repo), 0,
3844 got_worktree_get_root_path(worktree));
3848 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
3849 GOT_OBJ_TYPE_COMMIT, repo);
3850 if (error != NULL) {
3851 struct got_reference *ref;
3852 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
3854 error = got_ref_open(&ref, repo, argv[0], 0);
3857 error = got_ref_resolve(&commit_id, repo, ref);
3862 error = got_object_id_str(&commit_id_str, commit_id);
3866 error = got_ref_open(&head_ref, repo,
3867 got_worktree_get_head_ref_name(worktree), 0);
3871 error = check_same_branch(commit_id, head_ref, NULL, repo);
3875 error = got_object_open_as_commit(&commit, repo, commit_id);
3878 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3880 error = got_error(GOT_ERR_ROOT_COMMIT);
3884 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
3885 update_progress, &did_something, check_cancelled, NULL);
3890 printf("Backed out commit %s\n", commit_id_str);
3893 got_object_commit_close(commit);
3894 free(commit_id_str);
3896 got_ref_close(head_ref);
3898 got_worktree_close(worktree);
3900 got_repo_close(repo);
3907 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
3913 trim_logmsg(char *logmsg, int limit)
3918 len = strlen(logmsg);
3922 nl = strchr(logmsg, '\n');
3927 static const struct got_error *
3928 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
3930 const char *logmsg0 = NULL;
3932 logmsg0 = got_object_commit_get_logmsg(commit);
3934 while (isspace((unsigned char)logmsg0[0]))
3937 *logmsg = strdup(logmsg0);
3938 if (*logmsg == NULL)
3939 return got_error_from_errno("strdup");
3941 trim_logmsg(*logmsg, limit);
3945 static const struct got_error *
3946 show_rebase_progress(struct got_commit_object *commit,
3947 struct got_object_id *old_id, struct got_object_id *new_id)
3949 const struct got_error *err;
3950 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
3952 err = got_object_id_str(&old_id_str, old_id);
3957 err = got_object_id_str(&new_id_str, new_id);
3962 old_id_str[12] = '\0';
3964 new_id_str[12] = '\0';
3966 err = get_short_logmsg(&logmsg, 42, commit);
3970 printf("%s -> %s: %s\n", old_id_str,
3971 new_id_str ? new_id_str : "no-op change", logmsg);
3978 static const struct got_error *
3979 rebase_progress(void *arg, unsigned char status, const char *path)
3981 unsigned char *rebase_status = arg;
3983 while (path[0] == '/')
3985 printf("%c %s\n", status, path);
3987 if (*rebase_status == GOT_STATUS_CONFLICT)
3989 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
3990 *rebase_status = status;
3994 static const struct got_error *
3995 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
3996 struct got_reference *branch, struct got_reference *new_base_branch,
3997 struct got_reference *tmp_branch, struct got_repository *repo)
3999 printf("Switching work tree to %s\n", got_ref_get_name(branch));
4000 return got_worktree_rebase_complete(worktree, fileindex,
4001 new_base_branch, tmp_branch, branch, repo);
4004 static const struct got_error *
4005 rebase_commit(struct got_pathlist_head *merged_paths,
4006 struct got_worktree *worktree, struct got_fileindex *fileindex,
4007 struct got_reference *tmp_branch,
4008 struct got_object_id *commit_id, struct got_repository *repo)
4010 const struct got_error *error;
4011 struct got_commit_object *commit;
4012 struct got_object_id *new_commit_id;
4014 error = got_object_open_as_commit(&commit, repo, commit_id);
4018 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4019 worktree, fileindex, tmp_branch, commit, commit_id, repo);
4021 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4023 error = show_rebase_progress(commit, commit_id, NULL);
4025 error = show_rebase_progress(commit, commit_id, new_commit_id);
4026 free(new_commit_id);
4029 got_object_commit_close(commit);
4033 struct check_path_prefix_arg {
4034 const char *path_prefix;
4039 static const struct got_error *
4040 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4041 struct got_blob_object *blob2, struct got_object_id *id1,
4042 struct got_object_id *id2, const char *path1, const char *path2,
4043 struct got_repository *repo)
4045 struct check_path_prefix_arg *a = arg;
4047 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4048 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4049 return got_error(a->errcode);
4054 static const struct got_error *
4055 check_path_prefix(struct got_object_id *parent_id,
4056 struct got_object_id *commit_id, const char *path_prefix,
4057 int errcode, struct got_repository *repo)
4059 const struct got_error *err;
4060 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4061 struct got_commit_object *commit = NULL, *parent_commit = NULL;
4062 struct check_path_prefix_arg cpp_arg;
4064 if (got_path_is_root_dir(path_prefix))
4067 err = got_object_open_as_commit(&commit, repo, commit_id);
4071 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4075 err = got_object_open_as_tree(&tree1, repo,
4076 got_object_commit_get_tree_id(parent_commit));
4080 err = got_object_open_as_tree(&tree2, repo,
4081 got_object_commit_get_tree_id(commit));
4085 cpp_arg.path_prefix = path_prefix;
4086 while (cpp_arg.path_prefix[0] == '/')
4087 cpp_arg.path_prefix++;
4088 cpp_arg.len = strlen(cpp_arg.path_prefix);
4089 cpp_arg.errcode = errcode;
4090 err = got_diff_tree(tree1, tree2, "", "", repo,
4091 check_path_prefix_in_diff, &cpp_arg, 0);
4094 got_object_tree_close(tree1);
4096 got_object_tree_close(tree2);
4098 got_object_commit_close(commit);
4100 got_object_commit_close(parent_commit);
4104 static const struct got_error *
4105 collect_commits(struct got_object_id_queue *commits,
4106 struct got_object_id *initial_commit_id,
4107 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
4108 const char *path_prefix, int path_prefix_errcode,
4109 struct got_repository *repo)
4111 const struct got_error *err = NULL;
4112 struct got_commit_graph *graph = NULL;
4113 struct got_object_id *parent_id = NULL;
4114 struct got_object_qid *qid;
4115 struct got_object_id *commit_id = initial_commit_id;
4117 err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
4121 err = got_commit_graph_iter_start(graph, iter_start_id, repo);
4124 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
4125 err = got_commit_graph_iter_next(&parent_id, graph);
4127 if (err->code == GOT_ERR_ITER_COMPLETED) {
4128 err = got_error_msg(GOT_ERR_ANCESTRY,
4129 "ran out of commits to rebase before "
4130 "youngest common ancestor commit has "
4133 } else if (err->code != GOT_ERR_ITER_NEED_MORE)
4135 err = got_commit_graph_fetch_commits(graph, 1, repo);
4139 err = check_path_prefix(parent_id, commit_id,
4140 path_prefix, path_prefix_errcode, repo);
4144 err = got_object_qid_alloc(&qid, commit_id);
4147 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
4148 commit_id = parent_id;
4152 got_commit_graph_close(graph);
4156 static const struct got_error *
4157 cmd_rebase(int argc, char *argv[])
4159 const struct got_error *error = NULL;
4160 struct got_worktree *worktree = NULL;
4161 struct got_repository *repo = NULL;
4162 struct got_fileindex *fileindex = NULL;
4164 struct got_reference *branch = NULL;
4165 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
4166 struct got_object_id *commit_id = NULL, *parent_id = NULL;
4167 struct got_object_id *resume_commit_id = NULL;
4168 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
4169 struct got_commit_object *commit = NULL;
4170 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
4171 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4172 struct got_object_id_queue commits;
4173 struct got_pathlist_head merged_paths;
4174 const struct got_object_id_queue *parent_ids;
4175 struct got_object_qid *qid, *pid;
4177 SIMPLEQ_INIT(&commits);
4178 TAILQ_INIT(&merged_paths);
4180 while ((ch = getopt(argc, argv, "ac")) != -1) {
4186 continue_rebase = 1;
4198 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4199 "unveil", NULL) == -1)
4202 if (abort_rebase && continue_rebase)
4204 else if (abort_rebase || continue_rebase) {
4207 } else if (argc != 1)
4210 cwd = getcwd(NULL, 0);
4212 error = got_error_from_errno("getcwd");
4215 error = got_worktree_open(&worktree, cwd);
4219 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4223 error = apply_unveil(got_repo_get_path(repo), 0,
4224 got_worktree_get_root_path(worktree));
4228 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4234 if (!rebase_in_progress) {
4235 error = got_error(GOT_ERR_NOT_REBASING);
4238 error = got_worktree_rebase_continue(&resume_commit_id,
4239 &new_base_branch, &tmp_branch, &branch, &fileindex,
4243 printf("Switching work tree to %s\n",
4244 got_ref_get_symref_target(new_base_branch));
4245 error = got_worktree_rebase_abort(worktree, fileindex, repo,
4246 new_base_branch, update_progress, &did_something);
4249 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
4250 goto done; /* nothing else to do */
4253 if (continue_rebase) {
4254 if (!rebase_in_progress) {
4255 error = got_error(GOT_ERR_NOT_REBASING);
4258 error = got_worktree_rebase_continue(&resume_commit_id,
4259 &new_base_branch, &tmp_branch, &branch, &fileindex,
4264 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
4265 resume_commit_id, repo);
4269 yca_id = got_object_id_dup(resume_commit_id);
4270 if (yca_id == NULL) {
4271 error = got_error_from_errno("got_object_id_dup");
4275 error = got_ref_open(&branch, repo, argv[0], 0);
4280 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
4284 if (!continue_rebase) {
4285 struct got_object_id *base_commit_id;
4287 base_commit_id = got_worktree_get_base_commit_id(worktree);
4288 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
4289 base_commit_id, branch_head_commit_id, repo);
4292 if (yca_id == NULL) {
4293 error = got_error_msg(GOT_ERR_ANCESTRY,
4294 "specified branch shares no common ancestry "
4295 "with work tree's branch");
4299 error = check_same_branch(base_commit_id, branch, yca_id, repo);
4301 if (error->code != GOT_ERR_ANCESTRY)
4305 error = got_error_msg(GOT_ERR_SAME_BRANCH,
4306 "specified branch resolves to a commit which "
4307 "is already contained in work tree's branch");
4310 error = got_worktree_rebase_prepare(&new_base_branch,
4311 &tmp_branch, &fileindex, worktree, branch, repo);
4316 commit_id = branch_head_commit_id;
4317 error = got_object_open_as_commit(&commit, repo, commit_id);
4321 parent_ids = got_object_commit_get_parent_ids(commit);
4322 pid = SIMPLEQ_FIRST(parent_ids);
4324 if (!continue_rebase) {
4326 error = got_worktree_rebase_abort(worktree, fileindex,
4327 repo, new_base_branch, update_progress,
4331 printf("Rebase of %s aborted\n",
4332 got_ref_get_name(branch));
4334 error = got_error(GOT_ERR_EMPTY_REBASE);
4337 error = collect_commits(&commits, commit_id, pid->id,
4338 yca_id, got_worktree_get_path_prefix(worktree),
4339 GOT_ERR_REBASE_PATH, repo);
4340 got_object_commit_close(commit);
4345 if (SIMPLEQ_EMPTY(&commits)) {
4346 if (continue_rebase)
4347 error = rebase_complete(worktree, fileindex,
4348 branch, new_base_branch, tmp_branch, repo);
4350 error = got_error(GOT_ERR_EMPTY_REBASE);
4355 SIMPLEQ_FOREACH(qid, &commits, entry) {
4356 commit_id = qid->id;
4357 parent_id = pid ? pid->id : yca_id;
4360 error = got_worktree_rebase_merge_files(&merged_paths,
4361 worktree, fileindex, parent_id, commit_id, repo,
4362 rebase_progress, &rebase_status, check_cancelled, NULL);
4366 if (rebase_status == GOT_STATUS_CONFLICT) {
4367 got_worktree_rebase_pathlist_free(&merged_paths);
4371 error = rebase_commit(&merged_paths, worktree, fileindex,
4372 tmp_branch, commit_id, repo);
4373 got_worktree_rebase_pathlist_free(&merged_paths);
4378 if (rebase_status == GOT_STATUS_CONFLICT) {
4379 error = got_worktree_rebase_postpone(worktree, fileindex);
4382 error = got_error_msg(GOT_ERR_CONFLICTS,
4383 "conflicts must be resolved before rebasing can continue");
4385 error = rebase_complete(worktree, fileindex, branch,
4386 new_base_branch, tmp_branch, repo);
4388 got_object_id_queue_free(&commits);
4389 free(branch_head_commit_id);
4390 free(resume_commit_id);
4393 got_object_commit_close(commit);
4395 got_ref_close(branch);
4396 if (new_base_branch)
4397 got_ref_close(new_base_branch);
4399 got_ref_close(tmp_branch);
4401 got_worktree_close(worktree);
4403 got_repo_close(repo);
4408 usage_histedit(void)
4410 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
4415 #define GOT_HISTEDIT_PICK 'p'
4416 #define GOT_HISTEDIT_EDIT 'e'
4417 #define GOT_HISTEDIT_FOLD 'f'
4418 #define GOT_HISTEDIT_DROP 'd'
4419 #define GOT_HISTEDIT_MESG 'm'
4421 static struct got_histedit_cmd {
4425 } got_histedit_cmds[] = {
4426 { GOT_HISTEDIT_PICK, "pick", "use commit" },
4427 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
4428 { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
4429 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
4430 { GOT_HISTEDIT_MESG, "mesg",
4431 "single-line log message for commit above (open editor if empty)" },
4434 struct got_histedit_list_entry {
4435 TAILQ_ENTRY(got_histedit_list_entry) entry;
4436 struct got_object_id *commit_id;
4437 const struct got_histedit_cmd *cmd;
4440 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
4442 static const struct got_error *
4443 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
4444 FILE *f, struct got_repository *repo)
4446 const struct got_error *err = NULL;
4447 char *logmsg = NULL, *id_str = NULL;
4448 struct got_commit_object *commit = NULL;
4451 err = got_object_open_as_commit(&commit, repo, commit_id);
4455 err = get_short_logmsg(&logmsg, 34, commit);
4459 err = got_object_id_str(&id_str, commit_id);
4463 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
4465 err = got_ferror(f, GOT_ERR_IO);
4468 got_object_commit_close(commit);
4474 static const struct got_error *
4475 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
4476 struct got_repository *repo)
4478 const struct got_error *err = NULL;
4479 struct got_object_qid *qid;
4481 if (SIMPLEQ_EMPTY(commits))
4482 return got_error(GOT_ERR_EMPTY_HISTEDIT);
4484 SIMPLEQ_FOREACH(qid, commits, entry) {
4485 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
4494 static const struct got_error *
4495 write_cmd_list(FILE *f)
4497 const struct got_error *err = NULL;
4500 n = fprintf(f, "# Available histedit commands:\n");
4502 return got_ferror(f, GOT_ERR_IO);
4504 for (i = 0; i < nitems(got_histedit_cmds); i++) {
4505 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
4506 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
4509 err = got_ferror(f, GOT_ERR_IO);
4513 n = fprintf(f, "# Commits will be processed in order from top to "
4514 "bottom of this file.\n");
4516 return got_ferror(f, GOT_ERR_IO);
4520 static const struct got_error *
4521 histedit_syntax_error(int lineno)
4523 static char msg[42];
4526 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
4528 if (ret == -1 || ret >= sizeof(msg))
4529 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
4531 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
4534 static const struct got_error *
4535 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
4536 char *logmsg, struct got_repository *repo)
4538 const struct got_error *err;
4539 struct got_commit_object *folded_commit = NULL;
4542 err = got_object_id_str(&id_str, hle->commit_id);
4546 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
4550 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
4551 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
4552 got_object_commit_get_logmsg(folded_commit)) == -1) {
4553 err = got_error_from_errno("asprintf");
4558 got_object_commit_close(folded_commit);
4563 static struct got_histedit_list_entry *
4564 get_folded_commits(struct got_histedit_list_entry *hle)
4566 struct got_histedit_list_entry *prev, *folded = NULL;
4568 prev = TAILQ_PREV(hle, got_histedit_list, entry);
4569 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
4570 prev->cmd->code == GOT_HISTEDIT_DROP)) {
4571 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
4573 prev = TAILQ_PREV(prev, got_histedit_list, entry);
4579 static const struct got_error *
4580 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
4581 struct got_repository *repo)
4583 char *logmsg_path = NULL, *id_str = NULL;
4584 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
4585 const struct got_error *err = NULL;
4586 struct got_commit_object *commit = NULL;
4588 struct got_histedit_list_entry *folded = NULL;
4590 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
4594 folded = get_folded_commits(hle);
4596 while (folded != hle) {
4597 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
4598 folded = TAILQ_NEXT(folded, entry);
4601 err = append_folded_commit_msg(&new_msg, folded,
4607 folded = TAILQ_NEXT(folded, entry);
4611 err = got_object_id_str(&id_str, hle->commit_id);
4614 if (asprintf(&new_msg,
4615 "%s\n# original log message of commit %s: %s",
4616 logmsg ? logmsg : "", id_str,
4617 got_object_commit_get_logmsg(commit)) == -1) {
4618 err = got_error_from_errno("asprintf");
4624 err = got_object_id_str(&id_str, hle->commit_id);
4628 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
4632 dprintf(fd, logmsg);
4635 err = get_editor(&editor);
4639 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
4641 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
4644 hle->logmsg = strdup(got_object_commit_get_logmsg(commit));
4645 if (hle->logmsg == NULL)
4646 err = got_error_from_errno("strdup");
4649 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
4650 err = got_error_from_errno2("unlink", logmsg_path);
4655 got_object_commit_close(commit);
4659 static const struct got_error *
4660 histedit_parse_list(struct got_histedit_list *histedit_cmds,
4661 FILE *f, struct got_repository *repo)
4663 const struct got_error *err = NULL;
4664 char *line = NULL, *p, *end;
4668 const struct got_histedit_cmd *cmd;
4669 struct got_object_id *commit_id = NULL;
4670 struct got_histedit_list_entry *hle = NULL;
4673 len = getline(&line, &size, f);
4675 const struct got_error *getline_err;
4678 getline_err = got_error_from_errno("getline");
4679 err = got_ferror(f, getline_err->code);
4684 while (isspace((unsigned char)p[0]))
4686 if (p[0] == '#' || p[0] == '\0') {
4692 for (i = 0; i < nitems(got_histedit_cmds); i++) {
4693 cmd = &got_histedit_cmds[i];
4694 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
4695 isspace((unsigned char)p[strlen(cmd->name)])) {
4696 p += strlen(cmd->name);
4699 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
4704 if (i == nitems(got_histedit_cmds)) {
4705 err = histedit_syntax_error(lineno);
4708 while (isspace((unsigned char)p[0]))
4710 if (cmd->code == GOT_HISTEDIT_MESG) {
4711 if (hle == NULL || hle->logmsg != NULL) {
4712 err = got_error(GOT_ERR_HISTEDIT_CMD);
4716 err = histedit_edit_logmsg(hle, repo);
4720 hle->logmsg = strdup(p);
4721 if (hle->logmsg == NULL) {
4722 err = got_error_from_errno("strdup");
4731 while (end[0] && !isspace((unsigned char)end[0]))
4735 err = got_object_resolve_id_str(&commit_id, repo, p);
4737 /* override error code */
4738 err = histedit_syntax_error(lineno);
4742 hle = malloc(sizeof(*hle));
4744 err = got_error_from_errno("malloc");
4748 hle->commit_id = commit_id;
4753 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
4761 static const struct got_error *
4762 histedit_check_script(struct got_histedit_list *histedit_cmds,
4763 struct got_object_id_queue *commits, struct got_repository *repo)
4765 const struct got_error *err = NULL;
4766 struct got_object_qid *qid;
4767 struct got_histedit_list_entry *hle;
4768 static char msg[80];
4771 if (TAILQ_EMPTY(histedit_cmds))
4772 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
4773 "histedit script contains no commands");
4774 if (SIMPLEQ_EMPTY(commits))
4775 return got_error(GOT_ERR_EMPTY_HISTEDIT);
4777 SIMPLEQ_FOREACH(qid, commits, entry) {
4778 TAILQ_FOREACH(hle, histedit_cmds, entry) {
4779 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
4783 err = got_object_id_str(&id_str, qid->id);
4786 snprintf(msg, sizeof(msg),
4787 "commit %s missing from histedit script", id_str);
4789 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
4793 if (hle->cmd->code == GOT_HISTEDIT_FOLD)
4794 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
4795 "last commit in histedit script cannot be folded");
4800 static const struct got_error *
4801 histedit_run_editor(struct got_histedit_list *histedit_cmds,
4802 const char *path, struct got_object_id_queue *commits,
4803 struct got_repository *repo)
4805 const struct got_error *err = NULL;
4809 err = get_editor(&editor);
4813 if (spawn_editor(editor, path) == -1) {
4814 err = got_error_from_errno("failed spawning editor");
4818 f = fopen(path, "r");
4820 err = got_error_from_errno("fopen");
4823 err = histedit_parse_list(histedit_cmds, f, repo);
4827 err = histedit_check_script(histedit_cmds, commits, repo);
4829 if (f && fclose(f) != 0 && err == NULL)
4830 err = got_error_from_errno("fclose");
4835 static const struct got_error *
4836 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
4837 struct got_object_id_queue *, const char *, struct got_repository *);
4839 static const struct got_error *
4840 histedit_edit_script(struct got_histedit_list *histedit_cmds,
4841 struct got_object_id_queue *commits, struct got_repository *repo)
4843 const struct got_error *err;
4847 err = got_opentemp_named(&path, &f, "got-histedit");
4851 err = write_cmd_list(f);
4855 err = histedit_write_commit_list(commits, f, repo);
4859 if (fclose(f) != 0) {
4860 err = got_error_from_errno("fclose");
4865 err = histedit_run_editor(histedit_cmds, path, commits, repo);
4867 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4868 err->code != GOT_ERR_HISTEDIT_CMD)
4870 err = histedit_edit_list_retry(histedit_cmds, err,
4871 commits, path, repo);
4874 if (f && fclose(f) != 0 && err == NULL)
4875 err = got_error_from_errno("fclose");
4876 if (path && unlink(path) != 0 && err == NULL)
4877 err = got_error_from_errno2("unlink", path);
4882 static const struct got_error *
4883 histedit_save_list(struct got_histedit_list *histedit_cmds,
4884 struct got_worktree *worktree, struct got_repository *repo)
4886 const struct got_error *err = NULL;
4889 struct got_histedit_list_entry *hle;
4890 struct got_commit_object *commit = NULL;
4892 err = got_worktree_get_histedit_script_path(&path, worktree);
4896 f = fopen(path, "w");
4898 err = got_error_from_errno2("fopen", path);
4901 TAILQ_FOREACH(hle, histedit_cmds, entry) {
4902 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
4908 int n = fprintf(f, "%c %s\n",
4909 GOT_HISTEDIT_MESG, hle->logmsg);
4911 err = got_ferror(f, GOT_ERR_IO);
4917 if (f && fclose(f) != 0 && err == NULL)
4918 err = got_error_from_errno("fclose");
4921 got_object_commit_close(commit);
4926 histedit_free_list(struct got_histedit_list *histedit_cmds)
4928 struct got_histedit_list_entry *hle;
4930 while ((hle = TAILQ_FIRST(histedit_cmds))) {
4931 TAILQ_REMOVE(histedit_cmds, hle, entry);
4936 static const struct got_error *
4937 histedit_load_list(struct got_histedit_list *histedit_cmds,
4938 const char *path, struct got_repository *repo)
4940 const struct got_error *err = NULL;
4943 f = fopen(path, "r");
4945 err = got_error_from_errno2("fopen", path);
4949 err = histedit_parse_list(histedit_cmds, f, repo);
4951 if (f && fclose(f) != 0 && err == NULL)
4952 err = got_error_from_errno("fclose");
4956 static const struct got_error *
4957 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
4958 const struct got_error *edit_err, struct got_object_id_queue *commits,
4959 const char *path, struct got_repository *repo)
4961 const struct got_error *err = NULL, *prev_err = edit_err;
4964 while (resp != 'c' && resp != 'r' && resp != 'a') {
4965 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
4966 "or (a)bort: ", getprogname(), prev_err->msg);
4971 histedit_free_list(histedit_cmds);
4972 err = histedit_run_editor(histedit_cmds, path, commits,
4975 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4976 err->code != GOT_ERR_HISTEDIT_CMD)
4983 } else if (resp == 'r') {
4984 histedit_free_list(histedit_cmds);
4985 err = histedit_edit_script(histedit_cmds,
4988 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
4989 err->code != GOT_ERR_HISTEDIT_CMD)
4996 } else if (resp == 'a') {
4997 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5000 printf("invalid response '%c'\n", resp);
5006 static const struct got_error *
5007 histedit_complete(struct got_worktree *worktree,
5008 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5009 struct got_reference *branch, struct got_repository *repo)
5011 printf("Switching work tree to %s\n",
5012 got_ref_get_symref_target(branch));
5013 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5017 static const struct got_error *
5018 show_histedit_progress(struct got_commit_object *commit,
5019 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5021 const struct got_error *err;
5022 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5024 err = got_object_id_str(&old_id_str, hle->commit_id);
5029 err = got_object_id_str(&new_id_str, new_id);
5034 old_id_str[12] = '\0';
5036 new_id_str[12] = '\0';
5039 logmsg = strdup(hle->logmsg);
5040 if (logmsg == NULL) {
5041 err = got_error_from_errno("strdup");
5044 trim_logmsg(logmsg, 42);
5046 err = get_short_logmsg(&logmsg, 42, commit);
5051 switch (hle->cmd->code) {
5052 case GOT_HISTEDIT_PICK:
5053 case GOT_HISTEDIT_EDIT:
5054 printf("%s -> %s: %s\n", old_id_str,
5055 new_id_str ? new_id_str : "no-op change", logmsg);
5057 case GOT_HISTEDIT_DROP:
5058 case GOT_HISTEDIT_FOLD:
5059 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5072 static const struct got_error *
5073 histedit_commit(struct got_pathlist_head *merged_paths,
5074 struct got_worktree *worktree, struct got_fileindex *fileindex,
5075 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5076 struct got_repository *repo)
5078 const struct got_error *err;
5079 struct got_commit_object *commit;
5080 struct got_object_id *new_commit_id;
5082 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5083 && hle->logmsg == NULL) {
5084 err = histedit_edit_logmsg(hle, repo);
5089 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5093 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
5094 worktree, fileindex, tmp_branch, commit, hle->commit_id,
5097 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
5099 err = show_histedit_progress(commit, hle, NULL);
5101 err = show_histedit_progress(commit, hle, new_commit_id);
5102 free(new_commit_id);
5105 got_object_commit_close(commit);
5109 static const struct got_error *
5110 histedit_skip_commit(struct got_histedit_list_entry *hle,
5111 struct got_worktree *worktree, struct got_repository *repo)
5113 const struct got_error *error;
5114 struct got_commit_object *commit;
5116 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
5121 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
5125 error = show_histedit_progress(commit, hle, NULL);
5126 got_object_commit_close(commit);
5130 static const struct got_error *
5131 cmd_histedit(int argc, char *argv[])
5133 const struct got_error *error = NULL;
5134 struct got_worktree *worktree = NULL;
5135 struct got_fileindex *fileindex = NULL;
5136 struct got_repository *repo = NULL;
5138 struct got_reference *branch = NULL;
5139 struct got_reference *tmp_branch = NULL;
5140 struct got_object_id *resume_commit_id = NULL;
5141 struct got_object_id *base_commit_id = NULL;
5142 struct got_object_id *head_commit_id = NULL;
5143 struct got_commit_object *commit = NULL;
5144 int ch, rebase_in_progress = 0, did_something;
5145 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
5146 const char *edit_script_path = NULL;
5147 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5148 struct got_object_id_queue commits;
5149 struct got_pathlist_head merged_paths;
5150 const struct got_object_id_queue *parent_ids;
5151 struct got_object_qid *pid;
5152 struct got_histedit_list histedit_cmds;
5153 struct got_histedit_list_entry *hle;
5155 SIMPLEQ_INIT(&commits);
5156 TAILQ_INIT(&histedit_cmds);
5157 TAILQ_INIT(&merged_paths);
5159 while ((ch = getopt(argc, argv, "acF:")) != -1) {
5168 edit_script_path = optarg;
5180 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5181 "unveil", NULL) == -1)
5184 if (abort_edit && continue_edit)
5190 * This command cannot apply unveil(2) in all cases because the
5191 * user may choose to run an editor to edit the histedit script
5192 * and to edit individual commit log messages.
5193 * unveil(2) traverses exec(2); if an editor is used we have to
5194 * apply unveil after edit script and log messages have been written.
5195 * XXX TODO: Make use of unveil(2) where possible.
5198 cwd = getcwd(NULL, 0);
5200 error = got_error_from_errno("getcwd");
5203 error = got_worktree_open(&worktree, cwd);
5207 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5211 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5214 if (rebase_in_progress) {
5215 error = got_error(GOT_ERR_REBASING);
5219 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
5223 if (edit_in_progress && abort_edit) {
5224 error = got_worktree_histedit_continue(&resume_commit_id,
5225 &tmp_branch, &branch, &base_commit_id, &fileindex,
5229 printf("Switching work tree to %s\n",
5230 got_ref_get_symref_target(branch));
5231 error = got_worktree_histedit_abort(worktree, fileindex, repo,
5232 branch, base_commit_id, update_progress, &did_something);
5235 printf("Histedit of %s aborted\n",
5236 got_ref_get_symref_target(branch));
5237 goto done; /* nothing else to do */
5238 } else if (abort_edit) {
5239 error = got_error(GOT_ERR_NOT_HISTEDIT);
5243 if (continue_edit) {
5246 if (!edit_in_progress) {
5247 error = got_error(GOT_ERR_NOT_HISTEDIT);
5251 error = got_worktree_get_histedit_script_path(&path, worktree);
5255 error = histedit_load_list(&histedit_cmds, path, repo);
5260 error = got_worktree_histedit_continue(&resume_commit_id,
5261 &tmp_branch, &branch, &base_commit_id, &fileindex,
5266 error = got_ref_resolve(&head_commit_id, repo, branch);
5270 error = got_object_open_as_commit(&commit, repo,
5274 parent_ids = got_object_commit_get_parent_ids(commit);
5275 pid = SIMPLEQ_FIRST(parent_ids);
5277 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5280 error = collect_commits(&commits, head_commit_id, pid->id,
5281 base_commit_id, got_worktree_get_path_prefix(worktree),
5282 GOT_ERR_HISTEDIT_PATH, repo);
5283 got_object_commit_close(commit);
5288 if (edit_in_progress) {
5289 error = got_error(GOT_ERR_HISTEDIT_BUSY);
5293 error = got_ref_open(&branch, repo,
5294 got_worktree_get_head_ref_name(worktree), 0);
5298 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
5299 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
5300 "will not edit commit history of a branch outside "
5301 "the \"refs/heads/\" reference namespace");
5305 error = got_ref_resolve(&head_commit_id, repo, branch);
5306 got_ref_close(branch);
5311 error = got_object_open_as_commit(&commit, repo,
5315 parent_ids = got_object_commit_get_parent_ids(commit);
5316 pid = SIMPLEQ_FIRST(parent_ids);
5318 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5321 error = collect_commits(&commits, head_commit_id, pid->id,
5322 got_worktree_get_base_commit_id(worktree),
5323 got_worktree_get_path_prefix(worktree),
5324 GOT_ERR_HISTEDIT_PATH, repo);
5325 got_object_commit_close(commit);
5330 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
5331 &base_commit_id, &fileindex, worktree, repo);
5335 if (edit_script_path) {
5336 error = histedit_load_list(&histedit_cmds,
5337 edit_script_path, repo);
5339 got_worktree_histedit_abort(worktree, fileindex,
5340 repo, branch, base_commit_id,
5341 update_progress, &did_something);
5345 error = histedit_edit_script(&histedit_cmds, &commits,
5348 got_worktree_histedit_abort(worktree, fileindex,
5349 repo, branch, base_commit_id,
5350 update_progress, &did_something);
5356 error = histedit_save_list(&histedit_cmds, worktree,
5359 got_worktree_histedit_abort(worktree, fileindex,
5360 repo, branch, base_commit_id,
5361 update_progress, &did_something);
5367 error = histedit_check_script(&histedit_cmds, &commits, repo);
5371 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
5372 if (resume_commit_id) {
5373 if (got_object_id_cmp(hle->commit_id,
5374 resume_commit_id) != 0)
5377 resume_commit_id = NULL;
5378 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
5379 hle->cmd->code == GOT_HISTEDIT_FOLD) {
5380 error = histedit_skip_commit(hle, worktree,
5383 error = histedit_commit(NULL, worktree,
5384 fileindex, tmp_branch, hle, repo);
5391 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
5392 error = histedit_skip_commit(hle, worktree, repo);
5398 error = got_object_open_as_commit(&commit, repo,
5402 parent_ids = got_object_commit_get_parent_ids(commit);
5403 pid = SIMPLEQ_FIRST(parent_ids);
5405 error = got_worktree_histedit_merge_files(&merged_paths,
5406 worktree, fileindex, pid->id, hle->commit_id, repo,
5407 rebase_progress, &rebase_status, check_cancelled, NULL);
5410 got_object_commit_close(commit);
5413 if (rebase_status == GOT_STATUS_CONFLICT) {
5414 got_worktree_rebase_pathlist_free(&merged_paths);
5418 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
5420 error = got_object_id_str(&id_str, hle->commit_id);
5423 printf("Stopping histedit for amending commit %s\n",
5426 got_worktree_rebase_pathlist_free(&merged_paths);
5427 error = got_worktree_histedit_postpone(worktree,
5432 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
5433 error = histedit_skip_commit(hle, worktree, repo);
5439 error = histedit_commit(&merged_paths, worktree, fileindex,
5440 tmp_branch, hle, repo);
5441 got_worktree_rebase_pathlist_free(&merged_paths);
5446 if (rebase_status == GOT_STATUS_CONFLICT) {
5447 error = got_worktree_histedit_postpone(worktree, fileindex);
5450 error = got_error_msg(GOT_ERR_CONFLICTS,
5451 "conflicts must be resolved before rebasing can continue");
5453 error = histedit_complete(worktree, fileindex, tmp_branch,
5456 got_object_id_queue_free(&commits);
5457 histedit_free_list(&histedit_cmds);
5458 free(head_commit_id);
5459 free(base_commit_id);
5460 free(resume_commit_id);
5462 got_object_commit_close(commit);
5464 got_ref_close(branch);
5466 got_ref_close(tmp_branch);
5468 got_worktree_close(worktree);
5470 got_repo_close(repo);
5477 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
5478 "[file-path ...]\n",
5483 static const struct got_error *
5484 print_stage(void *arg, unsigned char status, unsigned char staged_status,
5485 const char *path, struct got_object_id *blob_id,
5486 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
5488 const struct got_error *err = NULL;
5489 char *id_str = NULL;
5491 if (staged_status != GOT_STATUS_ADD &&
5492 staged_status != GOT_STATUS_MODIFY &&
5493 staged_status != GOT_STATUS_DELETE)
5496 if (staged_status == GOT_STATUS_ADD ||
5497 staged_status == GOT_STATUS_MODIFY)
5498 err = got_object_id_str(&id_str, staged_blob_id);
5500 err = got_object_id_str(&id_str, blob_id);
5504 printf("%s %c %s\n", id_str, staged_status, path);
5509 static const struct got_error *
5510 cmd_stage(int argc, char *argv[])
5512 const struct got_error *error = NULL;
5513 struct got_repository *repo = NULL;
5514 struct got_worktree *worktree = NULL;
5516 struct got_pathlist_head paths;
5517 struct got_pathlist_entry *pe;
5518 int ch, list_stage = 0, pflag = 0;
5519 FILE *patch_script_file = NULL;
5520 const char *patch_script_path = NULL;
5521 struct choose_patch_arg cpa;
5525 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
5534 patch_script_path = optarg;
5546 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5547 "unveil", NULL) == -1)
5550 if (list_stage && (pflag || patch_script_path))
5551 errx(1, "-l option cannot be used with other options");
5552 if (patch_script_path && !pflag)
5553 errx(1, "-F option can only be used together with -p option");
5555 cwd = getcwd(NULL, 0);
5557 error = got_error_from_errno("getcwd");
5561 error = got_worktree_open(&worktree, cwd);
5565 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5569 if (patch_script_path) {
5570 patch_script_file = fopen(patch_script_path, "r");
5571 if (patch_script_file == NULL) {
5572 error = got_error_from_errno2("fopen",
5577 error = apply_unveil(got_repo_get_path(repo), 1,
5578 got_worktree_get_root_path(worktree));
5582 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5587 error = got_worktree_status(worktree, &paths, repo,
5588 print_stage, NULL, check_cancelled, NULL);
5590 cpa.patch_script_file = patch_script_file;
5591 cpa.action = "stage";
5592 error = got_worktree_stage(worktree, &paths,
5593 pflag ? NULL : print_status, NULL,
5594 pflag ? choose_patch : NULL, &cpa, repo);
5597 if (patch_script_file && fclose(patch_script_file) == EOF &&
5599 error = got_error_from_errno2("fclose", patch_script_path);
5601 got_repo_close(repo);
5603 got_worktree_close(worktree);
5604 TAILQ_FOREACH(pe, &paths, entry)
5605 free((char *)pe->path);
5606 got_pathlist_free(&paths);
5614 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
5615 "[file-path ...]\n",
5621 static const struct got_error *
5622 cmd_unstage(int argc, char *argv[])
5624 const struct got_error *error = NULL;
5625 struct got_repository *repo = NULL;
5626 struct got_worktree *worktree = NULL;
5628 struct got_pathlist_head paths;
5629 struct got_pathlist_entry *pe;
5630 int ch, did_something = 0, pflag = 0;
5631 FILE *patch_script_file = NULL;
5632 const char *patch_script_path = NULL;
5633 struct choose_patch_arg cpa;
5637 while ((ch = getopt(argc, argv, "pF:")) != -1) {
5643 patch_script_path = optarg;
5655 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5656 "unveil", NULL) == -1)
5659 if (patch_script_path && !pflag)
5660 errx(1, "-F option can only be used together with -p option");
5662 cwd = getcwd(NULL, 0);
5664 error = got_error_from_errno("getcwd");
5668 error = got_worktree_open(&worktree, cwd);
5672 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5676 if (patch_script_path) {
5677 patch_script_file = fopen(patch_script_path, "r");
5678 if (patch_script_file == NULL) {
5679 error = got_error_from_errno2("fopen",
5685 error = apply_unveil(got_repo_get_path(repo), 1,
5686 got_worktree_get_root_path(worktree));
5690 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5694 cpa.patch_script_file = patch_script_file;
5695 cpa.action = "unstage";
5696 error = got_worktree_unstage(worktree, &paths, update_progress,
5697 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
5699 if (patch_script_file && fclose(patch_script_file) == EOF &&
5701 error = got_error_from_errno2("fclose", patch_script_path);
5703 got_repo_close(repo);
5705 got_worktree_close(worktree);
5706 TAILQ_FOREACH(pe, &paths, entry)
5707 free((char *)pe->path);
5708 got_pathlist_free(&paths);