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(const char **author)
497 const char *got_author;
501 got_author = getenv("GOT_AUTHOR");
502 if (got_author == NULL) {
503 /* TODO: Look up user in password database? */
504 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
507 *author = got_author;
510 * Really dumb email address check; we're only doing this to
511 * avoid git's object parser breaking on commits we create.
513 while (*got_author && *got_author != '<')
515 if (*got_author != '<')
516 return got_error(GOT_ERR_COMMIT_NO_EMAIL);
517 while (*got_author && *got_author != '@')
519 if (*got_author != '@')
520 return got_error(GOT_ERR_COMMIT_NO_EMAIL);
521 while (*got_author && *got_author != '>')
523 if (*got_author != '>')
524 return got_error(GOT_ERR_COMMIT_NO_EMAIL);
529 static const struct got_error *
530 cmd_import(int argc, char *argv[])
532 const struct got_error *error = NULL;
533 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
536 const char *branch_name = "master";
537 char *refname = NULL, *id_str = NULL;
538 struct got_repository *repo = NULL;
539 struct got_reference *branch_ref = NULL, *head_ref = NULL;
540 struct got_object_id *new_commit_id = NULL;
542 struct got_pathlist_head ignores;
543 struct got_pathlist_entry *pe;
545 TAILQ_INIT(&ignores);
547 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
550 branch_name = optarg;
553 logmsg = strdup(optarg);
554 if (logmsg == NULL) {
555 error = got_error_from_errno("strdup");
560 repo_path = realpath(optarg, NULL);
561 if (repo_path == NULL) {
562 error = got_error_from_errno("realpath");
567 if (optarg[0] == '\0')
569 error = got_pathlist_insert(&pe, &ignores, optarg,
584 if (pledge("stdio rpath wpath cpath fattr flock proc exec unveil",
591 error = get_author(&author);
595 if (repo_path == NULL) {
596 repo_path = getcwd(NULL, 0);
597 if (repo_path == NULL)
598 return got_error_from_errno("getcwd");
600 got_path_strip_trailing_slashes(repo_path);
601 error = got_repo_open(&repo, repo_path);
605 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
606 error = got_error_from_errno("asprintf");
610 error = got_ref_open(&branch_ref, repo, refname, 0);
612 if (error->code != GOT_ERR_NOT_REF)
615 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
616 "import target branch already exists");
620 path_dir = realpath(argv[0], NULL);
621 if (path_dir == NULL) {
622 error = got_error_from_errno("realpath");
625 got_path_strip_trailing_slashes(path_dir);
628 * unveil(2) traverses exec(2); if an editor is used we have
629 * to apply unveil after the log message has been written.
631 if (logmsg == NULL || strlen(logmsg) == 0) {
632 error = get_editor(&editor);
635 error = collect_import_msg(&logmsg, editor, path_dir, refname);
640 if (unveil(path_dir, "r") != 0)
641 return got_error_from_errno2("unveil", path_dir);
643 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
647 error = got_repo_import(&new_commit_id, path_dir, logmsg,
648 author, &ignores, repo, import_progress, NULL);
652 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
656 error = got_ref_write(branch_ref, repo);
660 error = got_object_id_str(&id_str, new_commit_id);
664 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
666 if (error->code != GOT_ERR_NOT_REF)
669 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
674 error = got_ref_write(head_ref, repo);
679 printf("Created branch %s with commit %s\n",
680 got_ref_get_name(branch_ref), id_str);
688 got_ref_close(branch_ref);
690 got_ref_close(head_ref);
697 fprintf(stderr, "usage: %s checkout [-b branch] [-c commit] "
698 "[-p prefix] repository-path [worktree-path]\n", getprogname());
702 static const struct got_error *
703 checkout_progress(void *arg, unsigned char status, const char *path)
705 char *worktree_path = arg;
707 /* Base commit bump happens silently. */
708 if (status == GOT_STATUS_BUMP_BASE)
711 while (path[0] == '/')
714 printf("%c %s/%s\n", status, worktree_path, path);
718 static const struct got_error *
719 check_cancelled(void *arg)
721 if (sigint_received || sigpipe_received)
722 return got_error(GOT_ERR_CANCELLED);
726 static const struct got_error *
727 check_linear_ancestry(struct got_object_id *commit_id,
728 struct got_object_id *base_commit_id, struct got_repository *repo)
730 const struct got_error *err = NULL;
731 struct got_object_id *yca_id;
733 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
734 commit_id, base_commit_id, repo, check_cancelled, NULL);
739 return got_error(GOT_ERR_ANCESTRY);
742 * Require a straight line of history between the target commit
743 * and the work tree's base commit.
745 * Non-linear situations such as this require a rebase:
747 * (commit) D F (base_commit)
755 * 'got update' only handles linear cases:
756 * Update forwards in time: A (base/yca) - B - C - D (commit)
757 * Update backwards in time: D (base) - C - B - A (commit/yca)
759 if (got_object_id_cmp(commit_id, yca_id) != 0 &&
760 got_object_id_cmp(base_commit_id, yca_id) != 0)
761 return got_error(GOT_ERR_ANCESTRY);
767 static const struct got_error *
768 check_same_branch(struct got_object_id *commit_id,
769 struct got_reference *head_ref, struct got_object_id *yca_id,
770 struct got_repository *repo)
772 const struct got_error *err = NULL;
773 struct got_commit_graph *graph = NULL;
774 struct got_object_id *head_commit_id = NULL;
775 int is_same_branch = 0;
777 err = got_ref_resolve(&head_commit_id, repo, head_ref);
781 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
785 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
790 err = got_commit_graph_open(&graph, head_commit_id, "/", 1, repo);
794 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
795 check_cancelled, NULL);
800 struct got_object_id *id;
801 err = got_commit_graph_iter_next(&id, graph);
803 if (err->code == GOT_ERR_ITER_COMPLETED) {
806 } else if (err->code != GOT_ERR_ITER_NEED_MORE)
808 err = got_commit_graph_fetch_commits(graph, 1,
809 repo, check_cancelled, NULL);
815 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
817 if (got_object_id_cmp(id, commit_id) == 0) {
825 got_commit_graph_close(graph);
826 free(head_commit_id);
827 if (!err && !is_same_branch)
828 err = got_error(GOT_ERR_ANCESTRY);
832 static const struct got_error *
833 resolve_commit_arg(struct got_object_id **commit_id,
834 const char *commit_id_arg, struct got_repository *repo)
836 const struct got_error *err;
837 struct got_reference *ref;
838 struct got_tag_object *tag;
840 err = got_repo_object_match_tag(&tag, commit_id_arg,
841 GOT_OBJ_TYPE_COMMIT, repo);
843 *commit_id = got_object_id_dup(
844 got_object_tag_get_object_id(tag));
845 if (*commit_id == NULL)
846 err = got_error_from_errno("got_object_id_dup");
847 got_object_tag_close(tag);
849 } else if (err->code != GOT_ERR_NO_OBJ)
852 err = got_ref_open(&ref, repo, commit_id_arg, 0);
854 err = got_ref_resolve(commit_id, repo, ref);
857 if (err->code != GOT_ERR_NOT_REF)
859 err = got_repo_match_object_id_prefix(commit_id,
860 commit_id_arg, GOT_OBJ_TYPE_COMMIT, repo);
865 static const struct got_error *
866 cmd_checkout(int argc, char *argv[])
868 const struct got_error *error = NULL;
869 struct got_repository *repo = NULL;
870 struct got_reference *head_ref = NULL;
871 struct got_worktree *worktree = NULL;
872 char *repo_path = NULL;
873 char *worktree_path = NULL;
874 const char *path_prefix = "";
875 const char *branch_name = GOT_REF_HEAD;
876 char *commit_id_str = NULL;
877 int ch, same_path_prefix;
878 struct got_pathlist_head paths;
882 while ((ch = getopt(argc, argv, "b:c:p:")) != -1) {
885 branch_name = optarg;
888 commit_id_str = strdup(optarg);
889 if (commit_id_str == NULL)
890 return got_error_from_errno("strdup");
893 path_prefix = optarg;
905 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
906 "unveil", NULL) == -1)
910 char *cwd, *base, *dotgit;
911 repo_path = realpath(argv[0], NULL);
912 if (repo_path == NULL)
913 return got_error_from_errno2("realpath", argv[0]);
914 cwd = getcwd(NULL, 0);
916 error = got_error_from_errno("getcwd");
919 if (path_prefix[0]) {
920 base = basename(path_prefix);
922 error = got_error_from_errno2("basename",
927 base = basename(repo_path);
929 error = got_error_from_errno2("basename",
934 dotgit = strstr(base, ".git");
937 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
938 error = got_error_from_errno("asprintf");
943 } else if (argc == 2) {
944 repo_path = realpath(argv[0], NULL);
945 if (repo_path == NULL) {
946 error = got_error_from_errno2("realpath", argv[0]);
949 worktree_path = realpath(argv[1], NULL);
950 if (worktree_path == NULL) {
951 if (errno != ENOENT) {
952 error = got_error_from_errno2("realpath",
956 worktree_path = strdup(argv[1]);
957 if (worktree_path == NULL) {
958 error = got_error_from_errno("strdup");
965 got_path_strip_trailing_slashes(repo_path);
966 got_path_strip_trailing_slashes(worktree_path);
968 error = got_repo_open(&repo, repo_path);
972 /* Pre-create work tree path for unveil(2) */
973 error = got_path_mkdir(worktree_path);
975 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
976 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
978 if (!got_path_dir_is_empty(worktree_path)) {
979 error = got_error_path(worktree_path,
980 GOT_ERR_DIR_NOT_EMPTY);
985 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
989 error = got_ref_open(&head_ref, repo, branch_name, 0);
993 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
994 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
997 error = got_worktree_open(&worktree, worktree_path);
1001 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
1005 if (!same_path_prefix) {
1006 error = got_error(GOT_ERR_PATH_PREFIX);
1010 if (commit_id_str) {
1011 struct got_object_id *commit_id;
1012 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1015 error = check_linear_ancestry(commit_id,
1016 got_worktree_get_base_commit_id(worktree), repo);
1017 if (error != NULL) {
1021 error = check_same_branch(commit_id, head_ref, NULL, repo);
1024 error = got_worktree_set_base_commit_id(worktree, repo,
1031 error = got_pathlist_append(&paths, "", NULL);
1034 error = got_worktree_checkout_files(worktree, &paths, repo,
1035 checkout_progress, worktree_path, check_cancelled, NULL);
1039 printf("Now shut up and hack\n");
1042 got_pathlist_free(&paths);
1043 free(commit_id_str);
1045 free(worktree_path);
1052 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
1057 static const struct got_error *
1058 update_progress(void *arg, unsigned char status, const char *path)
1060 int *did_something = arg;
1062 if (status == GOT_STATUS_EXISTS)
1067 /* Base commit bump happens silently. */
1068 if (status == GOT_STATUS_BUMP_BASE)
1071 while (path[0] == '/')
1073 printf("%c %s\n", status, path);
1077 static const struct got_error *
1078 switch_head_ref(struct got_reference *head_ref,
1079 struct got_object_id *commit_id, struct got_worktree *worktree,
1080 struct got_repository *repo)
1082 const struct got_error *err = NULL;
1084 int ref_has_moved = 0;
1086 /* Trivial case: switching between two different references. */
1087 if (strcmp(got_ref_get_name(head_ref),
1088 got_worktree_get_head_ref_name(worktree)) != 0) {
1089 printf("Switching work tree from %s to %s\n",
1090 got_worktree_get_head_ref_name(worktree),
1091 got_ref_get_name(head_ref));
1092 return got_worktree_set_head_ref(worktree, head_ref);
1095 err = check_linear_ancestry(commit_id,
1096 got_worktree_get_base_commit_id(worktree), repo);
1098 if (err->code != GOT_ERR_ANCESTRY)
1105 /* Switching to a rebased branch with the same reference name. */
1106 err = got_object_id_str(&base_id_str,
1107 got_worktree_get_base_commit_id(worktree));
1110 printf("Reference %s now points at a different branch\n",
1111 got_worktree_get_head_ref_name(worktree));
1112 printf("Switching work tree from %s to %s\n", base_id_str,
1113 got_worktree_get_head_ref_name(worktree));
1117 static const struct got_error *
1118 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
1120 const struct got_error *err;
1123 err = got_worktree_rebase_in_progress(&in_progress, worktree);
1127 return got_error(GOT_ERR_REBASING);
1129 err = got_worktree_histedit_in_progress(&in_progress, worktree);
1133 return got_error(GOT_ERR_HISTEDIT_BUSY);
1138 static const struct got_error *
1139 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
1140 char *argv[], struct got_worktree *worktree)
1142 const struct got_error *err = NULL;
1149 return got_error_from_errno("strdup");
1150 return got_pathlist_append(paths, path, NULL);
1153 for (i = 0; i < argc; i++) {
1154 err = got_worktree_resolve_path(&path, worktree, argv[i]);
1157 err = got_pathlist_append(paths, path, NULL);
1167 static const struct got_error *
1168 cmd_update(int argc, char *argv[])
1170 const struct got_error *error = NULL;
1171 struct got_repository *repo = NULL;
1172 struct got_worktree *worktree = NULL;
1173 char *worktree_path = NULL;
1174 struct got_object_id *commit_id = NULL;
1175 char *commit_id_str = NULL;
1176 const char *branch_name = NULL;
1177 struct got_reference *head_ref = NULL;
1178 struct got_pathlist_head paths;
1179 struct got_pathlist_entry *pe;
1180 int ch, did_something = 0;
1184 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
1187 branch_name = optarg;
1190 commit_id_str = strdup(optarg);
1191 if (commit_id_str == NULL)
1192 return got_error_from_errno("strdup");
1204 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
1205 "unveil", NULL) == -1)
1208 worktree_path = getcwd(NULL, 0);
1209 if (worktree_path == NULL) {
1210 error = got_error_from_errno("getcwd");
1213 error = got_worktree_open(&worktree, worktree_path);
1217 error = check_rebase_or_histedit_in_progress(worktree);
1221 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
1225 error = apply_unveil(got_repo_get_path(repo), 0,
1226 got_worktree_get_root_path(worktree));
1230 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
1234 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
1235 got_worktree_get_head_ref_name(worktree), 0);
1238 if (commit_id_str == NULL) {
1239 error = got_ref_resolve(&commit_id, repo, head_ref);
1242 error = got_object_id_str(&commit_id_str, commit_id);
1246 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
1247 free(commit_id_str);
1248 commit_id_str = NULL;
1251 error = got_object_id_str(&commit_id_str, commit_id);
1257 struct got_object_id *head_commit_id;
1258 TAILQ_FOREACH(pe, &paths, entry) {
1259 if (pe->path_len == 0)
1261 error = got_error_msg(GOT_ERR_BAD_PATH,
1262 "switching between branches requires that "
1263 "the entire work tree gets updated");
1266 error = got_ref_resolve(&head_commit_id, repo, head_ref);
1269 error = check_linear_ancestry(commit_id, head_commit_id, repo);
1270 free(head_commit_id);
1273 error = check_same_branch(commit_id, head_ref, NULL, repo);
1276 error = switch_head_ref(head_ref, commit_id, worktree, repo);
1280 error = check_linear_ancestry(commit_id,
1281 got_worktree_get_base_commit_id(worktree), repo);
1282 if (error != NULL) {
1283 if (error->code == GOT_ERR_ANCESTRY)
1284 error = got_error(GOT_ERR_BRANCH_MOVED);
1287 error = check_same_branch(commit_id, head_ref, NULL, repo);
1292 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
1294 error = got_worktree_set_base_commit_id(worktree, repo,
1300 error = got_worktree_checkout_files(worktree, &paths, repo,
1301 update_progress, &did_something, check_cancelled, NULL);
1306 printf("Updated to commit %s\n", commit_id_str);
1308 printf("Already up-to-date\n");
1310 free(worktree_path);
1311 TAILQ_FOREACH(pe, &paths, entry)
1312 free((char *)pe->path);
1313 got_pathlist_free(&paths);
1315 free(commit_id_str);
1319 static const struct got_error *
1320 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1321 int diff_context, struct got_repository *repo)
1323 const struct got_error *err = NULL;
1324 struct got_tree_object *tree1 = NULL, *tree2;
1325 struct got_object_qid *qid;
1326 char *id_str1 = NULL, *id_str2;
1327 struct got_diff_blob_output_unidiff_arg arg;
1329 err = got_object_open_as_tree(&tree2, repo,
1330 got_object_commit_get_tree_id(commit));
1334 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1336 struct got_commit_object *pcommit;
1338 err = got_object_open_as_commit(&pcommit, repo, qid->id);
1342 err = got_object_open_as_tree(&tree1, repo,
1343 got_object_commit_get_tree_id(pcommit));
1344 got_object_commit_close(pcommit);
1348 err = got_object_id_str(&id_str1, qid->id);
1353 err = got_object_id_str(&id_str2, id);
1357 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1358 arg.diff_context = diff_context;
1359 arg.outfile = stdout;
1360 err = got_diff_tree(tree1, tree2, "", "", repo,
1361 got_diff_blob_output_unidiff, &arg, 1);
1364 got_object_tree_close(tree1);
1365 got_object_tree_close(tree2);
1372 get_datestr(time_t *time, char *datebuf)
1374 struct tm mytm, *tm;
1377 tm = gmtime_r(time, &mytm);
1380 s = asctime_r(tm, datebuf);
1383 p = strchr(s, '\n');
1389 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1391 static const struct got_error *
1392 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1393 struct got_repository *repo, int show_patch, int diff_context,
1394 struct got_reflist_head *refs)
1396 const struct got_error *err = NULL;
1397 char *id_str, *datestr, *logmsg0, *logmsg, *line;
1399 time_t committer_time;
1400 const char *author, *committer;
1401 char *refs_str = NULL;
1402 struct got_reflist_entry *re;
1404 SIMPLEQ_FOREACH(re, refs, entry) {
1407 struct got_tag_object *tag = NULL;
1410 name = got_ref_get_name(re->ref);
1411 if (strcmp(name, GOT_REF_HEAD) == 0)
1413 if (strncmp(name, "refs/", 5) == 0)
1415 if (strncmp(name, "got/", 4) == 0)
1417 if (strncmp(name, "heads/", 6) == 0)
1419 if (strncmp(name, "remotes/", 8) == 0)
1421 if (strncmp(name, "tags/", 5) == 0) {
1422 err = got_object_open_as_tag(&tag, repo, re->id);
1424 if (err->code != GOT_ERR_OBJ_TYPE)
1426 /* Ref points at something other than a tag. */
1431 cmp = got_object_id_cmp(tag ?
1432 got_object_tag_get_object_id(tag) : re->id, id);
1434 got_object_tag_close(tag);
1438 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1440 err = got_error_from_errno("asprintf");
1446 err = got_object_id_str(&id_str, id);
1450 printf(GOT_COMMIT_SEP_STR);
1451 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1452 refs_str ? refs_str : "", refs_str ? ")" : "");
1457 printf("from: %s\n", got_object_commit_get_author(commit));
1458 committer_time = got_object_commit_get_committer_time(commit);
1459 datestr = get_datestr(&committer_time, datebuf);
1461 printf("date: %s UTC\n", datestr);
1462 author = got_object_commit_get_author(commit);
1463 committer = got_object_commit_get_committer(commit);
1464 if (strcmp(author, committer) != 0)
1465 printf("via: %s\n", committer);
1466 if (got_object_commit_get_nparents(commit) > 1) {
1467 const struct got_object_id_queue *parent_ids;
1468 struct got_object_qid *qid;
1470 parent_ids = got_object_commit_get_parent_ids(commit);
1471 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1472 err = got_object_id_str(&id_str, qid->id);
1475 printf("parent %d: %s\n", n++, id_str);
1480 err = got_object_commit_get_logmsg(&logmsg0, commit);
1486 line = strsep(&logmsg, "\n");
1488 printf(" %s\n", line);
1493 err = print_patch(commit, id, diff_context, repo);
1498 if (fflush(stdout) != 0 && err == NULL)
1499 err = got_error_from_errno("fflush");
1503 static const struct got_error *
1504 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1505 char *path, int show_patch, int diff_context, int limit,
1506 int first_parent_traversal, struct got_reflist_head *refs)
1508 const struct got_error *err;
1509 struct got_commit_graph *graph;
1511 err = got_commit_graph_open(&graph, root_id, path,
1512 first_parent_traversal, repo);
1515 err = got_commit_graph_iter_start(graph, root_id, repo,
1516 check_cancelled, NULL);
1520 struct got_commit_object *commit;
1521 struct got_object_id *id;
1523 if (sigint_received || sigpipe_received)
1526 err = got_commit_graph_iter_next(&id, graph);
1528 if (err->code == GOT_ERR_ITER_COMPLETED) {
1532 if (err->code != GOT_ERR_ITER_NEED_MORE)
1534 err = got_commit_graph_fetch_commits(graph, 1, repo,
1535 check_cancelled, NULL);
1544 err = got_object_open_as_commit(&commit, repo, id);
1547 err = print_commit(commit, id, repo, show_patch, diff_context,
1549 got_object_commit_close(commit);
1550 if (err || (limit && --limit == 0))
1554 got_commit_graph_close(graph);
1561 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1562 "[-r repository-path] [path]\n", getprogname());
1567 get_default_log_limit(void)
1569 const char *got_default_log_limit;
1573 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1574 if (got_default_log_limit == NULL)
1576 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1582 static const struct got_error *
1583 cmd_log(int argc, char *argv[])
1585 const struct got_error *error;
1586 struct got_repository *repo = NULL;
1587 struct got_worktree *worktree = NULL;
1588 struct got_commit_object *commit = NULL;
1589 struct got_object_id *id = NULL;
1590 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1591 char *start_commit = NULL;
1592 int diff_context = 3, ch;
1593 int show_patch = 0, limit = 0, first_parent_traversal = 0;
1595 struct got_reflist_head refs;
1597 SIMPLEQ_INIT(&refs);
1600 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1606 limit = get_default_log_limit();
1608 while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1614 start_commit = optarg;
1617 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1620 err(1, "-C option %s", errstr);
1623 limit = strtonum(optarg, 0, INT_MAX, &errstr);
1625 err(1, "-l option %s", errstr);
1628 first_parent_traversal = 1;
1631 repo_path = realpath(optarg, NULL);
1632 if (repo_path == NULL)
1633 err(1, "-r option");
1634 got_path_strip_trailing_slashes(repo_path);
1645 cwd = getcwd(NULL, 0);
1647 error = got_error_from_errno("getcwd");
1651 error = got_worktree_open(&worktree, cwd);
1652 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1659 error = got_error_from_errno("strdup");
1662 } else if (argc == 1) {
1664 error = got_worktree_resolve_path(&path, worktree,
1669 path = strdup(argv[0]);
1671 error = got_error_from_errno("strdup");
1678 if (repo_path == NULL) {
1679 repo_path = worktree ?
1680 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1682 if (repo_path == NULL) {
1683 error = got_error_from_errno("strdup");
1687 error = got_repo_open(&repo, repo_path);
1691 error = apply_unveil(got_repo_get_path(repo), 1,
1692 worktree ? got_worktree_get_root_path(worktree) : NULL);
1696 if (start_commit == NULL) {
1697 struct got_reference *head_ref;
1698 error = got_ref_open(&head_ref, repo,
1699 worktree ? got_worktree_get_head_ref_name(worktree)
1703 error = got_ref_resolve(&id, repo, head_ref);
1704 got_ref_close(head_ref);
1707 error = got_object_open_as_commit(&commit, repo, id);
1709 struct got_reference *ref;
1710 error = got_ref_open(&ref, repo, start_commit, 0);
1711 if (error == NULL) {
1713 error = got_ref_resolve(&id, repo, ref);
1717 error = got_object_get_type(&obj_type, repo, id);
1720 if (obj_type == GOT_OBJ_TYPE_TAG) {
1721 struct got_tag_object *tag;
1722 error = got_object_open_as_tag(&tag, repo, id);
1725 if (got_object_tag_get_object_type(tag) !=
1726 GOT_OBJ_TYPE_COMMIT) {
1727 got_object_tag_close(tag);
1728 error = got_error(GOT_ERR_OBJ_TYPE);
1732 id = got_object_id_dup(
1733 got_object_tag_get_object_id(tag));
1735 error = got_error_from_errno(
1736 "got_object_id_dup");
1737 got_object_tag_close(tag);
1740 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1741 error = got_error(GOT_ERR_OBJ_TYPE);
1744 error = got_object_open_as_commit(&commit, repo, id);
1748 if (commit == NULL) {
1749 error = got_repo_match_object_id_prefix(&id,
1750 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1758 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1763 path = in_repo_path;
1766 error = got_ref_list(&refs, repo);
1770 error = print_commits(id, repo, path, show_patch,
1771 diff_context, limit, first_parent_traversal, &refs);
1778 got_worktree_close(worktree);
1780 const struct got_error *repo_error;
1781 repo_error = got_repo_close(repo);
1785 got_ref_list_free(&refs);
1792 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1793 "[object1 object2 | path]\n", getprogname());
1797 struct print_diff_arg {
1798 struct got_repository *repo;
1799 struct got_worktree *worktree;
1806 static const struct got_error *
1807 print_diff(void *arg, unsigned char status, unsigned char staged_status,
1808 const char *path, struct got_object_id *blob_id,
1809 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1811 struct print_diff_arg *a = arg;
1812 const struct got_error *err = NULL;
1813 struct got_blob_object *blob1 = NULL;
1815 char *abspath = NULL, *label1 = NULL;
1818 if (a->diff_staged) {
1819 if (staged_status != GOT_STATUS_MODIFY &&
1820 staged_status != GOT_STATUS_ADD &&
1821 staged_status != GOT_STATUS_DELETE)
1824 if (staged_status == GOT_STATUS_DELETE)
1826 if (status != GOT_STATUS_MODIFY &&
1827 status != GOT_STATUS_ADD &&
1828 status != GOT_STATUS_DELETE &&
1829 status != GOT_STATUS_CONFLICT)
1833 if (!a->header_shown) {
1834 printf("diff %s %s%s\n", a->id_str,
1835 got_worktree_get_root_path(a->worktree),
1836 a->diff_staged ? " (staged changes)" : "");
1837 a->header_shown = 1;
1840 if (a->diff_staged) {
1841 const char *label1 = NULL, *label2 = NULL;
1842 switch (staged_status) {
1843 case GOT_STATUS_MODIFY:
1847 case GOT_STATUS_ADD:
1850 case GOT_STATUS_DELETE:
1854 return got_error(GOT_ERR_FILE_STATUS);
1856 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1857 label1, label2, a->diff_context, a->repo, stdout);
1860 if (staged_status == GOT_STATUS_ADD ||
1861 staged_status == GOT_STATUS_MODIFY) {
1863 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1867 err = got_object_id_str(&id_str, staged_blob_id);
1870 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1871 err = got_error_from_errno("asprintf");
1876 } else if (status != GOT_STATUS_ADD) {
1877 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1882 if (status != GOT_STATUS_DELETE) {
1883 if (asprintf(&abspath, "%s/%s",
1884 got_worktree_get_root_path(a->worktree), path) == -1) {
1885 err = got_error_from_errno("asprintf");
1889 f2 = fopen(abspath, "r");
1891 err = got_error_from_errno2("fopen", abspath);
1894 if (lstat(abspath, &sb) == -1) {
1895 err = got_error_from_errno2("lstat", abspath);
1901 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1902 a->diff_context, stdout);
1905 got_object_blob_close(blob1);
1906 if (f2 && fclose(f2) != 0 && err == NULL)
1907 err = got_error_from_errno("fclose");
1912 static const struct got_error *
1913 match_object_id(struct got_object_id **id, char **label,
1914 const char *id_str, int obj_type, int resolve_tags,
1915 struct got_repository *repo)
1917 const struct got_error *err;
1918 struct got_tag_object *tag;
1919 struct got_reference *ref = NULL;
1925 err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
1928 *id = got_object_id_dup(
1929 got_object_tag_get_object_id(tag));
1931 err = got_error_from_errno("got_object_id_dup");
1932 else if (asprintf(label, "refs/tags/%s",
1933 got_object_tag_get_name(tag)) == -1) {
1934 err = got_error_from_errno("asprintf");
1938 got_object_tag_close(tag);
1940 } else if (err->code != GOT_ERR_NO_OBJ)
1944 err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
1946 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
1948 err = got_ref_open(&ref, repo, id_str, 0);
1951 *label = strdup(got_ref_get_name(ref));
1952 if (*label == NULL) {
1953 err = got_error_from_errno("strdup");
1956 err = got_ref_resolve(id, repo, ref);
1958 err = got_object_id_str(label, *id);
1959 if (*label == NULL) {
1960 err = got_error_from_errno("strdup");
1971 static const struct got_error *
1972 cmd_diff(int argc, char *argv[])
1974 const struct got_error *error;
1975 struct got_repository *repo = NULL;
1976 struct got_worktree *worktree = NULL;
1977 char *cwd = NULL, *repo_path = NULL;
1978 struct got_object_id *id1 = NULL, *id2 = NULL;
1979 const char *id_str1 = NULL, *id_str2 = NULL;
1980 char *label1 = NULL, *label2 = NULL;
1982 int diff_context = 3, diff_staged = 0, ch;
1987 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1992 while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
1995 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
1997 err(1, "-C option %s", errstr);
2000 repo_path = realpath(optarg, NULL);
2001 if (repo_path == NULL)
2002 err(1, "-r option");
2003 got_path_strip_trailing_slashes(repo_path);
2017 cwd = getcwd(NULL, 0);
2019 error = got_error_from_errno("getcwd");
2022 error = got_worktree_open(&worktree, cwd);
2023 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2026 if (worktree == NULL) {
2027 error = got_error(GOT_ERR_NOT_WORKTREE);
2032 "-r option can't be used when diffing a work tree");
2033 repo_path = strdup(got_worktree_get_repo_path(worktree));
2034 if (repo_path == NULL) {
2035 error = got_error_from_errno("strdup");
2039 error = got_worktree_resolve_path(&path, worktree,
2046 error = got_error_from_errno("strdup");
2050 } else if (argc == 2) {
2052 errx(1, "-s option can't be used when diffing "
2053 "objects in repository");
2056 if (worktree && repo_path == NULL) {
2058 strdup(got_worktree_get_repo_path(worktree));
2059 if (repo_path == NULL) {
2060 error = got_error_from_errno("strdup");
2067 if (repo_path == NULL) {
2068 repo_path = getcwd(NULL, 0);
2069 if (repo_path == NULL)
2070 return got_error_from_errno("getcwd");
2073 error = got_repo_open(&repo, repo_path);
2078 error = apply_unveil(got_repo_get_path(repo), 1,
2079 worktree ? got_worktree_get_root_path(worktree) : NULL);
2084 struct print_diff_arg arg;
2085 struct got_pathlist_head paths;
2090 error = got_object_id_str(&id_str,
2091 got_worktree_get_base_commit_id(worktree));
2095 arg.worktree = worktree;
2096 arg.diff_context = diff_context;
2097 arg.id_str = id_str;
2098 arg.header_shown = 0;
2099 arg.diff_staged = diff_staged;
2101 error = got_pathlist_append(&paths, path, NULL);
2105 error = got_worktree_status(worktree, &paths, repo, print_diff,
2106 &arg, check_cancelled, NULL);
2108 got_pathlist_free(&paths);
2112 error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2117 error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2122 error = got_object_get_type(&type1, repo, id1);
2126 error = got_object_get_type(&type2, repo, id2);
2130 if (type1 != type2) {
2131 error = got_error(GOT_ERR_OBJ_TYPE);
2136 case GOT_OBJ_TYPE_BLOB:
2137 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2138 diff_context, repo, stdout);
2140 case GOT_OBJ_TYPE_TREE:
2141 error = got_diff_objects_as_trees(id1, id2, "", "",
2142 diff_context, repo, stdout);
2144 case GOT_OBJ_TYPE_COMMIT:
2145 printf("diff %s %s\n", label1, label2);
2146 error = got_diff_objects_as_commits(id1, id2, diff_context,
2150 error = got_error(GOT_ERR_OBJ_TYPE);
2160 got_worktree_close(worktree);
2162 const struct got_error *repo_error;
2163 repo_error = got_repo_close(repo);
2174 "usage: %s blame [-c commit] [-r repository-path] path\n",
2183 char datebuf[9]; /* YY-MM-DD + NUL */
2186 struct blame_cb_args {
2187 struct blame_line *lines;
2191 off_t *line_offsets;
2193 struct got_repository *repo;
2196 static const struct got_error *
2197 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2199 const struct got_error *err = NULL;
2200 struct blame_cb_args *a = arg;
2201 struct blame_line *bline;
2203 size_t linesize = 0;
2204 struct got_commit_object *commit = NULL;
2207 time_t committer_time;
2209 if (nlines != a->nlines ||
2210 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2211 return got_error(GOT_ERR_RANGE);
2213 if (sigint_received)
2214 return got_error(GOT_ERR_ITER_COMPLETED);
2217 return NULL; /* no change in this commit */
2219 /* Annotate this line. */
2220 bline = &a->lines[lineno - 1];
2221 if (bline->annotated)
2223 err = got_object_id_str(&bline->id_str, id);
2227 err = got_object_open_as_commit(&commit, a->repo, id);
2231 bline->committer = strdup(got_object_commit_get_committer(commit));
2232 if (bline->committer == NULL) {
2233 err = got_error_from_errno("strdup");
2237 committer_time = got_object_commit_get_committer_time(commit);
2238 if (localtime_r(&committer_time, &tm) == NULL)
2239 return got_error_from_errno("localtime_r");
2240 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%g/%m/%d",
2241 &tm) >= sizeof(bline->datebuf)) {
2242 err = got_error(GOT_ERR_NO_SPACE);
2245 bline->annotated = 1;
2247 /* Print lines annotated so far. */
2248 bline = &a->lines[a->lineno_cur - 1];
2249 if (!bline->annotated)
2252 offset = a->line_offsets[a->lineno_cur - 1];
2253 if (fseeko(a->f, offset, SEEK_SET) == -1) {
2254 err = got_error_from_errno("fseeko");
2258 while (bline->annotated) {
2259 char *smallerthan, *at, *nl, *committer;
2262 if (getline(&line, &linesize, a->f) == (ssize_t)-1) {
2264 err = got_error_from_errno("getline");
2268 committer = bline->committer;
2269 smallerthan = strchr(committer, '<');
2270 if (smallerthan && smallerthan[1] != '\0')
2271 committer = smallerthan + 1;
2272 at = strchr(committer, '@');
2275 len = strlen(committer);
2277 committer[8] = '\0';
2279 nl = strchr(line, '\n');
2282 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2283 bline->id_str, bline->datebuf, committer, line);
2286 bline = &a->lines[a->lineno_cur - 1];
2290 got_object_commit_close(commit);
2295 static const struct got_error *
2296 cmd_blame(int argc, char *argv[])
2298 const struct got_error *error;
2299 struct got_repository *repo = NULL;
2300 struct got_worktree *worktree = NULL;
2301 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2302 struct got_object_id *obj_id = NULL;
2303 struct got_object_id *commit_id = NULL;
2304 struct got_blob_object *blob = NULL;
2305 char *commit_id_str = NULL;
2306 struct blame_cb_args bca;
2307 int ch, obj_type, i;
2310 memset(&bca, 0, sizeof(bca));
2313 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2318 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2321 commit_id_str = optarg;
2324 repo_path = realpath(optarg, NULL);
2325 if (repo_path == NULL)
2326 err(1, "-r option");
2327 got_path_strip_trailing_slashes(repo_path);
2343 cwd = getcwd(NULL, 0);
2345 error = got_error_from_errno("getcwd");
2348 if (repo_path == NULL) {
2349 error = got_worktree_open(&worktree, cwd);
2350 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2356 strdup(got_worktree_get_repo_path(worktree));
2357 if (repo_path == NULL)
2358 error = got_error_from_errno("strdup");
2362 repo_path = strdup(cwd);
2363 if (repo_path == NULL) {
2364 error = got_error_from_errno("strdup");
2370 error = got_repo_open(&repo, repo_path);
2374 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2379 const char *prefix = got_worktree_get_path_prefix(worktree);
2380 char *p, *worktree_subdir = cwd +
2381 strlen(got_worktree_get_root_path(worktree));
2382 if (asprintf(&p, "%s%s%s%s%s",
2383 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2384 worktree_subdir, worktree_subdir[0] ? "/" : "",
2386 error = got_error_from_errno("asprintf");
2389 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2392 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2397 if (commit_id_str == NULL) {
2398 struct got_reference *head_ref;
2399 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2402 error = got_ref_resolve(&commit_id, repo, head_ref);
2403 got_ref_close(head_ref);
2407 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2412 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2415 if (obj_id == NULL) {
2416 error = got_error(GOT_ERR_NO_OBJ);
2420 error = got_object_get_type(&obj_type, repo, obj_id);
2424 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2425 error = got_error(GOT_ERR_OBJ_TYPE);
2429 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2432 bca.f = got_opentemp();
2433 if (bca.f == NULL) {
2434 error = got_error_from_errno("got_opentemp");
2437 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2438 &bca.line_offsets, bca.f, blob);
2439 if (error || bca.nlines == 0)
2442 /* Don't include \n at EOF in the blame line count. */
2443 if (bca.line_offsets[bca.nlines - 1] == filesize)
2446 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2447 if (bca.lines == NULL) {
2448 error = got_error_from_errno("calloc");
2452 bca.nlines_prec = 0;
2460 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2461 check_cancelled, NULL);
2471 got_object_blob_close(blob);
2473 got_worktree_close(worktree);
2475 const struct got_error *repo_error;
2476 repo_error = got_repo_close(repo);
2480 for (i = 0; i < bca.nlines; i++) {
2481 struct blame_line *bline = &bca.lines[i];
2482 free(bline->id_str);
2483 free(bline->committer);
2486 free(bca.line_offsets);
2487 if (bca.f && fclose(bca.f) == EOF && error == NULL)
2488 error = got_error_from_errno("fclose");
2496 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2502 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2503 const char *root_path)
2505 int is_root_path = (strcmp(path, root_path) == 0);
2506 const char *modestr = "";
2508 path += strlen(root_path);
2509 while (path[0] == '/')
2512 if (S_ISLNK(te->mode))
2514 else if (S_ISDIR(te->mode))
2516 else if (te->mode & S_IXUSR)
2519 printf("%s%s%s%s%s\n", id ? id : "", path,
2520 is_root_path ? "" : "/", te->name, modestr);
2523 static const struct got_error *
2524 print_tree(const char *path, struct got_object_id *commit_id,
2525 int show_ids, int recurse, const char *root_path,
2526 struct got_repository *repo)
2528 const struct got_error *err = NULL;
2529 struct got_object_id *tree_id = NULL;
2530 struct got_tree_object *tree = NULL;
2531 const struct got_tree_entries *entries;
2532 struct got_tree_entry *te;
2534 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2538 err = got_object_open_as_tree(&tree, repo, tree_id);
2541 entries = got_object_tree_get_entries(tree);
2542 te = SIMPLEQ_FIRST(&entries->head);
2546 if (sigint_received || sigpipe_received)
2551 err = got_object_id_str(&id_str, te->id);
2554 if (asprintf(&id, "%s ", id_str) == -1) {
2555 err = got_error_from_errno("asprintf");
2561 print_entry(te, id, path, root_path);
2564 if (recurse && S_ISDIR(te->mode)) {
2566 if (asprintf(&child_path, "%s%s%s", path,
2567 path[0] == '/' && path[1] == '\0' ? "" : "/",
2569 err = got_error_from_errno("asprintf");
2572 err = print_tree(child_path, commit_id, show_ids, 1,
2579 te = SIMPLEQ_NEXT(te, entry);
2583 got_object_tree_close(tree);
2588 static const struct got_error *
2589 cmd_tree(int argc, char *argv[])
2591 const struct got_error *error;
2592 struct got_repository *repo = NULL;
2593 struct got_worktree *worktree = NULL;
2595 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2596 struct got_object_id *commit_id = NULL;
2597 char *commit_id_str = NULL;
2598 int show_ids = 0, recurse = 0;
2602 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2607 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2610 commit_id_str = optarg;
2613 repo_path = realpath(optarg, NULL);
2614 if (repo_path == NULL)
2615 err(1, "-r option");
2616 got_path_strip_trailing_slashes(repo_path);
2640 cwd = getcwd(NULL, 0);
2642 error = got_error_from_errno("getcwd");
2645 if (repo_path == NULL) {
2646 error = got_worktree_open(&worktree, cwd);
2647 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2653 strdup(got_worktree_get_repo_path(worktree));
2654 if (repo_path == NULL)
2655 error = got_error_from_errno("strdup");
2659 repo_path = strdup(cwd);
2660 if (repo_path == NULL) {
2661 error = got_error_from_errno("strdup");
2667 error = got_repo_open(&repo, repo_path);
2671 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2677 char *p, *worktree_subdir = cwd +
2678 strlen(got_worktree_get_root_path(worktree));
2679 if (asprintf(&p, "%s/%s",
2680 got_worktree_get_path_prefix(worktree),
2681 worktree_subdir) == -1) {
2682 error = got_error_from_errno("asprintf");
2685 error = got_repo_map_path(&in_repo_path, repo, p, 1);
2692 if (in_repo_path == NULL) {
2693 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2698 if (commit_id_str == NULL) {
2699 struct got_reference *head_ref;
2700 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2703 error = got_ref_resolve(&commit_id, repo, head_ref);
2704 got_ref_close(head_ref);
2708 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2713 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2714 in_repo_path, repo);
2721 got_worktree_close(worktree);
2723 const struct got_error *repo_error;
2724 repo_error = got_repo_close(repo);
2734 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2738 static const struct got_error *
2739 print_status(void *arg, unsigned char status, unsigned char staged_status,
2740 const char *path, struct got_object_id *blob_id,
2741 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2743 if (status == staged_status && (status == GOT_STATUS_DELETE))
2744 status = GOT_STATUS_NO_CHANGE;
2745 printf("%c%c %s\n", status, staged_status, path);
2749 static const struct got_error *
2750 cmd_status(int argc, char *argv[])
2752 const struct got_error *error = NULL;
2753 struct got_repository *repo = NULL;
2754 struct got_worktree *worktree = NULL;
2756 struct got_pathlist_head paths;
2757 struct got_pathlist_entry *pe;
2762 while ((ch = getopt(argc, argv, "")) != -1) {
2774 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2778 cwd = getcwd(NULL, 0);
2780 error = got_error_from_errno("getcwd");
2784 error = got_worktree_open(&worktree, cwd);
2788 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2792 error = apply_unveil(got_repo_get_path(repo), 1,
2793 got_worktree_get_root_path(worktree));
2797 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2801 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2802 check_cancelled, NULL);
2804 TAILQ_FOREACH(pe, &paths, entry)
2805 free((char *)pe->path);
2806 got_pathlist_free(&paths);
2815 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2820 static const struct got_error *
2821 list_refs(struct got_repository *repo)
2823 static const struct got_error *err = NULL;
2824 struct got_reflist_head refs;
2825 struct got_reflist_entry *re;
2827 SIMPLEQ_INIT(&refs);
2828 err = got_ref_list(&refs, repo);
2832 SIMPLEQ_FOREACH(re, &refs, entry) {
2834 refstr = got_ref_to_str(re->ref);
2836 return got_error_from_errno("got_ref_to_str");
2837 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2841 got_ref_list_free(&refs);
2845 static const struct got_error *
2846 delete_ref(struct got_repository *repo, const char *refname)
2848 const struct got_error *err = NULL;
2849 struct got_reference *ref;
2851 err = got_ref_open(&ref, repo, refname, 0);
2855 err = got_ref_delete(ref, repo);
2860 static const struct got_error *
2861 add_ref(struct got_repository *repo, const char *refname, const char *target)
2863 const struct got_error *err = NULL;
2864 struct got_object_id *id;
2865 struct got_reference *ref = NULL;
2868 * Don't let the user create a reference named '-'.
2869 * While technically a valid reference name, this case is usually
2870 * an unintended typo.
2872 if (refname[0] == '-' && refname[1] == '\0')
2873 return got_error(GOT_ERR_BAD_REF_NAME);
2875 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2878 struct got_reference *target_ref;
2880 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2882 err = got_ref_open(&target_ref, repo, target, 0);
2885 err = got_ref_resolve(&id, repo, target_ref);
2886 got_ref_close(target_ref);
2891 err = got_ref_alloc(&ref, refname, id);
2895 err = got_ref_write(ref, repo);
2903 static const struct got_error *
2904 add_symref(struct got_repository *repo, const char *refname, const char *target)
2906 const struct got_error *err = NULL;
2907 struct got_reference *ref = NULL;
2908 struct got_reference *target_ref = NULL;
2911 * Don't let the user create a reference named '-'.
2912 * While technically a valid reference name, this case is usually
2913 * an unintended typo.
2915 if (refname[0] == '-' && refname[1] == '\0')
2916 return got_error(GOT_ERR_BAD_REF_NAME);
2918 err = got_ref_open(&target_ref, repo, target, 0);
2922 err = got_ref_alloc_symref(&ref, refname, target_ref);
2926 err = got_ref_write(ref, repo);
2929 got_ref_close(target_ref);
2935 static const struct got_error *
2936 cmd_ref(int argc, char *argv[])
2938 const struct got_error *error = NULL;
2939 struct got_repository *repo = NULL;
2940 struct got_worktree *worktree = NULL;
2941 char *cwd = NULL, *repo_path = NULL;
2942 int ch, do_list = 0, create_symref = 0;
2943 const char *delref = NULL;
2945 /* TODO: Add -s option for adding symbolic references. */
2946 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
2952 repo_path = realpath(optarg, NULL);
2953 if (repo_path == NULL)
2954 err(1, "-r option");
2955 got_path_strip_trailing_slashes(repo_path);
2969 if (do_list && delref)
2970 errx(1, "-l and -d options are mutually exclusive\n");
2975 if (do_list || delref) {
2977 errx(1, "-s option cannot be used together with the "
2978 "-l or -d options");
2981 } else if (argc != 2)
2986 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
2990 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2991 "sendfd unveil", NULL) == -1)
2995 cwd = getcwd(NULL, 0);
2997 error = got_error_from_errno("getcwd");
3001 if (repo_path == NULL) {
3002 error = got_worktree_open(&worktree, cwd);
3003 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3009 strdup(got_worktree_get_repo_path(worktree));
3010 if (repo_path == NULL)
3011 error = got_error_from_errno("strdup");
3015 repo_path = strdup(cwd);
3016 if (repo_path == NULL) {
3017 error = got_error_from_errno("strdup");
3023 error = got_repo_open(&repo, repo_path);
3027 error = apply_unveil(got_repo_get_path(repo), do_list,
3028 worktree ? got_worktree_get_root_path(worktree) : NULL);
3033 error = list_refs(repo);
3035 error = delete_ref(repo, delref);
3036 else if (create_symref)
3037 error = add_symref(repo, argv[0], argv[1]);
3039 error = add_ref(repo, argv[0], argv[1]);
3042 got_repo_close(repo);
3044 got_worktree_close(worktree);
3054 "usage: %s branch [-r repository] -l | -d name | "
3055 "name [base-branch]\n", getprogname());
3059 static const struct got_error *
3060 list_branches(struct got_repository *repo, struct got_worktree *worktree)
3062 static const struct got_error *err = NULL;
3063 struct got_reflist_head refs;
3064 struct got_reflist_entry *re;
3066 SIMPLEQ_INIT(&refs);
3068 err = got_ref_list(&refs, repo);
3072 SIMPLEQ_FOREACH(re, &refs, entry) {
3073 const char *refname, *marker = " ";
3075 refname = got_ref_get_name(re->ref);
3076 if (strncmp(refname, "refs/heads/", 11) != 0)
3078 if (worktree && strcmp(refname,
3079 got_worktree_get_head_ref_name(worktree)) == 0) {
3080 struct got_object_id *id = NULL;
3081 err = got_ref_resolve(&id, repo, re->ref);
3084 if (got_object_id_cmp(id,
3085 got_worktree_get_base_commit_id(worktree)) == 0)
3092 refstr = got_ref_to_str(re->ref);
3094 return got_error_from_errno("got_ref_to_str");
3095 printf("%s%s: %s\n", marker, refname, refstr);
3099 got_ref_list_free(&refs);
3103 static const struct got_error *
3104 delete_branch(struct got_repository *repo, const char *branch_name)
3106 const struct got_error *err = NULL;
3107 struct got_reference *ref;
3110 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3111 return got_error_from_errno("asprintf");
3113 err = got_ref_open(&ref, repo, refname, 0);
3117 err = got_ref_delete(ref, repo);
3124 static const struct got_error *
3125 add_branch(struct got_repository *repo, const char *branch_name,
3126 const char *base_branch)
3128 const struct got_error *err = NULL;
3129 struct got_object_id *id = NULL;
3130 struct got_reference *ref = NULL;
3131 char *base_refname = NULL, *refname = NULL;
3132 struct got_reference *base_ref;
3135 * Don't let the user create a branch named '-'.
3136 * While technically a valid reference name, this case is usually
3137 * an unintended typo.
3139 if (branch_name[0] == '-' && branch_name[1] == '\0')
3140 return got_error(GOT_ERR_BAD_REF_NAME);
3142 if (strcmp(GOT_REF_HEAD, base_branch) == 0) {
3143 base_refname = strdup(GOT_REF_HEAD);
3144 if (base_refname == NULL)
3145 return got_error_from_errno("strdup");
3146 } else if (asprintf(&base_refname, "refs/heads/%s", base_branch) == -1)
3147 return got_error_from_errno("asprintf");
3149 err = got_ref_open(&base_ref, repo, base_refname, 0);
3152 err = got_ref_resolve(&id, repo, base_ref);
3153 got_ref_close(base_ref);
3157 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3158 err = got_error_from_errno("asprintf");
3162 err = got_ref_open(&ref, repo, refname, 0);
3164 err = got_error(GOT_ERR_BRANCH_EXISTS);
3166 } else if (err->code != GOT_ERR_NOT_REF)
3169 err = got_ref_alloc(&ref, refname, id);
3173 err = got_ref_write(ref, repo);
3183 static const struct got_error *
3184 cmd_branch(int argc, char *argv[])
3186 const struct got_error *error = NULL;
3187 struct got_repository *repo = NULL;
3188 struct got_worktree *worktree = NULL;
3189 char *cwd = NULL, *repo_path = NULL;
3190 int ch, do_list = 0;
3191 const char *delref = NULL;
3193 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3199 repo_path = realpath(optarg, NULL);
3200 if (repo_path == NULL)
3201 err(1, "-r option");
3202 got_path_strip_trailing_slashes(repo_path);
3213 if (do_list && delref)
3214 errx(1, "-l and -d options are mutually exclusive\n");
3219 if (do_list || delref) {
3222 } else if (argc < 1 || argc > 2)
3227 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3231 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3232 "sendfd unveil", NULL) == -1)
3236 cwd = getcwd(NULL, 0);
3238 error = got_error_from_errno("getcwd");
3242 if (repo_path == NULL) {
3243 error = got_worktree_open(&worktree, cwd);
3244 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3250 strdup(got_worktree_get_repo_path(worktree));
3251 if (repo_path == NULL)
3252 error = got_error_from_errno("strdup");
3256 repo_path = strdup(cwd);
3257 if (repo_path == NULL) {
3258 error = got_error_from_errno("strdup");
3264 error = got_repo_open(&repo, repo_path);
3268 error = apply_unveil(got_repo_get_path(repo), do_list,
3269 worktree ? got_worktree_get_root_path(worktree) : NULL);
3274 error = list_branches(repo, worktree);
3276 error = delete_branch(repo, delref);
3278 const char *base_branch;
3280 base_branch = worktree ?
3281 got_worktree_get_head_ref_name(worktree) :
3283 if (strncmp(base_branch, "refs/heads/", 11) == 0)
3286 base_branch = argv[1];
3287 error = add_branch(repo, argv[0], base_branch);
3291 got_repo_close(repo);
3293 got_worktree_close(worktree);
3304 "usage: %s tag [-r repository] | -l | "
3305 "[-m message] name [commit]\n", getprogname());
3309 static const struct got_error *
3310 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3312 static const struct got_error *err = NULL;
3313 struct got_reflist_head refs;
3314 struct got_reflist_entry *re;
3316 SIMPLEQ_INIT(&refs);
3318 err = got_ref_list(&refs, repo);
3322 SIMPLEQ_FOREACH(re, &refs, entry) {
3323 const char *refname;
3324 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3327 struct got_object_id *id;
3328 struct got_tag_object *tag;
3330 refname = got_ref_get_name(re->ref);
3331 if (strncmp(refname, "refs/tags/", 10) != 0)
3334 refstr = got_ref_to_str(re->ref);
3335 if (refstr == NULL) {
3336 err = got_error_from_errno("got_ref_to_str");
3339 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3342 err = got_ref_resolve(&id, repo, re->ref);
3345 err = got_object_open_as_tag(&tag, repo, id);
3349 printf("from: %s\n", got_object_tag_get_tagger(tag));
3350 tagger_time = got_object_tag_get_tagger_time(tag);
3351 datestr = get_datestr(&tagger_time, datebuf);
3353 printf("date: %s UTC\n", datestr);
3354 err = got_object_id_str(&id_str,
3355 got_object_tag_get_object_id(tag));
3358 switch (got_object_tag_get_object_type(tag)) {
3359 case GOT_OBJ_TYPE_BLOB:
3360 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3362 case GOT_OBJ_TYPE_TREE:
3363 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3365 case GOT_OBJ_TYPE_COMMIT:
3366 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3368 case GOT_OBJ_TYPE_TAG:
3369 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3375 tagmsg0 = strdup(got_object_tag_get_message(tag));
3376 got_object_tag_close(tag);
3377 if (tagmsg0 == NULL) {
3378 err = got_error_from_errno("strdup");
3384 line = strsep(&tagmsg, "\n");
3386 printf(" %s\n", line);
3391 got_ref_list_free(&refs);
3395 static const struct got_error *
3396 get_tag_message(char **tagmsg, const char *commit_id_str,
3397 const char *tag_name, const char *repo_path)
3399 const struct got_error *err = NULL;
3400 char *template = NULL, *initial_content = NULL;
3401 char *tagmsg_path = NULL, *editor = NULL;
3404 if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3405 err = got_error_from_errno("asprintf");
3409 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3410 commit_id_str, tag_name) == -1) {
3411 err = got_error_from_errno("asprintf");
3415 err = got_opentemp_named_fd(&tagmsg_path, &fd, template);
3419 dprintf(fd, initial_content);
3422 err = get_editor(&editor);
3425 err = edit_logmsg(tagmsg, editor, tagmsg_path, initial_content);
3427 if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3428 unlink(tagmsg_path);
3432 free(initial_content);
3436 /* Editor is done; we can now apply unveil(2) */
3438 err = apply_unveil(repo_path, 0, NULL);
3447 static const struct got_error *
3448 add_tag(struct got_repository *repo, const char *tag_name,
3449 const char *commit_arg, const char *tagmsg_arg)
3451 const struct got_error *err = NULL;
3452 struct got_object_id *commit_id = NULL, *tag_id = NULL;
3453 char *label = NULL, *commit_id_str = NULL;
3454 struct got_reference *ref = NULL;
3455 char *refname = NULL, *tagmsg = NULL;
3459 * Don't let the user create a tag named '-'.
3460 * While technically a valid reference name, this case is usually
3461 * an unintended typo.
3463 if (tag_name[0] == '-' && tag_name[1] == '\0')
3464 return got_error(GOT_ERR_BAD_REF_NAME);
3466 err = get_author(&tagger);
3470 err = match_object_id(&commit_id, &label, commit_arg,
3471 GOT_OBJ_TYPE_COMMIT, 1, repo);
3475 err = got_object_id_str(&commit_id_str, commit_id);
3479 if (strncmp("refs/tags/", tag_name, 10) == 0) {
3480 refname = strdup(tag_name);
3481 if (refname == NULL) {
3482 err = got_error_from_errno("strdup");
3486 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3487 err = got_error_from_errno("asprintf");
3491 err = got_ref_open(&ref, repo, refname, 0);
3493 err = got_error(GOT_ERR_TAG_EXISTS);
3495 } else if (err->code != GOT_ERR_NOT_REF)
3498 if (tagmsg_arg == NULL) {
3499 err = get_tag_message(&tagmsg, commit_id_str,
3500 tag_name, got_repo_get_path(repo));
3505 err = got_object_tag_create(&tag_id, tag_name, commit_id,
3506 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3510 err = got_ref_alloc(&ref, refname, tag_id);
3514 err = got_ref_write(ref, repo);
3518 err = got_object_id_str(&tag_id_str, tag_id);
3519 printf("Created tag %s\n", tag_id_str);
3526 free(commit_id_str);
3532 static const struct got_error *
3533 cmd_tag(int argc, char *argv[])
3535 const struct got_error *error = NULL;
3536 struct got_repository *repo = NULL;
3537 struct got_worktree *worktree = NULL;
3538 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3539 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3540 int ch, do_list = 0;
3542 while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3548 repo_path = realpath(optarg, NULL);
3549 if (repo_path == NULL)
3550 err(1, "-r option");
3551 got_path_strip_trailing_slashes(repo_path);
3567 errx(1, "-l and -m options are mutually exclusive\n");
3570 } else if (argc < 1 || argc > 2)
3575 commit_id_arg = argv[1];
3580 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3584 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3585 "sendfd unveil", NULL) == -1)
3589 cwd = getcwd(NULL, 0);
3591 error = got_error_from_errno("getcwd");
3595 if (repo_path == NULL) {
3596 error = got_worktree_open(&worktree, cwd);
3597 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3603 strdup(got_worktree_get_repo_path(worktree));
3604 if (repo_path == NULL)
3605 error = got_error_from_errno("strdup");
3609 repo_path = strdup(cwd);
3610 if (repo_path == NULL) {
3611 error = got_error_from_errno("strdup");
3617 error = got_repo_open(&repo, repo_path);
3623 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3626 error = list_tags(repo, worktree);
3629 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3634 if (commit_id_arg == NULL) {
3635 struct got_reference *head_ref;
3636 struct got_object_id *commit_id;
3637 error = got_ref_open(&head_ref, repo,
3638 worktree ? got_worktree_get_head_ref_name(worktree)
3642 error = got_ref_resolve(&commit_id, repo, head_ref);
3643 got_ref_close(head_ref);
3646 error = got_object_id_str(&commit_id_str, commit_id);
3652 error = add_tag(repo, tag_name,
3653 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
3657 got_repo_close(repo);
3659 got_worktree_close(worktree);
3662 free(commit_id_str);
3669 fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3673 static const struct got_error *
3674 cmd_add(int argc, char *argv[])
3676 const struct got_error *error = NULL;
3677 struct got_repository *repo = NULL;
3678 struct got_worktree *worktree = NULL;
3680 struct got_pathlist_head paths;
3681 struct got_pathlist_entry *pe;
3686 while ((ch = getopt(argc, argv, "")) != -1) {
3698 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3705 cwd = getcwd(NULL, 0);
3707 error = got_error_from_errno("getcwd");
3711 error = got_worktree_open(&worktree, cwd);
3715 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3719 error = apply_unveil(got_repo_get_path(repo), 1,
3720 got_worktree_get_root_path(worktree));
3724 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3728 error = got_worktree_schedule_add(worktree, &paths, print_status,
3732 got_repo_close(repo);
3734 got_worktree_close(worktree);
3735 TAILQ_FOREACH(pe, &paths, entry)
3736 free((char *)pe->path);
3737 got_pathlist_free(&paths);
3745 fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3749 static const struct got_error *
3750 cmd_remove(int argc, char *argv[])
3752 const struct got_error *error = NULL;
3753 struct got_worktree *worktree = NULL;
3754 struct got_repository *repo = NULL;
3756 struct got_pathlist_head paths;
3757 struct got_pathlist_entry *pe;
3758 int ch, delete_local_mods = 0;
3762 while ((ch = getopt(argc, argv, "f")) != -1) {
3765 delete_local_mods = 1;
3777 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3784 cwd = getcwd(NULL, 0);
3786 error = got_error_from_errno("getcwd");
3789 error = got_worktree_open(&worktree, cwd);
3793 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3797 error = apply_unveil(got_repo_get_path(repo), 1,
3798 got_worktree_get_root_path(worktree));
3802 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3806 error = got_worktree_schedule_delete(worktree, &paths,
3807 delete_local_mods, print_status, NULL, repo);
3812 got_repo_close(repo);
3814 got_worktree_close(worktree);
3815 TAILQ_FOREACH(pe, &paths, entry)
3816 free((char *)pe->path);
3817 got_pathlist_free(&paths);
3825 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
3826 "path ...\n", getprogname());
3830 static const struct got_error *
3831 revert_progress(void *arg, unsigned char status, const char *path)
3833 while (path[0] == '/')
3835 printf("%c %s\n", status, path);
3839 struct choose_patch_arg {
3840 FILE *patch_script_file;
3844 static const struct got_error *
3845 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
3846 int nchanges, const char *action)
3849 size_t linesize = 0;
3853 case GOT_STATUS_ADD:
3854 printf("A %s\n%s this addition? [y/n] ", path, action);
3856 case GOT_STATUS_DELETE:
3857 printf("D %s\n%s this deletion? [y/n] ", path, action);
3859 case GOT_STATUS_MODIFY:
3860 if (fseek(patch_file, 0L, SEEK_SET) == -1)
3861 return got_error_from_errno("fseek");
3862 printf(GOT_COMMIT_SEP_STR);
3863 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
3865 if (ferror(patch_file))
3866 return got_error_from_errno("getline");
3867 printf(GOT_COMMIT_SEP_STR);
3868 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
3869 path, n, nchanges, action);
3872 return got_error_path(path, GOT_ERR_FILE_STATUS);
3878 static const struct got_error *
3879 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
3880 FILE *patch_file, int n, int nchanges)
3882 const struct got_error *err = NULL;
3884 size_t linesize = 0;
3887 struct choose_patch_arg *a = arg;
3889 *choice = GOT_PATCH_CHOICE_NONE;
3891 if (a->patch_script_file) {
3893 err = show_change(status, path, patch_file, n, nchanges,
3897 linelen = getline(&line, &linesize, a->patch_script_file);
3898 if (linelen == -1) {
3899 if (ferror(a->patch_script_file))
3900 return got_error_from_errno("getline");
3903 nl = strchr(line, '\n');
3906 if (strcmp(line, "y") == 0) {
3907 *choice = GOT_PATCH_CHOICE_YES;
3909 } else if (strcmp(line, "n") == 0) {
3910 *choice = GOT_PATCH_CHOICE_NO;
3912 } else if (strcmp(line, "q") == 0 &&
3913 status == GOT_STATUS_MODIFY) {
3914 *choice = GOT_PATCH_CHOICE_QUIT;
3917 printf("invalid response '%s'\n", line);
3922 while (resp != 'y' && resp != 'n' && resp != 'q') {
3923 err = show_change(status, path, patch_file, n, nchanges,
3930 if (status == GOT_STATUS_MODIFY) {
3931 if (resp != 'y' && resp != 'n' && resp != 'q') {
3932 printf("invalid response '%c'\n", resp);
3935 } else if (resp != 'y' && resp != 'n') {
3936 printf("invalid response '%c'\n", resp);
3942 *choice = GOT_PATCH_CHOICE_YES;
3943 else if (resp == 'n')
3944 *choice = GOT_PATCH_CHOICE_NO;
3945 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
3946 *choice = GOT_PATCH_CHOICE_QUIT;
3952 static const struct got_error *
3953 cmd_revert(int argc, char *argv[])
3955 const struct got_error *error = NULL;
3956 struct got_worktree *worktree = NULL;
3957 struct got_repository *repo = NULL;
3958 char *cwd = NULL, *path = NULL;
3959 struct got_pathlist_head paths;
3960 struct got_pathlist_entry *pe;
3961 int ch, can_recurse = 0, pflag = 0;
3962 FILE *patch_script_file = NULL;
3963 const char *patch_script_path = NULL;
3964 struct choose_patch_arg cpa;
3968 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
3974 patch_script_path = optarg;
3989 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3990 "unveil", NULL) == -1)
3995 if (patch_script_path && !pflag)
3996 errx(1, "-F option can only be used together with -p option");
3998 cwd = getcwd(NULL, 0);
4000 error = got_error_from_errno("getcwd");
4003 error = got_worktree_open(&worktree, cwd);
4007 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4011 if (patch_script_path) {
4012 patch_script_file = fopen(patch_script_path, "r");
4013 if (patch_script_file == NULL) {
4014 error = got_error_from_errno2("fopen",
4019 error = apply_unveil(got_repo_get_path(repo), 1,
4020 got_worktree_get_root_path(worktree));
4024 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4031 TAILQ_FOREACH(pe, &paths, entry) {
4032 if (asprintf(&ondisk_path, "%s/%s",
4033 got_worktree_get_root_path(worktree),
4035 error = got_error_from_errno("asprintf");
4038 if (lstat(ondisk_path, &sb) == -1) {
4039 if (errno == ENOENT) {
4043 error = got_error_from_errno2("lstat",
4049 if (S_ISDIR(sb.st_mode)) {
4050 error = got_error_msg(GOT_ERR_BAD_PATH,
4051 "reverting directories requires -R option");
4057 cpa.patch_script_file = patch_script_file;
4058 cpa.action = "revert";
4059 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4060 pflag ? choose_patch : NULL, &cpa, repo);
4064 if (patch_script_file && fclose(patch_script_file) == EOF &&
4066 error = got_error_from_errno2("fclose", patch_script_path);
4068 got_repo_close(repo);
4070 got_worktree_close(worktree);
4079 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4084 struct collect_commit_logmsg_arg {
4085 const char *cmdline_log;
4087 const char *worktree_path;
4088 const char *branch_name;
4089 const char *repo_path;
4094 static const struct got_error *
4095 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4098 char *initial_content = NULL;
4099 struct got_pathlist_entry *pe;
4100 const struct got_error *err = NULL;
4101 char *template = NULL;
4102 struct collect_commit_logmsg_arg *a = arg;
4106 /* if a message was specified on the command line, just use it */
4107 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4108 len = strlen(a->cmdline_log) + 1;
4109 *logmsg = malloc(len + 1);
4110 if (*logmsg == NULL)
4111 return got_error_from_errno("malloc");
4112 strlcpy(*logmsg, a->cmdline_log, len);
4116 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4117 return got_error_from_errno("asprintf");
4119 if (asprintf(&initial_content,
4120 "\n# changes to be committed on branch %s:\n",
4121 a->branch_name) == -1)
4122 return got_error_from_errno("asprintf");
4124 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4128 dprintf(fd, initial_content);
4130 TAILQ_FOREACH(pe, commitable_paths, entry) {
4131 struct got_commitable *ct = pe->data;
4132 dprintf(fd, "# %c %s\n",
4133 got_commitable_get_status(ct),
4134 got_commitable_get_path(ct));
4138 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4140 if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
4141 unlink(a->logmsg_path);
4142 free(a->logmsg_path);
4143 a->logmsg_path = NULL;
4145 free(initial_content);
4148 /* Editor is done; we can now apply unveil(2) */
4150 err = apply_unveil(a->repo_path, 0, a->worktree_path);
4159 static const struct got_error *
4160 cmd_commit(int argc, char *argv[])
4162 const struct got_error *error = NULL;
4163 struct got_worktree *worktree = NULL;
4164 struct got_repository *repo = NULL;
4165 char *cwd = NULL, *id_str = NULL;
4166 struct got_object_id *id = NULL;
4167 const char *logmsg = NULL;
4169 struct collect_commit_logmsg_arg cl_arg;
4170 char *editor = NULL;
4171 int ch, rebase_in_progress, histedit_in_progress;
4172 struct got_pathlist_head paths;
4175 cl_arg.logmsg_path = NULL;
4177 while ((ch = getopt(argc, argv, "m:")) != -1) {
4192 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4193 "unveil", NULL) == -1)
4196 error = get_author(&author);
4200 cwd = getcwd(NULL, 0);
4202 error = got_error_from_errno("getcwd");
4205 error = got_worktree_open(&worktree, cwd);
4209 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4212 if (rebase_in_progress) {
4213 error = got_error(GOT_ERR_REBASING);
4217 error = got_worktree_histedit_in_progress(&histedit_in_progress,
4222 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4227 * unveil(2) traverses exec(2); if an editor is used we have
4228 * to apply unveil after the log message has been written.
4230 if (logmsg == NULL || strlen(logmsg) == 0)
4231 error = get_editor(&editor);
4233 error = apply_unveil(got_repo_get_path(repo), 0,
4234 got_worktree_get_root_path(worktree));
4238 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4242 cl_arg.editor = editor;
4243 cl_arg.cmdline_log = logmsg;
4244 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4245 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4246 if (!histedit_in_progress) {
4247 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4248 error = got_error(GOT_ERR_COMMIT_BRANCH);
4251 cl_arg.branch_name += 11;
4253 cl_arg.repo_path = got_repo_get_path(repo);
4254 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4255 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4257 if (cl_arg.logmsg_path)
4258 fprintf(stderr, "%s: log message preserved in %s\n",
4259 getprogname(), cl_arg.logmsg_path);
4263 if (cl_arg.logmsg_path)
4264 unlink(cl_arg.logmsg_path);
4266 error = got_object_id_str(&id_str, id);
4269 printf("Created commit %s\n", id_str);
4271 free(cl_arg.logmsg_path);
4273 got_repo_close(repo);
4275 got_worktree_close(worktree);
4283 usage_cherrypick(void)
4285 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4289 static const struct got_error *
4290 cmd_cherrypick(int argc, char *argv[])
4292 const struct got_error *error = NULL;
4293 struct got_worktree *worktree = NULL;
4294 struct got_repository *repo = NULL;
4295 char *cwd = NULL, *commit_id_str = NULL;
4296 struct got_object_id *commit_id = NULL;
4297 struct got_commit_object *commit = NULL;
4298 struct got_object_qid *pid;
4299 struct got_reference *head_ref = NULL;
4300 int ch, did_something = 0;
4302 while ((ch = getopt(argc, argv, "")) != -1) {
4314 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4315 "unveil", NULL) == -1)
4321 cwd = getcwd(NULL, 0);
4323 error = got_error_from_errno("getcwd");
4326 error = got_worktree_open(&worktree, cwd);
4330 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4334 error = apply_unveil(got_repo_get_path(repo), 0,
4335 got_worktree_get_root_path(worktree));
4339 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4340 GOT_OBJ_TYPE_COMMIT, repo);
4341 if (error != NULL) {
4342 struct got_reference *ref;
4343 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4345 error = got_ref_open(&ref, repo, argv[0], 0);
4348 error = got_ref_resolve(&commit_id, repo, ref);
4353 error = got_object_id_str(&commit_id_str, commit_id);
4357 error = got_ref_open(&head_ref, repo,
4358 got_worktree_get_head_ref_name(worktree), 0);
4362 error = check_same_branch(commit_id, head_ref, NULL, repo);
4364 if (error->code != GOT_ERR_ANCESTRY)
4368 error = got_error(GOT_ERR_SAME_BRANCH);
4372 error = got_object_open_as_commit(&commit, repo, commit_id);
4375 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4376 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4377 commit_id, repo, update_progress, &did_something, check_cancelled,
4383 printf("Merged commit %s\n", commit_id_str);
4386 got_object_commit_close(commit);
4387 free(commit_id_str);
4389 got_ref_close(head_ref);
4391 got_worktree_close(worktree);
4393 got_repo_close(repo);
4400 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4404 static const struct got_error *
4405 cmd_backout(int argc, char *argv[])
4407 const struct got_error *error = NULL;
4408 struct got_worktree *worktree = NULL;
4409 struct got_repository *repo = NULL;
4410 char *cwd = NULL, *commit_id_str = NULL;
4411 struct got_object_id *commit_id = NULL;
4412 struct got_commit_object *commit = NULL;
4413 struct got_object_qid *pid;
4414 struct got_reference *head_ref = NULL;
4415 int ch, did_something = 0;
4417 while ((ch = getopt(argc, argv, "")) != -1) {
4429 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4430 "unveil", NULL) == -1)
4436 cwd = getcwd(NULL, 0);
4438 error = got_error_from_errno("getcwd");
4441 error = got_worktree_open(&worktree, cwd);
4445 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4449 error = apply_unveil(got_repo_get_path(repo), 0,
4450 got_worktree_get_root_path(worktree));
4454 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4455 GOT_OBJ_TYPE_COMMIT, repo);
4456 if (error != NULL) {
4457 struct got_reference *ref;
4458 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4460 error = got_ref_open(&ref, repo, argv[0], 0);
4463 error = got_ref_resolve(&commit_id, repo, ref);
4468 error = got_object_id_str(&commit_id_str, commit_id);
4472 error = got_ref_open(&head_ref, repo,
4473 got_worktree_get_head_ref_name(worktree), 0);
4477 error = check_same_branch(commit_id, head_ref, NULL, repo);
4481 error = got_object_open_as_commit(&commit, repo, commit_id);
4484 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4486 error = got_error(GOT_ERR_ROOT_COMMIT);
4490 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4491 update_progress, &did_something, check_cancelled, NULL);
4496 printf("Backed out commit %s\n", commit_id_str);
4499 got_object_commit_close(commit);
4500 free(commit_id_str);
4502 got_ref_close(head_ref);
4504 got_worktree_close(worktree);
4506 got_repo_close(repo);
4513 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4519 trim_logmsg(char *logmsg, int limit)
4524 len = strlen(logmsg);
4528 nl = strchr(logmsg, '\n');
4533 static const struct got_error *
4534 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4536 const struct got_error *err;
4537 char *logmsg0 = NULL;
4540 err = got_object_commit_get_logmsg(&logmsg0, commit);
4545 while (isspace((unsigned char)s[0]))
4548 *logmsg = strdup(s);
4549 if (*logmsg == NULL) {
4550 err = got_error_from_errno("strdup");
4554 trim_logmsg(*logmsg, limit);
4560 static const struct got_error *
4561 show_rebase_progress(struct got_commit_object *commit,
4562 struct got_object_id *old_id, struct got_object_id *new_id)
4564 const struct got_error *err;
4565 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4567 err = got_object_id_str(&old_id_str, old_id);
4572 err = got_object_id_str(&new_id_str, new_id);
4577 old_id_str[12] = '\0';
4579 new_id_str[12] = '\0';
4581 err = get_short_logmsg(&logmsg, 42, commit);
4585 printf("%s -> %s: %s\n", old_id_str,
4586 new_id_str ? new_id_str : "no-op change", logmsg);
4593 static const struct got_error *
4594 rebase_progress(void *arg, unsigned char status, const char *path)
4596 unsigned char *rebase_status = arg;
4598 while (path[0] == '/')
4600 printf("%c %s\n", status, path);
4602 if (*rebase_status == GOT_STATUS_CONFLICT)
4604 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
4605 *rebase_status = status;
4609 static const struct got_error *
4610 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
4611 struct got_reference *branch, struct got_reference *new_base_branch,
4612 struct got_reference *tmp_branch, struct got_repository *repo)
4614 printf("Switching work tree to %s\n", got_ref_get_name(branch));
4615 return got_worktree_rebase_complete(worktree, fileindex,
4616 new_base_branch, tmp_branch, branch, repo);
4619 static const struct got_error *
4620 rebase_commit(struct got_pathlist_head *merged_paths,
4621 struct got_worktree *worktree, struct got_fileindex *fileindex,
4622 struct got_reference *tmp_branch,
4623 struct got_object_id *commit_id, struct got_repository *repo)
4625 const struct got_error *error;
4626 struct got_commit_object *commit;
4627 struct got_object_id *new_commit_id;
4629 error = got_object_open_as_commit(&commit, repo, commit_id);
4633 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4634 worktree, fileindex, tmp_branch, commit, commit_id, repo);
4636 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4638 error = show_rebase_progress(commit, commit_id, NULL);
4640 error = show_rebase_progress(commit, commit_id, new_commit_id);
4641 free(new_commit_id);
4644 got_object_commit_close(commit);
4648 struct check_path_prefix_arg {
4649 const char *path_prefix;
4654 static const struct got_error *
4655 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4656 struct got_blob_object *blob2, struct got_object_id *id1,
4657 struct got_object_id *id2, const char *path1, const char *path2,
4658 struct got_repository *repo)
4660 struct check_path_prefix_arg *a = arg;
4662 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4663 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4664 return got_error(a->errcode);
4669 static const struct got_error *
4670 check_path_prefix(struct got_object_id *parent_id,
4671 struct got_object_id *commit_id, const char *path_prefix,
4672 int errcode, struct got_repository *repo)
4674 const struct got_error *err;
4675 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4676 struct got_commit_object *commit = NULL, *parent_commit = NULL;
4677 struct check_path_prefix_arg cpp_arg;
4679 if (got_path_is_root_dir(path_prefix))
4682 err = got_object_open_as_commit(&commit, repo, commit_id);
4686 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4690 err = got_object_open_as_tree(&tree1, repo,
4691 got_object_commit_get_tree_id(parent_commit));
4695 err = got_object_open_as_tree(&tree2, repo,
4696 got_object_commit_get_tree_id(commit));
4700 cpp_arg.path_prefix = path_prefix;
4701 while (cpp_arg.path_prefix[0] == '/')
4702 cpp_arg.path_prefix++;
4703 cpp_arg.len = strlen(cpp_arg.path_prefix);
4704 cpp_arg.errcode = errcode;
4705 err = got_diff_tree(tree1, tree2, "", "", repo,
4706 check_path_prefix_in_diff, &cpp_arg, 0);
4709 got_object_tree_close(tree1);
4711 got_object_tree_close(tree2);
4713 got_object_commit_close(commit);
4715 got_object_commit_close(parent_commit);
4719 static const struct got_error *
4720 collect_commits(struct got_object_id_queue *commits,
4721 struct got_object_id *initial_commit_id,
4722 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
4723 const char *path_prefix, int path_prefix_errcode,
4724 struct got_repository *repo)
4726 const struct got_error *err = NULL;
4727 struct got_commit_graph *graph = NULL;
4728 struct got_object_id *parent_id = NULL;
4729 struct got_object_qid *qid;
4730 struct got_object_id *commit_id = initial_commit_id;
4732 err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
4736 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
4737 check_cancelled, NULL);
4740 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
4741 err = got_commit_graph_iter_next(&parent_id, graph);
4743 if (err->code == GOT_ERR_ITER_COMPLETED) {
4744 err = got_error_msg(GOT_ERR_ANCESTRY,
4745 "ran out of commits to rebase before "
4746 "youngest common ancestor commit has "
4749 } else if (err->code != GOT_ERR_ITER_NEED_MORE)
4751 err = got_commit_graph_fetch_commits(graph, 1, repo,
4752 check_cancelled, NULL);
4756 err = check_path_prefix(parent_id, commit_id,
4757 path_prefix, path_prefix_errcode, repo);
4761 err = got_object_qid_alloc(&qid, commit_id);
4764 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
4765 commit_id = parent_id;
4769 got_commit_graph_close(graph);
4773 static const struct got_error *
4774 cmd_rebase(int argc, char *argv[])
4776 const struct got_error *error = NULL;
4777 struct got_worktree *worktree = NULL;
4778 struct got_repository *repo = NULL;
4779 struct got_fileindex *fileindex = NULL;
4781 struct got_reference *branch = NULL;
4782 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
4783 struct got_object_id *commit_id = NULL, *parent_id = NULL;
4784 struct got_object_id *resume_commit_id = NULL;
4785 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
4786 struct got_commit_object *commit = NULL;
4787 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
4788 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4789 struct got_object_id_queue commits;
4790 struct got_pathlist_head merged_paths;
4791 const struct got_object_id_queue *parent_ids;
4792 struct got_object_qid *qid, *pid;
4794 SIMPLEQ_INIT(&commits);
4795 TAILQ_INIT(&merged_paths);
4797 while ((ch = getopt(argc, argv, "ac")) != -1) {
4803 continue_rebase = 1;
4815 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4816 "unveil", NULL) == -1)
4819 if (abort_rebase && continue_rebase)
4821 else if (abort_rebase || continue_rebase) {
4824 } else if (argc != 1)
4827 cwd = getcwd(NULL, 0);
4829 error = got_error_from_errno("getcwd");
4832 error = got_worktree_open(&worktree, cwd);
4836 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4840 error = apply_unveil(got_repo_get_path(repo), 0,
4841 got_worktree_get_root_path(worktree));
4845 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4851 if (!rebase_in_progress) {
4852 error = got_error(GOT_ERR_NOT_REBASING);
4855 error = got_worktree_rebase_continue(&resume_commit_id,
4856 &new_base_branch, &tmp_branch, &branch, &fileindex,
4860 printf("Switching work tree to %s\n",
4861 got_ref_get_symref_target(new_base_branch));
4862 error = got_worktree_rebase_abort(worktree, fileindex, repo,
4863 new_base_branch, update_progress, &did_something);
4866 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
4867 goto done; /* nothing else to do */
4870 if (continue_rebase) {
4871 if (!rebase_in_progress) {
4872 error = got_error(GOT_ERR_NOT_REBASING);
4875 error = got_worktree_rebase_continue(&resume_commit_id,
4876 &new_base_branch, &tmp_branch, &branch, &fileindex,
4881 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
4882 resume_commit_id, repo);
4886 yca_id = got_object_id_dup(resume_commit_id);
4887 if (yca_id == NULL) {
4888 error = got_error_from_errno("got_object_id_dup");
4892 error = got_ref_open(&branch, repo, argv[0], 0);
4897 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
4901 if (!continue_rebase) {
4902 struct got_object_id *base_commit_id;
4904 base_commit_id = got_worktree_get_base_commit_id(worktree);
4905 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
4906 base_commit_id, branch_head_commit_id, repo,
4907 check_cancelled, NULL);
4910 if (yca_id == NULL) {
4911 error = got_error_msg(GOT_ERR_ANCESTRY,
4912 "specified branch shares no common ancestry "
4913 "with work tree's branch");
4917 error = check_same_branch(base_commit_id, branch, yca_id, repo);
4919 if (error->code != GOT_ERR_ANCESTRY)
4923 error = got_error_msg(GOT_ERR_SAME_BRANCH,
4924 "specified branch resolves to a commit which "
4925 "is already contained in work tree's branch");
4928 error = got_worktree_rebase_prepare(&new_base_branch,
4929 &tmp_branch, &fileindex, worktree, branch, repo);
4934 commit_id = branch_head_commit_id;
4935 error = got_object_open_as_commit(&commit, repo, commit_id);
4939 parent_ids = got_object_commit_get_parent_ids(commit);
4940 pid = SIMPLEQ_FIRST(parent_ids);
4942 if (!continue_rebase) {
4944 error = got_worktree_rebase_abort(worktree, fileindex,
4945 repo, new_base_branch, update_progress,
4949 printf("Rebase of %s aborted\n",
4950 got_ref_get_name(branch));
4952 error = got_error(GOT_ERR_EMPTY_REBASE);
4955 error = collect_commits(&commits, commit_id, pid->id,
4956 yca_id, got_worktree_get_path_prefix(worktree),
4957 GOT_ERR_REBASE_PATH, repo);
4958 got_object_commit_close(commit);
4963 if (SIMPLEQ_EMPTY(&commits)) {
4964 if (continue_rebase)
4965 error = rebase_complete(worktree, fileindex,
4966 branch, new_base_branch, tmp_branch, repo);
4968 error = got_error(GOT_ERR_EMPTY_REBASE);
4973 SIMPLEQ_FOREACH(qid, &commits, entry) {
4974 commit_id = qid->id;
4975 parent_id = pid ? pid->id : yca_id;
4978 error = got_worktree_rebase_merge_files(&merged_paths,
4979 worktree, fileindex, parent_id, commit_id, repo,
4980 rebase_progress, &rebase_status, check_cancelled, NULL);
4984 if (rebase_status == GOT_STATUS_CONFLICT) {
4985 got_worktree_rebase_pathlist_free(&merged_paths);
4989 error = rebase_commit(&merged_paths, worktree, fileindex,
4990 tmp_branch, commit_id, repo);
4991 got_worktree_rebase_pathlist_free(&merged_paths);
4996 if (rebase_status == GOT_STATUS_CONFLICT) {
4997 error = got_worktree_rebase_postpone(worktree, fileindex);
5000 error = got_error_msg(GOT_ERR_CONFLICTS,
5001 "conflicts must be resolved before rebasing can continue");
5003 error = rebase_complete(worktree, fileindex, branch,
5004 new_base_branch, tmp_branch, repo);
5006 got_object_id_queue_free(&commits);
5007 free(branch_head_commit_id);
5008 free(resume_commit_id);
5011 got_object_commit_close(commit);
5013 got_ref_close(branch);
5014 if (new_base_branch)
5015 got_ref_close(new_base_branch);
5017 got_ref_close(tmp_branch);
5019 got_worktree_close(worktree);
5021 got_repo_close(repo);
5026 usage_histedit(void)
5028 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5033 #define GOT_HISTEDIT_PICK 'p'
5034 #define GOT_HISTEDIT_EDIT 'e'
5035 #define GOT_HISTEDIT_FOLD 'f'
5036 #define GOT_HISTEDIT_DROP 'd'
5037 #define GOT_HISTEDIT_MESG 'm'
5039 static struct got_histedit_cmd {
5043 } got_histedit_cmds[] = {
5044 { GOT_HISTEDIT_PICK, "pick", "use commit" },
5045 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5046 { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5047 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5048 { GOT_HISTEDIT_MESG, "mesg",
5049 "single-line log message for commit above (open editor if empty)" },
5052 struct got_histedit_list_entry {
5053 TAILQ_ENTRY(got_histedit_list_entry) entry;
5054 struct got_object_id *commit_id;
5055 const struct got_histedit_cmd *cmd;
5058 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5060 static const struct got_error *
5061 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5062 FILE *f, struct got_repository *repo)
5064 const struct got_error *err = NULL;
5065 char *logmsg = NULL, *id_str = NULL;
5066 struct got_commit_object *commit = NULL;
5069 err = got_object_open_as_commit(&commit, repo, commit_id);
5073 err = get_short_logmsg(&logmsg, 34, commit);
5077 err = got_object_id_str(&id_str, commit_id);
5081 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5083 err = got_ferror(f, GOT_ERR_IO);
5086 got_object_commit_close(commit);
5092 static const struct got_error *
5093 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5094 struct got_repository *repo)
5096 const struct got_error *err = NULL;
5097 struct got_object_qid *qid;
5099 if (SIMPLEQ_EMPTY(commits))
5100 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5102 SIMPLEQ_FOREACH(qid, commits, entry) {
5103 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5112 static const struct got_error *
5113 write_cmd_list(FILE *f)
5115 const struct got_error *err = NULL;
5118 n = fprintf(f, "# Available histedit commands:\n");
5120 return got_ferror(f, GOT_ERR_IO);
5122 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5123 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5124 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5127 err = got_ferror(f, GOT_ERR_IO);
5131 n = fprintf(f, "# Commits will be processed in order from top to "
5132 "bottom of this file.\n");
5134 return got_ferror(f, GOT_ERR_IO);
5138 static const struct got_error *
5139 histedit_syntax_error(int lineno)
5141 static char msg[42];
5144 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5146 if (ret == -1 || ret >= sizeof(msg))
5147 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5149 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5152 static const struct got_error *
5153 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5154 char *logmsg, struct got_repository *repo)
5156 const struct got_error *err;
5157 struct got_commit_object *folded_commit = NULL;
5158 char *id_str, *folded_logmsg = NULL;
5160 err = got_object_id_str(&id_str, hle->commit_id);
5164 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5168 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5171 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5172 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5173 folded_logmsg) == -1) {
5174 err = got_error_from_errno("asprintf");
5179 got_object_commit_close(folded_commit);
5181 free(folded_logmsg);
5185 static struct got_histedit_list_entry *
5186 get_folded_commits(struct got_histedit_list_entry *hle)
5188 struct got_histedit_list_entry *prev, *folded = NULL;
5190 prev = TAILQ_PREV(hle, got_histedit_list, entry);
5191 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5192 prev->cmd->code == GOT_HISTEDIT_DROP)) {
5193 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5195 prev = TAILQ_PREV(prev, got_histedit_list, entry);
5201 static const struct got_error *
5202 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5203 struct got_repository *repo)
5205 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5206 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5207 const struct got_error *err = NULL;
5208 struct got_commit_object *commit = NULL;
5210 struct got_histedit_list_entry *folded = NULL;
5212 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5216 folded = get_folded_commits(hle);
5218 while (folded != hle) {
5219 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5220 folded = TAILQ_NEXT(folded, entry);
5223 err = append_folded_commit_msg(&new_msg, folded,
5229 folded = TAILQ_NEXT(folded, entry);
5233 err = got_object_id_str(&id_str, hle->commit_id);
5236 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5239 if (asprintf(&new_msg,
5240 "%s\n# original log message of commit %s: %s",
5241 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5242 err = got_error_from_errno("asprintf");
5248 err = got_object_id_str(&id_str, hle->commit_id);
5252 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5256 dprintf(fd, logmsg);
5259 err = get_editor(&editor);
5263 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5265 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5267 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5270 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5271 err = got_error_from_errno2("unlink", logmsg_path);
5277 got_object_commit_close(commit);
5281 static const struct got_error *
5282 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5283 FILE *f, struct got_repository *repo)
5285 const struct got_error *err = NULL;
5286 char *line = NULL, *p, *end;
5290 const struct got_histedit_cmd *cmd;
5291 struct got_object_id *commit_id = NULL;
5292 struct got_histedit_list_entry *hle = NULL;
5295 len = getline(&line, &size, f);
5297 const struct got_error *getline_err;
5300 getline_err = got_error_from_errno("getline");
5301 err = got_ferror(f, getline_err->code);
5306 while (isspace((unsigned char)p[0]))
5308 if (p[0] == '#' || p[0] == '\0') {
5314 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5315 cmd = &got_histedit_cmds[i];
5316 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5317 isspace((unsigned char)p[strlen(cmd->name)])) {
5318 p += strlen(cmd->name);
5321 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5326 if (i == nitems(got_histedit_cmds)) {
5327 err = histedit_syntax_error(lineno);
5330 while (isspace((unsigned char)p[0]))
5332 if (cmd->code == GOT_HISTEDIT_MESG) {
5333 if (hle == NULL || hle->logmsg != NULL) {
5334 err = got_error(GOT_ERR_HISTEDIT_CMD);
5338 err = histedit_edit_logmsg(hle, repo);
5342 hle->logmsg = strdup(p);
5343 if (hle->logmsg == NULL) {
5344 err = got_error_from_errno("strdup");
5353 while (end[0] && !isspace((unsigned char)end[0]))
5357 err = got_object_resolve_id_str(&commit_id, repo, p);
5359 /* override error code */
5360 err = histedit_syntax_error(lineno);
5364 hle = malloc(sizeof(*hle));
5366 err = got_error_from_errno("malloc");
5370 hle->commit_id = commit_id;
5375 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5383 static const struct got_error *
5384 histedit_check_script(struct got_histedit_list *histedit_cmds,
5385 struct got_object_id_queue *commits, struct got_repository *repo)
5387 const struct got_error *err = NULL;
5388 struct got_object_qid *qid;
5389 struct got_histedit_list_entry *hle;
5390 static char msg[80];
5393 if (TAILQ_EMPTY(histedit_cmds))
5394 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5395 "histedit script contains no commands");
5396 if (SIMPLEQ_EMPTY(commits))
5397 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5399 SIMPLEQ_FOREACH(qid, commits, entry) {
5400 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5401 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5405 err = got_object_id_str(&id_str, qid->id);
5408 snprintf(msg, sizeof(msg),
5409 "commit %s missing from histedit script", id_str);
5411 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5415 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5416 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5417 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5418 "last commit in histedit script cannot be folded");
5423 static const struct got_error *
5424 histedit_run_editor(struct got_histedit_list *histedit_cmds,
5425 const char *path, struct got_object_id_queue *commits,
5426 struct got_repository *repo)
5428 const struct got_error *err = NULL;
5432 err = get_editor(&editor);
5436 if (spawn_editor(editor, path) == -1) {
5437 err = got_error_from_errno("failed spawning editor");
5441 f = fopen(path, "r");
5443 err = got_error_from_errno("fopen");
5446 err = histedit_parse_list(histedit_cmds, f, repo);
5450 err = histedit_check_script(histedit_cmds, commits, repo);
5452 if (f && fclose(f) != 0 && err == NULL)
5453 err = got_error_from_errno("fclose");
5458 static const struct got_error *
5459 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5460 struct got_object_id_queue *, const char *, struct got_repository *);
5462 static const struct got_error *
5463 histedit_edit_script(struct got_histedit_list *histedit_cmds,
5464 struct got_object_id_queue *commits, struct got_repository *repo)
5466 const struct got_error *err;
5470 err = got_opentemp_named(&path, &f, "got-histedit");
5474 err = write_cmd_list(f);
5478 err = histedit_write_commit_list(commits, f, repo);
5482 if (fclose(f) != 0) {
5483 err = got_error_from_errno("fclose");
5488 err = histedit_run_editor(histedit_cmds, path, commits, repo);
5490 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5491 err->code != GOT_ERR_HISTEDIT_CMD)
5493 err = histedit_edit_list_retry(histedit_cmds, err,
5494 commits, path, repo);
5497 if (f && fclose(f) != 0 && err == NULL)
5498 err = got_error_from_errno("fclose");
5499 if (path && unlink(path) != 0 && err == NULL)
5500 err = got_error_from_errno2("unlink", path);
5505 static const struct got_error *
5506 histedit_save_list(struct got_histedit_list *histedit_cmds,
5507 struct got_worktree *worktree, struct got_repository *repo)
5509 const struct got_error *err = NULL;
5512 struct got_histedit_list_entry *hle;
5513 struct got_commit_object *commit = NULL;
5515 err = got_worktree_get_histedit_script_path(&path, worktree);
5519 f = fopen(path, "w");
5521 err = got_error_from_errno2("fopen", path);
5524 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5525 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5531 int n = fprintf(f, "%c %s\n",
5532 GOT_HISTEDIT_MESG, hle->logmsg);
5534 err = got_ferror(f, GOT_ERR_IO);
5540 if (f && fclose(f) != 0 && err == NULL)
5541 err = got_error_from_errno("fclose");
5544 got_object_commit_close(commit);
5549 histedit_free_list(struct got_histedit_list *histedit_cmds)
5551 struct got_histedit_list_entry *hle;
5553 while ((hle = TAILQ_FIRST(histedit_cmds))) {
5554 TAILQ_REMOVE(histedit_cmds, hle, entry);
5559 static const struct got_error *
5560 histedit_load_list(struct got_histedit_list *histedit_cmds,
5561 const char *path, struct got_repository *repo)
5563 const struct got_error *err = NULL;
5566 f = fopen(path, "r");
5568 err = got_error_from_errno2("fopen", path);
5572 err = histedit_parse_list(histedit_cmds, f, repo);
5574 if (f && fclose(f) != 0 && err == NULL)
5575 err = got_error_from_errno("fclose");
5579 static const struct got_error *
5580 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
5581 const struct got_error *edit_err, struct got_object_id_queue *commits,
5582 const char *path, struct got_repository *repo)
5584 const struct got_error *err = NULL, *prev_err = edit_err;
5587 while (resp != 'c' && resp != 'r' && resp != 'a') {
5588 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
5589 "or (a)bort: ", getprogname(), prev_err->msg);
5594 histedit_free_list(histedit_cmds);
5595 err = histedit_run_editor(histedit_cmds, path, commits,
5598 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5599 err->code != GOT_ERR_HISTEDIT_CMD)
5606 } else if (resp == 'r') {
5607 histedit_free_list(histedit_cmds);
5608 err = histedit_edit_script(histedit_cmds,
5611 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5612 err->code != GOT_ERR_HISTEDIT_CMD)
5619 } else if (resp == 'a') {
5620 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5623 printf("invalid response '%c'\n", resp);
5629 static const struct got_error *
5630 histedit_complete(struct got_worktree *worktree,
5631 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5632 struct got_reference *branch, struct got_repository *repo)
5634 printf("Switching work tree to %s\n",
5635 got_ref_get_symref_target(branch));
5636 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5640 static const struct got_error *
5641 show_histedit_progress(struct got_commit_object *commit,
5642 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5644 const struct got_error *err;
5645 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5647 err = got_object_id_str(&old_id_str, hle->commit_id);
5652 err = got_object_id_str(&new_id_str, new_id);
5657 old_id_str[12] = '\0';
5659 new_id_str[12] = '\0';
5662 logmsg = strdup(hle->logmsg);
5663 if (logmsg == NULL) {
5664 err = got_error_from_errno("strdup");
5667 trim_logmsg(logmsg, 42);
5669 err = get_short_logmsg(&logmsg, 42, commit);
5674 switch (hle->cmd->code) {
5675 case GOT_HISTEDIT_PICK:
5676 case GOT_HISTEDIT_EDIT:
5677 printf("%s -> %s: %s\n", old_id_str,
5678 new_id_str ? new_id_str : "no-op change", logmsg);
5680 case GOT_HISTEDIT_DROP:
5681 case GOT_HISTEDIT_FOLD:
5682 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5695 static const struct got_error *
5696 histedit_commit(struct got_pathlist_head *merged_paths,
5697 struct got_worktree *worktree, struct got_fileindex *fileindex,
5698 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5699 struct got_repository *repo)
5701 const struct got_error *err;
5702 struct got_commit_object *commit;
5703 struct got_object_id *new_commit_id;
5705 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5706 && hle->logmsg == NULL) {
5707 err = histedit_edit_logmsg(hle, repo);
5712 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5716 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
5717 worktree, fileindex, tmp_branch, commit, hle->commit_id,
5720 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
5722 err = show_histedit_progress(commit, hle, NULL);
5724 err = show_histedit_progress(commit, hle, new_commit_id);
5725 free(new_commit_id);
5728 got_object_commit_close(commit);
5732 static const struct got_error *
5733 histedit_skip_commit(struct got_histedit_list_entry *hle,
5734 struct got_worktree *worktree, struct got_repository *repo)
5736 const struct got_error *error;
5737 struct got_commit_object *commit;
5739 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
5744 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
5748 error = show_histedit_progress(commit, hle, NULL);
5749 got_object_commit_close(commit);
5753 static const struct got_error *
5754 cmd_histedit(int argc, char *argv[])
5756 const struct got_error *error = NULL;
5757 struct got_worktree *worktree = NULL;
5758 struct got_fileindex *fileindex = NULL;
5759 struct got_repository *repo = NULL;
5761 struct got_reference *branch = NULL;
5762 struct got_reference *tmp_branch = NULL;
5763 struct got_object_id *resume_commit_id = NULL;
5764 struct got_object_id *base_commit_id = NULL;
5765 struct got_object_id *head_commit_id = NULL;
5766 struct got_commit_object *commit = NULL;
5767 int ch, rebase_in_progress = 0, did_something;
5768 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
5769 const char *edit_script_path = NULL;
5770 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5771 struct got_object_id_queue commits;
5772 struct got_pathlist_head merged_paths;
5773 const struct got_object_id_queue *parent_ids;
5774 struct got_object_qid *pid;
5775 struct got_histedit_list histedit_cmds;
5776 struct got_histedit_list_entry *hle;
5778 SIMPLEQ_INIT(&commits);
5779 TAILQ_INIT(&histedit_cmds);
5780 TAILQ_INIT(&merged_paths);
5782 while ((ch = getopt(argc, argv, "acF:")) != -1) {
5791 edit_script_path = optarg;
5803 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5804 "unveil", NULL) == -1)
5807 if (abort_edit && continue_edit)
5813 * This command cannot apply unveil(2) in all cases because the
5814 * user may choose to run an editor to edit the histedit script
5815 * and to edit individual commit log messages.
5816 * unveil(2) traverses exec(2); if an editor is used we have to
5817 * apply unveil after edit script and log messages have been written.
5818 * XXX TODO: Make use of unveil(2) where possible.
5821 cwd = getcwd(NULL, 0);
5823 error = got_error_from_errno("getcwd");
5826 error = got_worktree_open(&worktree, cwd);
5830 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5834 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5837 if (rebase_in_progress) {
5838 error = got_error(GOT_ERR_REBASING);
5842 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
5846 if (edit_in_progress && abort_edit) {
5847 error = got_worktree_histedit_continue(&resume_commit_id,
5848 &tmp_branch, &branch, &base_commit_id, &fileindex,
5852 printf("Switching work tree to %s\n",
5853 got_ref_get_symref_target(branch));
5854 error = got_worktree_histedit_abort(worktree, fileindex, repo,
5855 branch, base_commit_id, update_progress, &did_something);
5858 printf("Histedit of %s aborted\n",
5859 got_ref_get_symref_target(branch));
5860 goto done; /* nothing else to do */
5861 } else if (abort_edit) {
5862 error = got_error(GOT_ERR_NOT_HISTEDIT);
5866 if (continue_edit) {
5869 if (!edit_in_progress) {
5870 error = got_error(GOT_ERR_NOT_HISTEDIT);
5874 error = got_worktree_get_histedit_script_path(&path, worktree);
5878 error = histedit_load_list(&histedit_cmds, path, repo);
5883 error = got_worktree_histedit_continue(&resume_commit_id,
5884 &tmp_branch, &branch, &base_commit_id, &fileindex,
5889 error = got_ref_resolve(&head_commit_id, repo, branch);
5893 error = got_object_open_as_commit(&commit, repo,
5897 parent_ids = got_object_commit_get_parent_ids(commit);
5898 pid = SIMPLEQ_FIRST(parent_ids);
5900 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5903 error = collect_commits(&commits, head_commit_id, pid->id,
5904 base_commit_id, got_worktree_get_path_prefix(worktree),
5905 GOT_ERR_HISTEDIT_PATH, repo);
5906 got_object_commit_close(commit);
5911 if (edit_in_progress) {
5912 error = got_error(GOT_ERR_HISTEDIT_BUSY);
5916 error = got_ref_open(&branch, repo,
5917 got_worktree_get_head_ref_name(worktree), 0);
5921 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
5922 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
5923 "will not edit commit history of a branch outside "
5924 "the \"refs/heads/\" reference namespace");
5928 error = got_ref_resolve(&head_commit_id, repo, branch);
5929 got_ref_close(branch);
5934 error = got_object_open_as_commit(&commit, repo,
5938 parent_ids = got_object_commit_get_parent_ids(commit);
5939 pid = SIMPLEQ_FIRST(parent_ids);
5941 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
5944 error = collect_commits(&commits, head_commit_id, pid->id,
5945 got_worktree_get_base_commit_id(worktree),
5946 got_worktree_get_path_prefix(worktree),
5947 GOT_ERR_HISTEDIT_PATH, repo);
5948 got_object_commit_close(commit);
5953 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
5954 &base_commit_id, &fileindex, worktree, repo);
5958 if (edit_script_path) {
5959 error = histedit_load_list(&histedit_cmds,
5960 edit_script_path, repo);
5962 got_worktree_histedit_abort(worktree, fileindex,
5963 repo, branch, base_commit_id,
5964 update_progress, &did_something);
5968 error = histedit_edit_script(&histedit_cmds, &commits,
5971 got_worktree_histedit_abort(worktree, fileindex,
5972 repo, branch, base_commit_id,
5973 update_progress, &did_something);
5979 error = histedit_save_list(&histedit_cmds, worktree,
5982 got_worktree_histedit_abort(worktree, fileindex,
5983 repo, branch, base_commit_id,
5984 update_progress, &did_something);
5990 error = histedit_check_script(&histedit_cmds, &commits, repo);
5994 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
5995 if (resume_commit_id) {
5996 if (got_object_id_cmp(hle->commit_id,
5997 resume_commit_id) != 0)
6000 resume_commit_id = NULL;
6001 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6002 hle->cmd->code == GOT_HISTEDIT_FOLD) {
6003 error = histedit_skip_commit(hle, worktree,
6006 error = histedit_commit(NULL, worktree,
6007 fileindex, tmp_branch, hle, repo);
6014 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6015 error = histedit_skip_commit(hle, worktree, repo);
6021 error = got_object_open_as_commit(&commit, repo,
6025 parent_ids = got_object_commit_get_parent_ids(commit);
6026 pid = SIMPLEQ_FIRST(parent_ids);
6028 error = got_worktree_histedit_merge_files(&merged_paths,
6029 worktree, fileindex, pid->id, hle->commit_id, repo,
6030 rebase_progress, &rebase_status, check_cancelled, NULL);
6033 got_object_commit_close(commit);
6036 if (rebase_status == GOT_STATUS_CONFLICT) {
6037 got_worktree_rebase_pathlist_free(&merged_paths);
6041 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6043 error = got_object_id_str(&id_str, hle->commit_id);
6046 printf("Stopping histedit for amending commit %s\n",
6049 got_worktree_rebase_pathlist_free(&merged_paths);
6050 error = got_worktree_histedit_postpone(worktree,
6055 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6056 error = histedit_skip_commit(hle, worktree, repo);
6062 error = histedit_commit(&merged_paths, worktree, fileindex,
6063 tmp_branch, hle, repo);
6064 got_worktree_rebase_pathlist_free(&merged_paths);
6069 if (rebase_status == GOT_STATUS_CONFLICT) {
6070 error = got_worktree_histedit_postpone(worktree, fileindex);
6073 error = got_error_msg(GOT_ERR_CONFLICTS,
6074 "conflicts must be resolved before rebasing can continue");
6076 error = histedit_complete(worktree, fileindex, tmp_branch,
6079 got_object_id_queue_free(&commits);
6080 histedit_free_list(&histedit_cmds);
6081 free(head_commit_id);
6082 free(base_commit_id);
6083 free(resume_commit_id);
6085 got_object_commit_close(commit);
6087 got_ref_close(branch);
6089 got_ref_close(tmp_branch);
6091 got_worktree_close(worktree);
6093 got_repo_close(repo);
6100 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6101 "[file-path ...]\n",
6106 static const struct got_error *
6107 print_stage(void *arg, unsigned char status, unsigned char staged_status,
6108 const char *path, struct got_object_id *blob_id,
6109 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6111 const struct got_error *err = NULL;
6112 char *id_str = NULL;
6114 if (staged_status != GOT_STATUS_ADD &&
6115 staged_status != GOT_STATUS_MODIFY &&
6116 staged_status != GOT_STATUS_DELETE)
6119 if (staged_status == GOT_STATUS_ADD ||
6120 staged_status == GOT_STATUS_MODIFY)
6121 err = got_object_id_str(&id_str, staged_blob_id);
6123 err = got_object_id_str(&id_str, blob_id);
6127 printf("%s %c %s\n", id_str, staged_status, path);
6132 static const struct got_error *
6133 cmd_stage(int argc, char *argv[])
6135 const struct got_error *error = NULL;
6136 struct got_repository *repo = NULL;
6137 struct got_worktree *worktree = NULL;
6139 struct got_pathlist_head paths;
6140 struct got_pathlist_entry *pe;
6141 int ch, list_stage = 0, pflag = 0;
6142 FILE *patch_script_file = NULL;
6143 const char *patch_script_path = NULL;
6144 struct choose_patch_arg cpa;
6148 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6157 patch_script_path = optarg;
6169 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6170 "unveil", NULL) == -1)
6173 if (list_stage && (pflag || patch_script_path))
6174 errx(1, "-l option cannot be used with other options");
6175 if (patch_script_path && !pflag)
6176 errx(1, "-F option can only be used together with -p option");
6178 cwd = getcwd(NULL, 0);
6180 error = got_error_from_errno("getcwd");
6184 error = got_worktree_open(&worktree, cwd);
6188 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
6192 if (patch_script_path) {
6193 patch_script_file = fopen(patch_script_path, "r");
6194 if (patch_script_file == NULL) {
6195 error = got_error_from_errno2("fopen",
6200 error = apply_unveil(got_repo_get_path(repo), 1,
6201 got_worktree_get_root_path(worktree));
6205 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6210 error = got_worktree_status(worktree, &paths, repo,
6211 print_stage, NULL, check_cancelled, NULL);
6213 cpa.patch_script_file = patch_script_file;
6214 cpa.action = "stage";
6215 error = got_worktree_stage(worktree, &paths,
6216 pflag ? NULL : print_status, NULL,
6217 pflag ? choose_patch : NULL, &cpa, repo);
6220 if (patch_script_file && fclose(patch_script_file) == EOF &&
6222 error = got_error_from_errno2("fclose", patch_script_path);
6224 got_repo_close(repo);
6226 got_worktree_close(worktree);
6227 TAILQ_FOREACH(pe, &paths, entry)
6228 free((char *)pe->path);
6229 got_pathlist_free(&paths);
6237 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6238 "[file-path ...]\n",
6244 static const struct got_error *
6245 cmd_unstage(int argc, char *argv[])
6247 const struct got_error *error = NULL;
6248 struct got_repository *repo = NULL;
6249 struct got_worktree *worktree = NULL;
6251 struct got_pathlist_head paths;
6252 struct got_pathlist_entry *pe;
6253 int ch, did_something = 0, pflag = 0;
6254 FILE *patch_script_file = NULL;
6255 const char *patch_script_path = NULL;
6256 struct choose_patch_arg cpa;
6260 while ((ch = getopt(argc, argv, "pF:")) != -1) {
6266 patch_script_path = optarg;
6278 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6279 "unveil", NULL) == -1)
6282 if (patch_script_path && !pflag)
6283 errx(1, "-F option can only be used together with -p option");
6285 cwd = getcwd(NULL, 0);
6287 error = got_error_from_errno("getcwd");
6291 error = got_worktree_open(&worktree, cwd);
6295 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
6299 if (patch_script_path) {
6300 patch_script_file = fopen(patch_script_path, "r");
6301 if (patch_script_file == NULL) {
6302 error = got_error_from_errno2("fopen",
6308 error = apply_unveil(got_repo_get_path(repo), 1,
6309 got_worktree_get_root_path(worktree));
6313 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6317 cpa.patch_script_file = patch_script_file;
6318 cpa.action = "unstage";
6319 error = got_worktree_unstage(worktree, &paths, update_progress,
6320 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6322 if (patch_script_file && fclose(patch_script_file) == EOF &&
6324 error = got_error_from_errno2("fclose", patch_script_path);
6326 got_repo_close(repo);
6328 got_worktree_close(worktree);
6329 TAILQ_FOREACH(pe, &paths, entry)
6330 free((char *)pe->path);
6331 got_pathlist_free(&paths);
6339 fprintf(stderr, "usage: %s cat [-r repository ] object1 "
6340 "[object2 ...]\n", getprogname());
6344 static const struct got_error *
6345 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6347 const struct got_error *err;
6348 struct got_blob_object *blob;
6350 err = got_object_open_as_blob(&blob, repo, id, 8192);
6354 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6355 got_object_blob_close(blob);
6359 static const struct got_error *
6360 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6362 const struct got_error *err;
6363 struct got_tree_object *tree;
6364 const struct got_tree_entries *entries;
6365 struct got_tree_entry *te;
6367 err = got_object_open_as_tree(&tree, repo, id);
6371 entries = got_object_tree_get_entries(tree);
6372 te = SIMPLEQ_FIRST(&entries->head);
6375 if (sigint_received || sigpipe_received)
6377 err = got_object_id_str(&id_str, te->id);
6380 fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6382 te = SIMPLEQ_NEXT(te, entry);
6385 got_object_tree_close(tree);
6389 static const struct got_error *
6390 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6392 const struct got_error *err;
6393 struct got_commit_object *commit;
6394 const struct got_object_id_queue *parent_ids;
6395 struct got_object_qid *pid;
6396 char *id_str = NULL;
6397 const char *logmsg = NULL;
6399 err = got_object_open_as_commit(&commit, repo, id);
6403 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6407 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6408 parent_ids = got_object_commit_get_parent_ids(commit);
6409 fprintf(outfile, "numparents %d\n",
6410 got_object_commit_get_nparents(commit));
6411 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6413 err = got_object_id_str(&pid_str, pid->id);
6416 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6419 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6420 got_object_commit_get_author(commit),
6421 got_object_commit_get_author_time(commit));
6423 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
6424 got_object_commit_get_author(commit),
6425 got_object_commit_get_committer_time(commit));
6427 logmsg = got_object_commit_get_logmsg_raw(commit);
6428 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
6429 fprintf(outfile, "%s", logmsg);
6432 got_object_commit_close(commit);
6436 static const struct got_error *
6437 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6439 const struct got_error *err;
6440 struct got_tag_object *tag;
6441 char *id_str = NULL;
6442 const char *tagmsg = NULL;
6444 err = got_object_open_as_tag(&tag, repo, id);
6448 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
6452 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
6454 switch (got_object_tag_get_object_type(tag)) {
6455 case GOT_OBJ_TYPE_BLOB:
6456 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6457 GOT_OBJ_LABEL_BLOB);
6459 case GOT_OBJ_TYPE_TREE:
6460 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6461 GOT_OBJ_LABEL_TREE);
6463 case GOT_OBJ_TYPE_COMMIT:
6464 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6465 GOT_OBJ_LABEL_COMMIT);
6467 case GOT_OBJ_TYPE_TAG:
6468 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6475 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
6476 got_object_tag_get_name(tag));
6478 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
6479 got_object_tag_get_tagger(tag),
6480 got_object_tag_get_tagger_time(tag));
6482 tagmsg = got_object_tag_get_message(tag);
6483 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
6484 fprintf(outfile, "%s", tagmsg);
6487 got_object_tag_close(tag);
6491 static const struct got_error *
6492 cmd_cat(int argc, char *argv[])
6494 const struct got_error *error;
6495 struct got_repository *repo = NULL;
6496 struct got_worktree *worktree = NULL;
6497 char *cwd = NULL, *repo_path = NULL, *label = NULL;
6498 struct got_object_id *id = NULL;
6499 int ch, obj_type, i;
6502 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6507 while ((ch = getopt(argc, argv, "r:")) != -1) {
6510 repo_path = realpath(optarg, NULL);
6511 if (repo_path == NULL)
6512 err(1, "-r option");
6513 got_path_strip_trailing_slashes(repo_path);
6524 cwd = getcwd(NULL, 0);
6526 error = got_error_from_errno("getcwd");
6529 error = got_worktree_open(&worktree, cwd);
6530 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6533 if (repo_path == NULL) {
6535 got_worktree_get_repo_path(worktree));
6536 if (repo_path == NULL) {
6537 error = got_error_from_errno("strdup");
6543 if (repo_path == NULL) {
6544 repo_path = getcwd(NULL, 0);
6545 if (repo_path == NULL)
6546 return got_error_from_errno("getcwd");
6549 error = got_repo_open(&repo, repo_path);
6554 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6558 for (i = 0; i < argc; i++) {
6559 error = match_object_id(&id, &label, argv[i],
6560 GOT_OBJ_TYPE_ANY, 0, repo);
6564 error = got_object_get_type(&obj_type, repo, id);
6569 case GOT_OBJ_TYPE_BLOB:
6570 error = cat_blob(id, repo, stdout);
6572 case GOT_OBJ_TYPE_TREE:
6573 error = cat_tree(id, repo, stdout);
6575 case GOT_OBJ_TYPE_COMMIT:
6576 error = cat_commit(id, repo, stdout);
6578 case GOT_OBJ_TYPE_TAG:
6579 error = cat_tag(id, repo, stdout);
6582 error = got_error(GOT_ERR_OBJ_TYPE);
6597 got_worktree_close(worktree);
6599 const struct got_error *repo_error;
6600 repo_error = got_repo_close(repo);