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 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
1321 const char *path, int diff_context, struct got_repository *repo)
1323 const struct got_error *err = NULL;
1324 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
1327 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
1332 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
1336 while (path[0] == '/')
1338 err = got_diff_blob(blob1, blob2, path, path, diff_context,
1342 got_object_blob_close(blob1);
1343 got_object_blob_close(blob2);
1347 static const struct got_error *
1348 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
1349 const char *path, int diff_context, struct got_repository *repo)
1351 const struct got_error *err = NULL;
1352 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
1353 struct got_diff_blob_output_unidiff_arg arg;
1356 err = got_object_open_as_tree(&tree1, repo, tree_id1);
1361 err = got_object_open_as_tree(&tree2, repo, tree_id2);
1365 arg.diff_context = diff_context;
1366 arg.outfile = stdout;
1367 while (path[0] == '/')
1369 err = got_diff_tree(tree1, tree2, path, path, repo,
1370 got_diff_blob_output_unidiff, &arg, 1);
1373 got_object_tree_close(tree1);
1374 got_object_tree_close(tree2);
1378 static const struct got_error *
1379 print_patch(struct got_commit_object *commit, struct got_object_id *id,
1380 const char *path, int diff_context, struct got_repository *repo)
1382 const struct got_error *err = NULL;
1383 struct got_commit_object *pcommit = NULL;
1384 char *id_str1 = NULL, *id_str2 = NULL;
1385 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
1386 struct got_object_qid *qid;
1388 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
1390 err = got_object_open_as_commit(&pcommit, repo,
1396 if (path && path[0] != '\0') {
1398 err = got_object_id_by_path(&obj_id2, repo, id, path);
1401 err = got_object_id_str(&id_str2, obj_id2);
1407 err = got_object_id_by_path(&obj_id1, repo,
1413 err = got_object_id_str(&id_str1, obj_id1);
1419 err = got_object_get_type(&obj_type, repo, obj_id2);
1424 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1426 case GOT_OBJ_TYPE_BLOB:
1427 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
1430 case GOT_OBJ_TYPE_TREE:
1431 err = diff_trees(obj_id1, obj_id2, path, diff_context,
1435 err = got_error(GOT_ERR_OBJ_TYPE);
1441 obj_id2 = got_object_commit_get_tree_id(commit);
1442 err = got_object_id_str(&id_str2, obj_id2);
1445 obj_id1 = got_object_commit_get_tree_id(pcommit);
1446 err = got_object_id_str(&id_str1, obj_id1);
1449 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
1450 err = diff_trees(obj_id1, obj_id2, "", diff_context, repo);
1457 got_object_commit_close(pcommit);
1462 get_datestr(time_t *time, char *datebuf)
1464 struct tm mytm, *tm;
1467 tm = gmtime_r(time, &mytm);
1470 s = asctime_r(tm, datebuf);
1473 p = strchr(s, '\n');
1479 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
1481 static const struct got_error *
1482 print_commit(struct got_commit_object *commit, struct got_object_id *id,
1483 struct got_repository *repo, const char *path, int show_patch,
1484 int diff_context, struct got_reflist_head *refs)
1486 const struct got_error *err = NULL;
1487 char *id_str, *datestr, *logmsg0, *logmsg, *line;
1489 time_t committer_time;
1490 const char *author, *committer;
1491 char *refs_str = NULL;
1492 struct got_reflist_entry *re;
1494 SIMPLEQ_FOREACH(re, refs, entry) {
1497 struct got_tag_object *tag = NULL;
1500 name = got_ref_get_name(re->ref);
1501 if (strcmp(name, GOT_REF_HEAD) == 0)
1503 if (strncmp(name, "refs/", 5) == 0)
1505 if (strncmp(name, "got/", 4) == 0)
1507 if (strncmp(name, "heads/", 6) == 0)
1509 if (strncmp(name, "remotes/", 8) == 0)
1511 if (strncmp(name, "tags/", 5) == 0) {
1512 err = got_object_open_as_tag(&tag, repo, re->id);
1514 if (err->code != GOT_ERR_OBJ_TYPE)
1516 /* Ref points at something other than a tag. */
1521 cmp = got_object_id_cmp(tag ?
1522 got_object_tag_get_object_id(tag) : re->id, id);
1524 got_object_tag_close(tag);
1528 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
1530 err = got_error_from_errno("asprintf");
1536 err = got_object_id_str(&id_str, id);
1540 printf(GOT_COMMIT_SEP_STR);
1541 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
1542 refs_str ? refs_str : "", refs_str ? ")" : "");
1547 printf("from: %s\n", got_object_commit_get_author(commit));
1548 committer_time = got_object_commit_get_committer_time(commit);
1549 datestr = get_datestr(&committer_time, datebuf);
1551 printf("date: %s UTC\n", datestr);
1552 author = got_object_commit_get_author(commit);
1553 committer = got_object_commit_get_committer(commit);
1554 if (strcmp(author, committer) != 0)
1555 printf("via: %s\n", committer);
1556 if (got_object_commit_get_nparents(commit) > 1) {
1557 const struct got_object_id_queue *parent_ids;
1558 struct got_object_qid *qid;
1560 parent_ids = got_object_commit_get_parent_ids(commit);
1561 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
1562 err = got_object_id_str(&id_str, qid->id);
1565 printf("parent %d: %s\n", n++, id_str);
1570 err = got_object_commit_get_logmsg(&logmsg0, commit);
1576 line = strsep(&logmsg, "\n");
1578 printf(" %s\n", line);
1583 err = print_patch(commit, id, path, diff_context, repo);
1588 if (fflush(stdout) != 0 && err == NULL)
1589 err = got_error_from_errno("fflush");
1593 static const struct got_error *
1594 print_commits(struct got_object_id *root_id, struct got_repository *repo,
1595 char *path, int show_patch, int diff_context, int limit,
1596 int first_parent_traversal, struct got_reflist_head *refs)
1598 const struct got_error *err;
1599 struct got_commit_graph *graph;
1601 err = got_commit_graph_open(&graph, root_id, path,
1602 first_parent_traversal, repo);
1605 err = got_commit_graph_iter_start(graph, root_id, repo,
1606 check_cancelled, NULL);
1610 struct got_commit_object *commit;
1611 struct got_object_id *id;
1613 if (sigint_received || sigpipe_received)
1616 err = got_commit_graph_iter_next(&id, graph);
1618 if (err->code == GOT_ERR_ITER_COMPLETED) {
1622 if (err->code != GOT_ERR_ITER_NEED_MORE)
1624 err = got_commit_graph_fetch_commits(graph, 1, repo,
1625 check_cancelled, NULL);
1634 err = got_object_open_as_commit(&commit, repo, id);
1637 err = print_commit(commit, id, repo, path, show_patch,
1638 diff_context, refs);
1639 got_object_commit_close(commit);
1640 if (err || (limit && --limit == 0))
1644 got_commit_graph_close(graph);
1651 fprintf(stderr, "usage: %s log [-c commit] [-C number] [-f] [ -l N ] [-p] "
1652 "[-r repository-path] [path]\n", getprogname());
1657 get_default_log_limit(void)
1659 const char *got_default_log_limit;
1663 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
1664 if (got_default_log_limit == NULL)
1666 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
1672 static const struct got_error *
1673 cmd_log(int argc, char *argv[])
1675 const struct got_error *error;
1676 struct got_repository *repo = NULL;
1677 struct got_worktree *worktree = NULL;
1678 struct got_commit_object *commit = NULL;
1679 struct got_object_id *id = NULL;
1680 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
1681 char *start_commit = NULL;
1682 int diff_context = 3, ch;
1683 int show_patch = 0, limit = 0, first_parent_traversal = 0;
1685 struct got_reflist_head refs;
1687 SIMPLEQ_INIT(&refs);
1690 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
1696 limit = get_default_log_limit();
1698 while ((ch = getopt(argc, argv, "b:pc:C:l:fr:")) != -1) {
1704 start_commit = optarg;
1707 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
1710 err(1, "-C option %s", errstr);
1713 limit = strtonum(optarg, 0, INT_MAX, &errstr);
1715 err(1, "-l option %s", errstr);
1718 first_parent_traversal = 1;
1721 repo_path = realpath(optarg, NULL);
1722 if (repo_path == NULL)
1723 err(1, "-r option");
1724 got_path_strip_trailing_slashes(repo_path);
1735 cwd = getcwd(NULL, 0);
1737 error = got_error_from_errno("getcwd");
1741 error = got_worktree_open(&worktree, cwd);
1742 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1749 error = got_error_from_errno("strdup");
1752 } else if (argc == 1) {
1754 error = got_worktree_resolve_path(&path, worktree,
1759 path = strdup(argv[0]);
1761 error = got_error_from_errno("strdup");
1768 if (repo_path == NULL) {
1769 repo_path = worktree ?
1770 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
1772 if (repo_path == NULL) {
1773 error = got_error_from_errno("strdup");
1777 error = got_repo_open(&repo, repo_path);
1781 error = apply_unveil(got_repo_get_path(repo), 1,
1782 worktree ? got_worktree_get_root_path(worktree) : NULL);
1786 if (start_commit == NULL) {
1787 struct got_reference *head_ref;
1788 error = got_ref_open(&head_ref, repo,
1789 worktree ? got_worktree_get_head_ref_name(worktree)
1793 error = got_ref_resolve(&id, repo, head_ref);
1794 got_ref_close(head_ref);
1797 error = got_object_open_as_commit(&commit, repo, id);
1799 struct got_reference *ref;
1800 error = got_ref_open(&ref, repo, start_commit, 0);
1801 if (error == NULL) {
1803 error = got_ref_resolve(&id, repo, ref);
1807 error = got_object_get_type(&obj_type, repo, id);
1810 if (obj_type == GOT_OBJ_TYPE_TAG) {
1811 struct got_tag_object *tag;
1812 error = got_object_open_as_tag(&tag, repo, id);
1815 if (got_object_tag_get_object_type(tag) !=
1816 GOT_OBJ_TYPE_COMMIT) {
1817 got_object_tag_close(tag);
1818 error = got_error(GOT_ERR_OBJ_TYPE);
1822 id = got_object_id_dup(
1823 got_object_tag_get_object_id(tag));
1825 error = got_error_from_errno(
1826 "got_object_id_dup");
1827 got_object_tag_close(tag);
1830 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
1831 error = got_error(GOT_ERR_OBJ_TYPE);
1834 error = got_object_open_as_commit(&commit, repo, id);
1838 if (commit == NULL) {
1839 error = got_repo_match_object_id_prefix(&id,
1840 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
1848 error = got_repo_map_path(&in_repo_path, repo, path, 1);
1853 path = in_repo_path;
1856 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
1860 error = print_commits(id, repo, path, show_patch,
1861 diff_context, limit, first_parent_traversal, &refs);
1868 got_worktree_close(worktree);
1870 const struct got_error *repo_error;
1871 repo_error = got_repo_close(repo);
1875 got_ref_list_free(&refs);
1882 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
1883 "[object1 object2 | path]\n", getprogname());
1887 struct print_diff_arg {
1888 struct got_repository *repo;
1889 struct got_worktree *worktree;
1896 static const struct got_error *
1897 print_diff(void *arg, unsigned char status, unsigned char staged_status,
1898 const char *path, struct got_object_id *blob_id,
1899 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
1901 struct print_diff_arg *a = arg;
1902 const struct got_error *err = NULL;
1903 struct got_blob_object *blob1 = NULL;
1905 char *abspath = NULL, *label1 = NULL;
1908 if (a->diff_staged) {
1909 if (staged_status != GOT_STATUS_MODIFY &&
1910 staged_status != GOT_STATUS_ADD &&
1911 staged_status != GOT_STATUS_DELETE)
1914 if (staged_status == GOT_STATUS_DELETE)
1916 if (status == GOT_STATUS_NONEXISTENT)
1917 return got_error_set_errno(ENOENT, path);
1918 if (status != GOT_STATUS_MODIFY &&
1919 status != GOT_STATUS_ADD &&
1920 status != GOT_STATUS_DELETE &&
1921 status != GOT_STATUS_CONFLICT)
1925 if (!a->header_shown) {
1926 printf("diff %s %s%s\n", a->id_str,
1927 got_worktree_get_root_path(a->worktree),
1928 a->diff_staged ? " (staged changes)" : "");
1929 a->header_shown = 1;
1932 if (a->diff_staged) {
1933 const char *label1 = NULL, *label2 = NULL;
1934 switch (staged_status) {
1935 case GOT_STATUS_MODIFY:
1939 case GOT_STATUS_ADD:
1942 case GOT_STATUS_DELETE:
1946 return got_error(GOT_ERR_FILE_STATUS);
1948 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
1949 label1, label2, a->diff_context, a->repo, stdout);
1952 if (staged_status == GOT_STATUS_ADD ||
1953 staged_status == GOT_STATUS_MODIFY) {
1955 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
1959 err = got_object_id_str(&id_str, staged_blob_id);
1962 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
1963 err = got_error_from_errno("asprintf");
1968 } else if (status != GOT_STATUS_ADD) {
1969 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
1974 if (status != GOT_STATUS_DELETE) {
1975 if (asprintf(&abspath, "%s/%s",
1976 got_worktree_get_root_path(a->worktree), path) == -1) {
1977 err = got_error_from_errno("asprintf");
1981 f2 = fopen(abspath, "r");
1983 err = got_error_from_errno2("fopen", abspath);
1986 if (lstat(abspath, &sb) == -1) {
1987 err = got_error_from_errno2("lstat", abspath);
1993 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
1994 a->diff_context, stdout);
1997 got_object_blob_close(blob1);
1998 if (f2 && fclose(f2) != 0 && err == NULL)
1999 err = got_error_from_errno("fclose");
2004 static const struct got_error *
2005 match_object_id(struct got_object_id **id, char **label,
2006 const char *id_str, int obj_type, int resolve_tags,
2007 struct got_repository *repo)
2009 const struct got_error *err;
2010 struct got_tag_object *tag;
2011 struct got_reference *ref = NULL;
2017 err = got_repo_object_match_tag(&tag, id_str, GOT_OBJ_TYPE_ANY,
2020 *id = got_object_id_dup(
2021 got_object_tag_get_object_id(tag));
2023 err = got_error_from_errno("got_object_id_dup");
2024 else if (asprintf(label, "refs/tags/%s",
2025 got_object_tag_get_name(tag)) == -1) {
2026 err = got_error_from_errno("asprintf");
2030 got_object_tag_close(tag);
2032 } else if (err->code != GOT_ERR_NO_OBJ)
2036 err = got_repo_match_object_id_prefix(id, id_str, obj_type, repo);
2038 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2040 err = got_ref_open(&ref, repo, id_str, 0);
2043 *label = strdup(got_ref_get_name(ref));
2044 if (*label == NULL) {
2045 err = got_error_from_errno("strdup");
2048 err = got_ref_resolve(id, repo, ref);
2050 err = got_object_id_str(label, *id);
2051 if (*label == NULL) {
2052 err = got_error_from_errno("strdup");
2063 static const struct got_error *
2064 cmd_diff(int argc, char *argv[])
2066 const struct got_error *error;
2067 struct got_repository *repo = NULL;
2068 struct got_worktree *worktree = NULL;
2069 char *cwd = NULL, *repo_path = NULL;
2070 struct got_object_id *id1 = NULL, *id2 = NULL;
2071 const char *id_str1 = NULL, *id_str2 = NULL;
2072 char *label1 = NULL, *label2 = NULL;
2074 int diff_context = 3, diff_staged = 0, ch;
2079 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2084 while ((ch = getopt(argc, argv, "C:r:s")) != -1) {
2087 diff_context = strtonum(optarg, 1, INT_MAX, &errstr);
2089 err(1, "-C option %s", errstr);
2092 repo_path = realpath(optarg, NULL);
2093 if (repo_path == NULL)
2094 err(1, "-r option");
2095 got_path_strip_trailing_slashes(repo_path);
2109 cwd = getcwd(NULL, 0);
2111 error = got_error_from_errno("getcwd");
2114 error = got_worktree_open(&worktree, cwd);
2115 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2118 if (worktree == NULL) {
2119 error = got_error(GOT_ERR_NOT_WORKTREE);
2124 "-r option can't be used when diffing a work tree");
2125 repo_path = strdup(got_worktree_get_repo_path(worktree));
2126 if (repo_path == NULL) {
2127 error = got_error_from_errno("strdup");
2131 error = got_worktree_resolve_path(&path, worktree,
2138 error = got_error_from_errno("strdup");
2142 } else if (argc == 2) {
2144 errx(1, "-s option can't be used when diffing "
2145 "objects in repository");
2148 if (worktree && repo_path == NULL) {
2150 strdup(got_worktree_get_repo_path(worktree));
2151 if (repo_path == NULL) {
2152 error = got_error_from_errno("strdup");
2159 if (repo_path == NULL) {
2160 repo_path = getcwd(NULL, 0);
2161 if (repo_path == NULL)
2162 return got_error_from_errno("getcwd");
2165 error = got_repo_open(&repo, repo_path);
2170 error = apply_unveil(got_repo_get_path(repo), 1,
2171 worktree ? got_worktree_get_root_path(worktree) : NULL);
2176 struct print_diff_arg arg;
2177 struct got_pathlist_head paths;
2182 error = got_object_id_str(&id_str,
2183 got_worktree_get_base_commit_id(worktree));
2187 arg.worktree = worktree;
2188 arg.diff_context = diff_context;
2189 arg.id_str = id_str;
2190 arg.header_shown = 0;
2191 arg.diff_staged = diff_staged;
2193 error = got_pathlist_append(&paths, path, NULL);
2197 error = got_worktree_status(worktree, &paths, repo, print_diff,
2198 &arg, check_cancelled, NULL);
2200 got_pathlist_free(&paths);
2204 error = match_object_id(&id1, &label1, id_str1, GOT_OBJ_TYPE_ANY, 1,
2209 error = match_object_id(&id2, &label2, id_str2, GOT_OBJ_TYPE_ANY, 1,
2214 error = got_object_get_type(&type1, repo, id1);
2218 error = got_object_get_type(&type2, repo, id2);
2222 if (type1 != type2) {
2223 error = got_error(GOT_ERR_OBJ_TYPE);
2228 case GOT_OBJ_TYPE_BLOB:
2229 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
2230 diff_context, repo, stdout);
2232 case GOT_OBJ_TYPE_TREE:
2233 error = got_diff_objects_as_trees(id1, id2, "", "",
2234 diff_context, repo, stdout);
2236 case GOT_OBJ_TYPE_COMMIT:
2237 printf("diff %s %s\n", label1, label2);
2238 error = got_diff_objects_as_commits(id1, id2, diff_context,
2242 error = got_error(GOT_ERR_OBJ_TYPE);
2252 got_worktree_close(worktree);
2254 const struct got_error *repo_error;
2255 repo_error = got_repo_close(repo);
2266 "usage: %s blame [-c commit] [-r repository-path] path\n",
2275 char datebuf[9]; /* YY-MM-DD + NUL */
2278 struct blame_cb_args {
2279 struct blame_line *lines;
2283 off_t *line_offsets;
2285 struct got_repository *repo;
2288 static const struct got_error *
2289 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
2291 const struct got_error *err = NULL;
2292 struct blame_cb_args *a = arg;
2293 struct blame_line *bline;
2295 size_t linesize = 0;
2296 struct got_commit_object *commit = NULL;
2299 time_t committer_time;
2301 if (nlines != a->nlines ||
2302 (lineno != -1 && lineno < 1) || lineno > a->nlines)
2303 return got_error(GOT_ERR_RANGE);
2305 if (sigint_received)
2306 return got_error(GOT_ERR_ITER_COMPLETED);
2309 return NULL; /* no change in this commit */
2311 /* Annotate this line. */
2312 bline = &a->lines[lineno - 1];
2313 if (bline->annotated)
2315 err = got_object_id_str(&bline->id_str, id);
2319 err = got_object_open_as_commit(&commit, a->repo, id);
2323 bline->committer = strdup(got_object_commit_get_committer(commit));
2324 if (bline->committer == NULL) {
2325 err = got_error_from_errno("strdup");
2329 committer_time = got_object_commit_get_committer_time(commit);
2330 if (localtime_r(&committer_time, &tm) == NULL)
2331 return got_error_from_errno("localtime_r");
2332 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%g/%m/%d",
2333 &tm) >= sizeof(bline->datebuf)) {
2334 err = got_error(GOT_ERR_NO_SPACE);
2337 bline->annotated = 1;
2339 /* Print lines annotated so far. */
2340 bline = &a->lines[a->lineno_cur - 1];
2341 if (!bline->annotated)
2344 offset = a->line_offsets[a->lineno_cur - 1];
2345 if (fseeko(a->f, offset, SEEK_SET) == -1) {
2346 err = got_error_from_errno("fseeko");
2350 while (bline->annotated) {
2351 char *smallerthan, *at, *nl, *committer;
2354 if (getline(&line, &linesize, a->f) == (ssize_t)-1) {
2356 err = got_error_from_errno("getline");
2360 committer = bline->committer;
2361 smallerthan = strchr(committer, '<');
2362 if (smallerthan && smallerthan[1] != '\0')
2363 committer = smallerthan + 1;
2364 at = strchr(committer, '@');
2367 len = strlen(committer);
2369 committer[8] = '\0';
2371 nl = strchr(line, '\n');
2374 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
2375 bline->id_str, bline->datebuf, committer, line);
2378 bline = &a->lines[a->lineno_cur - 1];
2382 got_object_commit_close(commit);
2387 static const struct got_error *
2388 cmd_blame(int argc, char *argv[])
2390 const struct got_error *error;
2391 struct got_repository *repo = NULL;
2392 struct got_worktree *worktree = NULL;
2393 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2394 struct got_object_id *obj_id = NULL;
2395 struct got_object_id *commit_id = NULL;
2396 struct got_blob_object *blob = NULL;
2397 char *commit_id_str = NULL;
2398 struct blame_cb_args bca;
2399 int ch, obj_type, i;
2402 memset(&bca, 0, sizeof(bca));
2405 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2410 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
2413 commit_id_str = optarg;
2416 repo_path = realpath(optarg, NULL);
2417 if (repo_path == NULL)
2418 err(1, "-r option");
2419 got_path_strip_trailing_slashes(repo_path);
2435 cwd = getcwd(NULL, 0);
2437 error = got_error_from_errno("getcwd");
2440 if (repo_path == NULL) {
2441 error = got_worktree_open(&worktree, cwd);
2442 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2448 strdup(got_worktree_get_repo_path(worktree));
2449 if (repo_path == NULL)
2450 error = got_error_from_errno("strdup");
2454 repo_path = strdup(cwd);
2455 if (repo_path == NULL) {
2456 error = got_error_from_errno("strdup");
2462 error = got_repo_open(&repo, repo_path);
2466 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2471 const char *prefix = got_worktree_get_path_prefix(worktree);
2472 char *p, *worktree_subdir = cwd +
2473 strlen(got_worktree_get_root_path(worktree));
2474 if (asprintf(&p, "%s%s%s%s%s",
2475 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
2476 worktree_subdir, worktree_subdir[0] ? "/" : "",
2478 error = got_error_from_errno("asprintf");
2481 error = got_repo_map_path(&in_repo_path, repo, p, 0);
2484 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2489 if (commit_id_str == NULL) {
2490 struct got_reference *head_ref;
2491 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2494 error = got_ref_resolve(&commit_id, repo, head_ref);
2495 got_ref_close(head_ref);
2499 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2504 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
2507 if (obj_id == NULL) {
2508 error = got_error(GOT_ERR_NO_OBJ);
2512 error = got_object_get_type(&obj_type, repo, obj_id);
2516 if (obj_type != GOT_OBJ_TYPE_BLOB) {
2517 error = got_error(GOT_ERR_OBJ_TYPE);
2521 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
2524 bca.f = got_opentemp();
2525 if (bca.f == NULL) {
2526 error = got_error_from_errno("got_opentemp");
2529 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
2530 &bca.line_offsets, bca.f, blob);
2531 if (error || bca.nlines == 0)
2534 /* Don't include \n at EOF in the blame line count. */
2535 if (bca.line_offsets[bca.nlines - 1] == filesize)
2538 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
2539 if (bca.lines == NULL) {
2540 error = got_error_from_errno("calloc");
2544 bca.nlines_prec = 0;
2552 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
2553 check_cancelled, NULL);
2563 got_object_blob_close(blob);
2565 got_worktree_close(worktree);
2567 const struct got_error *repo_error;
2568 repo_error = got_repo_close(repo);
2572 for (i = 0; i < bca.nlines; i++) {
2573 struct blame_line *bline = &bca.lines[i];
2574 free(bline->id_str);
2575 free(bline->committer);
2578 free(bca.line_offsets);
2579 if (bca.f && fclose(bca.f) == EOF && error == NULL)
2580 error = got_error_from_errno("fclose");
2588 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
2594 print_entry(struct got_tree_entry *te, const char *id, const char *path,
2595 const char *root_path)
2597 int is_root_path = (strcmp(path, root_path) == 0);
2598 const char *modestr = "";
2600 path += strlen(root_path);
2601 while (path[0] == '/')
2604 if (got_object_tree_entry_is_submodule(te))
2606 else if (S_ISLNK(te->mode))
2608 else if (S_ISDIR(te->mode))
2610 else if (te->mode & S_IXUSR)
2613 printf("%s%s%s%s%s\n", id ? id : "", path,
2614 is_root_path ? "" : "/", te->name, modestr);
2617 static const struct got_error *
2618 print_tree(const char *path, struct got_object_id *commit_id,
2619 int show_ids, int recurse, const char *root_path,
2620 struct got_repository *repo)
2622 const struct got_error *err = NULL;
2623 struct got_object_id *tree_id = NULL;
2624 struct got_tree_object *tree = NULL;
2625 const struct got_tree_entries *entries;
2626 struct got_tree_entry *te;
2628 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
2632 err = got_object_open_as_tree(&tree, repo, tree_id);
2635 entries = got_object_tree_get_entries(tree);
2636 te = SIMPLEQ_FIRST(&entries->head);
2640 if (sigint_received || sigpipe_received)
2645 err = got_object_id_str(&id_str, te->id);
2648 if (asprintf(&id, "%s ", id_str) == -1) {
2649 err = got_error_from_errno("asprintf");
2655 print_entry(te, id, path, root_path);
2658 if (recurse && S_ISDIR(te->mode)) {
2660 if (asprintf(&child_path, "%s%s%s", path,
2661 path[0] == '/' && path[1] == '\0' ? "" : "/",
2663 err = got_error_from_errno("asprintf");
2666 err = print_tree(child_path, commit_id, show_ids, 1,
2673 te = SIMPLEQ_NEXT(te, entry);
2677 got_object_tree_close(tree);
2682 static const struct got_error *
2683 cmd_tree(int argc, char *argv[])
2685 const struct got_error *error;
2686 struct got_repository *repo = NULL;
2687 struct got_worktree *worktree = NULL;
2689 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
2690 struct got_object_id *commit_id = NULL;
2691 char *commit_id_str = NULL;
2692 int show_ids = 0, recurse = 0;
2696 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2701 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
2704 commit_id_str = optarg;
2707 repo_path = realpath(optarg, NULL);
2708 if (repo_path == NULL)
2709 err(1, "-r option");
2710 got_path_strip_trailing_slashes(repo_path);
2734 cwd = getcwd(NULL, 0);
2736 error = got_error_from_errno("getcwd");
2739 if (repo_path == NULL) {
2740 error = got_worktree_open(&worktree, cwd);
2741 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2747 strdup(got_worktree_get_repo_path(worktree));
2748 if (repo_path == NULL)
2749 error = got_error_from_errno("strdup");
2753 repo_path = strdup(cwd);
2754 if (repo_path == NULL) {
2755 error = got_error_from_errno("strdup");
2761 error = got_repo_open(&repo, repo_path);
2765 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
2771 char *p, *worktree_subdir = cwd +
2772 strlen(got_worktree_get_root_path(worktree));
2773 if (asprintf(&p, "%s/%s",
2774 got_worktree_get_path_prefix(worktree),
2775 worktree_subdir) == -1) {
2776 error = got_error_from_errno("asprintf");
2779 error = got_repo_map_path(&in_repo_path, repo, p, 1);
2786 if (in_repo_path == NULL) {
2787 error = got_repo_map_path(&in_repo_path, repo, path, 1);
2792 if (commit_id_str == NULL) {
2793 struct got_reference *head_ref;
2794 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
2797 error = got_ref_resolve(&commit_id, repo, head_ref);
2798 got_ref_close(head_ref);
2802 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
2807 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
2808 in_repo_path, repo);
2815 got_worktree_close(worktree);
2817 const struct got_error *repo_error;
2818 repo_error = got_repo_close(repo);
2828 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
2832 static const struct got_error *
2833 print_status(void *arg, unsigned char status, unsigned char staged_status,
2834 const char *path, struct got_object_id *blob_id,
2835 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
2837 if (status == staged_status && (status == GOT_STATUS_DELETE))
2838 status = GOT_STATUS_NO_CHANGE;
2839 printf("%c%c %s\n", status, staged_status, path);
2843 static const struct got_error *
2844 cmd_status(int argc, char *argv[])
2846 const struct got_error *error = NULL;
2847 struct got_repository *repo = NULL;
2848 struct got_worktree *worktree = NULL;
2850 struct got_pathlist_head paths;
2851 struct got_pathlist_entry *pe;
2856 while ((ch = getopt(argc, argv, "")) != -1) {
2868 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2872 cwd = getcwd(NULL, 0);
2874 error = got_error_from_errno("getcwd");
2878 error = got_worktree_open(&worktree, cwd);
2882 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
2886 error = apply_unveil(got_repo_get_path(repo), 1,
2887 got_worktree_get_root_path(worktree));
2891 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2895 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
2896 check_cancelled, NULL);
2898 TAILQ_FOREACH(pe, &paths, entry)
2899 free((char *)pe->path);
2900 got_pathlist_free(&paths);
2909 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
2914 static const struct got_error *
2915 list_refs(struct got_repository *repo)
2917 static const struct got_error *err = NULL;
2918 struct got_reflist_head refs;
2919 struct got_reflist_entry *re;
2921 SIMPLEQ_INIT(&refs);
2922 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
2926 SIMPLEQ_FOREACH(re, &refs, entry) {
2928 refstr = got_ref_to_str(re->ref);
2930 return got_error_from_errno("got_ref_to_str");
2931 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
2935 got_ref_list_free(&refs);
2939 static const struct got_error *
2940 delete_ref(struct got_repository *repo, const char *refname)
2942 const struct got_error *err = NULL;
2943 struct got_reference *ref;
2945 err = got_ref_open(&ref, repo, refname, 0);
2949 err = got_ref_delete(ref, repo);
2954 static const struct got_error *
2955 add_ref(struct got_repository *repo, const char *refname, const char *target)
2957 const struct got_error *err = NULL;
2958 struct got_object_id *id;
2959 struct got_reference *ref = NULL;
2962 * Don't let the user create a reference named '-'.
2963 * While technically a valid reference name, this case is usually
2964 * an unintended typo.
2966 if (refname[0] == '-' && refname[1] == '\0')
2967 return got_error(GOT_ERR_BAD_REF_NAME);
2969 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
2972 struct got_reference *target_ref;
2974 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
2976 err = got_ref_open(&target_ref, repo, target, 0);
2979 err = got_ref_resolve(&id, repo, target_ref);
2980 got_ref_close(target_ref);
2985 err = got_ref_alloc(&ref, refname, id);
2989 err = got_ref_write(ref, repo);
2997 static const struct got_error *
2998 add_symref(struct got_repository *repo, const char *refname, const char *target)
3000 const struct got_error *err = NULL;
3001 struct got_reference *ref = NULL;
3002 struct got_reference *target_ref = NULL;
3005 * Don't let the user create a reference named '-'.
3006 * While technically a valid reference name, this case is usually
3007 * an unintended typo.
3009 if (refname[0] == '-' && refname[1] == '\0')
3010 return got_error(GOT_ERR_BAD_REF_NAME);
3012 err = got_ref_open(&target_ref, repo, target, 0);
3016 err = got_ref_alloc_symref(&ref, refname, target_ref);
3020 err = got_ref_write(ref, repo);
3023 got_ref_close(target_ref);
3029 static const struct got_error *
3030 cmd_ref(int argc, char *argv[])
3032 const struct got_error *error = NULL;
3033 struct got_repository *repo = NULL;
3034 struct got_worktree *worktree = NULL;
3035 char *cwd = NULL, *repo_path = NULL;
3036 int ch, do_list = 0, create_symref = 0;
3037 const char *delref = NULL;
3039 /* TODO: Add -s option for adding symbolic references. */
3040 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
3046 repo_path = realpath(optarg, NULL);
3047 if (repo_path == NULL)
3048 err(1, "-r option");
3049 got_path_strip_trailing_slashes(repo_path);
3063 if (do_list && delref)
3064 errx(1, "-l and -d options are mutually exclusive\n");
3069 if (do_list || delref) {
3071 errx(1, "-s option cannot be used together with the "
3072 "-l or -d options");
3075 } else if (argc != 2)
3080 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3084 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3085 "sendfd unveil", NULL) == -1)
3089 cwd = getcwd(NULL, 0);
3091 error = got_error_from_errno("getcwd");
3095 if (repo_path == NULL) {
3096 error = got_worktree_open(&worktree, cwd);
3097 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3103 strdup(got_worktree_get_repo_path(worktree));
3104 if (repo_path == NULL)
3105 error = got_error_from_errno("strdup");
3109 repo_path = strdup(cwd);
3110 if (repo_path == NULL) {
3111 error = got_error_from_errno("strdup");
3117 error = got_repo_open(&repo, repo_path);
3121 error = apply_unveil(got_repo_get_path(repo), do_list,
3122 worktree ? got_worktree_get_root_path(worktree) : NULL);
3127 error = list_refs(repo);
3129 error = delete_ref(repo, delref);
3130 else if (create_symref)
3131 error = add_symref(repo, argv[0], argv[1]);
3133 error = add_ref(repo, argv[0], argv[1]);
3136 got_repo_close(repo);
3138 got_worktree_close(worktree);
3148 "usage: %s branch [-r repository] -l | -d name | "
3149 "name [commit]\n", getprogname());
3153 static const struct got_error *
3154 list_branches(struct got_repository *repo, struct got_worktree *worktree)
3156 static const struct got_error *err = NULL;
3157 struct got_reflist_head refs;
3158 struct got_reflist_entry *re;
3160 SIMPLEQ_INIT(&refs);
3162 err = got_ref_list(&refs, repo, "refs/heads",
3163 got_ref_cmp_by_name, NULL);
3167 SIMPLEQ_FOREACH(re, &refs, entry) {
3168 const char *refname, *marker = " ";
3170 refname = got_ref_get_name(re->ref);
3171 if (worktree && strcmp(refname,
3172 got_worktree_get_head_ref_name(worktree)) == 0) {
3173 struct got_object_id *id = NULL;
3174 err = got_ref_resolve(&id, repo, re->ref);
3177 if (got_object_id_cmp(id,
3178 got_worktree_get_base_commit_id(worktree)) == 0)
3184 refname += strlen("refs/heads/");
3185 refstr = got_ref_to_str(re->ref);
3187 return got_error_from_errno("got_ref_to_str");
3188 printf("%s%s: %s\n", marker, refname, refstr);
3192 got_ref_list_free(&refs);
3196 static const struct got_error *
3197 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
3198 const char *branch_name)
3200 const struct got_error *err = NULL;
3201 struct got_reference *ref = NULL;
3204 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
3205 return got_error_from_errno("asprintf");
3207 err = got_ref_open(&ref, repo, refname, 0);
3212 strcmp(got_worktree_get_head_ref_name(worktree),
3213 got_ref_get_name(ref)) == 0) {
3214 err = got_error_msg(GOT_ERR_SAME_BRANCH,
3215 "will not delete this work tree's current branch");
3219 err = got_ref_delete(ref, repo);
3227 static const struct got_error *
3228 add_branch(struct got_repository *repo, const char *branch_name,
3229 const char *base_branch)
3231 const struct got_error *err = NULL;
3232 struct got_object_id *id = NULL;
3234 struct got_reference *ref = NULL;
3235 char *base_refname = NULL, *refname = NULL;
3238 * Don't let the user create a branch named '-'.
3239 * While technically a valid reference name, this case is usually
3240 * an unintended typo.
3242 if (branch_name[0] == '-' && branch_name[1] == '\0')
3243 return got_error(GOT_ERR_BAD_REF_NAME);
3245 err = match_object_id(&id, &label, base_branch,
3246 GOT_OBJ_TYPE_COMMIT, 1, repo);
3250 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
3251 err = got_error_from_errno("asprintf");
3255 err = got_ref_open(&ref, repo, refname, 0);
3257 err = got_error(GOT_ERR_BRANCH_EXISTS);
3259 } else if (err->code != GOT_ERR_NOT_REF)
3262 err = got_ref_alloc(&ref, refname, id);
3266 err = got_ref_write(ref, repo);
3276 static const struct got_error *
3277 cmd_branch(int argc, char *argv[])
3279 const struct got_error *error = NULL;
3280 struct got_repository *repo = NULL;
3281 struct got_worktree *worktree = NULL;
3282 char *cwd = NULL, *repo_path = NULL;
3283 int ch, do_list = 0;
3284 const char *delref = NULL;
3286 while ((ch = getopt(argc, argv, "d:r:l")) != -1) {
3292 repo_path = realpath(optarg, NULL);
3293 if (repo_path == NULL)
3294 err(1, "-r option");
3295 got_path_strip_trailing_slashes(repo_path);
3306 if (do_list && delref)
3307 errx(1, "-l and -d options are mutually exclusive\n");
3312 if (do_list || delref) {
3315 } else if (argc < 1 || argc > 2)
3320 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3324 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3325 "sendfd unveil", NULL) == -1)
3329 cwd = getcwd(NULL, 0);
3331 error = got_error_from_errno("getcwd");
3335 if (repo_path == NULL) {
3336 error = got_worktree_open(&worktree, cwd);
3337 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3343 strdup(got_worktree_get_repo_path(worktree));
3344 if (repo_path == NULL)
3345 error = got_error_from_errno("strdup");
3349 repo_path = strdup(cwd);
3350 if (repo_path == NULL) {
3351 error = got_error_from_errno("strdup");
3357 error = got_repo_open(&repo, repo_path);
3361 error = apply_unveil(got_repo_get_path(repo), do_list,
3362 worktree ? got_worktree_get_root_path(worktree) : NULL);
3367 error = list_branches(repo, worktree);
3369 error = delete_branch(repo, worktree, delref);
3371 const char *base_branch;
3373 base_branch = worktree ?
3374 got_worktree_get_head_ref_name(worktree) :
3376 if (strncmp(base_branch, "refs/heads/", 11) == 0)
3379 base_branch = argv[1];
3380 error = add_branch(repo, argv[0], base_branch);
3384 got_repo_close(repo);
3386 got_worktree_close(worktree);
3397 "usage: %s tag [-r repository] | -l | "
3398 "[-m message] name [commit]\n", getprogname());
3403 static const struct got_error *
3404 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
3406 const struct got_error *err = NULL;
3407 struct got_reflist_entry *re, *se, *new;
3408 struct got_object_id *re_id, *se_id;
3409 struct got_tag_object *re_tag, *se_tag;
3410 time_t re_time, se_time;
3412 SIMPLEQ_FOREACH(re, tags, entry) {
3413 se = SIMPLEQ_FIRST(sorted);
3415 err = got_reflist_entry_dup(&new, re);
3418 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
3421 err = got_ref_resolve(&re_id, repo, re->ref);
3424 err = got_object_open_as_tag(&re_tag, repo, re_id);
3428 re_time = got_object_tag_get_tagger_time(re_tag);
3429 got_object_tag_close(re_tag);
3433 err = got_ref_resolve(&se_id, repo, re->ref);
3436 err = got_object_open_as_tag(&se_tag, repo, se_id);
3440 se_time = got_object_tag_get_tagger_time(se_tag);
3441 got_object_tag_close(se_tag);
3443 if (se_time > re_time) {
3444 err = got_reflist_entry_dup(&new, re);
3447 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
3450 se = SIMPLEQ_NEXT(se, entry);
3459 static const struct got_error *
3460 cmp_tags(void *arg, int *cmp, struct got_reference *ref1,
3461 struct got_reference *ref2)
3463 const struct got_error *err = NULL;
3464 struct got_repository *repo = arg;
3465 struct got_object_id *id1, *id2 = NULL;
3466 struct got_tag_object *tag1 = NULL, *tag2 = NULL;
3467 time_t time1, time2;
3471 err = got_ref_resolve(&id1, repo, ref1);
3474 err = got_object_open_as_tag(&tag1, repo, id1);
3478 err = got_ref_resolve(&id2, repo, ref2);
3481 err = got_object_open_as_tag(&tag2, repo, id2);
3485 time1 = got_object_tag_get_tagger_time(tag1);
3486 time2 = got_object_tag_get_tagger_time(tag2);
3488 /* Put latest tags first. */
3491 else if (time1 > time2)
3494 err = got_ref_cmp_by_name(NULL, cmp, ref2, ref1);
3499 got_object_tag_close(tag1);
3501 got_object_tag_close(tag2);
3505 static const struct got_error *
3506 list_tags(struct got_repository *repo, struct got_worktree *worktree)
3508 static const struct got_error *err = NULL;
3509 struct got_reflist_head refs;
3510 struct got_reflist_entry *re;
3512 SIMPLEQ_INIT(&refs);
3514 err = got_ref_list(&refs, repo, "refs/tags", cmp_tags, repo);
3518 SIMPLEQ_FOREACH(re, &refs, entry) {
3519 const char *refname;
3520 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
3523 struct got_object_id *id;
3524 struct got_tag_object *tag;
3526 refname = got_ref_get_name(re->ref);
3527 if (strncmp(refname, "refs/tags/", 10) != 0)
3530 refstr = got_ref_to_str(re->ref);
3531 if (refstr == NULL) {
3532 err = got_error_from_errno("got_ref_to_str");
3535 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
3538 err = got_ref_resolve(&id, repo, re->ref);
3541 err = got_object_open_as_tag(&tag, repo, id);
3545 printf("from: %s\n", got_object_tag_get_tagger(tag));
3546 tagger_time = got_object_tag_get_tagger_time(tag);
3547 datestr = get_datestr(&tagger_time, datebuf);
3549 printf("date: %s UTC\n", datestr);
3550 err = got_object_id_str(&id_str,
3551 got_object_tag_get_object_id(tag));
3554 switch (got_object_tag_get_object_type(tag)) {
3555 case GOT_OBJ_TYPE_BLOB:
3556 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB, id_str);
3558 case GOT_OBJ_TYPE_TREE:
3559 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE, id_str);
3561 case GOT_OBJ_TYPE_COMMIT:
3562 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
3564 case GOT_OBJ_TYPE_TAG:
3565 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG, id_str);
3571 tagmsg0 = strdup(got_object_tag_get_message(tag));
3572 got_object_tag_close(tag);
3573 if (tagmsg0 == NULL) {
3574 err = got_error_from_errno("strdup");
3580 line = strsep(&tagmsg, "\n");
3582 printf(" %s\n", line);
3587 got_ref_list_free(&refs);
3591 static const struct got_error *
3592 get_tag_message(char **tagmsg, const char *commit_id_str,
3593 const char *tag_name, const char *repo_path)
3595 const struct got_error *err = NULL;
3596 char *template = NULL, *initial_content = NULL;
3597 char *tagmsg_path = NULL, *editor = NULL;
3600 if (asprintf(&template, "/tmp/got-tagmsg") == -1) {
3601 err = got_error_from_errno("asprintf");
3605 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
3606 commit_id_str, tag_name) == -1) {
3607 err = got_error_from_errno("asprintf");
3611 err = got_opentemp_named_fd(&tagmsg_path, &fd, template);
3615 dprintf(fd, initial_content);
3618 err = get_editor(&editor);
3621 err = edit_logmsg(tagmsg, editor, tagmsg_path, initial_content);
3623 if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
3624 unlink(tagmsg_path);
3628 free(initial_content);
3632 /* Editor is done; we can now apply unveil(2) */
3634 err = apply_unveil(repo_path, 0, NULL);
3643 static const struct got_error *
3644 add_tag(struct got_repository *repo, const char *tag_name,
3645 const char *commit_arg, const char *tagmsg_arg)
3647 const struct got_error *err = NULL;
3648 struct got_object_id *commit_id = NULL, *tag_id = NULL;
3649 char *label = NULL, *commit_id_str = NULL;
3650 struct got_reference *ref = NULL;
3651 char *refname = NULL, *tagmsg = NULL;
3655 * Don't let the user create a tag named '-'.
3656 * While technically a valid reference name, this case is usually
3657 * an unintended typo.
3659 if (tag_name[0] == '-' && tag_name[1] == '\0')
3660 return got_error(GOT_ERR_BAD_REF_NAME);
3662 err = get_author(&tagger);
3666 err = match_object_id(&commit_id, &label, commit_arg,
3667 GOT_OBJ_TYPE_COMMIT, 1, repo);
3671 err = got_object_id_str(&commit_id_str, commit_id);
3675 if (strncmp("refs/tags/", tag_name, 10) == 0) {
3676 refname = strdup(tag_name);
3677 if (refname == NULL) {
3678 err = got_error_from_errno("strdup");
3682 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
3683 err = got_error_from_errno("asprintf");
3687 err = got_ref_open(&ref, repo, refname, 0);
3689 err = got_error(GOT_ERR_TAG_EXISTS);
3691 } else if (err->code != GOT_ERR_NOT_REF)
3694 if (tagmsg_arg == NULL) {
3695 err = get_tag_message(&tagmsg, commit_id_str,
3696 tag_name, got_repo_get_path(repo));
3701 err = got_object_tag_create(&tag_id, tag_name, commit_id,
3702 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
3706 err = got_ref_alloc(&ref, refname, tag_id);
3710 err = got_ref_write(ref, repo);
3714 err = got_object_id_str(&tag_id_str, tag_id);
3715 printf("Created tag %s\n", tag_id_str);
3722 free(commit_id_str);
3728 static const struct got_error *
3729 cmd_tag(int argc, char *argv[])
3731 const struct got_error *error = NULL;
3732 struct got_repository *repo = NULL;
3733 struct got_worktree *worktree = NULL;
3734 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
3735 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
3736 int ch, do_list = 0;
3738 while ((ch = getopt(argc, argv, "m:r:l")) != -1) {
3744 repo_path = realpath(optarg, NULL);
3745 if (repo_path == NULL)
3746 err(1, "-r option");
3747 got_path_strip_trailing_slashes(repo_path);
3763 errx(1, "-l and -m options are mutually exclusive\n");
3766 } else if (argc < 1 || argc > 2)
3769 commit_id_arg = argv[1];
3774 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
3778 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
3779 "sendfd unveil", NULL) == -1)
3783 cwd = getcwd(NULL, 0);
3785 error = got_error_from_errno("getcwd");
3789 if (repo_path == NULL) {
3790 error = got_worktree_open(&worktree, cwd);
3791 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3797 strdup(got_worktree_get_repo_path(worktree));
3798 if (repo_path == NULL)
3799 error = got_error_from_errno("strdup");
3803 repo_path = strdup(cwd);
3804 if (repo_path == NULL) {
3805 error = got_error_from_errno("strdup");
3811 error = got_repo_open(&repo, repo_path);
3817 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3820 error = list_tags(repo, worktree);
3823 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3828 if (commit_id_arg == NULL) {
3829 struct got_reference *head_ref;
3830 struct got_object_id *commit_id;
3831 error = got_ref_open(&head_ref, repo,
3832 worktree ? got_worktree_get_head_ref_name(worktree)
3836 error = got_ref_resolve(&commit_id, repo, head_ref);
3837 got_ref_close(head_ref);
3840 error = got_object_id_str(&commit_id_str, commit_id);
3846 error = add_tag(repo, tag_name,
3847 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
3851 got_repo_close(repo);
3853 got_worktree_close(worktree);
3856 free(commit_id_str);
3863 fprintf(stderr, "usage: %s add file-path ...\n", getprogname());
3867 static const struct got_error *
3868 cmd_add(int argc, char *argv[])
3870 const struct got_error *error = NULL;
3871 struct got_repository *repo = NULL;
3872 struct got_worktree *worktree = NULL;
3874 struct got_pathlist_head paths;
3875 struct got_pathlist_entry *pe;
3880 while ((ch = getopt(argc, argv, "")) != -1) {
3892 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3899 cwd = getcwd(NULL, 0);
3901 error = got_error_from_errno("getcwd");
3905 error = got_worktree_open(&worktree, cwd);
3909 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
3913 error = apply_unveil(got_repo_get_path(repo), 1,
3914 got_worktree_get_root_path(worktree));
3918 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3922 error = got_worktree_schedule_add(worktree, &paths, print_status,
3926 got_repo_close(repo);
3928 got_worktree_close(worktree);
3929 TAILQ_FOREACH(pe, &paths, entry)
3930 free((char *)pe->path);
3931 got_pathlist_free(&paths);
3939 fprintf(stderr, "usage: %s remove [-f] file-path ...\n", getprogname());
3943 static const struct got_error *
3944 print_remove_status(void *arg, unsigned char status,
3945 unsigned char staged_status, const char *path,
3946 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
3947 struct got_object_id *commit_id)
3949 if (status == GOT_STATUS_NONEXISTENT)
3951 if (status == staged_status && (status == GOT_STATUS_DELETE))
3952 status = GOT_STATUS_NO_CHANGE;
3953 printf("%c%c %s\n", status, staged_status, path);
3957 static const struct got_error *
3958 cmd_remove(int argc, char *argv[])
3960 const struct got_error *error = NULL;
3961 struct got_worktree *worktree = NULL;
3962 struct got_repository *repo = NULL;
3964 struct got_pathlist_head paths;
3965 struct got_pathlist_entry *pe;
3966 int ch, delete_local_mods = 0;
3970 while ((ch = getopt(argc, argv, "f")) != -1) {
3973 delete_local_mods = 1;
3985 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3992 cwd = getcwd(NULL, 0);
3994 error = got_error_from_errno("getcwd");
3997 error = got_worktree_open(&worktree, cwd);
4001 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4005 error = apply_unveil(got_repo_get_path(repo), 1,
4006 got_worktree_get_root_path(worktree));
4010 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4014 error = got_worktree_schedule_delete(worktree, &paths,
4015 delete_local_mods, print_remove_status, NULL, repo);
4020 got_repo_close(repo);
4022 got_worktree_close(worktree);
4023 TAILQ_FOREACH(pe, &paths, entry)
4024 free((char *)pe->path);
4025 got_pathlist_free(&paths);
4033 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
4034 "path ...\n", getprogname());
4038 static const struct got_error *
4039 revert_progress(void *arg, unsigned char status, const char *path)
4041 while (path[0] == '/')
4043 printf("%c %s\n", status, path);
4047 struct choose_patch_arg {
4048 FILE *patch_script_file;
4052 static const struct got_error *
4053 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
4054 int nchanges, const char *action)
4057 size_t linesize = 0;
4061 case GOT_STATUS_ADD:
4062 printf("A %s\n%s this addition? [y/n] ", path, action);
4064 case GOT_STATUS_DELETE:
4065 printf("D %s\n%s this deletion? [y/n] ", path, action);
4067 case GOT_STATUS_MODIFY:
4068 if (fseek(patch_file, 0L, SEEK_SET) == -1)
4069 return got_error_from_errno("fseek");
4070 printf(GOT_COMMIT_SEP_STR);
4071 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
4073 if (ferror(patch_file))
4074 return got_error_from_errno("getline");
4075 printf(GOT_COMMIT_SEP_STR);
4076 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
4077 path, n, nchanges, action);
4080 return got_error_path(path, GOT_ERR_FILE_STATUS);
4086 static const struct got_error *
4087 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
4088 FILE *patch_file, int n, int nchanges)
4090 const struct got_error *err = NULL;
4092 size_t linesize = 0;
4095 struct choose_patch_arg *a = arg;
4097 *choice = GOT_PATCH_CHOICE_NONE;
4099 if (a->patch_script_file) {
4101 err = show_change(status, path, patch_file, n, nchanges,
4105 linelen = getline(&line, &linesize, a->patch_script_file);
4106 if (linelen == -1) {
4107 if (ferror(a->patch_script_file))
4108 return got_error_from_errno("getline");
4111 nl = strchr(line, '\n');
4114 if (strcmp(line, "y") == 0) {
4115 *choice = GOT_PATCH_CHOICE_YES;
4117 } else if (strcmp(line, "n") == 0) {
4118 *choice = GOT_PATCH_CHOICE_NO;
4120 } else if (strcmp(line, "q") == 0 &&
4121 status == GOT_STATUS_MODIFY) {
4122 *choice = GOT_PATCH_CHOICE_QUIT;
4125 printf("invalid response '%s'\n", line);
4130 while (resp != 'y' && resp != 'n' && resp != 'q') {
4131 err = show_change(status, path, patch_file, n, nchanges,
4138 if (status == GOT_STATUS_MODIFY) {
4139 if (resp != 'y' && resp != 'n' && resp != 'q') {
4140 printf("invalid response '%c'\n", resp);
4143 } else if (resp != 'y' && resp != 'n') {
4144 printf("invalid response '%c'\n", resp);
4150 *choice = GOT_PATCH_CHOICE_YES;
4151 else if (resp == 'n')
4152 *choice = GOT_PATCH_CHOICE_NO;
4153 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
4154 *choice = GOT_PATCH_CHOICE_QUIT;
4160 static const struct got_error *
4161 cmd_revert(int argc, char *argv[])
4163 const struct got_error *error = NULL;
4164 struct got_worktree *worktree = NULL;
4165 struct got_repository *repo = NULL;
4166 char *cwd = NULL, *path = NULL;
4167 struct got_pathlist_head paths;
4168 struct got_pathlist_entry *pe;
4169 int ch, can_recurse = 0, pflag = 0;
4170 FILE *patch_script_file = NULL;
4171 const char *patch_script_path = NULL;
4172 struct choose_patch_arg cpa;
4176 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
4182 patch_script_path = optarg;
4197 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4198 "unveil", NULL) == -1)
4203 if (patch_script_path && !pflag)
4204 errx(1, "-F option can only be used together with -p option");
4206 cwd = getcwd(NULL, 0);
4208 error = got_error_from_errno("getcwd");
4211 error = got_worktree_open(&worktree, cwd);
4215 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4219 if (patch_script_path) {
4220 patch_script_file = fopen(patch_script_path, "r");
4221 if (patch_script_file == NULL) {
4222 error = got_error_from_errno2("fopen",
4227 error = apply_unveil(got_repo_get_path(repo), 1,
4228 got_worktree_get_root_path(worktree));
4232 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4239 TAILQ_FOREACH(pe, &paths, entry) {
4240 if (asprintf(&ondisk_path, "%s/%s",
4241 got_worktree_get_root_path(worktree),
4243 error = got_error_from_errno("asprintf");
4246 if (lstat(ondisk_path, &sb) == -1) {
4247 if (errno == ENOENT) {
4251 error = got_error_from_errno2("lstat",
4257 if (S_ISDIR(sb.st_mode)) {
4258 error = got_error_msg(GOT_ERR_BAD_PATH,
4259 "reverting directories requires -R option");
4265 cpa.patch_script_file = patch_script_file;
4266 cpa.action = "revert";
4267 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
4268 pflag ? choose_patch : NULL, &cpa, repo);
4272 if (patch_script_file && fclose(patch_script_file) == EOF &&
4274 error = got_error_from_errno2("fclose", patch_script_path);
4276 got_repo_close(repo);
4278 got_worktree_close(worktree);
4287 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
4292 struct collect_commit_logmsg_arg {
4293 const char *cmdline_log;
4295 const char *worktree_path;
4296 const char *branch_name;
4297 const char *repo_path;
4302 static const struct got_error *
4303 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
4306 char *initial_content = NULL;
4307 struct got_pathlist_entry *pe;
4308 const struct got_error *err = NULL;
4309 char *template = NULL;
4310 struct collect_commit_logmsg_arg *a = arg;
4314 /* if a message was specified on the command line, just use it */
4315 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
4316 len = strlen(a->cmdline_log) + 1;
4317 *logmsg = malloc(len + 1);
4318 if (*logmsg == NULL)
4319 return got_error_from_errno("malloc");
4320 strlcpy(*logmsg, a->cmdline_log, len);
4324 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
4325 return got_error_from_errno("asprintf");
4327 if (asprintf(&initial_content,
4328 "\n# changes to be committed on branch %s:\n",
4329 a->branch_name) == -1)
4330 return got_error_from_errno("asprintf");
4332 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
4336 dprintf(fd, initial_content);
4338 TAILQ_FOREACH(pe, commitable_paths, entry) {
4339 struct got_commitable *ct = pe->data;
4340 dprintf(fd, "# %c %s\n",
4341 got_commitable_get_status(ct),
4342 got_commitable_get_path(ct));
4346 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
4348 if (err == NULL || err->code == GOT_ERR_COMMIT_MSG_EMPTY) {
4349 unlink(a->logmsg_path);
4350 free(a->logmsg_path);
4351 a->logmsg_path = NULL;
4353 free(initial_content);
4356 /* Editor is done; we can now apply unveil(2) */
4358 err = apply_unveil(a->repo_path, 0, a->worktree_path);
4367 static const struct got_error *
4368 cmd_commit(int argc, char *argv[])
4370 const struct got_error *error = NULL;
4371 struct got_worktree *worktree = NULL;
4372 struct got_repository *repo = NULL;
4373 char *cwd = NULL, *id_str = NULL;
4374 struct got_object_id *id = NULL;
4375 const char *logmsg = NULL;
4377 struct collect_commit_logmsg_arg cl_arg;
4378 char *editor = NULL;
4379 int ch, rebase_in_progress, histedit_in_progress;
4380 struct got_pathlist_head paths;
4383 cl_arg.logmsg_path = NULL;
4385 while ((ch = getopt(argc, argv, "m:")) != -1) {
4400 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4401 "unveil", NULL) == -1)
4404 error = get_author(&author);
4408 cwd = getcwd(NULL, 0);
4410 error = got_error_from_errno("getcwd");
4413 error = got_worktree_open(&worktree, cwd);
4417 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
4420 if (rebase_in_progress) {
4421 error = got_error(GOT_ERR_REBASING);
4425 error = got_worktree_histedit_in_progress(&histedit_in_progress,
4430 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4435 * unveil(2) traverses exec(2); if an editor is used we have
4436 * to apply unveil after the log message has been written.
4438 if (logmsg == NULL || strlen(logmsg) == 0)
4439 error = get_editor(&editor);
4441 error = apply_unveil(got_repo_get_path(repo), 0,
4442 got_worktree_get_root_path(worktree));
4446 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4450 cl_arg.editor = editor;
4451 cl_arg.cmdline_log = logmsg;
4452 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
4453 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
4454 if (!histedit_in_progress) {
4455 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
4456 error = got_error(GOT_ERR_COMMIT_BRANCH);
4459 cl_arg.branch_name += 11;
4461 cl_arg.repo_path = got_repo_get_path(repo);
4462 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
4463 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
4465 if (cl_arg.logmsg_path)
4466 fprintf(stderr, "%s: log message preserved in %s\n",
4467 getprogname(), cl_arg.logmsg_path);
4471 if (cl_arg.logmsg_path)
4472 unlink(cl_arg.logmsg_path);
4474 error = got_object_id_str(&id_str, id);
4477 printf("Created commit %s\n", id_str);
4479 free(cl_arg.logmsg_path);
4481 got_repo_close(repo);
4483 got_worktree_close(worktree);
4491 usage_cherrypick(void)
4493 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
4497 static const struct got_error *
4498 cmd_cherrypick(int argc, char *argv[])
4500 const struct got_error *error = NULL;
4501 struct got_worktree *worktree = NULL;
4502 struct got_repository *repo = NULL;
4503 char *cwd = NULL, *commit_id_str = NULL;
4504 struct got_object_id *commit_id = NULL;
4505 struct got_commit_object *commit = NULL;
4506 struct got_object_qid *pid;
4507 struct got_reference *head_ref = NULL;
4508 int ch, did_something = 0;
4510 while ((ch = getopt(argc, argv, "")) != -1) {
4522 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4523 "unveil", NULL) == -1)
4529 cwd = getcwd(NULL, 0);
4531 error = got_error_from_errno("getcwd");
4534 error = got_worktree_open(&worktree, cwd);
4538 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4542 error = apply_unveil(got_repo_get_path(repo), 0,
4543 got_worktree_get_root_path(worktree));
4547 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4548 GOT_OBJ_TYPE_COMMIT, repo);
4549 if (error != NULL) {
4550 struct got_reference *ref;
4551 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4553 error = got_ref_open(&ref, repo, argv[0], 0);
4556 error = got_ref_resolve(&commit_id, repo, ref);
4561 error = got_object_id_str(&commit_id_str, commit_id);
4565 error = got_ref_open(&head_ref, repo,
4566 got_worktree_get_head_ref_name(worktree), 0);
4570 error = check_same_branch(commit_id, head_ref, NULL, repo);
4572 if (error->code != GOT_ERR_ANCESTRY)
4576 error = got_error(GOT_ERR_SAME_BRANCH);
4580 error = got_object_open_as_commit(&commit, repo, commit_id);
4583 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4584 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
4585 commit_id, repo, update_progress, &did_something, check_cancelled,
4591 printf("Merged commit %s\n", commit_id_str);
4594 got_object_commit_close(commit);
4595 free(commit_id_str);
4597 got_ref_close(head_ref);
4599 got_worktree_close(worktree);
4601 got_repo_close(repo);
4608 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
4612 static const struct got_error *
4613 cmd_backout(int argc, char *argv[])
4615 const struct got_error *error = NULL;
4616 struct got_worktree *worktree = NULL;
4617 struct got_repository *repo = NULL;
4618 char *cwd = NULL, *commit_id_str = NULL;
4619 struct got_object_id *commit_id = NULL;
4620 struct got_commit_object *commit = NULL;
4621 struct got_object_qid *pid;
4622 struct got_reference *head_ref = NULL;
4623 int ch, did_something = 0;
4625 while ((ch = getopt(argc, argv, "")) != -1) {
4637 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
4638 "unveil", NULL) == -1)
4644 cwd = getcwd(NULL, 0);
4646 error = got_error_from_errno("getcwd");
4649 error = got_worktree_open(&worktree, cwd);
4653 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
4657 error = apply_unveil(got_repo_get_path(repo), 0,
4658 got_worktree_get_root_path(worktree));
4662 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
4663 GOT_OBJ_TYPE_COMMIT, repo);
4664 if (error != NULL) {
4665 struct got_reference *ref;
4666 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
4668 error = got_ref_open(&ref, repo, argv[0], 0);
4671 error = got_ref_resolve(&commit_id, repo, ref);
4676 error = got_object_id_str(&commit_id_str, commit_id);
4680 error = got_ref_open(&head_ref, repo,
4681 got_worktree_get_head_ref_name(worktree), 0);
4685 error = check_same_branch(commit_id, head_ref, NULL, repo);
4689 error = got_object_open_as_commit(&commit, repo, commit_id);
4692 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
4694 error = got_error(GOT_ERR_ROOT_COMMIT);
4698 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
4699 update_progress, &did_something, check_cancelled, NULL);
4704 printf("Backed out commit %s\n", commit_id_str);
4707 got_object_commit_close(commit);
4708 free(commit_id_str);
4710 got_ref_close(head_ref);
4712 got_worktree_close(worktree);
4714 got_repo_close(repo);
4721 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
4727 trim_logmsg(char *logmsg, int limit)
4732 len = strlen(logmsg);
4736 nl = strchr(logmsg, '\n');
4741 static const struct got_error *
4742 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
4744 const struct got_error *err;
4745 char *logmsg0 = NULL;
4748 err = got_object_commit_get_logmsg(&logmsg0, commit);
4753 while (isspace((unsigned char)s[0]))
4756 *logmsg = strdup(s);
4757 if (*logmsg == NULL) {
4758 err = got_error_from_errno("strdup");
4762 trim_logmsg(*logmsg, limit);
4768 static const struct got_error *
4769 show_rebase_progress(struct got_commit_object *commit,
4770 struct got_object_id *old_id, struct got_object_id *new_id)
4772 const struct got_error *err;
4773 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
4775 err = got_object_id_str(&old_id_str, old_id);
4780 err = got_object_id_str(&new_id_str, new_id);
4785 old_id_str[12] = '\0';
4787 new_id_str[12] = '\0';
4789 err = get_short_logmsg(&logmsg, 42, commit);
4793 printf("%s -> %s: %s\n", old_id_str,
4794 new_id_str ? new_id_str : "no-op change", logmsg);
4801 static const struct got_error *
4802 rebase_progress(void *arg, unsigned char status, const char *path)
4804 unsigned char *rebase_status = arg;
4806 while (path[0] == '/')
4808 printf("%c %s\n", status, path);
4810 if (*rebase_status == GOT_STATUS_CONFLICT)
4812 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
4813 *rebase_status = status;
4817 static const struct got_error *
4818 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
4819 struct got_reference *branch, struct got_reference *new_base_branch,
4820 struct got_reference *tmp_branch, struct got_repository *repo)
4822 printf("Switching work tree to %s\n", got_ref_get_name(branch));
4823 return got_worktree_rebase_complete(worktree, fileindex,
4824 new_base_branch, tmp_branch, branch, repo);
4827 static const struct got_error *
4828 rebase_commit(struct got_pathlist_head *merged_paths,
4829 struct got_worktree *worktree, struct got_fileindex *fileindex,
4830 struct got_reference *tmp_branch,
4831 struct got_object_id *commit_id, struct got_repository *repo)
4833 const struct got_error *error;
4834 struct got_commit_object *commit;
4835 struct got_object_id *new_commit_id;
4837 error = got_object_open_as_commit(&commit, repo, commit_id);
4841 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
4842 worktree, fileindex, tmp_branch, commit, commit_id, repo);
4844 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
4846 error = show_rebase_progress(commit, commit_id, NULL);
4848 error = show_rebase_progress(commit, commit_id, new_commit_id);
4849 free(new_commit_id);
4852 got_object_commit_close(commit);
4856 struct check_path_prefix_arg {
4857 const char *path_prefix;
4862 static const struct got_error *
4863 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
4864 struct got_blob_object *blob2, struct got_object_id *id1,
4865 struct got_object_id *id2, const char *path1, const char *path2,
4866 struct got_repository *repo)
4868 struct check_path_prefix_arg *a = arg;
4870 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
4871 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
4872 return got_error(a->errcode);
4877 static const struct got_error *
4878 check_path_prefix(struct got_object_id *parent_id,
4879 struct got_object_id *commit_id, const char *path_prefix,
4880 int errcode, struct got_repository *repo)
4882 const struct got_error *err;
4883 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
4884 struct got_commit_object *commit = NULL, *parent_commit = NULL;
4885 struct check_path_prefix_arg cpp_arg;
4887 if (got_path_is_root_dir(path_prefix))
4890 err = got_object_open_as_commit(&commit, repo, commit_id);
4894 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
4898 err = got_object_open_as_tree(&tree1, repo,
4899 got_object_commit_get_tree_id(parent_commit));
4903 err = got_object_open_as_tree(&tree2, repo,
4904 got_object_commit_get_tree_id(commit));
4908 cpp_arg.path_prefix = path_prefix;
4909 while (cpp_arg.path_prefix[0] == '/')
4910 cpp_arg.path_prefix++;
4911 cpp_arg.len = strlen(cpp_arg.path_prefix);
4912 cpp_arg.errcode = errcode;
4913 err = got_diff_tree(tree1, tree2, "", "", repo,
4914 check_path_prefix_in_diff, &cpp_arg, 0);
4917 got_object_tree_close(tree1);
4919 got_object_tree_close(tree2);
4921 got_object_commit_close(commit);
4923 got_object_commit_close(parent_commit);
4927 static const struct got_error *
4928 collect_commits(struct got_object_id_queue *commits,
4929 struct got_object_id *initial_commit_id,
4930 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
4931 const char *path_prefix, int path_prefix_errcode,
4932 struct got_repository *repo)
4934 const struct got_error *err = NULL;
4935 struct got_commit_graph *graph = NULL;
4936 struct got_object_id *parent_id = NULL;
4937 struct got_object_qid *qid;
4938 struct got_object_id *commit_id = initial_commit_id;
4940 err = got_commit_graph_open(&graph, initial_commit_id, "/", 1, repo);
4944 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
4945 check_cancelled, NULL);
4948 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
4949 err = got_commit_graph_iter_next(&parent_id, graph);
4951 if (err->code == GOT_ERR_ITER_COMPLETED) {
4952 err = got_error_msg(GOT_ERR_ANCESTRY,
4953 "ran out of commits to rebase before "
4954 "youngest common ancestor commit has "
4957 } else if (err->code != GOT_ERR_ITER_NEED_MORE)
4959 err = got_commit_graph_fetch_commits(graph, 1, repo,
4960 check_cancelled, NULL);
4964 err = check_path_prefix(parent_id, commit_id,
4965 path_prefix, path_prefix_errcode, repo);
4969 err = got_object_qid_alloc(&qid, commit_id);
4972 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
4973 commit_id = parent_id;
4977 got_commit_graph_close(graph);
4981 static const struct got_error *
4982 cmd_rebase(int argc, char *argv[])
4984 const struct got_error *error = NULL;
4985 struct got_worktree *worktree = NULL;
4986 struct got_repository *repo = NULL;
4987 struct got_fileindex *fileindex = NULL;
4989 struct got_reference *branch = NULL;
4990 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
4991 struct got_object_id *commit_id = NULL, *parent_id = NULL;
4992 struct got_object_id *resume_commit_id = NULL;
4993 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
4994 struct got_commit_object *commit = NULL;
4995 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
4996 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
4997 struct got_object_id_queue commits;
4998 struct got_pathlist_head merged_paths;
4999 const struct got_object_id_queue *parent_ids;
5000 struct got_object_qid *qid, *pid;
5002 SIMPLEQ_INIT(&commits);
5003 TAILQ_INIT(&merged_paths);
5005 while ((ch = getopt(argc, argv, "ac")) != -1) {
5011 continue_rebase = 1;
5023 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5024 "unveil", NULL) == -1)
5027 if (abort_rebase && continue_rebase)
5029 else if (abort_rebase || continue_rebase) {
5032 } else if (argc != 1)
5035 cwd = getcwd(NULL, 0);
5037 error = got_error_from_errno("getcwd");
5040 error = got_worktree_open(&worktree, cwd);
5044 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
5048 error = apply_unveil(got_repo_get_path(repo), 0,
5049 got_worktree_get_root_path(worktree));
5053 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5059 if (!rebase_in_progress) {
5060 error = got_error(GOT_ERR_NOT_REBASING);
5063 error = got_worktree_rebase_continue(&resume_commit_id,
5064 &new_base_branch, &tmp_branch, &branch, &fileindex,
5068 printf("Switching work tree to %s\n",
5069 got_ref_get_symref_target(new_base_branch));
5070 error = got_worktree_rebase_abort(worktree, fileindex, repo,
5071 new_base_branch, update_progress, &did_something);
5074 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
5075 goto done; /* nothing else to do */
5078 if (continue_rebase) {
5079 if (!rebase_in_progress) {
5080 error = got_error(GOT_ERR_NOT_REBASING);
5083 error = got_worktree_rebase_continue(&resume_commit_id,
5084 &new_base_branch, &tmp_branch, &branch, &fileindex,
5089 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
5090 resume_commit_id, repo);
5094 yca_id = got_object_id_dup(resume_commit_id);
5095 if (yca_id == NULL) {
5096 error = got_error_from_errno("got_object_id_dup");
5100 error = got_ref_open(&branch, repo, argv[0], 0);
5105 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
5109 if (!continue_rebase) {
5110 struct got_object_id *base_commit_id;
5112 base_commit_id = got_worktree_get_base_commit_id(worktree);
5113 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
5114 base_commit_id, branch_head_commit_id, repo,
5115 check_cancelled, NULL);
5118 if (yca_id == NULL) {
5119 error = got_error_msg(GOT_ERR_ANCESTRY,
5120 "specified branch shares no common ancestry "
5121 "with work tree's branch");
5125 error = check_same_branch(base_commit_id, branch, yca_id, repo);
5127 if (error->code != GOT_ERR_ANCESTRY)
5131 error = got_error_msg(GOT_ERR_SAME_BRANCH,
5132 "specified branch resolves to a commit which "
5133 "is already contained in work tree's branch");
5136 error = got_worktree_rebase_prepare(&new_base_branch,
5137 &tmp_branch, &fileindex, worktree, branch, repo);
5142 commit_id = branch_head_commit_id;
5143 error = got_object_open_as_commit(&commit, repo, commit_id);
5147 parent_ids = got_object_commit_get_parent_ids(commit);
5148 pid = SIMPLEQ_FIRST(parent_ids);
5150 if (!continue_rebase) {
5152 error = got_worktree_rebase_abort(worktree, fileindex,
5153 repo, new_base_branch, update_progress,
5157 printf("Rebase of %s aborted\n",
5158 got_ref_get_name(branch));
5160 error = got_error(GOT_ERR_EMPTY_REBASE);
5163 error = collect_commits(&commits, commit_id, pid->id,
5164 yca_id, got_worktree_get_path_prefix(worktree),
5165 GOT_ERR_REBASE_PATH, repo);
5166 got_object_commit_close(commit);
5171 if (SIMPLEQ_EMPTY(&commits)) {
5172 if (continue_rebase)
5173 error = rebase_complete(worktree, fileindex,
5174 branch, new_base_branch, tmp_branch, repo);
5176 error = got_error(GOT_ERR_EMPTY_REBASE);
5181 SIMPLEQ_FOREACH(qid, &commits, entry) {
5182 commit_id = qid->id;
5183 parent_id = pid ? pid->id : yca_id;
5186 error = got_worktree_rebase_merge_files(&merged_paths,
5187 worktree, fileindex, parent_id, commit_id, repo,
5188 rebase_progress, &rebase_status, check_cancelled, NULL);
5192 if (rebase_status == GOT_STATUS_CONFLICT) {
5193 got_worktree_rebase_pathlist_free(&merged_paths);
5197 error = rebase_commit(&merged_paths, worktree, fileindex,
5198 tmp_branch, commit_id, repo);
5199 got_worktree_rebase_pathlist_free(&merged_paths);
5204 if (rebase_status == GOT_STATUS_CONFLICT) {
5205 error = got_worktree_rebase_postpone(worktree, fileindex);
5208 error = got_error_msg(GOT_ERR_CONFLICTS,
5209 "conflicts must be resolved before rebasing can continue");
5211 error = rebase_complete(worktree, fileindex, branch,
5212 new_base_branch, tmp_branch, repo);
5214 got_object_id_queue_free(&commits);
5215 free(branch_head_commit_id);
5216 free(resume_commit_id);
5219 got_object_commit_close(commit);
5221 got_ref_close(branch);
5222 if (new_base_branch)
5223 got_ref_close(new_base_branch);
5225 got_ref_close(tmp_branch);
5227 got_worktree_close(worktree);
5229 got_repo_close(repo);
5234 usage_histedit(void)
5236 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script]\n",
5241 #define GOT_HISTEDIT_PICK 'p'
5242 #define GOT_HISTEDIT_EDIT 'e'
5243 #define GOT_HISTEDIT_FOLD 'f'
5244 #define GOT_HISTEDIT_DROP 'd'
5245 #define GOT_HISTEDIT_MESG 'm'
5247 static struct got_histedit_cmd {
5251 } got_histedit_cmds[] = {
5252 { GOT_HISTEDIT_PICK, "pick", "use commit" },
5253 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
5254 { GOT_HISTEDIT_FOLD, "fold", "combine with commit below" },
5255 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
5256 { GOT_HISTEDIT_MESG, "mesg",
5257 "single-line log message for commit above (open editor if empty)" },
5260 struct got_histedit_list_entry {
5261 TAILQ_ENTRY(got_histedit_list_entry) entry;
5262 struct got_object_id *commit_id;
5263 const struct got_histedit_cmd *cmd;
5266 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
5268 static const struct got_error *
5269 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
5270 FILE *f, struct got_repository *repo)
5272 const struct got_error *err = NULL;
5273 char *logmsg = NULL, *id_str = NULL;
5274 struct got_commit_object *commit = NULL;
5277 err = got_object_open_as_commit(&commit, repo, commit_id);
5281 err = get_short_logmsg(&logmsg, 34, commit);
5285 err = got_object_id_str(&id_str, commit_id);
5289 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
5291 err = got_ferror(f, GOT_ERR_IO);
5294 got_object_commit_close(commit);
5300 static const struct got_error *
5301 histedit_write_commit_list(struct got_object_id_queue *commits, FILE *f,
5302 struct got_repository *repo)
5304 const struct got_error *err = NULL;
5305 struct got_object_qid *qid;
5307 if (SIMPLEQ_EMPTY(commits))
5308 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5310 SIMPLEQ_FOREACH(qid, commits, entry) {
5311 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
5320 static const struct got_error *
5321 write_cmd_list(FILE *f)
5323 const struct got_error *err = NULL;
5326 n = fprintf(f, "# Available histedit commands:\n");
5328 return got_ferror(f, GOT_ERR_IO);
5330 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5331 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
5332 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
5335 err = got_ferror(f, GOT_ERR_IO);
5339 n = fprintf(f, "# Commits will be processed in order from top to "
5340 "bottom of this file.\n");
5342 return got_ferror(f, GOT_ERR_IO);
5346 static const struct got_error *
5347 histedit_syntax_error(int lineno)
5349 static char msg[42];
5352 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
5354 if (ret == -1 || ret >= sizeof(msg))
5355 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
5357 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
5360 static const struct got_error *
5361 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
5362 char *logmsg, struct got_repository *repo)
5364 const struct got_error *err;
5365 struct got_commit_object *folded_commit = NULL;
5366 char *id_str, *folded_logmsg = NULL;
5368 err = got_object_id_str(&id_str, hle->commit_id);
5372 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
5376 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
5379 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
5380 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
5381 folded_logmsg) == -1) {
5382 err = got_error_from_errno("asprintf");
5387 got_object_commit_close(folded_commit);
5389 free(folded_logmsg);
5393 static struct got_histedit_list_entry *
5394 get_folded_commits(struct got_histedit_list_entry *hle)
5396 struct got_histedit_list_entry *prev, *folded = NULL;
5398 prev = TAILQ_PREV(hle, got_histedit_list, entry);
5399 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
5400 prev->cmd->code == GOT_HISTEDIT_DROP)) {
5401 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
5403 prev = TAILQ_PREV(prev, got_histedit_list, entry);
5409 static const struct got_error *
5410 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
5411 struct got_repository *repo)
5413 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
5414 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
5415 const struct got_error *err = NULL;
5416 struct got_commit_object *commit = NULL;
5418 struct got_histedit_list_entry *folded = NULL;
5420 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5424 folded = get_folded_commits(hle);
5426 while (folded != hle) {
5427 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
5428 folded = TAILQ_NEXT(folded, entry);
5431 err = append_folded_commit_msg(&new_msg, folded,
5437 folded = TAILQ_NEXT(folded, entry);
5441 err = got_object_id_str(&id_str, hle->commit_id);
5444 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
5447 if (asprintf(&new_msg,
5448 "%s\n# original log message of commit %s: %s",
5449 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
5450 err = got_error_from_errno("asprintf");
5456 err = got_object_id_str(&id_str, hle->commit_id);
5460 err = got_opentemp_named_fd(&logmsg_path, &fd, "/tmp/got-logmsg");
5464 dprintf(fd, logmsg);
5467 err = get_editor(&editor);
5471 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
5473 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
5475 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
5478 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
5479 err = got_error_from_errno2("unlink", logmsg_path);
5485 got_object_commit_close(commit);
5489 static const struct got_error *
5490 histedit_parse_list(struct got_histedit_list *histedit_cmds,
5491 FILE *f, struct got_repository *repo)
5493 const struct got_error *err = NULL;
5494 char *line = NULL, *p, *end;
5498 const struct got_histedit_cmd *cmd;
5499 struct got_object_id *commit_id = NULL;
5500 struct got_histedit_list_entry *hle = NULL;
5503 len = getline(&line, &size, f);
5505 const struct got_error *getline_err;
5508 getline_err = got_error_from_errno("getline");
5509 err = got_ferror(f, getline_err->code);
5514 while (isspace((unsigned char)p[0]))
5516 if (p[0] == '#' || p[0] == '\0') {
5522 for (i = 0; i < nitems(got_histedit_cmds); i++) {
5523 cmd = &got_histedit_cmds[i];
5524 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
5525 isspace((unsigned char)p[strlen(cmd->name)])) {
5526 p += strlen(cmd->name);
5529 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
5534 if (i == nitems(got_histedit_cmds)) {
5535 err = histedit_syntax_error(lineno);
5538 while (isspace((unsigned char)p[0]))
5540 if (cmd->code == GOT_HISTEDIT_MESG) {
5541 if (hle == NULL || hle->logmsg != NULL) {
5542 err = got_error(GOT_ERR_HISTEDIT_CMD);
5546 err = histedit_edit_logmsg(hle, repo);
5550 hle->logmsg = strdup(p);
5551 if (hle->logmsg == NULL) {
5552 err = got_error_from_errno("strdup");
5561 while (end[0] && !isspace((unsigned char)end[0]))
5565 err = got_object_resolve_id_str(&commit_id, repo, p);
5567 /* override error code */
5568 err = histedit_syntax_error(lineno);
5572 hle = malloc(sizeof(*hle));
5574 err = got_error_from_errno("malloc");
5578 hle->commit_id = commit_id;
5583 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
5591 static const struct got_error *
5592 histedit_check_script(struct got_histedit_list *histedit_cmds,
5593 struct got_object_id_queue *commits, struct got_repository *repo)
5595 const struct got_error *err = NULL;
5596 struct got_object_qid *qid;
5597 struct got_histedit_list_entry *hle;
5598 static char msg[80];
5601 if (TAILQ_EMPTY(histedit_cmds))
5602 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
5603 "histedit script contains no commands");
5604 if (SIMPLEQ_EMPTY(commits))
5605 return got_error(GOT_ERR_EMPTY_HISTEDIT);
5607 SIMPLEQ_FOREACH(qid, commits, entry) {
5608 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5609 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
5613 err = got_object_id_str(&id_str, qid->id);
5616 snprintf(msg, sizeof(msg),
5617 "commit %s missing from histedit script", id_str);
5619 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
5623 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
5624 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
5625 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
5626 "last commit in histedit script cannot be folded");
5631 static const struct got_error *
5632 histedit_run_editor(struct got_histedit_list *histedit_cmds,
5633 const char *path, struct got_object_id_queue *commits,
5634 struct got_repository *repo)
5636 const struct got_error *err = NULL;
5640 err = get_editor(&editor);
5644 if (spawn_editor(editor, path) == -1) {
5645 err = got_error_from_errno("failed spawning editor");
5649 f = fopen(path, "r");
5651 err = got_error_from_errno("fopen");
5654 err = histedit_parse_list(histedit_cmds, f, repo);
5658 err = histedit_check_script(histedit_cmds, commits, repo);
5660 if (f && fclose(f) != 0 && err == NULL)
5661 err = got_error_from_errno("fclose");
5666 static const struct got_error *
5667 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
5668 struct got_object_id_queue *, const char *, struct got_repository *);
5670 static const struct got_error *
5671 histedit_edit_script(struct got_histedit_list *histedit_cmds,
5672 struct got_object_id_queue *commits, struct got_repository *repo)
5674 const struct got_error *err;
5678 err = got_opentemp_named(&path, &f, "got-histedit");
5682 err = write_cmd_list(f);
5686 err = histedit_write_commit_list(commits, f, repo);
5690 if (fclose(f) != 0) {
5691 err = got_error_from_errno("fclose");
5696 err = histedit_run_editor(histedit_cmds, path, commits, repo);
5698 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5699 err->code != GOT_ERR_HISTEDIT_CMD)
5701 err = histedit_edit_list_retry(histedit_cmds, err,
5702 commits, path, repo);
5705 if (f && fclose(f) != 0 && err == NULL)
5706 err = got_error_from_errno("fclose");
5707 if (path && unlink(path) != 0 && err == NULL)
5708 err = got_error_from_errno2("unlink", path);
5713 static const struct got_error *
5714 histedit_save_list(struct got_histedit_list *histedit_cmds,
5715 struct got_worktree *worktree, struct got_repository *repo)
5717 const struct got_error *err = NULL;
5720 struct got_histedit_list_entry *hle;
5721 struct got_commit_object *commit = NULL;
5723 err = got_worktree_get_histedit_script_path(&path, worktree);
5727 f = fopen(path, "w");
5729 err = got_error_from_errno2("fopen", path);
5732 TAILQ_FOREACH(hle, histedit_cmds, entry) {
5733 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
5739 int n = fprintf(f, "%c %s\n",
5740 GOT_HISTEDIT_MESG, hle->logmsg);
5742 err = got_ferror(f, GOT_ERR_IO);
5748 if (f && fclose(f) != 0 && err == NULL)
5749 err = got_error_from_errno("fclose");
5752 got_object_commit_close(commit);
5757 histedit_free_list(struct got_histedit_list *histedit_cmds)
5759 struct got_histedit_list_entry *hle;
5761 while ((hle = TAILQ_FIRST(histedit_cmds))) {
5762 TAILQ_REMOVE(histedit_cmds, hle, entry);
5767 static const struct got_error *
5768 histedit_load_list(struct got_histedit_list *histedit_cmds,
5769 const char *path, struct got_repository *repo)
5771 const struct got_error *err = NULL;
5774 f = fopen(path, "r");
5776 err = got_error_from_errno2("fopen", path);
5780 err = histedit_parse_list(histedit_cmds, f, repo);
5782 if (f && fclose(f) != 0 && err == NULL)
5783 err = got_error_from_errno("fclose");
5787 static const struct got_error *
5788 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
5789 const struct got_error *edit_err, struct got_object_id_queue *commits,
5790 const char *path, struct got_repository *repo)
5792 const struct got_error *err = NULL, *prev_err = edit_err;
5795 while (resp != 'c' && resp != 'r' && resp != 'a') {
5796 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
5797 "or (a)bort: ", getprogname(), prev_err->msg);
5802 histedit_free_list(histedit_cmds);
5803 err = histedit_run_editor(histedit_cmds, path, commits,
5806 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5807 err->code != GOT_ERR_HISTEDIT_CMD)
5814 } else if (resp == 'r') {
5815 histedit_free_list(histedit_cmds);
5816 err = histedit_edit_script(histedit_cmds,
5819 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
5820 err->code != GOT_ERR_HISTEDIT_CMD)
5827 } else if (resp == 'a') {
5828 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
5831 printf("invalid response '%c'\n", resp);
5837 static const struct got_error *
5838 histedit_complete(struct got_worktree *worktree,
5839 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
5840 struct got_reference *branch, struct got_repository *repo)
5842 printf("Switching work tree to %s\n",
5843 got_ref_get_symref_target(branch));
5844 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
5848 static const struct got_error *
5849 show_histedit_progress(struct got_commit_object *commit,
5850 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
5852 const struct got_error *err;
5853 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
5855 err = got_object_id_str(&old_id_str, hle->commit_id);
5860 err = got_object_id_str(&new_id_str, new_id);
5865 old_id_str[12] = '\0';
5867 new_id_str[12] = '\0';
5870 logmsg = strdup(hle->logmsg);
5871 if (logmsg == NULL) {
5872 err = got_error_from_errno("strdup");
5875 trim_logmsg(logmsg, 42);
5877 err = get_short_logmsg(&logmsg, 42, commit);
5882 switch (hle->cmd->code) {
5883 case GOT_HISTEDIT_PICK:
5884 case GOT_HISTEDIT_EDIT:
5885 printf("%s -> %s: %s\n", old_id_str,
5886 new_id_str ? new_id_str : "no-op change", logmsg);
5888 case GOT_HISTEDIT_DROP:
5889 case GOT_HISTEDIT_FOLD:
5890 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
5903 static const struct got_error *
5904 histedit_commit(struct got_pathlist_head *merged_paths,
5905 struct got_worktree *worktree, struct got_fileindex *fileindex,
5906 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
5907 struct got_repository *repo)
5909 const struct got_error *err;
5910 struct got_commit_object *commit;
5911 struct got_object_id *new_commit_id;
5913 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
5914 && hle->logmsg == NULL) {
5915 err = histedit_edit_logmsg(hle, repo);
5920 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
5924 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
5925 worktree, fileindex, tmp_branch, commit, hle->commit_id,
5928 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
5930 err = show_histedit_progress(commit, hle, NULL);
5932 err = show_histedit_progress(commit, hle, new_commit_id);
5933 free(new_commit_id);
5936 got_object_commit_close(commit);
5940 static const struct got_error *
5941 histedit_skip_commit(struct got_histedit_list_entry *hle,
5942 struct got_worktree *worktree, struct got_repository *repo)
5944 const struct got_error *error;
5945 struct got_commit_object *commit;
5947 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
5952 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
5956 error = show_histedit_progress(commit, hle, NULL);
5957 got_object_commit_close(commit);
5961 static const struct got_error *
5962 cmd_histedit(int argc, char *argv[])
5964 const struct got_error *error = NULL;
5965 struct got_worktree *worktree = NULL;
5966 struct got_fileindex *fileindex = NULL;
5967 struct got_repository *repo = NULL;
5969 struct got_reference *branch = NULL;
5970 struct got_reference *tmp_branch = NULL;
5971 struct got_object_id *resume_commit_id = NULL;
5972 struct got_object_id *base_commit_id = NULL;
5973 struct got_object_id *head_commit_id = NULL;
5974 struct got_commit_object *commit = NULL;
5975 int ch, rebase_in_progress = 0, did_something;
5976 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
5977 const char *edit_script_path = NULL;
5978 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
5979 struct got_object_id_queue commits;
5980 struct got_pathlist_head merged_paths;
5981 const struct got_object_id_queue *parent_ids;
5982 struct got_object_qid *pid;
5983 struct got_histedit_list histedit_cmds;
5984 struct got_histedit_list_entry *hle;
5986 SIMPLEQ_INIT(&commits);
5987 TAILQ_INIT(&histedit_cmds);
5988 TAILQ_INIT(&merged_paths);
5990 while ((ch = getopt(argc, argv, "acF:")) != -1) {
5999 edit_script_path = optarg;
6011 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6012 "unveil", NULL) == -1)
6015 if (abort_edit && continue_edit)
6021 * This command cannot apply unveil(2) in all cases because the
6022 * user may choose to run an editor to edit the histedit script
6023 * and to edit individual commit log messages.
6024 * unveil(2) traverses exec(2); if an editor is used we have to
6025 * apply unveil after edit script and log messages have been written.
6026 * XXX TODO: Make use of unveil(2) where possible.
6029 cwd = getcwd(NULL, 0);
6031 error = got_error_from_errno("getcwd");
6034 error = got_worktree_open(&worktree, cwd);
6038 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
6042 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6045 if (rebase_in_progress) {
6046 error = got_error(GOT_ERR_REBASING);
6050 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
6054 if (edit_in_progress && abort_edit) {
6055 error = got_worktree_histedit_continue(&resume_commit_id,
6056 &tmp_branch, &branch, &base_commit_id, &fileindex,
6060 printf("Switching work tree to %s\n",
6061 got_ref_get_symref_target(branch));
6062 error = got_worktree_histedit_abort(worktree, fileindex, repo,
6063 branch, base_commit_id, update_progress, &did_something);
6066 printf("Histedit of %s aborted\n",
6067 got_ref_get_symref_target(branch));
6068 goto done; /* nothing else to do */
6069 } else if (abort_edit) {
6070 error = got_error(GOT_ERR_NOT_HISTEDIT);
6074 if (continue_edit) {
6077 if (!edit_in_progress) {
6078 error = got_error(GOT_ERR_NOT_HISTEDIT);
6082 error = got_worktree_get_histedit_script_path(&path, worktree);
6086 error = histedit_load_list(&histedit_cmds, path, repo);
6091 error = got_worktree_histedit_continue(&resume_commit_id,
6092 &tmp_branch, &branch, &base_commit_id, &fileindex,
6097 error = got_ref_resolve(&head_commit_id, repo, branch);
6101 error = got_object_open_as_commit(&commit, repo,
6105 parent_ids = got_object_commit_get_parent_ids(commit);
6106 pid = SIMPLEQ_FIRST(parent_ids);
6108 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6111 error = collect_commits(&commits, head_commit_id, pid->id,
6112 base_commit_id, got_worktree_get_path_prefix(worktree),
6113 GOT_ERR_HISTEDIT_PATH, repo);
6114 got_object_commit_close(commit);
6119 if (edit_in_progress) {
6120 error = got_error(GOT_ERR_HISTEDIT_BUSY);
6124 error = got_ref_open(&branch, repo,
6125 got_worktree_get_head_ref_name(worktree), 0);
6129 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
6130 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
6131 "will not edit commit history of a branch outside "
6132 "the \"refs/heads/\" reference namespace");
6136 error = got_ref_resolve(&head_commit_id, repo, branch);
6137 got_ref_close(branch);
6142 error = got_object_open_as_commit(&commit, repo,
6146 parent_ids = got_object_commit_get_parent_ids(commit);
6147 pid = SIMPLEQ_FIRST(parent_ids);
6149 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
6152 error = collect_commits(&commits, head_commit_id, pid->id,
6153 got_worktree_get_base_commit_id(worktree),
6154 got_worktree_get_path_prefix(worktree),
6155 GOT_ERR_HISTEDIT_PATH, repo);
6156 got_object_commit_close(commit);
6161 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
6162 &base_commit_id, &fileindex, worktree, repo);
6166 if (edit_script_path) {
6167 error = histedit_load_list(&histedit_cmds,
6168 edit_script_path, repo);
6170 got_worktree_histedit_abort(worktree, fileindex,
6171 repo, branch, base_commit_id,
6172 update_progress, &did_something);
6176 error = histedit_edit_script(&histedit_cmds, &commits,
6179 got_worktree_histedit_abort(worktree, fileindex,
6180 repo, branch, base_commit_id,
6181 update_progress, &did_something);
6187 error = histedit_save_list(&histedit_cmds, worktree,
6190 got_worktree_histedit_abort(worktree, fileindex,
6191 repo, branch, base_commit_id,
6192 update_progress, &did_something);
6198 error = histedit_check_script(&histedit_cmds, &commits, repo);
6202 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
6203 if (resume_commit_id) {
6204 if (got_object_id_cmp(hle->commit_id,
6205 resume_commit_id) != 0)
6208 resume_commit_id = NULL;
6209 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
6210 hle->cmd->code == GOT_HISTEDIT_FOLD) {
6211 error = histedit_skip_commit(hle, worktree,
6214 error = histedit_commit(NULL, worktree,
6215 fileindex, tmp_branch, hle, repo);
6222 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
6223 error = histedit_skip_commit(hle, worktree, repo);
6229 error = got_object_open_as_commit(&commit, repo,
6233 parent_ids = got_object_commit_get_parent_ids(commit);
6234 pid = SIMPLEQ_FIRST(parent_ids);
6236 error = got_worktree_histedit_merge_files(&merged_paths,
6237 worktree, fileindex, pid->id, hle->commit_id, repo,
6238 rebase_progress, &rebase_status, check_cancelled, NULL);
6241 got_object_commit_close(commit);
6244 if (rebase_status == GOT_STATUS_CONFLICT) {
6245 got_worktree_rebase_pathlist_free(&merged_paths);
6249 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
6251 error = got_object_id_str(&id_str, hle->commit_id);
6254 printf("Stopping histedit for amending commit %s\n",
6257 got_worktree_rebase_pathlist_free(&merged_paths);
6258 error = got_worktree_histedit_postpone(worktree,
6263 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
6264 error = histedit_skip_commit(hle, worktree, repo);
6270 error = histedit_commit(&merged_paths, worktree, fileindex,
6271 tmp_branch, hle, repo);
6272 got_worktree_rebase_pathlist_free(&merged_paths);
6277 if (rebase_status == GOT_STATUS_CONFLICT) {
6278 error = got_worktree_histedit_postpone(worktree, fileindex);
6281 error = got_error_msg(GOT_ERR_CONFLICTS,
6282 "conflicts must be resolved before rebasing can continue");
6284 error = histedit_complete(worktree, fileindex, tmp_branch,
6287 got_object_id_queue_free(&commits);
6288 histedit_free_list(&histedit_cmds);
6289 free(head_commit_id);
6290 free(base_commit_id);
6291 free(resume_commit_id);
6293 got_object_commit_close(commit);
6295 got_ref_close(branch);
6297 got_ref_close(tmp_branch);
6299 got_worktree_close(worktree);
6301 got_repo_close(repo);
6308 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
6309 "[file-path ...]\n",
6314 static const struct got_error *
6315 print_stage(void *arg, unsigned char status, unsigned char staged_status,
6316 const char *path, struct got_object_id *blob_id,
6317 struct got_object_id *staged_blob_id, struct got_object_id *commit_id)
6319 const struct got_error *err = NULL;
6320 char *id_str = NULL;
6322 if (staged_status != GOT_STATUS_ADD &&
6323 staged_status != GOT_STATUS_MODIFY &&
6324 staged_status != GOT_STATUS_DELETE)
6327 if (staged_status == GOT_STATUS_ADD ||
6328 staged_status == GOT_STATUS_MODIFY)
6329 err = got_object_id_str(&id_str, staged_blob_id);
6331 err = got_object_id_str(&id_str, blob_id);
6335 printf("%s %c %s\n", id_str, staged_status, path);
6340 static const struct got_error *
6341 cmd_stage(int argc, char *argv[])
6343 const struct got_error *error = NULL;
6344 struct got_repository *repo = NULL;
6345 struct got_worktree *worktree = NULL;
6347 struct got_pathlist_head paths;
6348 struct got_pathlist_entry *pe;
6349 int ch, list_stage = 0, pflag = 0;
6350 FILE *patch_script_file = NULL;
6351 const char *patch_script_path = NULL;
6352 struct choose_patch_arg cpa;
6356 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
6365 patch_script_path = optarg;
6377 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6378 "unveil", NULL) == -1)
6381 if (list_stage && (pflag || patch_script_path))
6382 errx(1, "-l option cannot be used with other options");
6383 if (patch_script_path && !pflag)
6384 errx(1, "-F option can only be used together with -p option");
6386 cwd = getcwd(NULL, 0);
6388 error = got_error_from_errno("getcwd");
6392 error = got_worktree_open(&worktree, cwd);
6396 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
6400 if (patch_script_path) {
6401 patch_script_file = fopen(patch_script_path, "r");
6402 if (patch_script_file == NULL) {
6403 error = got_error_from_errno2("fopen",
6408 error = apply_unveil(got_repo_get_path(repo), 1,
6409 got_worktree_get_root_path(worktree));
6413 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6418 error = got_worktree_status(worktree, &paths, repo,
6419 print_stage, NULL, check_cancelled, NULL);
6421 cpa.patch_script_file = patch_script_file;
6422 cpa.action = "stage";
6423 error = got_worktree_stage(worktree, &paths,
6424 pflag ? NULL : print_status, NULL,
6425 pflag ? choose_patch : NULL, &cpa, repo);
6428 if (patch_script_file && fclose(patch_script_file) == EOF &&
6430 error = got_error_from_errno2("fclose", patch_script_path);
6432 got_repo_close(repo);
6434 got_worktree_close(worktree);
6435 TAILQ_FOREACH(pe, &paths, entry)
6436 free((char *)pe->path);
6437 got_pathlist_free(&paths);
6445 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
6446 "[file-path ...]\n",
6452 static const struct got_error *
6453 cmd_unstage(int argc, char *argv[])
6455 const struct got_error *error = NULL;
6456 struct got_repository *repo = NULL;
6457 struct got_worktree *worktree = NULL;
6459 struct got_pathlist_head paths;
6460 struct got_pathlist_entry *pe;
6461 int ch, did_something = 0, pflag = 0;
6462 FILE *patch_script_file = NULL;
6463 const char *patch_script_path = NULL;
6464 struct choose_patch_arg cpa;
6468 while ((ch = getopt(argc, argv, "pF:")) != -1) {
6474 patch_script_path = optarg;
6486 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6487 "unveil", NULL) == -1)
6490 if (patch_script_path && !pflag)
6491 errx(1, "-F option can only be used together with -p option");
6493 cwd = getcwd(NULL, 0);
6495 error = got_error_from_errno("getcwd");
6499 error = got_worktree_open(&worktree, cwd);
6503 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree));
6507 if (patch_script_path) {
6508 patch_script_file = fopen(patch_script_path, "r");
6509 if (patch_script_file == NULL) {
6510 error = got_error_from_errno2("fopen",
6516 error = apply_unveil(got_repo_get_path(repo), 1,
6517 got_worktree_get_root_path(worktree));
6521 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6525 cpa.patch_script_file = patch_script_file;
6526 cpa.action = "unstage";
6527 error = got_worktree_unstage(worktree, &paths, update_progress,
6528 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
6530 if (patch_script_file && fclose(patch_script_file) == EOF &&
6532 error = got_error_from_errno2("fclose", patch_script_path);
6534 got_repo_close(repo);
6536 got_worktree_close(worktree);
6537 TAILQ_FOREACH(pe, &paths, entry)
6538 free((char *)pe->path);
6539 got_pathlist_free(&paths);
6547 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
6548 "arg1 [arg2 ...]\n", getprogname());
6552 static const struct got_error *
6553 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6555 const struct got_error *err;
6556 struct got_blob_object *blob;
6558 err = got_object_open_as_blob(&blob, repo, id, 8192);
6562 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
6563 got_object_blob_close(blob);
6567 static const struct got_error *
6568 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6570 const struct got_error *err;
6571 struct got_tree_object *tree;
6572 const struct got_tree_entries *entries;
6573 struct got_tree_entry *te;
6575 err = got_object_open_as_tree(&tree, repo, id);
6579 entries = got_object_tree_get_entries(tree);
6580 te = SIMPLEQ_FIRST(&entries->head);
6583 if (sigint_received || sigpipe_received)
6585 err = got_object_id_str(&id_str, te->id);
6588 fprintf(outfile, "%s %.7o %s\n", id_str, te->mode, te->name);
6590 te = SIMPLEQ_NEXT(te, entry);
6593 got_object_tree_close(tree);
6597 static const struct got_error *
6598 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6600 const struct got_error *err;
6601 struct got_commit_object *commit;
6602 const struct got_object_id_queue *parent_ids;
6603 struct got_object_qid *pid;
6604 char *id_str = NULL;
6605 const char *logmsg = NULL;
6607 err = got_object_open_as_commit(&commit, repo, id);
6611 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
6615 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
6616 parent_ids = got_object_commit_get_parent_ids(commit);
6617 fprintf(outfile, "numparents %d\n",
6618 got_object_commit_get_nparents(commit));
6619 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
6621 err = got_object_id_str(&pid_str, pid->id);
6624 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
6627 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
6628 got_object_commit_get_author(commit),
6629 got_object_commit_get_author_time(commit));
6631 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
6632 got_object_commit_get_author(commit),
6633 got_object_commit_get_committer_time(commit));
6635 logmsg = got_object_commit_get_logmsg_raw(commit);
6636 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
6637 fprintf(outfile, "%s", logmsg);
6640 got_object_commit_close(commit);
6644 static const struct got_error *
6645 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
6647 const struct got_error *err;
6648 struct got_tag_object *tag;
6649 char *id_str = NULL;
6650 const char *tagmsg = NULL;
6652 err = got_object_open_as_tag(&tag, repo, id);
6656 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
6660 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
6662 switch (got_object_tag_get_object_type(tag)) {
6663 case GOT_OBJ_TYPE_BLOB:
6664 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6665 GOT_OBJ_LABEL_BLOB);
6667 case GOT_OBJ_TYPE_TREE:
6668 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6669 GOT_OBJ_LABEL_TREE);
6671 case GOT_OBJ_TYPE_COMMIT:
6672 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6673 GOT_OBJ_LABEL_COMMIT);
6675 case GOT_OBJ_TYPE_TAG:
6676 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
6683 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
6684 got_object_tag_get_name(tag));
6686 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
6687 got_object_tag_get_tagger(tag),
6688 got_object_tag_get_tagger_time(tag));
6690 tagmsg = got_object_tag_get_message(tag);
6691 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
6692 fprintf(outfile, "%s", tagmsg);
6695 got_object_tag_close(tag);
6699 static const struct got_error *
6700 cmd_cat(int argc, char *argv[])
6702 const struct got_error *error;
6703 struct got_repository *repo = NULL;
6704 struct got_worktree *worktree = NULL;
6705 char *cwd = NULL, *repo_path = NULL, *label = NULL;
6706 const char *commit_id_str = NULL;
6707 struct got_object_id *id = NULL, *commit_id = NULL;
6708 int ch, obj_type, i, force_path = 0;
6711 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6716 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
6719 commit_id_str = optarg;
6722 repo_path = realpath(optarg, NULL);
6723 if (repo_path == NULL)
6724 err(1, "-r option");
6725 got_path_strip_trailing_slashes(repo_path);
6739 cwd = getcwd(NULL, 0);
6741 error = got_error_from_errno("getcwd");
6744 error = got_worktree_open(&worktree, cwd);
6745 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6748 if (repo_path == NULL) {
6750 got_worktree_get_repo_path(worktree));
6751 if (repo_path == NULL) {
6752 error = got_error_from_errno("strdup");
6758 if (repo_path == NULL) {
6759 repo_path = getcwd(NULL, 0);
6760 if (repo_path == NULL)
6761 return got_error_from_errno("getcwd");
6764 error = got_repo_open(&repo, repo_path);
6769 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6773 if (commit_id_str == NULL)
6774 commit_id_str = GOT_REF_HEAD;
6775 error = resolve_commit_arg(&commit_id, commit_id_str, repo);
6779 for (i = 0; i < argc; i++) {
6781 error = got_object_id_by_path(&id, repo, commit_id,
6786 error = match_object_id(&id, &label, argv[i],
6787 GOT_OBJ_TYPE_ANY, 0, repo);
6789 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
6790 error->code != GOT_ERR_NOT_REF)
6792 error = got_object_id_by_path(&id, repo,
6793 commit_id, argv[i]);
6799 error = got_object_get_type(&obj_type, repo, id);
6804 case GOT_OBJ_TYPE_BLOB:
6805 error = cat_blob(id, repo, stdout);
6807 case GOT_OBJ_TYPE_TREE:
6808 error = cat_tree(id, repo, stdout);
6810 case GOT_OBJ_TYPE_COMMIT:
6811 error = cat_commit(id, repo, stdout);
6813 case GOT_OBJ_TYPE_TAG:
6814 error = cat_tag(id, repo, stdout);
6817 error = got_error(GOT_ERR_OBJ_TYPE);
6833 got_worktree_close(worktree);
6835 const struct got_error *repo_error;
6836 repo_error = got_repo_close(repo);