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);
1181 printf("Connecting to %s%s%s\n", host,
1182 port ? ":" : "", port ? port : "");
1184 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1185 server_path, verbosity);
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);
1909 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
1910 port ? ":" : "", port ? port : "");
1912 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1913 server_path, verbosity);
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 get_changed_paths(struct got_pathlist_head *paths,
2896 struct got_commit_object *commit, struct got_repository *repo)
2898 const struct got_error *err = NULL;
2899 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
2900 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2901 struct got_object_qid *qid;
2903 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2905 struct got_commit_object *pcommit;
2906 err = got_object_open_as_commit(&pcommit, repo,
2911 tree_id1 = got_object_commit_get_tree_id(pcommit);
2912 got_object_commit_close(pcommit);
2917 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2922 tree_id2 = got_object_commit_get_tree_id(commit);
2923 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2927 err = got_diff_tree(tree1, tree2, "", "", repo,
2928 got_diff_tree_collect_changed_paths, paths, 0);
2931 got_object_tree_close(tree1);
2933 got_object_tree_close(tree2);
2937 static const struct got_error *
2938 print_patch(struct got_commit_object *commit, struct got_object_id *id,
2939 const char *path, int diff_context, struct got_repository *repo)
2941 const struct got_error *err = NULL;
2942 struct got_commit_object *pcommit = NULL;
2943 char *id_str1 = NULL, *id_str2 = NULL;
2944 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2945 struct got_object_qid *qid;
2947 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2949 err = got_object_open_as_commit(&pcommit, repo,
2955 if (path && path[0] != '\0') {
2957 err = got_object_id_by_path(&obj_id2, repo, id, path);
2960 err = got_object_id_str(&id_str2, obj_id2);
2966 err = got_object_id_by_path(&obj_id1, repo,
2969 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
2974 err = got_object_id_str(&id_str1, obj_id1);
2981 err = got_object_get_type(&obj_type, repo, obj_id2);
2986 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2988 case GOT_OBJ_TYPE_BLOB:
2989 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2992 case GOT_OBJ_TYPE_TREE:
2993 err = diff_trees(obj_id1, obj_id2, path, diff_context,
2997 err = got_error(GOT_ERR_OBJ_TYPE);
3003 obj_id2 = got_object_commit_get_tree_id(commit);
3004 err = got_object_id_str(&id_str2, obj_id2);
3007 obj_id1 = got_object_commit_get_tree_id(pcommit);
3008 err = got_object_id_str(&id_str1, obj_id1);
3011 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3012 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
3018 got_object_commit_close(pcommit);
3023 get_datestr(time_t *time, char *datebuf)
3025 struct tm mytm, *tm;
3028 tm = gmtime_r(time, &mytm);
3031 s = asctime_r(tm, datebuf);
3034 p = strchr(s, '\n');
3040 static const struct got_error *
3041 match_logmsg(int *have_match, struct got_object_id *id,
3042 struct got_commit_object *commit, regex_t *regex)
3044 const struct got_error *err = NULL;
3045 regmatch_t regmatch;
3046 char *id_str = NULL, *logmsg = NULL;
3050 err = got_object_id_str(&id_str, id);
3054 err = got_object_commit_get_logmsg(&logmsg, commit);
3058 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3067 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3070 regmatch_t regmatch;
3071 struct got_pathlist_entry *pe;
3075 TAILQ_FOREACH(pe, changed_paths, entry) {
3076 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3083 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3085 static const struct got_error *
3086 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3087 struct got_repository *repo, const char *path,
3088 struct got_pathlist_head *changed_paths, int show_patch,
3089 int diff_context, struct got_reflist_head *refs)
3091 const struct got_error *err = NULL;
3092 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3094 time_t committer_time;
3095 const char *author, *committer;
3096 char *refs_str = NULL;
3097 struct got_reflist_entry *re;
3099 SIMPLEQ_FOREACH(re, refs, entry) {
3102 struct got_tag_object *tag = NULL;
3105 name = got_ref_get_name(re->ref);
3106 if (strcmp(name, GOT_REF_HEAD) == 0)
3108 if (strncmp(name, "refs/", 5) == 0)
3110 if (strncmp(name, "got/", 4) == 0)
3112 if (strncmp(name, "heads/", 6) == 0)
3114 if (strncmp(name, "remotes/", 8) == 0) {
3116 s = strstr(name, "/" GOT_REF_HEAD);
3117 if (s != NULL && s[strlen(s)] == '\0')
3120 if (strncmp(name, "tags/", 5) == 0) {
3121 err = got_object_open_as_tag(&tag, repo, re->id);
3123 if (err->code != GOT_ERR_OBJ_TYPE)
3125 /* Ref points at something other than a tag. */
3130 cmp = got_object_id_cmp(tag ?
3131 got_object_tag_get_object_id(tag) : re->id, id);
3133 got_object_tag_close(tag);
3137 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3139 err = got_error_from_errno("asprintf");
3145 err = got_object_id_str(&id_str, id);
3149 printf(GOT_COMMIT_SEP_STR);
3150 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3151 refs_str ? refs_str : "", refs_str ? ")" : "");
3156 printf("from: %s\n", got_object_commit_get_author(commit));
3157 committer_time = got_object_commit_get_committer_time(commit);
3158 datestr = get_datestr(&committer_time, datebuf);
3160 printf("date: %s UTC\n", datestr);
3161 author = got_object_commit_get_author(commit);
3162 committer = got_object_commit_get_committer(commit);
3163 if (strcmp(author, committer) != 0)
3164 printf("via: %s\n", committer);
3165 if (got_object_commit_get_nparents(commit) > 1) {
3166 const struct got_object_id_queue *parent_ids;
3167 struct got_object_qid *qid;
3169 parent_ids = got_object_commit_get_parent_ids(commit);
3170 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3171 err = got_object_id_str(&id_str, qid->id);
3174 printf("parent %d: %s\n", n++, id_str);
3179 err = got_object_commit_get_logmsg(&logmsg0, commit);
3185 line = strsep(&logmsg, "\n");
3187 printf(" %s\n", line);
3191 if (changed_paths) {
3192 struct got_pathlist_entry *pe;
3193 TAILQ_FOREACH(pe, changed_paths, entry) {
3194 struct got_diff_changed_path *cp = pe->data;
3195 printf(" %c %s\n", cp->status, pe->path);
3200 err = print_patch(commit, id, path, diff_context, repo);
3205 if (fflush(stdout) != 0 && err == NULL)
3206 err = got_error_from_errno("fflush");
3210 static const struct got_error *
3211 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3212 struct got_repository *repo, const char *path, int show_changed_paths,
3213 int show_patch, const char *search_pattern, int diff_context, int limit,
3214 int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3216 const struct got_error *err;
3217 struct got_commit_graph *graph;
3220 struct got_object_id_queue reversed_commits;
3221 struct got_object_qid *qid;
3222 struct got_commit_object *commit;
3223 struct got_pathlist_head changed_paths;
3224 struct got_pathlist_entry *pe;
3226 SIMPLEQ_INIT(&reversed_commits);
3227 TAILQ_INIT(&changed_paths);
3229 if (search_pattern && regcomp(®ex, search_pattern,
3230 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3231 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3233 err = got_commit_graph_open(&graph, path, !log_branches);
3236 err = got_commit_graph_iter_start(graph, root_id, repo,
3237 check_cancelled, NULL);
3241 struct got_object_id *id;
3243 if (sigint_received || sigpipe_received)
3246 err = got_commit_graph_iter_next(&id, graph, repo,
3247 check_cancelled, NULL);
3249 if (err->code == GOT_ERR_ITER_COMPLETED)
3256 err = got_object_open_as_commit(&commit, repo, id);
3260 if (show_changed_paths) {
3261 err = get_changed_paths(&changed_paths, commit, repo);
3266 if (search_pattern) {
3267 err = match_logmsg(&have_match, id, commit, ®ex);
3269 got_object_commit_close(commit);
3272 if (have_match == 0 && show_changed_paths)
3273 match_changed_paths(&have_match,
3274 &changed_paths, ®ex);
3275 if (have_match == 0) {
3276 got_object_commit_close(commit);
3277 TAILQ_FOREACH(pe, &changed_paths, entry) {
3278 free((char *)pe->path);
3281 got_pathlist_free(&changed_paths);
3286 if (reverse_display_order) {
3287 err = got_object_qid_alloc(&qid, id);
3290 SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3291 got_object_commit_close(commit);
3293 err = print_commit(commit, id, repo, path,
3294 show_changed_paths ? &changed_paths : NULL,
3295 show_patch, diff_context, refs);
3296 got_object_commit_close(commit);
3300 if ((limit && --limit == 0) ||
3301 (end_id && got_object_id_cmp(id, end_id) == 0))
3304 TAILQ_FOREACH(pe, &changed_paths, entry) {
3305 free((char *)pe->path);
3308 got_pathlist_free(&changed_paths);
3310 if (reverse_display_order) {
3311 SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3312 err = got_object_open_as_commit(&commit, repo, qid->id);
3315 err = print_commit(commit, qid->id, repo, path,
3316 show_changed_paths ? &changed_paths : NULL,
3317 show_patch, diff_context, refs);
3318 got_object_commit_close(commit);
3324 while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3325 qid = SIMPLEQ_FIRST(&reversed_commits);
3326 SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3327 got_object_qid_free(qid);
3329 TAILQ_FOREACH(pe, &changed_paths, entry) {
3330 free((char *)pe->path);
3333 got_pathlist_free(&changed_paths);
3336 got_commit_graph_close(graph);
3343 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3344 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3345 "[-R] [path]\n", getprogname());
3350 get_default_log_limit(void)
3352 const char *got_default_log_limit;
3356 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3357 if (got_default_log_limit == NULL)
3359 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3365 static const struct got_error *
3366 resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3367 struct got_repository *repo)
3369 const struct got_error *err = NULL;
3370 struct got_reference *ref;
3374 err = got_ref_open(&ref, repo, commit_arg, 0);
3377 err = got_ref_resolve(id, repo, ref);
3381 err = got_object_get_type(&obj_type, repo, *id);
3384 if (obj_type == GOT_OBJ_TYPE_TAG) {
3385 struct got_tag_object *tag;
3386 err = got_object_open_as_tag(&tag, repo, *id);
3389 if (got_object_tag_get_object_type(tag) !=
3390 GOT_OBJ_TYPE_COMMIT) {
3391 got_object_tag_close(tag);
3392 return got_error(GOT_ERR_OBJ_TYPE);
3395 *id = got_object_id_dup(
3396 got_object_tag_get_object_id(tag));
3398 err = got_error_from_errno(
3399 "got_object_id_dup");
3400 got_object_tag_close(tag);
3403 } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3404 return got_error(GOT_ERR_OBJ_TYPE);
3406 err = got_repo_match_object_id_prefix(id, commit_arg,
3407 GOT_OBJ_TYPE_COMMIT, repo);
3413 static const struct got_error *
3414 cmd_log(int argc, char *argv[])
3416 const struct got_error *error;
3417 struct got_repository *repo = NULL;
3418 struct got_worktree *worktree = NULL;
3419 struct got_object_id *start_id = NULL, *end_id = NULL;
3420 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3421 const char *start_commit = NULL, *end_commit = NULL;
3422 const char *search_pattern = NULL;
3423 int diff_context = -1, ch;
3424 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3425 int reverse_display_order = 0;
3427 struct got_reflist_head refs;
3429 SIMPLEQ_INIT(&refs);
3432 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3438 limit = get_default_log_limit();
3440 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3446 show_changed_paths = 1;
3449 start_commit = optarg;
3452 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3455 err(1, "-C option %s", errstr);
3458 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3460 err(1, "-l option %s", errstr);
3466 repo_path = realpath(optarg, NULL);
3467 if (repo_path == NULL)
3468 return got_error_from_errno2("realpath",
3470 got_path_strip_trailing_slashes(repo_path);
3473 reverse_display_order = 1;
3476 search_pattern = optarg;
3479 end_commit = optarg;
3490 if (diff_context == -1)
3492 else if (!show_patch)
3493 errx(1, "-C reguires -p");
3495 cwd = getcwd(NULL, 0);
3497 error = got_error_from_errno("getcwd");
3501 if (repo_path == NULL) {
3502 error = got_worktree_open(&worktree, cwd);
3503 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3511 error = got_error_from_errno("strdup");
3514 } else if (argc == 1) {
3516 error = got_worktree_resolve_path(&path, worktree,
3521 path = strdup(argv[0]);
3523 error = got_error_from_errno("strdup");
3530 if (repo_path == NULL) {
3531 repo_path = worktree ?
3532 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3534 if (repo_path == NULL) {
3535 error = got_error_from_errno("strdup");
3539 error = got_repo_open(&repo, repo_path, NULL);
3543 error = apply_unveil(got_repo_get_path(repo), 1,
3544 worktree ? got_worktree_get_root_path(worktree) : NULL);
3548 if (start_commit == NULL) {
3549 struct got_reference *head_ref;
3550 struct got_commit_object *commit = NULL;
3551 error = got_ref_open(&head_ref, repo,
3552 worktree ? got_worktree_get_head_ref_name(worktree)
3556 error = got_ref_resolve(&start_id, repo, head_ref);
3557 got_ref_close(head_ref);
3560 error = got_object_open_as_commit(&commit, repo,
3564 got_object_commit_close(commit);
3566 error = resolve_commit_arg(&start_id, start_commit, repo);
3570 if (end_commit != NULL) {
3571 error = resolve_commit_arg(&end_id, end_commit, repo);
3577 const char *prefix = got_worktree_get_path_prefix(worktree);
3579 if (asprintf(&p, "%s%s%s", prefix,
3580 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3581 error = got_error_from_errno("asprintf");
3584 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3587 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3592 path = in_repo_path;
3595 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3599 error = print_commits(start_id, end_id, repo, path, show_changed_paths,
3600 show_patch, search_pattern, diff_context, limit, log_branches,
3601 reverse_display_order, &refs);
3607 got_worktree_close(worktree);
3609 const struct got_error *repo_error;
3610 repo_error = got_repo_close(repo);
3614 got_ref_list_free(&refs);
3621 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3622 "[-w] [object1 object2 | path]\n", getprogname());
3626 struct print_diff_arg {
3627 struct got_repository *repo;
3628 struct got_worktree *worktree;
3633 int ignore_whitespace;
3636 static const struct got_error *
3637 print_diff(void *arg, unsigned char status, unsigned char staged_status,
3638 const char *path, struct got_object_id *blob_id,
3639 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3640 int dirfd, const char *de_name)
3642 struct print_diff_arg *a = arg;
3643 const struct got_error *err = NULL;
3644 struct got_blob_object *blob1 = NULL;
3647 char *abspath = NULL, *label1 = NULL;
3650 if (a->diff_staged) {
3651 if (staged_status != GOT_STATUS_MODIFY &&
3652 staged_status != GOT_STATUS_ADD &&
3653 staged_status != GOT_STATUS_DELETE)
3656 if (staged_status == GOT_STATUS_DELETE)
3658 if (status == GOT_STATUS_NONEXISTENT)
3659 return got_error_set_errno(ENOENT, path);
3660 if (status != GOT_STATUS_MODIFY &&
3661 status != GOT_STATUS_ADD &&
3662 status != GOT_STATUS_DELETE &&
3663 status != GOT_STATUS_CONFLICT)
3667 if (!a->header_shown) {
3668 printf("diff %s %s%s\n", a->id_str,
3669 got_worktree_get_root_path(a->worktree),
3670 a->diff_staged ? " (staged changes)" : "");
3671 a->header_shown = 1;
3674 if (a->diff_staged) {
3675 const char *label1 = NULL, *label2 = NULL;
3676 switch (staged_status) {
3677 case GOT_STATUS_MODIFY:
3681 case GOT_STATUS_ADD:
3684 case GOT_STATUS_DELETE:
3688 return got_error(GOT_ERR_FILE_STATUS);
3690 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3691 label1, label2, a->diff_context, a->ignore_whitespace,
3695 if (staged_status == GOT_STATUS_ADD ||
3696 staged_status == GOT_STATUS_MODIFY) {
3698 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3702 err = got_object_id_str(&id_str, staged_blob_id);
3705 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3706 err = got_error_from_errno("asprintf");
3711 } else if (status != GOT_STATUS_ADD) {
3712 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3717 if (status != GOT_STATUS_DELETE) {
3718 if (asprintf(&abspath, "%s/%s",
3719 got_worktree_get_root_path(a->worktree), path) == -1) {
3720 err = got_error_from_errno("asprintf");
3725 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3727 err = got_error_from_errno2("openat", abspath);
3731 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3733 err = got_error_from_errno2("open", abspath);
3737 if (fstat(fd, &sb) == -1) {
3738 err = got_error_from_errno2("fstat", abspath);
3741 f2 = fdopen(fd, "r");
3743 err = got_error_from_errno2("fdopen", abspath);
3750 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3751 a->diff_context, a->ignore_whitespace, stdout);
3754 got_object_blob_close(blob1);
3755 if (f2 && fclose(f2) == EOF && err == NULL)
3756 err = got_error_from_errno("fclose");
3757 if (fd != -1 && close(fd) == -1 && err == NULL)
3758 err = got_error_from_errno("close");
3763 static const struct got_error *
3764 cmd_diff(int argc, char *argv[])
3766 const struct got_error *error;
3767 struct got_repository *repo = NULL;
3768 struct got_worktree *worktree = NULL;
3769 char *cwd = NULL, *repo_path = NULL;
3770 struct got_object_id *id1 = NULL, *id2 = NULL;
3771 const char *id_str1 = NULL, *id_str2 = NULL;
3772 char *label1 = NULL, *label2 = NULL;
3774 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3779 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3784 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3787 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3790 err(1, "-C option %s", errstr);
3793 repo_path = realpath(optarg, NULL);
3794 if (repo_path == NULL)
3795 return got_error_from_errno2("realpath",
3797 got_path_strip_trailing_slashes(repo_path);
3803 ignore_whitespace = 1;
3814 cwd = getcwd(NULL, 0);
3816 error = got_error_from_errno("getcwd");
3822 "-r option can't be used when diffing a work tree");
3823 error = got_worktree_open(&worktree, cwd);
3825 if (error->code == GOT_ERR_NOT_WORKTREE)
3826 error = wrap_not_worktree_error(error, "diff",
3830 repo_path = strdup(got_worktree_get_repo_path(worktree));
3831 if (repo_path == NULL) {
3832 error = got_error_from_errno("strdup");
3836 error = got_worktree_resolve_path(&path, worktree,
3843 error = got_error_from_errno("strdup");
3847 } else if (argc == 2) {
3849 errx(1, "-s option can't be used when diffing "
3850 "objects in repository");
3853 if (repo_path == NULL) {
3854 error = got_worktree_open(&worktree, cwd);
3855 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3859 got_worktree_get_repo_path(worktree));
3860 if (repo_path == NULL) {
3861 error = got_error_from_errno("strdup");
3865 repo_path = strdup(cwd);
3866 if (repo_path == NULL) {
3867 error = got_error_from_errno("strdup");
3875 error = got_repo_open(&repo, repo_path, NULL);
3880 error = apply_unveil(got_repo_get_path(repo), 1,
3881 worktree ? got_worktree_get_root_path(worktree) : NULL);
3886 struct print_diff_arg arg;
3887 struct got_pathlist_head paths;
3892 error = got_object_id_str(&id_str,
3893 got_worktree_get_base_commit_id(worktree));
3897 arg.worktree = worktree;
3898 arg.diff_context = diff_context;
3899 arg.id_str = id_str;
3900 arg.header_shown = 0;
3901 arg.diff_staged = diff_staged;
3902 arg.ignore_whitespace = ignore_whitespace;
3904 error = got_pathlist_append(&paths, path, NULL);
3908 error = got_worktree_status(worktree, &paths, repo, print_diff,
3909 &arg, check_cancelled, NULL);
3911 got_pathlist_free(&paths);
3915 error = got_repo_match_object_id(&id1, &label1, id_str1,
3916 GOT_OBJ_TYPE_ANY, 1, repo);
3920 error = got_repo_match_object_id(&id2, &label2, id_str2,
3921 GOT_OBJ_TYPE_ANY, 1, repo);
3925 error = got_object_get_type(&type1, repo, id1);
3929 error = got_object_get_type(&type2, repo, id2);
3933 if (type1 != type2) {
3934 error = got_error(GOT_ERR_OBJ_TYPE);
3939 case GOT_OBJ_TYPE_BLOB:
3940 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3941 diff_context, ignore_whitespace, repo, stdout);
3943 case GOT_OBJ_TYPE_TREE:
3944 error = got_diff_objects_as_trees(id1, id2, "", "",
3945 diff_context, ignore_whitespace, repo, stdout);
3947 case GOT_OBJ_TYPE_COMMIT:
3948 printf("diff %s %s\n", label1, label2);
3949 error = got_diff_objects_as_commits(id1, id2, diff_context,
3950 ignore_whitespace, repo, stdout);
3953 error = got_error(GOT_ERR_OBJ_TYPE);
3962 got_worktree_close(worktree);
3964 const struct got_error *repo_error;
3965 repo_error = got_repo_close(repo);
3976 "usage: %s blame [-c commit] [-r repository-path] path\n",
3985 char datebuf[11]; /* YYYY-MM-DD + NUL */
3988 struct blame_cb_args {
3989 struct blame_line *lines;
3993 off_t *line_offsets;
3995 struct got_repository *repo;
3998 static const struct got_error *
3999 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4001 const struct got_error *err = NULL;
4002 struct blame_cb_args *a = arg;
4003 struct blame_line *bline;
4005 size_t linesize = 0;
4006 struct got_commit_object *commit = NULL;
4009 time_t committer_time;
4011 if (nlines != a->nlines ||
4012 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4013 return got_error(GOT_ERR_RANGE);
4015 if (sigint_received)
4016 return got_error(GOT_ERR_ITER_COMPLETED);
4019 return NULL; /* no change in this commit */
4021 /* Annotate this line. */
4022 bline = &a->lines[lineno - 1];
4023 if (bline->annotated)
4025 err = got_object_id_str(&bline->id_str, id);
4029 err = got_object_open_as_commit(&commit, a->repo, id);
4033 bline->committer = strdup(got_object_commit_get_committer(commit));
4034 if (bline->committer == NULL) {
4035 err = got_error_from_errno("strdup");
4039 committer_time = got_object_commit_get_committer_time(commit);
4040 if (localtime_r(&committer_time, &tm) == NULL)
4041 return got_error_from_errno("localtime_r");
4042 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4043 &tm) >= sizeof(bline->datebuf)) {
4044 err = got_error(GOT_ERR_NO_SPACE);
4047 bline->annotated = 1;
4049 /* Print lines annotated so far. */
4050 bline = &a->lines[a->lineno_cur - 1];
4051 if (!bline->annotated)
4054 offset = a->line_offsets[a->lineno_cur - 1];
4055 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4056 err = got_error_from_errno("fseeko");
4060 while (bline->annotated) {
4061 char *smallerthan, *at, *nl, *committer;
4064 if (getline(&line, &linesize, a->f) == -1) {
4066 err = got_error_from_errno("getline");
4070 committer = bline->committer;
4071 smallerthan = strchr(committer, '<');
4072 if (smallerthan && smallerthan[1] != '\0')
4073 committer = smallerthan + 1;
4074 at = strchr(committer, '@');
4077 len = strlen(committer);
4079 committer[8] = '\0';
4081 nl = strchr(line, '\n');
4084 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4085 bline->id_str, bline->datebuf, committer, line);
4088 bline = &a->lines[a->lineno_cur - 1];
4092 got_object_commit_close(commit);
4097 static const struct got_error *
4098 cmd_blame(int argc, char *argv[])
4100 const struct got_error *error;
4101 struct got_repository *repo = NULL;
4102 struct got_worktree *worktree = NULL;
4103 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4104 struct got_object_id *obj_id = NULL;
4105 struct got_object_id *commit_id = NULL;
4106 struct got_blob_object *blob = NULL;
4107 char *commit_id_str = NULL;
4108 struct blame_cb_args bca;
4109 int ch, obj_type, i;
4112 memset(&bca, 0, sizeof(bca));
4115 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4120 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4123 commit_id_str = optarg;
4126 repo_path = realpath(optarg, NULL);
4127 if (repo_path == NULL)
4128 return got_error_from_errno2("realpath",
4130 got_path_strip_trailing_slashes(repo_path);
4146 cwd = getcwd(NULL, 0);
4148 error = got_error_from_errno("getcwd");
4151 if (repo_path == NULL) {
4152 error = got_worktree_open(&worktree, cwd);
4153 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4159 strdup(got_worktree_get_repo_path(worktree));
4160 if (repo_path == NULL) {
4161 error = got_error_from_errno("strdup");
4166 repo_path = strdup(cwd);
4167 if (repo_path == NULL) {
4168 error = got_error_from_errno("strdup");
4174 error = got_repo_open(&repo, repo_path, NULL);
4178 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4183 const char *prefix = got_worktree_get_path_prefix(worktree);
4184 char *p, *worktree_subdir = cwd +
4185 strlen(got_worktree_get_root_path(worktree));
4186 if (asprintf(&p, "%s%s%s%s%s",
4187 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4188 worktree_subdir, worktree_subdir[0] ? "/" : "",
4190 error = got_error_from_errno("asprintf");
4193 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4196 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4201 if (commit_id_str == NULL) {
4202 struct got_reference *head_ref;
4203 error = got_ref_open(&head_ref, repo, worktree ?
4204 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4207 error = got_ref_resolve(&commit_id, repo, head_ref);
4208 got_ref_close(head_ref);
4212 error = got_repo_match_object_id(&commit_id, NULL,
4213 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4218 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
4222 error = got_object_get_type(&obj_type, repo, obj_id);
4226 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4227 error = got_error(GOT_ERR_OBJ_TYPE);
4231 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4234 bca.f = got_opentemp();
4235 if (bca.f == NULL) {
4236 error = got_error_from_errno("got_opentemp");
4239 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4240 &bca.line_offsets, bca.f, blob);
4241 if (error || bca.nlines == 0)
4244 /* Don't include \n at EOF in the blame line count. */
4245 if (bca.line_offsets[bca.nlines - 1] == filesize)
4248 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4249 if (bca.lines == NULL) {
4250 error = got_error_from_errno("calloc");
4254 bca.nlines_prec = 0;
4262 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
4263 check_cancelled, NULL);
4271 got_object_blob_close(blob);
4273 got_worktree_close(worktree);
4275 const struct got_error *repo_error;
4276 repo_error = got_repo_close(repo);
4281 for (i = 0; i < bca.nlines; i++) {
4282 struct blame_line *bline = &bca.lines[i];
4283 free(bline->id_str);
4284 free(bline->committer);
4288 free(bca.line_offsets);
4289 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4290 error = got_error_from_errno("fclose");
4298 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
4304 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4305 const char *root_path)
4307 int is_root_path = (strcmp(path, root_path) == 0);
4308 const char *modestr = "";
4309 mode_t mode = got_tree_entry_get_mode(te);
4311 path += strlen(root_path);
4312 while (path[0] == '/')
4315 if (got_object_tree_entry_is_submodule(te))
4317 else if (S_ISLNK(mode))
4319 else if (S_ISDIR(mode))
4321 else if (mode & S_IXUSR)
4324 printf("%s%s%s%s%s\n", id ? id : "", path,
4325 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
4328 static const struct got_error *
4329 print_tree(const char *path, struct got_object_id *commit_id,
4330 int show_ids, int recurse, const char *root_path,
4331 struct got_repository *repo)
4333 const struct got_error *err = NULL;
4334 struct got_object_id *tree_id = NULL;
4335 struct got_tree_object *tree = NULL;
4338 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4342 err = got_object_open_as_tree(&tree, repo, tree_id);
4345 nentries = got_object_tree_get_nentries(tree);
4346 for (i = 0; i < nentries; i++) {
4347 struct got_tree_entry *te;
4350 if (sigint_received || sigpipe_received)
4353 te = got_object_tree_get_entry(tree, i);
4356 err = got_object_id_str(&id_str,
4357 got_tree_entry_get_id(te));
4360 if (asprintf(&id, "%s ", id_str) == -1) {
4361 err = got_error_from_errno("asprintf");
4367 print_entry(te, id, path, root_path);
4370 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4372 if (asprintf(&child_path, "%s%s%s", path,
4373 path[0] == '/' && path[1] == '\0' ? "" : "/",
4374 got_tree_entry_get_name(te)) == -1) {
4375 err = got_error_from_errno("asprintf");
4378 err = print_tree(child_path, commit_id, show_ids, 1,
4387 got_object_tree_close(tree);
4392 static const struct got_error *
4393 cmd_tree(int argc, char *argv[])
4395 const struct got_error *error;
4396 struct got_repository *repo = NULL;
4397 struct got_worktree *worktree = NULL;
4398 const char *path, *refname = NULL;
4399 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4400 struct got_object_id *commit_id = NULL;
4401 char *commit_id_str = NULL;
4402 int show_ids = 0, recurse = 0;
4406 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4411 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4414 commit_id_str = optarg;
4417 repo_path = realpath(optarg, NULL);
4418 if (repo_path == NULL)
4419 return got_error_from_errno2("realpath",
4421 got_path_strip_trailing_slashes(repo_path);
4445 cwd = getcwd(NULL, 0);
4447 error = got_error_from_errno("getcwd");
4450 if (repo_path == NULL) {
4451 error = got_worktree_open(&worktree, cwd);
4452 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4458 strdup(got_worktree_get_repo_path(worktree));
4459 if (repo_path == NULL)
4460 error = got_error_from_errno("strdup");
4464 repo_path = strdup(cwd);
4465 if (repo_path == NULL) {
4466 error = got_error_from_errno("strdup");
4472 error = got_repo_open(&repo, repo_path, NULL);
4476 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4482 char *p, *worktree_subdir = cwd +
4483 strlen(got_worktree_get_root_path(worktree));
4484 if (asprintf(&p, "%s/%s",
4485 got_worktree_get_path_prefix(worktree),
4486 worktree_subdir) == -1) {
4487 error = got_error_from_errno("asprintf");
4490 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4497 if (in_repo_path == NULL) {
4498 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4503 if (commit_id_str == NULL) {
4504 struct got_reference *head_ref;
4506 refname = got_worktree_get_head_ref_name(worktree);
4508 refname = GOT_REF_HEAD;
4509 error = got_ref_open(&head_ref, repo, refname, 0);
4512 error = got_ref_resolve(&commit_id, repo, head_ref);
4513 got_ref_close(head_ref);
4517 error = got_repo_match_object_id(&commit_id, NULL,
4518 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4523 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4524 in_repo_path, repo);
4531 got_worktree_close(worktree);
4533 const struct got_error *repo_error;
4534 repo_error = got_repo_close(repo);
4544 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4548 static const struct got_error *
4549 print_status(void *arg, unsigned char status, unsigned char staged_status,
4550 const char *path, struct got_object_id *blob_id,
4551 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4552 int dirfd, const char *de_name)
4554 if (status == staged_status && (status == GOT_STATUS_DELETE))
4555 status = GOT_STATUS_NO_CHANGE;
4556 printf("%c%c %s\n", status, staged_status, path);
4560 static const struct got_error *
4561 cmd_status(int argc, char *argv[])
4563 const struct got_error *error = NULL;
4564 struct got_repository *repo = NULL;
4565 struct got_worktree *worktree = NULL;
4567 struct got_pathlist_head paths;
4568 struct got_pathlist_entry *pe;
4573 while ((ch = getopt(argc, argv, "")) != -1) {
4585 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4589 cwd = getcwd(NULL, 0);
4591 error = got_error_from_errno("getcwd");
4595 error = got_worktree_open(&worktree, cwd);
4597 if (error->code == GOT_ERR_NOT_WORKTREE)
4598 error = wrap_not_worktree_error(error, "status", cwd);
4602 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4607 error = apply_unveil(got_repo_get_path(repo), 1,
4608 got_worktree_get_root_path(worktree));
4612 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4616 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4617 check_cancelled, NULL);
4619 TAILQ_FOREACH(pe, &paths, entry)
4620 free((char *)pe->path);
4621 got_pathlist_free(&paths);
4630 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4636 static const struct got_error *
4637 list_refs(struct got_repository *repo, const char *refname)
4639 static const struct got_error *err = NULL;
4640 struct got_reflist_head refs;
4641 struct got_reflist_entry *re;
4643 SIMPLEQ_INIT(&refs);
4644 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4648 SIMPLEQ_FOREACH(re, &refs, entry) {
4650 refstr = got_ref_to_str(re->ref);
4652 return got_error_from_errno("got_ref_to_str");
4653 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4657 got_ref_list_free(&refs);
4661 static const struct got_error *
4662 delete_ref(struct got_repository *repo, const char *refname)
4664 const struct got_error *err = NULL;
4665 struct got_reference *ref;
4667 err = got_ref_open(&ref, repo, refname, 0);
4671 err = got_ref_delete(ref, repo);
4676 static const struct got_error *
4677 add_ref(struct got_repository *repo, const char *refname, const char *target)
4679 const struct got_error *err = NULL;
4680 struct got_object_id *id;
4681 struct got_reference *ref = NULL;
4684 * Don't let the user create a reference name with a leading '-'.
4685 * While technically a valid reference name, this case is usually
4686 * an unintended typo.
4688 if (refname[0] == '-')
4689 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4691 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4694 struct got_reference *target_ref;
4696 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4698 err = got_ref_open(&target_ref, repo, target, 0);
4701 err = got_ref_resolve(&id, repo, target_ref);
4702 got_ref_close(target_ref);
4707 err = got_ref_alloc(&ref, refname, id);
4711 err = got_ref_write(ref, repo);
4719 static const struct got_error *
4720 add_symref(struct got_repository *repo, const char *refname, const char *target)
4722 const struct got_error *err = NULL;
4723 struct got_reference *ref = NULL;
4724 struct got_reference *target_ref = NULL;
4727 * Don't let the user create a reference name with a leading '-'.
4728 * While technically a valid reference name, this case is usually
4729 * an unintended typo.
4731 if (refname[0] == '-')
4732 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4734 err = got_ref_open(&target_ref, repo, target, 0);
4738 err = got_ref_alloc_symref(&ref, refname, target_ref);
4742 err = got_ref_write(ref, repo);
4745 got_ref_close(target_ref);
4751 static const struct got_error *
4752 cmd_ref(int argc, char *argv[])
4754 const struct got_error *error = NULL;
4755 struct got_repository *repo = NULL;
4756 struct got_worktree *worktree = NULL;
4757 char *cwd = NULL, *repo_path = NULL;
4758 int ch, do_list = 0, do_delete = 0;
4759 const char *obj_arg = NULL, *symref_target= NULL;
4760 char *refname = NULL;
4762 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
4771 repo_path = realpath(optarg, NULL);
4772 if (repo_path == NULL)
4773 return got_error_from_errno2("realpath",
4775 got_path_strip_trailing_slashes(repo_path);
4781 symref_target = optarg;
4789 if (obj_arg && do_list)
4790 errx(1, "-c and -l options are mutually exclusive");
4791 if (obj_arg && do_delete)
4792 errx(1, "-c and -d options are mutually exclusive");
4793 if (obj_arg && symref_target)
4794 errx(1, "-c and -s options are mutually exclusive");
4795 if (symref_target && do_delete)
4796 errx(1, "-s and -d options are mutually exclusive");
4797 if (symref_target && do_list)
4798 errx(1, "-s and -l options are mutually exclusive");
4799 if (do_delete && do_list)
4800 errx(1, "-d and -l options are mutually exclusive");
4806 if (argc != 0 && argc != 1)
4809 refname = strdup(argv[0]);
4810 if (refname == NULL) {
4811 error = got_error_from_errno("strdup");
4818 refname = strdup(argv[0]);
4819 if (refname == NULL) {
4820 error = got_error_from_errno("strdup");
4826 got_path_strip_trailing_slashes(refname);
4830 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4834 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4835 "sendfd unveil", NULL) == -1)
4839 cwd = getcwd(NULL, 0);
4841 error = got_error_from_errno("getcwd");
4845 if (repo_path == NULL) {
4846 error = got_worktree_open(&worktree, cwd);
4847 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4853 strdup(got_worktree_get_repo_path(worktree));
4854 if (repo_path == NULL)
4855 error = got_error_from_errno("strdup");
4859 repo_path = strdup(cwd);
4860 if (repo_path == NULL) {
4861 error = got_error_from_errno("strdup");
4867 error = got_repo_open(&repo, repo_path, NULL);
4871 error = apply_unveil(got_repo_get_path(repo), do_list,
4872 worktree ? got_worktree_get_root_path(worktree) : NULL);
4877 error = list_refs(repo, refname);
4879 error = delete_ref(repo, refname);
4880 else if (symref_target)
4881 error = add_symref(repo, refname, symref_target);
4883 if (obj_arg == NULL)
4885 error = add_ref(repo, refname, obj_arg);
4890 got_repo_close(repo);
4892 got_worktree_close(worktree);
4902 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4903 "[name]\n", getprogname());
4907 static const struct got_error *
4908 list_branch(struct got_repository *repo, struct got_worktree *worktree,
4909 struct got_reference *ref)
4911 const struct got_error *err = NULL;
4912 const char *refname, *marker = " ";
4915 refname = got_ref_get_name(ref);
4916 if (worktree && strcmp(refname,
4917 got_worktree_get_head_ref_name(worktree)) == 0) {
4918 struct got_object_id *id = NULL;
4920 err = got_ref_resolve(&id, repo, ref);
4923 if (got_object_id_cmp(id,
4924 got_worktree_get_base_commit_id(worktree)) == 0)
4931 if (strncmp(refname, "refs/heads/", 11) == 0)
4933 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4936 refstr = got_ref_to_str(ref);
4938 return got_error_from_errno("got_ref_to_str");
4940 printf("%s%s: %s\n", marker, refname, refstr);
4945 static const struct got_error *
4946 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4948 const char *refname;
4950 if (worktree == NULL)
4951 return got_error(GOT_ERR_NOT_WORKTREE);
4953 refname = got_worktree_get_head_ref_name(worktree);
4955 if (strncmp(refname, "refs/heads/", 11) == 0)
4957 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4960 printf("%s\n", refname);
4965 static const struct got_error *
4966 list_branches(struct got_repository *repo, struct got_worktree *worktree)
4968 static const struct got_error *err = NULL;
4969 struct got_reflist_head refs;
4970 struct got_reflist_entry *re;
4971 struct got_reference *temp_ref = NULL;
4972 int rebase_in_progress, histedit_in_progress;
4974 SIMPLEQ_INIT(&refs);
4977 err = got_worktree_rebase_in_progress(&rebase_in_progress,
4982 err = got_worktree_histedit_in_progress(&histedit_in_progress,
4987 if (rebase_in_progress || histedit_in_progress) {
4988 err = got_ref_open(&temp_ref, repo,
4989 got_worktree_get_head_ref_name(worktree), 0);
4992 list_branch(repo, worktree, temp_ref);
4993 got_ref_close(temp_ref);
4997 err = got_ref_list(&refs, repo, "refs/heads",
4998 got_ref_cmp_by_name, NULL);
5002 SIMPLEQ_FOREACH(re, &refs, entry)
5003 list_branch(repo, worktree, re->ref);
5005 got_ref_list_free(&refs);
5009 static const struct got_error *
5010 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5011 const char *branch_name)
5013 const struct got_error *err = NULL;
5014 struct got_reference *ref = NULL;
5017 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5018 return got_error_from_errno("asprintf");
5020 err = got_ref_open(&ref, repo, refname, 0);
5025 strcmp(got_worktree_get_head_ref_name(worktree),
5026 got_ref_get_name(ref)) == 0) {
5027 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5028 "will not delete this work tree's current branch");
5032 err = got_ref_delete(ref, repo);
5040 static const struct got_error *
5041 add_branch(struct got_repository *repo, const char *branch_name,
5042 struct got_object_id *base_commit_id)
5044 const struct got_error *err = NULL;
5045 struct got_reference *ref = NULL;
5046 char *base_refname = NULL, *refname = NULL;
5049 * Don't let the user create a branch name with a leading '-'.
5050 * While technically a valid reference name, this case is usually
5051 * an unintended typo.
5053 if (branch_name[0] == '-')
5054 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5056 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5057 err = got_error_from_errno("asprintf");
5061 err = got_ref_open(&ref, repo, refname, 0);
5063 err = got_error(GOT_ERR_BRANCH_EXISTS);
5065 } else if (err->code != GOT_ERR_NOT_REF)
5068 err = got_ref_alloc(&ref, refname, base_commit_id);
5072 err = got_ref_write(ref, repo);
5081 static const struct got_error *
5082 cmd_branch(int argc, char *argv[])
5084 const struct got_error *error = NULL;
5085 struct got_repository *repo = NULL;
5086 struct got_worktree *worktree = NULL;
5087 char *cwd = NULL, *repo_path = NULL;
5088 int ch, do_list = 0, do_show = 0, do_update = 1;
5089 const char *delref = NULL, *commit_id_arg = NULL;
5090 struct got_reference *ref = NULL;
5091 struct got_pathlist_head paths;
5092 struct got_pathlist_entry *pe;
5093 struct got_object_id *commit_id = NULL;
5094 char *commit_id_str = NULL;
5098 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5101 commit_id_arg = optarg;
5107 repo_path = realpath(optarg, NULL);
5108 if (repo_path == NULL)
5109 return got_error_from_errno2("realpath",
5111 got_path_strip_trailing_slashes(repo_path);
5125 if (do_list && delref)
5126 errx(1, "-l and -d options are mutually exclusive");
5131 if (!do_list && !delref && argc == 0)
5134 if ((do_list || delref || do_show) && commit_id_arg != NULL)
5135 errx(1, "-c option can only be used when creating a branch");
5137 if (do_list || delref) {
5140 } else if (!do_show && argc != 1)
5144 if (do_list || do_show) {
5145 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5149 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5150 "sendfd unveil", NULL) == -1)
5154 cwd = getcwd(NULL, 0);
5156 error = got_error_from_errno("getcwd");
5160 if (repo_path == NULL) {
5161 error = got_worktree_open(&worktree, cwd);
5162 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5168 strdup(got_worktree_get_repo_path(worktree));
5169 if (repo_path == NULL)
5170 error = got_error_from_errno("strdup");
5174 repo_path = strdup(cwd);
5175 if (repo_path == NULL) {
5176 error = got_error_from_errno("strdup");
5182 error = got_repo_open(&repo, repo_path, NULL);
5186 error = apply_unveil(got_repo_get_path(repo), do_list,
5187 worktree ? got_worktree_get_root_path(worktree) : NULL);
5192 error = show_current_branch(repo, worktree);
5194 error = list_branches(repo, worktree);
5196 error = delete_branch(repo, worktree, delref);
5198 if (commit_id_arg == NULL)
5199 commit_id_arg = worktree ?
5200 got_worktree_get_head_ref_name(worktree) :
5202 error = got_repo_match_object_id(&commit_id, NULL,
5203 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5206 error = add_branch(repo, argv[0], commit_id);
5209 if (worktree && do_update) {
5210 struct got_update_progress_arg upa;
5211 char *branch_refname = NULL;
5213 error = got_object_id_str(&commit_id_str, commit_id);
5216 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5220 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5222 error = got_error_from_errno("asprintf");
5225 error = got_ref_open(&ref, repo, branch_refname, 0);
5226 free(branch_refname);
5229 error = switch_head_ref(ref, commit_id, worktree,
5233 error = got_worktree_set_base_commit_id(worktree, repo,
5237 memset(&upa, 0, sizeof(upa));
5238 error = got_worktree_checkout_files(worktree, &paths,
5239 repo, update_progress, &upa, check_cancelled,
5243 if (upa.did_something)
5244 printf("Updated to commit %s\n", commit_id_str);
5245 print_update_progress_stats(&upa);
5252 got_repo_close(repo);
5254 got_worktree_close(worktree);
5258 free(commit_id_str);
5259 TAILQ_FOREACH(pe, &paths, entry)
5260 free((char *)pe->path);
5261 got_pathlist_free(&paths);
5270 "usage: %s tag [-c commit] [-r repository] [-l] "
5271 "[-m message] name\n", getprogname());
5276 static const struct got_error *
5277 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5279 const struct got_error *err = NULL;
5280 struct got_reflist_entry *re, *se, *new;
5281 struct got_object_id *re_id, *se_id;
5282 struct got_tag_object *re_tag, *se_tag;
5283 time_t re_time, se_time;
5285 SIMPLEQ_FOREACH(re, tags, entry) {
5286 se = SIMPLEQ_FIRST(sorted);
5288 err = got_reflist_entry_dup(&new, re);
5291 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5294 err = got_ref_resolve(&re_id, repo, re->ref);
5297 err = got_object_open_as_tag(&re_tag, repo, re_id);
5301 re_time = got_object_tag_get_tagger_time(re_tag);
5302 got_object_tag_close(re_tag);
5306 err = got_ref_resolve(&se_id, repo, re->ref);
5309 err = got_object_open_as_tag(&se_tag, repo, se_id);
5313 se_time = got_object_tag_get_tagger_time(se_tag);
5314 got_object_tag_close(se_tag);
5316 if (se_time > re_time) {
5317 err = got_reflist_entry_dup(&new, re);
5320 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5323 se = SIMPLEQ_NEXT(se, entry);
5332 static const struct got_error *
5333 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5335 static const struct got_error *err = NULL;
5336 struct got_reflist_head refs;
5337 struct got_reflist_entry *re;
5339 SIMPLEQ_INIT(&refs);
5341 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5345 SIMPLEQ_FOREACH(re, &refs, entry) {
5346 const char *refname;
5347 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5351 struct got_object_id *id;
5352 struct got_tag_object *tag;
5353 struct got_commit_object *commit = NULL;
5355 refname = got_ref_get_name(re->ref);
5356 if (strncmp(refname, "refs/tags/", 10) != 0)
5359 refstr = got_ref_to_str(re->ref);
5360 if (refstr == NULL) {
5361 err = got_error_from_errno("got_ref_to_str");
5364 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5367 err = got_ref_resolve(&id, repo, re->ref);
5370 err = got_object_open_as_tag(&tag, repo, id);
5372 if (err->code != GOT_ERR_OBJ_TYPE) {
5376 /* "lightweight" tag */
5377 err = got_object_open_as_commit(&commit, repo, id);
5382 tagger = got_object_commit_get_committer(commit);
5384 got_object_commit_get_committer_time(commit);
5385 err = got_object_id_str(&id_str, id);
5391 tagger = got_object_tag_get_tagger(tag);
5392 tagger_time = got_object_tag_get_tagger_time(tag);
5393 err = got_object_id_str(&id_str,
5394 got_object_tag_get_object_id(tag));
5398 printf("from: %s\n", tagger);
5399 datestr = get_datestr(&tagger_time, datebuf);
5401 printf("date: %s UTC\n", datestr);
5403 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5405 switch (got_object_tag_get_object_type(tag)) {
5406 case GOT_OBJ_TYPE_BLOB:
5407 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5410 case GOT_OBJ_TYPE_TREE:
5411 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5414 case GOT_OBJ_TYPE_COMMIT:
5415 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5418 case GOT_OBJ_TYPE_TAG:
5419 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5428 err = got_object_commit_get_logmsg(&tagmsg0, commit);
5431 got_object_commit_close(commit);
5433 tagmsg0 = strdup(got_object_tag_get_message(tag));
5434 got_object_tag_close(tag);
5435 if (tagmsg0 == NULL) {
5436 err = got_error_from_errno("strdup");
5443 line = strsep(&tagmsg, "\n");
5445 printf(" %s\n", line);
5450 got_ref_list_free(&refs);
5454 static const struct got_error *
5455 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5456 const char *tag_name, const char *repo_path)
5458 const struct got_error *err = NULL;
5459 char *template = NULL, *initial_content = NULL;
5460 char *editor = NULL;
5463 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5464 err = got_error_from_errno("asprintf");
5468 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
5469 commit_id_str, tag_name) == -1) {
5470 err = got_error_from_errno("asprintf");
5474 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5478 dprintf(fd, initial_content);
5481 err = get_editor(&editor);
5484 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5486 free(initial_content);
5490 /* Editor is done; we can now apply unveil(2) */
5492 err = apply_unveil(repo_path, 0, NULL);
5501 static const struct got_error *
5502 add_tag(struct got_repository *repo, const char *tag_name,
5503 const char *commit_arg, const char *tagmsg_arg)
5505 const struct got_error *err = NULL;
5506 struct got_object_id *commit_id = NULL, *tag_id = NULL;
5507 char *label = NULL, *commit_id_str = NULL;
5508 struct got_reference *ref = NULL;
5509 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5510 char *tagmsg_path = NULL, *tag_id_str = NULL;
5511 int preserve_tagmsg = 0;
5514 * Don't let the user create a tag name with a leading '-'.
5515 * While technically a valid reference name, this case is usually
5516 * an unintended typo.
5518 if (tag_name[0] == '-')
5519 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5521 err = get_author(&tagger, repo);
5525 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5526 GOT_OBJ_TYPE_COMMIT, 1, repo);
5530 err = got_object_id_str(&commit_id_str, commit_id);
5534 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5535 refname = strdup(tag_name);
5536 if (refname == NULL) {
5537 err = got_error_from_errno("strdup");
5541 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5542 err = got_error_from_errno("asprintf");
5546 err = got_ref_open(&ref, repo, refname, 0);
5548 err = got_error(GOT_ERR_TAG_EXISTS);
5550 } else if (err->code != GOT_ERR_NOT_REF)
5553 if (tagmsg_arg == NULL) {
5554 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5555 tag_name, got_repo_get_path(repo));
5557 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5558 tagmsg_path != NULL)
5559 preserve_tagmsg = 1;
5564 err = got_object_tag_create(&tag_id, tag_name, commit_id,
5565 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5568 preserve_tagmsg = 1;
5572 err = got_ref_alloc(&ref, refname, tag_id);
5575 preserve_tagmsg = 1;
5579 err = got_ref_write(ref, repo);
5582 preserve_tagmsg = 1;
5586 err = got_object_id_str(&tag_id_str, tag_id);
5589 preserve_tagmsg = 1;
5592 printf("Created tag %s\n", tag_id_str);
5594 if (preserve_tagmsg) {
5595 fprintf(stderr, "%s: tag message preserved in %s\n",
5596 getprogname(), tagmsg_path);
5597 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5598 err = got_error_from_errno2("unlink", tagmsg_path);
5603 free(commit_id_str);
5611 static const struct got_error *
5612 cmd_tag(int argc, char *argv[])
5614 const struct got_error *error = NULL;
5615 struct got_repository *repo = NULL;
5616 struct got_worktree *worktree = NULL;
5617 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5618 char *gitconfig_path = NULL;
5619 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5620 int ch, do_list = 0;
5622 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5625 commit_id_arg = optarg;
5631 repo_path = realpath(optarg, NULL);
5632 if (repo_path == NULL)
5633 return got_error_from_errno2("realpath",
5635 got_path_strip_trailing_slashes(repo_path);
5650 if (commit_id_arg != NULL)
5652 "-c option can only be used when creating a tag");
5654 errx(1, "-l and -m options are mutually exclusive");
5657 } else if (argc != 1)
5664 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5668 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5669 "sendfd unveil", NULL) == -1)
5673 cwd = getcwd(NULL, 0);
5675 error = got_error_from_errno("getcwd");
5679 if (repo_path == NULL) {
5680 error = got_worktree_open(&worktree, cwd);
5681 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5687 strdup(got_worktree_get_repo_path(worktree));
5688 if (repo_path == NULL)
5689 error = got_error_from_errno("strdup");
5693 repo_path = strdup(cwd);
5694 if (repo_path == NULL) {
5695 error = got_error_from_errno("strdup");
5702 error = got_repo_open(&repo, repo_path, NULL);
5705 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5708 error = list_tags(repo, worktree);
5710 error = get_gitconfig_path(&gitconfig_path);
5713 error = got_repo_open(&repo, repo_path, gitconfig_path);
5718 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5723 if (commit_id_arg == NULL) {
5724 struct got_reference *head_ref;
5725 struct got_object_id *commit_id;
5726 error = got_ref_open(&head_ref, repo,
5727 worktree ? got_worktree_get_head_ref_name(worktree)
5731 error = got_ref_resolve(&commit_id, repo, head_ref);
5732 got_ref_close(head_ref);
5735 error = got_object_id_str(&commit_id_str, commit_id);
5741 error = add_tag(repo, tag_name,
5742 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5746 got_repo_close(repo);
5748 got_worktree_close(worktree);
5751 free(gitconfig_path);
5752 free(commit_id_str);
5759 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5764 static const struct got_error *
5765 add_progress(void *arg, unsigned char status, const char *path)
5767 while (path[0] == '/')
5769 printf("%c %s\n", status, path);
5773 static const struct got_error *
5774 cmd_add(int argc, char *argv[])
5776 const struct got_error *error = NULL;
5777 struct got_repository *repo = NULL;
5778 struct got_worktree *worktree = NULL;
5780 struct got_pathlist_head paths;
5781 struct got_pathlist_entry *pe;
5782 int ch, can_recurse = 0, no_ignores = 0;
5786 while ((ch = getopt(argc, argv, "IR")) != -1) {
5804 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5811 cwd = getcwd(NULL, 0);
5813 error = got_error_from_errno("getcwd");
5817 error = got_worktree_open(&worktree, cwd);
5819 if (error->code == GOT_ERR_NOT_WORKTREE)
5820 error = wrap_not_worktree_error(error, "add", cwd);
5824 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5829 error = apply_unveil(got_repo_get_path(repo), 1,
5830 got_worktree_get_root_path(worktree));
5834 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5838 if (!can_recurse && no_ignores) {
5839 error = got_error_msg(GOT_ERR_BAD_PATH,
5840 "disregarding ignores requires -R option");
5848 TAILQ_FOREACH(pe, &paths, entry) {
5849 if (asprintf(&ondisk_path, "%s/%s",
5850 got_worktree_get_root_path(worktree),
5852 error = got_error_from_errno("asprintf");
5855 if (lstat(ondisk_path, &sb) == -1) {
5856 if (errno == ENOENT) {
5860 error = got_error_from_errno2("lstat",
5866 if (S_ISDIR(sb.st_mode)) {
5867 error = got_error_msg(GOT_ERR_BAD_PATH,
5868 "adding directories requires -R option");
5874 error = got_worktree_schedule_add(worktree, &paths, add_progress,
5875 NULL, repo, no_ignores);
5878 got_repo_close(repo);
5880 got_worktree_close(worktree);
5881 TAILQ_FOREACH(pe, &paths, entry)
5882 free((char *)pe->path);
5883 got_pathlist_free(&paths);
5891 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5896 static const struct got_error *
5897 print_remove_status(void *arg, unsigned char status,
5898 unsigned char staged_status, const char *path)
5900 while (path[0] == '/')
5902 if (status == GOT_STATUS_NONEXISTENT)
5904 if (status == staged_status && (status == GOT_STATUS_DELETE))
5905 status = GOT_STATUS_NO_CHANGE;
5906 printf("%c%c %s\n", status, staged_status, path);
5910 static const struct got_error *
5911 cmd_remove(int argc, char *argv[])
5913 const struct got_error *error = NULL;
5914 struct got_worktree *worktree = NULL;
5915 struct got_repository *repo = NULL;
5917 struct got_pathlist_head paths;
5918 struct got_pathlist_entry *pe;
5919 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5923 while ((ch = getopt(argc, argv, "fkR")) != -1) {
5926 delete_local_mods = 1;
5944 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5951 cwd = getcwd(NULL, 0);
5953 error = got_error_from_errno("getcwd");
5956 error = got_worktree_open(&worktree, cwd);
5958 if (error->code == GOT_ERR_NOT_WORKTREE)
5959 error = wrap_not_worktree_error(error, "remove", cwd);
5963 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5968 error = apply_unveil(got_repo_get_path(repo), 1,
5969 got_worktree_get_root_path(worktree));
5973 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5980 TAILQ_FOREACH(pe, &paths, entry) {
5981 if (asprintf(&ondisk_path, "%s/%s",
5982 got_worktree_get_root_path(worktree),
5984 error = got_error_from_errno("asprintf");
5987 if (lstat(ondisk_path, &sb) == -1) {
5988 if (errno == ENOENT) {
5992 error = got_error_from_errno2("lstat",
5998 if (S_ISDIR(sb.st_mode)) {
5999 error = got_error_msg(GOT_ERR_BAD_PATH,
6000 "removing directories requires -R option");
6006 error = got_worktree_schedule_delete(worktree, &paths,
6007 delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
6010 got_repo_close(repo);
6012 got_worktree_close(worktree);
6013 TAILQ_FOREACH(pe, &paths, entry)
6014 free((char *)pe->path);
6015 got_pathlist_free(&paths);
6023 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6024 "path ...\n", getprogname());
6028 static const struct got_error *
6029 revert_progress(void *arg, unsigned char status, const char *path)
6031 if (status == GOT_STATUS_UNVERSIONED)
6034 while (path[0] == '/')
6036 printf("%c %s\n", status, path);
6040 struct choose_patch_arg {
6041 FILE *patch_script_file;
6045 static const struct got_error *
6046 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6047 int nchanges, const char *action)
6050 size_t linesize = 0;
6054 case GOT_STATUS_ADD:
6055 printf("A %s\n%s this addition? [y/n] ", path, action);
6057 case GOT_STATUS_DELETE:
6058 printf("D %s\n%s this deletion? [y/n] ", path, action);
6060 case GOT_STATUS_MODIFY:
6061 if (fseek(patch_file, 0L, SEEK_SET) == -1)
6062 return got_error_from_errno("fseek");
6063 printf(GOT_COMMIT_SEP_STR);
6064 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6066 if (ferror(patch_file))
6067 return got_error_from_errno("getline");
6068 printf(GOT_COMMIT_SEP_STR);
6069 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6070 path, n, nchanges, action);
6073 return got_error_path(path, GOT_ERR_FILE_STATUS);
6079 static const struct got_error *
6080 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6081 FILE *patch_file, int n, int nchanges)
6083 const struct got_error *err = NULL;
6085 size_t linesize = 0;
6088 struct choose_patch_arg *a = arg;
6090 *choice = GOT_PATCH_CHOICE_NONE;
6092 if (a->patch_script_file) {
6094 err = show_change(status, path, patch_file, n, nchanges,
6098 linelen = getline(&line, &linesize, a->patch_script_file);
6099 if (linelen == -1) {
6100 if (ferror(a->patch_script_file))
6101 return got_error_from_errno("getline");
6104 nl = strchr(line, '\n');
6107 if (strcmp(line, "y") == 0) {
6108 *choice = GOT_PATCH_CHOICE_YES;
6110 } else if (strcmp(line, "n") == 0) {
6111 *choice = GOT_PATCH_CHOICE_NO;
6113 } else if (strcmp(line, "q") == 0 &&
6114 status == GOT_STATUS_MODIFY) {
6115 *choice = GOT_PATCH_CHOICE_QUIT;
6118 printf("invalid response '%s'\n", line);
6123 while (resp != 'y' && resp != 'n' && resp != 'q') {
6124 err = show_change(status, path, patch_file, n, nchanges,
6131 if (status == GOT_STATUS_MODIFY) {
6132 if (resp != 'y' && resp != 'n' && resp != 'q') {
6133 printf("invalid response '%c'\n", resp);
6136 } else if (resp != 'y' && resp != 'n') {
6137 printf("invalid response '%c'\n", resp);
6143 *choice = GOT_PATCH_CHOICE_YES;
6144 else if (resp == 'n')
6145 *choice = GOT_PATCH_CHOICE_NO;
6146 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6147 *choice = GOT_PATCH_CHOICE_QUIT;
6153 static const struct got_error *
6154 cmd_revert(int argc, char *argv[])
6156 const struct got_error *error = NULL;
6157 struct got_worktree *worktree = NULL;
6158 struct got_repository *repo = NULL;
6159 char *cwd = NULL, *path = NULL;
6160 struct got_pathlist_head paths;
6161 struct got_pathlist_entry *pe;
6162 int ch, can_recurse = 0, pflag = 0;
6163 FILE *patch_script_file = NULL;
6164 const char *patch_script_path = NULL;
6165 struct choose_patch_arg cpa;
6169 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6175 patch_script_path = optarg;
6190 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6191 "unveil", NULL) == -1)
6196 if (patch_script_path && !pflag)
6197 errx(1, "-F option can only be used together with -p option");
6199 cwd = getcwd(NULL, 0);
6201 error = got_error_from_errno("getcwd");
6204 error = got_worktree_open(&worktree, cwd);
6206 if (error->code == GOT_ERR_NOT_WORKTREE)
6207 error = wrap_not_worktree_error(error, "revert", cwd);
6211 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6216 if (patch_script_path) {
6217 patch_script_file = fopen(patch_script_path, "r");
6218 if (patch_script_file == NULL) {
6219 error = got_error_from_errno2("fopen",
6224 error = apply_unveil(got_repo_get_path(repo), 1,
6225 got_worktree_get_root_path(worktree));
6229 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6236 TAILQ_FOREACH(pe, &paths, entry) {
6237 if (asprintf(&ondisk_path, "%s/%s",
6238 got_worktree_get_root_path(worktree),
6240 error = got_error_from_errno("asprintf");
6243 if (lstat(ondisk_path, &sb) == -1) {
6244 if (errno == ENOENT) {
6248 error = got_error_from_errno2("lstat",
6254 if (S_ISDIR(sb.st_mode)) {
6255 error = got_error_msg(GOT_ERR_BAD_PATH,
6256 "reverting directories requires -R option");
6262 cpa.patch_script_file = patch_script_file;
6263 cpa.action = "revert";
6264 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6265 pflag ? choose_patch : NULL, &cpa, repo);
6267 if (patch_script_file && fclose(patch_script_file) == EOF &&
6269 error = got_error_from_errno2("fclose", patch_script_path);
6271 got_repo_close(repo);
6273 got_worktree_close(worktree);
6282 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
6287 struct collect_commit_logmsg_arg {
6288 const char *cmdline_log;
6290 const char *worktree_path;
6291 const char *branch_name;
6292 const char *repo_path;
6297 static const struct got_error *
6298 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6301 char *initial_content = NULL;
6302 struct got_pathlist_entry *pe;
6303 const struct got_error *err = NULL;
6304 char *template = NULL;
6305 struct collect_commit_logmsg_arg *a = arg;
6309 /* if a message was specified on the command line, just use it */
6310 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6311 len = strlen(a->cmdline_log) + 1;
6312 *logmsg = malloc(len + 1);
6313 if (*logmsg == NULL)
6314 return got_error_from_errno("malloc");
6315 strlcpy(*logmsg, a->cmdline_log, len);
6319 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6320 return got_error_from_errno("asprintf");
6322 if (asprintf(&initial_content,
6323 "\n# changes to be committed on branch %s:\n",
6324 a->branch_name) == -1)
6325 return got_error_from_errno("asprintf");
6327 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6331 dprintf(fd, initial_content);
6333 TAILQ_FOREACH(pe, commitable_paths, entry) {
6334 struct got_commitable *ct = pe->data;
6335 dprintf(fd, "# %c %s\n",
6336 got_commitable_get_status(ct),
6337 got_commitable_get_path(ct));
6341 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6343 free(initial_content);
6346 /* Editor is done; we can now apply unveil(2) */
6348 err = apply_unveil(a->repo_path, 0, a->worktree_path);
6357 static const struct got_error *
6358 cmd_commit(int argc, char *argv[])
6360 const struct got_error *error = NULL;
6361 struct got_worktree *worktree = NULL;
6362 struct got_repository *repo = NULL;
6363 char *cwd = NULL, *id_str = NULL;
6364 struct got_object_id *id = NULL;
6365 const char *logmsg = NULL;
6366 struct collect_commit_logmsg_arg cl_arg;
6367 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6368 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6369 struct got_pathlist_head paths;
6372 cl_arg.logmsg_path = NULL;
6374 while ((ch = getopt(argc, argv, "m:")) != -1) {
6389 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6390 "unveil", NULL) == -1)
6393 cwd = getcwd(NULL, 0);
6395 error = got_error_from_errno("getcwd");
6398 error = got_worktree_open(&worktree, cwd);
6400 if (error->code == GOT_ERR_NOT_WORKTREE)
6401 error = wrap_not_worktree_error(error, "commit", cwd);
6405 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6408 if (rebase_in_progress) {
6409 error = got_error(GOT_ERR_REBASING);
6413 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6418 error = get_gitconfig_path(&gitconfig_path);
6421 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6426 error = get_author(&author, repo);
6431 * unveil(2) traverses exec(2); if an editor is used we have
6432 * to apply unveil after the log message has been written.
6434 if (logmsg == NULL || strlen(logmsg) == 0)
6435 error = get_editor(&editor);
6437 error = apply_unveil(got_repo_get_path(repo), 0,
6438 got_worktree_get_root_path(worktree));
6442 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6446 cl_arg.editor = editor;
6447 cl_arg.cmdline_log = logmsg;
6448 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6449 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6450 if (!histedit_in_progress) {
6451 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6452 error = got_error(GOT_ERR_COMMIT_BRANCH);
6455 cl_arg.branch_name += 11;
6457 cl_arg.repo_path = got_repo_get_path(repo);
6458 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6459 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
6461 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6462 cl_arg.logmsg_path != NULL)
6463 preserve_logmsg = 1;
6467 error = got_object_id_str(&id_str, id);
6470 printf("Created commit %s\n", id_str);
6472 if (preserve_logmsg) {
6473 fprintf(stderr, "%s: log message preserved in %s\n",
6474 getprogname(), cl_arg.logmsg_path);
6475 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6477 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6478 free(cl_arg.logmsg_path);
6480 got_repo_close(repo);
6482 got_worktree_close(worktree);
6485 free(gitconfig_path);
6492 usage_cherrypick(void)
6494 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6498 static const struct got_error *
6499 cmd_cherrypick(int argc, char *argv[])
6501 const struct got_error *error = NULL;
6502 struct got_worktree *worktree = NULL;
6503 struct got_repository *repo = NULL;
6504 char *cwd = NULL, *commit_id_str = NULL;
6505 struct got_object_id *commit_id = NULL;
6506 struct got_commit_object *commit = NULL;
6507 struct got_object_qid *pid;
6508 struct got_reference *head_ref = NULL;
6510 struct got_update_progress_arg upa;
6512 while ((ch = getopt(argc, argv, "")) != -1) {
6524 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6525 "unveil", NULL) == -1)
6531 cwd = getcwd(NULL, 0);
6533 error = got_error_from_errno("getcwd");
6536 error = got_worktree_open(&worktree, cwd);
6538 if (error->code == GOT_ERR_NOT_WORKTREE)
6539 error = wrap_not_worktree_error(error, "cherrypick",
6544 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6549 error = apply_unveil(got_repo_get_path(repo), 0,
6550 got_worktree_get_root_path(worktree));
6554 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6555 GOT_OBJ_TYPE_COMMIT, repo);
6556 if (error != NULL) {
6557 struct got_reference *ref;
6558 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6560 error = got_ref_open(&ref, repo, argv[0], 0);
6563 error = got_ref_resolve(&commit_id, repo, ref);
6568 error = got_object_id_str(&commit_id_str, commit_id);
6572 error = got_ref_open(&head_ref, repo,
6573 got_worktree_get_head_ref_name(worktree), 0);
6577 error = check_same_branch(commit_id, head_ref, NULL, repo);
6579 if (error->code != GOT_ERR_ANCESTRY)
6583 error = got_error(GOT_ERR_SAME_BRANCH);
6587 error = got_object_open_as_commit(&commit, repo, commit_id);
6590 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6591 memset(&upa, 0, sizeof(upa));
6592 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6593 commit_id, repo, update_progress, &upa, check_cancelled,
6598 if (upa.did_something)
6599 printf("Merged commit %s\n", commit_id_str);
6600 print_update_progress_stats(&upa);
6603 got_object_commit_close(commit);
6604 free(commit_id_str);
6606 got_ref_close(head_ref);
6608 got_worktree_close(worktree);
6610 got_repo_close(repo);
6617 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6621 static const struct got_error *
6622 cmd_backout(int argc, char *argv[])
6624 const struct got_error *error = NULL;
6625 struct got_worktree *worktree = NULL;
6626 struct got_repository *repo = NULL;
6627 char *cwd = NULL, *commit_id_str = NULL;
6628 struct got_object_id *commit_id = NULL;
6629 struct got_commit_object *commit = NULL;
6630 struct got_object_qid *pid;
6631 struct got_reference *head_ref = NULL;
6633 struct got_update_progress_arg upa;
6635 while ((ch = getopt(argc, argv, "")) != -1) {
6647 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6648 "unveil", NULL) == -1)
6654 cwd = getcwd(NULL, 0);
6656 error = got_error_from_errno("getcwd");
6659 error = got_worktree_open(&worktree, cwd);
6661 if (error->code == GOT_ERR_NOT_WORKTREE)
6662 error = wrap_not_worktree_error(error, "backout", cwd);
6666 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6671 error = apply_unveil(got_repo_get_path(repo), 0,
6672 got_worktree_get_root_path(worktree));
6676 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6677 GOT_OBJ_TYPE_COMMIT, repo);
6678 if (error != NULL) {
6679 struct got_reference *ref;
6680 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6682 error = got_ref_open(&ref, repo, argv[0], 0);
6685 error = got_ref_resolve(&commit_id, repo, ref);
6690 error = got_object_id_str(&commit_id_str, commit_id);
6694 error = got_ref_open(&head_ref, repo,
6695 got_worktree_get_head_ref_name(worktree), 0);
6699 error = check_same_branch(commit_id, head_ref, NULL, repo);
6703 error = got_object_open_as_commit(&commit, repo, commit_id);
6706 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6708 error = got_error(GOT_ERR_ROOT_COMMIT);
6712 memset(&upa, 0, sizeof(upa));
6713 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6714 update_progress, &upa, check_cancelled, NULL);
6718 if (upa.did_something)
6719 printf("Backed out commit %s\n", commit_id_str);
6720 print_update_progress_stats(&upa);
6723 got_object_commit_close(commit);
6724 free(commit_id_str);
6726 got_ref_close(head_ref);
6728 got_worktree_close(worktree);
6730 got_repo_close(repo);
6737 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6743 trim_logmsg(char *logmsg, int limit)
6748 len = strlen(logmsg);
6752 nl = strchr(logmsg, '\n');
6757 static const struct got_error *
6758 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6760 const struct got_error *err;
6761 char *logmsg0 = NULL;
6764 err = got_object_commit_get_logmsg(&logmsg0, commit);
6769 while (isspace((unsigned char)s[0]))
6772 *logmsg = strdup(s);
6773 if (*logmsg == NULL) {
6774 err = got_error_from_errno("strdup");
6778 trim_logmsg(*logmsg, limit);
6784 static const struct got_error *
6785 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6787 const struct got_error *err;
6788 struct got_commit_object *commit = NULL;
6789 char *id_str = NULL, *logmsg = NULL;
6791 err = got_object_open_as_commit(&commit, repo, id);
6795 err = got_object_id_str(&id_str, id);
6801 err = get_short_logmsg(&logmsg, 42, commit);
6805 printf("%s -> merge conflict: %s\n", id_str, logmsg);
6808 got_object_commit_close(commit);
6813 static const struct got_error *
6814 show_rebase_progress(struct got_commit_object *commit,
6815 struct got_object_id *old_id, struct got_object_id *new_id)
6817 const struct got_error *err;
6818 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6820 err = got_object_id_str(&old_id_str, old_id);
6825 err = got_object_id_str(&new_id_str, new_id);
6830 old_id_str[12] = '\0';
6832 new_id_str[12] = '\0';
6834 err = get_short_logmsg(&logmsg, 42, commit);
6838 printf("%s -> %s: %s\n", old_id_str,
6839 new_id_str ? new_id_str : "no-op change", logmsg);
6847 static const struct got_error *
6848 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6849 struct got_reference *branch, struct got_reference *new_base_branch,
6850 struct got_reference *tmp_branch, struct got_repository *repo)
6852 printf("Switching work tree to %s\n", got_ref_get_name(branch));
6853 return got_worktree_rebase_complete(worktree, fileindex,
6854 new_base_branch, tmp_branch, branch, repo);
6857 static const struct got_error *
6858 rebase_commit(struct got_pathlist_head *merged_paths,
6859 struct got_worktree *worktree, struct got_fileindex *fileindex,
6860 struct got_reference *tmp_branch,
6861 struct got_object_id *commit_id, struct got_repository *repo)
6863 const struct got_error *error;
6864 struct got_commit_object *commit;
6865 struct got_object_id *new_commit_id;
6867 error = got_object_open_as_commit(&commit, repo, commit_id);
6871 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6872 worktree, fileindex, tmp_branch, commit, commit_id, repo);
6874 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6876 error = show_rebase_progress(commit, commit_id, NULL);
6878 error = show_rebase_progress(commit, commit_id, new_commit_id);
6879 free(new_commit_id);
6882 got_object_commit_close(commit);
6886 struct check_path_prefix_arg {
6887 const char *path_prefix;
6892 static const struct got_error *
6893 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6894 struct got_blob_object *blob2, struct got_object_id *id1,
6895 struct got_object_id *id2, const char *path1, const char *path2,
6896 mode_t mode1, mode_t mode2, struct got_repository *repo)
6898 struct check_path_prefix_arg *a = arg;
6900 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6901 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6902 return got_error(a->errcode);
6907 static const struct got_error *
6908 check_path_prefix(struct got_object_id *parent_id,
6909 struct got_object_id *commit_id, const char *path_prefix,
6910 int errcode, struct got_repository *repo)
6912 const struct got_error *err;
6913 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6914 struct got_commit_object *commit = NULL, *parent_commit = NULL;
6915 struct check_path_prefix_arg cpp_arg;
6917 if (got_path_is_root_dir(path_prefix))
6920 err = got_object_open_as_commit(&commit, repo, commit_id);
6924 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6928 err = got_object_open_as_tree(&tree1, repo,
6929 got_object_commit_get_tree_id(parent_commit));
6933 err = got_object_open_as_tree(&tree2, repo,
6934 got_object_commit_get_tree_id(commit));
6938 cpp_arg.path_prefix = path_prefix;
6939 while (cpp_arg.path_prefix[0] == '/')
6940 cpp_arg.path_prefix++;
6941 cpp_arg.len = strlen(cpp_arg.path_prefix);
6942 cpp_arg.errcode = errcode;
6943 err = got_diff_tree(tree1, tree2, "", "", repo,
6944 check_path_prefix_in_diff, &cpp_arg, 0);
6947 got_object_tree_close(tree1);
6949 got_object_tree_close(tree2);
6951 got_object_commit_close(commit);
6953 got_object_commit_close(parent_commit);
6957 static const struct got_error *
6958 collect_commits(struct got_object_id_queue *commits,
6959 struct got_object_id *initial_commit_id,
6960 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6961 const char *path_prefix, int path_prefix_errcode,
6962 struct got_repository *repo)
6964 const struct got_error *err = NULL;
6965 struct got_commit_graph *graph = NULL;
6966 struct got_object_id *parent_id = NULL;
6967 struct got_object_qid *qid;
6968 struct got_object_id *commit_id = initial_commit_id;
6970 err = got_commit_graph_open(&graph, "/", 1);
6974 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6975 check_cancelled, NULL);
6978 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6979 err = got_commit_graph_iter_next(&parent_id, graph, repo,
6980 check_cancelled, NULL);
6982 if (err->code == GOT_ERR_ITER_COMPLETED) {
6983 err = got_error_msg(GOT_ERR_ANCESTRY,
6984 "ran out of commits to rebase before "
6985 "youngest common ancestor commit has "
6990 err = check_path_prefix(parent_id, commit_id,
6991 path_prefix, path_prefix_errcode, repo);
6995 err = got_object_qid_alloc(&qid, commit_id);
6998 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6999 commit_id = parent_id;
7003 got_commit_graph_close(graph);
7007 static const struct got_error *
7008 cmd_rebase(int argc, char *argv[])
7010 const struct got_error *error = NULL;
7011 struct got_worktree *worktree = NULL;
7012 struct got_repository *repo = NULL;
7013 struct got_fileindex *fileindex = NULL;
7015 struct got_reference *branch = NULL;
7016 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7017 struct got_object_id *commit_id = NULL, *parent_id = NULL;
7018 struct got_object_id *resume_commit_id = NULL;
7019 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7020 struct got_commit_object *commit = NULL;
7021 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7022 int histedit_in_progress = 0;
7023 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7024 struct got_object_id_queue commits;
7025 struct got_pathlist_head merged_paths;
7026 const struct got_object_id_queue *parent_ids;
7027 struct got_object_qid *qid, *pid;
7029 SIMPLEQ_INIT(&commits);
7030 TAILQ_INIT(&merged_paths);
7032 while ((ch = getopt(argc, argv, "ac")) != -1) {
7038 continue_rebase = 1;
7050 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7051 "unveil", NULL) == -1)
7054 if (abort_rebase && continue_rebase)
7056 else if (abort_rebase || continue_rebase) {
7059 } else if (argc != 1)
7062 cwd = getcwd(NULL, 0);
7064 error = got_error_from_errno("getcwd");
7067 error = got_worktree_open(&worktree, cwd);
7069 if (error->code == GOT_ERR_NOT_WORKTREE)
7070 error = wrap_not_worktree_error(error, "rebase", cwd);
7074 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7079 error = apply_unveil(got_repo_get_path(repo), 0,
7080 got_worktree_get_root_path(worktree));
7084 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7088 if (histedit_in_progress) {
7089 error = got_error(GOT_ERR_HISTEDIT_BUSY);
7093 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7098 struct got_update_progress_arg upa;
7099 if (!rebase_in_progress) {
7100 error = got_error(GOT_ERR_NOT_REBASING);
7103 error = got_worktree_rebase_continue(&resume_commit_id,
7104 &new_base_branch, &tmp_branch, &branch, &fileindex,
7108 printf("Switching work tree to %s\n",
7109 got_ref_get_symref_target(new_base_branch));
7110 memset(&upa, 0, sizeof(upa));
7111 error = got_worktree_rebase_abort(worktree, fileindex, repo,
7112 new_base_branch, update_progress, &upa);
7115 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7116 print_update_progress_stats(&upa);
7117 goto done; /* nothing else to do */
7120 if (continue_rebase) {
7121 if (!rebase_in_progress) {
7122 error = got_error(GOT_ERR_NOT_REBASING);
7125 error = got_worktree_rebase_continue(&resume_commit_id,
7126 &new_base_branch, &tmp_branch, &branch, &fileindex,
7131 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7132 resume_commit_id, repo);
7136 yca_id = got_object_id_dup(resume_commit_id);
7137 if (yca_id == NULL) {
7138 error = got_error_from_errno("got_object_id_dup");
7142 error = got_ref_open(&branch, repo, argv[0], 0);
7147 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7151 if (!continue_rebase) {
7152 struct got_object_id *base_commit_id;
7154 base_commit_id = got_worktree_get_base_commit_id(worktree);
7155 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7156 base_commit_id, branch_head_commit_id, repo,
7157 check_cancelled, NULL);
7160 if (yca_id == NULL) {
7161 error = got_error_msg(GOT_ERR_ANCESTRY,
7162 "specified branch shares no common ancestry "
7163 "with work tree's branch");
7167 error = check_same_branch(base_commit_id, branch, yca_id, repo);
7169 if (error->code != GOT_ERR_ANCESTRY)
7173 error = got_error_msg(GOT_ERR_SAME_BRANCH,
7174 "specified branch resolves to a commit which "
7175 "is already contained in work tree's branch");
7178 error = got_worktree_rebase_prepare(&new_base_branch,
7179 &tmp_branch, &fileindex, worktree, branch, repo);
7184 commit_id = branch_head_commit_id;
7185 error = got_object_open_as_commit(&commit, repo, commit_id);
7189 parent_ids = got_object_commit_get_parent_ids(commit);
7190 pid = SIMPLEQ_FIRST(parent_ids);
7192 if (!continue_rebase) {
7193 struct got_update_progress_arg upa;
7194 memset(&upa, 0, sizeof(upa));
7195 error = got_worktree_rebase_abort(worktree, fileindex,
7196 repo, new_base_branch, update_progress, &upa);
7199 printf("Rebase of %s aborted\n",
7200 got_ref_get_name(branch));
7201 print_update_progress_stats(&upa);
7204 error = got_error(GOT_ERR_EMPTY_REBASE);
7207 error = collect_commits(&commits, commit_id, pid->id,
7208 yca_id, got_worktree_get_path_prefix(worktree),
7209 GOT_ERR_REBASE_PATH, repo);
7210 got_object_commit_close(commit);
7215 if (SIMPLEQ_EMPTY(&commits)) {
7216 if (continue_rebase) {
7217 error = rebase_complete(worktree, fileindex,
7218 branch, new_base_branch, tmp_branch, repo);
7221 /* Fast-forward the reference of the branch. */
7222 struct got_object_id *new_head_commit_id;
7224 error = got_ref_resolve(&new_head_commit_id, repo,
7228 error = got_object_id_str(&id_str, new_head_commit_id);
7229 printf("Forwarding %s to commit %s\n",
7230 got_ref_get_name(branch), id_str);
7232 error = got_ref_change_ref(branch,
7233 new_head_commit_id);
7240 SIMPLEQ_FOREACH(qid, &commits, entry) {
7241 struct got_update_progress_arg upa;
7243 commit_id = qid->id;
7244 parent_id = pid ? pid->id : yca_id;
7247 memset(&upa, 0, sizeof(upa));
7248 error = got_worktree_rebase_merge_files(&merged_paths,
7249 worktree, fileindex, parent_id, commit_id, repo,
7250 update_progress, &upa, check_cancelled, NULL);
7254 print_update_progress_stats(&upa);
7255 if (upa.conflicts > 0)
7256 rebase_status = GOT_STATUS_CONFLICT;
7258 if (rebase_status == GOT_STATUS_CONFLICT) {
7259 error = show_rebase_merge_conflict(qid->id, repo);
7262 got_worktree_rebase_pathlist_free(&merged_paths);
7266 error = rebase_commit(&merged_paths, worktree, fileindex,
7267 tmp_branch, commit_id, repo);
7268 got_worktree_rebase_pathlist_free(&merged_paths);
7273 if (rebase_status == GOT_STATUS_CONFLICT) {
7274 error = got_worktree_rebase_postpone(worktree, fileindex);
7277 error = got_error_msg(GOT_ERR_CONFLICTS,
7278 "conflicts must be resolved before rebasing can continue");
7280 error = rebase_complete(worktree, fileindex, branch,
7281 new_base_branch, tmp_branch, repo);
7283 got_object_id_queue_free(&commits);
7284 free(branch_head_commit_id);
7285 free(resume_commit_id);
7288 got_object_commit_close(commit);
7290 got_ref_close(branch);
7291 if (new_base_branch)
7292 got_ref_close(new_base_branch);
7294 got_ref_close(tmp_branch);
7296 got_worktree_close(worktree);
7298 got_repo_close(repo);
7303 usage_histedit(void)
7305 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7310 #define GOT_HISTEDIT_PICK 'p'
7311 #define GOT_HISTEDIT_EDIT 'e'
7312 #define GOT_HISTEDIT_FOLD 'f'
7313 #define GOT_HISTEDIT_DROP 'd'
7314 #define GOT_HISTEDIT_MESG 'm'
7316 static struct got_histedit_cmd {
7320 } got_histedit_cmds[] = {
7321 { GOT_HISTEDIT_PICK, "pick", "use commit" },
7322 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7323 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7325 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7326 { GOT_HISTEDIT_MESG, "mesg",
7327 "single-line log message for commit above (open editor if empty)" },
7330 struct got_histedit_list_entry {
7331 TAILQ_ENTRY(got_histedit_list_entry) entry;
7332 struct got_object_id *commit_id;
7333 const struct got_histedit_cmd *cmd;
7336 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7338 static const struct got_error *
7339 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7340 FILE *f, struct got_repository *repo)
7342 const struct got_error *err = NULL;
7343 char *logmsg = NULL, *id_str = NULL;
7344 struct got_commit_object *commit = NULL;
7347 err = got_object_open_as_commit(&commit, repo, commit_id);
7351 err = get_short_logmsg(&logmsg, 34, commit);
7355 err = got_object_id_str(&id_str, commit_id);
7359 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7361 err = got_ferror(f, GOT_ERR_IO);
7364 got_object_commit_close(commit);
7370 static const struct got_error *
7371 histedit_write_commit_list(struct got_object_id_queue *commits,
7372 FILE *f, int edit_logmsg_only, struct got_repository *repo)
7374 const struct got_error *err = NULL;
7375 struct got_object_qid *qid;
7377 if (SIMPLEQ_EMPTY(commits))
7378 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7380 SIMPLEQ_FOREACH(qid, commits, entry) {
7381 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7385 if (edit_logmsg_only) {
7386 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7388 err = got_ferror(f, GOT_ERR_IO);
7397 static const struct got_error *
7398 write_cmd_list(FILE *f, const char *branch_name,
7399 struct got_object_id_queue *commits)
7401 const struct got_error *err = NULL;
7404 struct got_object_qid *qid;
7406 qid = SIMPLEQ_FIRST(commits);
7407 err = got_object_id_str(&id_str, qid->id);
7412 "# Editing the history of branch '%s' starting at\n"
7414 "# Commits will be processed in order from top to "
7415 "bottom of this file.\n", branch_name, id_str);
7417 err = got_ferror(f, GOT_ERR_IO);
7421 n = fprintf(f, "# Available histedit commands:\n");
7423 err = got_ferror(f, GOT_ERR_IO);
7427 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7428 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7429 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7432 err = got_ferror(f, GOT_ERR_IO);
7441 static const struct got_error *
7442 histedit_syntax_error(int lineno)
7444 static char msg[42];
7447 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7449 if (ret == -1 || ret >= sizeof(msg))
7450 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7452 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7455 static const struct got_error *
7456 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7457 char *logmsg, struct got_repository *repo)
7459 const struct got_error *err;
7460 struct got_commit_object *folded_commit = NULL;
7461 char *id_str, *folded_logmsg = NULL;
7463 err = got_object_id_str(&id_str, hle->commit_id);
7467 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7471 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7474 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7475 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7476 folded_logmsg) == -1) {
7477 err = got_error_from_errno("asprintf");
7481 got_object_commit_close(folded_commit);
7483 free(folded_logmsg);
7487 static struct got_histedit_list_entry *
7488 get_folded_commits(struct got_histedit_list_entry *hle)
7490 struct got_histedit_list_entry *prev, *folded = NULL;
7492 prev = TAILQ_PREV(hle, got_histedit_list, entry);
7493 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7494 prev->cmd->code == GOT_HISTEDIT_DROP)) {
7495 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7497 prev = TAILQ_PREV(prev, got_histedit_list, entry);
7503 static const struct got_error *
7504 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7505 struct got_repository *repo)
7507 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7508 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7509 const struct got_error *err = NULL;
7510 struct got_commit_object *commit = NULL;
7512 struct got_histedit_list_entry *folded = NULL;
7514 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7518 folded = get_folded_commits(hle);
7520 while (folded != hle) {
7521 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7522 folded = TAILQ_NEXT(folded, entry);
7525 err = append_folded_commit_msg(&new_msg, folded,
7531 folded = TAILQ_NEXT(folded, entry);
7535 err = got_object_id_str(&id_str, hle->commit_id);
7538 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7541 if (asprintf(&new_msg,
7542 "%s\n# original log message of commit %s: %s",
7543 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7544 err = got_error_from_errno("asprintf");
7550 err = got_object_id_str(&id_str, hle->commit_id);
7554 err = got_opentemp_named_fd(&logmsg_path, &fd,
7555 GOT_TMPDIR_STR "/got-logmsg");
7559 dprintf(fd, logmsg);
7562 err = get_editor(&editor);
7566 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7568 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7570 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7573 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7574 err = got_error_from_errno2("unlink", logmsg_path);
7580 got_object_commit_close(commit);
7584 static const struct got_error *
7585 histedit_parse_list(struct got_histedit_list *histedit_cmds,
7586 FILE *f, struct got_repository *repo)
7588 const struct got_error *err = NULL;
7589 char *line = NULL, *p, *end;
7593 const struct got_histedit_cmd *cmd;
7594 struct got_object_id *commit_id = NULL;
7595 struct got_histedit_list_entry *hle = NULL;
7598 len = getline(&line, &size, f);
7600 const struct got_error *getline_err;
7603 getline_err = got_error_from_errno("getline");
7604 err = got_ferror(f, getline_err->code);
7609 while (isspace((unsigned char)p[0]))
7611 if (p[0] == '#' || p[0] == '\0') {
7617 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7618 cmd = &got_histedit_cmds[i];
7619 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7620 isspace((unsigned char)p[strlen(cmd->name)])) {
7621 p += strlen(cmd->name);
7624 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7629 if (i == nitems(got_histedit_cmds)) {
7630 err = histedit_syntax_error(lineno);
7633 while (isspace((unsigned char)p[0]))
7635 if (cmd->code == GOT_HISTEDIT_MESG) {
7636 if (hle == NULL || hle->logmsg != NULL) {
7637 err = got_error(GOT_ERR_HISTEDIT_CMD);
7641 err = histedit_edit_logmsg(hle, repo);
7645 hle->logmsg = strdup(p);
7646 if (hle->logmsg == NULL) {
7647 err = got_error_from_errno("strdup");
7656 while (end[0] && !isspace((unsigned char)end[0]))
7660 err = got_object_resolve_id_str(&commit_id, repo, p);
7662 /* override error code */
7663 err = histedit_syntax_error(lineno);
7667 hle = malloc(sizeof(*hle));
7669 err = got_error_from_errno("malloc");
7673 hle->commit_id = commit_id;
7678 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7686 static const struct got_error *
7687 histedit_check_script(struct got_histedit_list *histedit_cmds,
7688 struct got_object_id_queue *commits, struct got_repository *repo)
7690 const struct got_error *err = NULL;
7691 struct got_object_qid *qid;
7692 struct got_histedit_list_entry *hle;
7693 static char msg[92];
7696 if (TAILQ_EMPTY(histedit_cmds))
7697 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7698 "histedit script contains no commands");
7699 if (SIMPLEQ_EMPTY(commits))
7700 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7702 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7703 struct got_histedit_list_entry *hle2;
7704 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7707 if (got_object_id_cmp(hle->commit_id,
7708 hle2->commit_id) != 0)
7710 err = got_object_id_str(&id_str, hle->commit_id);
7713 snprintf(msg, sizeof(msg), "commit %s is listed "
7714 "more than once in histedit script", id_str);
7716 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7720 SIMPLEQ_FOREACH(qid, commits, entry) {
7721 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7722 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7726 err = got_object_id_str(&id_str, qid->id);
7729 snprintf(msg, sizeof(msg),
7730 "commit %s missing from histedit script", id_str);
7732 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7736 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7737 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7738 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7739 "last commit in histedit script cannot be folded");
7744 static const struct got_error *
7745 histedit_run_editor(struct got_histedit_list *histedit_cmds,
7746 const char *path, struct got_object_id_queue *commits,
7747 struct got_repository *repo)
7749 const struct got_error *err = NULL;
7753 err = get_editor(&editor);
7757 if (spawn_editor(editor, path) == -1) {
7758 err = got_error_from_errno("failed spawning editor");
7762 f = fopen(path, "r");
7764 err = got_error_from_errno("fopen");
7767 err = histedit_parse_list(histedit_cmds, f, repo);
7771 err = histedit_check_script(histedit_cmds, commits, repo);
7773 if (f && fclose(f) != 0 && err == NULL)
7774 err = got_error_from_errno("fclose");
7779 static const struct got_error *
7780 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7781 struct got_object_id_queue *, const char *, const char *,
7782 struct got_repository *);
7784 static const struct got_error *
7785 histedit_edit_script(struct got_histedit_list *histedit_cmds,
7786 struct got_object_id_queue *commits, const char *branch_name,
7787 int edit_logmsg_only, struct got_repository *repo)
7789 const struct got_error *err;
7793 err = got_opentemp_named(&path, &f, "got-histedit");
7797 err = write_cmd_list(f, branch_name, commits);
7801 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7805 if (edit_logmsg_only) {
7807 err = histedit_parse_list(histedit_cmds, f, repo);
7809 if (fclose(f) != 0) {
7810 err = got_error_from_errno("fclose");
7814 err = histedit_run_editor(histedit_cmds, path, commits, repo);
7816 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7817 err->code != GOT_ERR_HISTEDIT_CMD)
7819 err = histedit_edit_list_retry(histedit_cmds, err,
7820 commits, path, branch_name, repo);
7824 if (f && fclose(f) != 0 && err == NULL)
7825 err = got_error_from_errno("fclose");
7826 if (path && unlink(path) != 0 && err == NULL)
7827 err = got_error_from_errno2("unlink", path);
7832 static const struct got_error *
7833 histedit_save_list(struct got_histedit_list *histedit_cmds,
7834 struct got_worktree *worktree, struct got_repository *repo)
7836 const struct got_error *err = NULL;
7839 struct got_histedit_list_entry *hle;
7840 struct got_commit_object *commit = NULL;
7842 err = got_worktree_get_histedit_script_path(&path, worktree);
7846 f = fopen(path, "w");
7848 err = got_error_from_errno2("fopen", path);
7851 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7852 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7858 int n = fprintf(f, "%c %s\n",
7859 GOT_HISTEDIT_MESG, hle->logmsg);
7861 err = got_ferror(f, GOT_ERR_IO);
7867 if (f && fclose(f) != 0 && err == NULL)
7868 err = got_error_from_errno("fclose");
7871 got_object_commit_close(commit);
7876 histedit_free_list(struct got_histedit_list *histedit_cmds)
7878 struct got_histedit_list_entry *hle;
7880 while ((hle = TAILQ_FIRST(histedit_cmds))) {
7881 TAILQ_REMOVE(histedit_cmds, hle, entry);
7886 static const struct got_error *
7887 histedit_load_list(struct got_histedit_list *histedit_cmds,
7888 const char *path, struct got_repository *repo)
7890 const struct got_error *err = NULL;
7893 f = fopen(path, "r");
7895 err = got_error_from_errno2("fopen", path);
7899 err = histedit_parse_list(histedit_cmds, f, repo);
7901 if (f && fclose(f) != 0 && err == NULL)
7902 err = got_error_from_errno("fclose");
7906 static const struct got_error *
7907 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7908 const struct got_error *edit_err, struct got_object_id_queue *commits,
7909 const char *path, const char *branch_name, struct got_repository *repo)
7911 const struct got_error *err = NULL, *prev_err = edit_err;
7914 while (resp != 'c' && resp != 'r' && resp != 'a') {
7915 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7916 "or (a)bort: ", getprogname(), prev_err->msg);
7921 histedit_free_list(histedit_cmds);
7922 err = histedit_run_editor(histedit_cmds, path, commits,
7925 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7926 err->code != GOT_ERR_HISTEDIT_CMD)
7933 } else if (resp == 'r') {
7934 histedit_free_list(histedit_cmds);
7935 err = histedit_edit_script(histedit_cmds,
7936 commits, branch_name, 0, repo);
7938 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7939 err->code != GOT_ERR_HISTEDIT_CMD)
7946 } else if (resp == 'a') {
7947 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7950 printf("invalid response '%c'\n", resp);
7956 static const struct got_error *
7957 histedit_complete(struct got_worktree *worktree,
7958 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7959 struct got_reference *branch, struct got_repository *repo)
7961 printf("Switching work tree to %s\n",
7962 got_ref_get_symref_target(branch));
7963 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7967 static const struct got_error *
7968 show_histedit_progress(struct got_commit_object *commit,
7969 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7971 const struct got_error *err;
7972 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7974 err = got_object_id_str(&old_id_str, hle->commit_id);
7979 err = got_object_id_str(&new_id_str, new_id);
7984 old_id_str[12] = '\0';
7986 new_id_str[12] = '\0';
7989 logmsg = strdup(hle->logmsg);
7990 if (logmsg == NULL) {
7991 err = got_error_from_errno("strdup");
7994 trim_logmsg(logmsg, 42);
7996 err = get_short_logmsg(&logmsg, 42, commit);
8001 switch (hle->cmd->code) {
8002 case GOT_HISTEDIT_PICK:
8003 case GOT_HISTEDIT_EDIT:
8004 printf("%s -> %s: %s\n", old_id_str,
8005 new_id_str ? new_id_str : "no-op change", logmsg);
8007 case GOT_HISTEDIT_DROP:
8008 case GOT_HISTEDIT_FOLD:
8009 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8021 static const struct got_error *
8022 histedit_commit(struct got_pathlist_head *merged_paths,
8023 struct got_worktree *worktree, struct got_fileindex *fileindex,
8024 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8025 struct got_repository *repo)
8027 const struct got_error *err;
8028 struct got_commit_object *commit;
8029 struct got_object_id *new_commit_id;
8031 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8032 && hle->logmsg == NULL) {
8033 err = histedit_edit_logmsg(hle, repo);
8038 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8042 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8043 worktree, fileindex, tmp_branch, commit, hle->commit_id,
8046 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8048 err = show_histedit_progress(commit, hle, NULL);
8050 err = show_histedit_progress(commit, hle, new_commit_id);
8051 free(new_commit_id);
8054 got_object_commit_close(commit);
8058 static const struct got_error *
8059 histedit_skip_commit(struct got_histedit_list_entry *hle,
8060 struct got_worktree *worktree, struct got_repository *repo)
8062 const struct got_error *error;
8063 struct got_commit_object *commit;
8065 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8070 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8074 error = show_histedit_progress(commit, hle, NULL);
8075 got_object_commit_close(commit);
8079 static const struct got_error *
8080 check_local_changes(void *arg, unsigned char status,
8081 unsigned char staged_status, const char *path,
8082 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8083 struct got_object_id *commit_id, int dirfd, const char *de_name)
8085 int *have_local_changes = arg;
8088 case GOT_STATUS_ADD:
8089 case GOT_STATUS_DELETE:
8090 case GOT_STATUS_MODIFY:
8091 case GOT_STATUS_CONFLICT:
8092 *have_local_changes = 1;
8093 return got_error(GOT_ERR_CANCELLED);
8098 switch (staged_status) {
8099 case GOT_STATUS_ADD:
8100 case GOT_STATUS_DELETE:
8101 case GOT_STATUS_MODIFY:
8102 *have_local_changes = 1;
8103 return got_error(GOT_ERR_CANCELLED);
8111 static const struct got_error *
8112 cmd_histedit(int argc, char *argv[])
8114 const struct got_error *error = NULL;
8115 struct got_worktree *worktree = NULL;
8116 struct got_fileindex *fileindex = NULL;
8117 struct got_repository *repo = NULL;
8119 struct got_reference *branch = NULL;
8120 struct got_reference *tmp_branch = NULL;
8121 struct got_object_id *resume_commit_id = NULL;
8122 struct got_object_id *base_commit_id = NULL;
8123 struct got_object_id *head_commit_id = NULL;
8124 struct got_commit_object *commit = NULL;
8125 int ch, rebase_in_progress = 0;
8126 struct got_update_progress_arg upa;
8127 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8128 int edit_logmsg_only = 0;
8129 const char *edit_script_path = NULL;
8130 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8131 struct got_object_id_queue commits;
8132 struct got_pathlist_head merged_paths;
8133 const struct got_object_id_queue *parent_ids;
8134 struct got_object_qid *pid;
8135 struct got_histedit_list histedit_cmds;
8136 struct got_histedit_list_entry *hle;
8138 SIMPLEQ_INIT(&commits);
8139 TAILQ_INIT(&histedit_cmds);
8140 TAILQ_INIT(&merged_paths);
8141 memset(&upa, 0, sizeof(upa));
8143 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8152 edit_script_path = optarg;
8155 edit_logmsg_only = 1;
8167 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8168 "unveil", NULL) == -1)
8171 if (abort_edit && continue_edit)
8172 errx(1, "histedit's -a and -c options are mutually exclusive");
8173 if (edit_script_path && edit_logmsg_only)
8174 errx(1, "histedit's -F and -m options are mutually exclusive");
8175 if (abort_edit && edit_logmsg_only)
8176 errx(1, "histedit's -a and -m options are mutually exclusive");
8177 if (continue_edit && edit_logmsg_only)
8178 errx(1, "histedit's -c and -m options are mutually exclusive");
8183 * This command cannot apply unveil(2) in all cases because the
8184 * user may choose to run an editor to edit the histedit script
8185 * and to edit individual commit log messages.
8186 * unveil(2) traverses exec(2); if an editor is used we have to
8187 * apply unveil after edit script and log messages have been written.
8188 * XXX TODO: Make use of unveil(2) where possible.
8191 cwd = getcwd(NULL, 0);
8193 error = got_error_from_errno("getcwd");
8196 error = got_worktree_open(&worktree, cwd);
8198 if (error->code == GOT_ERR_NOT_WORKTREE)
8199 error = wrap_not_worktree_error(error, "histedit", cwd);
8203 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8208 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8211 if (rebase_in_progress) {
8212 error = got_error(GOT_ERR_REBASING);
8216 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8220 if (edit_in_progress && edit_logmsg_only) {
8221 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8222 "histedit operation is in progress in this "
8223 "work tree and must be continued or aborted "
8224 "before the -m option can be used");
8228 if (edit_in_progress && abort_edit) {
8229 error = got_worktree_histedit_continue(&resume_commit_id,
8230 &tmp_branch, &branch, &base_commit_id, &fileindex,
8234 printf("Switching work tree to %s\n",
8235 got_ref_get_symref_target(branch));
8236 error = got_worktree_histedit_abort(worktree, fileindex, repo,
8237 branch, base_commit_id, update_progress, &upa);
8240 printf("Histedit of %s aborted\n",
8241 got_ref_get_symref_target(branch));
8242 print_update_progress_stats(&upa);
8243 goto done; /* nothing else to do */
8244 } else if (abort_edit) {
8245 error = got_error(GOT_ERR_NOT_HISTEDIT);
8249 if (continue_edit) {
8252 if (!edit_in_progress) {
8253 error = got_error(GOT_ERR_NOT_HISTEDIT);
8257 error = got_worktree_get_histedit_script_path(&path, worktree);
8261 error = histedit_load_list(&histedit_cmds, path, repo);
8266 error = got_worktree_histedit_continue(&resume_commit_id,
8267 &tmp_branch, &branch, &base_commit_id, &fileindex,
8272 error = got_ref_resolve(&head_commit_id, repo, branch);
8276 error = got_object_open_as_commit(&commit, repo,
8280 parent_ids = got_object_commit_get_parent_ids(commit);
8281 pid = SIMPLEQ_FIRST(parent_ids);
8283 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8286 error = collect_commits(&commits, head_commit_id, pid->id,
8287 base_commit_id, got_worktree_get_path_prefix(worktree),
8288 GOT_ERR_HISTEDIT_PATH, repo);
8289 got_object_commit_close(commit);
8294 if (edit_in_progress) {
8295 error = got_error(GOT_ERR_HISTEDIT_BUSY);
8299 error = got_ref_open(&branch, repo,
8300 got_worktree_get_head_ref_name(worktree), 0);
8304 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8305 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8306 "will not edit commit history of a branch outside "
8307 "the \"refs/heads/\" reference namespace");
8311 error = got_ref_resolve(&head_commit_id, repo, branch);
8312 got_ref_close(branch);
8317 error = got_object_open_as_commit(&commit, repo,
8321 parent_ids = got_object_commit_get_parent_ids(commit);
8322 pid = SIMPLEQ_FIRST(parent_ids);
8324 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8327 error = collect_commits(&commits, head_commit_id, pid->id,
8328 got_worktree_get_base_commit_id(worktree),
8329 got_worktree_get_path_prefix(worktree),
8330 GOT_ERR_HISTEDIT_PATH, repo);
8331 got_object_commit_close(commit);
8336 if (SIMPLEQ_EMPTY(&commits)) {
8337 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8341 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8342 &base_commit_id, &fileindex, worktree, repo);
8346 if (edit_script_path) {
8347 error = histedit_load_list(&histedit_cmds,
8348 edit_script_path, repo);
8350 got_worktree_histedit_abort(worktree, fileindex,
8351 repo, branch, base_commit_id,
8352 update_progress, &upa);
8353 print_update_progress_stats(&upa);
8357 const char *branch_name;
8358 branch_name = got_ref_get_symref_target(branch);
8359 if (strncmp(branch_name, "refs/heads/", 11) == 0)
8361 error = histedit_edit_script(&histedit_cmds, &commits,
8362 branch_name, edit_logmsg_only, repo);
8364 got_worktree_histedit_abort(worktree, fileindex,
8365 repo, branch, base_commit_id,
8366 update_progress, &upa);
8367 print_update_progress_stats(&upa);
8373 error = histedit_save_list(&histedit_cmds, worktree,
8376 got_worktree_histedit_abort(worktree, fileindex,
8377 repo, branch, base_commit_id,
8378 update_progress, &upa);
8379 print_update_progress_stats(&upa);
8385 error = histedit_check_script(&histedit_cmds, &commits, repo);
8389 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8390 if (resume_commit_id) {
8391 if (got_object_id_cmp(hle->commit_id,
8392 resume_commit_id) != 0)
8395 resume_commit_id = NULL;
8396 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8397 hle->cmd->code == GOT_HISTEDIT_FOLD) {
8398 error = histedit_skip_commit(hle, worktree,
8403 struct got_pathlist_head paths;
8404 int have_changes = 0;
8407 error = got_pathlist_append(&paths, "", NULL);
8410 error = got_worktree_status(worktree, &paths,
8411 repo, check_local_changes, &have_changes,
8412 check_cancelled, NULL);
8413 got_pathlist_free(&paths);
8415 if (error->code != GOT_ERR_CANCELLED)
8417 if (sigint_received || sigpipe_received)
8421 error = histedit_commit(NULL, worktree,
8422 fileindex, tmp_branch, hle, repo);
8426 error = got_object_open_as_commit(
8427 &commit, repo, hle->commit_id);
8430 error = show_histedit_progress(commit,
8432 got_object_commit_close(commit);
8441 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8442 error = histedit_skip_commit(hle, worktree, repo);
8448 error = got_object_open_as_commit(&commit, repo,
8452 parent_ids = got_object_commit_get_parent_ids(commit);
8453 pid = SIMPLEQ_FIRST(parent_ids);
8455 error = got_worktree_histedit_merge_files(&merged_paths,
8456 worktree, fileindex, pid->id, hle->commit_id, repo,
8457 update_progress, &upa, check_cancelled, NULL);
8460 got_object_commit_close(commit);
8463 print_update_progress_stats(&upa);
8464 if (upa.conflicts > 0)
8465 rebase_status = GOT_STATUS_CONFLICT;
8467 if (rebase_status == GOT_STATUS_CONFLICT) {
8468 error = show_rebase_merge_conflict(hle->commit_id,
8472 got_worktree_rebase_pathlist_free(&merged_paths);
8476 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8478 error = got_object_id_str(&id_str, hle->commit_id);
8481 printf("Stopping histedit for amending commit %s\n",
8484 got_worktree_rebase_pathlist_free(&merged_paths);
8485 error = got_worktree_histedit_postpone(worktree,
8490 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8491 error = histedit_skip_commit(hle, worktree, repo);
8497 error = histedit_commit(&merged_paths, worktree, fileindex,
8498 tmp_branch, hle, repo);
8499 got_worktree_rebase_pathlist_free(&merged_paths);
8504 if (rebase_status == GOT_STATUS_CONFLICT) {
8505 error = got_worktree_histedit_postpone(worktree, fileindex);
8508 error = got_error_msg(GOT_ERR_CONFLICTS,
8509 "conflicts must be resolved before histedit can continue");
8511 error = histedit_complete(worktree, fileindex, tmp_branch,
8514 got_object_id_queue_free(&commits);
8515 histedit_free_list(&histedit_cmds);
8516 free(head_commit_id);
8517 free(base_commit_id);
8518 free(resume_commit_id);
8520 got_object_commit_close(commit);
8522 got_ref_close(branch);
8524 got_ref_close(tmp_branch);
8526 got_worktree_close(worktree);
8528 got_repo_close(repo);
8533 usage_integrate(void)
8535 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8539 static const struct got_error *
8540 cmd_integrate(int argc, char *argv[])
8542 const struct got_error *error = NULL;
8543 struct got_repository *repo = NULL;
8544 struct got_worktree *worktree = NULL;
8545 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8546 const char *branch_arg = NULL;
8547 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8548 struct got_fileindex *fileindex = NULL;
8549 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8551 struct got_update_progress_arg upa;
8553 while ((ch = getopt(argc, argv, "")) != -1) {
8566 branch_arg = argv[0];
8568 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8569 "unveil", NULL) == -1)
8572 cwd = getcwd(NULL, 0);
8574 error = got_error_from_errno("getcwd");
8578 error = got_worktree_open(&worktree, cwd);
8580 if (error->code == GOT_ERR_NOT_WORKTREE)
8581 error = wrap_not_worktree_error(error, "integrate",
8586 error = check_rebase_or_histedit_in_progress(worktree);
8590 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8595 error = apply_unveil(got_repo_get_path(repo), 0,
8596 got_worktree_get_root_path(worktree));
8600 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8601 error = got_error_from_errno("asprintf");
8605 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8606 &base_branch_ref, worktree, refname, repo);
8610 refname = strdup(got_ref_get_name(branch_ref));
8611 if (refname == NULL) {
8612 error = got_error_from_errno("strdup");
8613 got_worktree_integrate_abort(worktree, fileindex, repo,
8614 branch_ref, base_branch_ref);
8617 base_refname = strdup(got_ref_get_name(base_branch_ref));
8618 if (base_refname == NULL) {
8619 error = got_error_from_errno("strdup");
8620 got_worktree_integrate_abort(worktree, fileindex, repo,
8621 branch_ref, base_branch_ref);
8625 error = got_ref_resolve(&commit_id, repo, branch_ref);
8629 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8633 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8634 error = got_error_msg(GOT_ERR_SAME_BRANCH,
8635 "specified branch has already been integrated");
8636 got_worktree_integrate_abort(worktree, fileindex, repo,
8637 branch_ref, base_branch_ref);
8641 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8643 if (error->code == GOT_ERR_ANCESTRY)
8644 error = got_error(GOT_ERR_REBASE_REQUIRED);
8645 got_worktree_integrate_abort(worktree, fileindex, repo,
8646 branch_ref, base_branch_ref);
8650 memset(&upa, 0, sizeof(upa));
8651 error = got_worktree_integrate_continue(worktree, fileindex, repo,
8652 branch_ref, base_branch_ref, update_progress, &upa,
8653 check_cancelled, NULL);
8657 printf("Integrated %s into %s\n", refname, base_refname);
8658 print_update_progress_stats(&upa);
8661 got_repo_close(repo);
8663 got_worktree_close(worktree);
8665 free(base_commit_id);
8675 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8676 "[file-path ...]\n",
8681 static const struct got_error *
8682 print_stage(void *arg, unsigned char status, unsigned char staged_status,
8683 const char *path, struct got_object_id *blob_id,
8684 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8685 int dirfd, const char *de_name)
8687 const struct got_error *err = NULL;
8688 char *id_str = NULL;
8690 if (staged_status != GOT_STATUS_ADD &&
8691 staged_status != GOT_STATUS_MODIFY &&
8692 staged_status != GOT_STATUS_DELETE)
8695 if (staged_status == GOT_STATUS_ADD ||
8696 staged_status == GOT_STATUS_MODIFY)
8697 err = got_object_id_str(&id_str, staged_blob_id);
8699 err = got_object_id_str(&id_str, blob_id);
8703 printf("%s %c %s\n", id_str, staged_status, path);
8708 static const struct got_error *
8709 cmd_stage(int argc, char *argv[])
8711 const struct got_error *error = NULL;
8712 struct got_repository *repo = NULL;
8713 struct got_worktree *worktree = NULL;
8715 struct got_pathlist_head paths;
8716 struct got_pathlist_entry *pe;
8717 int ch, list_stage = 0, pflag = 0;
8718 FILE *patch_script_file = NULL;
8719 const char *patch_script_path = NULL;
8720 struct choose_patch_arg cpa;
8724 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8733 patch_script_path = optarg;
8745 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8746 "unveil", NULL) == -1)
8749 if (list_stage && (pflag || patch_script_path))
8750 errx(1, "-l option cannot be used with other options");
8751 if (patch_script_path && !pflag)
8752 errx(1, "-F option can only be used together with -p option");
8754 cwd = getcwd(NULL, 0);
8756 error = got_error_from_errno("getcwd");
8760 error = got_worktree_open(&worktree, cwd);
8762 if (error->code == GOT_ERR_NOT_WORKTREE)
8763 error = wrap_not_worktree_error(error, "stage", cwd);
8767 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8772 if (patch_script_path) {
8773 patch_script_file = fopen(patch_script_path, "r");
8774 if (patch_script_file == NULL) {
8775 error = got_error_from_errno2("fopen",
8780 error = apply_unveil(got_repo_get_path(repo), 0,
8781 got_worktree_get_root_path(worktree));
8785 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8790 error = got_worktree_status(worktree, &paths, repo,
8791 print_stage, NULL, check_cancelled, NULL);
8793 cpa.patch_script_file = patch_script_file;
8794 cpa.action = "stage";
8795 error = got_worktree_stage(worktree, &paths,
8796 pflag ? NULL : print_status, NULL,
8797 pflag ? choose_patch : NULL, &cpa, repo);
8800 if (patch_script_file && fclose(patch_script_file) == EOF &&
8802 error = got_error_from_errno2("fclose", patch_script_path);
8804 got_repo_close(repo);
8806 got_worktree_close(worktree);
8807 TAILQ_FOREACH(pe, &paths, entry)
8808 free((char *)pe->path);
8809 got_pathlist_free(&paths);
8817 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8818 "[file-path ...]\n",
8824 static const struct got_error *
8825 cmd_unstage(int argc, char *argv[])
8827 const struct got_error *error = NULL;
8828 struct got_repository *repo = NULL;
8829 struct got_worktree *worktree = NULL;
8831 struct got_pathlist_head paths;
8832 struct got_pathlist_entry *pe;
8834 struct got_update_progress_arg upa;
8835 FILE *patch_script_file = NULL;
8836 const char *patch_script_path = NULL;
8837 struct choose_patch_arg cpa;
8841 while ((ch = getopt(argc, argv, "pF:")) != -1) {
8847 patch_script_path = optarg;
8859 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8860 "unveil", NULL) == -1)
8863 if (patch_script_path && !pflag)
8864 errx(1, "-F option can only be used together with -p option");
8866 cwd = getcwd(NULL, 0);
8868 error = got_error_from_errno("getcwd");
8872 error = got_worktree_open(&worktree, cwd);
8874 if (error->code == GOT_ERR_NOT_WORKTREE)
8875 error = wrap_not_worktree_error(error, "unstage", cwd);
8879 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8884 if (patch_script_path) {
8885 patch_script_file = fopen(patch_script_path, "r");
8886 if (patch_script_file == NULL) {
8887 error = got_error_from_errno2("fopen",
8893 error = apply_unveil(got_repo_get_path(repo), 0,
8894 got_worktree_get_root_path(worktree));
8898 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8902 cpa.patch_script_file = patch_script_file;
8903 cpa.action = "unstage";
8904 memset(&upa, 0, sizeof(upa));
8905 error = got_worktree_unstage(worktree, &paths, update_progress,
8906 &upa, pflag ? choose_patch : NULL, &cpa, repo);
8908 print_update_progress_stats(&upa);
8910 if (patch_script_file && fclose(patch_script_file) == EOF &&
8912 error = got_error_from_errno2("fclose", patch_script_path);
8914 got_repo_close(repo);
8916 got_worktree_close(worktree);
8917 TAILQ_FOREACH(pe, &paths, entry)
8918 free((char *)pe->path);
8919 got_pathlist_free(&paths);
8927 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8928 "arg1 [arg2 ...]\n", getprogname());
8932 static const struct got_error *
8933 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8935 const struct got_error *err;
8936 struct got_blob_object *blob;
8938 err = got_object_open_as_blob(&blob, repo, id, 8192);
8942 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8943 got_object_blob_close(blob);
8947 static const struct got_error *
8948 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8950 const struct got_error *err;
8951 struct got_tree_object *tree;
8954 err = got_object_open_as_tree(&tree, repo, id);
8958 nentries = got_object_tree_get_nentries(tree);
8959 for (i = 0; i < nentries; i++) {
8960 struct got_tree_entry *te;
8962 if (sigint_received || sigpipe_received)
8964 te = got_object_tree_get_entry(tree, i);
8965 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8968 fprintf(outfile, "%s %.7o %s\n", id_str,
8969 got_tree_entry_get_mode(te),
8970 got_tree_entry_get_name(te));
8974 got_object_tree_close(tree);
8978 static const struct got_error *
8979 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8981 const struct got_error *err;
8982 struct got_commit_object *commit;
8983 const struct got_object_id_queue *parent_ids;
8984 struct got_object_qid *pid;
8985 char *id_str = NULL;
8986 const char *logmsg = NULL;
8988 err = got_object_open_as_commit(&commit, repo, id);
8992 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8996 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8997 parent_ids = got_object_commit_get_parent_ids(commit);
8998 fprintf(outfile, "numparents %d\n",
8999 got_object_commit_get_nparents(commit));
9000 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9002 err = got_object_id_str(&pid_str, pid->id);
9005 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9008 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9009 got_object_commit_get_author(commit),
9010 got_object_commit_get_author_time(commit));
9012 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9013 got_object_commit_get_author(commit),
9014 got_object_commit_get_committer_time(commit));
9016 logmsg = got_object_commit_get_logmsg_raw(commit);
9017 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9018 fprintf(outfile, "%s", logmsg);
9021 got_object_commit_close(commit);
9025 static const struct got_error *
9026 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9028 const struct got_error *err;
9029 struct got_tag_object *tag;
9030 char *id_str = NULL;
9031 const char *tagmsg = NULL;
9033 err = got_object_open_as_tag(&tag, repo, id);
9037 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9041 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9043 switch (got_object_tag_get_object_type(tag)) {
9044 case GOT_OBJ_TYPE_BLOB:
9045 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9046 GOT_OBJ_LABEL_BLOB);
9048 case GOT_OBJ_TYPE_TREE:
9049 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9050 GOT_OBJ_LABEL_TREE);
9052 case GOT_OBJ_TYPE_COMMIT:
9053 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9054 GOT_OBJ_LABEL_COMMIT);
9056 case GOT_OBJ_TYPE_TAG:
9057 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9064 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9065 got_object_tag_get_name(tag));
9067 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9068 got_object_tag_get_tagger(tag),
9069 got_object_tag_get_tagger_time(tag));
9071 tagmsg = got_object_tag_get_message(tag);
9072 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9073 fprintf(outfile, "%s", tagmsg);
9076 got_object_tag_close(tag);
9080 static const struct got_error *
9081 cmd_cat(int argc, char *argv[])
9083 const struct got_error *error;
9084 struct got_repository *repo = NULL;
9085 struct got_worktree *worktree = NULL;
9086 char *cwd = NULL, *repo_path = NULL, *label = NULL;
9087 const char *commit_id_str = NULL;
9088 struct got_object_id *id = NULL, *commit_id = NULL;
9089 int ch, obj_type, i, force_path = 0;
9092 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9097 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9100 commit_id_str = optarg;
9103 repo_path = realpath(optarg, NULL);
9104 if (repo_path == NULL)
9105 return got_error_from_errno2("realpath",
9107 got_path_strip_trailing_slashes(repo_path);
9121 cwd = getcwd(NULL, 0);
9123 error = got_error_from_errno("getcwd");
9126 error = got_worktree_open(&worktree, cwd);
9127 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9130 if (repo_path == NULL) {
9132 got_worktree_get_repo_path(worktree));
9133 if (repo_path == NULL) {
9134 error = got_error_from_errno("strdup");
9140 if (repo_path == NULL) {
9141 repo_path = getcwd(NULL, 0);
9142 if (repo_path == NULL)
9143 return got_error_from_errno("getcwd");
9146 error = got_repo_open(&repo, repo_path, NULL);
9151 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9155 if (commit_id_str == NULL)
9156 commit_id_str = GOT_REF_HEAD;
9157 error = got_repo_match_object_id(&commit_id, NULL,
9158 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9162 for (i = 0; i < argc; i++) {
9164 error = got_object_id_by_path(&id, repo, commit_id,
9169 error = got_repo_match_object_id(&id, &label, argv[i],
9170 GOT_OBJ_TYPE_ANY, 0, repo);
9172 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9173 error->code != GOT_ERR_NOT_REF)
9175 error = got_object_id_by_path(&id, repo,
9176 commit_id, argv[i]);
9182 error = got_object_get_type(&obj_type, repo, id);
9187 case GOT_OBJ_TYPE_BLOB:
9188 error = cat_blob(id, repo, stdout);
9190 case GOT_OBJ_TYPE_TREE:
9191 error = cat_tree(id, repo, stdout);
9193 case GOT_OBJ_TYPE_COMMIT:
9194 error = cat_commit(id, repo, stdout);
9196 case GOT_OBJ_TYPE_TAG:
9197 error = cat_tag(id, repo, stdout);
9200 error = got_error(GOT_ERR_OBJ_TYPE);
9215 got_worktree_close(worktree);
9217 const struct got_error *repo_error;
9218 repo_error = got_repo_close(repo);