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_cancel.h"
45 #include "got_worktree.h"
47 #include "got_commit_graph.h"
48 #include "got_blame.h"
49 #include "got_privsep.h"
50 #include "got_opentemp.h"
53 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
56 static volatile sig_atomic_t sigint_received;
57 static volatile sig_atomic_t sigpipe_received;
60 catch_sigint(int signo)
66 catch_sigpipe(int signo)
74 const struct got_error *(*cmd_main)(int, char *[]);
75 void (*cmd_usage)(void);
76 const char *cmd_alias;
79 __dead static void usage(int);
80 __dead static void usage_init(void);
81 __dead static void usage_import(void);
82 __dead static void usage_checkout(void);
83 __dead static void usage_update(void);
84 __dead static void usage_log(void);
85 __dead static void usage_diff(void);
86 __dead static void usage_blame(void);
87 __dead static void usage_tree(void);
88 __dead static void usage_status(void);
89 __dead static void usage_ref(void);
90 __dead static void usage_branch(void);
91 __dead static void usage_tag(void);
92 __dead static void usage_add(void);
93 __dead static void usage_remove(void);
94 __dead static void usage_revert(void);
95 __dead static void usage_commit(void);
96 __dead static void usage_cherrypick(void);
97 __dead static void usage_backout(void);
98 __dead static void usage_rebase(void);
99 __dead static void usage_histedit(void);
100 __dead static void usage_stage(void);
101 __dead static void usage_unstage(void);
102 __dead static void usage_cat(void);
104 static const struct got_error* cmd_init(int, char *[]);
105 static const struct got_error* cmd_import(int, char *[]);
106 static const struct got_error* cmd_checkout(int, char *[]);
107 static const struct got_error* cmd_update(int, char *[]);
108 static const struct got_error* cmd_log(int, char *[]);
109 static const struct got_error* cmd_diff(int, char *[]);
110 static const struct got_error* cmd_blame(int, char *[]);
111 static const struct got_error* cmd_tree(int, char *[]);
112 static const struct got_error* cmd_status(int, char *[]);
113 static const struct got_error* cmd_ref(int, char *[]);
114 static const struct got_error* cmd_branch(int, char *[]);
115 static const struct got_error* cmd_tag(int, char *[]);
116 static const struct got_error* cmd_add(int, char *[]);
117 static const struct got_error* cmd_remove(int, char *[]);
118 static const struct got_error* cmd_revert(int, char *[]);
119 static const struct got_error* cmd_commit(int, char *[]);
120 static const struct got_error* cmd_cherrypick(int, char *[]);
121 static const struct got_error* cmd_backout(int, char *[]);
122 static const struct got_error* cmd_rebase(int, char *[]);
123 static const struct got_error* cmd_histedit(int, char *[]);
124 static const struct got_error* cmd_stage(int, char *[]);
125 static const struct got_error* cmd_unstage(int, char *[]);
126 static const struct got_error* cmd_cat(int, char *[]);
128 static struct got_cmd got_commands[] = {
129 { "init", cmd_init, usage_init, "in" },
130 { "import", cmd_import, usage_import, "im" },
131 { "checkout", cmd_checkout, usage_checkout, "co" },
132 { "update", cmd_update, usage_update, "up" },
133 { "log", cmd_log, usage_log, "" },
134 { "diff", cmd_diff, usage_diff, "di" },
135 { "blame", cmd_blame, usage_blame, "bl" },
136 { "tree", cmd_tree, usage_tree, "tr" },
137 { "status", cmd_status, usage_status, "st" },
138 { "ref", cmd_ref, usage_ref, "" },
139 { "branch", cmd_branch, usage_branch, "br" },
140 { "tag", cmd_tag, usage_tag, "" },
141 { "add", cmd_add, usage_add, "" },
142 { "remove", cmd_remove, usage_remove, "rm" },
143 { "revert", cmd_revert, usage_revert, "rv" },
144 { "commit", cmd_commit, usage_commit, "ci" },
145 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
146 { "backout", cmd_backout, usage_backout, "bo" },
147 { "rebase", cmd_rebase, usage_rebase, "rb" },
148 { "histedit", cmd_histedit, usage_histedit, "he" },
149 { "stage", cmd_stage, usage_stage, "sg" },
150 { "unstage", cmd_unstage, usage_unstage, "ug" },
151 { "cat", cmd_cat, usage_cat, "" },
159 fprintf(stderr, "commands:");
160 for (i = 0; i < nitems(got_commands); i++) {
161 struct got_cmd *cmd = &got_commands[i];
162 fprintf(stderr, " %s", cmd->cmd_name);
168 main(int argc, char *argv[])
173 int hflag = 0, Vflag = 0;
175 setlocale(LC_CTYPE, "");
177 while ((ch = getopt(argc, argv, "hV")) != -1) {
196 got_version_print_str();
203 signal(SIGINT, catch_sigint);
204 signal(SIGPIPE, catch_sigpipe);
206 for (i = 0; i < nitems(got_commands); i++) {
207 const struct got_error *error;
209 cmd = &got_commands[i];
211 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
212 strcmp(cmd->cmd_alias, argv[0]) != 0)
216 got_commands[i].cmd_usage();
218 error = got_commands[i].cmd_main(argc, argv);
219 if (error && !(sigint_received || sigpipe_received)) {
220 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
227 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
235 fprintf(stderr, "usage: %s [-h] [-V] command [arg ...]\n",
242 static const struct got_error *
243 get_editor(char **abspath)
245 const struct got_error *err = NULL;
250 editor = getenv("VISUAL");
252 editor = getenv("EDITOR");
255 err = got_path_find_prog(abspath, editor);
260 if (*abspath == NULL) {
261 *abspath = strdup("/bin/ed");
262 if (*abspath == NULL)
263 return got_error_from_errno("strdup");
269 static const struct got_error *
270 apply_unveil(const char *repo_path, int repo_read_only,
271 const char *worktree_path)
273 const struct got_error *err;
276 if (unveil("gmon.out", "rwc") != 0)
277 return got_error_from_errno2("unveil", "gmon.out");
279 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
280 return got_error_from_errno2("unveil", repo_path);
282 if (worktree_path && unveil(worktree_path, "rwc") != 0)
283 return got_error_from_errno2("unveil", worktree_path);
285 if (unveil("/tmp", "rwc") != 0)
286 return got_error_from_errno2("unveil", "/tmp");
288 err = got_privsep_unveil_exec_helpers();
292 if (unveil(NULL, NULL) != 0)
293 return got_error_from_errno("unveil");
301 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
305 static const struct got_error *
306 cmd_init(int argc, char *argv[])
308 const struct got_error *error = NULL;
309 char *repo_path = NULL;
312 while ((ch = getopt(argc, argv, "")) != -1) {
324 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
330 repo_path = strdup(argv[0]);
331 if (repo_path == NULL)
332 return got_error_from_errno("strdup");
334 got_path_strip_trailing_slashes(repo_path);
336 error = got_path_mkdir(repo_path);
338 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
341 error = apply_unveil(repo_path, 0, NULL);
345 error = got_repo_init(repo_path);
357 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
358 "[-r repository-path] [-I pattern] path\n", getprogname());
363 spawn_editor(const char *editor, const char *file)
366 sig_t sighup, sigint, sigquit;
369 sighup = signal(SIGHUP, SIG_IGN);
370 sigint = signal(SIGINT, SIG_IGN);
371 sigquit = signal(SIGQUIT, SIG_IGN);
373 switch (pid = fork()) {
377 execl(editor, editor, file, (char *)NULL);
381 while (waitpid(pid, &st, 0) == -1)
386 (void)signal(SIGHUP, sighup);
387 (void)signal(SIGINT, sigint);
388 (void)signal(SIGQUIT, sigquit);
390 if (!WIFEXITED(st)) {
395 return WEXITSTATUS(st);
398 static const struct got_error *
399 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
400 const char *initial_content)
402 const struct got_error *err = NULL;
406 int content_changed = 0;
411 if (stat(logmsg_path, &st) == -1)
412 return got_error_from_errno2("stat", logmsg_path);
414 if (spawn_editor(editor, logmsg_path) == -1)
415 return got_error_from_errno("failed spawning editor");
417 if (stat(logmsg_path, &st2) == -1)
418 return got_error_from_errno("stat");
420 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
421 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
422 "no changes made to commit message, aborting");
424 *logmsg = malloc(st2.st_size + 1);
426 return got_error_from_errno("malloc");
430 fp = fopen(logmsg_path, "r");
432 err = got_error_from_errno("fopen");
435 while (fgets(buf, sizeof(buf), fp) != NULL) {
436 if (!content_changed && strcmp(buf, initial_content) != 0)
438 if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
439 continue; /* remove comments and leading empty lines */
440 len = strlcat(*logmsg, buf, st2.st_size);
444 while (len > 0 && (*logmsg)[len - 1] == '\n') {
445 (*logmsg)[len - 1] = '\0';
449 if (len == 0 || !content_changed)
450 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
451 "commit message cannot be empty, aborting");
460 static const struct got_error *
461 collect_import_msg(char **logmsg, const char *editor, const char *path_dir,
462 const char *branch_name)
464 char *initial_content = NULL, *logmsg_path = NULL;
465 const struct got_error *err = NULL;
468 if (asprintf(&initial_content,
469 "\n# %s to be imported to branch %s\n", path_dir,
471 return got_error_from_errno("asprintf");
473 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-importmsg");
477 dprintf(fd, initial_content);
480 err = edit_logmsg(logmsg, editor, logmsg_path, initial_content);
482 free(initial_content);
487 static const struct got_error *
488 import_progress(void *arg, const char *path)
490 printf("A %s\n", path);
494 static const struct got_error *
495 get_author(char **author, struct got_repository *repo)
497 const struct got_error *err = NULL;
498 const char *got_author, *name, *email;
502 name = got_repo_get_gitconfig_author_name(repo);
503 email = got_repo_get_gitconfig_author_email(repo);
505 if (asprintf(author, "%s <%s>", name, email) == -1)
506 return got_error_from_errno("asprintf");
510 got_author = getenv("GOT_AUTHOR");
511 if (got_author == NULL) {
512 name = got_repo_get_global_gitconfig_author_name(repo);
513 email = got_repo_get_global_gitconfig_author_email(repo);
515 if (asprintf(author, "%s <%s>", name, email) == -1)
516 return got_error_from_errno("asprintf");
519 /* TODO: Look up user in password database? */
520 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
523 *author = strdup(got_author);
525 return got_error_from_errno("strdup");
528 * Really dumb email address check; we're only doing this to
529 * avoid git's object parser breaking on commits we create.
531 while (*got_author && *got_author != '<')
533 if (*got_author != '<') {
534 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
537 while (*got_author && *got_author != '@')
539 if (*got_author != '@') {
540 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
543 while (*got_author && *got_author != '>')
545 if (*got_author != '>')
546 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
555 static const struct got_error *
556 get_gitconfig_path(char **gitconfig_path)
558 const char *homedir = getenv("HOME");
560 *gitconfig_path = NULL;
562 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
563 return got_error_from_errno("asprintf");
569 static const struct got_error *
570 cmd_import(int argc, char *argv[])
572 const struct got_error *error = NULL;
573 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
574 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
575 const char *branch_name = "master";
576 char *refname = NULL, *id_str = NULL;
577 struct got_repository *repo = NULL;
578 struct got_reference *branch_ref = NULL, *head_ref = NULL;
579 struct got_object_id *new_commit_id = NULL;
581 struct got_pathlist_head ignores;
582 struct got_pathlist_entry *pe;
584 TAILQ_INIT(&ignores);
586 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
589 branch_name = optarg;
592 logmsg = strdup(optarg);
593 if (logmsg == NULL) {
594 error = got_error_from_errno("strdup");
599 repo_path = realpath(optarg, NULL);
600 if (repo_path == NULL) {
601 error = got_error_from_errno("realpath");
606 if (optarg[0] == '\0')
608 error = got_pathlist_insert(&pe, &ignores, optarg,
623 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
631 if (repo_path == NULL) {
632 repo_path = getcwd(NULL, 0);
633 if (repo_path == NULL)
634 return got_error_from_errno("getcwd");
636 got_path_strip_trailing_slashes(repo_path);
637 error = get_gitconfig_path(&gitconfig_path);
640 error = got_repo_open(&repo, repo_path, gitconfig_path);
644 error = get_author(&author, repo);
648 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
649 error = got_error_from_errno("asprintf");
653 error = got_ref_open(&branch_ref, repo, refname, 0);
655 if (error->code != GOT_ERR_NOT_REF)
658 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
659 "import target branch already exists");
663 path_dir = realpath(argv[0], NULL);
664 if (path_dir == NULL) {
665 error = got_error_from_errno("realpath");
668 got_path_strip_trailing_slashes(path_dir);
671 * unveil(2) traverses exec(2); if an editor is used we have
672 * to apply unveil after the log message has been written.
674 if (logmsg == NULL || strlen(logmsg) == 0) {
675 error = get_editor(&editor);
679 error = collect_import_msg(&logmsg, editor, path_dir, refname);
684 if (unveil(path_dir, "r") != 0)
685 return got_error_from_errno2("unveil", path_dir);
687 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
691 error = got_repo_import(&new_commit_id, path_dir, logmsg,
692 author, &ignores, repo, import_progress, NULL);
696 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
700 error = got_ref_write(branch_ref, repo);
704 error = got_object_id_str(&id_str, new_commit_id);
708 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
710 if (error->code != GOT_ERR_NOT_REF)
713 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
718 error = got_ref_write(head_ref, repo);
723 printf("Created branch %s with commit %s\n",
724 got_ref_get_name(branch_ref), id_str);
733 free(gitconfig_path);
735 got_ref_close(branch_ref);
737 got_ref_close(head_ref);
744 fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
745 "[-p prefix] repository-path [worktree-path]\n", getprogname());
749 static const struct got_error *
750 checkout_progress(void *arg, unsigned char status, const char *path)
752 char *worktree_path = arg;
754 /* Base commit bump happens silently. */
755 if (status == GOT_STATUS_BUMP_BASE)
758 while (path[0] == '/')
761 printf("%c %s/%s\n", status, worktree_path, path);
765 static const struct got_error *
766 check_cancelled(void *arg)
768 if (sigint_received || sigpipe_received)
769 return got_error(GOT_ERR_CANCELLED);
773 static const struct got_error *
774 check_linear_ancestry(struct got_object_id *commit_id,
775 struct got_object_id *base_commit_id, struct got_repository *repo)
777 const struct got_error *err = NULL;
778 struct got_object_id *yca_id;
780 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
781 commit_id, base_commit_id, repo, check_cancelled, NULL);
786 return got_error(GOT_ERR_ANCESTRY);
789 * Require a straight line of history between the target commit
790 * and the work tree's base commit.
792 * Non-linear situations such as this require a rebase:
794 * (commit) D F (base_commit)
802 * 'got update' only handles linear cases:
803 * Update forwards in time: A (base/yca) - B - C - D (commit)
804 * Update backwards in time: D (base) - C - B - A (commit/yca)
806 if (got_object_id_cmp(commit_id, yca_id) != 0 &&
807 got_object_id_cmp(base_commit_id, yca_id) != 0)
808 return got_error(GOT_ERR_ANCESTRY);
814 static const struct got_error *
815 check_same_branch(struct got_object_id *commit_id,
816 struct got_reference *head_ref, struct got_object_id *yca_id,
817 struct got_repository *repo)
819 const struct got_error *err = NULL;
820 struct got_commit_graph *graph = NULL;
821 struct got_object_id *head_commit_id = NULL;
822 int is_same_branch = 0;
824 err = got_ref_resolve(&head_commit_id, repo, head_ref);
828 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
832 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
837 err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
841 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
842 check_cancelled, NULL);
847 struct got_object_id *id;
848 err = got_commit_graph_iter_next(&id, graph);
850 if (err->code == GOT_ERR_ITER_COMPLETED) {
853 } else if (err->code != GOT_ERR_ITER_NEED_MORE)
855 err = got_commit_graph_fetch_commits(graph, 1,
856 repo, check_cancelled, NULL);
862 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
864 if (got_object_id_cmp(id, commit_id) == 0) {
872 got_commit_graph_close(graph);
873 free(head_commit_id);
874 if (!err && !is_same_branch)
875 err = got_error(GOT_ERR_ANCESTRY);
879 static const struct got_error *
880 resolve_commit_arg(struct got_object_id **commit_id,
881 const char *commit_id_arg, struct got_repository *repo)
883 const struct got_error *err;
884 struct got_reference *ref;
885 struct got_tag_object *tag;
887 err = got_repo_object_match_tag(&tag, commit_id_arg,
888 GOT_OBJ_TYPE_COMMIT, repo);
890 *commit_id = got_object_id_dup(
891 got_object_tag_get_object_id(tag));
892 if (*commit_id == NULL)
893 err = got_error_from_errno("got_object_id_dup");
894 got_object_tag_close(tag);
896 } else if (err->code != GOT_ERR_NO_OBJ)
899 err = got_ref_open(&ref, repo, commit_id_arg, 0);
901 err = got_ref_resolve(commit_id, repo, ref);
904 if (err->code != GOT_ERR_NOT_REF)
906 err = got_repo_match_object_id_prefix(commit_id,
907 commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
912 static const struct got_error *
913 cmd_checkout(int argc, char *argv[])
915 const struct got_error *error = NULL;
916 struct got_repository *repo = NULL;
917 struct got_reference *head_ref = NULL;
918 struct got_worktree *worktree = NULL;
919 char *repo_path = NULL;
920 char *worktree_path = NULL;
921 const char *path_prefix = "";
922 const char *branch_name = GOT_REF_HEAD;
923 char *commit_id_str = NULL;
924 int ch, same_path_prefix;
925 struct got_pathlist_head paths;
929 while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
932 branch_name = optarg;
935 commit_id_str = strdup(optarg);
936 if (commit_id_str == NULL)
937 return got_error_from_errno("strdup");
940 path_prefix = optarg;
952 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
953 "unveil", NULL) == -1)
957 char *cwd, *base, *dotgit;
958 repo_path = realpath(argv[0], NULL);
959 if (repo_path == NULL)
960 return got_error_from_errno2("realpath", argv[0]);
961 cwd = getcwd(NULL, 0);
963 error = got_error_from_errno("getcwd");
966 if (path_prefix[0]) {
967 base = basename(path_prefix);
969 error = got_error_from_errno2("basename",
974 base = basename(repo_path);
976 error = got_error_from_errno2("basename",
981 dotgit = strstr(base, ".git");
984 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
985 error = got_error_from_errno("asprintf");
990 } else if (argc == 2) {
991 repo_path = realpath(argv[0], NULL);
992 if (repo_path == NULL) {
993 error = got_error_from_errno2("realpath", argv[0]);
996 worktree_path = realpath(argv[1], NULL);
997 if (worktree_path == NULL) {
998 if (errno != ENOENT) {
999 error = got_error_from_errno2("realpath",
1003 worktree_path = strdup(argv[1]);
1004 if (worktree_path == NULL) {
1005 error = got_error_from_errno("strdup");
1012 got_path_strip_trailing_slashes(repo_path);
1013 got_path_strip_trailing_slashes(worktree_path);
1015 error = got_repo_open(&repo, repo_path, NULL);
1019 /* Pre-create work tree path for unveil(2) */
1020 error = got_path_mkdir(worktree_path);
1022 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1023 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1025 if (!got_path_dir_is_empty(worktree_path)) {
1026 error = got_error_path(worktree_path,
1027 GOT_ERR_DIR_NOT_EMPTY);
1032 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
1036 error = got_ref_open(&head_ref, repo, branch_name, 0);
1040 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
1041 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
1044 error = got_worktree_open(&worktree, worktree_path);
1048 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1052 if (!same_path_prefix) {
1053 error = got_error(GOT_ERR_PATH_PREFIX);
1057 if (commit_id_str) {
1058 struct got_object_id *commit_id;
1059 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1062 error = check_linear_ancestry(commit_id,
1063 got_worktree_get_base_commit_id(worktree), repo);
1064 if (error != NULL) {
1068 error = check_same_branch(commit_id, head_ref, NULL, repo);
1071 error = got_worktree_set_base_commit_id(worktree, repo,
1078 error = got_pathlist_append(&paths, "", NULL);
1081 error = got_worktree_checkout_files(worktree, &paths, repo,
1082 checkout_progress, worktree_path, check_cancelled, NULL);
1086 printf("Now shut up and hack\n");
1089 got_pathlist_free(&paths);
1090 free(commit_id_str);
1092 free(worktree_path);
1099 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1104 static const struct got_error *
1105 update_progress(void *arg, unsigned char status, const char *path)
1107 int *did_something = arg;
1109 if (status == GOT_STATUS_EXISTS)
1114 /* Base commit bump happens silently. */
1115 if (status == GOT_STATUS_BUMP_BASE)
1118 while (path[0] == '/')
1120 printf("%c %s\n", status, path);
1124 static const struct got_error *
1125 switch_head_ref(struct got_reference *head_ref,
1126 struct got_object_id *commit_id, struct got_worktree *worktree,
1127 struct got_repository *repo)
1129 const struct got_error *err = NULL;
1131 int ref_has_moved = 0;
1133 /* Trivial case: switching between two different references. */
1134 if (strcmp(got_ref_get_name(head_ref),
1135 got_worktree_get_head_ref_name(worktree)) != 0) {
1136 printf("Switching work tree from %s to %s\n",
1137 got_worktree_get_head_ref_name(worktree),
1138 got_ref_get_name(head_ref));
1139 return got_worktree_set_head_ref(worktree, head_ref);
1142 err = check_linear_ancestry(commit_id,
1143 got_worktree_get_base_commit_id(worktree), repo);
1145 if (err->code != GOT_ERR_ANCESTRY)
1152 /* Switching to a rebased branch with the same reference name. */
1153 err = got_object_id_str(&base_id_str,
1154 got_worktree_get_base_commit_id(worktree));
1157 printf("Reference %s now points at a different branch\n",
1158 got_worktree_get_head_ref_name(worktree));
1159 printf("Switching work tree from %s to %s\n", base_id_str,
1160 got_worktree_get_head_ref_name(worktree));
1164 static const struct got_error *
1165 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1167 const struct got_error *err;
1170 err = got_worktree_rebase_in_progress(&in_progress, worktree);
1174 return got_error(GOT_ERR_REBASING);
1176 err = got_worktree_histedit_in_progress(&in_progress, worktree);
1180 return got_error(GOT_ERR_HISTEDIT_BUSY);
1185 static const struct got_error *
1186 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1187 char *argv[], struct got_worktree *worktree)
1189 const struct got_error *err = NULL;
1196 return got_error_from_errno("strdup");
1197 return got_pathlist_append(paths, path, NULL);
1200 for (i = 0; i < argc; i++) {
1201 err = got_worktree_resolve_path(&path, worktree, argv[i]);
1204 err = got_pathlist_append(paths, path, NULL);
1214 static const struct got_error *
1215 cmd_update(int argc, char *argv[])
1217 const struct got_error *error = NULL;
1218 struct got_repository *repo = NULL;
1219 struct got_worktree *worktree = NULL;
1220 char *worktree_path = NULL;
1221 struct got_object_id *commit_id = NULL;
1222 char *commit_id_str = NULL;
1223 const char *branch_name = NULL;
1224 struct got_reference *head_ref = NULL;
1225 struct got_pathlist_head paths;
1226 struct got_pathlist_entry *pe;
1227 int ch, did_something = 0;
1231 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1234 branch_name = optarg;
1237 commit_id_str = strdup(optarg);
1238 if (commit_id_str == NULL)
1239 return got_error_from_errno("strdup");
1251 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1252 "unveil", NULL) == -1)
1255 worktree_path = getcwd(NULL, 0);
1256 if (worktree_path == NULL) {
1257 error = got_error_from_errno("getcwd");
1260 error = got_worktree_open(&worktree, worktree_path);
1264 error = check_rebase_or_histedit_in_progress(worktree);
1268 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
1273 error = apply_unveil(got_repo_get_path(repo), 0,
1274 got_worktree_get_root_path(worktree));
1278 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1282 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1283 got_worktree_get_head_ref_name(worktree), 0);
1286 if (commit_id_str == NULL) {
1287 error = got_ref_resolve(&commit_id, repo, head_ref);
1290 error = got_object_id_str(&commit_id_str, commit_id);
1294 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1295 free(commit_id_str);
1296 commit_id_str = NULL;
1299 error = got_object_id_str(&commit_id_str, commit_id);
1305 struct got_object_id *head_commit_id;
1306 TAILQ_FOREACH(pe, &paths, entry) {
1307 if (pe->path_len == 0)
1309 error = got_error_msg(GOT_ERR_BAD_PATH,
1310 "switching between branches requires that "
1311 "the entire work tree gets updated");
1314 error = got_ref_resolve(&head_commit_id, repo, head_ref);
1317 error = check_linear_ancestry(commit_id, head_commit_id, repo);
1318 free(head_commit_id);
1321 error = check_same_branch(commit_id, head_ref, NULL, repo);
1324 error = switch_head_ref(head_ref, commit_id, worktree, repo);
1328 error = check_linear_ancestry(commit_id,
1329 got_worktree_get_base_commit_id(worktree), repo);
1330 if (error != NULL) {
1331 if (error->code == GOT_ERR_ANCESTRY)
1332 error = got_error(GOT_ERR_BRANCH_MOVED);
1335 error = check_same_branch(commit_id, head_ref, NULL, repo);
1340 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1342 error = got_worktree_set_base_commit_id(worktree, repo,
1348 error = got_worktree_checkout_files(worktree, &paths, repo,
1349 update_progress, &did_something, check_cancelled, NULL);
1354 printf("Updated to commit %s\n", commit_id_str);
1356 printf("Already up-to-date\n");
1358 free(worktree_path);
1359 TAILQ_FOREACH(pe, &paths, entry)
1360 free((char *)pe->path);
1361 got_pathlist_free(&paths);
1363 free(commit_id_str);
1367 static const struct got_error *
1368 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1369 const char *path, int diff_context, struct got_repository *repo)
1371 const struct got_error *err = NULL;
1372 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1375 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1380 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1384 while (path[0] == '/')
1386 err = got_diff_blob(blob1, blob2, path, path, diff_context,
1390 got_object_blob_close(blob1);
1391 got_object_blob_close(blob2);
1395 static const struct got_error *
1396 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1397 const char *path, int diff_context, struct got_repository *repo)
1399 const struct got_error *err = NULL;
1400 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1401 struct got_diff_blob_output_unidiff_arg arg;
1404 err = got_object_open_as_tree(&tree1, repo, tree_id1);
1409 err = got_object_open_as_tree(&tree2, repo, tree_id2);
1413 arg.diff_context = diff_context;
1414 arg.outfile = stdout;
1415 while (path[0] == '/')
1417 err = got_diff_tree(tree1, tree2, path, path, repo,
1418 got_diff_blob_output_unidiff, &arg, 1);
1421 got_object_tree_close(tree1);
1422 got_object_tree_close(tree2);
1426 static const struct got_error *
1427 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1428 const char *path, int diff_context, struct got_repository *repo)
1430 const struct got_error *err = NULL;
1431 struct got_commit_object *pcommit = NULL;
1432 char *id_str1 = NULL, *id_str2 = NULL;
1433 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1434 struct got_object_qid *qid;
1436 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1438 err = got_object_open_as_commit(&pcommit, repo,
1444 if (path && path[0] != '\0') {
1446 err = got_object_id_by_path(&obj_id2, repo, id, path);
1449 err = got_object_id_str(&id_str2, obj_id2);
1455 err = got_object_id_by_path(&obj_id1, repo,
1461 err = got_object_id_str(&id_str1, obj_id1);
1467 err = got_object_get_type(&obj_type, repo, obj_id2);
1472 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1474 case GOT_OBJ_TYPE_BLOB:
1475 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1478 case GOT_OBJ_TYPE_TREE:
1479 err = diff_trees(obj_id1, obj_id2, path, diff_context,
1483 err = got_error(GOT_ERR_OBJ_TYPE);
1489 obj_id2 = got_object_commit_get_tree_id(commit);
1490 err = got_object_id_str(&id_str2, obj_id2);
1493 obj_id1 = got_object_commit_get_tree_id(pcommit);
1494 err = got_object_id_str(&id_str1, obj_id1);
1497 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1498 err = diff_trees(obj_id1, obj_id2, "", diff_context, repo);
1505 got_object_commit_close(pcommit);
1510 get_datestr(time_t *time, char *datebuf)
1512 struct tm mytm, *tm;
1515 tm = gmtime_r(time, &mytm);
1518 s = asctime_r(tm, datebuf);
1521 p = strchr(s, '\n');
1527 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1529 static const struct got_error *
1530 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1531 struct got_repository *repo, const char *path, int show_patch,
1532 int diff_context, struct got_reflist_head *refs)
1534 const struct got_error *err = NULL;
1535 char *id_str, *datestr, *logmsg0, *logmsg, *line;
1537 time_t committer_time;
1538 const char *author, *committer;
1539 char *refs_str = NULL;
1540 struct got_reflist_entry *re;
1542 SIMPLEQ_FOREACH(re, refs, entry) {
1545 struct got_tag_object *tag = NULL;
1548 name = got_ref_get_name(re->ref);
1549 if (strcmp(name, GOT_REF_HEAD) == 0)
1551 if (strncmp(name, "refs/", 5) == 0)
1553 if (strncmp(name, "got/", 4) == 0)
1555 if (strncmp(name, "heads/", 6) == 0)
1557 if (strncmp(name, "remotes/", 8) == 0)
1559 if (strncmp(name, "tags/", 5) == 0) {
1560 err = got_object_open_as_tag(&tag, repo, re->id);
1562 if (err->code != GOT_ERR_OBJ_TYPE)
1564 /* Ref points at something other than a tag. */
1569 cmp = got_object_id_cmp(tag ?
1570 got_object_tag_get_object_id(tag) : re->id, id);
1572 got_object_tag_close(tag);
1576 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1578 err = got_error_from_errno("asprintf");
1584 err = got_object_id_str(&id_str, id);
1588 printf(GOT_COMMIT_SEP_STR);
1589 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1590 refs_str ? refs_str : "", refs_str ? ")" : "");
1595 printf("from: %s\n", got_object_commit_get_author(commit));
1596 committer_time = got_object_commit_get_committer_time(commit);
1597 datestr = get_datestr(&committer_time, datebuf);
1599 printf("date: %s UTC\n", datestr);
1600 author = got_object_commit_get_author(commit);
1601 committer = got_object_commit_get_committer(commit);
1602 if (strcmp(author, committer) != 0)
1603 printf("via: %s\n", committer);
1604 if (got_object_commit_get_nparents(commit) > 1) {
1605 const struct got_object_id_queue *parent_ids;
1606 struct got_object_qid *qid;
1608 parent_ids = got_object_commit_get_parent_ids(commit);
1609 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1610 err = got_object_id_str(&id_str, qid->id);
1613 printf("parent %d: %s\n", n++, id_str);
1618 err = got_object_commit_get_logmsg(&logmsg0, commit);
1624 line = strsep(&logmsg, "\n");
1626 printf(" %s\n", line);
1631 err = print_patch(commit, id, path, diff_context, repo);
1636 if (fflush(stdout) != 0 && err == NULL)
1637 err = got_error_from_errno("fflush");
1641 static const struct got_error *
1642 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1643 char *path, int show_patch, int diff_context, int limit,
1644 int first_parent_traversal, struct got_reflist_head *refs)
1646 const struct got_error *err;
1647 struct got_commit_graph *graph;
1649 err = got_commit_graph_open(&graph, root_id, path,
1650 first_parent_traversal, repo);
1653 err = got_commit_graph_iter_start(graph, root_id, repo,
1654 check_cancelled, NULL);
1658 struct got_commit_object *commit;
1659 struct got_object_id *id;
1661 if (sigint_received || sigpipe_received)
1664 err = got_commit_graph_iter_next(&id, graph);
1666 if (err->code == GOT_ERR_ITER_COMPLETED) {
1670 if (err->code != GOT_ERR_ITER_NEED_MORE)
1672 err = got_commit_graph_fetch_commits(graph, 1, repo,
1673 check_cancelled, NULL);
1682 err = got_object_open_as_commit(&commit, repo, id);
1685 err = print_commit(commit, id, repo, path, show_patch,
1686 diff_context, refs);
1687 got_object_commit_close(commit);
1688 if (err || (limit && --limit == 0))
1692 got_commit_graph_close(graph);
1699 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1700 "[-r repository-path] [path]\n", getprogname());
1705 get_default_log_limit(void)
1707 const char *got_default_log_limit;
1711 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1712 if (got_default_log_limit == NULL)
1714 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1720 static const struct got_error *
1721 cmd_log(int argc, char *argv[])
1723 const struct got_error *error;
1724 struct got_repository *repo = NULL;
1725 struct got_worktree *worktree = NULL;
1726 struct got_commit_object *commit = NULL;
1727 struct got_object_id *id = NULL;
1728 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1729 char *start_commit = NULL;
1730 int diff_context = 3, ch;
1731 int show_patch = 0, limit = 0, first_parent_traversal = 0;
1733 struct got_reflist_head refs;
1735 SIMPLEQ_INIT(&refs);
1738 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1744 limit = get_default_log_limit();
1746 while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1752 start_commit = optarg;
1755 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1758 err(1, "-C option %s", errstr);
1761 limit = strtonum(optarg, 0, INT_MAX, &errstr);
1763 err(1, "-l option %s", errstr);
1766 first_parent_traversal = 1;
1769 repo_path = realpath(optarg, NULL);
1770 if (repo_path == NULL)
1771 err(1, "-r option");
1772 got_path_strip_trailing_slashes(repo_path);
1783 cwd = getcwd(NULL, 0);
1785 error = got_error_from_errno("getcwd");
1789 error = got_worktree_open(&worktree, cwd);
1790 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1797 error = got_error_from_errno("strdup");
1800 } else if (argc == 1) {
1802 error = got_worktree_resolve_path(&path, worktree,
1807 path = strdup(argv[0]);
1809 error = got_error_from_errno("strdup");
1816 if (repo_path == NULL) {
1817 repo_path = worktree ?
1818 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1820 if (repo_path == NULL) {
1821 error = got_error_from_errno("strdup");
1825 error = got_repo_open(&repo, repo_path, NULL);
1829 error = apply_unveil(got_repo_get_path(repo), 1,
1830 worktree ? got_worktree_get_root_path(worktree) : NULL);
1834 if (start_commit == NULL) {
1835 struct got_reference *head_ref;
1836 error = got_ref_open(&head_ref, repo,
1837 worktree ? got_worktree_get_head_ref_name(worktree)
1841 error = got_ref_resolve(&id, repo, head_ref);
1842 got_ref_close(head_ref);
1845 error = got_object_open_as_commit(&commit, repo, id);
1847 struct got_reference *ref;
1848 error = got_ref_open(&ref, repo, start_commit, 0);
1849 if (error == NULL) {
1851 error = got_ref_resolve(&id, repo, ref);
1855 error = got_object_get_type(&obj_type, repo, id);
1858 if (obj_type == GOT_OBJ_TYPE_TAG) {
1859 struct got_tag_object *tag;
1860 error = got_object_open_as_tag(&tag, repo, id);
1863 if (got_object_tag_get_object_type(tag) !=
1864 GOT_OBJ_TYPE_COMMIT) {
1865 got_object_tag_close(tag);
1866 error = got_error(GOT_ERR_OBJ_TYPE);
1870 id = got_object_id_dup(
1871 got_object_tag_get_object_id(tag));
1873 error = got_error_from_errno(
1874 "got_object_id_dup");
1875 got_object_tag_close(tag);
1878 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1879 error = got_error(GOT_ERR_OBJ_TYPE);
1882 error = got_object_open_as_commit(&commit, repo, id);
1886 if (commit == NULL) {
1887 error = got_repo_match_object_id_prefix(&id,
1888 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1897 const char *prefix = got_worktree_get_path_prefix(worktree);
1899 if (asprintf(&p, "%s%s%s", prefix,
1900 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
1901 error = got_error_from_errno("asprintf");
1904 error = got_repo_map_path(&in_repo_path, repo, p, 1);
1907 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1912 path = in_repo_path;
1915 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
1919 error = print_commits(id, repo, path, show_patch,
1920 diff_context, limit, first_parent_traversal, &refs);
1927 got_worktree_close(worktree);
1929 const struct got_error *repo_error;
1930 repo_error = got_repo_close(repo);
1934 got_ref_list_free(&refs);
1941 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1942 "[object1 object2 | path]\n", getprogname());
1946 struct print_diff_arg {
1947 struct got_repository *repo;
1948 struct got_worktree *worktree;
1955 static const struct got_error *
1956 print_diff(void *arg, unsigned char status, unsigned char staged_status,
1957 const char *path, struct got_object_id *blob_id,
1958 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1960 struct print_diff_arg *a = arg;
1961 const struct got_error *err = NULL;
1962 struct got_blob_object *blob1 = NULL;
1964 char *abspath = NULL, *label1 = NULL;
1967 if (a->diff_staged) {
1968 if (staged_status != GOT_STATUS_MODIFY &&
1969 staged_status != GOT_STATUS_ADD &&
1970 staged_status != GOT_STATUS_DELETE)
1973 if (staged_status == GOT_STATUS_DELETE)
1975 if (status == GOT_STATUS_NONEXISTENT)
1976 return got_error_set_errno(ENOENT, path);
1977 if (status != GOT_STATUS_MODIFY &&
1978 status != GOT_STATUS_ADD &&
1979 status != GOT_STATUS_DELETE &&
1980 status != GOT_STATUS_CONFLICT)
1984 if (!a->header_shown) {
1985 printf("diff %s %s%s\n", a->id_str,
1986 got_worktree_get_root_path(a->worktree),
1987 a->diff_staged ? " (staged changes)" : "");
1988 a->header_shown = 1;
1991 if (a->diff_staged) {
1992 const char *label1 = NULL, *label2 = NULL;
1993 switch (staged_status) {
1994 case GOT_STATUS_MODIFY:
1998 case GOT_STATUS_ADD:
2001 case GOT_STATUS_DELETE:
2005 return got_error(GOT_ERR_FILE_STATUS);
2007 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
2008 label1, label2, a->diff_context, a->repo, stdout);
2011 if (staged_status == GOT_STATUS_ADD ||
2012 staged_status == GOT_STATUS_MODIFY) {
2014 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
2018 err = got_object_id_str(&id_str, staged_blob_id);
2021 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
2022 err = got_error_from_errno("asprintf");
2027 } else if (status != GOT_STATUS_ADD) {
2028 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
2033 if (status != GOT_STATUS_DELETE) {
2034 if (asprintf(&abspath, "%s/%s",
2035 got_worktree_get_root_path(a->worktree), path) == -1) {
2036 err = got_error_from_errno("asprintf");
2040 f2 = fopen(abspath, "r");
2042 err = got_error_from_errno2("fopen", abspath);
2045 if (lstat(abspath, &sb) == -1) {
2046 err = got_error_from_errno2("lstat", abspath);
2052 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
2053 a->diff_context, stdout);
2056 got_object_blob_close(blob1);
2057 if (f2 && fclose(f2) != 0 && err == NULL)
2058 err = got_error_from_errno("fclose");
2063 static const struct got_error *
2064 match_object_id(struct got_object_id **id, char **label,
2065 const char *id_str, int obj_type, int resolve_tags,
2066 struct got_repository *repo)
2068 const struct got_error *err;
2069 struct got_tag_object *tag;
2070 struct got_reference *ref = NULL;
2076 err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2079 *id = got_object_id_dup(
2080 got_object_tag_get_object_id(tag));
2082 err = got_error_from_errno("got_object_id_dup");
2083 else if (asprintf(label, "refs/tags/%s",
2084 got_object_tag_get_name(tag)) == -1) {
2085 err = got_error_from_errno("asprintf");
2089 got_object_tag_close(tag);
2091 } else if (err->code != GOT_ERR_NO_OBJ)
2095 err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2097 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2099 err = got_ref_open(&ref, repo, id_str, 0);
2102 *label = strdup(got_ref_get_name(ref));
2103 if (*label == NULL) {
2104 err = got_error_from_errno("strdup");
2107 err = got_ref_resolve(id, repo, ref);
2109 err = got_object_id_str(label, *id);
2110 if (*label == NULL) {
2111 err = got_error_from_errno("strdup");
2122 static const struct got_error *
2123 cmd_diff(int argc, char *argv[])
2125 const struct got_error *error;
2126 struct got_repository *repo = NULL;
2127 struct got_worktree *worktree = NULL;
2128 char *cwd = NULL, *repo_path = NULL;
2129 struct got_object_id *id1 = NULL, *id2 = NULL;
2130 const char *id_str1 = NULL, *id_str2 = NULL;
2131 char *label1 = NULL, *label2 = NULL;
2133 int diff_context = 3, diff_staged = 0, ch;
2138 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2143 while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
2146 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
2148 err(1, "-C option %s", errstr);
2151 repo_path = realpath(optarg, NULL);
2152 if (repo_path == NULL)
2153 err(1, "-r option");
2154 got_path_strip_trailing_slashes(repo_path);
2168 cwd = getcwd(NULL, 0);
2170 error = got_error_from_errno("getcwd");
2173 error = got_worktree_open(&worktree, cwd);
2174 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2177 if (worktree == NULL) {
2178 error = got_error(GOT_ERR_NOT_WORKTREE);
2183 "-r option can't be used when diffing a work tree");
2184 repo_path = strdup(got_worktree_get_repo_path(worktree));
2185 if (repo_path == NULL) {
2186 error = got_error_from_errno("strdup");
2190 error = got_worktree_resolve_path(&path, worktree,
2197 error = got_error_from_errno("strdup");
2201 } else if (argc == 2) {
2203 errx(1, "-s option can't be used when diffing "
2204 "objects in repository");
2207 if (worktree && repo_path == NULL) {
2209 strdup(got_worktree_get_repo_path(worktree));
2210 if (repo_path == NULL) {
2211 error = got_error_from_errno("strdup");
2218 if (repo_path == NULL) {
2219 repo_path = getcwd(NULL, 0);
2220 if (repo_path == NULL)
2221 return got_error_from_errno("getcwd");
2224 error = got_repo_open(&repo, repo_path, NULL);
2229 error = apply_unveil(got_repo_get_path(repo), 1,
2230 worktree ? got_worktree_get_root_path(worktree) : NULL);
2235 struct print_diff_arg arg;
2236 struct got_pathlist_head paths;
2241 error = got_object_id_str(&id_str,
2242 got_worktree_get_base_commit_id(worktree));
2246 arg.worktree = worktree;
2247 arg.diff_context = diff_context;
2248 arg.id_str = id_str;
2249 arg.header_shown = 0;
2250 arg.diff_staged = diff_staged;
2252 error = got_pathlist_append(&paths, path, NULL);
2256 error = got_worktree_status(worktree, &paths, repo, print_diff,
2257 &arg, check_cancelled, NULL);
2259 got_pathlist_free(&paths);
2263 error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2268 error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2273 error = got_object_get_type(&type1, repo, id1);
2277 error = got_object_get_type(&type2, repo, id2);
2281 if (type1 != type2) {
2282 error = got_error(GOT_ERR_OBJ_TYPE);
2287 case GOT_OBJ_TYPE_BLOB:
2288 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2289 diff_context, repo, stdout);
2291 case GOT_OBJ_TYPE_TREE:
2292 error = got_diff_objects_as_trees(id1, id2, "", "",
2293 diff_context, repo, stdout);
2295 case GOT_OBJ_TYPE_COMMIT:
2296 printf("diff %s %s\n", label1, label2);
2297 error = got_diff_objects_as_commits(id1, id2, diff_context,
2301 error = got_error(GOT_ERR_OBJ_TYPE);
2311 got_worktree_close(worktree);
2313 const struct got_error *repo_error;
2314 repo_error = got_repo_close(repo);
2325 "usage: %s blame [-c commit] [-r repository-path] path\n",
2334 char datebuf[9]; /* YY-MM-DD + NUL */
2337 struct blame_cb_args {
2338 struct blame_line *lines;
2342 off_t *line_offsets;
2344 struct got_repository *repo;
2347 static const struct got_error *
2348 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2350 const struct got_error *err = NULL;
2351 struct blame_cb_args *a = arg;
2352 struct blame_line *bline;
2354 size_t linesize = 0;
2355 struct got_commit_object *commit = NULL;
2358 time_t committer_time;
2360 if (nlines != a->nlines ||
2361 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2362 return got_error(GOT_ERR_RANGE);
2364 if (sigint_received)
2365 return got_error(GOT_ERR_ITER_COMPLETED);
2368 return NULL; /* no change in this commit */
2370 /* Annotate this line. */
2371 bline = &a->lines[lineno - 1];
2372 if (bline->annotated)
2374 err = got_object_id_str(&bline->id_str, id);
2378 err = got_object_open_as_commit(&commit, a->repo, id);
2382 bline->committer = strdup(got_object_commit_get_committer(commit));
2383 if (bline->committer == NULL) {
2384 err = got_error_from_errno("strdup");
2388 committer_time = got_object_commit_get_committer_time(commit);
2389 if (localtime_r(&committer_time, &tm) == NULL)
2390 return got_error_from_errno("localtime_r");
2391 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%g/%m/%d",
2392 &tm) >= sizeof(bline->datebuf)) {
2393 err = got_error(GOT_ERR_NO_SPACE);
2396 bline->annotated = 1;
2398 /* Print lines annotated so far. */
2399 bline = &a->lines[a->lineno_cur - 1];
2400 if (!bline->annotated)
2403 offset = a->line_offsets[a->lineno_cur - 1];
2404 if (fseeko(a->f, offset, SEEK_SET) == -1) {
2405 err = got_error_from_errno("fseeko");
2409 while (bline->annotated) {
2410 char *smallerthan, *at, *nl, *committer;
2413 if (getline(&line, &linesize, a->f) == (ssize_t)-1) {
2415 err = got_error_from_errno("getline");
2419 committer = bline->committer;
2420 smallerthan = strchr(committer, '<');
2421 if (smallerthan && smallerthan[1] != '\0')
2422 committer = smallerthan + 1;
2423 at = strchr(committer, '@');
2426 len = strlen(committer);
2428 committer[8] = '\0';
2430 nl = strchr(line, '\n');
2433 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2434 bline->id_str, bline->datebuf, committer, line);
2437 bline = &a->lines[a->lineno_cur - 1];
2441 got_object_commit_close(commit);
2446 static const struct got_error *
2447 cmd_blame(int argc, char *argv[])
2449 const struct got_error *error;
2450 struct got_repository *repo = NULL;
2451 struct got_worktree *worktree = NULL;
2452 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2453 struct got_object_id *obj_id = NULL;
2454 struct got_object_id *commit_id = NULL;
2455 struct got_blob_object *blob = NULL;
2456 char *commit_id_str = NULL;
2457 struct blame_cb_args bca;
2458 int ch, obj_type, i;
2461 memset(&bca, 0, sizeof(bca));
2464 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2469 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2472 commit_id_str = optarg;
2475 repo_path = realpath(optarg, NULL);
2476 if (repo_path == NULL)
2477 err(1, "-r option");
2478 got_path_strip_trailing_slashes(repo_path);
2494 cwd = getcwd(NULL, 0);
2496 error = got_error_from_errno("getcwd");
2499 if (repo_path == NULL) {
2500 error = got_worktree_open(&worktree, cwd);
2501 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2507 strdup(got_worktree_get_repo_path(worktree));
2508 if (repo_path == NULL)
2509 error = got_error_from_errno("strdup");
2513 repo_path = strdup(cwd);
2514 if (repo_path == NULL) {
2515 error = got_error_from_errno("strdup");
2521 error = got_repo_open(&repo, repo_path, NULL);
2525 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2530 const char *prefix = got_worktree_get_path_prefix(worktree);
2531 char *p, *worktree_subdir = cwd +
2532 strlen(got_worktree_get_root_path(worktree));
2533 if (asprintf(&p, "%s%s%s%s%s",
2534 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2535 worktree_subdir, worktree_subdir[0] ? "/" : "",
2537 error = got_error_from_errno("asprintf");
2540 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2543 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2548 if (commit_id_str == NULL) {
2549 struct got_reference *head_ref;
2550 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2553 error = got_ref_resolve(&commit_id, repo, head_ref);
2554 got_ref_close(head_ref);
2558 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2563 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2566 if (obj_id == NULL) {
2567 error = got_error(GOT_ERR_NO_OBJ);
2571 error = got_object_get_type(&obj_type, repo, obj_id);
2575 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2576 error = got_error(GOT_ERR_OBJ_TYPE);
2580 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2583 bca.f = got_opentemp();
2584 if (bca.f == NULL) {
2585 error = got_error_from_errno("got_opentemp");
2588 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2589 &bca.line_offsets, bca.f, blob);
2590 if (error || bca.nlines == 0)
2593 /* Don't include \n at EOF in the blame line count. */
2594 if (bca.line_offsets[bca.nlines - 1] == filesize)
2597 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2598 if (bca.lines == NULL) {
2599 error = got_error_from_errno("calloc");
2603 bca.nlines_prec = 0;
2611 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2612 check_cancelled, NULL);
2622 got_object_blob_close(blob);
2624 got_worktree_close(worktree);
2626 const struct got_error *repo_error;
2627 repo_error = got_repo_close(repo);
2632 for (i = 0; i < bca.nlines; i++) {
2633 struct blame_line *bline = &bca.lines[i];
2634 free(bline->id_str);
2635 free(bline->committer);
2639 free(bca.line_offsets);
2640 if (bca.f && fclose(bca.f) == EOF && error == NULL)
2641 error = got_error_from_errno("fclose");
2649 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2655 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2656 const char *root_path)
2658 int is_root_path = (strcmp(path, root_path) == 0);
2659 const char *modestr = "";
2661 path += strlen(root_path);
2662 while (path[0] == '/')
2665 if (got_object_tree_entry_is_submodule(te))
2667 else if (S_ISLNK(te->mode))
2669 else if (S_ISDIR(te->mode))
2671 else if (te->mode & S_IXUSR)
2674 printf("%s%s%s%s%s\n", id ? id : "", path,
2675 is_root_path ? "" : "/", te->name, modestr);
2678 static const struct got_error *
2679 print_tree(const char *path, struct got_object_id *commit_id,
2680 int show_ids, int recurse, const char *root_path,
2681 struct got_repository *repo)
2683 const struct got_error *err = NULL;
2684 struct got_object_id *tree_id = NULL;
2685 struct got_tree_object *tree = NULL;
2686 const struct got_tree_entries *entries;
2687 struct got_tree_entry *te;
2689 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2693 err = got_object_open_as_tree(&tree, repo, tree_id);
2696 entries = got_object_tree_get_entries(tree);
2697 te = SIMPLEQ_FIRST(&entries->head);
2701 if (sigint_received || sigpipe_received)
2706 err = got_object_id_str(&id_str, te->id);
2709 if (asprintf(&id, "%s ", id_str) == -1) {
2710 err = got_error_from_errno("asprintf");
2716 print_entry(te, id, path, root_path);
2719 if (recurse && S_ISDIR(te->mode)) {
2721 if (asprintf(&child_path, "%s%s%s", path,
2722 path[0] == '/' && path[1] == '\0' ? "" : "/",
2724 err = got_error_from_errno("asprintf");
2727 err = print_tree(child_path, commit_id, show_ids, 1,
2734 te = SIMPLEQ_NEXT(te, entry);
2738 got_object_tree_close(tree);
2743 static const struct got_error *
2744 cmd_tree(int argc, char *argv[])
2746 const struct got_error *error;
2747 struct got_repository *repo = NULL;
2748 struct got_worktree *worktree = NULL;
2750 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2751 struct got_object_id *commit_id = NULL;
2752 char *commit_id_str = NULL;
2753 int show_ids = 0, recurse = 0;
2757 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2762 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2765 commit_id_str = optarg;
2768 repo_path = realpath(optarg, NULL);
2769 if (repo_path == NULL)
2770 err(1, "-r option");
2771 got_path_strip_trailing_slashes(repo_path);
2795 cwd = getcwd(NULL, 0);
2797 error = got_error_from_errno("getcwd");
2800 if (repo_path == NULL) {
2801 error = got_worktree_open(&worktree, cwd);
2802 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2808 strdup(got_worktree_get_repo_path(worktree));
2809 if (repo_path == NULL)
2810 error = got_error_from_errno("strdup");
2814 repo_path = strdup(cwd);
2815 if (repo_path == NULL) {
2816 error = got_error_from_errno("strdup");
2822 error = got_repo_open(&repo, repo_path, NULL);
2826 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2832 char *p, *worktree_subdir = cwd +
2833 strlen(got_worktree_get_root_path(worktree));
2834 if (asprintf(&p, "%s/%s",
2835 got_worktree_get_path_prefix(worktree),
2836 worktree_subdir) == -1) {
2837 error = got_error_from_errno("asprintf");
2840 error = got_repo_map_path(&in_repo_path, repo, p, 1);
2847 if (in_repo_path == NULL) {
2848 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2853 if (commit_id_str == NULL) {
2854 struct got_reference *head_ref;
2855 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2858 error = got_ref_resolve(&commit_id, repo, head_ref);
2859 got_ref_close(head_ref);
2863 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2868 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2869 in_repo_path, repo);
2876 got_worktree_close(worktree);
2878 const struct got_error *repo_error;
2879 repo_error = got_repo_close(repo);
2889 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2893 static const struct got_error *
2894 print_status(void *arg, unsigned char status, unsigned char staged_status,
2895 const char *path, struct got_object_id *blob_id,
2896 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2898 if (status == staged_status && (status == GOT_STATUS_DELETE))
2899 status = GOT_STATUS_NO_CHANGE;
2900 printf("%c%c %s\n", status, staged_status, path);
2904 static const struct got_error *
2905 cmd_status(int argc, char *argv[])
2907 const struct got_error *error = NULL;
2908 struct got_repository *repo = NULL;
2909 struct got_worktree *worktree = NULL;
2911 struct got_pathlist_head paths;
2912 struct got_pathlist_entry *pe;
2917 while ((ch = getopt(argc, argv, "")) != -1) {
2929 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2933 cwd = getcwd(NULL, 0);
2935 error = got_error_from_errno("getcwd");
2939 error = got_worktree_open(&worktree, cwd);
2943 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2948 error = apply_unveil(got_repo_get_path(repo), 1,
2949 got_worktree_get_root_path(worktree));
2953 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2957 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2958 check_cancelled, NULL);
2960 TAILQ_FOREACH(pe, &paths, entry)
2961 free((char *)pe->path);
2962 got_pathlist_free(&paths);
2971 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2976 static const struct got_error *
2977 list_refs(struct got_repository *repo)
2979 static const struct got_error *err = NULL;
2980 struct got_reflist_head refs;
2981 struct got_reflist_entry *re;
2983 SIMPLEQ_INIT(&refs);
2984 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2988 SIMPLEQ_FOREACH(re, &refs, entry) {
2990 refstr = got_ref_to_str(re->ref);
2992 return got_error_from_errno("got_ref_to_str");
2993 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2997 got_ref_list_free(&refs);
3001 static const struct got_error *
3002 delete_ref(struct got_repository *repo, const char *refname)
3004 const struct got_error *err = NULL;
3005 struct got_reference *ref;
3007 err = got_ref_open(&ref, repo, refname, 0);
3011 err = got_ref_delete(ref, repo);
3016 static const struct got_error *
3017 add_ref(struct got_repository *repo, const char *refname, const char *target)
3019 const struct got_error *err = NULL;
3020 struct got_object_id *id;
3021 struct got_reference *ref = NULL;
3024 * Don't let the user create a reference named '-'.
3025 * While technically a valid reference name, this case is usually
3026 * an unintended typo.
3028 if (refname[0] == '-' && refname[1] == '\0')
3029 return got_error(GOT_ERR_BAD_REF_NAME);
3031 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
3034 struct got_reference *target_ref;
3036 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
3038 err = got_ref_open(&target_ref, repo, target, 0);
3041 err = got_ref_resolve(&id, repo, target_ref);
3042 got_ref_close(target_ref);
3047 err = got_ref_alloc(&ref, refname, id);
3051 err = got_ref_write(ref, repo);
3059 static const struct got_error *
3060 add_symref(struct got_repository *repo, const char *refname, const char *target)
3062 const struct got_error *err = NULL;
3063 struct got_reference *ref = NULL;
3064 struct got_reference *target_ref = NULL;
3067 * Don't let the user create a reference named '-'.
3068 * While technically a valid reference name, this case is usually
3069 * an unintended typo.
3071 if (refname[0] == '-' && refname[1] == '\0')
3072 return got_error(GOT_ERR_BAD_REF_NAME);
3074 err = got_ref_open(&target_ref, repo, target, 0);
3078 err = got_ref_alloc_symref(&ref, refname, target_ref);
3082 err = got_ref_write(ref, repo);
3085 got_ref_close(target_ref);
3091 static const struct got_error *
3092 cmd_ref(int argc, char *argv[])
3094 const struct got_error *error = NULL;
3095 struct got_repository *repo = NULL;
3096 struct got_worktree *worktree = NULL;
3097 char *cwd = NULL, *repo_path = NULL;
3098 int ch, do_list = 0, create_symref = 0;
3099 const char *delref = NULL;
3101 /* TODO: Add -s option for adding symbolic references. */
3102 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3108 repo_path = realpath(optarg, NULL);
3109 if (repo_path == NULL)
3110 err(1, "-r option");
3111 got_path_strip_trailing_slashes(repo_path);
3125 if (do_list && delref)
3126 errx(1, "-l and -d options are mutually exclusive\n");
3131 if (do_list || delref) {
3133 errx(1, "-s option cannot be used together with the "
3134 "-l or -d options");
3137 } else if (argc != 2)
3142 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3146 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3147 "sendfd unveil", NULL) == -1)
3151 cwd = getcwd(NULL, 0);
3153 error = got_error_from_errno("getcwd");
3157 if (repo_path == NULL) {
3158 error = got_worktree_open(&worktree, cwd);
3159 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3165 strdup(got_worktree_get_repo_path(worktree));
3166 if (repo_path == NULL)
3167 error = got_error_from_errno("strdup");
3171 repo_path = strdup(cwd);
3172 if (repo_path == NULL) {
3173 error = got_error_from_errno("strdup");
3179 error = got_repo_open(&repo, repo_path, NULL);
3183 error = apply_unveil(got_repo_get_path(repo), do_list,
3184 worktree ? got_worktree_get_root_path(worktree) : NULL);
3189 error = list_refs(repo);
3191 error = delete_ref(repo, delref);
3192 else if (create_symref)
3193 error = add_symref(repo, argv[0], argv[1]);
3195 error = add_ref(repo, argv[0], argv[1]);
3198 got_repo_close(repo);
3200 got_worktree_close(worktree);
3210 "usage: %s branch [-r repository] -l | -d name | "
3211 "name [commit]\n", getprogname());
3215 static const struct got_error *
3216 list_branches(struct got_repository *repo, struct got_worktree *worktree)
3218 static const struct got_error *err = NULL;
3219 struct got_reflist_head refs;
3220 struct got_reflist_entry *re;
3222 SIMPLEQ_INIT(&refs);
3224 err = got_ref_list(&refs, repo, "refs/heads",
3225 got_ref_cmp_by_name, NULL);
3229 SIMPLEQ_FOREACH(re, &refs, entry) {
3230 const char *refname, *marker = " ";
3232 refname = got_ref_get_name(re->ref);
3233 if (worktree && strcmp(refname,
3234 got_worktree_get_head_ref_name(worktree)) == 0) {
3235 struct got_object_id *id = NULL;
3236 err = got_ref_resolve(&id, repo, re->ref);
3239 if (got_object_id_cmp(id,
3240 got_worktree_get_base_commit_id(worktree)) == 0)
3246 refname += strlen("refs/heads/");
3247 refstr = got_ref_to_str(re->ref);
3249 return got_error_from_errno("got_ref_to_str");
3250 printf("%s%s: %s\n", marker, refname, refstr);
3254 got_ref_list_free(&refs);
3258 static const struct got_error *
3259 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3260 const char *branch_name)
3262 const struct got_error *err = NULL;
3263 struct got_reference *ref = NULL;
3266 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3267 return got_error_from_errno("asprintf");
3269 err = got_ref_open(&ref, repo, refname, 0);
3274 strcmp(got_worktree_get_head_ref_name(worktree),
3275 got_ref_get_name(ref)) == 0) {
3276 err = got_error_msg(GOT_ERR_SAME_BRANCH,
3277 "will not delete this work tree's current branch");
3281 err = got_ref_delete(ref, repo);
3289 static const struct got_error *
3290 add_branch(struct got_repository *repo, const char *branch_name,
3291 const char *base_branch)
3293 const struct got_error *err = NULL;
3294 struct got_object_id *id = NULL;
3296 struct got_reference *ref = NULL;
3297 char *base_refname = NULL, *refname = NULL;
3300 * Don't let the user create a branch named '-'.
3301 * While technically a valid reference name, this case is usually
3302 * an unintended typo.
3304 if (branch_name[0] == '-' && branch_name[1] == '\0')
3305 return got_error(GOT_ERR_BAD_REF_NAME);
3307 err = match_object_id(&id, &label, base_branch,
3308 GOT_OBJ_TYPE_COMMIT, 1, repo);
3312 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3313 err = got_error_from_errno("asprintf");
3317 err = got_ref_open(&ref, repo, refname, 0);
3319 err = got_error(GOT_ERR_BRANCH_EXISTS);
3321 } else if (err->code != GOT_ERR_NOT_REF)
3324 err = got_ref_alloc(&ref, refname, id);
3328 err = got_ref_write(ref, repo);
3338 static const struct got_error *
3339 cmd_branch(int argc, char *argv[])
3341 const struct got_error *error = NULL;
3342 struct got_repository *repo = NULL;
3343 struct got_worktree *worktree = NULL;
3344 char *cwd = NULL, *repo_path = NULL;
3345 int ch, do_list = 0;
3346 const char *delref = NULL;
3348 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3354 repo_path = realpath(optarg, NULL);
3355 if (repo_path == NULL)
3356 err(1, "-r option");
3357 got_path_strip_trailing_slashes(repo_path);
3368 if (do_list && delref)
3369 errx(1, "-l and -d options are mutually exclusive\n");
3374 if (do_list || delref) {
3377 } else if (argc < 1 || argc > 2)
3382 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3386 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3387 "sendfd unveil", NULL) == -1)
3391 cwd = getcwd(NULL, 0);
3393 error = got_error_from_errno("getcwd");
3397 if (repo_path == NULL) {
3398 error = got_worktree_open(&worktree, cwd);
3399 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3405 strdup(got_worktree_get_repo_path(worktree));
3406 if (repo_path == NULL)
3407 error = got_error_from_errno("strdup");
3411 repo_path = strdup(cwd);
3412 if (repo_path == NULL) {
3413 error = got_error_from_errno("strdup");
3419 error = got_repo_open(&repo, repo_path, NULL);
3423 error = apply_unveil(got_repo_get_path(repo), do_list,
3424 worktree ? got_worktree_get_root_path(worktree) : NULL);
3429 error = list_branches(repo, worktree);
3431 error = delete_branch(repo, worktree, delref);
3433 const char *base_branch;
3435 base_branch = worktree ?
3436 got_worktree_get_head_ref_name(worktree) :
3438 if (strncmp(base_branch, "refs/heads/", 11) == 0)
3441 base_branch = argv[1];
3442 error = add_branch(repo, argv[0], base_branch);
3446 got_repo_close(repo);
3448 got_worktree_close(worktree);
3459 "usage: %s tag [-r repository] | -l | "
3460 "[-m message] name [commit]\n", getprogname());
3465 static const struct got_error *
3466 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3468 const struct got_error *err = NULL;
3469 struct got_reflist_entry *re, *se, *new;
3470 struct got_object_id *re_id, *se_id;
3471 struct got_tag_object *re_tag, *se_tag;
3472 time_t re_time, se_time;
3474 SIMPLEQ_FOREACH(re, tags, entry) {
3475 se = SIMPLEQ_FIRST(sorted);
3477 err = got_reflist_entry_dup(&new, re);
3480 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3483 err = got_ref_resolve(&re_id, repo, re->ref);
3486 err = got_object_open_as_tag(&re_tag, repo, re_id);
3490 re_time = got_object_tag_get_tagger_time(re_tag);
3491 got_object_tag_close(re_tag);
3495 err = got_ref_resolve(&se_id, repo, re->ref);
3498 err = got_object_open_as_tag(&se_tag, repo, se_id);
3502 se_time = got_object_tag_get_tagger_time(se_tag);
3503 got_object_tag_close(se_tag);
3505 if (se_time > re_time) {
3506 err = got_reflist_entry_dup(&new, re);
3509 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3512 se = SIMPLEQ_NEXT(se, entry);
3521 static const struct got_error *
3522 cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3523 struct got_reference *ref2)
3525 const struct got_error *err = NULL;
3526 struct got_repository *repo = arg;
3527 struct got_object_id *id1, *id2 = NULL;
3528 struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3529 time_t time1, time2;
3533 err = got_ref_resolve(&id1, repo, ref1);
3536 err = got_object_open_as_tag(&tag1, repo, id1);
3540 err = got_ref_resolve(&id2, repo, ref2);
3543 err = got_object_open_as_tag(&tag2, repo, id2);
3547 time1 = got_object_tag_get_tagger_time(tag1);
3548 time2 = got_object_tag_get_tagger_time(tag2);
3550 /* Put latest tags first. */
3553 else if (time1 > time2)
3556 err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3561 got_object_tag_close(tag1);
3563 got_object_tag_close(tag2);
3567 static const struct got_error *
3568 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3570 static const struct got_error *err = NULL;
3571 struct got_reflist_head refs;
3572 struct got_reflist_entry *re;
3574 SIMPLEQ_INIT(&refs);
3576 err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3580 SIMPLEQ_FOREACH(re, &refs, entry) {
3581 const char *refname;
3582 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3585 struct got_object_id *id;
3586 struct got_tag_object *tag;
3588 refname = got_ref_get_name(re->ref);
3589 if (strncmp(refname, "refs/tags/", 10) != 0)
3592 refstr = got_ref_to_str(re->ref);
3593 if (refstr == NULL) {
3594 err = got_error_from_errno("got_ref_to_str");
3597 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3600 err = got_ref_resolve(&id, repo, re->ref);
3603 err = got_object_open_as_tag(&tag, repo, id);
3607 printf("from: %s\n", got_object_tag_get_tagger(tag));
3608 tagger_time = got_object_tag_get_tagger_time(tag);
3609 datestr = get_datestr(&tagger_time, datebuf);
3611 printf("date: %s UTC\n", datestr);
3612 err = got_object_id_str(&id_str,
3613 got_object_tag_get_object_id(tag));
3616 switch (got_object_tag_get_object_type(tag)) {
3617 case GOT_OBJ_TYPE_BLOB:
3618 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3620 case GOT_OBJ_TYPE_TREE:
3621 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3623 case GOT_OBJ_TYPE_COMMIT:
3624 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3626 case GOT_OBJ_TYPE_TAG:
3627 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3633 tagmsg0 = strdup(got_object_tag_get_message(tag));
3634 got_object_tag_close(tag);
3635 if (tagmsg0 == NULL) {
3636 err = got_error_from_errno("strdup");
3642 line = strsep(&tagmsg, "\n");
3644 printf(" %s\n", line);
3649 got_ref_list_free(&refs);
3653 static const struct got_error *
3654 get_tag_message(char **tagmsg, const char *commit_id_str,
3655 const char *tag_name, const char *repo_path)
3657 const struct got_error *err = NULL;
3658 char *template = NULL, *initial_content = NULL;
3659 char *tagmsg_path = NULL, *editor = NULL;
3662 if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3663 err = got_error_from_errno("asprintf");
3667 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3668 commit_id_str, tag_name) == -1) {
3669 err = got_error_from_errno("asprintf");
3673 err = got_opentemp_named_fd(&tagmsg_path, &fd, template);
3677 dprintf(fd, initial_content);
3680 err = get_editor(&editor);
3683 err = edit_logmsg(tagmsg, editor, tagmsg_path, initial_content);
3685 if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3686 unlink(tagmsg_path);
3690 free(initial_content);
3694 /* Editor is done; we can now apply unveil(2) */
3696 err = apply_unveil(repo_path, 0, NULL);
3705 static const struct got_error *
3706 add_tag(struct got_repository *repo, const char *tag_name,
3707 const char *commit_arg, const char *tagmsg_arg)
3709 const struct got_error *err = NULL;
3710 struct got_object_id *commit_id = NULL, *tag_id = NULL;
3711 char *label = NULL, *commit_id_str = NULL;
3712 struct got_reference *ref = NULL;
3713 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
3716 * Don't let the user create a tag named '-'.
3717 * While technically a valid reference name, this case is usually
3718 * an unintended typo.
3720 if (tag_name[0] == '-' && tag_name[1] == '\0')
3721 return got_error(GOT_ERR_BAD_REF_NAME);
3723 err = get_author(&tagger, repo);
3727 err = match_object_id(&commit_id, &label, commit_arg,
3728 GOT_OBJ_TYPE_COMMIT, 1, repo);
3732 err = got_object_id_str(&commit_id_str, commit_id);
3736 if (strncmp("refs/tags/", tag_name, 10) == 0) {
3737 refname = strdup(tag_name);
3738 if (refname == NULL) {
3739 err = got_error_from_errno("strdup");
3743 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3744 err = got_error_from_errno("asprintf");
3748 err = got_ref_open(&ref, repo, refname, 0);
3750 err = got_error(GOT_ERR_TAG_EXISTS);
3752 } else if (err->code != GOT_ERR_NOT_REF)
3755 if (tagmsg_arg == NULL) {
3756 err = get_tag_message(&tagmsg, commit_id_str,
3757 tag_name, got_repo_get_path(repo));
3762 err = got_object_tag_create(&tag_id, tag_name, commit_id,
3763 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3767 err = got_ref_alloc(&ref, refname, tag_id);
3771 err = got_ref_write(ref, repo);
3775 err = got_object_id_str(&tag_id_str, tag_id);
3776 printf("Created tag %s\n", tag_id_str);
3783 free(commit_id_str);
3790 static const struct got_error *
3791 cmd_tag(int argc, char *argv[])
3793 const struct got_error *error = NULL;
3794 struct got_repository *repo = NULL;
3795 struct got_worktree *worktree = NULL;
3796 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3797 char *gitconfig_path = NULL;
3798 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3799 int ch, do_list = 0;
3801 while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3807 repo_path = realpath(optarg, NULL);
3808 if (repo_path == NULL)
3809 err(1, "-r option");
3810 got_path_strip_trailing_slashes(repo_path);
3826 errx(1, "-l and -m options are mutually exclusive\n");
3829 } else if (argc < 1 || argc > 2)
3832 commit_id_arg = argv[1];
3837 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3841 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3842 "sendfd unveil", NULL) == -1)
3846 cwd = getcwd(NULL, 0);
3848 error = got_error_from_errno("getcwd");
3852 if (repo_path == NULL) {
3853 error = got_worktree_open(&worktree, cwd);
3854 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3860 strdup(got_worktree_get_repo_path(worktree));
3861 if (repo_path == NULL)
3862 error = got_error_from_errno("strdup");
3866 repo_path = strdup(cwd);
3867 if (repo_path == NULL) {
3868 error = got_error_from_errno("strdup");
3875 error = got_repo_open(&repo, repo_path, NULL);
3878 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3881 error = list_tags(repo, worktree);
3883 error = get_gitconfig_path(&gitconfig_path);
3886 error = got_repo_open(&repo, repo_path, gitconfig_path);
3891 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3896 if (commit_id_arg == NULL) {
3897 struct got_reference *head_ref;
3898 struct got_object_id *commit_id;
3899 error = got_ref_open(&head_ref, repo,
3900 worktree ? got_worktree_get_head_ref_name(worktree)
3904 error = got_ref_resolve(&commit_id, repo, head_ref);
3905 got_ref_close(head_ref);
3908 error = got_object_id_str(&commit_id_str, commit_id);
3914 error = add_tag(repo, tag_name,
3915 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
3919 got_repo_close(repo);
3921 got_worktree_close(worktree);
3924 free(gitconfig_path);
3925 free(commit_id_str);
3932 fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3936 static const struct got_error *
3937 cmd_add(int argc, char *argv[])
3939 const struct got_error *error = NULL;
3940 struct got_repository *repo = NULL;
3941 struct got_worktree *worktree = NULL;
3943 struct got_pathlist_head paths;
3944 struct got_pathlist_entry *pe;
3949 while ((ch = getopt(argc, argv, "")) != -1) {
3961 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3968 cwd = getcwd(NULL, 0);
3970 error = got_error_from_errno("getcwd");
3974 error = got_worktree_open(&worktree, cwd);
3978 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3983 error = apply_unveil(got_repo_get_path(repo), 1,
3984 got_worktree_get_root_path(worktree));
3988 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3992 error = got_worktree_schedule_add(worktree, &paths, print_status,
3996 got_repo_close(repo);
3998 got_worktree_close(worktree);
3999 TAILQ_FOREACH(pe, &paths, entry)
4000 free((char *)pe->path);
4001 got_pathlist_free(&paths);
4009 fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
4013 static const struct got_error *
4014 print_remove_status(void *arg, unsigned char status,
4015 unsigned char staged_status, const char *path,
4016 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4017 struct got_object_id *commit_id)
4019 if (status == GOT_STATUS_NONEXISTENT)
4021 if (status == staged_status && (status == GOT_STATUS_DELETE))
4022 status = GOT_STATUS_NO_CHANGE;
4023 printf("%c%c %s\n", status, staged_status, path);
4027 static const struct got_error *
4028 cmd_remove(int argc, char *argv[])
4030 const struct got_error *error = NULL;
4031 struct got_worktree *worktree = NULL;
4032 struct got_repository *repo = NULL;
4034 struct got_pathlist_head paths;
4035 struct got_pathlist_entry *pe;
4036 int ch, delete_local_mods = 0;
4040 while ((ch = getopt(argc, argv, "f")) != -1) {
4043 delete_local_mods = 1;
4055 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4062 cwd = getcwd(NULL, 0);
4064 error = got_error_from_errno("getcwd");
4067 error = got_worktree_open(&worktree, cwd);
4071 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4076 error = apply_unveil(got_repo_get_path(repo), 1,
4077 got_worktree_get_root_path(worktree));
4081 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4085 error = got_worktree_schedule_delete(worktree, &paths,
4086 delete_local_mods, print_remove_status, NULL, repo);
4091 got_repo_close(repo);
4093 got_worktree_close(worktree);
4094 TAILQ_FOREACH(pe, &paths, entry)
4095 free((char *)pe->path);
4096 got_pathlist_free(&paths);
4104 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4105 "path ...\n", getprogname());
4109 static const struct got_error *
4110 revert_progress(void *arg, unsigned char status, const char *path)
4112 while (path[0] == '/')
4114 printf("%c %s\n", status, path);
4118 struct choose_patch_arg {
4119 FILE *patch_script_file;
4123 static const struct got_error *
4124 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4125 int nchanges, const char *action)
4128 size_t linesize = 0;
4132 case GOT_STATUS_ADD:
4133 printf("A %s\n%s this addition? [y/n] ", path, action);
4135 case GOT_STATUS_DELETE:
4136 printf("D %s\n%s this deletion? [y/n] ", path, action);
4138 case GOT_STATUS_MODIFY:
4139 if (fseek(patch_file, 0L, SEEK_SET) == -1)
4140 return got_error_from_errno("fseek");
4141 printf(GOT_COMMIT_SEP_STR);
4142 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4144 if (ferror(patch_file))
4145 return got_error_from_errno("getline");
4146 printf(GOT_COMMIT_SEP_STR);
4147 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4148 path, n, nchanges, action);
4151 return got_error_path(path, GOT_ERR_FILE_STATUS);
4157 static const struct got_error *
4158 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4159 FILE *patch_file, int n, int nchanges)
4161 const struct got_error *err = NULL;
4163 size_t linesize = 0;
4166 struct choose_patch_arg *a = arg;
4168 *choice = GOT_PATCH_CHOICE_NONE;
4170 if (a->patch_script_file) {
4172 err = show_change(status, path, patch_file, n, nchanges,
4176 linelen = getline(&line, &linesize, a->patch_script_file);
4177 if (linelen == -1) {
4178 if (ferror(a->patch_script_file))
4179 return got_error_from_errno("getline");
4182 nl = strchr(line, '\n');
4185 if (strcmp(line, "y") == 0) {
4186 *choice = GOT_PATCH_CHOICE_YES;
4188 } else if (strcmp(line, "n") == 0) {
4189 *choice = GOT_PATCH_CHOICE_NO;
4191 } else if (strcmp(line, "q") == 0 &&
4192 status == GOT_STATUS_MODIFY) {
4193 *choice = GOT_PATCH_CHOICE_QUIT;
4196 printf("invalid response '%s'\n", line);
4201 while (resp != 'y' && resp != 'n' && resp != 'q') {
4202 err = show_change(status, path, patch_file, n, nchanges,
4209 if (status == GOT_STATUS_MODIFY) {
4210 if (resp != 'y' && resp != 'n' && resp != 'q') {
4211 printf("invalid response '%c'\n", resp);
4214 } else if (resp != 'y' && resp != 'n') {
4215 printf("invalid response '%c'\n", resp);
4221 *choice = GOT_PATCH_CHOICE_YES;
4222 else if (resp == 'n')
4223 *choice = GOT_PATCH_CHOICE_NO;
4224 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4225 *choice = GOT_PATCH_CHOICE_QUIT;
4231 static const struct got_error *
4232 cmd_revert(int argc, char *argv[])
4234 const struct got_error *error = NULL;
4235 struct got_worktree *worktree = NULL;
4236 struct got_repository *repo = NULL;
4237 char *cwd = NULL, *path = NULL;
4238 struct got_pathlist_head paths;
4239 struct got_pathlist_entry *pe;
4240 int ch, can_recurse = 0, pflag = 0;
4241 FILE *patch_script_file = NULL;
4242 const char *patch_script_path = NULL;
4243 struct choose_patch_arg cpa;
4247 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4253 patch_script_path = optarg;
4268 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4269 "unveil", NULL) == -1)
4274 if (patch_script_path && !pflag)
4275 errx(1, "-F option can only be used together with -p option");
4277 cwd = getcwd(NULL, 0);
4279 error = got_error_from_errno("getcwd");
4282 error = got_worktree_open(&worktree, cwd);
4286 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4291 if (patch_script_path) {
4292 patch_script_file = fopen(patch_script_path, "r");
4293 if (patch_script_file == NULL) {
4294 error = got_error_from_errno2("fopen",
4299 error = apply_unveil(got_repo_get_path(repo), 1,
4300 got_worktree_get_root_path(worktree));
4304 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4311 TAILQ_FOREACH(pe, &paths, entry) {
4312 if (asprintf(&ondisk_path, "%s/%s",
4313 got_worktree_get_root_path(worktree),
4315 error = got_error_from_errno("asprintf");
4318 if (lstat(ondisk_path, &sb) == -1) {
4319 if (errno == ENOENT) {
4323 error = got_error_from_errno2("lstat",
4329 if (S_ISDIR(sb.st_mode)) {
4330 error = got_error_msg(GOT_ERR_BAD_PATH,
4331 "reverting directories requires -R option");
4337 cpa.patch_script_file = patch_script_file;
4338 cpa.action = "revert";
4339 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4340 pflag ? choose_patch : NULL, &cpa, repo);
4344 if (patch_script_file && fclose(patch_script_file) == EOF &&
4346 error = got_error_from_errno2("fclose", patch_script_path);
4348 got_repo_close(repo);
4350 got_worktree_close(worktree);
4359 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4364 struct collect_commit_logmsg_arg {
4365 const char *cmdline_log;
4367 const char *worktree_path;
4368 const char *branch_name;
4369 const char *repo_path;
4374 static const struct got_error *
4375 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4378 char *initial_content = NULL;
4379 struct got_pathlist_entry *pe;
4380 const struct got_error *err = NULL;
4381 char *template = NULL;
4382 struct collect_commit_logmsg_arg *a = arg;
4386 /* if a message was specified on the command line, just use it */
4387 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4388 len = strlen(a->cmdline_log) + 1;
4389 *logmsg = malloc(len + 1);
4390 if (*logmsg == NULL)
4391 return got_error_from_errno("malloc");
4392 strlcpy(*logmsg, a->cmdline_log, len);
4396 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4397 return got_error_from_errno("asprintf");
4399 if (asprintf(&initial_content,
4400 "\n# changes to be committed on branch %s:\n",
4401 a->branch_name) == -1)
4402 return got_error_from_errno("asprintf");
4404 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4408 dprintf(fd, initial_content);
4410 TAILQ_FOREACH(pe, commitable_paths, entry) {
4411 struct got_commitable *ct = pe->data;
4412 dprintf(fd, "# %c %s\n",
4413 got_commitable_get_status(ct),
4414 got_commitable_get_path(ct));
4418 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4420 if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
4421 unlink(a->logmsg_path);
4422 free(a->logmsg_path);
4423 a->logmsg_path = NULL;
4425 free(initial_content);
4428 /* Editor is done; we can now apply unveil(2) */
4430 err = apply_unveil(a->repo_path, 0, a->worktree_path);
4439 static const struct got_error *
4440 cmd_commit(int argc, char *argv[])
4442 const struct got_error *error = NULL;
4443 struct got_worktree *worktree = NULL;
4444 struct got_repository *repo = NULL;
4445 char *cwd = NULL, *id_str = NULL;
4446 struct got_object_id *id = NULL;
4447 const char *logmsg = NULL;
4448 struct collect_commit_logmsg_arg cl_arg;
4449 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
4450 int ch, rebase_in_progress, histedit_in_progress;
4451 struct got_pathlist_head paths;
4454 cl_arg.logmsg_path = NULL;
4456 while ((ch = getopt(argc, argv, "m:")) != -1) {
4471 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4472 "unveil", NULL) == -1)
4475 cwd = getcwd(NULL, 0);
4477 error = got_error_from_errno("getcwd");
4480 error = got_worktree_open(&worktree, cwd);
4484 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4487 if (rebase_in_progress) {
4488 error = got_error(GOT_ERR_REBASING);
4492 error = got_worktree_histedit_in_progress(&histedit_in_progress,
4497 error = get_gitconfig_path(&gitconfig_path);
4500 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4505 error = get_author(&author, repo);
4510 * unveil(2) traverses exec(2); if an editor is used we have
4511 * to apply unveil after the log message has been written.
4513 if (logmsg == NULL || strlen(logmsg) == 0)
4514 error = get_editor(&editor);
4516 error = apply_unveil(got_repo_get_path(repo), 0,
4517 got_worktree_get_root_path(worktree));
4521 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4525 cl_arg.editor = editor;
4526 cl_arg.cmdline_log = logmsg;
4527 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4528 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4529 if (!histedit_in_progress) {
4530 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4531 error = got_error(GOT_ERR_COMMIT_BRANCH);
4534 cl_arg.branch_name += 11;
4536 cl_arg.repo_path = got_repo_get_path(repo);
4537 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4538 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4540 if (cl_arg.logmsg_path)
4541 fprintf(stderr, "%s: log message preserved in %s\n",
4542 getprogname(), cl_arg.logmsg_path);
4546 if (cl_arg.logmsg_path)
4547 unlink(cl_arg.logmsg_path);
4549 error = got_object_id_str(&id_str, id);
4552 printf("Created commit %s\n", id_str);
4554 free(cl_arg.logmsg_path);
4556 got_repo_close(repo);
4558 got_worktree_close(worktree);
4561 free(gitconfig_path);
4568 usage_cherrypick(void)
4570 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4574 static const struct got_error *
4575 cmd_cherrypick(int argc, char *argv[])
4577 const struct got_error *error = NULL;
4578 struct got_worktree *worktree = NULL;
4579 struct got_repository *repo = NULL;
4580 char *cwd = NULL, *commit_id_str = NULL;
4581 struct got_object_id *commit_id = NULL;
4582 struct got_commit_object *commit = NULL;
4583 struct got_object_qid *pid;
4584 struct got_reference *head_ref = NULL;
4585 int ch, did_something = 0;
4587 while ((ch = getopt(argc, argv, "")) != -1) {
4599 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4600 "unveil", NULL) == -1)
4606 cwd = getcwd(NULL, 0);
4608 error = got_error_from_errno("getcwd");
4611 error = got_worktree_open(&worktree, cwd);
4615 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4620 error = apply_unveil(got_repo_get_path(repo), 0,
4621 got_worktree_get_root_path(worktree));
4625 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4626 GOT_OBJ_TYPE_COMMIT, repo);
4627 if (error != NULL) {
4628 struct got_reference *ref;
4629 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4631 error = got_ref_open(&ref, repo, argv[0], 0);
4634 error = got_ref_resolve(&commit_id, repo, ref);
4639 error = got_object_id_str(&commit_id_str, commit_id);
4643 error = got_ref_open(&head_ref, repo,
4644 got_worktree_get_head_ref_name(worktree), 0);
4648 error = check_same_branch(commit_id, head_ref, NULL, repo);
4650 if (error->code != GOT_ERR_ANCESTRY)
4654 error = got_error(GOT_ERR_SAME_BRANCH);
4658 error = got_object_open_as_commit(&commit, repo, commit_id);
4661 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4662 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4663 commit_id, repo, update_progress, &did_something, check_cancelled,
4669 printf("Merged commit %s\n", commit_id_str);
4672 got_object_commit_close(commit);
4673 free(commit_id_str);
4675 got_ref_close(head_ref);
4677 got_worktree_close(worktree);
4679 got_repo_close(repo);
4686 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4690 static const struct got_error *
4691 cmd_backout(int argc, char *argv[])
4693 const struct got_error *error = NULL;
4694 struct got_worktree *worktree = NULL;
4695 struct got_repository *repo = NULL;
4696 char *cwd = NULL, *commit_id_str = NULL;
4697 struct got_object_id *commit_id = NULL;
4698 struct got_commit_object *commit = NULL;
4699 struct got_object_qid *pid;
4700 struct got_reference *head_ref = NULL;
4701 int ch, did_something = 0;
4703 while ((ch = getopt(argc, argv, "")) != -1) {
4715 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4716 "unveil", NULL) == -1)
4722 cwd = getcwd(NULL, 0);
4724 error = got_error_from_errno("getcwd");
4727 error = got_worktree_open(&worktree, cwd);
4731 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4736 error = apply_unveil(got_repo_get_path(repo), 0,
4737 got_worktree_get_root_path(worktree));
4741 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4742 GOT_OBJ_TYPE_COMMIT, repo);
4743 if (error != NULL) {
4744 struct got_reference *ref;
4745 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4747 error = got_ref_open(&ref, repo, argv[0], 0);
4750 error = got_ref_resolve(&commit_id, repo, ref);
4755 error = got_object_id_str(&commit_id_str, commit_id);
4759 error = got_ref_open(&head_ref, repo,
4760 got_worktree_get_head_ref_name(worktree), 0);
4764 error = check_same_branch(commit_id, head_ref, NULL, repo);
4768 error = got_object_open_as_commit(&commit, repo, commit_id);
4771 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4773 error = got_error(GOT_ERR_ROOT_COMMIT);
4777 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4778 update_progress, &did_something, check_cancelled, NULL);
4783 printf("Backed out commit %s\n", commit_id_str);
4786 got_object_commit_close(commit);
4787 free(commit_id_str);
4789 got_ref_close(head_ref);
4791 got_worktree_close(worktree);
4793 got_repo_close(repo);
4800 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4806 trim_logmsg(char *logmsg, int limit)
4811 len = strlen(logmsg);
4815 nl = strchr(logmsg, '\n');
4820 static const struct got_error *
4821 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4823 const struct got_error *err;
4824 char *logmsg0 = NULL;
4827 err = got_object_commit_get_logmsg(&logmsg0, commit);
4832 while (isspace((unsigned char)s[0]))
4835 *logmsg = strdup(s);
4836 if (*logmsg == NULL) {
4837 err = got_error_from_errno("strdup");
4841 trim_logmsg(*logmsg, limit);
4847 static const struct got_error *
4848 show_rebase_progress(struct got_commit_object *commit,
4849 struct got_object_id *old_id, struct got_object_id *new_id)
4851 const struct got_error *err;
4852 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4854 err = got_object_id_str(&old_id_str, old_id);
4859 err = got_object_id_str(&new_id_str, new_id);
4864 old_id_str[12] = '\0';
4866 new_id_str[12] = '\0';
4868 err = get_short_logmsg(&logmsg, 42, commit);
4872 printf("%s -> %s: %s\n", old_id_str,
4873 new_id_str ? new_id_str : "no-op change", logmsg);
4880 static const struct got_error *
4881 rebase_progress(void *arg, unsigned char status, const char *path)
4883 unsigned char *rebase_status = arg;
4885 while (path[0] == '/')
4887 printf("%c %s\n", status, path);
4889 if (*rebase_status == GOT_STATUS_CONFLICT)
4891 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
4892 *rebase_status = status;
4896 static const struct got_error *
4897 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
4898 struct got_reference *branch, struct got_reference *new_base_branch,
4899 struct got_reference *tmp_branch, struct got_repository *repo)
4901 printf("Switching work tree to %s\n", got_ref_get_name(branch));
4902 return got_worktree_rebase_complete(worktree, fileindex,
4903 new_base_branch, tmp_branch, branch, repo);
4906 static const struct got_error *
4907 rebase_commit(struct got_pathlist_head *merged_paths,
4908 struct got_worktree *worktree, struct got_fileindex *fileindex,
4909 struct got_reference *tmp_branch,
4910 struct got_object_id *commit_id, struct got_repository *repo)
4912 const struct got_error *error;
4913 struct got_commit_object *commit;
4914 struct got_object_id *new_commit_id;
4916 error = got_object_open_as_commit(&commit, repo, commit_id);
4920 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4921 worktree, fileindex, tmp_branch, commit, commit_id, repo);
4923 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4925 error = show_rebase_progress(commit, commit_id, NULL);
4927 error = show_rebase_progress(commit, commit_id, new_commit_id);
4928 free(new_commit_id);
4931 got_object_commit_close(commit);
4935 struct check_path_prefix_arg {
4936 const char *path_prefix;
4941 static const struct got_error *
4942 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4943 struct got_blob_object *blob2, struct got_object_id *id1,
4944 struct got_object_id *id2, const char *path1, const char *path2,
4945 struct got_repository *repo)
4947 struct check_path_prefix_arg *a = arg;
4949 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4950 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4951 return got_error(a->errcode);
4956 static const struct got_error *
4957 check_path_prefix(struct got_object_id *parent_id,
4958 struct got_object_id *commit_id, const char *path_prefix,
4959 int errcode, struct got_repository *repo)
4961 const struct got_error *err;
4962 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4963 struct got_commit_object *commit = NULL, *parent_commit = NULL;
4964 struct check_path_prefix_arg cpp_arg;
4966 if (got_path_is_root_dir(path_prefix))
4969 err = got_object_open_as_commit(&commit, repo, commit_id);
4973 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4977 err = got_object_open_as_tree(&tree1, repo,
4978 got_object_commit_get_tree_id(parent_commit));
4982 err = got_object_open_as_tree(&tree2, repo,
4983 got_object_commit_get_tree_id(commit));
4987 cpp_arg.path_prefix = path_prefix;
4988 while (cpp_arg.path_prefix[0] == '/')
4989 cpp_arg.path_prefix++;
4990 cpp_arg.len = strlen(cpp_arg.path_prefix);
4991 cpp_arg.errcode = errcode;
4992 err = got_diff_tree(tree1, tree2, "", "", repo,
4993 check_path_prefix_in_diff, &cpp_arg, 0);
4996 got_object_tree_close(tree1);
4998 got_object_tree_close(tree2);
5000 got_object_commit_close(commit);
5002 got_object_commit_close(parent_commit);
5006 static const struct got_error *
5007 collect_commits(struct got_object_id_queue *commits,
5008 struct got_object_id *initial_commit_id,
5009 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
5010 const char *path_prefix, int path_prefix_errcode,
5011 struct got_repository *repo)
5013 const struct got_error *err = NULL;
5014 struct got_commit_graph *graph = NULL;
5015 struct got_object_id *parent_id = NULL;
5016 struct got_object_qid *qid;
5017 struct got_object_id *commit_id = initial_commit_id;
5019 err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
5023 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
5024 check_cancelled, NULL);
5027 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
5028 err = got_commit_graph_iter_next(&parent_id, graph);
5030 if (err->code == GOT_ERR_ITER_COMPLETED) {
5031 err = got_error_msg(GOT_ERR_ANCESTRY,
5032 "ran out of commits to rebase before "
5033 "youngest common ancestor commit has "
5036 } else if (err->code != GOT_ERR_ITER_NEED_MORE)
5038 err = got_commit_graph_fetch_commits(graph, 1, repo,
5039 check_cancelled, NULL);
5043 err = check_path_prefix(parent_id, commit_id,
5044 path_prefix, path_prefix_errcode, repo);
5048 err = got_object_qid_alloc(&qid, commit_id);
5051 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
5052 commit_id = parent_id;
5056 got_commit_graph_close(graph);
5060 static const struct got_error *
5061 cmd_rebase(int argc, char *argv[])
5063 const struct got_error *error = NULL;
5064 struct got_worktree *worktree = NULL;
5065 struct got_repository *repo = NULL;
5066 struct got_fileindex *fileindex = NULL;
5068 struct got_reference *branch = NULL;
5069 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
5070 struct got_object_id *commit_id = NULL, *parent_id = NULL;
5071 struct got_object_id *resume_commit_id = NULL;
5072 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
5073 struct got_commit_object *commit = NULL;
5074 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
5075 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5076 struct got_object_id_queue commits;
5077 struct got_pathlist_head merged_paths;
5078 const struct got_object_id_queue *parent_ids;
5079 struct got_object_qid *qid, *pid;
5081 SIMPLEQ_INIT(&commits);
5082 TAILQ_INIT(&merged_paths);
5084 while ((ch = getopt(argc, argv, "ac")) != -1) {
5090 continue_rebase = 1;
5102 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5103 "unveil", NULL) == -1)
5106 if (abort_rebase && continue_rebase)
5108 else if (abort_rebase || continue_rebase) {
5111 } else if (argc != 1)
5114 cwd = getcwd(NULL, 0);
5116 error = got_error_from_errno("getcwd");
5119 error = got_worktree_open(&worktree, cwd);
5123 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5128 error = apply_unveil(got_repo_get_path(repo), 0,
5129 got_worktree_get_root_path(worktree));
5133 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5139 if (!rebase_in_progress) {
5140 error = got_error(GOT_ERR_NOT_REBASING);
5143 error = got_worktree_rebase_continue(&resume_commit_id,
5144 &new_base_branch, &tmp_branch, &branch, &fileindex,
5148 printf("Switching work tree to %s\n",
5149 got_ref_get_symref_target(new_base_branch));
5150 error = got_worktree_rebase_abort(worktree, fileindex, repo,
5151 new_base_branch, update_progress, &did_something);
5154 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5155 goto done; /* nothing else to do */
5158 if (continue_rebase) {
5159 if (!rebase_in_progress) {
5160 error = got_error(GOT_ERR_NOT_REBASING);
5163 error = got_worktree_rebase_continue(&resume_commit_id,
5164 &new_base_branch, &tmp_branch, &branch, &fileindex,
5169 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5170 resume_commit_id, repo);
5174 yca_id = got_object_id_dup(resume_commit_id);
5175 if (yca_id == NULL) {
5176 error = got_error_from_errno("got_object_id_dup");
5180 error = got_ref_open(&branch, repo, argv[0], 0);
5185 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5189 if (!continue_rebase) {
5190 struct got_object_id *base_commit_id;
5192 base_commit_id = got_worktree_get_base_commit_id(worktree);
5193 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5194 base_commit_id, branch_head_commit_id, repo,
5195 check_cancelled, NULL);
5198 if (yca_id == NULL) {
5199 error = got_error_msg(GOT_ERR_ANCESTRY,
5200 "specified branch shares no common ancestry "
5201 "with work tree's branch");
5205 error = check_same_branch(base_commit_id, branch, yca_id, repo);
5207 if (error->code != GOT_ERR_ANCESTRY)
5211 error = got_error_msg(GOT_ERR_SAME_BRANCH,
5212 "specified branch resolves to a commit which "
5213 "is already contained in work tree's branch");
5216 error = got_worktree_rebase_prepare(&new_base_branch,
5217 &tmp_branch, &fileindex, worktree, branch, repo);
5222 commit_id = branch_head_commit_id;
5223 error = got_object_open_as_commit(&commit, repo, commit_id);
5227 parent_ids = got_object_commit_get_parent_ids(commit);
5228 pid = SIMPLEQ_FIRST(parent_ids);
5230 if (!continue_rebase) {
5232 error = got_worktree_rebase_abort(worktree, fileindex,
5233 repo, new_base_branch, update_progress,
5237 printf("Rebase of %s aborted\n",
5238 got_ref_get_name(branch));
5240 error = got_error(GOT_ERR_EMPTY_REBASE);
5243 error = collect_commits(&commits, commit_id, pid->id,
5244 yca_id, got_worktree_get_path_prefix(worktree),
5245 GOT_ERR_REBASE_PATH, repo);
5246 got_object_commit_close(commit);
5251 if (SIMPLEQ_EMPTY(&commits)) {
5252 if (continue_rebase)
5253 error = rebase_complete(worktree, fileindex,
5254 branch, new_base_branch, tmp_branch, repo);
5256 error = got_error(GOT_ERR_EMPTY_REBASE);
5261 SIMPLEQ_FOREACH(qid, &commits, entry) {
5262 commit_id = qid->id;
5263 parent_id = pid ? pid->id : yca_id;
5266 error = got_worktree_rebase_merge_files(&merged_paths,
5267 worktree, fileindex, parent_id, commit_id, repo,
5268 rebase_progress, &rebase_status, check_cancelled, NULL);
5272 if (rebase_status == GOT_STATUS_CONFLICT) {
5273 got_worktree_rebase_pathlist_free(&merged_paths);
5277 error = rebase_commit(&merged_paths, worktree, fileindex,
5278 tmp_branch, commit_id, repo);
5279 got_worktree_rebase_pathlist_free(&merged_paths);
5284 if (rebase_status == GOT_STATUS_CONFLICT) {
5285 error = got_worktree_rebase_postpone(worktree, fileindex);
5288 error = got_error_msg(GOT_ERR_CONFLICTS,
5289 "conflicts must be resolved before rebasing can continue");
5291 error = rebase_complete(worktree, fileindex, branch,
5292 new_base_branch, tmp_branch, repo);
5294 got_object_id_queue_free(&commits);
5295 free(branch_head_commit_id);
5296 free(resume_commit_id);
5299 got_object_commit_close(commit);
5301 got_ref_close(branch);
5302 if (new_base_branch)
5303 got_ref_close(new_base_branch);
5305 got_ref_close(tmp_branch);
5307 got_worktree_close(worktree);
5309 got_repo_close(repo);
5314 usage_histedit(void)
5316 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5321 #define GOT_HISTEDIT_PICK 'p'
5322 #define GOT_HISTEDIT_EDIT 'e'
5323 #define GOT_HISTEDIT_FOLD 'f'
5324 #define GOT_HISTEDIT_DROP 'd'
5325 #define GOT_HISTEDIT_MESG 'm'
5327 static struct got_histedit_cmd {
5331 } got_histedit_cmds[] = {
5332 { GOT_HISTEDIT_PICK, "pick", "use commit" },
5333 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5334 { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5335 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5336 { GOT_HISTEDIT_MESG, "mesg",
5337 "single-line log message for commit above (open editor if empty)" },
5340 struct got_histedit_list_entry {
5341 TAILQ_ENTRY(got_histedit_list_entry) entry;
5342 struct got_object_id *commit_id;
5343 const struct got_histedit_cmd *cmd;
5346 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5348 static const struct got_error *
5349 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5350 FILE *f, struct got_repository *repo)
5352 const struct got_error *err = NULL;
5353 char *logmsg = NULL, *id_str = NULL;
5354 struct got_commit_object *commit = NULL;
5357 err = got_object_open_as_commit(&commit, repo, commit_id);
5361 err = get_short_logmsg(&logmsg, 34, commit);
5365 err = got_object_id_str(&id_str, commit_id);
5369 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5371 err = got_ferror(f, GOT_ERR_IO);
5374 got_object_commit_close(commit);
5380 static const struct got_error *
5381 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5382 struct got_repository *repo)
5384 const struct got_error *err = NULL;
5385 struct got_object_qid *qid;
5387 if (SIMPLEQ_EMPTY(commits))
5388 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5390 SIMPLEQ_FOREACH(qid, commits, entry) {
5391 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5400 static const struct got_error *
5401 write_cmd_list(FILE *f)
5403 const struct got_error *err = NULL;
5406 n = fprintf(f, "# Available histedit commands:\n");
5408 return got_ferror(f, GOT_ERR_IO);
5410 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5411 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5412 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5415 err = got_ferror(f, GOT_ERR_IO);
5419 n = fprintf(f, "# Commits will be processed in order from top to "
5420 "bottom of this file.\n");
5422 return got_ferror(f, GOT_ERR_IO);
5426 static const struct got_error *
5427 histedit_syntax_error(int lineno)
5429 static char msg[42];
5432 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5434 if (ret == -1 || ret >= sizeof(msg))
5435 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5437 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5440 static const struct got_error *
5441 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5442 char *logmsg, struct got_repository *repo)
5444 const struct got_error *err;
5445 struct got_commit_object *folded_commit = NULL;
5446 char *id_str, *folded_logmsg = NULL;
5448 err = got_object_id_str(&id_str, hle->commit_id);
5452 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5456 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5459 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5460 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5461 folded_logmsg) == -1) {
5462 err = got_error_from_errno("asprintf");
5467 got_object_commit_close(folded_commit);
5469 free(folded_logmsg);
5473 static struct got_histedit_list_entry *
5474 get_folded_commits(struct got_histedit_list_entry *hle)
5476 struct got_histedit_list_entry *prev, *folded = NULL;
5478 prev = TAILQ_PREV(hle, got_histedit_list, entry);
5479 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5480 prev->cmd->code == GOT_HISTEDIT_DROP)) {
5481 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5483 prev = TAILQ_PREV(prev, got_histedit_list, entry);
5489 static const struct got_error *
5490 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5491 struct got_repository *repo)
5493 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5494 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5495 const struct got_error *err = NULL;
5496 struct got_commit_object *commit = NULL;
5498 struct got_histedit_list_entry *folded = NULL;
5500 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5504 folded = get_folded_commits(hle);
5506 while (folded != hle) {
5507 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5508 folded = TAILQ_NEXT(folded, entry);
5511 err = append_folded_commit_msg(&new_msg, folded,
5517 folded = TAILQ_NEXT(folded, entry);
5521 err = got_object_id_str(&id_str, hle->commit_id);
5524 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5527 if (asprintf(&new_msg,
5528 "%s\n# original log message of commit %s: %s",
5529 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5530 err = got_error_from_errno("asprintf");
5536 err = got_object_id_str(&id_str, hle->commit_id);
5540 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5544 dprintf(fd, logmsg);
5547 err = get_editor(&editor);
5551 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5553 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5555 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5558 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5559 err = got_error_from_errno2("unlink", logmsg_path);
5565 got_object_commit_close(commit);
5569 static const struct got_error *
5570 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5571 FILE *f, struct got_repository *repo)
5573 const struct got_error *err = NULL;
5574 char *line = NULL, *p, *end;
5578 const struct got_histedit_cmd *cmd;
5579 struct got_object_id *commit_id = NULL;
5580 struct got_histedit_list_entry *hle = NULL;
5583 len = getline(&line, &size, f);
5585 const struct got_error *getline_err;
5588 getline_err = got_error_from_errno("getline");
5589 err = got_ferror(f, getline_err->code);
5594 while (isspace((unsigned char)p[0]))
5596 if (p[0] == '#' || p[0] == '\0') {
5602 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5603 cmd = &got_histedit_cmds[i];
5604 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5605 isspace((unsigned char)p[strlen(cmd->name)])) {
5606 p += strlen(cmd->name);
5609 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5614 if (i == nitems(got_histedit_cmds)) {
5615 err = histedit_syntax_error(lineno);
5618 while (isspace((unsigned char)p[0]))
5620 if (cmd->code == GOT_HISTEDIT_MESG) {
5621 if (hle == NULL || hle->logmsg != NULL) {
5622 err = got_error(GOT_ERR_HISTEDIT_CMD);
5626 err = histedit_edit_logmsg(hle, repo);
5630 hle->logmsg = strdup(p);
5631 if (hle->logmsg == NULL) {
5632 err = got_error_from_errno("strdup");
5641 while (end[0] && !isspace((unsigned char)end[0]))
5645 err = got_object_resolve_id_str(&commit_id, repo, p);
5647 /* override error code */
5648 err = histedit_syntax_error(lineno);
5652 hle = malloc(sizeof(*hle));
5654 err = got_error_from_errno("malloc");
5658 hle->commit_id = commit_id;
5663 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5671 static const struct got_error *
5672 histedit_check_script(struct got_histedit_list *histedit_cmds,
5673 struct got_object_id_queue *commits, struct got_repository *repo)
5675 const struct got_error *err = NULL;
5676 struct got_object_qid *qid;
5677 struct got_histedit_list_entry *hle;
5678 static char msg[80];
5681 if (TAILQ_EMPTY(histedit_cmds))
5682 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5683 "histedit script contains no commands");
5684 if (SIMPLEQ_EMPTY(commits))
5685 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5687 SIMPLEQ_FOREACH(qid, commits, entry) {
5688 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5689 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5693 err = got_object_id_str(&id_str, qid->id);
5696 snprintf(msg, sizeof(msg),
5697 "commit %s missing from histedit script", id_str);
5699 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5703 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5704 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5705 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5706 "last commit in histedit script cannot be folded");
5711 static const struct got_error *
5712 histedit_run_editor(struct got_histedit_list *histedit_cmds,
5713 const char *path, struct got_object_id_queue *commits,
5714 struct got_repository *repo)
5716 const struct got_error *err = NULL;
5720 err = get_editor(&editor);
5724 if (spawn_editor(editor, path) == -1) {
5725 err = got_error_from_errno("failed spawning editor");
5729 f = fopen(path, "r");
5731 err = got_error_from_errno("fopen");
5734 err = histedit_parse_list(histedit_cmds, f, repo);
5738 err = histedit_check_script(histedit_cmds, commits, repo);
5740 if (f && fclose(f) != 0 && err == NULL)
5741 err = got_error_from_errno("fclose");
5746 static const struct got_error *
5747 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5748 struct got_object_id_queue *, const char *, struct got_repository *);
5750 static const struct got_error *
5751 histedit_edit_script(struct got_histedit_list *histedit_cmds,
5752 struct got_object_id_queue *commits, struct got_repository *repo)
5754 const struct got_error *err;
5758 err = got_opentemp_named(&path, &f, "got-histedit");
5762 err = write_cmd_list(f);
5766 err = histedit_write_commit_list(commits, f, repo);
5770 if (fclose(f) != 0) {
5771 err = got_error_from_errno("fclose");
5776 err = histedit_run_editor(histedit_cmds, path, commits, repo);
5778 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5779 err->code != GOT_ERR_HISTEDIT_CMD)
5781 err = histedit_edit_list_retry(histedit_cmds, err,
5782 commits, path, repo);
5785 if (f && fclose(f) != 0 && err == NULL)
5786 err = got_error_from_errno("fclose");
5787 if (path && unlink(path) != 0 && err == NULL)
5788 err = got_error_from_errno2("unlink", path);
5793 static const struct got_error *
5794 histedit_save_list(struct got_histedit_list *histedit_cmds,
5795 struct got_worktree *worktree, struct got_repository *repo)
5797 const struct got_error *err = NULL;
5800 struct got_histedit_list_entry *hle;
5801 struct got_commit_object *commit = NULL;
5803 err = got_worktree_get_histedit_script_path(&path, worktree);
5807 f = fopen(path, "w");
5809 err = got_error_from_errno2("fopen", path);
5812 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5813 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5819 int n = fprintf(f, "%c %s\n",
5820 GOT_HISTEDIT_MESG, hle->logmsg);
5822 err = got_ferror(f, GOT_ERR_IO);
5828 if (f && fclose(f) != 0 && err == NULL)
5829 err = got_error_from_errno("fclose");
5832 got_object_commit_close(commit);
5837 histedit_free_list(struct got_histedit_list *histedit_cmds)
5839 struct got_histedit_list_entry *hle;
5841 while ((hle = TAILQ_FIRST(histedit_cmds))) {
5842 TAILQ_REMOVE(histedit_cmds, hle, entry);
5847 static const struct got_error *
5848 histedit_load_list(struct got_histedit_list *histedit_cmds,
5849 const char *path, struct got_repository *repo)
5851 const struct got_error *err = NULL;
5854 f = fopen(path, "r");
5856 err = got_error_from_errno2("fopen", path);
5860 err = histedit_parse_list(histedit_cmds, f, repo);
5862 if (f && fclose(f) != 0 && err == NULL)
5863 err = got_error_from_errno("fclose");
5867 static const struct got_error *
5868 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
5869 const struct got_error *edit_err, struct got_object_id_queue *commits,
5870 const char *path, struct got_repository *repo)
5872 const struct got_error *err = NULL, *prev_err = edit_err;
5875 while (resp != 'c' && resp != 'r' && resp != 'a') {
5876 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
5877 "or (a)bort: ", getprogname(), prev_err->msg);
5882 histedit_free_list(histedit_cmds);
5883 err = histedit_run_editor(histedit_cmds, path, commits,
5886 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5887 err->code != GOT_ERR_HISTEDIT_CMD)
5894 } else if (resp == 'r') {
5895 histedit_free_list(histedit_cmds);
5896 err = histedit_edit_script(histedit_cmds,
5899 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5900 err->code != GOT_ERR_HISTEDIT_CMD)
5907 } else if (resp == 'a') {
5908 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5911 printf("invalid response '%c'\n", resp);
5917 static const struct got_error *
5918 histedit_complete(struct got_worktree *worktree,
5919 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5920 struct got_reference *branch, struct got_repository *repo)
5922 printf("Switching work tree to %s\n",
5923 got_ref_get_symref_target(branch));
5924 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5928 static const struct got_error *
5929 show_histedit_progress(struct got_commit_object *commit,
5930 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5932 const struct got_error *err;
5933 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5935 err = got_object_id_str(&old_id_str, hle->commit_id);
5940 err = got_object_id_str(&new_id_str, new_id);
5945 old_id_str[12] = '\0';
5947 new_id_str[12] = '\0';
5950 logmsg = strdup(hle->logmsg);
5951 if (logmsg == NULL) {
5952 err = got_error_from_errno("strdup");
5955 trim_logmsg(logmsg, 42);
5957 err = get_short_logmsg(&logmsg, 42, commit);
5962 switch (hle->cmd->code) {
5963 case GOT_HISTEDIT_PICK:
5964 case GOT_HISTEDIT_EDIT:
5965 printf("%s -> %s: %s\n", old_id_str,
5966 new_id_str ? new_id_str : "no-op change", logmsg);
5968 case GOT_HISTEDIT_DROP:
5969 case GOT_HISTEDIT_FOLD:
5970 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5983 static const struct got_error *
5984 histedit_commit(struct got_pathlist_head *merged_paths,
5985 struct got_worktree *worktree, struct got_fileindex *fileindex,
5986 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5987 struct got_repository *repo)
5989 const struct got_error *err;
5990 struct got_commit_object *commit;
5991 struct got_object_id *new_commit_id;
5993 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5994 && hle->logmsg == NULL) {
5995 err = histedit_edit_logmsg(hle, repo);
6000 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
6004 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
6005 worktree, fileindex, tmp_branch, commit, hle->commit_id,
6008 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
6010 err = show_histedit_progress(commit, hle, NULL);
6012 err = show_histedit_progress(commit, hle, new_commit_id);
6013 free(new_commit_id);
6016 got_object_commit_close(commit);
6020 static const struct got_error *
6021 histedit_skip_commit(struct got_histedit_list_entry *hle,
6022 struct got_worktree *worktree, struct got_repository *repo)
6024 const struct got_error *error;
6025 struct got_commit_object *commit;
6027 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
6032 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
6036 error = show_histedit_progress(commit, hle, NULL);
6037 got_object_commit_close(commit);
6041 static const struct got_error *
6042 cmd_histedit(int argc, char *argv[])
6044 const struct got_error *error = NULL;
6045 struct got_worktree *worktree = NULL;
6046 struct got_fileindex *fileindex = NULL;
6047 struct got_repository *repo = NULL;
6049 struct got_reference *branch = NULL;
6050 struct got_reference *tmp_branch = NULL;
6051 struct got_object_id *resume_commit_id = NULL;
6052 struct got_object_id *base_commit_id = NULL;
6053 struct got_object_id *head_commit_id = NULL;
6054 struct got_commit_object *commit = NULL;
6055 int ch, rebase_in_progress = 0, did_something;
6056 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
6057 const char *edit_script_path = NULL;
6058 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6059 struct got_object_id_queue commits;
6060 struct got_pathlist_head merged_paths;
6061 const struct got_object_id_queue *parent_ids;
6062 struct got_object_qid *pid;
6063 struct got_histedit_list histedit_cmds;
6064 struct got_histedit_list_entry *hle;
6066 SIMPLEQ_INIT(&commits);
6067 TAILQ_INIT(&histedit_cmds);
6068 TAILQ_INIT(&merged_paths);
6070 while ((ch = getopt(argc, argv, "acF:")) != -1) {
6079 edit_script_path = optarg;
6091 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6092 "unveil", NULL) == -1)
6095 if (abort_edit && continue_edit)
6101 * This command cannot apply unveil(2) in all cases because the
6102 * user may choose to run an editor to edit the histedit script
6103 * and to edit individual commit log messages.
6104 * unveil(2) traverses exec(2); if an editor is used we have to
6105 * apply unveil after edit script and log messages have been written.
6106 * XXX TODO: Make use of unveil(2) where possible.
6109 cwd = getcwd(NULL, 0);
6111 error = got_error_from_errno("getcwd");
6114 error = got_worktree_open(&worktree, cwd);
6118 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6123 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6126 if (rebase_in_progress) {
6127 error = got_error(GOT_ERR_REBASING);
6131 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6135 if (edit_in_progress && abort_edit) {
6136 error = got_worktree_histedit_continue(&resume_commit_id,
6137 &tmp_branch, &branch, &base_commit_id, &fileindex,
6141 printf("Switching work tree to %s\n",
6142 got_ref_get_symref_target(branch));
6143 error = got_worktree_histedit_abort(worktree, fileindex, repo,
6144 branch, base_commit_id, update_progress, &did_something);
6147 printf("Histedit of %s aborted\n",
6148 got_ref_get_symref_target(branch));
6149 goto done; /* nothing else to do */
6150 } else if (abort_edit) {
6151 error = got_error(GOT_ERR_NOT_HISTEDIT);
6155 if (continue_edit) {
6158 if (!edit_in_progress) {
6159 error = got_error(GOT_ERR_NOT_HISTEDIT);
6163 error = got_worktree_get_histedit_script_path(&path, worktree);
6167 error = histedit_load_list(&histedit_cmds, path, repo);
6172 error = got_worktree_histedit_continue(&resume_commit_id,
6173 &tmp_branch, &branch, &base_commit_id, &fileindex,
6178 error = got_ref_resolve(&head_commit_id, repo, branch);
6182 error = got_object_open_as_commit(&commit, repo,
6186 parent_ids = got_object_commit_get_parent_ids(commit);
6187 pid = SIMPLEQ_FIRST(parent_ids);
6189 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6192 error = collect_commits(&commits, head_commit_id, pid->id,
6193 base_commit_id, got_worktree_get_path_prefix(worktree),
6194 GOT_ERR_HISTEDIT_PATH, repo);
6195 got_object_commit_close(commit);
6200 if (edit_in_progress) {
6201 error = got_error(GOT_ERR_HISTEDIT_BUSY);
6205 error = got_ref_open(&branch, repo,
6206 got_worktree_get_head_ref_name(worktree), 0);
6210 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6211 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6212 "will not edit commit history of a branch outside "
6213 "the \"refs/heads/\" reference namespace");
6217 error = got_ref_resolve(&head_commit_id, repo, branch);
6218 got_ref_close(branch);
6223 error = got_object_open_as_commit(&commit, repo,
6227 parent_ids = got_object_commit_get_parent_ids(commit);
6228 pid = SIMPLEQ_FIRST(parent_ids);
6230 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6233 error = collect_commits(&commits, head_commit_id, pid->id,
6234 got_worktree_get_base_commit_id(worktree),
6235 got_worktree_get_path_prefix(worktree),
6236 GOT_ERR_HISTEDIT_PATH, repo);
6237 got_object_commit_close(commit);
6242 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6243 &base_commit_id, &fileindex, worktree, repo);
6247 if (edit_script_path) {
6248 error = histedit_load_list(&histedit_cmds,
6249 edit_script_path, repo);
6251 got_worktree_histedit_abort(worktree, fileindex,
6252 repo, branch, base_commit_id,
6253 update_progress, &did_something);
6257 error = histedit_edit_script(&histedit_cmds, &commits,
6260 got_worktree_histedit_abort(worktree, fileindex,
6261 repo, branch, base_commit_id,
6262 update_progress, &did_something);
6268 error = histedit_save_list(&histedit_cmds, worktree,
6271 got_worktree_histedit_abort(worktree, fileindex,
6272 repo, branch, base_commit_id,
6273 update_progress, &did_something);
6279 error = histedit_check_script(&histedit_cmds, &commits, repo);
6283 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6284 if (resume_commit_id) {
6285 if (got_object_id_cmp(hle->commit_id,
6286 resume_commit_id) != 0)
6289 resume_commit_id = NULL;
6290 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6291 hle->cmd->code == GOT_HISTEDIT_FOLD) {
6292 error = histedit_skip_commit(hle, worktree,
6295 error = histedit_commit(NULL, worktree,
6296 fileindex, tmp_branch, hle, repo);
6303 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6304 error = histedit_skip_commit(hle, worktree, repo);
6310 error = got_object_open_as_commit(&commit, repo,
6314 parent_ids = got_object_commit_get_parent_ids(commit);
6315 pid = SIMPLEQ_FIRST(parent_ids);
6317 error = got_worktree_histedit_merge_files(&merged_paths,
6318 worktree, fileindex, pid->id, hle->commit_id, repo,
6319 rebase_progress, &rebase_status, check_cancelled, NULL);
6322 got_object_commit_close(commit);
6325 if (rebase_status == GOT_STATUS_CONFLICT) {
6326 got_worktree_rebase_pathlist_free(&merged_paths);
6330 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6332 error = got_object_id_str(&id_str, hle->commit_id);
6335 printf("Stopping histedit for amending commit %s\n",
6338 got_worktree_rebase_pathlist_free(&merged_paths);
6339 error = got_worktree_histedit_postpone(worktree,
6344 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6345 error = histedit_skip_commit(hle, worktree, repo);
6351 error = histedit_commit(&merged_paths, worktree, fileindex,
6352 tmp_branch, hle, repo);
6353 got_worktree_rebase_pathlist_free(&merged_paths);
6358 if (rebase_status == GOT_STATUS_CONFLICT) {
6359 error = got_worktree_histedit_postpone(worktree, fileindex);
6362 error = got_error_msg(GOT_ERR_CONFLICTS,
6363 "conflicts must be resolved before rebasing can continue");
6365 error = histedit_complete(worktree, fileindex, tmp_branch,
6368 got_object_id_queue_free(&commits);
6369 histedit_free_list(&histedit_cmds);
6370 free(head_commit_id);
6371 free(base_commit_id);
6372 free(resume_commit_id);
6374 got_object_commit_close(commit);
6376 got_ref_close(branch);
6378 got_ref_close(tmp_branch);
6380 got_worktree_close(worktree);
6382 got_repo_close(repo);
6389 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6390 "[file-path ...]\n",
6395 static const struct got_error *
6396 print_stage(void *arg, unsigned char status, unsigned char staged_status,
6397 const char *path, struct got_object_id *blob_id,
6398 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6400 const struct got_error *err = NULL;
6401 char *id_str = NULL;
6403 if (staged_status != GOT_STATUS_ADD &&
6404 staged_status != GOT_STATUS_MODIFY &&
6405 staged_status != GOT_STATUS_DELETE)
6408 if (staged_status == GOT_STATUS_ADD ||
6409 staged_status == GOT_STATUS_MODIFY)
6410 err = got_object_id_str(&id_str, staged_blob_id);
6412 err = got_object_id_str(&id_str, blob_id);
6416 printf("%s %c %s\n", id_str, staged_status, path);
6421 static const struct got_error *
6422 cmd_stage(int argc, char *argv[])
6424 const struct got_error *error = NULL;
6425 struct got_repository *repo = NULL;
6426 struct got_worktree *worktree = NULL;
6428 struct got_pathlist_head paths;
6429 struct got_pathlist_entry *pe;
6430 int ch, list_stage = 0, pflag = 0;
6431 FILE *patch_script_file = NULL;
6432 const char *patch_script_path = NULL;
6433 struct choose_patch_arg cpa;
6437 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6446 patch_script_path = optarg;
6458 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6459 "unveil", NULL) == -1)
6462 if (list_stage && (pflag || patch_script_path))
6463 errx(1, "-l option cannot be used with other options");
6464 if (patch_script_path && !pflag)
6465 errx(1, "-F option can only be used together with -p option");
6467 cwd = getcwd(NULL, 0);
6469 error = got_error_from_errno("getcwd");
6473 error = got_worktree_open(&worktree, cwd);
6477 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6482 if (patch_script_path) {
6483 patch_script_file = fopen(patch_script_path, "r");
6484 if (patch_script_file == NULL) {
6485 error = got_error_from_errno2("fopen",
6490 error = apply_unveil(got_repo_get_path(repo), 0,
6491 got_worktree_get_root_path(worktree));
6495 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6500 error = got_worktree_status(worktree, &paths, repo,
6501 print_stage, NULL, check_cancelled, NULL);
6503 cpa.patch_script_file = patch_script_file;
6504 cpa.action = "stage";
6505 error = got_worktree_stage(worktree, &paths,
6506 pflag ? NULL : print_status, NULL,
6507 pflag ? choose_patch : NULL, &cpa, repo);
6510 if (patch_script_file && fclose(patch_script_file) == EOF &&
6512 error = got_error_from_errno2("fclose", patch_script_path);
6514 got_repo_close(repo);
6516 got_worktree_close(worktree);
6517 TAILQ_FOREACH(pe, &paths, entry)
6518 free((char *)pe->path);
6519 got_pathlist_free(&paths);
6527 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6528 "[file-path ...]\n",
6534 static const struct got_error *
6535 cmd_unstage(int argc, char *argv[])
6537 const struct got_error *error = NULL;
6538 struct got_repository *repo = NULL;
6539 struct got_worktree *worktree = NULL;
6541 struct got_pathlist_head paths;
6542 struct got_pathlist_entry *pe;
6543 int ch, did_something = 0, pflag = 0;
6544 FILE *patch_script_file = NULL;
6545 const char *patch_script_path = NULL;
6546 struct choose_patch_arg cpa;
6550 while ((ch = getopt(argc, argv, "pF:")) != -1) {
6556 patch_script_path = optarg;
6568 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6569 "unveil", NULL) == -1)
6572 if (patch_script_path && !pflag)
6573 errx(1, "-F option can only be used together with -p option");
6575 cwd = getcwd(NULL, 0);
6577 error = got_error_from_errno("getcwd");
6581 error = got_worktree_open(&worktree, cwd);
6585 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6590 if (patch_script_path) {
6591 patch_script_file = fopen(patch_script_path, "r");
6592 if (patch_script_file == NULL) {
6593 error = got_error_from_errno2("fopen",
6599 error = apply_unveil(got_repo_get_path(repo), 0,
6600 got_worktree_get_root_path(worktree));
6604 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6608 cpa.patch_script_file = patch_script_file;
6609 cpa.action = "unstage";
6610 error = got_worktree_unstage(worktree, &paths, update_progress,
6611 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6613 if (patch_script_file && fclose(patch_script_file) == EOF &&
6615 error = got_error_from_errno2("fclose", patch_script_path);
6617 got_repo_close(repo);
6619 got_worktree_close(worktree);
6620 TAILQ_FOREACH(pe, &paths, entry)
6621 free((char *)pe->path);
6622 got_pathlist_free(&paths);
6630 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
6631 "arg1 [arg2 ...]\n", getprogname());
6635 static const struct got_error *
6636 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6638 const struct got_error *err;
6639 struct got_blob_object *blob;
6641 err = got_object_open_as_blob(&blob, repo, id, 8192);
6645 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6646 got_object_blob_close(blob);
6650 static const struct got_error *
6651 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6653 const struct got_error *err;
6654 struct got_tree_object *tree;
6655 const struct got_tree_entries *entries;
6656 struct got_tree_entry *te;
6658 err = got_object_open_as_tree(&tree, repo, id);
6662 entries = got_object_tree_get_entries(tree);
6663 te = SIMPLEQ_FIRST(&entries->head);
6666 if (sigint_received || sigpipe_received)
6668 err = got_object_id_str(&id_str, te->id);
6671 fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6673 te = SIMPLEQ_NEXT(te, entry);
6676 got_object_tree_close(tree);
6680 static const struct got_error *
6681 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6683 const struct got_error *err;
6684 struct got_commit_object *commit;
6685 const struct got_object_id_queue *parent_ids;
6686 struct got_object_qid *pid;
6687 char *id_str = NULL;
6688 const char *logmsg = NULL;
6690 err = got_object_open_as_commit(&commit, repo, id);
6694 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6698 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6699 parent_ids = got_object_commit_get_parent_ids(commit);
6700 fprintf(outfile, "numparents %d\n",
6701 got_object_commit_get_nparents(commit));
6702 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6704 err = got_object_id_str(&pid_str, pid->id);
6707 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6710 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6711 got_object_commit_get_author(commit),
6712 got_object_commit_get_author_time(commit));
6714 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
6715 got_object_commit_get_author(commit),
6716 got_object_commit_get_committer_time(commit));
6718 logmsg = got_object_commit_get_logmsg_raw(commit);
6719 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
6720 fprintf(outfile, "%s", logmsg);
6723 got_object_commit_close(commit);
6727 static const struct got_error *
6728 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6730 const struct got_error *err;
6731 struct got_tag_object *tag;
6732 char *id_str = NULL;
6733 const char *tagmsg = NULL;
6735 err = got_object_open_as_tag(&tag, repo, id);
6739 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
6743 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
6745 switch (got_object_tag_get_object_type(tag)) {
6746 case GOT_OBJ_TYPE_BLOB:
6747 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6748 GOT_OBJ_LABEL_BLOB);
6750 case GOT_OBJ_TYPE_TREE:
6751 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6752 GOT_OBJ_LABEL_TREE);
6754 case GOT_OBJ_TYPE_COMMIT:
6755 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6756 GOT_OBJ_LABEL_COMMIT);
6758 case GOT_OBJ_TYPE_TAG:
6759 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6766 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
6767 got_object_tag_get_name(tag));
6769 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
6770 got_object_tag_get_tagger(tag),
6771 got_object_tag_get_tagger_time(tag));
6773 tagmsg = got_object_tag_get_message(tag);
6774 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
6775 fprintf(outfile, "%s", tagmsg);
6778 got_object_tag_close(tag);
6782 static const struct got_error *
6783 cmd_cat(int argc, char *argv[])
6785 const struct got_error *error;
6786 struct got_repository *repo = NULL;
6787 struct got_worktree *worktree = NULL;
6788 char *cwd = NULL, *repo_path = NULL, *label = NULL;
6789 const char *commit_id_str = NULL;
6790 struct got_object_id *id = NULL, *commit_id = NULL;
6791 int ch, obj_type, i, force_path = 0;
6794 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6799 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
6802 commit_id_str = optarg;
6805 repo_path = realpath(optarg, NULL);
6806 if (repo_path == NULL)
6807 err(1, "-r option");
6808 got_path_strip_trailing_slashes(repo_path);
6822 cwd = getcwd(NULL, 0);
6824 error = got_error_from_errno("getcwd");
6827 error = got_worktree_open(&worktree, cwd);
6828 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6831 if (repo_path == NULL) {
6833 got_worktree_get_repo_path(worktree));
6834 if (repo_path == NULL) {
6835 error = got_error_from_errno("strdup");
6841 if (repo_path == NULL) {
6842 repo_path = getcwd(NULL, 0);
6843 if (repo_path == NULL)
6844 return got_error_from_errno("getcwd");
6847 error = got_repo_open(&repo, repo_path, NULL);
6852 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6856 if (commit_id_str == NULL)
6857 commit_id_str = GOT_REF_HEAD;
6858 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
6862 for (i = 0; i < argc; i++) {
6864 error = got_object_id_by_path(&id, repo, commit_id,
6869 error = match_object_id(&id, &label, argv[i],
6870 GOT_OBJ_TYPE_ANY, 0, repo);
6872 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
6873 error->code != GOT_ERR_NOT_REF)
6875 error = got_object_id_by_path(&id, repo,
6876 commit_id, argv[i]);
6882 error = got_object_get_type(&obj_type, repo, id);
6887 case GOT_OBJ_TYPE_BLOB:
6888 error = cat_blob(id, repo, stdout);
6890 case GOT_OBJ_TYPE_TREE:
6891 error = cat_tree(id, repo, stdout);
6893 case GOT_OBJ_TYPE_COMMIT:
6894 error = cat_commit(id, repo, stdout);
6896 case GOT_OBJ_TYPE_TAG:
6897 error = cat_tag(id, repo, stdout);
6900 error = got_error(GOT_ERR_OBJ_TYPE);
6916 got_worktree_close(worktree);
6918 const struct got_error *repo_error;
6919 repo_error = got_repo_close(repo);