2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/queue.h>
20 #include <sys/types.h>
22 #include <sys/param.h>
43 #include "got_version.h"
44 #include "got_error.h"
45 #include "got_object.h"
46 #include "got_reference.h"
47 #include "got_repository.h"
49 #include "got_cancel.h"
50 #include "got_worktree.h"
52 #include "got_commit_graph.h"
53 #include "got_fetch.h"
54 #include "got_blame.h"
55 #include "got_privsep.h"
56 #include "got_opentemp.h"
59 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
62 static volatile sig_atomic_t sigint_received;
63 static volatile sig_atomic_t sigpipe_received;
66 catch_sigint(int signo)
72 catch_sigpipe(int signo)
80 const struct got_error *(*cmd_main)(int, char *[]);
81 void (*cmd_usage)(void);
82 const char *cmd_alias;
85 __dead static void usage(int);
86 __dead static void usage_init(void);
87 __dead static void usage_import(void);
88 __dead static void usage_clone(void);
89 __dead static void usage_fetch(void);
90 __dead static void usage_checkout(void);
91 __dead static void usage_update(void);
92 __dead static void usage_log(void);
93 __dead static void usage_diff(void);
94 __dead static void usage_blame(void);
95 __dead static void usage_tree(void);
96 __dead static void usage_status(void);
97 __dead static void usage_ref(void);
98 __dead static void usage_branch(void);
99 __dead static void usage_tag(void);
100 __dead static void usage_add(void);
101 __dead static void usage_remove(void);
102 __dead static void usage_revert(void);
103 __dead static void usage_commit(void);
104 __dead static void usage_cherrypick(void);
105 __dead static void usage_backout(void);
106 __dead static void usage_rebase(void);
107 __dead static void usage_histedit(void);
108 __dead static void usage_integrate(void);
109 __dead static void usage_stage(void);
110 __dead static void usage_unstage(void);
111 __dead static void usage_cat(void);
113 static const struct got_error* cmd_init(int, char *[]);
114 static const struct got_error* cmd_import(int, char *[]);
115 static const struct got_error* cmd_clone(int, char *[]);
116 static const struct got_error* cmd_fetch(int, char *[]);
117 static const struct got_error* cmd_checkout(int, char *[]);
118 static const struct got_error* cmd_update(int, char *[]);
119 static const struct got_error* cmd_log(int, char *[]);
120 static const struct got_error* cmd_diff(int, char *[]);
121 static const struct got_error* cmd_blame(int, char *[]);
122 static const struct got_error* cmd_tree(int, char *[]);
123 static const struct got_error* cmd_status(int, char *[]);
124 static const struct got_error* cmd_ref(int, char *[]);
125 static const struct got_error* cmd_branch(int, char *[]);
126 static const struct got_error* cmd_tag(int, char *[]);
127 static const struct got_error* cmd_add(int, char *[]);
128 static const struct got_error* cmd_remove(int, char *[]);
129 static const struct got_error* cmd_revert(int, char *[]);
130 static const struct got_error* cmd_commit(int, char *[]);
131 static const struct got_error* cmd_cherrypick(int, char *[]);
132 static const struct got_error* cmd_backout(int, char *[]);
133 static const struct got_error* cmd_rebase(int, char *[]);
134 static const struct got_error* cmd_histedit(int, char *[]);
135 static const struct got_error* cmd_integrate(int, char *[]);
136 static const struct got_error* cmd_stage(int, char *[]);
137 static const struct got_error* cmd_unstage(int, char *[]);
138 static const struct got_error* cmd_cat(int, char *[]);
140 static struct got_cmd got_commands[] = {
141 { "init", cmd_init, usage_init, "in" },
142 { "import", cmd_import, usage_import, "im" },
143 { "clone", cmd_clone, usage_clone, "cl" },
144 { "fetch", cmd_fetch, usage_fetch, "fe" },
145 { "checkout", cmd_checkout, usage_checkout, "co" },
146 { "update", cmd_update, usage_update, "up" },
147 { "log", cmd_log, usage_log, "" },
148 { "diff", cmd_diff, usage_diff, "di" },
149 { "blame", cmd_blame, usage_blame, "bl" },
150 { "tree", cmd_tree, usage_tree, "tr" },
151 { "status", cmd_status, usage_status, "st" },
152 { "ref", cmd_ref, usage_ref, "" },
153 { "branch", cmd_branch, usage_branch, "br" },
154 { "tag", cmd_tag, usage_tag, "" },
155 { "add", cmd_add, usage_add, "" },
156 { "remove", cmd_remove, usage_remove, "rm" },
157 { "revert", cmd_revert, usage_revert, "rv" },
158 { "commit", cmd_commit, usage_commit, "ci" },
159 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
160 { "backout", cmd_backout, usage_backout, "bo" },
161 { "rebase", cmd_rebase, usage_rebase, "rb" },
162 { "histedit", cmd_histedit, usage_histedit, "he" },
163 { "integrate", cmd_integrate, usage_integrate,"ig" },
164 { "stage", cmd_stage, usage_stage, "sg" },
165 { "unstage", cmd_unstage, usage_unstage, "ug" },
166 { "cat", cmd_cat, usage_cat, "" },
174 fprintf(stderr, "commands:");
175 for (i = 0; i < nitems(got_commands); i++) {
176 struct got_cmd *cmd = &got_commands[i];
177 fprintf(stderr, " %s", cmd->cmd_name);
183 main(int argc, char *argv[])
188 int hflag = 0, Vflag = 0;
189 static struct option longopts[] = {
190 { "version", no_argument, NULL, 'V' },
194 setlocale(LC_CTYPE, "");
196 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
215 got_version_print_str();
222 signal(SIGINT, catch_sigint);
223 signal(SIGPIPE, catch_sigpipe);
225 for (i = 0; i < nitems(got_commands); i++) {
226 const struct got_error *error;
228 cmd = &got_commands[i];
230 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
231 strcmp(cmd->cmd_alias, argv[0]) != 0)
235 got_commands[i].cmd_usage();
237 error = got_commands[i].cmd_main(argc, argv);
238 if (error && error->code != GOT_ERR_CANCELLED &&
239 error->code != GOT_ERR_PRIVSEP_EXIT &&
240 !(sigpipe_received &&
241 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
243 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
244 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
251 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
259 fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
266 static const struct got_error *
267 get_editor(char **abspath)
269 const struct got_error *err = NULL;
274 editor = getenv("VISUAL");
276 editor = getenv("EDITOR");
279 err = got_path_find_prog(abspath, editor);
284 if (*abspath == NULL) {
285 *abspath = strdup("/bin/ed");
286 if (*abspath == NULL)
287 return got_error_from_errno("strdup");
293 static const struct got_error *
294 apply_unveil(const char *repo_path, int repo_read_only,
295 const char *worktree_path)
297 const struct got_error *err;
300 if (unveil("gmon.out", "rwc") != 0)
301 return got_error_from_errno2("unveil", "gmon.out");
303 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
304 return got_error_from_errno2("unveil", repo_path);
306 if (worktree_path && unveil(worktree_path, "rwc") != 0)
307 return got_error_from_errno2("unveil", worktree_path);
309 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
310 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
312 err = got_privsep_unveil_exec_helpers();
316 if (unveil(NULL, NULL) != 0)
317 return got_error_from_errno("unveil");
325 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
329 static const struct got_error *
330 cmd_init(int argc, char *argv[])
332 const struct got_error *error = NULL;
333 char *repo_path = NULL;
336 while ((ch = getopt(argc, argv, "")) != -1) {
348 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
354 repo_path = strdup(argv[0]);
355 if (repo_path == NULL)
356 return got_error_from_errno("strdup");
358 got_path_strip_trailing_slashes(repo_path);
360 error = got_path_mkdir(repo_path);
362 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
365 error = apply_unveil(repo_path, 0, NULL);
369 error = got_repo_init(repo_path);
378 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
379 "[-r repository-path] [-I pattern] path\n", getprogname());
384 spawn_editor(const char *editor, const char *file)
387 sig_t sighup, sigint, sigquit;
390 sighup = signal(SIGHUP, SIG_IGN);
391 sigint = signal(SIGINT, SIG_IGN);
392 sigquit = signal(SIGQUIT, SIG_IGN);
394 switch (pid = fork()) {
398 execl(editor, editor, file, (char *)NULL);
402 while (waitpid(pid, &st, 0) == -1)
407 (void)signal(SIGHUP, sighup);
408 (void)signal(SIGINT, sigint);
409 (void)signal(SIGQUIT, sigquit);
411 if (!WIFEXITED(st)) {
416 return WEXITSTATUS(st);
419 static const struct got_error *
420 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
421 const char *initial_content)
423 const struct got_error *err = NULL;
427 int content_changed = 0;
432 if (stat(logmsg_path, &st) == -1)
433 return got_error_from_errno2("stat", logmsg_path);
435 if (spawn_editor(editor, logmsg_path) == -1)
436 return got_error_from_errno("failed spawning editor");
438 if (stat(logmsg_path, &st2) == -1)
439 return got_error_from_errno("stat");
441 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
442 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
443 "no changes made to commit message, aborting");
445 *logmsg = malloc(st2.st_size + 1);
447 return got_error_from_errno("malloc");
451 fp = fopen(logmsg_path, "r");
453 err = got_error_from_errno("fopen");
456 while (fgets(buf, sizeof(buf), fp) != NULL) {
457 if (!content_changed && strcmp(buf, initial_content) != 0)
459 if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
460 continue; /* remove comments and leading empty lines */
461 len = strlcat(*logmsg, buf, st2.st_size);
465 while (len > 0 && (*logmsg)[len - 1] == '\n') {
466 (*logmsg)[len - 1] = '\0';
470 if (len == 0 || !content_changed)
471 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
472 "commit message cannot be empty, aborting");
481 static const struct got_error *
482 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
483 const char *path_dir, const char *branch_name)
485 char *initial_content = NULL;
486 const struct got_error *err = NULL;
489 if (asprintf(&initial_content,
490 "\n# %s to be imported to branch %s\n", path_dir,
492 return got_error_from_errno("asprintf");
494 err = got_opentemp_named_fd(logmsg_path, &fd,
495 GOT_TMPDIR_STR "/got-importmsg");
499 dprintf(fd, initial_content);
502 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
504 free(initial_content);
508 static const struct got_error *
509 import_progress(void *arg, const char *path)
511 printf("A %s\n", path);
515 static const struct got_error *
516 get_author(char **author, struct got_repository *repo)
518 const struct got_error *err = NULL;
519 const char *got_author, *name, *email;
523 name = got_repo_get_gitconfig_author_name(repo);
524 email = got_repo_get_gitconfig_author_email(repo);
526 if (asprintf(author, "%s <%s>", name, email) == -1)
527 return got_error_from_errno("asprintf");
531 got_author = getenv("GOT_AUTHOR");
532 if (got_author == NULL) {
533 name = got_repo_get_global_gitconfig_author_name(repo);
534 email = got_repo_get_global_gitconfig_author_email(repo);
536 if (asprintf(author, "%s <%s>", name, email) == -1)
537 return got_error_from_errno("asprintf");
540 /* TODO: Look up user in password database? */
541 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
544 *author = strdup(got_author);
546 return got_error_from_errno("strdup");
549 * Really dumb email address check; we're only doing this to
550 * avoid git's object parser breaking on commits we create.
552 while (*got_author && *got_author != '<')
554 if (*got_author != '<') {
555 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
558 while (*got_author && *got_author != '@')
560 if (*got_author != '@') {
561 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
564 while (*got_author && *got_author != '>')
566 if (*got_author != '>')
567 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
576 static const struct got_error *
577 get_gitconfig_path(char **gitconfig_path)
579 const char *homedir = getenv("HOME");
581 *gitconfig_path = NULL;
583 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
584 return got_error_from_errno("asprintf");
590 static const struct got_error *
591 cmd_import(int argc, char *argv[])
593 const struct got_error *error = NULL;
594 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
595 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
596 const char *branch_name = "main";
597 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
598 struct got_repository *repo = NULL;
599 struct got_reference *branch_ref = NULL, *head_ref = NULL;
600 struct got_object_id *new_commit_id = NULL;
602 struct got_pathlist_head ignores;
603 struct got_pathlist_entry *pe;
604 int preserve_logmsg = 0;
606 TAILQ_INIT(&ignores);
608 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
611 branch_name = optarg;
614 logmsg = strdup(optarg);
615 if (logmsg == NULL) {
616 error = got_error_from_errno("strdup");
621 repo_path = realpath(optarg, NULL);
622 if (repo_path == NULL) {
623 error = got_error_from_errno2("realpath",
629 if (optarg[0] == '\0')
631 error = got_pathlist_insert(&pe, &ignores, optarg,
646 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
654 if (repo_path == NULL) {
655 repo_path = getcwd(NULL, 0);
656 if (repo_path == NULL)
657 return got_error_from_errno("getcwd");
659 got_path_strip_trailing_slashes(repo_path);
660 error = get_gitconfig_path(&gitconfig_path);
663 error = got_repo_open(&repo, repo_path, gitconfig_path);
667 error = get_author(&author, repo);
672 * Don't let the user create a branch name with a leading '-'.
673 * While technically a valid reference name, this case is usually
674 * an unintended typo.
676 if (branch_name[0] == '-')
677 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
679 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
680 error = got_error_from_errno("asprintf");
684 error = got_ref_open(&branch_ref, repo, refname, 0);
686 if (error->code != GOT_ERR_NOT_REF)
689 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
690 "import target branch already exists");
694 path_dir = realpath(argv[0], NULL);
695 if (path_dir == NULL) {
696 error = got_error_from_errno2("realpath", argv[0]);
699 got_path_strip_trailing_slashes(path_dir);
702 * unveil(2) traverses exec(2); if an editor is used we have
703 * to apply unveil after the log message has been written.
705 if (logmsg == NULL || strlen(logmsg) == 0) {
706 error = get_editor(&editor);
710 error = collect_import_msg(&logmsg, &logmsg_path, editor,
713 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
720 if (unveil(path_dir, "r") != 0) {
721 error = got_error_from_errno2("unveil", path_dir);
727 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
734 error = got_repo_import(&new_commit_id, path_dir, logmsg,
735 author, &ignores, repo, import_progress, NULL);
742 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
749 error = got_ref_write(branch_ref, repo);
756 error = got_object_id_str(&id_str, new_commit_id);
763 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
765 if (error->code != GOT_ERR_NOT_REF) {
771 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
779 error = got_ref_write(head_ref, repo);
787 printf("Created branch %s with commit %s\n",
788 got_ref_get_name(branch_ref), id_str);
790 if (preserve_logmsg) {
791 fprintf(stderr, "%s: log message preserved in %s\n",
792 getprogname(), logmsg_path);
793 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
794 error = got_error_from_errno2("unlink", logmsg_path);
803 free(gitconfig_path);
805 got_ref_close(branch_ref);
807 got_ref_close(head_ref);
814 fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
815 "[-R reference] repository-url [directory]\n", getprogname());
819 struct got_fetch_progress_arg {
820 char last_scaled_size[FMT_SCALED_STRSIZE];
826 static const struct got_error *
827 fetch_progress(void *arg, const char *message, off_t packfile_size,
828 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
830 struct got_fetch_progress_arg *a = arg;
831 char scaled_size[FMT_SCALED_STRSIZE];
832 int p_indexed, p_resolved;
833 int print_size = 0, print_indexed = 0, print_resolved = 0;
835 if (a->verbosity < 0)
838 if (message && message[0] != '\0') {
839 printf("\rserver: %s", message);
844 if (packfile_size > 0 || nobj_indexed > 0) {
845 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
846 (a->last_scaled_size[0] == '\0' ||
847 strcmp(scaled_size, a->last_scaled_size)) != 0) {
849 if (strlcpy(a->last_scaled_size, scaled_size,
850 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
851 return got_error(GOT_ERR_NO_SPACE);
853 if (nobj_indexed > 0) {
854 p_indexed = (nobj_indexed * 100) / nobj_total;
855 if (p_indexed != a->last_p_indexed) {
856 a->last_p_indexed = p_indexed;
861 if (nobj_resolved > 0) {
862 p_resolved = (nobj_resolved * 100) /
863 (nobj_total - nobj_loose);
864 if (p_resolved != a->last_p_resolved) {
865 a->last_p_resolved = p_resolved;
873 if (print_size || print_indexed || print_resolved)
876 printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
878 printf("; indexing %d%%", p_indexed);
880 printf("; resolving deltas %d%%", p_resolved);
881 if (print_size || print_indexed || print_resolved)
887 static const struct got_error *
888 create_symref(const char *refname, struct got_reference *target_ref,
889 int verbosity, struct got_repository *repo)
891 const struct got_error *err;
892 struct got_reference *head_symref;
894 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
898 err = got_ref_write(head_symref, repo);
899 got_ref_close(head_symref);
900 if (err == NULL && verbosity > 0) {
901 printf("Created reference %s: %s\n", GOT_REF_HEAD,
902 got_ref_get_name(target_ref));
907 static const struct got_error *
908 list_remote_refs(struct got_pathlist_head *symrefs,
909 struct got_pathlist_head *refs)
911 const struct got_error *err;
912 struct got_pathlist_entry *pe;
914 TAILQ_FOREACH(pe, symrefs, entry) {
915 const char *refname = pe->path;
916 const char *targetref = pe->data;
918 printf("%s: %s\n", refname, targetref);
921 TAILQ_FOREACH(pe, refs, entry) {
922 const char *refname = pe->path;
923 struct got_object_id *id = pe->data;
926 err = got_object_id_str(&id_str, id);
929 printf("%s: %s\n", refname, id_str);
936 static const struct got_error *
937 create_ref(const char *refname, struct got_object_id *id,
938 int verbosity, struct got_repository *repo)
940 const struct got_error *err = NULL;
941 struct got_reference *ref;
944 err = got_object_id_str(&id_str, id);
948 err = got_ref_alloc(&ref, refname, id);
952 err = got_ref_write(ref, repo);
955 if (err == NULL && verbosity >= 0)
956 printf("Created reference %s: %s\n", refname, id_str);
963 match_wanted_ref(const char *refname, const char *wanted_ref)
965 if (strncmp(refname, "refs/", 5) != 0)
970 * Prevent fetching of references that won't make any
971 * sense outside of the remote repository's context.
973 if (strncmp(refname, "got/", 4) == 0)
975 if (strncmp(refname, "remotes/", 8) == 0)
978 if (strncmp(wanted_ref, "refs/", 5) == 0)
981 /* Allow prefix match. */
982 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
985 /* Allow exact match. */
986 return (strcmp(refname, wanted_ref) == 0);
990 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
992 struct got_pathlist_entry *pe;
994 TAILQ_FOREACH(pe, wanted_refs, entry) {
995 if (match_wanted_ref(refname, pe->path))
1002 static const struct got_error *
1003 create_wanted_ref(const char *refname, struct got_object_id *id,
1004 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1006 const struct got_error *err;
1007 char *remote_refname;
1009 if (strncmp("refs/", refname, 5) == 0)
1012 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1013 remote_repo_name, refname) == -1)
1014 return got_error_from_errno("asprintf");
1016 err = create_ref(remote_refname, id, verbosity, repo);
1017 free(remote_refname);
1021 static const struct got_error *
1022 cmd_clone(int argc, char *argv[])
1024 const struct got_error *error = NULL;
1025 const char *uri, *dirname;
1026 char *proto, *host, *port, *repo_name, *server_path;
1027 char *default_destdir = NULL, *id_str = NULL;
1028 const char *repo_path;
1029 struct got_repository *repo = NULL;
1030 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1031 struct got_pathlist_entry *pe;
1032 struct got_object_id *pack_hash = NULL;
1033 int ch, fetchfd = -1, fetchstatus;
1034 pid_t fetchpid = -1;
1035 struct got_fetch_progress_arg fpa;
1036 char *git_url = NULL;
1037 char *gitconfig_path = NULL;
1038 char *gitconfig = NULL;
1039 FILE *gitconfig_file = NULL;
1041 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1042 int list_refs_only = 0;
1043 struct got_reference *head_symref = NULL;
1046 TAILQ_INIT(&symrefs);
1047 TAILQ_INIT(&wanted_branches);
1048 TAILQ_INIT(&wanted_refs);
1050 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1053 fetch_all_branches = 1;
1056 error = got_pathlist_append(&wanted_branches,
1065 mirror_references = 1;
1070 else if (verbosity < 3)
1077 error = got_pathlist_append(&wanted_refs,
1090 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1091 errx(1, "-a and -b options are mutually exclusive");
1092 if (list_refs_only) {
1093 if (!TAILQ_EMPTY(&wanted_branches))
1094 errx(1, "-l and -b options are mutually exclusive");
1095 if (fetch_all_branches)
1096 errx(1, "-l and -a options are mutually exclusive");
1097 if (mirror_references)
1098 errx(1, "-l and -m options are mutually exclusive");
1099 if (verbosity == -1)
1100 errx(1, "-l and -q options are mutually exclusive");
1101 if (!TAILQ_EMPTY(&wanted_refs))
1102 errx(1, "-l and -R options are mutually exclusive");
1114 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1115 &repo_name, argv[0]);
1119 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1120 host, port ? ":" : "", port ? port : "",
1121 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1122 error = got_error_from_errno("asprintf");
1126 if (strcmp(proto, "git") == 0) {
1128 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1129 "sendfd dns inet unveil", NULL) == -1)
1132 } else if (strcmp(proto, "git+ssh") == 0 ||
1133 strcmp(proto, "ssh") == 0) {
1135 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1136 "sendfd unveil", NULL) == -1)
1139 } else if (strcmp(proto, "http") == 0 ||
1140 strcmp(proto, "git+http") == 0) {
1141 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1144 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1147 if (dirname == NULL) {
1148 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1149 error = got_error_from_errno("asprintf");
1152 repo_path = default_destdir;
1154 repo_path = dirname;
1156 if (!list_refs_only) {
1157 error = got_path_mkdir(repo_path);
1161 error = got_repo_init(repo_path);
1164 error = got_repo_open(&repo, repo_path, NULL);
1169 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1170 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1171 error = got_error_from_errno2("unveil",
1172 GOT_FETCH_PATH_SSH);
1176 error = apply_unveil(repo ? got_repo_get_path(repo) : NULL, 0, NULL);
1180 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1181 server_path, verbosity);
1186 printf("Connected to %s%s%s\n", host,
1187 port ? ":" : "", port ? port : "");
1189 fpa.last_scaled_size[0] = '\0';
1190 fpa.last_p_indexed = -1;
1191 fpa.last_p_resolved = -1;
1192 fpa.verbosity = verbosity;
1193 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1194 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1195 fetch_all_branches, &wanted_branches, &wanted_refs,
1196 list_refs_only, verbosity, fetchfd, repo,
1197 fetch_progress, &fpa);
1201 if (list_refs_only) {
1202 error = list_remote_refs(&symrefs, &refs);
1206 error = got_object_id_str(&id_str, pack_hash);
1210 printf("\nFetched %s.pack\n", id_str);
1213 /* Set up references provided with the pack file. */
1214 TAILQ_FOREACH(pe, &refs, entry) {
1215 const char *refname = pe->path;
1216 struct got_object_id *id = pe->data;
1217 char *remote_refname;
1219 if (is_wanted_ref(&wanted_refs, refname) &&
1220 !mirror_references) {
1221 error = create_wanted_ref(refname, id,
1222 GOT_FETCH_DEFAULT_REMOTE_NAME,
1223 verbosity - 1, repo);
1229 error = create_ref(refname, id, verbosity - 1, repo);
1233 if (mirror_references)
1236 if (strncmp("refs/heads/", refname, 11) != 0)
1239 if (asprintf(&remote_refname,
1240 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1241 refname + 11) == -1) {
1242 error = got_error_from_errno("asprintf");
1245 error = create_ref(remote_refname, id, verbosity - 1, repo);
1246 free(remote_refname);
1251 /* Set the HEAD reference if the server provided one. */
1252 TAILQ_FOREACH(pe, &symrefs, entry) {
1253 struct got_reference *target_ref;
1254 const char *refname = pe->path;
1255 const char *target = pe->data;
1256 char *remote_refname = NULL, *remote_target = NULL;
1258 if (strcmp(refname, GOT_REF_HEAD) != 0)
1261 error = got_ref_open(&target_ref, repo, target, 0);
1263 if (error->code == GOT_ERR_NOT_REF) {
1270 error = create_symref(refname, target_ref, verbosity, repo);
1271 got_ref_close(target_ref);
1275 if (mirror_references)
1278 if (strncmp("refs/heads/", target, 11) != 0)
1281 if (asprintf(&remote_refname,
1282 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1284 error = got_error_from_errno("asprintf");
1287 if (asprintf(&remote_target,
1288 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1289 target + 11) == -1) {
1290 error = got_error_from_errno("asprintf");
1291 free(remote_refname);
1294 error = got_ref_open(&target_ref, repo, remote_target, 0);
1296 free(remote_refname);
1297 free(remote_target);
1298 if (error->code == GOT_ERR_NOT_REF) {
1304 error = create_symref(remote_refname, target_ref,
1305 verbosity - 1, repo);
1306 free(remote_refname);
1307 free(remote_target);
1308 got_ref_close(target_ref);
1314 * We failed to set the HEAD reference. If we asked for
1315 * a set of wanted branches use the first of one of those
1316 * which could be fetched instead.
1318 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1319 const char *target = pe->path;
1320 struct got_reference *target_ref;
1322 error = got_ref_open(&target_ref, repo, target, 0);
1324 if (error->code == GOT_ERR_NOT_REF) {
1331 error = create_symref(GOT_REF_HEAD, target_ref,
1333 got_ref_close(target_ref);
1340 /* Create a config file git-fetch(1) can understand. */
1341 gitconfig_path = got_repo_get_path_gitconfig(repo);
1342 if (gitconfig_path == NULL) {
1343 error = got_error_from_errno("got_repo_get_path_gitconfig");
1346 gitconfig_file = fopen(gitconfig_path, "a");
1347 if (gitconfig_file == NULL) {
1348 error = got_error_from_errno2("fopen", gitconfig_path);
1351 if (mirror_references) {
1352 if (asprintf(&gitconfig,
1355 "\tfetch = +refs/*:refs/*\n"
1356 "\tmirror = true\n",
1357 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1358 error = got_error_from_errno("asprintf");
1361 } else if (fetch_all_branches) {
1362 if (asprintf(&gitconfig,
1365 "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1366 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1367 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1368 error = got_error_from_errno("asprintf");
1372 const char *branchname;
1375 * If the server specified a default branch, use just that one.
1376 * Otherwise fall back to fetching all branches on next fetch.
1379 branchname = got_ref_get_symref_target(head_symref);
1380 if (strncmp(branchname, "refs/heads/", 11) == 0)
1383 branchname = "*"; /* fall back to all branches */
1384 if (asprintf(&gitconfig,
1387 "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1388 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1389 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1390 branchname) == -1) {
1391 error = got_error_from_errno("asprintf");
1395 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1396 if (n != strlen(gitconfig)) {
1397 error = got_ferror(gitconfig_file, GOT_ERR_IO);
1402 printf("Created %s repository '%s'\n",
1403 mirror_references ? "mirrored" : "cloned", repo_path);
1406 if (kill(fetchpid, SIGTERM) == -1)
1407 error = got_error_from_errno("kill");
1408 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1409 error = got_error_from_errno("waitpid");
1411 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1412 error = got_error_from_errno("close");
1413 if (gitconfig_file && fclose(gitconfig_file) == EOF && error == NULL)
1414 error = got_error_from_errno("fclose");
1416 got_repo_close(repo);
1418 got_ref_close(head_symref);
1419 TAILQ_FOREACH(pe, &refs, entry) {
1420 free((void *)pe->path);
1423 got_pathlist_free(&refs);
1424 TAILQ_FOREACH(pe, &symrefs, entry) {
1425 free((void *)pe->path);
1428 got_pathlist_free(&symrefs);
1429 got_pathlist_free(&wanted_branches);
1430 got_pathlist_free(&wanted_refs);
1437 free(default_destdir);
1438 free(gitconfig_path);
1443 static const struct got_error *
1444 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1445 int replace_tags, int verbosity, struct got_repository *repo)
1447 const struct got_error *err = NULL;
1448 char *new_id_str = NULL;
1449 struct got_object_id *old_id = NULL;
1451 err = got_object_id_str(&new_id_str, new_id);
1455 if (!replace_tags &&
1456 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1457 err = got_ref_resolve(&old_id, repo, ref);
1460 if (got_object_id_cmp(old_id, new_id) == 0)
1462 if (verbosity >= 0) {
1463 printf("Rejecting update of existing tag %s: %s\n",
1464 got_ref_get_name(ref), new_id_str);
1469 if (got_ref_is_symbolic(ref)) {
1470 if (verbosity >= 0) {
1471 printf("Replacing reference %s: %s\n",
1472 got_ref_get_name(ref),
1473 got_ref_get_symref_target(ref));
1475 err = got_ref_change_symref_to_ref(ref, new_id);
1478 err = got_ref_write(ref, repo);
1482 err = got_ref_resolve(&old_id, repo, ref);
1485 if (got_object_id_cmp(old_id, new_id) == 0)
1488 err = got_ref_change_ref(ref, new_id);
1491 err = got_ref_write(ref, repo);
1497 printf("Updated reference %s: %s\n", got_ref_get_name(ref),
1505 static const struct got_error *
1506 update_symref(const char *refname, struct got_reference *target_ref,
1507 int verbosity, struct got_repository *repo)
1509 const struct got_error *err = NULL, *unlock_err;
1510 struct got_reference *symref;
1511 int symref_is_locked = 0;
1513 err = got_ref_open(&symref, repo, refname, 1);
1515 if (err->code != GOT_ERR_NOT_REF)
1517 err = got_ref_alloc_symref(&symref, refname, target_ref);
1521 err = got_ref_write(symref, repo);
1526 printf("Created reference %s: %s\n",
1527 got_ref_get_name(symref),
1528 got_ref_get_symref_target(symref));
1530 symref_is_locked = 1;
1532 if (strcmp(got_ref_get_symref_target(symref),
1533 got_ref_get_name(target_ref)) == 0)
1536 err = got_ref_change_symref(symref,
1537 got_ref_get_name(target_ref));
1541 err = got_ref_write(symref, repo);
1546 printf("Updated reference %s: %s\n",
1547 got_ref_get_name(symref),
1548 got_ref_get_symref_target(symref));
1552 if (symref_is_locked) {
1553 unlock_err = got_ref_unlock(symref);
1554 if (unlock_err && err == NULL)
1557 got_ref_close(symref);
1564 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1565 "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1566 "[remote-repository-name]\n",
1571 static const struct got_error *
1572 delete_missing_ref(struct got_reference *ref,
1573 int verbosity, struct got_repository *repo)
1575 const struct got_error *err = NULL;
1576 struct got_object_id *id = NULL;
1577 char *id_str = NULL;
1579 if (got_ref_is_symbolic(ref)) {
1580 err = got_ref_delete(ref, repo);
1583 if (verbosity >= 0) {
1584 printf("Deleted reference %s: %s\n",
1585 got_ref_get_name(ref),
1586 got_ref_get_symref_target(ref));
1589 err = got_ref_resolve(&id, repo, ref);
1592 err = got_object_id_str(&id_str, id);
1596 err = got_ref_delete(ref, repo);
1599 if (verbosity >= 0) {
1600 printf("Deleted reference %s: %s\n",
1601 got_ref_get_name(ref), id_str);
1610 static const struct got_error *
1611 delete_missing_refs(struct got_pathlist_head *their_refs,
1612 struct got_pathlist_head *their_symrefs, struct got_remote_repo *remote,
1613 int verbosity, struct got_repository *repo)
1615 const struct got_error *err = NULL, *unlock_err;
1616 struct got_reflist_head my_refs;
1617 struct got_reflist_entry *re;
1618 struct got_pathlist_entry *pe;
1619 char *remote_namespace = NULL;
1620 char *local_refname = NULL;
1622 SIMPLEQ_INIT(&my_refs);
1624 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1626 return got_error_from_errno("asprintf");
1628 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1632 SIMPLEQ_FOREACH(re, &my_refs, entry) {
1633 const char *refname = got_ref_get_name(re->ref);
1635 if (!remote->mirror_references) {
1636 if (strncmp(refname, remote_namespace,
1637 strlen(remote_namespace)) == 0) {
1638 if (strcmp(refname + strlen(remote_namespace),
1641 if (asprintf(&local_refname, "refs/heads/%s",
1642 refname + strlen(remote_namespace)) == -1) {
1643 err = got_error_from_errno("asprintf");
1646 } else if (strncmp(refname, "refs/tags/", 10) != 0)
1650 TAILQ_FOREACH(pe, their_refs, entry) {
1651 if (strcmp(local_refname, pe->path) == 0)
1657 TAILQ_FOREACH(pe, their_symrefs, entry) {
1658 if (strcmp(local_refname, pe->path) == 0)
1664 err = delete_missing_ref(re->ref, verbosity, repo);
1668 if (local_refname) {
1669 struct got_reference *ref;
1670 err = got_ref_open(&ref, repo, local_refname, 1);
1672 if (err->code != GOT_ERR_NOT_REF)
1674 free(local_refname);
1675 local_refname = NULL;
1678 err = delete_missing_ref(ref, verbosity, repo);
1681 unlock_err = got_ref_unlock(ref);
1683 if (unlock_err && err == NULL) {
1688 free(local_refname);
1689 local_refname = NULL;
1693 free(remote_namespace);
1694 free(local_refname);
1698 static const struct got_error *
1699 update_wanted_ref(const char *refname, struct got_object_id *id,
1700 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1702 const struct got_error *err, *unlock_err;
1703 char *remote_refname;
1704 struct got_reference *ref;
1706 if (strncmp("refs/", refname, 5) == 0)
1709 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1710 remote_repo_name, refname) == -1)
1711 return got_error_from_errno("asprintf");
1713 err = got_ref_open(&ref, repo, remote_refname, 1);
1715 if (err->code != GOT_ERR_NOT_REF)
1717 err = create_ref(remote_refname, id, verbosity, repo);
1719 err = update_ref(ref, id, 0, verbosity, repo);
1720 unlock_err = got_ref_unlock(ref);
1721 if (unlock_err && err == NULL)
1726 free(remote_refname);
1730 static const struct got_error *
1731 cmd_fetch(int argc, char *argv[])
1733 const struct got_error *error = NULL, *unlock_err;
1734 char *cwd = NULL, *repo_path = NULL;
1735 const char *remote_name;
1736 char *proto = NULL, *host = NULL, *port = NULL;
1737 char *repo_name = NULL, *server_path = NULL;
1738 struct got_remote_repo *remotes, *remote = NULL;
1740 char *id_str = NULL;
1741 struct got_repository *repo = NULL;
1742 struct got_worktree *worktree = NULL;
1743 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1744 struct got_pathlist_entry *pe;
1745 struct got_object_id *pack_hash = NULL;
1746 int i, ch, fetchfd = -1, fetchstatus;
1747 pid_t fetchpid = -1;
1748 struct got_fetch_progress_arg fpa;
1749 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
1750 int delete_refs = 0, replace_tags = 0;
1753 TAILQ_INIT(&symrefs);
1754 TAILQ_INIT(&wanted_branches);
1755 TAILQ_INIT(&wanted_refs);
1757 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
1760 fetch_all_branches = 1;
1763 error = got_pathlist_append(&wanted_branches,
1775 repo_path = realpath(optarg, NULL);
1776 if (repo_path == NULL)
1777 return got_error_from_errno2("realpath",
1779 got_path_strip_trailing_slashes(repo_path);
1787 else if (verbosity < 3)
1794 error = got_pathlist_append(&wanted_refs,
1807 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1808 errx(1, "-a and -b options are mutually exclusive");
1809 if (list_refs_only) {
1810 if (!TAILQ_EMPTY(&wanted_branches))
1811 errx(1, "-l and -b options are mutually exclusive");
1812 if (fetch_all_branches)
1813 errx(1, "-l and -a options are mutually exclusive");
1815 errx(1, "-l and -d options are mutually exclusive");
1816 if (verbosity == -1)
1817 errx(1, "-l and -q options are mutually exclusive");
1821 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
1823 remote_name = argv[0];
1827 cwd = getcwd(NULL, 0);
1829 error = got_error_from_errno("getcwd");
1833 if (repo_path == NULL) {
1834 error = got_worktree_open(&worktree, cwd);
1835 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1841 strdup(got_worktree_get_repo_path(worktree));
1842 if (repo_path == NULL)
1843 error = got_error_from_errno("strdup");
1847 repo_path = strdup(cwd);
1848 if (repo_path == NULL) {
1849 error = got_error_from_errno("strdup");
1855 error = got_repo_open(&repo, repo_path, NULL);
1859 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
1860 for (i = 0; i < nremotes; i++) {
1861 remote = &remotes[i];
1862 if (strcmp(remote->name, remote_name) == 0)
1865 if (i == nremotes) {
1866 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
1870 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1871 &repo_name, remote->url);
1875 if (strcmp(proto, "git") == 0) {
1877 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1878 "sendfd dns inet unveil", NULL) == -1)
1881 } else if (strcmp(proto, "git+ssh") == 0 ||
1882 strcmp(proto, "ssh") == 0) {
1884 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1885 "sendfd unveil", NULL) == -1)
1888 } else if (strcmp(proto, "http") == 0 ||
1889 strcmp(proto, "git+http") == 0) {
1890 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1893 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1897 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1898 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1899 error = got_error_from_errno2("unveil",
1900 GOT_FETCH_PATH_SSH);
1904 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
1908 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1909 server_path, verbosity);
1914 printf("Connected to \"%s\" %s%s%s\n", remote->name, host,
1915 port ? ":" : "", port ? port : "");
1917 fpa.last_scaled_size[0] = '\0';
1918 fpa.last_p_indexed = -1;
1919 fpa.last_p_resolved = -1;
1920 fpa.verbosity = verbosity;
1921 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
1922 remote->mirror_references, fetch_all_branches, &wanted_branches,
1923 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
1924 fetch_progress, &fpa);
1928 if (list_refs_only) {
1929 error = list_remote_refs(&symrefs, &refs);
1933 if (pack_hash == NULL) {
1935 printf("Already up-to-date\n");
1936 } else if (verbosity >= 0) {
1937 error = got_object_id_str(&id_str, pack_hash);
1940 printf("\nFetched %s.pack\n", id_str);
1945 /* Update references provided with the pack file. */
1946 TAILQ_FOREACH(pe, &refs, entry) {
1947 const char *refname = pe->path;
1948 struct got_object_id *id = pe->data;
1949 struct got_reference *ref;
1950 char *remote_refname;
1952 if (is_wanted_ref(&wanted_refs, refname) &&
1953 !remote->mirror_references) {
1954 error = update_wanted_ref(refname, id,
1955 remote->name, verbosity, repo);
1961 if (remote->mirror_references ||
1962 strncmp("refs/tags/", refname, 10) == 0) {
1963 error = got_ref_open(&ref, repo, refname, 1);
1965 if (error->code != GOT_ERR_NOT_REF)
1967 error = create_ref(refname, id, verbosity,
1972 error = update_ref(ref, id, replace_tags,
1974 unlock_err = got_ref_unlock(ref);
1975 if (unlock_err && error == NULL)
1981 } else if (strncmp("refs/heads/", refname, 11) == 0) {
1982 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1983 remote_name, refname + 11) == -1) {
1984 error = got_error_from_errno("asprintf");
1988 error = got_ref_open(&ref, repo, remote_refname, 1);
1990 if (error->code != GOT_ERR_NOT_REF)
1992 error = create_ref(remote_refname, id,
1997 error = update_ref(ref, id, replace_tags,
1999 unlock_err = got_ref_unlock(ref);
2000 if (unlock_err && error == NULL)
2007 /* Also create a local branch if none exists yet. */
2008 error = got_ref_open(&ref, repo, refname, 1);
2010 if (error->code != GOT_ERR_NOT_REF)
2012 error = create_ref(refname, id, verbosity,
2017 unlock_err = got_ref_unlock(ref);
2018 if (unlock_err && error == NULL)
2025 error = delete_missing_refs(&refs, &symrefs, remote,
2031 if (!remote->mirror_references) {
2032 /* Update remote HEAD reference if the server provided one. */
2033 TAILQ_FOREACH(pe, &symrefs, entry) {
2034 struct got_reference *target_ref;
2035 const char *refname = pe->path;
2036 const char *target = pe->data;
2037 char *remote_refname = NULL, *remote_target = NULL;
2039 if (strcmp(refname, GOT_REF_HEAD) != 0)
2042 if (strncmp("refs/heads/", target, 11) != 0)
2045 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2046 remote->name, refname) == -1) {
2047 error = got_error_from_errno("asprintf");
2050 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2051 remote->name, target + 11) == -1) {
2052 error = got_error_from_errno("asprintf");
2053 free(remote_refname);
2057 error = got_ref_open(&target_ref, repo, remote_target,
2060 free(remote_refname);
2061 free(remote_target);
2062 if (error->code == GOT_ERR_NOT_REF) {
2068 error = update_symref(remote_refname, target_ref,
2070 free(remote_refname);
2071 free(remote_target);
2072 got_ref_close(target_ref);
2079 if (kill(fetchpid, SIGTERM) == -1)
2080 error = got_error_from_errno("kill");
2081 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2082 error = got_error_from_errno("waitpid");
2084 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2085 error = got_error_from_errno("close");
2087 got_repo_close(repo);
2089 got_worktree_close(worktree);
2090 TAILQ_FOREACH(pe, &refs, entry) {
2091 free((void *)pe->path);
2094 got_pathlist_free(&refs);
2095 TAILQ_FOREACH(pe, &symrefs, entry) {
2096 free((void *)pe->path);
2099 got_pathlist_free(&symrefs);
2100 got_pathlist_free(&wanted_branches);
2101 got_pathlist_free(&wanted_refs);
2116 usage_checkout(void)
2118 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2119 "[-p prefix] repository-path [worktree-path]\n", getprogname());
2124 show_worktree_base_ref_warning(void)
2126 fprintf(stderr, "%s: warning: could not create a reference "
2127 "to the work tree's base commit; the commit could be "
2128 "garbage-collected by Git; making the repository "
2129 "writable and running 'got update' will prevent this\n",
2133 struct got_checkout_progress_arg {
2134 const char *worktree_path;
2135 int had_base_commit_ref_error;
2138 static const struct got_error *
2139 checkout_progress(void *arg, unsigned char status, const char *path)
2141 struct got_checkout_progress_arg *a = arg;
2143 /* Base commit bump happens silently. */
2144 if (status == GOT_STATUS_BUMP_BASE)
2147 if (status == GOT_STATUS_BASE_REF_ERR) {
2148 a->had_base_commit_ref_error = 1;
2152 while (path[0] == '/')
2155 printf("%c %s/%s\n", status, a->worktree_path, path);
2159 static const struct got_error *
2160 check_cancelled(void *arg)
2162 if (sigint_received || sigpipe_received)
2163 return got_error(GOT_ERR_CANCELLED);
2167 static const struct got_error *
2168 check_linear_ancestry(struct got_object_id *commit_id,
2169 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2170 struct got_repository *repo)
2172 const struct got_error *err = NULL;
2173 struct got_object_id *yca_id;
2175 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2176 commit_id, base_commit_id, repo, check_cancelled, NULL);
2181 return got_error(GOT_ERR_ANCESTRY);
2184 * Require a straight line of history between the target commit
2185 * and the work tree's base commit.
2187 * Non-linear situations such as this require a rebase:
2189 * (commit) D F (base_commit)
2197 * 'got update' only handles linear cases:
2198 * Update forwards in time: A (base/yca) - B - C - D (commit)
2199 * Update backwards in time: D (base) - C - B - A (commit/yca)
2201 if (allow_forwards_in_time_only) {
2202 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2203 return got_error(GOT_ERR_ANCESTRY);
2204 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2205 got_object_id_cmp(base_commit_id, yca_id) != 0)
2206 return got_error(GOT_ERR_ANCESTRY);
2212 static const struct got_error *
2213 check_same_branch(struct got_object_id *commit_id,
2214 struct got_reference *head_ref, struct got_object_id *yca_id,
2215 struct got_repository *repo)
2217 const struct got_error *err = NULL;
2218 struct got_commit_graph *graph = NULL;
2219 struct got_object_id *head_commit_id = NULL;
2220 int is_same_branch = 0;
2222 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2226 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2230 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2235 err = got_commit_graph_open(&graph, "/", 1);
2239 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2240 check_cancelled, NULL);
2245 struct got_object_id *id;
2246 err = got_commit_graph_iter_next(&id, graph, repo,
2247 check_cancelled, NULL);
2249 if (err->code == GOT_ERR_ITER_COMPLETED)
2255 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2257 if (got_object_id_cmp(id, commit_id) == 0) {
2265 got_commit_graph_close(graph);
2266 free(head_commit_id);
2267 if (!err && !is_same_branch)
2268 err = got_error(GOT_ERR_ANCESTRY);
2272 static const struct got_error *
2273 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2275 static char msg[512];
2276 const char *branch_name;
2278 if (got_ref_is_symbolic(ref))
2279 branch_name = got_ref_get_symref_target(ref);
2281 branch_name = got_ref_get_name(ref);
2283 if (strncmp("refs/heads/", branch_name, 11) == 0)
2286 snprintf(msg, sizeof(msg),
2287 "target commit is not contained in branch '%s'; "
2288 "the branch to use must be specified with -b; "
2289 "if necessary a new branch can be created for "
2290 "this commit with 'got branch -c %s BRANCH_NAME'",
2291 branch_name, commit_id_str);
2293 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2296 static const struct got_error *
2297 cmd_checkout(int argc, char *argv[])
2299 const struct got_error *error = NULL;
2300 struct got_repository *repo = NULL;
2301 struct got_reference *head_ref = NULL;
2302 struct got_worktree *worktree = NULL;
2303 char *repo_path = NULL;
2304 char *worktree_path = NULL;
2305 const char *path_prefix = "";
2306 const char *branch_name = GOT_REF_HEAD;
2307 char *commit_id_str = NULL;
2308 int ch, same_path_prefix, allow_nonempty = 0;
2309 struct got_pathlist_head paths;
2310 struct got_checkout_progress_arg cpa;
2314 while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2317 branch_name = optarg;
2320 commit_id_str = strdup(optarg);
2321 if (commit_id_str == NULL)
2322 return got_error_from_errno("strdup");
2328 path_prefix = optarg;
2340 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2341 "unveil", NULL) == -1)
2345 char *cwd, *base, *dotgit;
2346 repo_path = realpath(argv[0], NULL);
2347 if (repo_path == NULL)
2348 return got_error_from_errno2("realpath", argv[0]);
2349 cwd = getcwd(NULL, 0);
2351 error = got_error_from_errno("getcwd");
2354 if (path_prefix[0]) {
2355 base = basename(path_prefix);
2357 error = got_error_from_errno2("basename",
2362 base = basename(repo_path);
2364 error = got_error_from_errno2("basename",
2369 dotgit = strstr(base, ".git");
2372 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2373 error = got_error_from_errno("asprintf");
2378 } else if (argc == 2) {
2379 repo_path = realpath(argv[0], NULL);
2380 if (repo_path == NULL) {
2381 error = got_error_from_errno2("realpath", argv[0]);
2384 worktree_path = realpath(argv[1], NULL);
2385 if (worktree_path == NULL) {
2386 if (errno != ENOENT) {
2387 error = got_error_from_errno2("realpath",
2391 worktree_path = strdup(argv[1]);
2392 if (worktree_path == NULL) {
2393 error = got_error_from_errno("strdup");
2400 got_path_strip_trailing_slashes(repo_path);
2401 got_path_strip_trailing_slashes(worktree_path);
2403 error = got_repo_open(&repo, repo_path, NULL);
2407 /* Pre-create work tree path for unveil(2) */
2408 error = got_path_mkdir(worktree_path);
2410 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2411 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2413 if (!allow_nonempty &&
2414 !got_path_dir_is_empty(worktree_path)) {
2415 error = got_error_path(worktree_path,
2416 GOT_ERR_DIR_NOT_EMPTY);
2421 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2425 error = got_ref_open(&head_ref, repo, branch_name, 0);
2429 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2430 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2433 error = got_worktree_open(&worktree, worktree_path);
2437 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2441 if (!same_path_prefix) {
2442 error = got_error(GOT_ERR_PATH_PREFIX);
2446 if (commit_id_str) {
2447 struct got_object_id *commit_id;
2448 error = got_repo_match_object_id(&commit_id, NULL,
2449 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2452 error = check_linear_ancestry(commit_id,
2453 got_worktree_get_base_commit_id(worktree), 0, repo);
2454 if (error != NULL) {
2456 if (error->code == GOT_ERR_ANCESTRY) {
2457 error = checkout_ancestry_error(
2458 head_ref, commit_id_str);
2462 error = check_same_branch(commit_id, head_ref, NULL, repo);
2464 if (error->code == GOT_ERR_ANCESTRY) {
2465 error = checkout_ancestry_error(
2466 head_ref, commit_id_str);
2470 error = got_worktree_set_base_commit_id(worktree, repo,
2477 error = got_pathlist_append(&paths, "", NULL);
2480 cpa.worktree_path = worktree_path;
2481 cpa.had_base_commit_ref_error = 0;
2482 error = got_worktree_checkout_files(worktree, &paths, repo,
2483 checkout_progress, &cpa, check_cancelled, NULL);
2487 printf("Now shut up and hack\n");
2488 if (cpa.had_base_commit_ref_error)
2489 show_worktree_base_ref_warning();
2491 got_pathlist_free(&paths);
2492 free(commit_id_str);
2494 free(worktree_path);
2498 struct got_update_progress_arg {
2506 print_update_progress_stats(struct got_update_progress_arg *upa)
2508 if (!upa->did_something)
2511 if (upa->conflicts > 0)
2512 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2513 if (upa->obstructed > 0)
2514 printf("File paths obstructed by a non-regular file: %d\n",
2516 if (upa->not_updated > 0)
2517 printf("Files not updated because of existing merge "
2518 "conflicts: %d\n", upa->not_updated);
2524 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2529 static const struct got_error *
2530 update_progress(void *arg, unsigned char status, const char *path)
2532 struct got_update_progress_arg *upa = arg;
2534 if (status == GOT_STATUS_EXISTS ||
2535 status == GOT_STATUS_BASE_REF_ERR)
2538 upa->did_something = 1;
2540 /* Base commit bump happens silently. */
2541 if (status == GOT_STATUS_BUMP_BASE)
2544 if (status == GOT_STATUS_CONFLICT)
2546 if (status == GOT_STATUS_OBSTRUCTED)
2548 if (status == GOT_STATUS_CANNOT_UPDATE)
2551 while (path[0] == '/')
2553 printf("%c %s\n", status, path);
2557 static const struct got_error *
2558 switch_head_ref(struct got_reference *head_ref,
2559 struct got_object_id *commit_id, struct got_worktree *worktree,
2560 struct got_repository *repo)
2562 const struct got_error *err = NULL;
2564 int ref_has_moved = 0;
2566 /* Trivial case: switching between two different references. */
2567 if (strcmp(got_ref_get_name(head_ref),
2568 got_worktree_get_head_ref_name(worktree)) != 0) {
2569 printf("Switching work tree from %s to %s\n",
2570 got_worktree_get_head_ref_name(worktree),
2571 got_ref_get_name(head_ref));
2572 return got_worktree_set_head_ref(worktree, head_ref);
2575 err = check_linear_ancestry(commit_id,
2576 got_worktree_get_base_commit_id(worktree), 0, repo);
2578 if (err->code != GOT_ERR_ANCESTRY)
2585 /* Switching to a rebased branch with the same reference name. */
2586 err = got_object_id_str(&base_id_str,
2587 got_worktree_get_base_commit_id(worktree));
2590 printf("Reference %s now points at a different branch\n",
2591 got_worktree_get_head_ref_name(worktree));
2592 printf("Switching work tree from %s to %s\n", base_id_str,
2593 got_worktree_get_head_ref_name(worktree));
2597 static const struct got_error *
2598 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2600 const struct got_error *err;
2603 err = got_worktree_rebase_in_progress(&in_progress, worktree);
2607 return got_error(GOT_ERR_REBASING);
2609 err = got_worktree_histedit_in_progress(&in_progress, worktree);
2613 return got_error(GOT_ERR_HISTEDIT_BUSY);
2618 static const struct got_error *
2619 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2620 char *argv[], struct got_worktree *worktree)
2622 const struct got_error *err = NULL;
2629 return got_error_from_errno("strdup");
2630 return got_pathlist_append(paths, path, NULL);
2633 for (i = 0; i < argc; i++) {
2634 err = got_worktree_resolve_path(&path, worktree, argv[i]);
2637 err = got_pathlist_append(paths, path, NULL);
2647 static const struct got_error *
2648 wrap_not_worktree_error(const struct got_error *orig_err,
2649 const char *cmdname, const char *path)
2651 const struct got_error *err;
2652 struct got_repository *repo;
2653 static char msg[512];
2655 err = got_repo_open(&repo, path, NULL);
2659 snprintf(msg, sizeof(msg),
2660 "'got %s' needs a work tree in addition to a git repository\n"
2661 "Work trees can be checked out from this Git repository with "
2663 "The got(1) manual page contains more information.", cmdname);
2664 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2665 got_repo_close(repo);
2669 static const struct got_error *
2670 cmd_update(int argc, char *argv[])
2672 const struct got_error *error = NULL;
2673 struct got_repository *repo = NULL;
2674 struct got_worktree *worktree = NULL;
2675 char *worktree_path = NULL;
2676 struct got_object_id *commit_id = NULL;
2677 char *commit_id_str = NULL;
2678 const char *branch_name = NULL;
2679 struct got_reference *head_ref = NULL;
2680 struct got_pathlist_head paths;
2681 struct got_pathlist_entry *pe;
2683 struct got_update_progress_arg upa;
2687 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2690 branch_name = optarg;
2693 commit_id_str = strdup(optarg);
2694 if (commit_id_str == NULL)
2695 return got_error_from_errno("strdup");
2707 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2708 "unveil", NULL) == -1)
2711 worktree_path = getcwd(NULL, 0);
2712 if (worktree_path == NULL) {
2713 error = got_error_from_errno("getcwd");
2716 error = got_worktree_open(&worktree, worktree_path);
2718 if (error->code == GOT_ERR_NOT_WORKTREE)
2719 error = wrap_not_worktree_error(error, "update",
2724 error = check_rebase_or_histedit_in_progress(worktree);
2728 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2733 error = apply_unveil(got_repo_get_path(repo), 0,
2734 got_worktree_get_root_path(worktree));
2738 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2742 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2743 got_worktree_get_head_ref_name(worktree), 0);
2746 if (commit_id_str == NULL) {
2747 error = got_ref_resolve(&commit_id, repo, head_ref);
2750 error = got_object_id_str(&commit_id_str, commit_id);
2754 error = got_repo_match_object_id(&commit_id, NULL,
2755 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2756 free(commit_id_str);
2757 commit_id_str = NULL;
2760 error = got_object_id_str(&commit_id_str, commit_id);
2766 struct got_object_id *head_commit_id;
2767 TAILQ_FOREACH(pe, &paths, entry) {
2768 if (pe->path_len == 0)
2770 error = got_error_msg(GOT_ERR_BAD_PATH,
2771 "switching between branches requires that "
2772 "the entire work tree gets updated");
2775 error = got_ref_resolve(&head_commit_id, repo, head_ref);
2778 error = check_linear_ancestry(commit_id, head_commit_id, 0,
2780 free(head_commit_id);
2783 error = check_same_branch(commit_id, head_ref, NULL, repo);
2786 error = switch_head_ref(head_ref, commit_id, worktree, repo);
2790 error = check_linear_ancestry(commit_id,
2791 got_worktree_get_base_commit_id(worktree), 0, repo);
2792 if (error != NULL) {
2793 if (error->code == GOT_ERR_ANCESTRY)
2794 error = got_error(GOT_ERR_BRANCH_MOVED);
2797 error = check_same_branch(commit_id, head_ref, NULL, repo);
2802 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2804 error = got_worktree_set_base_commit_id(worktree, repo,
2810 memset(&upa, 0, sizeof(upa));
2811 error = got_worktree_checkout_files(worktree, &paths, repo,
2812 update_progress, &upa, check_cancelled, NULL);
2816 if (upa.did_something)
2817 printf("Updated to commit %s\n", commit_id_str);
2819 printf("Already up-to-date\n");
2820 print_update_progress_stats(&upa);
2822 free(worktree_path);
2823 TAILQ_FOREACH(pe, &paths, entry)
2824 free((char *)pe->path);
2825 got_pathlist_free(&paths);
2827 free(commit_id_str);
2831 static const struct got_error *
2832 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2833 const char *path, int diff_context, int ignore_whitespace,
2834 struct got_repository *repo)
2836 const struct got_error *err = NULL;
2837 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2840 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2845 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2849 while (path[0] == '/')
2851 err = got_diff_blob(blob1, blob2, path, path, diff_context,
2852 ignore_whitespace, stdout);
2855 got_object_blob_close(blob1);
2856 got_object_blob_close(blob2);
2860 static const struct got_error *
2861 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2862 const char *path, int diff_context, int ignore_whitespace,
2863 struct got_repository *repo)
2865 const struct got_error *err = NULL;
2866 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2867 struct got_diff_blob_output_unidiff_arg arg;
2870 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2875 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2879 arg.diff_context = diff_context;
2880 arg.ignore_whitespace = ignore_whitespace;
2881 arg.outfile = stdout;
2882 while (path[0] == '/')
2884 err = got_diff_tree(tree1, tree2, path, path, repo,
2885 got_diff_blob_output_unidiff, &arg, 1);
2888 got_object_tree_close(tree1);
2890 got_object_tree_close(tree2);
2894 static const struct got_error *
2895 print_patch(struct got_commit_object *commit, struct got_object_id *id,
2896 const char *path, int diff_context, struct got_repository *repo)
2898 const struct got_error *err = NULL;
2899 struct got_commit_object *pcommit = NULL;
2900 char *id_str1 = NULL, *id_str2 = NULL;
2901 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2902 struct got_object_qid *qid;
2904 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2906 err = got_object_open_as_commit(&pcommit, repo,
2912 if (path && path[0] != '\0') {
2914 err = got_object_id_by_path(&obj_id2, repo, id, path);
2917 err = got_object_id_str(&id_str2, obj_id2);
2923 err = got_object_id_by_path(&obj_id1, repo,
2929 err = got_object_id_str(&id_str1, obj_id1);
2935 err = got_object_get_type(&obj_type, repo, obj_id2);
2940 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2942 case GOT_OBJ_TYPE_BLOB:
2943 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2946 case GOT_OBJ_TYPE_TREE:
2947 err = diff_trees(obj_id1, obj_id2, path, diff_context,
2951 err = got_error(GOT_ERR_OBJ_TYPE);
2957 obj_id2 = got_object_commit_get_tree_id(commit);
2958 err = got_object_id_str(&id_str2, obj_id2);
2961 obj_id1 = got_object_commit_get_tree_id(pcommit);
2962 err = got_object_id_str(&id_str1, obj_id1);
2965 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2966 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
2972 got_object_commit_close(pcommit);
2977 get_datestr(time_t *time, char *datebuf)
2979 struct tm mytm, *tm;
2982 tm = gmtime_r(time, &mytm);
2985 s = asctime_r(tm, datebuf);
2988 p = strchr(s, '\n');
2994 static const struct got_error *
2995 match_logmsg(int *have_match, struct got_object_id *id,
2996 struct got_commit_object *commit, regex_t *regex)
2998 const struct got_error *err = NULL;
2999 regmatch_t regmatch;
3000 char *id_str = NULL, *logmsg = NULL;
3004 err = got_object_id_str(&id_str, id);
3008 err = got_object_commit_get_logmsg(&logmsg, commit);
3012 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3020 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3022 static const struct got_error *
3023 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3024 struct got_repository *repo, const char *path, int show_patch,
3025 int diff_context, struct got_reflist_head *refs)
3027 const struct got_error *err = NULL;
3028 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3030 time_t committer_time;
3031 const char *author, *committer;
3032 char *refs_str = NULL;
3033 struct got_reflist_entry *re;
3035 SIMPLEQ_FOREACH(re, refs, entry) {
3038 struct got_tag_object *tag = NULL;
3041 name = got_ref_get_name(re->ref);
3042 if (strcmp(name, GOT_REF_HEAD) == 0)
3044 if (strncmp(name, "refs/", 5) == 0)
3046 if (strncmp(name, "got/", 4) == 0)
3048 if (strncmp(name, "heads/", 6) == 0)
3050 if (strncmp(name, "remotes/", 8) == 0)
3052 if (strncmp(name, "tags/", 5) == 0) {
3053 err = got_object_open_as_tag(&tag, repo, re->id);
3055 if (err->code != GOT_ERR_OBJ_TYPE)
3057 /* Ref points at something other than a tag. */
3062 cmp = got_object_id_cmp(tag ?
3063 got_object_tag_get_object_id(tag) : re->id, id);
3065 got_object_tag_close(tag);
3069 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3071 err = got_error_from_errno("asprintf");
3077 err = got_object_id_str(&id_str, id);
3081 printf(GOT_COMMIT_SEP_STR);
3082 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3083 refs_str ? refs_str : "", refs_str ? ")" : "");
3088 printf("from: %s\n", got_object_commit_get_author(commit));
3089 committer_time = got_object_commit_get_committer_time(commit);
3090 datestr = get_datestr(&committer_time, datebuf);
3092 printf("date: %s UTC\n", datestr);
3093 author = got_object_commit_get_author(commit);
3094 committer = got_object_commit_get_committer(commit);
3095 if (strcmp(author, committer) != 0)
3096 printf("via: %s\n", committer);
3097 if (got_object_commit_get_nparents(commit) > 1) {
3098 const struct got_object_id_queue *parent_ids;
3099 struct got_object_qid *qid;
3101 parent_ids = got_object_commit_get_parent_ids(commit);
3102 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3103 err = got_object_id_str(&id_str, qid->id);
3106 printf("parent %d: %s\n", n++, id_str);
3111 err = got_object_commit_get_logmsg(&logmsg0, commit);
3117 line = strsep(&logmsg, "\n");
3119 printf(" %s\n", line);
3124 err = print_patch(commit, id, path, diff_context, repo);
3129 if (fflush(stdout) != 0 && err == NULL)
3130 err = got_error_from_errno("fflush");
3134 static const struct got_error *
3135 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3136 struct got_repository *repo, const char *path, int show_patch,
3137 const char *search_pattern, int diff_context, int limit, int log_branches,
3138 struct got_reflist_head *refs)
3140 const struct got_error *err;
3141 struct got_commit_graph *graph;
3145 if (search_pattern && regcomp(®ex, search_pattern,
3146 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3147 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3149 err = got_commit_graph_open(&graph, path, !log_branches);
3152 err = got_commit_graph_iter_start(graph, root_id, repo,
3153 check_cancelled, NULL);
3157 struct got_commit_object *commit;
3158 struct got_object_id *id;
3160 if (sigint_received || sigpipe_received)
3163 err = got_commit_graph_iter_next(&id, graph, repo,
3164 check_cancelled, NULL);
3166 if (err->code == GOT_ERR_ITER_COMPLETED)
3173 err = got_object_open_as_commit(&commit, repo, id);
3177 if (search_pattern) {
3178 err = match_logmsg(&have_match, id, commit, ®ex);
3180 got_object_commit_close(commit);
3183 if (have_match == 0) {
3184 got_object_commit_close(commit);
3189 err = print_commit(commit, id, repo, path, show_patch,
3190 diff_context, refs);
3191 got_object_commit_close(commit);
3192 if (err || (limit && --limit == 0) ||
3193 (end_id != NULL && got_object_id_cmp(id, end_id) == 0))
3199 got_commit_graph_close(graph);
3206 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3207 "[-p] [-x commit] [-s search-pattern] [-r repository-path] "
3208 "[path]\n", getprogname());
3213 get_default_log_limit(void)
3215 const char *got_default_log_limit;
3219 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3220 if (got_default_log_limit == NULL)
3222 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3228 static const struct got_error *
3229 resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3230 struct got_repository *repo)
3232 const struct got_error *err = NULL;
3233 struct got_reference *ref;
3237 err = got_ref_open(&ref, repo, commit_arg, 0);
3240 err = got_ref_resolve(id, repo, ref);
3244 err = got_object_get_type(&obj_type, repo, *id);
3247 if (obj_type == GOT_OBJ_TYPE_TAG) {
3248 struct got_tag_object *tag;
3249 err = got_object_open_as_tag(&tag, repo, *id);
3252 if (got_object_tag_get_object_type(tag) !=
3253 GOT_OBJ_TYPE_COMMIT) {
3254 got_object_tag_close(tag);
3255 return got_error(GOT_ERR_OBJ_TYPE);
3258 *id = got_object_id_dup(
3259 got_object_tag_get_object_id(tag));
3261 err = got_error_from_errno(
3262 "got_object_id_dup");
3263 got_object_tag_close(tag);
3266 } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3267 return got_error(GOT_ERR_OBJ_TYPE);
3269 err = got_repo_match_object_id_prefix(id, commit_arg,
3270 GOT_OBJ_TYPE_COMMIT, repo);
3276 static const struct got_error *
3277 cmd_log(int argc, char *argv[])
3279 const struct got_error *error;
3280 struct got_repository *repo = NULL;
3281 struct got_worktree *worktree = NULL;
3282 struct got_object_id *start_id = NULL, *end_id = NULL;
3283 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3284 const char *start_commit = NULL, *end_commit = NULL;
3285 const char *search_pattern = NULL;
3286 int diff_context = -1, ch;
3287 int show_patch = 0, limit = 0, log_branches = 0;
3289 struct got_reflist_head refs;
3291 SIMPLEQ_INIT(&refs);
3294 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3300 limit = get_default_log_limit();
3302 while ((ch = getopt(argc, argv, "bpc:C:l:r:s:x:")) != -1) {
3308 start_commit = optarg;
3311 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3314 err(1, "-C option %s", errstr);
3317 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3319 err(1, "-l option %s", errstr);
3325 repo_path = realpath(optarg, NULL);
3326 if (repo_path == NULL)
3327 return got_error_from_errno2("realpath",
3329 got_path_strip_trailing_slashes(repo_path);
3332 search_pattern = optarg;
3335 end_commit = optarg;
3346 if (diff_context == -1)
3348 else if (!show_patch)
3349 errx(1, "-C reguires -p");
3351 cwd = getcwd(NULL, 0);
3353 error = got_error_from_errno("getcwd");
3357 error = got_worktree_open(&worktree, cwd);
3358 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3365 error = got_error_from_errno("strdup");
3368 } else if (argc == 1) {
3370 error = got_worktree_resolve_path(&path, worktree,
3375 path = strdup(argv[0]);
3377 error = got_error_from_errno("strdup");
3384 if (repo_path == NULL) {
3385 repo_path = worktree ?
3386 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3388 if (repo_path == NULL) {
3389 error = got_error_from_errno("strdup");
3393 error = got_repo_open(&repo, repo_path, NULL);
3397 error = apply_unveil(got_repo_get_path(repo), 1,
3398 worktree ? got_worktree_get_root_path(worktree) : NULL);
3402 if (start_commit == NULL) {
3403 struct got_reference *head_ref;
3404 struct got_commit_object *commit = NULL;
3405 error = got_ref_open(&head_ref, repo,
3406 worktree ? got_worktree_get_head_ref_name(worktree)
3410 error = got_ref_resolve(&start_id, repo, head_ref);
3411 got_ref_close(head_ref);
3414 error = got_object_open_as_commit(&commit, repo,
3418 got_object_commit_close(commit);
3420 error = resolve_commit_arg(&start_id, start_commit, repo);
3424 if (end_commit != NULL) {
3425 error = resolve_commit_arg(&end_id, end_commit, repo);
3431 const char *prefix = got_worktree_get_path_prefix(worktree);
3433 if (asprintf(&p, "%s%s%s", prefix,
3434 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3435 error = got_error_from_errno("asprintf");
3438 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3441 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3446 path = in_repo_path;
3449 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3453 error = print_commits(start_id, end_id, repo, path, show_patch,
3454 search_pattern, diff_context, limit, log_branches, &refs);
3460 got_worktree_close(worktree);
3462 const struct got_error *repo_error;
3463 repo_error = got_repo_close(repo);
3467 got_ref_list_free(&refs);
3474 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3475 "[-w] [object1 object2 | path]\n", getprogname());
3479 struct print_diff_arg {
3480 struct got_repository *repo;
3481 struct got_worktree *worktree;
3486 int ignore_whitespace;
3489 static const struct got_error *
3490 print_diff(void *arg, unsigned char status, unsigned char staged_status,
3491 const char *path, struct got_object_id *blob_id,
3492 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3493 int dirfd, const char *de_name)
3495 struct print_diff_arg *a = arg;
3496 const struct got_error *err = NULL;
3497 struct got_blob_object *blob1 = NULL;
3500 char *abspath = NULL, *label1 = NULL;
3503 if (a->diff_staged) {
3504 if (staged_status != GOT_STATUS_MODIFY &&
3505 staged_status != GOT_STATUS_ADD &&
3506 staged_status != GOT_STATUS_DELETE)
3509 if (staged_status == GOT_STATUS_DELETE)
3511 if (status == GOT_STATUS_NONEXISTENT)
3512 return got_error_set_errno(ENOENT, path);
3513 if (status != GOT_STATUS_MODIFY &&
3514 status != GOT_STATUS_ADD &&
3515 status != GOT_STATUS_DELETE &&
3516 status != GOT_STATUS_CONFLICT)
3520 if (!a->header_shown) {
3521 printf("diff %s %s%s\n", a->id_str,
3522 got_worktree_get_root_path(a->worktree),
3523 a->diff_staged ? " (staged changes)" : "");
3524 a->header_shown = 1;
3527 if (a->diff_staged) {
3528 const char *label1 = NULL, *label2 = NULL;
3529 switch (staged_status) {
3530 case GOT_STATUS_MODIFY:
3534 case GOT_STATUS_ADD:
3537 case GOT_STATUS_DELETE:
3541 return got_error(GOT_ERR_FILE_STATUS);
3543 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3544 label1, label2, a->diff_context, a->ignore_whitespace,
3548 if (staged_status == GOT_STATUS_ADD ||
3549 staged_status == GOT_STATUS_MODIFY) {
3551 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3555 err = got_object_id_str(&id_str, staged_blob_id);
3558 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3559 err = got_error_from_errno("asprintf");
3564 } else if (status != GOT_STATUS_ADD) {
3565 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3570 if (status != GOT_STATUS_DELETE) {
3571 if (asprintf(&abspath, "%s/%s",
3572 got_worktree_get_root_path(a->worktree), path) == -1) {
3573 err = got_error_from_errno("asprintf");
3578 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3580 err = got_error_from_errno2("openat", abspath);
3584 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3586 err = got_error_from_errno2("open", abspath);
3590 if (fstat(fd, &sb) == -1) {
3591 err = got_error_from_errno2("fstat", abspath);
3594 f2 = fdopen(fd, "r");
3596 err = got_error_from_errno2("fdopen", abspath);
3603 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3604 a->diff_context, a->ignore_whitespace, stdout);
3607 got_object_blob_close(blob1);
3608 if (f2 && fclose(f2) == EOF && err == NULL)
3609 err = got_error_from_errno("fclose");
3610 if (fd != -1 && close(fd) == -1 && err == NULL)
3611 err = got_error_from_errno("close");
3616 static const struct got_error *
3617 cmd_diff(int argc, char *argv[])
3619 const struct got_error *error;
3620 struct got_repository *repo = NULL;
3621 struct got_worktree *worktree = NULL;
3622 char *cwd = NULL, *repo_path = NULL;
3623 struct got_object_id *id1 = NULL, *id2 = NULL;
3624 const char *id_str1 = NULL, *id_str2 = NULL;
3625 char *label1 = NULL, *label2 = NULL;
3627 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3632 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3637 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3640 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3643 err(1, "-C option %s", errstr);
3646 repo_path = realpath(optarg, NULL);
3647 if (repo_path == NULL)
3648 return got_error_from_errno2("realpath",
3650 got_path_strip_trailing_slashes(repo_path);
3656 ignore_whitespace = 1;
3667 cwd = getcwd(NULL, 0);
3669 error = got_error_from_errno("getcwd");
3675 "-r option can't be used when diffing a work tree");
3676 error = got_worktree_open(&worktree, cwd);
3678 if (error->code == GOT_ERR_NOT_WORKTREE)
3679 error = wrap_not_worktree_error(error, "diff",
3683 repo_path = strdup(got_worktree_get_repo_path(worktree));
3684 if (repo_path == NULL) {
3685 error = got_error_from_errno("strdup");
3689 error = got_worktree_resolve_path(&path, worktree,
3696 error = got_error_from_errno("strdup");
3700 } else if (argc == 2) {
3702 errx(1, "-s option can't be used when diffing "
3703 "objects in repository");
3706 if (repo_path == NULL) {
3707 error = got_worktree_open(&worktree, cwd);
3708 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3712 got_worktree_get_repo_path(worktree));
3713 if (repo_path == NULL) {
3714 error = got_error_from_errno("strdup");
3718 repo_path = strdup(cwd);
3719 if (repo_path == NULL) {
3720 error = got_error_from_errno("strdup");
3728 error = got_repo_open(&repo, repo_path, NULL);
3733 error = apply_unveil(got_repo_get_path(repo), 1,
3734 worktree ? got_worktree_get_root_path(worktree) : NULL);
3739 struct print_diff_arg arg;
3740 struct got_pathlist_head paths;
3745 error = got_object_id_str(&id_str,
3746 got_worktree_get_base_commit_id(worktree));
3750 arg.worktree = worktree;
3751 arg.diff_context = diff_context;
3752 arg.id_str = id_str;
3753 arg.header_shown = 0;
3754 arg.diff_staged = diff_staged;
3755 arg.ignore_whitespace = ignore_whitespace;
3757 error = got_pathlist_append(&paths, path, NULL);
3761 error = got_worktree_status(worktree, &paths, repo, print_diff,
3762 &arg, check_cancelled, NULL);
3764 got_pathlist_free(&paths);
3768 error = got_repo_match_object_id(&id1, &label1, id_str1,
3769 GOT_OBJ_TYPE_ANY, 1, repo);
3773 error = got_repo_match_object_id(&id2, &label2, id_str2,
3774 GOT_OBJ_TYPE_ANY, 1, repo);
3778 error = got_object_get_type(&type1, repo, id1);
3782 error = got_object_get_type(&type2, repo, id2);
3786 if (type1 != type2) {
3787 error = got_error(GOT_ERR_OBJ_TYPE);
3792 case GOT_OBJ_TYPE_BLOB:
3793 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3794 diff_context, ignore_whitespace, repo, stdout);
3796 case GOT_OBJ_TYPE_TREE:
3797 error = got_diff_objects_as_trees(id1, id2, "", "",
3798 diff_context, ignore_whitespace, repo, stdout);
3800 case GOT_OBJ_TYPE_COMMIT:
3801 printf("diff %s %s\n", label1, label2);
3802 error = got_diff_objects_as_commits(id1, id2, diff_context,
3803 ignore_whitespace, repo, stdout);
3806 error = got_error(GOT_ERR_OBJ_TYPE);
3815 got_worktree_close(worktree);
3817 const struct got_error *repo_error;
3818 repo_error = got_repo_close(repo);
3829 "usage: %s blame [-c commit] [-r repository-path] path\n",
3838 char datebuf[11]; /* YYYY-MM-DD + NUL */
3841 struct blame_cb_args {
3842 struct blame_line *lines;
3846 off_t *line_offsets;
3848 struct got_repository *repo;
3851 static const struct got_error *
3852 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3854 const struct got_error *err = NULL;
3855 struct blame_cb_args *a = arg;
3856 struct blame_line *bline;
3858 size_t linesize = 0;
3859 struct got_commit_object *commit = NULL;
3862 time_t committer_time;
3864 if (nlines != a->nlines ||
3865 (lineno != -1 && lineno < 1) || lineno > a->nlines)
3866 return got_error(GOT_ERR_RANGE);
3868 if (sigint_received)
3869 return got_error(GOT_ERR_ITER_COMPLETED);
3872 return NULL; /* no change in this commit */
3874 /* Annotate this line. */
3875 bline = &a->lines[lineno - 1];
3876 if (bline->annotated)
3878 err = got_object_id_str(&bline->id_str, id);
3882 err = got_object_open_as_commit(&commit, a->repo, id);
3886 bline->committer = strdup(got_object_commit_get_committer(commit));
3887 if (bline->committer == NULL) {
3888 err = got_error_from_errno("strdup");
3892 committer_time = got_object_commit_get_committer_time(commit);
3893 if (localtime_r(&committer_time, &tm) == NULL)
3894 return got_error_from_errno("localtime_r");
3895 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
3896 &tm) >= sizeof(bline->datebuf)) {
3897 err = got_error(GOT_ERR_NO_SPACE);
3900 bline->annotated = 1;
3902 /* Print lines annotated so far. */
3903 bline = &a->lines[a->lineno_cur - 1];
3904 if (!bline->annotated)
3907 offset = a->line_offsets[a->lineno_cur - 1];
3908 if (fseeko(a->f, offset, SEEK_SET) == -1) {
3909 err = got_error_from_errno("fseeko");
3913 while (bline->annotated) {
3914 char *smallerthan, *at, *nl, *committer;
3917 if (getline(&line, &linesize, a->f) == -1) {
3919 err = got_error_from_errno("getline");
3923 committer = bline->committer;
3924 smallerthan = strchr(committer, '<');
3925 if (smallerthan && smallerthan[1] != '\0')
3926 committer = smallerthan + 1;
3927 at = strchr(committer, '@');
3930 len = strlen(committer);
3932 committer[8] = '\0';
3934 nl = strchr(line, '\n');
3937 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
3938 bline->id_str, bline->datebuf, committer, line);
3941 bline = &a->lines[a->lineno_cur - 1];
3945 got_object_commit_close(commit);
3950 static const struct got_error *
3951 cmd_blame(int argc, char *argv[])
3953 const struct got_error *error;
3954 struct got_repository *repo = NULL;
3955 struct got_worktree *worktree = NULL;
3956 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3957 struct got_object_id *obj_id = NULL;
3958 struct got_object_id *commit_id = NULL;
3959 struct got_blob_object *blob = NULL;
3960 char *commit_id_str = NULL;
3961 struct blame_cb_args bca;
3962 int ch, obj_type, i;
3965 memset(&bca, 0, sizeof(bca));
3968 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3973 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3976 commit_id_str = optarg;
3979 repo_path = realpath(optarg, NULL);
3980 if (repo_path == NULL)
3981 return got_error_from_errno2("realpath",
3983 got_path_strip_trailing_slashes(repo_path);
3999 cwd = getcwd(NULL, 0);
4001 error = got_error_from_errno("getcwd");
4004 if (repo_path == NULL) {
4005 error = got_worktree_open(&worktree, cwd);
4006 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4012 strdup(got_worktree_get_repo_path(worktree));
4013 if (repo_path == NULL) {
4014 error = got_error_from_errno("strdup");
4019 repo_path = strdup(cwd);
4020 if (repo_path == NULL) {
4021 error = got_error_from_errno("strdup");
4027 error = got_repo_open(&repo, repo_path, NULL);
4031 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4036 const char *prefix = got_worktree_get_path_prefix(worktree);
4037 char *p, *worktree_subdir = cwd +
4038 strlen(got_worktree_get_root_path(worktree));
4039 if (asprintf(&p, "%s%s%s%s%s",
4040 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4041 worktree_subdir, worktree_subdir[0] ? "/" : "",
4043 error = got_error_from_errno("asprintf");
4046 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4049 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4054 if (commit_id_str == NULL) {
4055 struct got_reference *head_ref;
4056 error = got_ref_open(&head_ref, repo, worktree ?
4057 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4060 error = got_ref_resolve(&commit_id, repo, head_ref);
4061 got_ref_close(head_ref);
4065 error = got_repo_match_object_id(&commit_id, NULL,
4066 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4071 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
4075 error = got_object_get_type(&obj_type, repo, obj_id);
4079 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4080 error = got_error(GOT_ERR_OBJ_TYPE);
4084 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4087 bca.f = got_opentemp();
4088 if (bca.f == NULL) {
4089 error = got_error_from_errno("got_opentemp");
4092 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4093 &bca.line_offsets, bca.f, blob);
4094 if (error || bca.nlines == 0)
4097 /* Don't include \n at EOF in the blame line count. */
4098 if (bca.line_offsets[bca.nlines - 1] == filesize)
4101 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4102 if (bca.lines == NULL) {
4103 error = got_error_from_errno("calloc");
4107 bca.nlines_prec = 0;
4115 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
4116 check_cancelled, NULL);
4124 got_object_blob_close(blob);
4126 got_worktree_close(worktree);
4128 const struct got_error *repo_error;
4129 repo_error = got_repo_close(repo);
4134 for (i = 0; i < bca.nlines; i++) {
4135 struct blame_line *bline = &bca.lines[i];
4136 free(bline->id_str);
4137 free(bline->committer);
4141 free(bca.line_offsets);
4142 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4143 error = got_error_from_errno("fclose");
4151 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
4157 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4158 const char *root_path)
4160 int is_root_path = (strcmp(path, root_path) == 0);
4161 const char *modestr = "";
4162 mode_t mode = got_tree_entry_get_mode(te);
4164 path += strlen(root_path);
4165 while (path[0] == '/')
4168 if (got_object_tree_entry_is_submodule(te))
4170 else if (S_ISLNK(mode))
4172 else if (S_ISDIR(mode))
4174 else if (mode & S_IXUSR)
4177 printf("%s%s%s%s%s\n", id ? id : "", path,
4178 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
4181 static const struct got_error *
4182 print_tree(const char *path, struct got_object_id *commit_id,
4183 int show_ids, int recurse, const char *root_path,
4184 struct got_repository *repo)
4186 const struct got_error *err = NULL;
4187 struct got_object_id *tree_id = NULL;
4188 struct got_tree_object *tree = NULL;
4191 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4195 err = got_object_open_as_tree(&tree, repo, tree_id);
4198 nentries = got_object_tree_get_nentries(tree);
4199 for (i = 0; i < nentries; i++) {
4200 struct got_tree_entry *te;
4203 if (sigint_received || sigpipe_received)
4206 te = got_object_tree_get_entry(tree, i);
4209 err = got_object_id_str(&id_str,
4210 got_tree_entry_get_id(te));
4213 if (asprintf(&id, "%s ", id_str) == -1) {
4214 err = got_error_from_errno("asprintf");
4220 print_entry(te, id, path, root_path);
4223 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4225 if (asprintf(&child_path, "%s%s%s", path,
4226 path[0] == '/' && path[1] == '\0' ? "" : "/",
4227 got_tree_entry_get_name(te)) == -1) {
4228 err = got_error_from_errno("asprintf");
4231 err = print_tree(child_path, commit_id, show_ids, 1,
4240 got_object_tree_close(tree);
4245 static const struct got_error *
4246 cmd_tree(int argc, char *argv[])
4248 const struct got_error *error;
4249 struct got_repository *repo = NULL;
4250 struct got_worktree *worktree = NULL;
4251 const char *path, *refname = NULL;
4252 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4253 struct got_object_id *commit_id = NULL;
4254 char *commit_id_str = NULL;
4255 int show_ids = 0, recurse = 0;
4259 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4264 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4267 commit_id_str = optarg;
4270 repo_path = realpath(optarg, NULL);
4271 if (repo_path == NULL)
4272 return got_error_from_errno2("realpath",
4274 got_path_strip_trailing_slashes(repo_path);
4298 cwd = getcwd(NULL, 0);
4300 error = got_error_from_errno("getcwd");
4303 if (repo_path == NULL) {
4304 error = got_worktree_open(&worktree, cwd);
4305 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4311 strdup(got_worktree_get_repo_path(worktree));
4312 if (repo_path == NULL)
4313 error = got_error_from_errno("strdup");
4317 repo_path = strdup(cwd);
4318 if (repo_path == NULL) {
4319 error = got_error_from_errno("strdup");
4325 error = got_repo_open(&repo, repo_path, NULL);
4329 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4335 char *p, *worktree_subdir = cwd +
4336 strlen(got_worktree_get_root_path(worktree));
4337 if (asprintf(&p, "%s/%s",
4338 got_worktree_get_path_prefix(worktree),
4339 worktree_subdir) == -1) {
4340 error = got_error_from_errno("asprintf");
4343 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4350 if (in_repo_path == NULL) {
4351 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4356 if (commit_id_str == NULL) {
4357 struct got_reference *head_ref;
4359 refname = got_worktree_get_head_ref_name(worktree);
4361 refname = GOT_REF_HEAD;
4362 error = got_ref_open(&head_ref, repo, refname, 0);
4365 error = got_ref_resolve(&commit_id, repo, head_ref);
4366 got_ref_close(head_ref);
4370 error = got_repo_match_object_id(&commit_id, NULL,
4371 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4376 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4377 in_repo_path, repo);
4384 got_worktree_close(worktree);
4386 const struct got_error *repo_error;
4387 repo_error = got_repo_close(repo);
4397 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4401 static const struct got_error *
4402 print_status(void *arg, unsigned char status, unsigned char staged_status,
4403 const char *path, struct got_object_id *blob_id,
4404 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4405 int dirfd, const char *de_name)
4407 if (status == staged_status && (status == GOT_STATUS_DELETE))
4408 status = GOT_STATUS_NO_CHANGE;
4409 printf("%c%c %s\n", status, staged_status, path);
4413 static const struct got_error *
4414 cmd_status(int argc, char *argv[])
4416 const struct got_error *error = NULL;
4417 struct got_repository *repo = NULL;
4418 struct got_worktree *worktree = NULL;
4420 struct got_pathlist_head paths;
4421 struct got_pathlist_entry *pe;
4426 while ((ch = getopt(argc, argv, "")) != -1) {
4438 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4442 cwd = getcwd(NULL, 0);
4444 error = got_error_from_errno("getcwd");
4448 error = got_worktree_open(&worktree, cwd);
4450 if (error->code == GOT_ERR_NOT_WORKTREE)
4451 error = wrap_not_worktree_error(error, "status", cwd);
4455 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4460 error = apply_unveil(got_repo_get_path(repo), 1,
4461 got_worktree_get_root_path(worktree));
4465 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4469 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4470 check_cancelled, NULL);
4472 TAILQ_FOREACH(pe, &paths, entry)
4473 free((char *)pe->path);
4474 got_pathlist_free(&paths);
4483 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4489 static const struct got_error *
4490 list_refs(struct got_repository *repo, const char *refname)
4492 static const struct got_error *err = NULL;
4493 struct got_reflist_head refs;
4494 struct got_reflist_entry *re;
4496 SIMPLEQ_INIT(&refs);
4497 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4501 SIMPLEQ_FOREACH(re, &refs, entry) {
4503 refstr = got_ref_to_str(re->ref);
4505 return got_error_from_errno("got_ref_to_str");
4506 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4510 got_ref_list_free(&refs);
4514 static const struct got_error *
4515 delete_ref(struct got_repository *repo, const char *refname)
4517 const struct got_error *err = NULL;
4518 struct got_reference *ref;
4520 err = got_ref_open(&ref, repo, refname, 0);
4524 err = got_ref_delete(ref, repo);
4529 static const struct got_error *
4530 add_ref(struct got_repository *repo, const char *refname, const char *target)
4532 const struct got_error *err = NULL;
4533 struct got_object_id *id;
4534 struct got_reference *ref = NULL;
4537 * Don't let the user create a reference name with a leading '-'.
4538 * While technically a valid reference name, this case is usually
4539 * an unintended typo.
4541 if (refname[0] == '-')
4542 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4544 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4547 struct got_reference *target_ref;
4549 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4551 err = got_ref_open(&target_ref, repo, target, 0);
4554 err = got_ref_resolve(&id, repo, target_ref);
4555 got_ref_close(target_ref);
4560 err = got_ref_alloc(&ref, refname, id);
4564 err = got_ref_write(ref, repo);
4572 static const struct got_error *
4573 add_symref(struct got_repository *repo, const char *refname, const char *target)
4575 const struct got_error *err = NULL;
4576 struct got_reference *ref = NULL;
4577 struct got_reference *target_ref = NULL;
4580 * Don't let the user create a reference name with a leading '-'.
4581 * While technically a valid reference name, this case is usually
4582 * an unintended typo.
4584 if (refname[0] == '-')
4585 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4587 err = got_ref_open(&target_ref, repo, target, 0);
4591 err = got_ref_alloc_symref(&ref, refname, target_ref);
4595 err = got_ref_write(ref, repo);
4598 got_ref_close(target_ref);
4604 static const struct got_error *
4605 cmd_ref(int argc, char *argv[])
4607 const struct got_error *error = NULL;
4608 struct got_repository *repo = NULL;
4609 struct got_worktree *worktree = NULL;
4610 char *cwd = NULL, *repo_path = NULL;
4611 int ch, do_list = 0, do_delete = 0;
4612 const char *obj_arg = NULL, *symref_target= NULL;
4613 char *refname = NULL;
4615 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4624 repo_path = realpath(optarg, NULL);
4625 if (repo_path == NULL)
4626 return got_error_from_errno2("realpath",
4628 got_path_strip_trailing_slashes(repo_path);
4634 symref_target = optarg;
4642 if (obj_arg && do_list)
4643 errx(1, "-c and -l options are mutually exclusive");
4644 if (obj_arg && do_delete)
4645 errx(1, "-c and -d options are mutually exclusive");
4646 if (obj_arg && symref_target)
4647 errx(1, "-c and -s options are mutually exclusive");
4648 if (symref_target && do_delete)
4649 errx(1, "-s and -d options are mutually exclusive");
4650 if (symref_target && do_list)
4651 errx(1, "-s and -l options are mutually exclusive");
4652 if (do_delete && do_list)
4653 errx(1, "-d and -l options are mutually exclusive");
4659 if (argc != 0 && argc != 1)
4662 refname = strdup(argv[0]);
4663 if (refname == NULL) {
4664 error = got_error_from_errno("strdup");
4671 refname = strdup(argv[0]);
4672 if (refname == NULL) {
4673 error = got_error_from_errno("strdup");
4679 got_path_strip_trailing_slashes(refname);
4683 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4687 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4688 "sendfd unveil", NULL) == -1)
4692 cwd = getcwd(NULL, 0);
4694 error = got_error_from_errno("getcwd");
4698 if (repo_path == NULL) {
4699 error = got_worktree_open(&worktree, cwd);
4700 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4706 strdup(got_worktree_get_repo_path(worktree));
4707 if (repo_path == NULL)
4708 error = got_error_from_errno("strdup");
4712 repo_path = strdup(cwd);
4713 if (repo_path == NULL) {
4714 error = got_error_from_errno("strdup");
4720 error = got_repo_open(&repo, repo_path, NULL);
4724 error = apply_unveil(got_repo_get_path(repo), do_list,
4725 worktree ? got_worktree_get_root_path(worktree) : NULL);
4730 error = list_refs(repo, refname);
4732 error = delete_ref(repo, refname);
4733 else if (symref_target)
4734 error = add_symref(repo, refname, symref_target);
4736 if (obj_arg == NULL)
4738 error = add_ref(repo, refname, obj_arg);
4743 got_repo_close(repo);
4745 got_worktree_close(worktree);
4755 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4756 "[name]\n", getprogname());
4760 static const struct got_error *
4761 list_branch(struct got_repository *repo, struct got_worktree *worktree,
4762 struct got_reference *ref)
4764 const struct got_error *err = NULL;
4765 const char *refname, *marker = " ";
4768 refname = got_ref_get_name(ref);
4769 if (worktree && strcmp(refname,
4770 got_worktree_get_head_ref_name(worktree)) == 0) {
4771 struct got_object_id *id = NULL;
4773 err = got_ref_resolve(&id, repo, ref);
4776 if (got_object_id_cmp(id,
4777 got_worktree_get_base_commit_id(worktree)) == 0)
4784 if (strncmp(refname, "refs/heads/", 11) == 0)
4786 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4789 refstr = got_ref_to_str(ref);
4791 return got_error_from_errno("got_ref_to_str");
4793 printf("%s%s: %s\n", marker, refname, refstr);
4798 static const struct got_error *
4799 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4801 const char *refname;
4803 if (worktree == NULL)
4804 return got_error(GOT_ERR_NOT_WORKTREE);
4806 refname = got_worktree_get_head_ref_name(worktree);
4808 if (strncmp(refname, "refs/heads/", 11) == 0)
4810 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4813 printf("%s\n", refname);
4818 static const struct got_error *
4819 list_branches(struct got_repository *repo, struct got_worktree *worktree)
4821 static const struct got_error *err = NULL;
4822 struct got_reflist_head refs;
4823 struct got_reflist_entry *re;
4824 struct got_reference *temp_ref = NULL;
4825 int rebase_in_progress, histedit_in_progress;
4827 SIMPLEQ_INIT(&refs);
4830 err = got_worktree_rebase_in_progress(&rebase_in_progress,
4835 err = got_worktree_histedit_in_progress(&histedit_in_progress,
4840 if (rebase_in_progress || histedit_in_progress) {
4841 err = got_ref_open(&temp_ref, repo,
4842 got_worktree_get_head_ref_name(worktree), 0);
4845 list_branch(repo, worktree, temp_ref);
4846 got_ref_close(temp_ref);
4850 err = got_ref_list(&refs, repo, "refs/heads",
4851 got_ref_cmp_by_name, NULL);
4855 SIMPLEQ_FOREACH(re, &refs, entry)
4856 list_branch(repo, worktree, re->ref);
4858 got_ref_list_free(&refs);
4862 static const struct got_error *
4863 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
4864 const char *branch_name)
4866 const struct got_error *err = NULL;
4867 struct got_reference *ref = NULL;
4870 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
4871 return got_error_from_errno("asprintf");
4873 err = got_ref_open(&ref, repo, refname, 0);
4878 strcmp(got_worktree_get_head_ref_name(worktree),
4879 got_ref_get_name(ref)) == 0) {
4880 err = got_error_msg(GOT_ERR_SAME_BRANCH,
4881 "will not delete this work tree's current branch");
4885 err = got_ref_delete(ref, repo);
4893 static const struct got_error *
4894 add_branch(struct got_repository *repo, const char *branch_name,
4895 struct got_object_id *base_commit_id)
4897 const struct got_error *err = NULL;
4898 struct got_reference *ref = NULL;
4899 char *base_refname = NULL, *refname = NULL;
4902 * Don't let the user create a branch name with a leading '-'.
4903 * While technically a valid reference name, this case is usually
4904 * an unintended typo.
4906 if (branch_name[0] == '-')
4907 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
4909 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
4910 err = got_error_from_errno("asprintf");
4914 err = got_ref_open(&ref, repo, refname, 0);
4916 err = got_error(GOT_ERR_BRANCH_EXISTS);
4918 } else if (err->code != GOT_ERR_NOT_REF)
4921 err = got_ref_alloc(&ref, refname, base_commit_id);
4925 err = got_ref_write(ref, repo);
4934 static const struct got_error *
4935 cmd_branch(int argc, char *argv[])
4937 const struct got_error *error = NULL;
4938 struct got_repository *repo = NULL;
4939 struct got_worktree *worktree = NULL;
4940 char *cwd = NULL, *repo_path = NULL;
4941 int ch, do_list = 0, do_show = 0, do_update = 1;
4942 const char *delref = NULL, *commit_id_arg = NULL;
4943 struct got_reference *ref = NULL;
4944 struct got_pathlist_head paths;
4945 struct got_pathlist_entry *pe;
4946 struct got_object_id *commit_id = NULL;
4947 char *commit_id_str = NULL;
4951 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
4954 commit_id_arg = optarg;
4960 repo_path = realpath(optarg, NULL);
4961 if (repo_path == NULL)
4962 return got_error_from_errno2("realpath",
4964 got_path_strip_trailing_slashes(repo_path);
4978 if (do_list && delref)
4979 errx(1, "-l and -d options are mutually exclusive");
4984 if (!do_list && !delref && argc == 0)
4987 if ((do_list || delref || do_show) && commit_id_arg != NULL)
4988 errx(1, "-c option can only be used when creating a branch");
4990 if (do_list || delref) {
4993 } else if (!do_show && argc != 1)
4997 if (do_list || do_show) {
4998 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5002 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5003 "sendfd unveil", NULL) == -1)
5007 cwd = getcwd(NULL, 0);
5009 error = got_error_from_errno("getcwd");
5013 if (repo_path == NULL) {
5014 error = got_worktree_open(&worktree, cwd);
5015 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5021 strdup(got_worktree_get_repo_path(worktree));
5022 if (repo_path == NULL)
5023 error = got_error_from_errno("strdup");
5027 repo_path = strdup(cwd);
5028 if (repo_path == NULL) {
5029 error = got_error_from_errno("strdup");
5035 error = got_repo_open(&repo, repo_path, NULL);
5039 error = apply_unveil(got_repo_get_path(repo), do_list,
5040 worktree ? got_worktree_get_root_path(worktree) : NULL);
5045 error = show_current_branch(repo, worktree);
5047 error = list_branches(repo, worktree);
5049 error = delete_branch(repo, worktree, delref);
5051 if (commit_id_arg == NULL)
5052 commit_id_arg = worktree ?
5053 got_worktree_get_head_ref_name(worktree) :
5055 error = got_repo_match_object_id(&commit_id, NULL,
5056 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5059 error = add_branch(repo, argv[0], commit_id);
5062 if (worktree && do_update) {
5063 struct got_update_progress_arg upa;
5064 char *branch_refname = NULL;
5066 error = got_object_id_str(&commit_id_str, commit_id);
5069 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5073 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5075 error = got_error_from_errno("asprintf");
5078 error = got_ref_open(&ref, repo, branch_refname, 0);
5079 free(branch_refname);
5082 error = switch_head_ref(ref, commit_id, worktree,
5086 error = got_worktree_set_base_commit_id(worktree, repo,
5090 memset(&upa, 0, sizeof(upa));
5091 error = got_worktree_checkout_files(worktree, &paths,
5092 repo, update_progress, &upa, check_cancelled,
5096 if (upa.did_something)
5097 printf("Updated to commit %s\n", commit_id_str);
5098 print_update_progress_stats(&upa);
5105 got_repo_close(repo);
5107 got_worktree_close(worktree);
5111 free(commit_id_str);
5112 TAILQ_FOREACH(pe, &paths, entry)
5113 free((char *)pe->path);
5114 got_pathlist_free(&paths);
5123 "usage: %s tag [-c commit] [-r repository] [-l] "
5124 "[-m message] name\n", getprogname());
5129 static const struct got_error *
5130 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5132 const struct got_error *err = NULL;
5133 struct got_reflist_entry *re, *se, *new;
5134 struct got_object_id *re_id, *se_id;
5135 struct got_tag_object *re_tag, *se_tag;
5136 time_t re_time, se_time;
5138 SIMPLEQ_FOREACH(re, tags, entry) {
5139 se = SIMPLEQ_FIRST(sorted);
5141 err = got_reflist_entry_dup(&new, re);
5144 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5147 err = got_ref_resolve(&re_id, repo, re->ref);
5150 err = got_object_open_as_tag(&re_tag, repo, re_id);
5154 re_time = got_object_tag_get_tagger_time(re_tag);
5155 got_object_tag_close(re_tag);
5159 err = got_ref_resolve(&se_id, repo, re->ref);
5162 err = got_object_open_as_tag(&se_tag, repo, se_id);
5166 se_time = got_object_tag_get_tagger_time(se_tag);
5167 got_object_tag_close(se_tag);
5169 if (se_time > re_time) {
5170 err = got_reflist_entry_dup(&new, re);
5173 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5176 se = SIMPLEQ_NEXT(se, entry);
5185 static const struct got_error *
5186 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5188 static const struct got_error *err = NULL;
5189 struct got_reflist_head refs;
5190 struct got_reflist_entry *re;
5192 SIMPLEQ_INIT(&refs);
5194 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5198 SIMPLEQ_FOREACH(re, &refs, entry) {
5199 const char *refname;
5200 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5204 struct got_object_id *id;
5205 struct got_tag_object *tag;
5206 struct got_commit_object *commit = NULL;
5208 refname = got_ref_get_name(re->ref);
5209 if (strncmp(refname, "refs/tags/", 10) != 0)
5212 refstr = got_ref_to_str(re->ref);
5213 if (refstr == NULL) {
5214 err = got_error_from_errno("got_ref_to_str");
5217 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5220 err = got_ref_resolve(&id, repo, re->ref);
5223 err = got_object_open_as_tag(&tag, repo, id);
5225 if (err->code != GOT_ERR_OBJ_TYPE) {
5229 /* "lightweight" tag */
5230 err = got_object_open_as_commit(&commit, repo, id);
5235 tagger = got_object_commit_get_committer(commit);
5237 got_object_commit_get_committer_time(commit);
5238 err = got_object_id_str(&id_str, id);
5244 tagger = got_object_tag_get_tagger(tag);
5245 tagger_time = got_object_tag_get_tagger_time(tag);
5246 err = got_object_id_str(&id_str,
5247 got_object_tag_get_object_id(tag));
5251 printf("from: %s\n", tagger);
5252 datestr = get_datestr(&tagger_time, datebuf);
5254 printf("date: %s UTC\n", datestr);
5256 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5258 switch (got_object_tag_get_object_type(tag)) {
5259 case GOT_OBJ_TYPE_BLOB:
5260 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5263 case GOT_OBJ_TYPE_TREE:
5264 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5267 case GOT_OBJ_TYPE_COMMIT:
5268 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5271 case GOT_OBJ_TYPE_TAG:
5272 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5281 err = got_object_commit_get_logmsg(&tagmsg0, commit);
5284 got_object_commit_close(commit);
5286 tagmsg0 = strdup(got_object_tag_get_message(tag));
5287 got_object_tag_close(tag);
5288 if (tagmsg0 == NULL) {
5289 err = got_error_from_errno("strdup");
5296 line = strsep(&tagmsg, "\n");
5298 printf(" %s\n", line);
5303 got_ref_list_free(&refs);
5307 static const struct got_error *
5308 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5309 const char *tag_name, const char *repo_path)
5311 const struct got_error *err = NULL;
5312 char *template = NULL, *initial_content = NULL;
5313 char *editor = NULL;
5316 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5317 err = got_error_from_errno("asprintf");
5321 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5322 commit_id_str, tag_name) == -1) {
5323 err = got_error_from_errno("asprintf");
5327 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5331 dprintf(fd, initial_content);
5334 err = get_editor(&editor);
5337 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5339 free(initial_content);
5343 /* Editor is done; we can now apply unveil(2) */
5345 err = apply_unveil(repo_path, 0, NULL);
5354 static const struct got_error *
5355 add_tag(struct got_repository *repo, const char *tag_name,
5356 const char *commit_arg, const char *tagmsg_arg)
5358 const struct got_error *err = NULL;
5359 struct got_object_id *commit_id = NULL, *tag_id = NULL;
5360 char *label = NULL, *commit_id_str = NULL;
5361 struct got_reference *ref = NULL;
5362 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5363 char *tagmsg_path = NULL, *tag_id_str = NULL;
5364 int preserve_tagmsg = 0;
5367 * Don't let the user create a tag name with a leading '-'.
5368 * While technically a valid reference name, this case is usually
5369 * an unintended typo.
5371 if (tag_name[0] == '-')
5372 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5374 err = get_author(&tagger, repo);
5378 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5379 GOT_OBJ_TYPE_COMMIT, 1, repo);
5383 err = got_object_id_str(&commit_id_str, commit_id);
5387 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5388 refname = strdup(tag_name);
5389 if (refname == NULL) {
5390 err = got_error_from_errno("strdup");
5394 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5395 err = got_error_from_errno("asprintf");
5399 err = got_ref_open(&ref, repo, refname, 0);
5401 err = got_error(GOT_ERR_TAG_EXISTS);
5403 } else if (err->code != GOT_ERR_NOT_REF)
5406 if (tagmsg_arg == NULL) {
5407 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5408 tag_name, got_repo_get_path(repo));
5410 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5411 tagmsg_path != NULL)
5412 preserve_tagmsg = 1;
5417 err = got_object_tag_create(&tag_id, tag_name, commit_id,
5418 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5421 preserve_tagmsg = 1;
5425 err = got_ref_alloc(&ref, refname, tag_id);
5428 preserve_tagmsg = 1;
5432 err = got_ref_write(ref, repo);
5435 preserve_tagmsg = 1;
5439 err = got_object_id_str(&tag_id_str, tag_id);
5442 preserve_tagmsg = 1;
5445 printf("Created tag %s\n", tag_id_str);
5447 if (preserve_tagmsg) {
5448 fprintf(stderr, "%s: tag message preserved in %s\n",
5449 getprogname(), tagmsg_path);
5450 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5451 err = got_error_from_errno2("unlink", tagmsg_path);
5456 free(commit_id_str);
5464 static const struct got_error *
5465 cmd_tag(int argc, char *argv[])
5467 const struct got_error *error = NULL;
5468 struct got_repository *repo = NULL;
5469 struct got_worktree *worktree = NULL;
5470 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5471 char *gitconfig_path = NULL;
5472 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5473 int ch, do_list = 0;
5475 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5478 commit_id_arg = optarg;
5484 repo_path = realpath(optarg, NULL);
5485 if (repo_path == NULL)
5486 return got_error_from_errno2("realpath",
5488 got_path_strip_trailing_slashes(repo_path);
5503 if (commit_id_arg != NULL)
5505 "-c option can only be used when creating a tag");
5507 errx(1, "-l and -m options are mutually exclusive");
5510 } else if (argc != 1)
5517 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5521 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5522 "sendfd unveil", NULL) == -1)
5526 cwd = getcwd(NULL, 0);
5528 error = got_error_from_errno("getcwd");
5532 if (repo_path == NULL) {
5533 error = got_worktree_open(&worktree, cwd);
5534 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5540 strdup(got_worktree_get_repo_path(worktree));
5541 if (repo_path == NULL)
5542 error = got_error_from_errno("strdup");
5546 repo_path = strdup(cwd);
5547 if (repo_path == NULL) {
5548 error = got_error_from_errno("strdup");
5555 error = got_repo_open(&repo, repo_path, NULL);
5558 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5561 error = list_tags(repo, worktree);
5563 error = get_gitconfig_path(&gitconfig_path);
5566 error = got_repo_open(&repo, repo_path, gitconfig_path);
5571 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5576 if (commit_id_arg == NULL) {
5577 struct got_reference *head_ref;
5578 struct got_object_id *commit_id;
5579 error = got_ref_open(&head_ref, repo,
5580 worktree ? got_worktree_get_head_ref_name(worktree)
5584 error = got_ref_resolve(&commit_id, repo, head_ref);
5585 got_ref_close(head_ref);
5588 error = got_object_id_str(&commit_id_str, commit_id);
5594 error = add_tag(repo, tag_name,
5595 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5599 got_repo_close(repo);
5601 got_worktree_close(worktree);
5604 free(gitconfig_path);
5605 free(commit_id_str);
5612 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5617 static const struct got_error *
5618 add_progress(void *arg, unsigned char status, const char *path)
5620 while (path[0] == '/')
5622 printf("%c %s\n", status, path);
5626 static const struct got_error *
5627 cmd_add(int argc, char *argv[])
5629 const struct got_error *error = NULL;
5630 struct got_repository *repo = NULL;
5631 struct got_worktree *worktree = NULL;
5633 struct got_pathlist_head paths;
5634 struct got_pathlist_entry *pe;
5635 int ch, can_recurse = 0, no_ignores = 0;
5639 while ((ch = getopt(argc, argv, "IR")) != -1) {
5657 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5664 cwd = getcwd(NULL, 0);
5666 error = got_error_from_errno("getcwd");
5670 error = got_worktree_open(&worktree, cwd);
5672 if (error->code == GOT_ERR_NOT_WORKTREE)
5673 error = wrap_not_worktree_error(error, "add", cwd);
5677 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5682 error = apply_unveil(got_repo_get_path(repo), 1,
5683 got_worktree_get_root_path(worktree));
5687 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5691 if (!can_recurse && no_ignores) {
5692 error = got_error_msg(GOT_ERR_BAD_PATH,
5693 "disregarding ignores requires -R option");
5701 TAILQ_FOREACH(pe, &paths, entry) {
5702 if (asprintf(&ondisk_path, "%s/%s",
5703 got_worktree_get_root_path(worktree),
5705 error = got_error_from_errno("asprintf");
5708 if (lstat(ondisk_path, &sb) == -1) {
5709 if (errno == ENOENT) {
5713 error = got_error_from_errno2("lstat",
5719 if (S_ISDIR(sb.st_mode)) {
5720 error = got_error_msg(GOT_ERR_BAD_PATH,
5721 "adding directories requires -R option");
5727 error = got_worktree_schedule_add(worktree, &paths, add_progress,
5728 NULL, repo, no_ignores);
5731 got_repo_close(repo);
5733 got_worktree_close(worktree);
5734 TAILQ_FOREACH(pe, &paths, entry)
5735 free((char *)pe->path);
5736 got_pathlist_free(&paths);
5744 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5749 static const struct got_error *
5750 print_remove_status(void *arg, unsigned char status,
5751 unsigned char staged_status, const char *path)
5753 while (path[0] == '/')
5755 if (status == GOT_STATUS_NONEXISTENT)
5757 if (status == staged_status && (status == GOT_STATUS_DELETE))
5758 status = GOT_STATUS_NO_CHANGE;
5759 printf("%c%c %s\n", status, staged_status, path);
5763 static const struct got_error *
5764 cmd_remove(int argc, char *argv[])
5766 const struct got_error *error = NULL;
5767 struct got_worktree *worktree = NULL;
5768 struct got_repository *repo = NULL;
5770 struct got_pathlist_head paths;
5771 struct got_pathlist_entry *pe;
5772 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5776 while ((ch = getopt(argc, argv, "fkR")) != -1) {
5779 delete_local_mods = 1;
5797 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5804 cwd = getcwd(NULL, 0);
5806 error = got_error_from_errno("getcwd");
5809 error = got_worktree_open(&worktree, cwd);
5811 if (error->code == GOT_ERR_NOT_WORKTREE)
5812 error = wrap_not_worktree_error(error, "remove", cwd);
5816 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5821 error = apply_unveil(got_repo_get_path(repo), 1,
5822 got_worktree_get_root_path(worktree));
5826 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5833 TAILQ_FOREACH(pe, &paths, entry) {
5834 if (asprintf(&ondisk_path, "%s/%s",
5835 got_worktree_get_root_path(worktree),
5837 error = got_error_from_errno("asprintf");
5840 if (lstat(ondisk_path, &sb) == -1) {
5841 if (errno == ENOENT) {
5845 error = got_error_from_errno2("lstat",
5851 if (S_ISDIR(sb.st_mode)) {
5852 error = got_error_msg(GOT_ERR_BAD_PATH,
5853 "removing directories requires -R option");
5859 error = got_worktree_schedule_delete(worktree, &paths,
5860 delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
5863 got_repo_close(repo);
5865 got_worktree_close(worktree);
5866 TAILQ_FOREACH(pe, &paths, entry)
5867 free((char *)pe->path);
5868 got_pathlist_free(&paths);
5876 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
5877 "path ...\n", getprogname());
5881 static const struct got_error *
5882 revert_progress(void *arg, unsigned char status, const char *path)
5884 if (status == GOT_STATUS_UNVERSIONED)
5887 while (path[0] == '/')
5889 printf("%c %s\n", status, path);
5893 struct choose_patch_arg {
5894 FILE *patch_script_file;
5898 static const struct got_error *
5899 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
5900 int nchanges, const char *action)
5903 size_t linesize = 0;
5907 case GOT_STATUS_ADD:
5908 printf("A %s\n%s this addition? [y/n] ", path, action);
5910 case GOT_STATUS_DELETE:
5911 printf("D %s\n%s this deletion? [y/n] ", path, action);
5913 case GOT_STATUS_MODIFY:
5914 if (fseek(patch_file, 0L, SEEK_SET) == -1)
5915 return got_error_from_errno("fseek");
5916 printf(GOT_COMMIT_SEP_STR);
5917 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
5919 if (ferror(patch_file))
5920 return got_error_from_errno("getline");
5921 printf(GOT_COMMIT_SEP_STR);
5922 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
5923 path, n, nchanges, action);
5926 return got_error_path(path, GOT_ERR_FILE_STATUS);
5932 static const struct got_error *
5933 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
5934 FILE *patch_file, int n, int nchanges)
5936 const struct got_error *err = NULL;
5938 size_t linesize = 0;
5941 struct choose_patch_arg *a = arg;
5943 *choice = GOT_PATCH_CHOICE_NONE;
5945 if (a->patch_script_file) {
5947 err = show_change(status, path, patch_file, n, nchanges,
5951 linelen = getline(&line, &linesize, a->patch_script_file);
5952 if (linelen == -1) {
5953 if (ferror(a->patch_script_file))
5954 return got_error_from_errno("getline");
5957 nl = strchr(line, '\n');
5960 if (strcmp(line, "y") == 0) {
5961 *choice = GOT_PATCH_CHOICE_YES;
5963 } else if (strcmp(line, "n") == 0) {
5964 *choice = GOT_PATCH_CHOICE_NO;
5966 } else if (strcmp(line, "q") == 0 &&
5967 status == GOT_STATUS_MODIFY) {
5968 *choice = GOT_PATCH_CHOICE_QUIT;
5971 printf("invalid response '%s'\n", line);
5976 while (resp != 'y' && resp != 'n' && resp != 'q') {
5977 err = show_change(status, path, patch_file, n, nchanges,
5984 if (status == GOT_STATUS_MODIFY) {
5985 if (resp != 'y' && resp != 'n' && resp != 'q') {
5986 printf("invalid response '%c'\n", resp);
5989 } else if (resp != 'y' && resp != 'n') {
5990 printf("invalid response '%c'\n", resp);
5996 *choice = GOT_PATCH_CHOICE_YES;
5997 else if (resp == 'n')
5998 *choice = GOT_PATCH_CHOICE_NO;
5999 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6000 *choice = GOT_PATCH_CHOICE_QUIT;
6006 static const struct got_error *
6007 cmd_revert(int argc, char *argv[])
6009 const struct got_error *error = NULL;
6010 struct got_worktree *worktree = NULL;
6011 struct got_repository *repo = NULL;
6012 char *cwd = NULL, *path = NULL;
6013 struct got_pathlist_head paths;
6014 struct got_pathlist_entry *pe;
6015 int ch, can_recurse = 0, pflag = 0;
6016 FILE *patch_script_file = NULL;
6017 const char *patch_script_path = NULL;
6018 struct choose_patch_arg cpa;
6022 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6028 patch_script_path = optarg;
6043 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6044 "unveil", NULL) == -1)
6049 if (patch_script_path && !pflag)
6050 errx(1, "-F option can only be used together with -p option");
6052 cwd = getcwd(NULL, 0);
6054 error = got_error_from_errno("getcwd");
6057 error = got_worktree_open(&worktree, cwd);
6059 if (error->code == GOT_ERR_NOT_WORKTREE)
6060 error = wrap_not_worktree_error(error, "revert", cwd);
6064 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6069 if (patch_script_path) {
6070 patch_script_file = fopen(patch_script_path, "r");
6071 if (patch_script_file == NULL) {
6072 error = got_error_from_errno2("fopen",
6077 error = apply_unveil(got_repo_get_path(repo), 1,
6078 got_worktree_get_root_path(worktree));
6082 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6089 TAILQ_FOREACH(pe, &paths, entry) {
6090 if (asprintf(&ondisk_path, "%s/%s",
6091 got_worktree_get_root_path(worktree),
6093 error = got_error_from_errno("asprintf");
6096 if (lstat(ondisk_path, &sb) == -1) {
6097 if (errno == ENOENT) {
6101 error = got_error_from_errno2("lstat",
6107 if (S_ISDIR(sb.st_mode)) {
6108 error = got_error_msg(GOT_ERR_BAD_PATH,
6109 "reverting directories requires -R option");
6115 cpa.patch_script_file = patch_script_file;
6116 cpa.action = "revert";
6117 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6118 pflag ? choose_patch : NULL, &cpa, repo);
6120 if (patch_script_file && fclose(patch_script_file) == EOF &&
6122 error = got_error_from_errno2("fclose", patch_script_path);
6124 got_repo_close(repo);
6126 got_worktree_close(worktree);
6135 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6140 struct collect_commit_logmsg_arg {
6141 const char *cmdline_log;
6143 const char *worktree_path;
6144 const char *branch_name;
6145 const char *repo_path;
6150 static const struct got_error *
6151 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6154 char *initial_content = NULL;
6155 struct got_pathlist_entry *pe;
6156 const struct got_error *err = NULL;
6157 char *template = NULL;
6158 struct collect_commit_logmsg_arg *a = arg;
6162 /* if a message was specified on the command line, just use it */
6163 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6164 len = strlen(a->cmdline_log) + 1;
6165 *logmsg = malloc(len + 1);
6166 if (*logmsg == NULL)
6167 return got_error_from_errno("malloc");
6168 strlcpy(*logmsg, a->cmdline_log, len);
6172 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6173 return got_error_from_errno("asprintf");
6175 if (asprintf(&initial_content,
6176 "\n# changes to be committed on branch %s:\n",
6177 a->branch_name) == -1)
6178 return got_error_from_errno("asprintf");
6180 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6184 dprintf(fd, initial_content);
6186 TAILQ_FOREACH(pe, commitable_paths, entry) {
6187 struct got_commitable *ct = pe->data;
6188 dprintf(fd, "# %c %s\n",
6189 got_commitable_get_status(ct),
6190 got_commitable_get_path(ct));
6194 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6196 free(initial_content);
6199 /* Editor is done; we can now apply unveil(2) */
6201 err = apply_unveil(a->repo_path, 0, a->worktree_path);
6210 static const struct got_error *
6211 cmd_commit(int argc, char *argv[])
6213 const struct got_error *error = NULL;
6214 struct got_worktree *worktree = NULL;
6215 struct got_repository *repo = NULL;
6216 char *cwd = NULL, *id_str = NULL;
6217 struct got_object_id *id = NULL;
6218 const char *logmsg = NULL;
6219 struct collect_commit_logmsg_arg cl_arg;
6220 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6221 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6222 struct got_pathlist_head paths;
6225 cl_arg.logmsg_path = NULL;
6227 while ((ch = getopt(argc, argv, "m:")) != -1) {
6242 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6243 "unveil", NULL) == -1)
6246 cwd = getcwd(NULL, 0);
6248 error = got_error_from_errno("getcwd");
6251 error = got_worktree_open(&worktree, cwd);
6253 if (error->code == GOT_ERR_NOT_WORKTREE)
6254 error = wrap_not_worktree_error(error, "commit", cwd);
6258 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6261 if (rebase_in_progress) {
6262 error = got_error(GOT_ERR_REBASING);
6266 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6271 error = get_gitconfig_path(&gitconfig_path);
6274 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6279 error = get_author(&author, repo);
6284 * unveil(2) traverses exec(2); if an editor is used we have
6285 * to apply unveil after the log message has been written.
6287 if (logmsg == NULL || strlen(logmsg) == 0)
6288 error = get_editor(&editor);
6290 error = apply_unveil(got_repo_get_path(repo), 0,
6291 got_worktree_get_root_path(worktree));
6295 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6299 cl_arg.editor = editor;
6300 cl_arg.cmdline_log = logmsg;
6301 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6302 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6303 if (!histedit_in_progress) {
6304 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6305 error = got_error(GOT_ERR_COMMIT_BRANCH);
6308 cl_arg.branch_name += 11;
6310 cl_arg.repo_path = got_repo_get_path(repo);
6311 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6312 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6314 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6315 cl_arg.logmsg_path != NULL)
6316 preserve_logmsg = 1;
6320 error = got_object_id_str(&id_str, id);
6323 printf("Created commit %s\n", id_str);
6325 if (preserve_logmsg) {
6326 fprintf(stderr, "%s: log message preserved in %s\n",
6327 getprogname(), cl_arg.logmsg_path);
6328 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6330 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6331 free(cl_arg.logmsg_path);
6333 got_repo_close(repo);
6335 got_worktree_close(worktree);
6338 free(gitconfig_path);
6345 usage_cherrypick(void)
6347 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6351 static const struct got_error *
6352 cmd_cherrypick(int argc, char *argv[])
6354 const struct got_error *error = NULL;
6355 struct got_worktree *worktree = NULL;
6356 struct got_repository *repo = NULL;
6357 char *cwd = NULL, *commit_id_str = NULL;
6358 struct got_object_id *commit_id = NULL;
6359 struct got_commit_object *commit = NULL;
6360 struct got_object_qid *pid;
6361 struct got_reference *head_ref = NULL;
6363 struct got_update_progress_arg upa;
6365 while ((ch = getopt(argc, argv, "")) != -1) {
6377 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6378 "unveil", NULL) == -1)
6384 cwd = getcwd(NULL, 0);
6386 error = got_error_from_errno("getcwd");
6389 error = got_worktree_open(&worktree, cwd);
6391 if (error->code == GOT_ERR_NOT_WORKTREE)
6392 error = wrap_not_worktree_error(error, "cherrypick",
6397 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6402 error = apply_unveil(got_repo_get_path(repo), 0,
6403 got_worktree_get_root_path(worktree));
6407 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6408 GOT_OBJ_TYPE_COMMIT, repo);
6409 if (error != NULL) {
6410 struct got_reference *ref;
6411 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6413 error = got_ref_open(&ref, repo, argv[0], 0);
6416 error = got_ref_resolve(&commit_id, repo, ref);
6421 error = got_object_id_str(&commit_id_str, commit_id);
6425 error = got_ref_open(&head_ref, repo,
6426 got_worktree_get_head_ref_name(worktree), 0);
6430 error = check_same_branch(commit_id, head_ref, NULL, repo);
6432 if (error->code != GOT_ERR_ANCESTRY)
6436 error = got_error(GOT_ERR_SAME_BRANCH);
6440 error = got_object_open_as_commit(&commit, repo, commit_id);
6443 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6444 memset(&upa, 0, sizeof(upa));
6445 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6446 commit_id, repo, update_progress, &upa, check_cancelled,
6451 if (upa.did_something)
6452 printf("Merged commit %s\n", commit_id_str);
6453 print_update_progress_stats(&upa);
6456 got_object_commit_close(commit);
6457 free(commit_id_str);
6459 got_ref_close(head_ref);
6461 got_worktree_close(worktree);
6463 got_repo_close(repo);
6470 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6474 static const struct got_error *
6475 cmd_backout(int argc, char *argv[])
6477 const struct got_error *error = NULL;
6478 struct got_worktree *worktree = NULL;
6479 struct got_repository *repo = NULL;
6480 char *cwd = NULL, *commit_id_str = NULL;
6481 struct got_object_id *commit_id = NULL;
6482 struct got_commit_object *commit = NULL;
6483 struct got_object_qid *pid;
6484 struct got_reference *head_ref = NULL;
6486 struct got_update_progress_arg upa;
6488 while ((ch = getopt(argc, argv, "")) != -1) {
6500 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6501 "unveil", NULL) == -1)
6507 cwd = getcwd(NULL, 0);
6509 error = got_error_from_errno("getcwd");
6512 error = got_worktree_open(&worktree, cwd);
6514 if (error->code == GOT_ERR_NOT_WORKTREE)
6515 error = wrap_not_worktree_error(error, "backout", cwd);
6519 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6524 error = apply_unveil(got_repo_get_path(repo), 0,
6525 got_worktree_get_root_path(worktree));
6529 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6530 GOT_OBJ_TYPE_COMMIT, repo);
6531 if (error != NULL) {
6532 struct got_reference *ref;
6533 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6535 error = got_ref_open(&ref, repo, argv[0], 0);
6538 error = got_ref_resolve(&commit_id, repo, ref);
6543 error = got_object_id_str(&commit_id_str, commit_id);
6547 error = got_ref_open(&head_ref, repo,
6548 got_worktree_get_head_ref_name(worktree), 0);
6552 error = check_same_branch(commit_id, head_ref, NULL, repo);
6556 error = got_object_open_as_commit(&commit, repo, commit_id);
6559 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6561 error = got_error(GOT_ERR_ROOT_COMMIT);
6565 memset(&upa, 0, sizeof(upa));
6566 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6567 update_progress, &upa, check_cancelled, NULL);
6571 if (upa.did_something)
6572 printf("Backed out commit %s\n", commit_id_str);
6573 print_update_progress_stats(&upa);
6576 got_object_commit_close(commit);
6577 free(commit_id_str);
6579 got_ref_close(head_ref);
6581 got_worktree_close(worktree);
6583 got_repo_close(repo);
6590 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6596 trim_logmsg(char *logmsg, int limit)
6601 len = strlen(logmsg);
6605 nl = strchr(logmsg, '\n');
6610 static const struct got_error *
6611 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6613 const struct got_error *err;
6614 char *logmsg0 = NULL;
6617 err = got_object_commit_get_logmsg(&logmsg0, commit);
6622 while (isspace((unsigned char)s[0]))
6625 *logmsg = strdup(s);
6626 if (*logmsg == NULL) {
6627 err = got_error_from_errno("strdup");
6631 trim_logmsg(*logmsg, limit);
6637 static const struct got_error *
6638 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6640 const struct got_error *err;
6641 struct got_commit_object *commit = NULL;
6642 char *id_str = NULL, *logmsg = NULL;
6644 err = got_object_open_as_commit(&commit, repo, id);
6648 err = got_object_id_str(&id_str, id);
6654 err = get_short_logmsg(&logmsg, 42, commit);
6658 printf("%s -> merge conflict: %s\n", id_str, logmsg);
6661 got_object_commit_close(commit);
6666 static const struct got_error *
6667 show_rebase_progress(struct got_commit_object *commit,
6668 struct got_object_id *old_id, struct got_object_id *new_id)
6670 const struct got_error *err;
6671 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6673 err = got_object_id_str(&old_id_str, old_id);
6678 err = got_object_id_str(&new_id_str, new_id);
6683 old_id_str[12] = '\0';
6685 new_id_str[12] = '\0';
6687 err = get_short_logmsg(&logmsg, 42, commit);
6691 printf("%s -> %s: %s\n", old_id_str,
6692 new_id_str ? new_id_str : "no-op change", logmsg);
6700 static const struct got_error *
6701 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6702 struct got_reference *branch, struct got_reference *new_base_branch,
6703 struct got_reference *tmp_branch, struct got_repository *repo)
6705 printf("Switching work tree to %s\n", got_ref_get_name(branch));
6706 return got_worktree_rebase_complete(worktree, fileindex,
6707 new_base_branch, tmp_branch, branch, repo);
6710 static const struct got_error *
6711 rebase_commit(struct got_pathlist_head *merged_paths,
6712 struct got_worktree *worktree, struct got_fileindex *fileindex,
6713 struct got_reference *tmp_branch,
6714 struct got_object_id *commit_id, struct got_repository *repo)
6716 const struct got_error *error;
6717 struct got_commit_object *commit;
6718 struct got_object_id *new_commit_id;
6720 error = got_object_open_as_commit(&commit, repo, commit_id);
6724 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6725 worktree, fileindex, tmp_branch, commit, commit_id, repo);
6727 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6729 error = show_rebase_progress(commit, commit_id, NULL);
6731 error = show_rebase_progress(commit, commit_id, new_commit_id);
6732 free(new_commit_id);
6735 got_object_commit_close(commit);
6739 struct check_path_prefix_arg {
6740 const char *path_prefix;
6745 static const struct got_error *
6746 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6747 struct got_blob_object *blob2, struct got_object_id *id1,
6748 struct got_object_id *id2, const char *path1, const char *path2,
6749 mode_t mode1, mode_t mode2, struct got_repository *repo)
6751 struct check_path_prefix_arg *a = arg;
6753 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6754 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6755 return got_error(a->errcode);
6760 static const struct got_error *
6761 check_path_prefix(struct got_object_id *parent_id,
6762 struct got_object_id *commit_id, const char *path_prefix,
6763 int errcode, struct got_repository *repo)
6765 const struct got_error *err;
6766 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6767 struct got_commit_object *commit = NULL, *parent_commit = NULL;
6768 struct check_path_prefix_arg cpp_arg;
6770 if (got_path_is_root_dir(path_prefix))
6773 err = got_object_open_as_commit(&commit, repo, commit_id);
6777 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6781 err = got_object_open_as_tree(&tree1, repo,
6782 got_object_commit_get_tree_id(parent_commit));
6786 err = got_object_open_as_tree(&tree2, repo,
6787 got_object_commit_get_tree_id(commit));
6791 cpp_arg.path_prefix = path_prefix;
6792 while (cpp_arg.path_prefix[0] == '/')
6793 cpp_arg.path_prefix++;
6794 cpp_arg.len = strlen(cpp_arg.path_prefix);
6795 cpp_arg.errcode = errcode;
6796 err = got_diff_tree(tree1, tree2, "", "", repo,
6797 check_path_prefix_in_diff, &cpp_arg, 0);
6800 got_object_tree_close(tree1);
6802 got_object_tree_close(tree2);
6804 got_object_commit_close(commit);
6806 got_object_commit_close(parent_commit);
6810 static const struct got_error *
6811 collect_commits(struct got_object_id_queue *commits,
6812 struct got_object_id *initial_commit_id,
6813 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6814 const char *path_prefix, int path_prefix_errcode,
6815 struct got_repository *repo)
6817 const struct got_error *err = NULL;
6818 struct got_commit_graph *graph = NULL;
6819 struct got_object_id *parent_id = NULL;
6820 struct got_object_qid *qid;
6821 struct got_object_id *commit_id = initial_commit_id;
6823 err = got_commit_graph_open(&graph, "/", 1);
6827 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6828 check_cancelled, NULL);
6831 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6832 err = got_commit_graph_iter_next(&parent_id, graph, repo,
6833 check_cancelled, NULL);
6835 if (err->code == GOT_ERR_ITER_COMPLETED) {
6836 err = got_error_msg(GOT_ERR_ANCESTRY,
6837 "ran out of commits to rebase before "
6838 "youngest common ancestor commit has "
6843 err = check_path_prefix(parent_id, commit_id,
6844 path_prefix, path_prefix_errcode, repo);
6848 err = got_object_qid_alloc(&qid, commit_id);
6851 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6852 commit_id = parent_id;
6856 got_commit_graph_close(graph);
6860 static const struct got_error *
6861 cmd_rebase(int argc, char *argv[])
6863 const struct got_error *error = NULL;
6864 struct got_worktree *worktree = NULL;
6865 struct got_repository *repo = NULL;
6866 struct got_fileindex *fileindex = NULL;
6868 struct got_reference *branch = NULL;
6869 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
6870 struct got_object_id *commit_id = NULL, *parent_id = NULL;
6871 struct got_object_id *resume_commit_id = NULL;
6872 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
6873 struct got_commit_object *commit = NULL;
6874 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
6875 int histedit_in_progress = 0;
6876 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6877 struct got_object_id_queue commits;
6878 struct got_pathlist_head merged_paths;
6879 const struct got_object_id_queue *parent_ids;
6880 struct got_object_qid *qid, *pid;
6882 SIMPLEQ_INIT(&commits);
6883 TAILQ_INIT(&merged_paths);
6885 while ((ch = getopt(argc, argv, "ac")) != -1) {
6891 continue_rebase = 1;
6903 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6904 "unveil", NULL) == -1)
6907 if (abort_rebase && continue_rebase)
6909 else if (abort_rebase || continue_rebase) {
6912 } else if (argc != 1)
6915 cwd = getcwd(NULL, 0);
6917 error = got_error_from_errno("getcwd");
6920 error = got_worktree_open(&worktree, cwd);
6922 if (error->code == GOT_ERR_NOT_WORKTREE)
6923 error = wrap_not_worktree_error(error, "rebase", cwd);
6927 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6932 error = apply_unveil(got_repo_get_path(repo), 0,
6933 got_worktree_get_root_path(worktree));
6937 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6941 if (histedit_in_progress) {
6942 error = got_error(GOT_ERR_HISTEDIT_BUSY);
6946 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6951 struct got_update_progress_arg upa;
6952 if (!rebase_in_progress) {
6953 error = got_error(GOT_ERR_NOT_REBASING);
6956 error = got_worktree_rebase_continue(&resume_commit_id,
6957 &new_base_branch, &tmp_branch, &branch, &fileindex,
6961 printf("Switching work tree to %s\n",
6962 got_ref_get_symref_target(new_base_branch));
6963 memset(&upa, 0, sizeof(upa));
6964 error = got_worktree_rebase_abort(worktree, fileindex, repo,
6965 new_base_branch, update_progress, &upa);
6968 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
6969 print_update_progress_stats(&upa);
6970 goto done; /* nothing else to do */
6973 if (continue_rebase) {
6974 if (!rebase_in_progress) {
6975 error = got_error(GOT_ERR_NOT_REBASING);
6978 error = got_worktree_rebase_continue(&resume_commit_id,
6979 &new_base_branch, &tmp_branch, &branch, &fileindex,
6984 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
6985 resume_commit_id, repo);
6989 yca_id = got_object_id_dup(resume_commit_id);
6990 if (yca_id == NULL) {
6991 error = got_error_from_errno("got_object_id_dup");
6995 error = got_ref_open(&branch, repo, argv[0], 0);
7000 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7004 if (!continue_rebase) {
7005 struct got_object_id *base_commit_id;
7007 base_commit_id = got_worktree_get_base_commit_id(worktree);
7008 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7009 base_commit_id, branch_head_commit_id, repo,
7010 check_cancelled, NULL);
7013 if (yca_id == NULL) {
7014 error = got_error_msg(GOT_ERR_ANCESTRY,
7015 "specified branch shares no common ancestry "
7016 "with work tree's branch");
7020 error = check_same_branch(base_commit_id, branch, yca_id, repo);
7022 if (error->code != GOT_ERR_ANCESTRY)
7026 error = got_error_msg(GOT_ERR_SAME_BRANCH,
7027 "specified branch resolves to a commit which "
7028 "is already contained in work tree's branch");
7031 error = got_worktree_rebase_prepare(&new_base_branch,
7032 &tmp_branch, &fileindex, worktree, branch, repo);
7037 commit_id = branch_head_commit_id;
7038 error = got_object_open_as_commit(&commit, repo, commit_id);
7042 parent_ids = got_object_commit_get_parent_ids(commit);
7043 pid = SIMPLEQ_FIRST(parent_ids);
7045 if (!continue_rebase) {
7046 struct got_update_progress_arg upa;
7047 memset(&upa, 0, sizeof(upa));
7048 error = got_worktree_rebase_abort(worktree, fileindex,
7049 repo, new_base_branch, update_progress, &upa);
7052 printf("Rebase of %s aborted\n",
7053 got_ref_get_name(branch));
7054 print_update_progress_stats(&upa);
7057 error = got_error(GOT_ERR_EMPTY_REBASE);
7060 error = collect_commits(&commits, commit_id, pid->id,
7061 yca_id, got_worktree_get_path_prefix(worktree),
7062 GOT_ERR_REBASE_PATH, repo);
7063 got_object_commit_close(commit);
7068 if (SIMPLEQ_EMPTY(&commits)) {
7069 if (continue_rebase) {
7070 error = rebase_complete(worktree, fileindex,
7071 branch, new_base_branch, tmp_branch, repo);
7074 /* Fast-forward the reference of the branch. */
7075 struct got_object_id *new_head_commit_id;
7077 error = got_ref_resolve(&new_head_commit_id, repo,
7081 error = got_object_id_str(&id_str, new_head_commit_id);
7082 printf("Forwarding %s to commit %s\n",
7083 got_ref_get_name(branch), id_str);
7085 error = got_ref_change_ref(branch,
7086 new_head_commit_id);
7093 SIMPLEQ_FOREACH(qid, &commits, entry) {
7094 struct got_update_progress_arg upa;
7096 commit_id = qid->id;
7097 parent_id = pid ? pid->id : yca_id;
7100 memset(&upa, 0, sizeof(upa));
7101 error = got_worktree_rebase_merge_files(&merged_paths,
7102 worktree, fileindex, parent_id, commit_id, repo,
7103 update_progress, &upa, check_cancelled, NULL);
7107 print_update_progress_stats(&upa);
7108 if (upa.conflicts > 0)
7109 rebase_status = GOT_STATUS_CONFLICT;
7111 if (rebase_status == GOT_STATUS_CONFLICT) {
7112 error = show_rebase_merge_conflict(qid->id, repo);
7115 got_worktree_rebase_pathlist_free(&merged_paths);
7119 error = rebase_commit(&merged_paths, worktree, fileindex,
7120 tmp_branch, commit_id, repo);
7121 got_worktree_rebase_pathlist_free(&merged_paths);
7126 if (rebase_status == GOT_STATUS_CONFLICT) {
7127 error = got_worktree_rebase_postpone(worktree, fileindex);
7130 error = got_error_msg(GOT_ERR_CONFLICTS,
7131 "conflicts must be resolved before rebasing can continue");
7133 error = rebase_complete(worktree, fileindex, branch,
7134 new_base_branch, tmp_branch, repo);
7136 got_object_id_queue_free(&commits);
7137 free(branch_head_commit_id);
7138 free(resume_commit_id);
7141 got_object_commit_close(commit);
7143 got_ref_close(branch);
7144 if (new_base_branch)
7145 got_ref_close(new_base_branch);
7147 got_ref_close(tmp_branch);
7149 got_worktree_close(worktree);
7151 got_repo_close(repo);
7156 usage_histedit(void)
7158 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7163 #define GOT_HISTEDIT_PICK 'p'
7164 #define GOT_HISTEDIT_EDIT 'e'
7165 #define GOT_HISTEDIT_FOLD 'f'
7166 #define GOT_HISTEDIT_DROP 'd'
7167 #define GOT_HISTEDIT_MESG 'm'
7169 static struct got_histedit_cmd {
7173 } got_histedit_cmds[] = {
7174 { GOT_HISTEDIT_PICK, "pick", "use commit" },
7175 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7176 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7178 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7179 { GOT_HISTEDIT_MESG, "mesg",
7180 "single-line log message for commit above (open editor if empty)" },
7183 struct got_histedit_list_entry {
7184 TAILQ_ENTRY(got_histedit_list_entry) entry;
7185 struct got_object_id *commit_id;
7186 const struct got_histedit_cmd *cmd;
7189 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7191 static const struct got_error *
7192 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7193 FILE *f, struct got_repository *repo)
7195 const struct got_error *err = NULL;
7196 char *logmsg = NULL, *id_str = NULL;
7197 struct got_commit_object *commit = NULL;
7200 err = got_object_open_as_commit(&commit, repo, commit_id);
7204 err = get_short_logmsg(&logmsg, 34, commit);
7208 err = got_object_id_str(&id_str, commit_id);
7212 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7214 err = got_ferror(f, GOT_ERR_IO);
7217 got_object_commit_close(commit);
7223 static const struct got_error *
7224 histedit_write_commit_list(struct got_object_id_queue *commits,
7225 FILE *f, int edit_logmsg_only, struct got_repository *repo)
7227 const struct got_error *err = NULL;
7228 struct got_object_qid *qid;
7230 if (SIMPLEQ_EMPTY(commits))
7231 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7233 SIMPLEQ_FOREACH(qid, commits, entry) {
7234 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7238 if (edit_logmsg_only) {
7239 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7241 err = got_ferror(f, GOT_ERR_IO);
7250 static const struct got_error *
7251 write_cmd_list(FILE *f, const char *branch_name,
7252 struct got_object_id_queue *commits)
7254 const struct got_error *err = NULL;
7257 struct got_object_qid *qid;
7259 qid = SIMPLEQ_FIRST(commits);
7260 err = got_object_id_str(&id_str, qid->id);
7265 "# Editing the history of branch '%s' starting at\n"
7267 "# Commits will be processed in order from top to "
7268 "bottom of this file.\n", branch_name, id_str);
7270 err = got_ferror(f, GOT_ERR_IO);
7274 n = fprintf(f, "# Available histedit commands:\n");
7276 err = got_ferror(f, GOT_ERR_IO);
7280 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7281 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7282 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7285 err = got_ferror(f, GOT_ERR_IO);
7294 static const struct got_error *
7295 histedit_syntax_error(int lineno)
7297 static char msg[42];
7300 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7302 if (ret == -1 || ret >= sizeof(msg))
7303 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7305 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7308 static const struct got_error *
7309 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7310 char *logmsg, struct got_repository *repo)
7312 const struct got_error *err;
7313 struct got_commit_object *folded_commit = NULL;
7314 char *id_str, *folded_logmsg = NULL;
7316 err = got_object_id_str(&id_str, hle->commit_id);
7320 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7324 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7327 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7328 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7329 folded_logmsg) == -1) {
7330 err = got_error_from_errno("asprintf");
7334 got_object_commit_close(folded_commit);
7336 free(folded_logmsg);
7340 static struct got_histedit_list_entry *
7341 get_folded_commits(struct got_histedit_list_entry *hle)
7343 struct got_histedit_list_entry *prev, *folded = NULL;
7345 prev = TAILQ_PREV(hle, got_histedit_list, entry);
7346 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7347 prev->cmd->code == GOT_HISTEDIT_DROP)) {
7348 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7350 prev = TAILQ_PREV(prev, got_histedit_list, entry);
7356 static const struct got_error *
7357 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7358 struct got_repository *repo)
7360 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7361 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7362 const struct got_error *err = NULL;
7363 struct got_commit_object *commit = NULL;
7365 struct got_histedit_list_entry *folded = NULL;
7367 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7371 folded = get_folded_commits(hle);
7373 while (folded != hle) {
7374 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7375 folded = TAILQ_NEXT(folded, entry);
7378 err = append_folded_commit_msg(&new_msg, folded,
7384 folded = TAILQ_NEXT(folded, entry);
7388 err = got_object_id_str(&id_str, hle->commit_id);
7391 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7394 if (asprintf(&new_msg,
7395 "%s\n# original log message of commit %s: %s",
7396 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7397 err = got_error_from_errno("asprintf");
7403 err = got_object_id_str(&id_str, hle->commit_id);
7407 err = got_opentemp_named_fd(&logmsg_path, &fd,
7408 GOT_TMPDIR_STR "/got-logmsg");
7412 dprintf(fd, logmsg);
7415 err = get_editor(&editor);
7419 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7421 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7423 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7426 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7427 err = got_error_from_errno2("unlink", logmsg_path);
7433 got_object_commit_close(commit);
7437 static const struct got_error *
7438 histedit_parse_list(struct got_histedit_list *histedit_cmds,
7439 FILE *f, struct got_repository *repo)
7441 const struct got_error *err = NULL;
7442 char *line = NULL, *p, *end;
7446 const struct got_histedit_cmd *cmd;
7447 struct got_object_id *commit_id = NULL;
7448 struct got_histedit_list_entry *hle = NULL;
7451 len = getline(&line, &size, f);
7453 const struct got_error *getline_err;
7456 getline_err = got_error_from_errno("getline");
7457 err = got_ferror(f, getline_err->code);
7462 while (isspace((unsigned char)p[0]))
7464 if (p[0] == '#' || p[0] == '\0') {
7470 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7471 cmd = &got_histedit_cmds[i];
7472 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7473 isspace((unsigned char)p[strlen(cmd->name)])) {
7474 p += strlen(cmd->name);
7477 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7482 if (i == nitems(got_histedit_cmds)) {
7483 err = histedit_syntax_error(lineno);
7486 while (isspace((unsigned char)p[0]))
7488 if (cmd->code == GOT_HISTEDIT_MESG) {
7489 if (hle == NULL || hle->logmsg != NULL) {
7490 err = got_error(GOT_ERR_HISTEDIT_CMD);
7494 err = histedit_edit_logmsg(hle, repo);
7498 hle->logmsg = strdup(p);
7499 if (hle->logmsg == NULL) {
7500 err = got_error_from_errno("strdup");
7509 while (end[0] && !isspace((unsigned char)end[0]))
7513 err = got_object_resolve_id_str(&commit_id, repo, p);
7515 /* override error code */
7516 err = histedit_syntax_error(lineno);
7520 hle = malloc(sizeof(*hle));
7522 err = got_error_from_errno("malloc");
7526 hle->commit_id = commit_id;
7531 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7539 static const struct got_error *
7540 histedit_check_script(struct got_histedit_list *histedit_cmds,
7541 struct got_object_id_queue *commits, struct got_repository *repo)
7543 const struct got_error *err = NULL;
7544 struct got_object_qid *qid;
7545 struct got_histedit_list_entry *hle;
7546 static char msg[92];
7549 if (TAILQ_EMPTY(histedit_cmds))
7550 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7551 "histedit script contains no commands");
7552 if (SIMPLEQ_EMPTY(commits))
7553 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7555 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7556 struct got_histedit_list_entry *hle2;
7557 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7560 if (got_object_id_cmp(hle->commit_id,
7561 hle2->commit_id) != 0)
7563 err = got_object_id_str(&id_str, hle->commit_id);
7566 snprintf(msg, sizeof(msg), "commit %s is listed "
7567 "more than once in histedit script", id_str);
7569 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7573 SIMPLEQ_FOREACH(qid, commits, entry) {
7574 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7575 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7579 err = got_object_id_str(&id_str, qid->id);
7582 snprintf(msg, sizeof(msg),
7583 "commit %s missing from histedit script", id_str);
7585 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7589 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7590 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7591 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7592 "last commit in histedit script cannot be folded");
7597 static const struct got_error *
7598 histedit_run_editor(struct got_histedit_list *histedit_cmds,
7599 const char *path, struct got_object_id_queue *commits,
7600 struct got_repository *repo)
7602 const struct got_error *err = NULL;
7606 err = get_editor(&editor);
7610 if (spawn_editor(editor, path) == -1) {
7611 err = got_error_from_errno("failed spawning editor");
7615 f = fopen(path, "r");
7617 err = got_error_from_errno("fopen");
7620 err = histedit_parse_list(histedit_cmds, f, repo);
7624 err = histedit_check_script(histedit_cmds, commits, repo);
7626 if (f && fclose(f) != 0 && err == NULL)
7627 err = got_error_from_errno("fclose");
7632 static const struct got_error *
7633 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7634 struct got_object_id_queue *, const char *, const char *,
7635 struct got_repository *);
7637 static const struct got_error *
7638 histedit_edit_script(struct got_histedit_list *histedit_cmds,
7639 struct got_object_id_queue *commits, const char *branch_name,
7640 int edit_logmsg_only, struct got_repository *repo)
7642 const struct got_error *err;
7646 err = got_opentemp_named(&path, &f, "got-histedit");
7650 err = write_cmd_list(f, branch_name, commits);
7654 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7658 if (edit_logmsg_only) {
7660 err = histedit_parse_list(histedit_cmds, f, repo);
7662 if (fclose(f) != 0) {
7663 err = got_error_from_errno("fclose");
7667 err = histedit_run_editor(histedit_cmds, path, commits, repo);
7669 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7670 err->code != GOT_ERR_HISTEDIT_CMD)
7672 err = histedit_edit_list_retry(histedit_cmds, err,
7673 commits, path, branch_name, repo);
7677 if (f && fclose(f) != 0 && err == NULL)
7678 err = got_error_from_errno("fclose");
7679 if (path && unlink(path) != 0 && err == NULL)
7680 err = got_error_from_errno2("unlink", path);
7685 static const struct got_error *
7686 histedit_save_list(struct got_histedit_list *histedit_cmds,
7687 struct got_worktree *worktree, struct got_repository *repo)
7689 const struct got_error *err = NULL;
7692 struct got_histedit_list_entry *hle;
7693 struct got_commit_object *commit = NULL;
7695 err = got_worktree_get_histedit_script_path(&path, worktree);
7699 f = fopen(path, "w");
7701 err = got_error_from_errno2("fopen", path);
7704 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7705 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7711 int n = fprintf(f, "%c %s\n",
7712 GOT_HISTEDIT_MESG, hle->logmsg);
7714 err = got_ferror(f, GOT_ERR_IO);
7720 if (f && fclose(f) != 0 && err == NULL)
7721 err = got_error_from_errno("fclose");
7724 got_object_commit_close(commit);
7729 histedit_free_list(struct got_histedit_list *histedit_cmds)
7731 struct got_histedit_list_entry *hle;
7733 while ((hle = TAILQ_FIRST(histedit_cmds))) {
7734 TAILQ_REMOVE(histedit_cmds, hle, entry);
7739 static const struct got_error *
7740 histedit_load_list(struct got_histedit_list *histedit_cmds,
7741 const char *path, struct got_repository *repo)
7743 const struct got_error *err = NULL;
7746 f = fopen(path, "r");
7748 err = got_error_from_errno2("fopen", path);
7752 err = histedit_parse_list(histedit_cmds, f, repo);
7754 if (f && fclose(f) != 0 && err == NULL)
7755 err = got_error_from_errno("fclose");
7759 static const struct got_error *
7760 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7761 const struct got_error *edit_err, struct got_object_id_queue *commits,
7762 const char *path, const char *branch_name, struct got_repository *repo)
7764 const struct got_error *err = NULL, *prev_err = edit_err;
7767 while (resp != 'c' && resp != 'r' && resp != 'a') {
7768 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7769 "or (a)bort: ", getprogname(), prev_err->msg);
7774 histedit_free_list(histedit_cmds);
7775 err = histedit_run_editor(histedit_cmds, path, commits,
7778 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7779 err->code != GOT_ERR_HISTEDIT_CMD)
7786 } else if (resp == 'r') {
7787 histedit_free_list(histedit_cmds);
7788 err = histedit_edit_script(histedit_cmds,
7789 commits, branch_name, 0, repo);
7791 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7792 err->code != GOT_ERR_HISTEDIT_CMD)
7799 } else if (resp == 'a') {
7800 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7803 printf("invalid response '%c'\n", resp);
7809 static const struct got_error *
7810 histedit_complete(struct got_worktree *worktree,
7811 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7812 struct got_reference *branch, struct got_repository *repo)
7814 printf("Switching work tree to %s\n",
7815 got_ref_get_symref_target(branch));
7816 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7820 static const struct got_error *
7821 show_histedit_progress(struct got_commit_object *commit,
7822 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7824 const struct got_error *err;
7825 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7827 err = got_object_id_str(&old_id_str, hle->commit_id);
7832 err = got_object_id_str(&new_id_str, new_id);
7837 old_id_str[12] = '\0';
7839 new_id_str[12] = '\0';
7842 logmsg = strdup(hle->logmsg);
7843 if (logmsg == NULL) {
7844 err = got_error_from_errno("strdup");
7847 trim_logmsg(logmsg, 42);
7849 err = get_short_logmsg(&logmsg, 42, commit);
7854 switch (hle->cmd->code) {
7855 case GOT_HISTEDIT_PICK:
7856 case GOT_HISTEDIT_EDIT:
7857 printf("%s -> %s: %s\n", old_id_str,
7858 new_id_str ? new_id_str : "no-op change", logmsg);
7860 case GOT_HISTEDIT_DROP:
7861 case GOT_HISTEDIT_FOLD:
7862 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
7874 static const struct got_error *
7875 histedit_commit(struct got_pathlist_head *merged_paths,
7876 struct got_worktree *worktree, struct got_fileindex *fileindex,
7877 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
7878 struct got_repository *repo)
7880 const struct got_error *err;
7881 struct got_commit_object *commit;
7882 struct got_object_id *new_commit_id;
7884 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
7885 && hle->logmsg == NULL) {
7886 err = histedit_edit_logmsg(hle, repo);
7891 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7895 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
7896 worktree, fileindex, tmp_branch, commit, hle->commit_id,
7899 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
7901 err = show_histedit_progress(commit, hle, NULL);
7903 err = show_histedit_progress(commit, hle, new_commit_id);
7904 free(new_commit_id);
7907 got_object_commit_close(commit);
7911 static const struct got_error *
7912 histedit_skip_commit(struct got_histedit_list_entry *hle,
7913 struct got_worktree *worktree, struct got_repository *repo)
7915 const struct got_error *error;
7916 struct got_commit_object *commit;
7918 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
7923 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
7927 error = show_histedit_progress(commit, hle, NULL);
7928 got_object_commit_close(commit);
7932 static const struct got_error *
7933 check_local_changes(void *arg, unsigned char status,
7934 unsigned char staged_status, const char *path,
7935 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7936 struct got_object_id *commit_id, int dirfd, const char *de_name)
7938 int *have_local_changes = arg;
7941 case GOT_STATUS_ADD:
7942 case GOT_STATUS_DELETE:
7943 case GOT_STATUS_MODIFY:
7944 case GOT_STATUS_CONFLICT:
7945 *have_local_changes = 1;
7946 return got_error(GOT_ERR_CANCELLED);
7951 switch (staged_status) {
7952 case GOT_STATUS_ADD:
7953 case GOT_STATUS_DELETE:
7954 case GOT_STATUS_MODIFY:
7955 *have_local_changes = 1;
7956 return got_error(GOT_ERR_CANCELLED);
7964 static const struct got_error *
7965 cmd_histedit(int argc, char *argv[])
7967 const struct got_error *error = NULL;
7968 struct got_worktree *worktree = NULL;
7969 struct got_fileindex *fileindex = NULL;
7970 struct got_repository *repo = NULL;
7972 struct got_reference *branch = NULL;
7973 struct got_reference *tmp_branch = NULL;
7974 struct got_object_id *resume_commit_id = NULL;
7975 struct got_object_id *base_commit_id = NULL;
7976 struct got_object_id *head_commit_id = NULL;
7977 struct got_commit_object *commit = NULL;
7978 int ch, rebase_in_progress = 0;
7979 struct got_update_progress_arg upa;
7980 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
7981 int edit_logmsg_only = 0;
7982 const char *edit_script_path = NULL;
7983 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7984 struct got_object_id_queue commits;
7985 struct got_pathlist_head merged_paths;
7986 const struct got_object_id_queue *parent_ids;
7987 struct got_object_qid *pid;
7988 struct got_histedit_list histedit_cmds;
7989 struct got_histedit_list_entry *hle;
7991 SIMPLEQ_INIT(&commits);
7992 TAILQ_INIT(&histedit_cmds);
7993 TAILQ_INIT(&merged_paths);
7994 memset(&upa, 0, sizeof(upa));
7996 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8005 edit_script_path = optarg;
8008 edit_logmsg_only = 1;
8020 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8021 "unveil", NULL) == -1)
8024 if (abort_edit && continue_edit)
8025 errx(1, "histedit's -a and -c options are mutually exclusive");
8026 if (edit_script_path && edit_logmsg_only)
8027 errx(1, "histedit's -F and -m options are mutually exclusive");
8028 if (abort_edit && edit_logmsg_only)
8029 errx(1, "histedit's -a and -m options are mutually exclusive");
8030 if (continue_edit && edit_logmsg_only)
8031 errx(1, "histedit's -c and -m options are mutually exclusive");
8036 * This command cannot apply unveil(2) in all cases because the
8037 * user may choose to run an editor to edit the histedit script
8038 * and to edit individual commit log messages.
8039 * unveil(2) traverses exec(2); if an editor is used we have to
8040 * apply unveil after edit script and log messages have been written.
8041 * XXX TODO: Make use of unveil(2) where possible.
8044 cwd = getcwd(NULL, 0);
8046 error = got_error_from_errno("getcwd");
8049 error = got_worktree_open(&worktree, cwd);
8051 if (error->code == GOT_ERR_NOT_WORKTREE)
8052 error = wrap_not_worktree_error(error, "histedit", cwd);
8056 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8061 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8064 if (rebase_in_progress) {
8065 error = got_error(GOT_ERR_REBASING);
8069 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8073 if (edit_in_progress && edit_logmsg_only) {
8074 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8075 "histedit operation is in progress in this "
8076 "work tree and must be continued or aborted "
8077 "before the -m option can be used");
8081 if (edit_in_progress && abort_edit) {
8082 error = got_worktree_histedit_continue(&resume_commit_id,
8083 &tmp_branch, &branch, &base_commit_id, &fileindex,
8087 printf("Switching work tree to %s\n",
8088 got_ref_get_symref_target(branch));
8089 error = got_worktree_histedit_abort(worktree, fileindex, repo,
8090 branch, base_commit_id, update_progress, &upa);
8093 printf("Histedit of %s aborted\n",
8094 got_ref_get_symref_target(branch));
8095 print_update_progress_stats(&upa);
8096 goto done; /* nothing else to do */
8097 } else if (abort_edit) {
8098 error = got_error(GOT_ERR_NOT_HISTEDIT);
8102 if (continue_edit) {
8105 if (!edit_in_progress) {
8106 error = got_error(GOT_ERR_NOT_HISTEDIT);
8110 error = got_worktree_get_histedit_script_path(&path, worktree);
8114 error = histedit_load_list(&histedit_cmds, path, repo);
8119 error = got_worktree_histedit_continue(&resume_commit_id,
8120 &tmp_branch, &branch, &base_commit_id, &fileindex,
8125 error = got_ref_resolve(&head_commit_id, repo, branch);
8129 error = got_object_open_as_commit(&commit, repo,
8133 parent_ids = got_object_commit_get_parent_ids(commit);
8134 pid = SIMPLEQ_FIRST(parent_ids);
8136 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8139 error = collect_commits(&commits, head_commit_id, pid->id,
8140 base_commit_id, got_worktree_get_path_prefix(worktree),
8141 GOT_ERR_HISTEDIT_PATH, repo);
8142 got_object_commit_close(commit);
8147 if (edit_in_progress) {
8148 error = got_error(GOT_ERR_HISTEDIT_BUSY);
8152 error = got_ref_open(&branch, repo,
8153 got_worktree_get_head_ref_name(worktree), 0);
8157 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8158 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8159 "will not edit commit history of a branch outside "
8160 "the \"refs/heads/\" reference namespace");
8164 error = got_ref_resolve(&head_commit_id, repo, branch);
8165 got_ref_close(branch);
8170 error = got_object_open_as_commit(&commit, repo,
8174 parent_ids = got_object_commit_get_parent_ids(commit);
8175 pid = SIMPLEQ_FIRST(parent_ids);
8177 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8180 error = collect_commits(&commits, head_commit_id, pid->id,
8181 got_worktree_get_base_commit_id(worktree),
8182 got_worktree_get_path_prefix(worktree),
8183 GOT_ERR_HISTEDIT_PATH, repo);
8184 got_object_commit_close(commit);
8189 if (SIMPLEQ_EMPTY(&commits)) {
8190 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8194 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8195 &base_commit_id, &fileindex, worktree, repo);
8199 if (edit_script_path) {
8200 error = histedit_load_list(&histedit_cmds,
8201 edit_script_path, repo);
8203 got_worktree_histedit_abort(worktree, fileindex,
8204 repo, branch, base_commit_id,
8205 update_progress, &upa);
8206 print_update_progress_stats(&upa);
8210 const char *branch_name;
8211 branch_name = got_ref_get_symref_target(branch);
8212 if (strncmp(branch_name, "refs/heads/", 11) == 0)
8214 error = histedit_edit_script(&histedit_cmds, &commits,
8215 branch_name, edit_logmsg_only, repo);
8217 got_worktree_histedit_abort(worktree, fileindex,
8218 repo, branch, base_commit_id,
8219 update_progress, &upa);
8220 print_update_progress_stats(&upa);
8226 error = histedit_save_list(&histedit_cmds, worktree,
8229 got_worktree_histedit_abort(worktree, fileindex,
8230 repo, branch, base_commit_id,
8231 update_progress, &upa);
8232 print_update_progress_stats(&upa);
8238 error = histedit_check_script(&histedit_cmds, &commits, repo);
8242 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8243 if (resume_commit_id) {
8244 if (got_object_id_cmp(hle->commit_id,
8245 resume_commit_id) != 0)
8248 resume_commit_id = NULL;
8249 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8250 hle->cmd->code == GOT_HISTEDIT_FOLD) {
8251 error = histedit_skip_commit(hle, worktree,
8256 struct got_pathlist_head paths;
8257 int have_changes = 0;
8260 error = got_pathlist_append(&paths, "", NULL);
8263 error = got_worktree_status(worktree, &paths,
8264 repo, check_local_changes, &have_changes,
8265 check_cancelled, NULL);
8266 got_pathlist_free(&paths);
8268 if (error->code != GOT_ERR_CANCELLED)
8270 if (sigint_received || sigpipe_received)
8274 error = histedit_commit(NULL, worktree,
8275 fileindex, tmp_branch, hle, repo);
8279 error = got_object_open_as_commit(
8280 &commit, repo, hle->commit_id);
8283 error = show_histedit_progress(commit,
8285 got_object_commit_close(commit);
8294 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8295 error = histedit_skip_commit(hle, worktree, repo);
8301 error = got_object_open_as_commit(&commit, repo,
8305 parent_ids = got_object_commit_get_parent_ids(commit);
8306 pid = SIMPLEQ_FIRST(parent_ids);
8308 error = got_worktree_histedit_merge_files(&merged_paths,
8309 worktree, fileindex, pid->id, hle->commit_id, repo,
8310 update_progress, &upa, check_cancelled, NULL);
8313 got_object_commit_close(commit);
8316 print_update_progress_stats(&upa);
8317 if (upa.conflicts > 0)
8318 rebase_status = GOT_STATUS_CONFLICT;
8320 if (rebase_status == GOT_STATUS_CONFLICT) {
8321 error = show_rebase_merge_conflict(hle->commit_id,
8325 got_worktree_rebase_pathlist_free(&merged_paths);
8329 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8331 error = got_object_id_str(&id_str, hle->commit_id);
8334 printf("Stopping histedit for amending commit %s\n",
8337 got_worktree_rebase_pathlist_free(&merged_paths);
8338 error = got_worktree_histedit_postpone(worktree,
8343 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8344 error = histedit_skip_commit(hle, worktree, repo);
8350 error = histedit_commit(&merged_paths, worktree, fileindex,
8351 tmp_branch, hle, repo);
8352 got_worktree_rebase_pathlist_free(&merged_paths);
8357 if (rebase_status == GOT_STATUS_CONFLICT) {
8358 error = got_worktree_histedit_postpone(worktree, fileindex);
8361 error = got_error_msg(GOT_ERR_CONFLICTS,
8362 "conflicts must be resolved before histedit can continue");
8364 error = histedit_complete(worktree, fileindex, tmp_branch,
8367 got_object_id_queue_free(&commits);
8368 histedit_free_list(&histedit_cmds);
8369 free(head_commit_id);
8370 free(base_commit_id);
8371 free(resume_commit_id);
8373 got_object_commit_close(commit);
8375 got_ref_close(branch);
8377 got_ref_close(tmp_branch);
8379 got_worktree_close(worktree);
8381 got_repo_close(repo);
8386 usage_integrate(void)
8388 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8392 static const struct got_error *
8393 cmd_integrate(int argc, char *argv[])
8395 const struct got_error *error = NULL;
8396 struct got_repository *repo = NULL;
8397 struct got_worktree *worktree = NULL;
8398 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8399 const char *branch_arg = NULL;
8400 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8401 struct got_fileindex *fileindex = NULL;
8402 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8404 struct got_update_progress_arg upa;
8406 while ((ch = getopt(argc, argv, "")) != -1) {
8419 branch_arg = argv[0];
8421 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8422 "unveil", NULL) == -1)
8425 cwd = getcwd(NULL, 0);
8427 error = got_error_from_errno("getcwd");
8431 error = got_worktree_open(&worktree, cwd);
8433 if (error->code == GOT_ERR_NOT_WORKTREE)
8434 error = wrap_not_worktree_error(error, "integrate",
8439 error = check_rebase_or_histedit_in_progress(worktree);
8443 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8448 error = apply_unveil(got_repo_get_path(repo), 0,
8449 got_worktree_get_root_path(worktree));
8453 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8454 error = got_error_from_errno("asprintf");
8458 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8459 &base_branch_ref, worktree, refname, repo);
8463 refname = strdup(got_ref_get_name(branch_ref));
8464 if (refname == NULL) {
8465 error = got_error_from_errno("strdup");
8466 got_worktree_integrate_abort(worktree, fileindex, repo,
8467 branch_ref, base_branch_ref);
8470 base_refname = strdup(got_ref_get_name(base_branch_ref));
8471 if (base_refname == NULL) {
8472 error = got_error_from_errno("strdup");
8473 got_worktree_integrate_abort(worktree, fileindex, repo,
8474 branch_ref, base_branch_ref);
8478 error = got_ref_resolve(&commit_id, repo, branch_ref);
8482 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8486 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8487 error = got_error_msg(GOT_ERR_SAME_BRANCH,
8488 "specified branch has already been integrated");
8489 got_worktree_integrate_abort(worktree, fileindex, repo,
8490 branch_ref, base_branch_ref);
8494 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8496 if (error->code == GOT_ERR_ANCESTRY)
8497 error = got_error(GOT_ERR_REBASE_REQUIRED);
8498 got_worktree_integrate_abort(worktree, fileindex, repo,
8499 branch_ref, base_branch_ref);
8503 memset(&upa, 0, sizeof(upa));
8504 error = got_worktree_integrate_continue(worktree, fileindex, repo,
8505 branch_ref, base_branch_ref, update_progress, &upa,
8506 check_cancelled, NULL);
8510 printf("Integrated %s into %s\n", refname, base_refname);
8511 print_update_progress_stats(&upa);
8514 got_repo_close(repo);
8516 got_worktree_close(worktree);
8518 free(base_commit_id);
8528 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8529 "[file-path ...]\n",
8534 static const struct got_error *
8535 print_stage(void *arg, unsigned char status, unsigned char staged_status,
8536 const char *path, struct got_object_id *blob_id,
8537 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8538 int dirfd, const char *de_name)
8540 const struct got_error *err = NULL;
8541 char *id_str = NULL;
8543 if (staged_status != GOT_STATUS_ADD &&
8544 staged_status != GOT_STATUS_MODIFY &&
8545 staged_status != GOT_STATUS_DELETE)
8548 if (staged_status == GOT_STATUS_ADD ||
8549 staged_status == GOT_STATUS_MODIFY)
8550 err = got_object_id_str(&id_str, staged_blob_id);
8552 err = got_object_id_str(&id_str, blob_id);
8556 printf("%s %c %s\n", id_str, staged_status, path);
8561 static const struct got_error *
8562 cmd_stage(int argc, char *argv[])
8564 const struct got_error *error = NULL;
8565 struct got_repository *repo = NULL;
8566 struct got_worktree *worktree = NULL;
8568 struct got_pathlist_head paths;
8569 struct got_pathlist_entry *pe;
8570 int ch, list_stage = 0, pflag = 0;
8571 FILE *patch_script_file = NULL;
8572 const char *patch_script_path = NULL;
8573 struct choose_patch_arg cpa;
8577 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8586 patch_script_path = optarg;
8598 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8599 "unveil", NULL) == -1)
8602 if (list_stage && (pflag || patch_script_path))
8603 errx(1, "-l option cannot be used with other options");
8604 if (patch_script_path && !pflag)
8605 errx(1, "-F option can only be used together with -p option");
8607 cwd = getcwd(NULL, 0);
8609 error = got_error_from_errno("getcwd");
8613 error = got_worktree_open(&worktree, cwd);
8615 if (error->code == GOT_ERR_NOT_WORKTREE)
8616 error = wrap_not_worktree_error(error, "stage", cwd);
8620 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8625 if (patch_script_path) {
8626 patch_script_file = fopen(patch_script_path, "r");
8627 if (patch_script_file == NULL) {
8628 error = got_error_from_errno2("fopen",
8633 error = apply_unveil(got_repo_get_path(repo), 0,
8634 got_worktree_get_root_path(worktree));
8638 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8643 error = got_worktree_status(worktree, &paths, repo,
8644 print_stage, NULL, check_cancelled, NULL);
8646 cpa.patch_script_file = patch_script_file;
8647 cpa.action = "stage";
8648 error = got_worktree_stage(worktree, &paths,
8649 pflag ? NULL : print_status, NULL,
8650 pflag ? choose_patch : NULL, &cpa, repo);
8653 if (patch_script_file && fclose(patch_script_file) == EOF &&
8655 error = got_error_from_errno2("fclose", patch_script_path);
8657 got_repo_close(repo);
8659 got_worktree_close(worktree);
8660 TAILQ_FOREACH(pe, &paths, entry)
8661 free((char *)pe->path);
8662 got_pathlist_free(&paths);
8670 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8671 "[file-path ...]\n",
8677 static const struct got_error *
8678 cmd_unstage(int argc, char *argv[])
8680 const struct got_error *error = NULL;
8681 struct got_repository *repo = NULL;
8682 struct got_worktree *worktree = NULL;
8684 struct got_pathlist_head paths;
8685 struct got_pathlist_entry *pe;
8687 struct got_update_progress_arg upa;
8688 FILE *patch_script_file = NULL;
8689 const char *patch_script_path = NULL;
8690 struct choose_patch_arg cpa;
8694 while ((ch = getopt(argc, argv, "pF:")) != -1) {
8700 patch_script_path = optarg;
8712 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8713 "unveil", NULL) == -1)
8716 if (patch_script_path && !pflag)
8717 errx(1, "-F option can only be used together with -p option");
8719 cwd = getcwd(NULL, 0);
8721 error = got_error_from_errno("getcwd");
8725 error = got_worktree_open(&worktree, cwd);
8727 if (error->code == GOT_ERR_NOT_WORKTREE)
8728 error = wrap_not_worktree_error(error, "unstage", cwd);
8732 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8737 if (patch_script_path) {
8738 patch_script_file = fopen(patch_script_path, "r");
8739 if (patch_script_file == NULL) {
8740 error = got_error_from_errno2("fopen",
8746 error = apply_unveil(got_repo_get_path(repo), 0,
8747 got_worktree_get_root_path(worktree));
8751 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8755 cpa.patch_script_file = patch_script_file;
8756 cpa.action = "unstage";
8757 memset(&upa, 0, sizeof(upa));
8758 error = got_worktree_unstage(worktree, &paths, update_progress,
8759 &upa, pflag ? choose_patch : NULL, &cpa, repo);
8761 print_update_progress_stats(&upa);
8763 if (patch_script_file && fclose(patch_script_file) == EOF &&
8765 error = got_error_from_errno2("fclose", patch_script_path);
8767 got_repo_close(repo);
8769 got_worktree_close(worktree);
8770 TAILQ_FOREACH(pe, &paths, entry)
8771 free((char *)pe->path);
8772 got_pathlist_free(&paths);
8780 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8781 "arg1 [arg2 ...]\n", getprogname());
8785 static const struct got_error *
8786 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8788 const struct got_error *err;
8789 struct got_blob_object *blob;
8791 err = got_object_open_as_blob(&blob, repo, id, 8192);
8795 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8796 got_object_blob_close(blob);
8800 static const struct got_error *
8801 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8803 const struct got_error *err;
8804 struct got_tree_object *tree;
8807 err = got_object_open_as_tree(&tree, repo, id);
8811 nentries = got_object_tree_get_nentries(tree);
8812 for (i = 0; i < nentries; i++) {
8813 struct got_tree_entry *te;
8815 if (sigint_received || sigpipe_received)
8817 te = got_object_tree_get_entry(tree, i);
8818 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8821 fprintf(outfile, "%s %.7o %s\n", id_str,
8822 got_tree_entry_get_mode(te),
8823 got_tree_entry_get_name(te));
8827 got_object_tree_close(tree);
8831 static const struct got_error *
8832 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8834 const struct got_error *err;
8835 struct got_commit_object *commit;
8836 const struct got_object_id_queue *parent_ids;
8837 struct got_object_qid *pid;
8838 char *id_str = NULL;
8839 const char *logmsg = NULL;
8841 err = got_object_open_as_commit(&commit, repo, id);
8845 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8849 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8850 parent_ids = got_object_commit_get_parent_ids(commit);
8851 fprintf(outfile, "numparents %d\n",
8852 got_object_commit_get_nparents(commit));
8853 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
8855 err = got_object_id_str(&pid_str, pid->id);
8858 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8861 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
8862 got_object_commit_get_author(commit),
8863 got_object_commit_get_author_time(commit));
8865 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
8866 got_object_commit_get_author(commit),
8867 got_object_commit_get_committer_time(commit));
8869 logmsg = got_object_commit_get_logmsg_raw(commit);
8870 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8871 fprintf(outfile, "%s", logmsg);
8874 got_object_commit_close(commit);
8878 static const struct got_error *
8879 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8881 const struct got_error *err;
8882 struct got_tag_object *tag;
8883 char *id_str = NULL;
8884 const char *tagmsg = NULL;
8886 err = got_object_open_as_tag(&tag, repo, id);
8890 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8894 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8896 switch (got_object_tag_get_object_type(tag)) {
8897 case GOT_OBJ_TYPE_BLOB:
8898 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8899 GOT_OBJ_LABEL_BLOB);
8901 case GOT_OBJ_TYPE_TREE:
8902 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8903 GOT_OBJ_LABEL_TREE);
8905 case GOT_OBJ_TYPE_COMMIT:
8906 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8907 GOT_OBJ_LABEL_COMMIT);
8909 case GOT_OBJ_TYPE_TAG:
8910 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8917 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8918 got_object_tag_get_name(tag));
8920 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
8921 got_object_tag_get_tagger(tag),
8922 got_object_tag_get_tagger_time(tag));
8924 tagmsg = got_object_tag_get_message(tag);
8925 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8926 fprintf(outfile, "%s", tagmsg);
8929 got_object_tag_close(tag);
8933 static const struct got_error *
8934 cmd_cat(int argc, char *argv[])
8936 const struct got_error *error;
8937 struct got_repository *repo = NULL;
8938 struct got_worktree *worktree = NULL;
8939 char *cwd = NULL, *repo_path = NULL, *label = NULL;
8940 const char *commit_id_str = NULL;
8941 struct got_object_id *id = NULL, *commit_id = NULL;
8942 int ch, obj_type, i, force_path = 0;
8945 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8950 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
8953 commit_id_str = optarg;
8956 repo_path = realpath(optarg, NULL);
8957 if (repo_path == NULL)
8958 return got_error_from_errno2("realpath",
8960 got_path_strip_trailing_slashes(repo_path);
8974 cwd = getcwd(NULL, 0);
8976 error = got_error_from_errno("getcwd");
8979 error = got_worktree_open(&worktree, cwd);
8980 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8983 if (repo_path == NULL) {
8985 got_worktree_get_repo_path(worktree));
8986 if (repo_path == NULL) {
8987 error = got_error_from_errno("strdup");
8993 if (repo_path == NULL) {
8994 repo_path = getcwd(NULL, 0);
8995 if (repo_path == NULL)
8996 return got_error_from_errno("getcwd");
8999 error = got_repo_open(&repo, repo_path, NULL);
9004 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9008 if (commit_id_str == NULL)
9009 commit_id_str = GOT_REF_HEAD;
9010 error = got_repo_match_object_id(&commit_id, NULL,
9011 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9015 for (i = 0; i < argc; i++) {
9017 error = got_object_id_by_path(&id, repo, commit_id,
9022 error = got_repo_match_object_id(&id, &label, argv[i],
9023 GOT_OBJ_TYPE_ANY, 0, repo);
9025 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9026 error->code != GOT_ERR_NOT_REF)
9028 error = got_object_id_by_path(&id, repo,
9029 commit_id, argv[i]);
9035 error = got_object_get_type(&obj_type, repo, id);
9040 case GOT_OBJ_TYPE_BLOB:
9041 error = cat_blob(id, repo, stdout);
9043 case GOT_OBJ_TYPE_TREE:
9044 error = cat_tree(id, repo, stdout);
9046 case GOT_OBJ_TYPE_COMMIT:
9047 error = cat_commit(id, repo, stdout);
9049 case GOT_OBJ_TYPE_TAG:
9050 error = cat_tag(id, repo, stdout);
9053 error = got_error(GOT_ERR_OBJ_TYPE);
9068 got_worktree_close(worktree);
9070 const struct got_error *repo_error;
9071 repo_error = got_repo_close(repo);