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_head_ref(struct got_reference *target_ref, int verbosity,
889 struct got_repository *repo)
891 const struct got_error *err;
892 struct got_reference *head_symref;
894 err = got_ref_alloc_symref(&head_symref, GOT_REF_HEAD, target_ref);
898 err = got_ref_write(head_symref, repo);
899 got_ref_close(head_symref);
900 if (err == NULL && verbosity > 0) {
901 printf("Created reference %s: %s\n", GOT_REF_HEAD,
902 got_ref_get_name(target_ref));
907 static const struct got_error *
908 list_remote_refs(struct got_pathlist_head *symrefs,
909 struct got_pathlist_head *refs)
911 const struct got_error *err;
912 struct got_pathlist_entry *pe;
914 TAILQ_FOREACH(pe, symrefs, entry) {
915 const char *refname = pe->path;
916 const char *targetref = pe->data;
918 printf("%s: %s\n", refname, targetref);
921 TAILQ_FOREACH(pe, refs, entry) {
922 const char *refname = pe->path;
923 struct got_object_id *id = pe->data;
926 err = got_object_id_str(&id_str, id);
929 printf("%s: %s\n", refname, id_str);
936 static const struct got_error *
937 create_ref(const char *refname, struct got_object_id *id,
938 int verbosity, struct got_repository *repo)
940 const struct got_error *err = NULL;
941 struct got_reference *ref;
944 err = got_object_id_str(&id_str, id);
948 err = got_ref_alloc(&ref, refname, id);
952 err = got_ref_write(ref, repo);
955 if (err == NULL && verbosity >= 0)
956 printf("Created reference %s: %s\n", refname, id_str);
963 match_wanted_ref(const char *refname, const char *wanted_ref)
965 if (strncmp(refname, "refs/", 5) != 0)
970 * Prevent fetching of references that won't make any
971 * sense outside of the remote repository's context.
973 if (strncmp(refname, "got/", 4) == 0)
975 if (strncmp(refname, "remotes/", 8) == 0)
978 if (strncmp(wanted_ref, "refs/", 5) == 0)
981 /* Allow prefix match. */
982 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
985 /* Allow exact match. */
986 return (strcmp(refname, wanted_ref) == 0);
990 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
992 struct got_pathlist_entry *pe;
994 TAILQ_FOREACH(pe, wanted_refs, entry) {
995 if (match_wanted_ref(refname, pe->path))
1002 static const struct got_error *
1003 create_wanted_ref(const char *refname, struct got_object_id *id,
1004 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1006 const struct got_error *err;
1007 char *remote_refname;
1009 if (strncmp("refs/", refname, 5) == 0)
1012 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1013 remote_repo_name, refname) == -1)
1014 return got_error_from_errno("asprintf");
1016 err = create_ref(remote_refname, id, verbosity, repo);
1017 free(remote_refname);
1021 static const struct got_error *
1022 cmd_clone(int argc, char *argv[])
1024 const struct got_error *error = NULL;
1025 const char *uri, *dirname;
1026 char *proto, *host, *port, *repo_name, *server_path;
1027 char *default_destdir = NULL, *id_str = NULL;
1028 const char *repo_path;
1029 struct got_repository *repo = NULL;
1030 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1031 struct got_pathlist_entry *pe;
1032 struct got_object_id *pack_hash = NULL;
1033 int ch, fetchfd = -1, fetchstatus;
1034 pid_t fetchpid = -1;
1035 struct got_fetch_progress_arg fpa;
1036 char *git_url = NULL;
1037 char *gitconfig_path = NULL;
1038 char *gitconfig = NULL;
1039 FILE *gitconfig_file = NULL;
1041 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1042 int list_refs_only = 0;
1043 struct got_reference *head_symref = NULL;
1046 TAILQ_INIT(&symrefs);
1047 TAILQ_INIT(&wanted_branches);
1048 TAILQ_INIT(&wanted_refs);
1050 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1053 fetch_all_branches = 1;
1056 error = got_pathlist_append(&wanted_branches,
1065 mirror_references = 1;
1070 else if (verbosity < 3)
1077 error = got_pathlist_append(&wanted_refs,
1090 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1091 errx(1, "-a and -b options are mutually exclusive");
1092 if (list_refs_only) {
1093 if (!TAILQ_EMPTY(&wanted_branches))
1094 errx(1, "-l and -b options are mutually exclusive");
1095 if (fetch_all_branches)
1096 errx(1, "-l and -a options are mutually exclusive");
1097 if (mirror_references)
1098 errx(1, "-l and -m options are mutually exclusive");
1099 if (verbosity == -1)
1100 errx(1, "-l and -q options are mutually exclusive");
1101 if (!TAILQ_EMPTY(&wanted_refs))
1102 errx(1, "-l and -R options are mutually exclusive");
1114 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1115 &repo_name, argv[0]);
1119 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1120 host, port ? ":" : "", port ? port : "",
1121 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1122 error = got_error_from_errno("asprintf");
1126 if (strcmp(proto, "git") == 0) {
1128 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1129 "sendfd dns inet unveil", NULL) == -1)
1132 } else if (strcmp(proto, "git+ssh") == 0 ||
1133 strcmp(proto, "ssh") == 0) {
1135 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1136 "sendfd unveil", NULL) == -1)
1139 } else if (strcmp(proto, "http") == 0 ||
1140 strcmp(proto, "git+http") == 0) {
1141 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1144 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1147 if (dirname == NULL) {
1148 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1149 error = got_error_from_errno("asprintf");
1152 repo_path = default_destdir;
1154 repo_path = dirname;
1156 if (!list_refs_only) {
1157 error = got_path_mkdir(repo_path);
1161 error = got_repo_init(repo_path);
1164 error = got_repo_open(&repo, repo_path, NULL);
1169 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1170 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1171 error = got_error_from_errno2("unveil",
1172 GOT_FETCH_PATH_SSH);
1176 error = apply_unveil(repo ? got_repo_get_path(repo) : NULL, 0, NULL);
1180 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1181 server_path, verbosity);
1186 printf("Connected to %s%s%s\n", host,
1187 port ? ":" : "", port ? port : "");
1189 fpa.last_scaled_size[0] = '\0';
1190 fpa.last_p_indexed = -1;
1191 fpa.last_p_resolved = -1;
1192 fpa.verbosity = verbosity;
1193 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1194 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1195 fetch_all_branches, &wanted_branches, &wanted_refs,
1196 list_refs_only, verbosity, fetchfd, repo,
1197 fetch_progress, &fpa);
1201 if (list_refs_only) {
1202 error = list_remote_refs(&symrefs, &refs);
1206 error = got_object_id_str(&id_str, pack_hash);
1210 printf("\nFetched %s.pack\n", id_str);
1213 /* Set up references provided with the pack file. */
1214 TAILQ_FOREACH(pe, &refs, entry) {
1215 const char *refname = pe->path;
1216 struct got_object_id *id = pe->data;
1217 char *remote_refname;
1219 if (is_wanted_ref(&wanted_refs, refname) &&
1220 !mirror_references) {
1221 error = create_wanted_ref(refname, id,
1222 GOT_FETCH_DEFAULT_REMOTE_NAME,
1223 verbosity - 1, repo);
1229 error = create_ref(refname, id, verbosity - 1, repo);
1233 if (mirror_references)
1236 if (strncmp("refs/heads/", refname, 11) != 0)
1239 if (asprintf(&remote_refname,
1240 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1241 refname + 11) == -1) {
1242 error = got_error_from_errno("asprintf");
1245 error = create_ref(remote_refname, id, verbosity - 1, repo);
1250 /* Set the HEAD reference if the server provided one. */
1251 TAILQ_FOREACH(pe, &symrefs, entry) {
1252 struct got_reference *target_ref;
1253 const char *refname = pe->path;
1254 const char *target = pe->data;
1256 if (strcmp(refname, GOT_REF_HEAD) != 0)
1259 error = got_ref_open(&target_ref, repo, target, 0);
1261 if (error->code == GOT_ERR_NOT_REF) {
1268 error = create_head_ref(target_ref, verbosity, repo);
1269 got_ref_close(target_ref);
1275 * We failed to set the HEAD reference. If we asked for
1276 * a set of wanted branches use the first of one of those
1277 * which could be fetched instead.
1279 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1280 const char *target = pe->path;
1281 struct got_reference *target_ref;
1283 error = got_ref_open(&target_ref, repo, target, 0);
1285 if (error->code == GOT_ERR_NOT_REF) {
1292 error = create_head_ref(target_ref, verbosity, repo);
1293 got_ref_close(target_ref);
1300 /* Create a config file git-fetch(1) can understand. */
1301 gitconfig_path = got_repo_get_path_gitconfig(repo);
1302 if (gitconfig_path == NULL) {
1303 error = got_error_from_errno("got_repo_get_path_gitconfig");
1306 gitconfig_file = fopen(gitconfig_path, "a");
1307 if (gitconfig_file == NULL) {
1308 error = got_error_from_errno2("fopen", gitconfig_path);
1311 if (mirror_references) {
1312 if (asprintf(&gitconfig,
1315 "\tfetch = +refs/*:refs/*\n"
1316 "\tmirror = true\n",
1317 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1318 error = got_error_from_errno("asprintf");
1321 } else if (fetch_all_branches) {
1322 if (asprintf(&gitconfig,
1325 "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1326 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1327 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1328 error = got_error_from_errno("asprintf");
1332 const char *branchname;
1335 * If the server specified a default branch, use just that one.
1336 * Otherwise fall back to fetching all branches on next fetch.
1339 branchname = got_ref_get_symref_target(head_symref);
1340 if (strncmp(branchname, "refs/heads/", 11) == 0)
1343 branchname = "*"; /* fall back to all branches */
1344 if (asprintf(&gitconfig,
1347 "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1348 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1349 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1350 branchname) == -1) {
1351 error = got_error_from_errno("asprintf");
1355 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1356 if (n != strlen(gitconfig)) {
1357 error = got_ferror(gitconfig_file, GOT_ERR_IO);
1362 printf("Created %s repository '%s'\n",
1363 mirror_references ? "mirrored" : "cloned", repo_path);
1366 if (kill(fetchpid, SIGTERM) == -1)
1367 error = got_error_from_errno("kill");
1368 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1369 error = got_error_from_errno("waitpid");
1371 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1372 error = got_error_from_errno("close");
1373 if (gitconfig_file && fclose(gitconfig_file) == EOF && error == NULL)
1374 error = got_error_from_errno("fclose");
1376 got_repo_close(repo);
1378 got_ref_close(head_symref);
1379 TAILQ_FOREACH(pe, &refs, entry) {
1380 free((void *)pe->path);
1383 got_pathlist_free(&refs);
1384 TAILQ_FOREACH(pe, &symrefs, entry) {
1385 free((void *)pe->path);
1388 got_pathlist_free(&symrefs);
1389 got_pathlist_free(&wanted_branches);
1390 got_pathlist_free(&wanted_refs);
1397 free(default_destdir);
1398 free(gitconfig_path);
1403 static const struct got_error *
1404 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1405 int replace_tags, int verbosity, struct got_repository *repo)
1407 const struct got_error *err = NULL;
1408 char *new_id_str = NULL;
1409 struct got_object_id *old_id = NULL;
1411 err = got_object_id_str(&new_id_str, new_id);
1415 if (!replace_tags &&
1416 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1417 err = got_ref_resolve(&old_id, repo, ref);
1420 if (got_object_id_cmp(old_id, new_id) == 0)
1422 if (verbosity >= 0) {
1423 printf("Rejecting update of existing tag %s: %s\n",
1424 got_ref_get_name(ref), new_id_str);
1429 if (got_ref_is_symbolic(ref)) {
1430 if (verbosity >= 0) {
1431 printf("Replacing reference %s: %s\n",
1432 got_ref_get_name(ref),
1433 got_ref_get_symref_target(ref));
1435 err = got_ref_change_symref_to_ref(ref, new_id);
1438 err = got_ref_write(ref, repo);
1442 err = got_ref_resolve(&old_id, repo, ref);
1445 if (got_object_id_cmp(old_id, new_id) == 0)
1448 err = got_ref_change_ref(ref, new_id);
1451 err = got_ref_write(ref, repo);
1457 printf("Updated reference %s: %s\n", got_ref_get_name(ref),
1468 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1469 "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1470 "[remote-repository-name]\n",
1475 static const struct got_error *
1476 delete_missing_refs(struct got_pathlist_head *their_refs,
1477 int verbosity, struct got_repository *repo)
1479 const struct got_error *err = NULL;
1480 struct got_reflist_head my_refs;
1481 struct got_reflist_entry *re;
1482 struct got_pathlist_entry *pe;
1483 struct got_object_id *id;
1486 SIMPLEQ_INIT(&my_refs);
1488 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1492 SIMPLEQ_FOREACH(re, &my_refs, entry) {
1493 const char *refname = got_ref_get_name(re->ref);
1495 if (strncmp(refname, "refs/heads/", 11) != 0 &&
1496 strncmp(refname, "refs/tags/", 10) != 0)
1499 TAILQ_FOREACH(pe, their_refs, entry) {
1500 if (strcmp(refname, pe->path) == 0)
1506 err = got_ref_resolve(&id, repo, re->ref);
1509 err = got_object_id_str(&id_str, id);
1515 err = got_ref_delete(re->ref, repo);
1518 if (verbosity >= 0) {
1519 printf("Deleted reference %s: %s\n",
1520 got_ref_get_name(re->ref), id_str);
1527 static const struct got_error *
1528 update_wanted_ref(const char *refname, struct got_object_id *id,
1529 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1531 const struct got_error *err, *unlock_err;
1532 char *remote_refname;
1533 struct got_reference *ref;
1535 if (strncmp("refs/", refname, 5) == 0)
1538 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1539 remote_repo_name, refname) == -1)
1540 return got_error_from_errno("asprintf");
1542 err = got_ref_open(&ref, repo, remote_refname, 1);
1544 if (err->code != GOT_ERR_NOT_REF)
1546 err = create_ref(remote_refname, id, verbosity, repo);
1548 err = update_ref(ref, id, 0, verbosity, repo);
1549 unlock_err = got_ref_unlock(ref);
1550 if (unlock_err && err == NULL)
1555 free(remote_refname);
1559 static const struct got_error *
1560 cmd_fetch(int argc, char *argv[])
1562 const struct got_error *error = NULL, *unlock_err;
1563 char *cwd = NULL, *repo_path = NULL;
1564 const char *remote_name;
1565 char *proto = NULL, *host = NULL, *port = NULL;
1566 char *repo_name = NULL, *server_path = NULL;
1567 struct got_remote_repo *remotes, *remote = NULL;
1569 char *id_str = NULL;
1570 struct got_repository *repo = NULL;
1571 struct got_worktree *worktree = NULL;
1572 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1573 struct got_pathlist_entry *pe;
1574 struct got_object_id *pack_hash = NULL;
1575 int i, ch, fetchfd = -1, fetchstatus;
1576 pid_t fetchpid = -1;
1577 struct got_fetch_progress_arg fpa;
1578 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
1579 int delete_refs = 0, replace_tags = 0;
1582 TAILQ_INIT(&symrefs);
1583 TAILQ_INIT(&wanted_branches);
1584 TAILQ_INIT(&wanted_refs);
1586 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
1589 fetch_all_branches = 1;
1592 error = got_pathlist_append(&wanted_branches,
1604 repo_path = realpath(optarg, NULL);
1605 if (repo_path == NULL)
1606 return got_error_from_errno2("realpath",
1608 got_path_strip_trailing_slashes(repo_path);
1616 else if (verbosity < 3)
1623 error = got_pathlist_append(&wanted_refs,
1636 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1637 errx(1, "-a and -b options are mutually exclusive");
1638 if (list_refs_only) {
1639 if (!TAILQ_EMPTY(&wanted_branches))
1640 errx(1, "-l and -b options are mutually exclusive");
1641 if (fetch_all_branches)
1642 errx(1, "-l and -a options are mutually exclusive");
1644 errx(1, "-l and -d options are mutually exclusive");
1645 if (verbosity == -1)
1646 errx(1, "-l and -q options are mutually exclusive");
1650 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
1652 remote_name = argv[0];
1656 cwd = getcwd(NULL, 0);
1658 error = got_error_from_errno("getcwd");
1662 if (repo_path == NULL) {
1663 error = got_worktree_open(&worktree, cwd);
1664 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1670 strdup(got_worktree_get_repo_path(worktree));
1671 if (repo_path == NULL)
1672 error = got_error_from_errno("strdup");
1676 repo_path = strdup(cwd);
1677 if (repo_path == NULL) {
1678 error = got_error_from_errno("strdup");
1684 error = got_repo_open(&repo, repo_path, NULL);
1688 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
1689 for (i = 0; i < nremotes; i++) {
1690 remote = &remotes[i];
1691 if (strcmp(remote->name, remote_name) == 0)
1694 if (i == nremotes) {
1695 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
1699 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1700 &repo_name, remote->url);
1704 if (strcmp(proto, "git") == 0) {
1706 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1707 "sendfd dns inet unveil", NULL) == -1)
1710 } else if (strcmp(proto, "git+ssh") == 0 ||
1711 strcmp(proto, "ssh") == 0) {
1713 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1714 "sendfd unveil", NULL) == -1)
1717 } else if (strcmp(proto, "http") == 0 ||
1718 strcmp(proto, "git+http") == 0) {
1719 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1722 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1726 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1727 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1728 error = got_error_from_errno2("unveil",
1729 GOT_FETCH_PATH_SSH);
1733 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
1737 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1738 server_path, verbosity);
1743 printf("Connected to \"%s\" %s%s%s\n", remote->name, host,
1744 port ? ":" : "", port ? port : "");
1746 fpa.last_scaled_size[0] = '\0';
1747 fpa.last_p_indexed = -1;
1748 fpa.last_p_resolved = -1;
1749 fpa.verbosity = verbosity;
1750 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
1751 remote->mirror_references, fetch_all_branches, &wanted_branches,
1752 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
1753 fetch_progress, &fpa);
1757 if (list_refs_only) {
1758 error = list_remote_refs(&symrefs, &refs);
1762 if (pack_hash == NULL) {
1764 printf("Already up-to-date\n");
1766 error = delete_missing_refs(&refs, verbosity, repo);
1770 if (verbosity >= 0) {
1771 error = got_object_id_str(&id_str, pack_hash);
1774 printf("\nFetched %s.pack\n", id_str);
1779 /* Update references provided with the pack file. */
1780 TAILQ_FOREACH(pe, &refs, entry) {
1781 const char *refname = pe->path;
1782 struct got_object_id *id = pe->data;
1783 struct got_reference *ref;
1784 char *remote_refname;
1786 if (is_wanted_ref(&wanted_refs, refname) &&
1787 !remote->mirror_references) {
1788 error = update_wanted_ref(refname, id,
1789 remote->name, verbosity, repo);
1795 if (remote->mirror_references ||
1796 strncmp("refs/tags/", refname, 10) == 0) {
1797 error = got_ref_open(&ref, repo, refname, 1);
1799 if (error->code != GOT_ERR_NOT_REF)
1801 error = create_ref(refname, id, verbosity,
1806 error = update_ref(ref, id, replace_tags,
1808 unlock_err = got_ref_unlock(ref);
1809 if (unlock_err && error == NULL)
1815 } else if (strncmp("refs/heads/", refname, 11) == 0) {
1816 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1817 remote_name, refname + 11) == -1) {
1818 error = got_error_from_errno("asprintf");
1822 error = got_ref_open(&ref, repo, remote_refname, 1);
1824 if (error->code != GOT_ERR_NOT_REF)
1826 error = create_ref(remote_refname, id,
1831 error = update_ref(ref, id, replace_tags,
1833 unlock_err = got_ref_unlock(ref);
1834 if (unlock_err && error == NULL)
1841 /* Also create a local branch if none exists yet. */
1842 error = got_ref_open(&ref, repo, refname, 1);
1844 if (error->code != GOT_ERR_NOT_REF)
1846 error = create_ref(refname, id, verbosity,
1851 unlock_err = got_ref_unlock(ref);
1852 if (unlock_err && error == NULL)
1859 error = delete_missing_refs(&refs, verbosity, repo);
1862 if (kill(fetchpid, SIGTERM) == -1)
1863 error = got_error_from_errno("kill");
1864 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1865 error = got_error_from_errno("waitpid");
1867 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1868 error = got_error_from_errno("close");
1870 got_repo_close(repo);
1872 got_worktree_close(worktree);
1873 TAILQ_FOREACH(pe, &refs, entry) {
1874 free((void *)pe->path);
1877 got_pathlist_free(&refs);
1878 TAILQ_FOREACH(pe, &symrefs, entry) {
1879 free((void *)pe->path);
1882 got_pathlist_free(&symrefs);
1883 got_pathlist_free(&wanted_branches);
1884 got_pathlist_free(&wanted_refs);
1899 usage_checkout(void)
1901 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
1902 "[-p prefix] repository-path [worktree-path]\n", getprogname());
1907 show_worktree_base_ref_warning(void)
1909 fprintf(stderr, "%s: warning: could not create a reference "
1910 "to the work tree's base commit; the commit could be "
1911 "garbage-collected by Git; making the repository "
1912 "writable and running 'got update' will prevent this\n",
1916 struct got_checkout_progress_arg {
1917 const char *worktree_path;
1918 int had_base_commit_ref_error;
1921 static const struct got_error *
1922 checkout_progress(void *arg, unsigned char status, const char *path)
1924 struct got_checkout_progress_arg *a = arg;
1926 /* Base commit bump happens silently. */
1927 if (status == GOT_STATUS_BUMP_BASE)
1930 if (status == GOT_STATUS_BASE_REF_ERR) {
1931 a->had_base_commit_ref_error = 1;
1935 while (path[0] == '/')
1938 printf("%c %s/%s\n", status, a->worktree_path, path);
1942 static const struct got_error *
1943 check_cancelled(void *arg)
1945 if (sigint_received || sigpipe_received)
1946 return got_error(GOT_ERR_CANCELLED);
1950 static const struct got_error *
1951 check_linear_ancestry(struct got_object_id *commit_id,
1952 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
1953 struct got_repository *repo)
1955 const struct got_error *err = NULL;
1956 struct got_object_id *yca_id;
1958 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
1959 commit_id, base_commit_id, repo, check_cancelled, NULL);
1964 return got_error(GOT_ERR_ANCESTRY);
1967 * Require a straight line of history between the target commit
1968 * and the work tree's base commit.
1970 * Non-linear situations such as this require a rebase:
1972 * (commit) D F (base_commit)
1980 * 'got update' only handles linear cases:
1981 * Update forwards in time: A (base/yca) - B - C - D (commit)
1982 * Update backwards in time: D (base) - C - B - A (commit/yca)
1984 if (allow_forwards_in_time_only) {
1985 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
1986 return got_error(GOT_ERR_ANCESTRY);
1987 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
1988 got_object_id_cmp(base_commit_id, yca_id) != 0)
1989 return got_error(GOT_ERR_ANCESTRY);
1995 static const struct got_error *
1996 check_same_branch(struct got_object_id *commit_id,
1997 struct got_reference *head_ref, struct got_object_id *yca_id,
1998 struct got_repository *repo)
2000 const struct got_error *err = NULL;
2001 struct got_commit_graph *graph = NULL;
2002 struct got_object_id *head_commit_id = NULL;
2003 int is_same_branch = 0;
2005 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2009 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2013 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2018 err = got_commit_graph_open(&graph, "/", 1);
2022 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2023 check_cancelled, NULL);
2028 struct got_object_id *id;
2029 err = got_commit_graph_iter_next(&id, graph, repo,
2030 check_cancelled, NULL);
2032 if (err->code == GOT_ERR_ITER_COMPLETED)
2038 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2040 if (got_object_id_cmp(id, commit_id) == 0) {
2048 got_commit_graph_close(graph);
2049 free(head_commit_id);
2050 if (!err && !is_same_branch)
2051 err = got_error(GOT_ERR_ANCESTRY);
2055 static const struct got_error *
2056 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2058 static char msg[512];
2059 const char *branch_name;
2061 if (got_ref_is_symbolic(ref))
2062 branch_name = got_ref_get_symref_target(ref);
2064 branch_name = got_ref_get_name(ref);
2066 if (strncmp("refs/heads/", branch_name, 11) == 0)
2069 snprintf(msg, sizeof(msg),
2070 "target commit is not contained in branch '%s'; "
2071 "the branch to use must be specified with -b; "
2072 "if necessary a new branch can be created for "
2073 "this commit with 'got branch -c %s BRANCH_NAME'",
2074 branch_name, commit_id_str);
2076 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2079 static const struct got_error *
2080 cmd_checkout(int argc, char *argv[])
2082 const struct got_error *error = NULL;
2083 struct got_repository *repo = NULL;
2084 struct got_reference *head_ref = NULL;
2085 struct got_worktree *worktree = NULL;
2086 char *repo_path = NULL;
2087 char *worktree_path = NULL;
2088 const char *path_prefix = "";
2089 const char *branch_name = GOT_REF_HEAD;
2090 char *commit_id_str = NULL;
2091 int ch, same_path_prefix, allow_nonempty = 0;
2092 struct got_pathlist_head paths;
2093 struct got_checkout_progress_arg cpa;
2097 while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2100 branch_name = optarg;
2103 commit_id_str = strdup(optarg);
2104 if (commit_id_str == NULL)
2105 return got_error_from_errno("strdup");
2111 path_prefix = optarg;
2123 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2124 "unveil", NULL) == -1)
2128 char *cwd, *base, *dotgit;
2129 repo_path = realpath(argv[0], NULL);
2130 if (repo_path == NULL)
2131 return got_error_from_errno2("realpath", argv[0]);
2132 cwd = getcwd(NULL, 0);
2134 error = got_error_from_errno("getcwd");
2137 if (path_prefix[0]) {
2138 base = basename(path_prefix);
2140 error = got_error_from_errno2("basename",
2145 base = basename(repo_path);
2147 error = got_error_from_errno2("basename",
2152 dotgit = strstr(base, ".git");
2155 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2156 error = got_error_from_errno("asprintf");
2161 } else if (argc == 2) {
2162 repo_path = realpath(argv[0], NULL);
2163 if (repo_path == NULL) {
2164 error = got_error_from_errno2("realpath", argv[0]);
2167 worktree_path = realpath(argv[1], NULL);
2168 if (worktree_path == NULL) {
2169 if (errno != ENOENT) {
2170 error = got_error_from_errno2("realpath",
2174 worktree_path = strdup(argv[1]);
2175 if (worktree_path == NULL) {
2176 error = got_error_from_errno("strdup");
2183 got_path_strip_trailing_slashes(repo_path);
2184 got_path_strip_trailing_slashes(worktree_path);
2186 error = got_repo_open(&repo, repo_path, NULL);
2190 /* Pre-create work tree path for unveil(2) */
2191 error = got_path_mkdir(worktree_path);
2193 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2194 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2196 if (!allow_nonempty &&
2197 !got_path_dir_is_empty(worktree_path)) {
2198 error = got_error_path(worktree_path,
2199 GOT_ERR_DIR_NOT_EMPTY);
2204 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2208 error = got_ref_open(&head_ref, repo, branch_name, 0);
2212 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2213 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2216 error = got_worktree_open(&worktree, worktree_path);
2220 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2224 if (!same_path_prefix) {
2225 error = got_error(GOT_ERR_PATH_PREFIX);
2229 if (commit_id_str) {
2230 struct got_object_id *commit_id;
2231 error = got_repo_match_object_id(&commit_id, NULL,
2232 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2235 error = check_linear_ancestry(commit_id,
2236 got_worktree_get_base_commit_id(worktree), 0, repo);
2237 if (error != NULL) {
2239 if (error->code == GOT_ERR_ANCESTRY) {
2240 error = checkout_ancestry_error(
2241 head_ref, commit_id_str);
2245 error = check_same_branch(commit_id, head_ref, NULL, repo);
2247 if (error->code == GOT_ERR_ANCESTRY) {
2248 error = checkout_ancestry_error(
2249 head_ref, commit_id_str);
2253 error = got_worktree_set_base_commit_id(worktree, repo,
2260 error = got_pathlist_append(&paths, "", NULL);
2263 cpa.worktree_path = worktree_path;
2264 cpa.had_base_commit_ref_error = 0;
2265 error = got_worktree_checkout_files(worktree, &paths, repo,
2266 checkout_progress, &cpa, check_cancelled, NULL);
2270 printf("Now shut up and hack\n");
2271 if (cpa.had_base_commit_ref_error)
2272 show_worktree_base_ref_warning();
2274 got_pathlist_free(&paths);
2275 free(commit_id_str);
2277 free(worktree_path);
2284 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2289 static const struct got_error *
2290 update_progress(void *arg, unsigned char status, const char *path)
2292 int *did_something = arg;
2294 if (status == GOT_STATUS_EXISTS ||
2295 status == GOT_STATUS_BASE_REF_ERR)
2300 /* Base commit bump happens silently. */
2301 if (status == GOT_STATUS_BUMP_BASE)
2304 while (path[0] == '/')
2306 printf("%c %s\n", status, path);
2310 static const struct got_error *
2311 switch_head_ref(struct got_reference *head_ref,
2312 struct got_object_id *commit_id, struct got_worktree *worktree,
2313 struct got_repository *repo)
2315 const struct got_error *err = NULL;
2317 int ref_has_moved = 0;
2319 /* Trivial case: switching between two different references. */
2320 if (strcmp(got_ref_get_name(head_ref),
2321 got_worktree_get_head_ref_name(worktree)) != 0) {
2322 printf("Switching work tree from %s to %s\n",
2323 got_worktree_get_head_ref_name(worktree),
2324 got_ref_get_name(head_ref));
2325 return got_worktree_set_head_ref(worktree, head_ref);
2328 err = check_linear_ancestry(commit_id,
2329 got_worktree_get_base_commit_id(worktree), 0, repo);
2331 if (err->code != GOT_ERR_ANCESTRY)
2338 /* Switching to a rebased branch with the same reference name. */
2339 err = got_object_id_str(&base_id_str,
2340 got_worktree_get_base_commit_id(worktree));
2343 printf("Reference %s now points at a different branch\n",
2344 got_worktree_get_head_ref_name(worktree));
2345 printf("Switching work tree from %s to %s\n", base_id_str,
2346 got_worktree_get_head_ref_name(worktree));
2350 static const struct got_error *
2351 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2353 const struct got_error *err;
2356 err = got_worktree_rebase_in_progress(&in_progress, worktree);
2360 return got_error(GOT_ERR_REBASING);
2362 err = got_worktree_histedit_in_progress(&in_progress, worktree);
2366 return got_error(GOT_ERR_HISTEDIT_BUSY);
2371 static const struct got_error *
2372 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2373 char *argv[], struct got_worktree *worktree)
2375 const struct got_error *err = NULL;
2382 return got_error_from_errno("strdup");
2383 return got_pathlist_append(paths, path, NULL);
2386 for (i = 0; i < argc; i++) {
2387 err = got_worktree_resolve_path(&path, worktree, argv[i]);
2390 err = got_pathlist_append(paths, path, NULL);
2400 static const struct got_error *
2401 cmd_update(int argc, char *argv[])
2403 const struct got_error *error = NULL;
2404 struct got_repository *repo = NULL;
2405 struct got_worktree *worktree = NULL;
2406 char *worktree_path = NULL;
2407 struct got_object_id *commit_id = NULL;
2408 char *commit_id_str = NULL;
2409 const char *branch_name = NULL;
2410 struct got_reference *head_ref = NULL;
2411 struct got_pathlist_head paths;
2412 struct got_pathlist_entry *pe;
2413 int ch, did_something = 0;
2417 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2420 branch_name = optarg;
2423 commit_id_str = strdup(optarg);
2424 if (commit_id_str == NULL)
2425 return got_error_from_errno("strdup");
2437 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2438 "unveil", NULL) == -1)
2441 worktree_path = getcwd(NULL, 0);
2442 if (worktree_path == NULL) {
2443 error = got_error_from_errno("getcwd");
2446 error = got_worktree_open(&worktree, worktree_path);
2450 error = check_rebase_or_histedit_in_progress(worktree);
2454 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2459 error = apply_unveil(got_repo_get_path(repo), 0,
2460 got_worktree_get_root_path(worktree));
2464 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2468 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2469 got_worktree_get_head_ref_name(worktree), 0);
2472 if (commit_id_str == NULL) {
2473 error = got_ref_resolve(&commit_id, repo, head_ref);
2476 error = got_object_id_str(&commit_id_str, commit_id);
2480 error = got_repo_match_object_id(&commit_id, NULL,
2481 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2482 free(commit_id_str);
2483 commit_id_str = NULL;
2486 error = got_object_id_str(&commit_id_str, commit_id);
2492 struct got_object_id *head_commit_id;
2493 TAILQ_FOREACH(pe, &paths, entry) {
2494 if (pe->path_len == 0)
2496 error = got_error_msg(GOT_ERR_BAD_PATH,
2497 "switching between branches requires that "
2498 "the entire work tree gets updated");
2501 error = got_ref_resolve(&head_commit_id, repo, head_ref);
2504 error = check_linear_ancestry(commit_id, head_commit_id, 0,
2506 free(head_commit_id);
2509 error = check_same_branch(commit_id, head_ref, NULL, repo);
2512 error = switch_head_ref(head_ref, commit_id, worktree, repo);
2516 error = check_linear_ancestry(commit_id,
2517 got_worktree_get_base_commit_id(worktree), 0, repo);
2518 if (error != NULL) {
2519 if (error->code == GOT_ERR_ANCESTRY)
2520 error = got_error(GOT_ERR_BRANCH_MOVED);
2523 error = check_same_branch(commit_id, head_ref, NULL, repo);
2528 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2530 error = got_worktree_set_base_commit_id(worktree, repo,
2536 error = got_worktree_checkout_files(worktree, &paths, repo,
2537 update_progress, &did_something, check_cancelled, NULL);
2542 printf("Updated to commit %s\n", commit_id_str);
2544 printf("Already up-to-date\n");
2546 free(worktree_path);
2547 TAILQ_FOREACH(pe, &paths, entry)
2548 free((char *)pe->path);
2549 got_pathlist_free(&paths);
2551 free(commit_id_str);
2555 static const struct got_error *
2556 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2557 const char *path, int diff_context, int ignore_whitespace,
2558 struct got_repository *repo)
2560 const struct got_error *err = NULL;
2561 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2564 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2569 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2573 while (path[0] == '/')
2575 err = got_diff_blob(blob1, blob2, path, path, diff_context,
2576 ignore_whitespace, stdout);
2579 got_object_blob_close(blob1);
2580 got_object_blob_close(blob2);
2584 static const struct got_error *
2585 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2586 const char *path, int diff_context, int ignore_whitespace,
2587 struct got_repository *repo)
2589 const struct got_error *err = NULL;
2590 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2591 struct got_diff_blob_output_unidiff_arg arg;
2594 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2599 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2603 arg.diff_context = diff_context;
2604 arg.ignore_whitespace = ignore_whitespace;
2605 arg.outfile = stdout;
2606 while (path[0] == '/')
2608 err = got_diff_tree(tree1, tree2, path, path, repo,
2609 got_diff_blob_output_unidiff, &arg, 1);
2612 got_object_tree_close(tree1);
2614 got_object_tree_close(tree2);
2618 static const struct got_error *
2619 print_patch(struct got_commit_object *commit, struct got_object_id *id,
2620 const char *path, int diff_context, struct got_repository *repo)
2622 const struct got_error *err = NULL;
2623 struct got_commit_object *pcommit = NULL;
2624 char *id_str1 = NULL, *id_str2 = NULL;
2625 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
2626 struct got_object_qid *qid;
2628 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
2630 err = got_object_open_as_commit(&pcommit, repo,
2636 if (path && path[0] != '\0') {
2638 err = got_object_id_by_path(&obj_id2, repo, id, path);
2641 err = got_object_id_str(&id_str2, obj_id2);
2647 err = got_object_id_by_path(&obj_id1, repo,
2653 err = got_object_id_str(&id_str1, obj_id1);
2659 err = got_object_get_type(&obj_type, repo, obj_id2);
2664 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2666 case GOT_OBJ_TYPE_BLOB:
2667 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
2670 case GOT_OBJ_TYPE_TREE:
2671 err = diff_trees(obj_id1, obj_id2, path, diff_context,
2675 err = got_error(GOT_ERR_OBJ_TYPE);
2681 obj_id2 = got_object_commit_get_tree_id(commit);
2682 err = got_object_id_str(&id_str2, obj_id2);
2685 obj_id1 = got_object_commit_get_tree_id(pcommit);
2686 err = got_object_id_str(&id_str1, obj_id1);
2689 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
2690 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
2696 got_object_commit_close(pcommit);
2701 get_datestr(time_t *time, char *datebuf)
2703 struct tm mytm, *tm;
2706 tm = gmtime_r(time, &mytm);
2709 s = asctime_r(tm, datebuf);
2712 p = strchr(s, '\n');
2718 static const struct got_error *
2719 match_logmsg(int *have_match, struct got_object_id *id,
2720 struct got_commit_object *commit, regex_t *regex)
2722 const struct got_error *err = NULL;
2723 regmatch_t regmatch;
2724 char *id_str = NULL, *logmsg = NULL;
2728 err = got_object_id_str(&id_str, id);
2732 err = got_object_commit_get_logmsg(&logmsg, commit);
2736 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
2744 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
2746 static const struct got_error *
2747 print_commit(struct got_commit_object *commit, struct got_object_id *id,
2748 struct got_repository *repo, const char *path, int show_patch,
2749 int diff_context, struct got_reflist_head *refs)
2751 const struct got_error *err = NULL;
2752 char *id_str, *datestr, *logmsg0, *logmsg, *line;
2754 time_t committer_time;
2755 const char *author, *committer;
2756 char *refs_str = NULL;
2757 struct got_reflist_entry *re;
2759 SIMPLEQ_FOREACH(re, refs, entry) {
2762 struct got_tag_object *tag = NULL;
2765 name = got_ref_get_name(re->ref);
2766 if (strcmp(name, GOT_REF_HEAD) == 0)
2768 if (strncmp(name, "refs/", 5) == 0)
2770 if (strncmp(name, "got/", 4) == 0)
2772 if (strncmp(name, "heads/", 6) == 0)
2774 if (strncmp(name, "remotes/", 8) == 0)
2776 if (strncmp(name, "tags/", 5) == 0) {
2777 err = got_object_open_as_tag(&tag, repo, re->id);
2779 if (err->code != GOT_ERR_OBJ_TYPE)
2781 /* Ref points at something other than a tag. */
2786 cmp = got_object_id_cmp(tag ?
2787 got_object_tag_get_object_id(tag) : re->id, id);
2789 got_object_tag_close(tag);
2793 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
2795 err = got_error_from_errno("asprintf");
2801 err = got_object_id_str(&id_str, id);
2805 printf(GOT_COMMIT_SEP_STR);
2806 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
2807 refs_str ? refs_str : "", refs_str ? ")" : "");
2812 printf("from: %s\n", got_object_commit_get_author(commit));
2813 committer_time = got_object_commit_get_committer_time(commit);
2814 datestr = get_datestr(&committer_time, datebuf);
2816 printf("date: %s UTC\n", datestr);
2817 author = got_object_commit_get_author(commit);
2818 committer = got_object_commit_get_committer(commit);
2819 if (strcmp(author, committer) != 0)
2820 printf("via: %s\n", committer);
2821 if (got_object_commit_get_nparents(commit) > 1) {
2822 const struct got_object_id_queue *parent_ids;
2823 struct got_object_qid *qid;
2825 parent_ids = got_object_commit_get_parent_ids(commit);
2826 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
2827 err = got_object_id_str(&id_str, qid->id);
2830 printf("parent %d: %s\n", n++, id_str);
2835 err = got_object_commit_get_logmsg(&logmsg0, commit);
2841 line = strsep(&logmsg, "\n");
2843 printf(" %s\n", line);
2848 err = print_patch(commit, id, path, diff_context, repo);
2853 if (fflush(stdout) != 0 && err == NULL)
2854 err = got_error_from_errno("fflush");
2858 static const struct got_error *
2859 print_commits(struct got_object_id *root_id, struct got_repository *repo,
2860 const char *path, int show_patch, const char *search_pattern,
2861 int diff_context, int limit, int log_branches,
2862 struct got_reflist_head *refs)
2864 const struct got_error *err;
2865 struct got_commit_graph *graph;
2869 if (search_pattern &&
2870 regcomp(®ex, search_pattern, REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
2871 return got_error_msg(GOT_ERR_REGEX, search_pattern);
2873 err = got_commit_graph_open(&graph, path, !log_branches);
2876 err = got_commit_graph_iter_start(graph, root_id, repo,
2877 check_cancelled, NULL);
2881 struct got_commit_object *commit;
2882 struct got_object_id *id;
2884 if (sigint_received || sigpipe_received)
2887 err = got_commit_graph_iter_next(&id, graph, repo,
2888 check_cancelled, NULL);
2890 if (err->code == GOT_ERR_ITER_COMPLETED)
2897 err = got_object_open_as_commit(&commit, repo, id);
2901 if (search_pattern) {
2902 err = match_logmsg(&have_match, id, commit, ®ex);
2904 got_object_commit_close(commit);
2907 if (have_match == 0) {
2908 got_object_commit_close(commit);
2913 err = print_commit(commit, id, repo, path, show_patch,
2914 diff_context, refs);
2915 got_object_commit_close(commit);
2916 if (err || (limit && --limit == 0))
2922 got_commit_graph_close(graph);
2929 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] [-p] "
2930 "[-s search-pattern] [-r repository-path] [path]\n", getprogname());
2935 get_default_log_limit(void)
2937 const char *got_default_log_limit;
2941 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
2942 if (got_default_log_limit == NULL)
2944 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
2950 static const struct got_error *
2951 cmd_log(int argc, char *argv[])
2953 const struct got_error *error;
2954 struct got_repository *repo = NULL;
2955 struct got_worktree *worktree = NULL;
2956 struct got_commit_object *commit = NULL;
2957 struct got_object_id *id = NULL;
2958 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
2959 const char *start_commit = NULL, *search_pattern = NULL;
2960 int diff_context = -1, ch;
2961 int show_patch = 0, limit = 0, log_branches = 0;
2963 struct got_reflist_head refs;
2965 SIMPLEQ_INIT(&refs);
2968 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
2974 limit = get_default_log_limit();
2976 while ((ch = getopt(argc, argv, "bpc:C:l:r:s:")) != -1) {
2982 start_commit = optarg;
2985 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
2988 err(1, "-C option %s", errstr);
2991 limit = strtonum(optarg, 0, INT_MAX, &errstr);
2993 err(1, "-l option %s", errstr);
2999 repo_path = realpath(optarg, NULL);
3000 if (repo_path == NULL)
3001 return got_error_from_errno2("realpath",
3003 got_path_strip_trailing_slashes(repo_path);
3006 search_pattern = optarg;
3017 if (diff_context == -1)
3019 else if (!show_patch)
3020 errx(1, "-C reguires -p");
3022 cwd = getcwd(NULL, 0);
3024 error = got_error_from_errno("getcwd");
3028 error = got_worktree_open(&worktree, cwd);
3029 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3036 error = got_error_from_errno("strdup");
3039 } else if (argc == 1) {
3041 error = got_worktree_resolve_path(&path, worktree,
3046 path = strdup(argv[0]);
3048 error = got_error_from_errno("strdup");
3055 if (repo_path == NULL) {
3056 repo_path = worktree ?
3057 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3059 if (repo_path == NULL) {
3060 error = got_error_from_errno("strdup");
3064 error = got_repo_open(&repo, repo_path, NULL);
3068 error = apply_unveil(got_repo_get_path(repo), 1,
3069 worktree ? got_worktree_get_root_path(worktree) : NULL);
3073 if (start_commit == NULL) {
3074 struct got_reference *head_ref;
3075 error = got_ref_open(&head_ref, repo,
3076 worktree ? got_worktree_get_head_ref_name(worktree)
3080 error = got_ref_resolve(&id, repo, head_ref);
3081 got_ref_close(head_ref);
3084 error = got_object_open_as_commit(&commit, repo, id);
3086 struct got_reference *ref;
3087 error = got_ref_open(&ref, repo, start_commit, 0);
3088 if (error == NULL) {
3090 error = got_ref_resolve(&id, repo, ref);
3094 error = got_object_get_type(&obj_type, repo, id);
3097 if (obj_type == GOT_OBJ_TYPE_TAG) {
3098 struct got_tag_object *tag;
3099 error = got_object_open_as_tag(&tag, repo, id);
3102 if (got_object_tag_get_object_type(tag) !=
3103 GOT_OBJ_TYPE_COMMIT) {
3104 got_object_tag_close(tag);
3105 error = got_error(GOT_ERR_OBJ_TYPE);
3109 id = got_object_id_dup(
3110 got_object_tag_get_object_id(tag));
3112 error = got_error_from_errno(
3113 "got_object_id_dup");
3114 got_object_tag_close(tag);
3117 } else if (obj_type != GOT_OBJ_TYPE_COMMIT) {
3118 error = got_error(GOT_ERR_OBJ_TYPE);
3121 error = got_object_open_as_commit(&commit, repo, id);
3125 if (commit == NULL) {
3126 error = got_repo_match_object_id_prefix(&id,
3127 start_commit, GOT_OBJ_TYPE_COMMIT, repo);
3136 const char *prefix = got_worktree_get_path_prefix(worktree);
3138 if (asprintf(&p, "%s%s%s", prefix,
3139 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3140 error = got_error_from_errno("asprintf");
3143 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3146 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3151 path = in_repo_path;
3154 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3158 error = print_commits(id, repo, path, show_patch, search_pattern,
3159 diff_context, limit, log_branches, &refs);
3166 got_worktree_close(worktree);
3168 const struct got_error *repo_error;
3169 repo_error = got_repo_close(repo);
3173 got_ref_list_free(&refs);
3180 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3181 "[-w] [object1 object2 | path]\n", getprogname());
3185 struct print_diff_arg {
3186 struct got_repository *repo;
3187 struct got_worktree *worktree;
3192 int ignore_whitespace;
3195 static const struct got_error *
3196 print_diff(void *arg, unsigned char status, unsigned char staged_status,
3197 const char *path, struct got_object_id *blob_id,
3198 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3199 int dirfd, const char *de_name)
3201 struct print_diff_arg *a = arg;
3202 const struct got_error *err = NULL;
3203 struct got_blob_object *blob1 = NULL;
3206 char *abspath = NULL, *label1 = NULL;
3209 if (a->diff_staged) {
3210 if (staged_status != GOT_STATUS_MODIFY &&
3211 staged_status != GOT_STATUS_ADD &&
3212 staged_status != GOT_STATUS_DELETE)
3215 if (staged_status == GOT_STATUS_DELETE)
3217 if (status == GOT_STATUS_NONEXISTENT)
3218 return got_error_set_errno(ENOENT, path);
3219 if (status != GOT_STATUS_MODIFY &&
3220 status != GOT_STATUS_ADD &&
3221 status != GOT_STATUS_DELETE &&
3222 status != GOT_STATUS_CONFLICT)
3226 if (!a->header_shown) {
3227 printf("diff %s %s%s\n", a->id_str,
3228 got_worktree_get_root_path(a->worktree),
3229 a->diff_staged ? " (staged changes)" : "");
3230 a->header_shown = 1;
3233 if (a->diff_staged) {
3234 const char *label1 = NULL, *label2 = NULL;
3235 switch (staged_status) {
3236 case GOT_STATUS_MODIFY:
3240 case GOT_STATUS_ADD:
3243 case GOT_STATUS_DELETE:
3247 return got_error(GOT_ERR_FILE_STATUS);
3249 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3250 label1, label2, a->diff_context, a->ignore_whitespace,
3254 if (staged_status == GOT_STATUS_ADD ||
3255 staged_status == GOT_STATUS_MODIFY) {
3257 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3261 err = got_object_id_str(&id_str, staged_blob_id);
3264 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3265 err = got_error_from_errno("asprintf");
3270 } else if (status != GOT_STATUS_ADD) {
3271 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3276 if (status != GOT_STATUS_DELETE) {
3277 if (asprintf(&abspath, "%s/%s",
3278 got_worktree_get_root_path(a->worktree), path) == -1) {
3279 err = got_error_from_errno("asprintf");
3284 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3286 err = got_error_from_errno2("openat", abspath);
3290 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3292 err = got_error_from_errno2("open", abspath);
3296 if (fstat(fd, &sb) == -1) {
3297 err = got_error_from_errno2("fstat", abspath);
3300 f2 = fdopen(fd, "r");
3302 err = got_error_from_errno2("fdopen", abspath);
3309 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3310 a->diff_context, a->ignore_whitespace, stdout);
3313 got_object_blob_close(blob1);
3314 if (f2 && fclose(f2) == EOF && err == NULL)
3315 err = got_error_from_errno("fclose");
3316 if (fd != -1 && close(fd) == -1 && err == NULL)
3317 err = got_error_from_errno("close");
3322 static const struct got_error *
3323 cmd_diff(int argc, char *argv[])
3325 const struct got_error *error;
3326 struct got_repository *repo = NULL;
3327 struct got_worktree *worktree = NULL;
3328 char *cwd = NULL, *repo_path = NULL;
3329 struct got_object_id *id1 = NULL, *id2 = NULL;
3330 const char *id_str1 = NULL, *id_str2 = NULL;
3331 char *label1 = NULL, *label2 = NULL;
3333 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3338 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3343 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3346 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3349 err(1, "-C option %s", errstr);
3352 repo_path = realpath(optarg, NULL);
3353 if (repo_path == NULL)
3354 return got_error_from_errno2("realpath",
3356 got_path_strip_trailing_slashes(repo_path);
3362 ignore_whitespace = 1;
3373 cwd = getcwd(NULL, 0);
3375 error = got_error_from_errno("getcwd");
3381 "-r option can't be used when diffing a work tree");
3382 error = got_worktree_open(&worktree, cwd);
3385 repo_path = strdup(got_worktree_get_repo_path(worktree));
3386 if (repo_path == NULL) {
3387 error = got_error_from_errno("strdup");
3391 error = got_worktree_resolve_path(&path, worktree,
3398 error = got_error_from_errno("strdup");
3402 } else if (argc == 2) {
3404 errx(1, "-s option can't be used when diffing "
3405 "objects in repository");
3408 if (repo_path == NULL) {
3409 error = got_worktree_open(&worktree, cwd);
3410 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3414 got_worktree_get_repo_path(worktree));
3415 if (repo_path == NULL) {
3416 error = got_error_from_errno("strdup");
3420 repo_path = strdup(cwd);
3421 if (repo_path == NULL) {
3422 error = got_error_from_errno("strdup");
3430 error = got_repo_open(&repo, repo_path, NULL);
3435 error = apply_unveil(got_repo_get_path(repo), 1,
3436 worktree ? got_worktree_get_root_path(worktree) : NULL);
3441 struct print_diff_arg arg;
3442 struct got_pathlist_head paths;
3447 error = got_object_id_str(&id_str,
3448 got_worktree_get_base_commit_id(worktree));
3452 arg.worktree = worktree;
3453 arg.diff_context = diff_context;
3454 arg.id_str = id_str;
3455 arg.header_shown = 0;
3456 arg.diff_staged = diff_staged;
3457 arg.ignore_whitespace = ignore_whitespace;
3459 error = got_pathlist_append(&paths, path, NULL);
3463 error = got_worktree_status(worktree, &paths, repo, print_diff,
3464 &arg, check_cancelled, NULL);
3466 got_pathlist_free(&paths);
3470 error = got_repo_match_object_id(&id1, &label1, id_str1,
3471 GOT_OBJ_TYPE_ANY, 1, repo);
3475 error = got_repo_match_object_id(&id2, &label2, id_str2,
3476 GOT_OBJ_TYPE_ANY, 1, repo);
3480 error = got_object_get_type(&type1, repo, id1);
3484 error = got_object_get_type(&type2, repo, id2);
3488 if (type1 != type2) {
3489 error = got_error(GOT_ERR_OBJ_TYPE);
3494 case GOT_OBJ_TYPE_BLOB:
3495 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
3496 diff_context, ignore_whitespace, repo, stdout);
3498 case GOT_OBJ_TYPE_TREE:
3499 error = got_diff_objects_as_trees(id1, id2, "", "",
3500 diff_context, ignore_whitespace, repo, stdout);
3502 case GOT_OBJ_TYPE_COMMIT:
3503 printf("diff %s %s\n", label1, label2);
3504 error = got_diff_objects_as_commits(id1, id2, diff_context,
3505 ignore_whitespace, repo, stdout);
3508 error = got_error(GOT_ERR_OBJ_TYPE);
3517 got_worktree_close(worktree);
3519 const struct got_error *repo_error;
3520 repo_error = got_repo_close(repo);
3531 "usage: %s blame [-c commit] [-r repository-path] path\n",
3540 char datebuf[11]; /* YYYY-MM-DD + NUL */
3543 struct blame_cb_args {
3544 struct blame_line *lines;
3548 off_t *line_offsets;
3550 struct got_repository *repo;
3553 static const struct got_error *
3554 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
3556 const struct got_error *err = NULL;
3557 struct blame_cb_args *a = arg;
3558 struct blame_line *bline;
3560 size_t linesize = 0;
3561 struct got_commit_object *commit = NULL;
3564 time_t committer_time;
3566 if (nlines != a->nlines ||
3567 (lineno != -1 && lineno < 1) || lineno > a->nlines)
3568 return got_error(GOT_ERR_RANGE);
3570 if (sigint_received)
3571 return got_error(GOT_ERR_ITER_COMPLETED);
3574 return NULL; /* no change in this commit */
3576 /* Annotate this line. */
3577 bline = &a->lines[lineno - 1];
3578 if (bline->annotated)
3580 err = got_object_id_str(&bline->id_str, id);
3584 err = got_object_open_as_commit(&commit, a->repo, id);
3588 bline->committer = strdup(got_object_commit_get_committer(commit));
3589 if (bline->committer == NULL) {
3590 err = got_error_from_errno("strdup");
3594 committer_time = got_object_commit_get_committer_time(commit);
3595 if (localtime_r(&committer_time, &tm) == NULL)
3596 return got_error_from_errno("localtime_r");
3597 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
3598 &tm) >= sizeof(bline->datebuf)) {
3599 err = got_error(GOT_ERR_NO_SPACE);
3602 bline->annotated = 1;
3604 /* Print lines annotated so far. */
3605 bline = &a->lines[a->lineno_cur - 1];
3606 if (!bline->annotated)
3609 offset = a->line_offsets[a->lineno_cur - 1];
3610 if (fseeko(a->f, offset, SEEK_SET) == -1) {
3611 err = got_error_from_errno("fseeko");
3615 while (bline->annotated) {
3616 char *smallerthan, *at, *nl, *committer;
3619 if (getline(&line, &linesize, a->f) == -1) {
3621 err = got_error_from_errno("getline");
3625 committer = bline->committer;
3626 smallerthan = strchr(committer, '<');
3627 if (smallerthan && smallerthan[1] != '\0')
3628 committer = smallerthan + 1;
3629 at = strchr(committer, '@');
3632 len = strlen(committer);
3634 committer[8] = '\0';
3636 nl = strchr(line, '\n');
3639 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
3640 bline->id_str, bline->datebuf, committer, line);
3643 bline = &a->lines[a->lineno_cur - 1];
3647 got_object_commit_close(commit);
3652 static const struct got_error *
3653 cmd_blame(int argc, char *argv[])
3655 const struct got_error *error;
3656 struct got_repository *repo = NULL;
3657 struct got_worktree *worktree = NULL;
3658 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3659 struct got_object_id *obj_id = NULL;
3660 struct got_object_id *commit_id = NULL;
3661 struct got_blob_object *blob = NULL;
3662 char *commit_id_str = NULL;
3663 struct blame_cb_args bca;
3664 int ch, obj_type, i;
3667 memset(&bca, 0, sizeof(bca));
3670 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3675 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
3678 commit_id_str = optarg;
3681 repo_path = realpath(optarg, NULL);
3682 if (repo_path == NULL)
3683 return got_error_from_errno2("realpath",
3685 got_path_strip_trailing_slashes(repo_path);
3701 cwd = getcwd(NULL, 0);
3703 error = got_error_from_errno("getcwd");
3706 if (repo_path == NULL) {
3707 error = got_worktree_open(&worktree, cwd);
3708 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3714 strdup(got_worktree_get_repo_path(worktree));
3715 if (repo_path == NULL) {
3716 error = got_error_from_errno("strdup");
3721 repo_path = strdup(cwd);
3722 if (repo_path == NULL) {
3723 error = got_error_from_errno("strdup");
3729 error = got_repo_open(&repo, repo_path, NULL);
3733 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
3738 const char *prefix = got_worktree_get_path_prefix(worktree);
3739 char *p, *worktree_subdir = cwd +
3740 strlen(got_worktree_get_root_path(worktree));
3741 if (asprintf(&p, "%s%s%s%s%s",
3742 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
3743 worktree_subdir, worktree_subdir[0] ? "/" : "",
3745 error = got_error_from_errno("asprintf");
3748 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3751 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3756 if (commit_id_str == NULL) {
3757 struct got_reference *head_ref;
3758 error = got_ref_open(&head_ref, repo, worktree ?
3759 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
3762 error = got_ref_resolve(&commit_id, repo, head_ref);
3763 got_ref_close(head_ref);
3767 error = got_repo_match_object_id(&commit_id, NULL,
3768 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3773 error = got_object_id_by_path(&obj_id, repo, commit_id, in_repo_path);
3777 error = got_object_get_type(&obj_type, repo, obj_id);
3781 if (obj_type != GOT_OBJ_TYPE_BLOB) {
3782 error = got_error(GOT_ERR_OBJ_TYPE);
3786 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
3789 bca.f = got_opentemp();
3790 if (bca.f == NULL) {
3791 error = got_error_from_errno("got_opentemp");
3794 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
3795 &bca.line_offsets, bca.f, blob);
3796 if (error || bca.nlines == 0)
3799 /* Don't include \n at EOF in the blame line count. */
3800 if (bca.line_offsets[bca.nlines - 1] == filesize)
3803 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
3804 if (bca.lines == NULL) {
3805 error = got_error_from_errno("calloc");
3809 bca.nlines_prec = 0;
3817 error = got_blame(in_repo_path, commit_id, repo, blame_cb, &bca,
3818 check_cancelled, NULL);
3826 got_object_blob_close(blob);
3828 got_worktree_close(worktree);
3830 const struct got_error *repo_error;
3831 repo_error = got_repo_close(repo);
3836 for (i = 0; i < bca.nlines; i++) {
3837 struct blame_line *bline = &bca.lines[i];
3838 free(bline->id_str);
3839 free(bline->committer);
3843 free(bca.line_offsets);
3844 if (bca.f && fclose(bca.f) == EOF && error == NULL)
3845 error = got_error_from_errno("fclose");
3853 "usage: %s tree [-c commit] [-r repository-path] [-iR] path\n",
3859 print_entry(struct got_tree_entry *te, const char *id, const char *path,
3860 const char *root_path)
3862 int is_root_path = (strcmp(path, root_path) == 0);
3863 const char *modestr = "";
3864 mode_t mode = got_tree_entry_get_mode(te);
3866 path += strlen(root_path);
3867 while (path[0] == '/')
3870 if (got_object_tree_entry_is_submodule(te))
3872 else if (S_ISLNK(mode))
3874 else if (S_ISDIR(mode))
3876 else if (mode & S_IXUSR)
3879 printf("%s%s%s%s%s\n", id ? id : "", path,
3880 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr);
3883 static const struct got_error *
3884 print_tree(const char *path, struct got_object_id *commit_id,
3885 int show_ids, int recurse, const char *root_path,
3886 struct got_repository *repo)
3888 const struct got_error *err = NULL;
3889 struct got_object_id *tree_id = NULL;
3890 struct got_tree_object *tree = NULL;
3893 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
3897 err = got_object_open_as_tree(&tree, repo, tree_id);
3900 nentries = got_object_tree_get_nentries(tree);
3901 for (i = 0; i < nentries; i++) {
3902 struct got_tree_entry *te;
3905 if (sigint_received || sigpipe_received)
3908 te = got_object_tree_get_entry(tree, i);
3911 err = got_object_id_str(&id_str,
3912 got_tree_entry_get_id(te));
3915 if (asprintf(&id, "%s ", id_str) == -1) {
3916 err = got_error_from_errno("asprintf");
3922 print_entry(te, id, path, root_path);
3925 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
3927 if (asprintf(&child_path, "%s%s%s", path,
3928 path[0] == '/' && path[1] == '\0' ? "" : "/",
3929 got_tree_entry_get_name(te)) == -1) {
3930 err = got_error_from_errno("asprintf");
3933 err = print_tree(child_path, commit_id, show_ids, 1,
3942 got_object_tree_close(tree);
3947 static const struct got_error *
3948 cmd_tree(int argc, char *argv[])
3950 const struct got_error *error;
3951 struct got_repository *repo = NULL;
3952 struct got_worktree *worktree = NULL;
3954 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
3955 struct got_object_id *commit_id = NULL;
3956 char *commit_id_str = NULL;
3957 int show_ids = 0, recurse = 0;
3961 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3966 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
3969 commit_id_str = optarg;
3972 repo_path = realpath(optarg, NULL);
3973 if (repo_path == NULL)
3974 return got_error_from_errno2("realpath",
3976 got_path_strip_trailing_slashes(repo_path);
4000 cwd = getcwd(NULL, 0);
4002 error = got_error_from_errno("getcwd");
4005 if (repo_path == NULL) {
4006 error = got_worktree_open(&worktree, cwd);
4007 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4013 strdup(got_worktree_get_repo_path(worktree));
4014 if (repo_path == NULL)
4015 error = got_error_from_errno("strdup");
4019 repo_path = strdup(cwd);
4020 if (repo_path == NULL) {
4021 error = got_error_from_errno("strdup");
4027 error = got_repo_open(&repo, repo_path, NULL);
4031 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4037 char *p, *worktree_subdir = cwd +
4038 strlen(got_worktree_get_root_path(worktree));
4039 if (asprintf(&p, "%s/%s",
4040 got_worktree_get_path_prefix(worktree),
4041 worktree_subdir) == -1) {
4042 error = got_error_from_errno("asprintf");
4045 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4052 if (in_repo_path == NULL) {
4053 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4058 if (commit_id_str == NULL) {
4059 struct got_reference *head_ref;
4060 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
4063 error = got_ref_resolve(&commit_id, repo, head_ref);
4064 got_ref_close(head_ref);
4068 error = got_repo_match_object_id(&commit_id, NULL,
4069 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4074 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4075 in_repo_path, repo);
4082 got_worktree_close(worktree);
4084 const struct got_error *repo_error;
4085 repo_error = got_repo_close(repo);
4095 fprintf(stderr, "usage: %s status [path ...]\n", getprogname());
4099 static const struct got_error *
4100 print_status(void *arg, unsigned char status, unsigned char staged_status,
4101 const char *path, struct got_object_id *blob_id,
4102 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4103 int dirfd, const char *de_name)
4105 if (status == staged_status && (status == GOT_STATUS_DELETE))
4106 status = GOT_STATUS_NO_CHANGE;
4107 printf("%c%c %s\n", status, staged_status, path);
4111 static const struct got_error *
4112 cmd_status(int argc, char *argv[])
4114 const struct got_error *error = NULL;
4115 struct got_repository *repo = NULL;
4116 struct got_worktree *worktree = NULL;
4118 struct got_pathlist_head paths;
4119 struct got_pathlist_entry *pe;
4124 while ((ch = getopt(argc, argv, "")) != -1) {
4136 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4140 cwd = getcwd(NULL, 0);
4142 error = got_error_from_errno("getcwd");
4146 error = got_worktree_open(&worktree, cwd);
4150 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4155 error = apply_unveil(got_repo_get_path(repo), 1,
4156 got_worktree_get_root_path(worktree));
4160 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4164 error = got_worktree_status(worktree, &paths, repo, print_status, NULL,
4165 check_cancelled, NULL);
4167 TAILQ_FOREACH(pe, &paths, entry)
4168 free((char *)pe->path);
4169 got_pathlist_free(&paths);
4178 "usage: %s ref [-r repository] -l | -d name | [-s] name target\n",
4183 static const struct got_error *
4184 list_refs(struct got_repository *repo)
4186 static const struct got_error *err = NULL;
4187 struct got_reflist_head refs;
4188 struct got_reflist_entry *re;
4190 SIMPLEQ_INIT(&refs);
4191 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4195 SIMPLEQ_FOREACH(re, &refs, entry) {
4197 refstr = got_ref_to_str(re->ref);
4199 return got_error_from_errno("got_ref_to_str");
4200 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4204 got_ref_list_free(&refs);
4208 static const struct got_error *
4209 delete_ref(struct got_repository *repo, const char *refname)
4211 const struct got_error *err = NULL;
4212 struct got_reference *ref;
4214 err = got_ref_open(&ref, repo, refname, 0);
4218 err = got_ref_delete(ref, repo);
4223 static const struct got_error *
4224 add_ref(struct got_repository *repo, const char *refname, const char *target)
4226 const struct got_error *err = NULL;
4227 struct got_object_id *id;
4228 struct got_reference *ref = NULL;
4231 * Don't let the user create a reference name with a leading '-'.
4232 * While technically a valid reference name, this case is usually
4233 * an unintended typo.
4235 if (refname[0] == '-')
4236 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4238 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4241 struct got_reference *target_ref;
4243 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4245 err = got_ref_open(&target_ref, repo, target, 0);
4248 err = got_ref_resolve(&id, repo, target_ref);
4249 got_ref_close(target_ref);
4254 err = got_ref_alloc(&ref, refname, id);
4258 err = got_ref_write(ref, repo);
4266 static const struct got_error *
4267 add_symref(struct got_repository *repo, const char *refname, const char *target)
4269 const struct got_error *err = NULL;
4270 struct got_reference *ref = NULL;
4271 struct got_reference *target_ref = NULL;
4274 * Don't let the user create a reference name with a leading '-'.
4275 * While technically a valid reference name, this case is usually
4276 * an unintended typo.
4278 if (refname[0] == '-')
4279 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4281 err = got_ref_open(&target_ref, repo, target, 0);
4285 err = got_ref_alloc_symref(&ref, refname, target_ref);
4289 err = got_ref_write(ref, repo);
4292 got_ref_close(target_ref);
4298 static const struct got_error *
4299 cmd_ref(int argc, char *argv[])
4301 const struct got_error *error = NULL;
4302 struct got_repository *repo = NULL;
4303 struct got_worktree *worktree = NULL;
4304 char *cwd = NULL, *repo_path = NULL;
4305 int ch, do_list = 0, create_symref = 0;
4306 const char *delref = NULL;
4308 /* TODO: Add -s option for adding symbolic references. */
4309 while ((ch = getopt(argc, argv, "d:r:ls")) != -1) {
4315 repo_path = realpath(optarg, NULL);
4316 if (repo_path == NULL)
4317 return got_error_from_errno2("realpath",
4319 got_path_strip_trailing_slashes(repo_path);
4333 if (do_list && delref)
4334 errx(1, "-l and -d options are mutually exclusive\n");
4339 if (do_list || delref) {
4341 errx(1, "-s option cannot be used together with the "
4342 "-l or -d options");
4345 } else if (argc != 2)
4350 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4354 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4355 "sendfd unveil", NULL) == -1)
4359 cwd = getcwd(NULL, 0);
4361 error = got_error_from_errno("getcwd");
4365 if (repo_path == NULL) {
4366 error = got_worktree_open(&worktree, cwd);
4367 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4373 strdup(got_worktree_get_repo_path(worktree));
4374 if (repo_path == NULL)
4375 error = got_error_from_errno("strdup");
4379 repo_path = strdup(cwd);
4380 if (repo_path == NULL) {
4381 error = got_error_from_errno("strdup");
4387 error = got_repo_open(&repo, repo_path, NULL);
4391 error = apply_unveil(got_repo_get_path(repo), do_list,
4392 worktree ? got_worktree_get_root_path(worktree) : NULL);
4397 error = list_refs(repo);
4399 error = delete_ref(repo, delref);
4400 else if (create_symref)
4401 error = add_symref(repo, argv[0], argv[1]);
4403 error = add_ref(repo, argv[0], argv[1]);
4406 got_repo_close(repo);
4408 got_worktree_close(worktree);
4418 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
4419 "[name]\n", getprogname());
4423 static const struct got_error *
4424 list_branch(struct got_repository *repo, struct got_worktree *worktree,
4425 struct got_reference *ref)
4427 const struct got_error *err = NULL;
4428 const char *refname, *marker = " ";
4431 refname = got_ref_get_name(ref);
4432 if (worktree && strcmp(refname,
4433 got_worktree_get_head_ref_name(worktree)) == 0) {
4434 struct got_object_id *id = NULL;
4436 err = got_ref_resolve(&id, repo, ref);
4439 if (got_object_id_cmp(id,
4440 got_worktree_get_base_commit_id(worktree)) == 0)
4447 if (strncmp(refname, "refs/heads/", 11) == 0)
4449 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4452 refstr = got_ref_to_str(ref);
4454 return got_error_from_errno("got_ref_to_str");
4456 printf("%s%s: %s\n", marker, refname, refstr);
4461 static const struct got_error *
4462 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
4464 const char *refname;
4466 if (worktree == NULL)
4467 return got_error(GOT_ERR_NOT_WORKTREE);
4469 refname = got_worktree_get_head_ref_name(worktree);
4471 if (strncmp(refname, "refs/heads/", 11) == 0)
4473 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
4476 printf("%s\n", refname);
4481 static const struct got_error *
4482 list_branches(struct got_repository *repo, struct got_worktree *worktree)
4484 static const struct got_error *err = NULL;
4485 struct got_reflist_head refs;
4486 struct got_reflist_entry *re;
4487 struct got_reference *temp_ref = NULL;
4488 int rebase_in_progress, histedit_in_progress;
4490 SIMPLEQ_INIT(&refs);
4493 err = got_worktree_rebase_in_progress(&rebase_in_progress,
4498 err = got_worktree_histedit_in_progress(&histedit_in_progress,
4503 if (rebase_in_progress || histedit_in_progress) {
4504 err = got_ref_open(&temp_ref, repo,
4505 got_worktree_get_head_ref_name(worktree), 0);
4508 list_branch(repo, worktree, temp_ref);
4509 got_ref_close(temp_ref);
4513 err = got_ref_list(&refs, repo, "refs/heads",
4514 got_ref_cmp_by_name, NULL);
4518 SIMPLEQ_FOREACH(re, &refs, entry)
4519 list_branch(repo, worktree, re->ref);
4521 got_ref_list_free(&refs);
4525 static const struct got_error *
4526 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
4527 const char *branch_name)
4529 const struct got_error *err = NULL;
4530 struct got_reference *ref = NULL;
4533 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
4534 return got_error_from_errno("asprintf");
4536 err = got_ref_open(&ref, repo, refname, 0);
4541 strcmp(got_worktree_get_head_ref_name(worktree),
4542 got_ref_get_name(ref)) == 0) {
4543 err = got_error_msg(GOT_ERR_SAME_BRANCH,
4544 "will not delete this work tree's current branch");
4548 err = got_ref_delete(ref, repo);
4556 static const struct got_error *
4557 add_branch(struct got_repository *repo, const char *branch_name,
4558 struct got_object_id *base_commit_id)
4560 const struct got_error *err = NULL;
4561 struct got_reference *ref = NULL;
4562 char *base_refname = NULL, *refname = NULL;
4565 * Don't let the user create a branch name with a leading '-'.
4566 * While technically a valid reference name, this case is usually
4567 * an unintended typo.
4569 if (branch_name[0] == '-')
4570 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
4572 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
4573 err = got_error_from_errno("asprintf");
4577 err = got_ref_open(&ref, repo, refname, 0);
4579 err = got_error(GOT_ERR_BRANCH_EXISTS);
4581 } else if (err->code != GOT_ERR_NOT_REF)
4584 err = got_ref_alloc(&ref, refname, base_commit_id);
4588 err = got_ref_write(ref, repo);
4597 static const struct got_error *
4598 cmd_branch(int argc, char *argv[])
4600 const struct got_error *error = NULL;
4601 struct got_repository *repo = NULL;
4602 struct got_worktree *worktree = NULL;
4603 char *cwd = NULL, *repo_path = NULL;
4604 int ch, do_list = 0, do_show = 0, do_update = 1;
4605 const char *delref = NULL, *commit_id_arg = NULL;
4606 struct got_reference *ref = NULL;
4607 struct got_pathlist_head paths;
4608 struct got_pathlist_entry *pe;
4609 struct got_object_id *commit_id = NULL;
4610 char *commit_id_str = NULL;
4614 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
4617 commit_id_arg = optarg;
4623 repo_path = realpath(optarg, NULL);
4624 if (repo_path == NULL)
4625 return got_error_from_errno2("realpath",
4627 got_path_strip_trailing_slashes(repo_path);
4641 if (do_list && delref)
4642 errx(1, "-l and -d options are mutually exclusive\n");
4647 if (!do_list && !delref && argc == 0)
4650 if ((do_list || delref || do_show) && commit_id_arg != NULL)
4651 errx(1, "-c option can only be used when creating a branch");
4653 if (do_list || delref) {
4656 } else if (!do_show && argc != 1)
4660 if (do_list || do_show) {
4661 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
4665 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
4666 "sendfd unveil", NULL) == -1)
4670 cwd = getcwd(NULL, 0);
4672 error = got_error_from_errno("getcwd");
4676 if (repo_path == NULL) {
4677 error = got_worktree_open(&worktree, cwd);
4678 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4684 strdup(got_worktree_get_repo_path(worktree));
4685 if (repo_path == NULL)
4686 error = got_error_from_errno("strdup");
4690 repo_path = strdup(cwd);
4691 if (repo_path == NULL) {
4692 error = got_error_from_errno("strdup");
4698 error = got_repo_open(&repo, repo_path, NULL);
4702 error = apply_unveil(got_repo_get_path(repo), do_list,
4703 worktree ? got_worktree_get_root_path(worktree) : NULL);
4708 error = show_current_branch(repo, worktree);
4710 error = list_branches(repo, worktree);
4712 error = delete_branch(repo, worktree, delref);
4714 if (commit_id_arg == NULL)
4715 commit_id_arg = worktree ?
4716 got_worktree_get_head_ref_name(worktree) :
4718 error = got_repo_match_object_id(&commit_id, NULL,
4719 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
4722 error = add_branch(repo, argv[0], commit_id);
4725 if (worktree && do_update) {
4726 int did_something = 0;
4727 char *branch_refname = NULL;
4729 error = got_object_id_str(&commit_id_str, commit_id);
4732 error = get_worktree_paths_from_argv(&paths, 0, NULL,
4736 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
4738 error = got_error_from_errno("asprintf");
4741 error = got_ref_open(&ref, repo, branch_refname, 0);
4742 free(branch_refname);
4745 error = switch_head_ref(ref, commit_id, worktree,
4749 error = got_worktree_set_base_commit_id(worktree, repo,
4753 error = got_worktree_checkout_files(worktree, &paths,
4754 repo, update_progress, &did_something,
4755 check_cancelled, NULL);
4759 printf("Updated to commit %s\n", commit_id_str);
4766 got_repo_close(repo);
4768 got_worktree_close(worktree);
4772 free(commit_id_str);
4773 TAILQ_FOREACH(pe, &paths, entry)
4774 free((char *)pe->path);
4775 got_pathlist_free(&paths);
4784 "usage: %s tag [-c commit] [-r repository] [-l] "
4785 "[-m message] name\n", getprogname());
4790 static const struct got_error *
4791 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
4793 const struct got_error *err = NULL;
4794 struct got_reflist_entry *re, *se, *new;
4795 struct got_object_id *re_id, *se_id;
4796 struct got_tag_object *re_tag, *se_tag;
4797 time_t re_time, se_time;
4799 SIMPLEQ_FOREACH(re, tags, entry) {
4800 se = SIMPLEQ_FIRST(sorted);
4802 err = got_reflist_entry_dup(&new, re);
4805 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
4808 err = got_ref_resolve(&re_id, repo, re->ref);
4811 err = got_object_open_as_tag(&re_tag, repo, re_id);
4815 re_time = got_object_tag_get_tagger_time(re_tag);
4816 got_object_tag_close(re_tag);
4820 err = got_ref_resolve(&se_id, repo, re->ref);
4823 err = got_object_open_as_tag(&se_tag, repo, se_id);
4827 se_time = got_object_tag_get_tagger_time(se_tag);
4828 got_object_tag_close(se_tag);
4830 if (se_time > re_time) {
4831 err = got_reflist_entry_dup(&new, re);
4834 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
4837 se = SIMPLEQ_NEXT(se, entry);
4846 static const struct got_error *
4847 list_tags(struct got_repository *repo, struct got_worktree *worktree)
4849 static const struct got_error *err = NULL;
4850 struct got_reflist_head refs;
4851 struct got_reflist_entry *re;
4853 SIMPLEQ_INIT(&refs);
4855 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
4859 SIMPLEQ_FOREACH(re, &refs, entry) {
4860 const char *refname;
4861 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
4865 struct got_object_id *id;
4866 struct got_tag_object *tag;
4867 struct got_commit_object *commit = NULL;
4869 refname = got_ref_get_name(re->ref);
4870 if (strncmp(refname, "refs/tags/", 10) != 0)
4873 refstr = got_ref_to_str(re->ref);
4874 if (refstr == NULL) {
4875 err = got_error_from_errno("got_ref_to_str");
4878 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
4881 err = got_ref_resolve(&id, repo, re->ref);
4884 err = got_object_open_as_tag(&tag, repo, id);
4886 if (err->code != GOT_ERR_OBJ_TYPE) {
4890 /* "lightweight" tag */
4891 err = got_object_open_as_commit(&commit, repo, id);
4896 tagger = got_object_commit_get_committer(commit);
4898 got_object_commit_get_committer_time(commit);
4899 err = got_object_id_str(&id_str, id);
4905 tagger = got_object_tag_get_tagger(tag);
4906 tagger_time = got_object_tag_get_tagger_time(tag);
4907 err = got_object_id_str(&id_str,
4908 got_object_tag_get_object_id(tag));
4912 printf("from: %s\n", tagger);
4913 datestr = get_datestr(&tagger_time, datebuf);
4915 printf("date: %s UTC\n", datestr);
4917 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
4919 switch (got_object_tag_get_object_type(tag)) {
4920 case GOT_OBJ_TYPE_BLOB:
4921 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
4924 case GOT_OBJ_TYPE_TREE:
4925 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
4928 case GOT_OBJ_TYPE_COMMIT:
4929 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
4932 case GOT_OBJ_TYPE_TAG:
4933 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
4942 err = got_object_commit_get_logmsg(&tagmsg0, commit);
4945 got_object_commit_close(commit);
4947 tagmsg0 = strdup(got_object_tag_get_message(tag));
4948 got_object_tag_close(tag);
4949 if (tagmsg0 == NULL) {
4950 err = got_error_from_errno("strdup");
4957 line = strsep(&tagmsg, "\n");
4959 printf(" %s\n", line);
4964 got_ref_list_free(&refs);
4968 static const struct got_error *
4969 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
4970 const char *tag_name, const char *repo_path)
4972 const struct got_error *err = NULL;
4973 char *template = NULL, *initial_content = NULL;
4974 char *editor = NULL;
4977 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
4978 err = got_error_from_errno("asprintf");
4982 if (asprintf(&initial_content, "\n# tagging commit %s as %s\n",
4983 commit_id_str, tag_name) == -1) {
4984 err = got_error_from_errno("asprintf");
4988 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
4992 dprintf(fd, initial_content);
4995 err = get_editor(&editor);
4998 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5000 free(initial_content);
5004 /* Editor is done; we can now apply unveil(2) */
5006 err = apply_unveil(repo_path, 0, NULL);
5015 static const struct got_error *
5016 add_tag(struct got_repository *repo, const char *tag_name,
5017 const char *commit_arg, const char *tagmsg_arg)
5019 const struct got_error *err = NULL;
5020 struct got_object_id *commit_id = NULL, *tag_id = NULL;
5021 char *label = NULL, *commit_id_str = NULL;
5022 struct got_reference *ref = NULL;
5023 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5024 char *tagmsg_path = NULL, *tag_id_str = NULL;
5025 int preserve_tagmsg = 0;
5028 * Don't let the user create a tag name with a leading '-'.
5029 * While technically a valid reference name, this case is usually
5030 * an unintended typo.
5032 if (tag_name[0] == '-')
5033 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5035 err = get_author(&tagger, repo);
5039 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5040 GOT_OBJ_TYPE_COMMIT, 1, repo);
5044 err = got_object_id_str(&commit_id_str, commit_id);
5048 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5049 refname = strdup(tag_name);
5050 if (refname == NULL) {
5051 err = got_error_from_errno("strdup");
5055 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5056 err = got_error_from_errno("asprintf");
5060 err = got_ref_open(&ref, repo, refname, 0);
5062 err = got_error(GOT_ERR_TAG_EXISTS);
5064 } else if (err->code != GOT_ERR_NOT_REF)
5067 if (tagmsg_arg == NULL) {
5068 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5069 tag_name, got_repo_get_path(repo));
5071 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5072 tagmsg_path != NULL)
5073 preserve_tagmsg = 1;
5078 err = got_object_tag_create(&tag_id, tag_name, commit_id,
5079 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5082 preserve_tagmsg = 1;
5086 err = got_ref_alloc(&ref, refname, tag_id);
5089 preserve_tagmsg = 1;
5093 err = got_ref_write(ref, repo);
5096 preserve_tagmsg = 1;
5100 err = got_object_id_str(&tag_id_str, tag_id);
5103 preserve_tagmsg = 1;
5106 printf("Created tag %s\n", tag_id_str);
5108 if (preserve_tagmsg) {
5109 fprintf(stderr, "%s: tag message preserved in %s\n",
5110 getprogname(), tagmsg_path);
5111 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5112 err = got_error_from_errno2("unlink", tagmsg_path);
5117 free(commit_id_str);
5125 static const struct got_error *
5126 cmd_tag(int argc, char *argv[])
5128 const struct got_error *error = NULL;
5129 struct got_repository *repo = NULL;
5130 struct got_worktree *worktree = NULL;
5131 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5132 char *gitconfig_path = NULL;
5133 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5134 int ch, do_list = 0;
5136 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5139 commit_id_arg = optarg;
5145 repo_path = realpath(optarg, NULL);
5146 if (repo_path == NULL)
5147 return got_error_from_errno2("realpath",
5149 got_path_strip_trailing_slashes(repo_path);
5164 if (commit_id_arg != NULL)
5165 errx(1, "-c option can only be used when creating a tag");
5167 errx(1, "-l and -m options are mutually exclusive");
5170 } else if (argc != 1)
5177 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5181 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5182 "sendfd unveil", NULL) == -1)
5186 cwd = getcwd(NULL, 0);
5188 error = got_error_from_errno("getcwd");
5192 if (repo_path == NULL) {
5193 error = got_worktree_open(&worktree, cwd);
5194 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5200 strdup(got_worktree_get_repo_path(worktree));
5201 if (repo_path == NULL)
5202 error = got_error_from_errno("strdup");
5206 repo_path = strdup(cwd);
5207 if (repo_path == NULL) {
5208 error = got_error_from_errno("strdup");
5215 error = got_repo_open(&repo, repo_path, NULL);
5218 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5221 error = list_tags(repo, worktree);
5223 error = get_gitconfig_path(&gitconfig_path);
5226 error = got_repo_open(&repo, repo_path, gitconfig_path);
5231 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5236 if (commit_id_arg == NULL) {
5237 struct got_reference *head_ref;
5238 struct got_object_id *commit_id;
5239 error = got_ref_open(&head_ref, repo,
5240 worktree ? got_worktree_get_head_ref_name(worktree)
5244 error = got_ref_resolve(&commit_id, repo, head_ref);
5245 got_ref_close(head_ref);
5248 error = got_object_id_str(&commit_id_str, commit_id);
5254 error = add_tag(repo, tag_name,
5255 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5259 got_repo_close(repo);
5261 got_worktree_close(worktree);
5264 free(gitconfig_path);
5265 free(commit_id_str);
5272 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
5277 static const struct got_error *
5278 add_progress(void *arg, unsigned char status, const char *path)
5280 while (path[0] == '/')
5282 printf("%c %s\n", status, path);
5286 static const struct got_error *
5287 cmd_add(int argc, char *argv[])
5289 const struct got_error *error = NULL;
5290 struct got_repository *repo = NULL;
5291 struct got_worktree *worktree = NULL;
5293 struct got_pathlist_head paths;
5294 struct got_pathlist_entry *pe;
5295 int ch, can_recurse = 0, no_ignores = 0;
5299 while ((ch = getopt(argc, argv, "IR")) != -1) {
5317 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5324 cwd = getcwd(NULL, 0);
5326 error = got_error_from_errno("getcwd");
5330 error = got_worktree_open(&worktree, cwd);
5334 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5339 error = apply_unveil(got_repo_get_path(repo), 1,
5340 got_worktree_get_root_path(worktree));
5344 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5348 if (!can_recurse && no_ignores) {
5349 error = got_error_msg(GOT_ERR_BAD_PATH,
5350 "disregarding ignores requires -R option");
5358 TAILQ_FOREACH(pe, &paths, entry) {
5359 if (asprintf(&ondisk_path, "%s/%s",
5360 got_worktree_get_root_path(worktree),
5362 error = got_error_from_errno("asprintf");
5365 if (lstat(ondisk_path, &sb) == -1) {
5366 if (errno == ENOENT) {
5370 error = got_error_from_errno2("lstat",
5376 if (S_ISDIR(sb.st_mode)) {
5377 error = got_error_msg(GOT_ERR_BAD_PATH,
5378 "adding directories requires -R option");
5384 error = got_worktree_schedule_add(worktree, &paths, add_progress,
5385 NULL, repo, no_ignores);
5388 got_repo_close(repo);
5390 got_worktree_close(worktree);
5391 TAILQ_FOREACH(pe, &paths, entry)
5392 free((char *)pe->path);
5393 got_pathlist_free(&paths);
5401 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] path ...\n",
5406 static const struct got_error *
5407 print_remove_status(void *arg, unsigned char status,
5408 unsigned char staged_status, const char *path)
5410 while (path[0] == '/')
5412 if (status == GOT_STATUS_NONEXISTENT)
5414 if (status == staged_status && (status == GOT_STATUS_DELETE))
5415 status = GOT_STATUS_NO_CHANGE;
5416 printf("%c%c %s\n", status, staged_status, path);
5420 static const struct got_error *
5421 cmd_remove(int argc, char *argv[])
5423 const struct got_error *error = NULL;
5424 struct got_worktree *worktree = NULL;
5425 struct got_repository *repo = NULL;
5427 struct got_pathlist_head paths;
5428 struct got_pathlist_entry *pe;
5429 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0;
5433 while ((ch = getopt(argc, argv, "fkR")) != -1) {
5436 delete_local_mods = 1;
5454 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5461 cwd = getcwd(NULL, 0);
5463 error = got_error_from_errno("getcwd");
5466 error = got_worktree_open(&worktree, cwd);
5470 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5475 error = apply_unveil(got_repo_get_path(repo), 1,
5476 got_worktree_get_root_path(worktree));
5480 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5487 TAILQ_FOREACH(pe, &paths, entry) {
5488 if (asprintf(&ondisk_path, "%s/%s",
5489 got_worktree_get_root_path(worktree),
5491 error = got_error_from_errno("asprintf");
5494 if (lstat(ondisk_path, &sb) == -1) {
5495 if (errno == ENOENT) {
5499 error = got_error_from_errno2("lstat",
5505 if (S_ISDIR(sb.st_mode)) {
5506 error = got_error_msg(GOT_ERR_BAD_PATH,
5507 "removing directories requires -R option");
5513 error = got_worktree_schedule_delete(worktree, &paths,
5514 delete_local_mods, print_remove_status, NULL, repo, keep_on_disk);
5517 got_repo_close(repo);
5519 got_worktree_close(worktree);
5520 TAILQ_FOREACH(pe, &paths, entry)
5521 free((char *)pe->path);
5522 got_pathlist_free(&paths);
5530 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
5531 "path ...\n", getprogname());
5535 static const struct got_error *
5536 revert_progress(void *arg, unsigned char status, const char *path)
5538 if (status == GOT_STATUS_UNVERSIONED)
5541 while (path[0] == '/')
5543 printf("%c %s\n", status, path);
5547 struct choose_patch_arg {
5548 FILE *patch_script_file;
5552 static const struct got_error *
5553 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
5554 int nchanges, const char *action)
5557 size_t linesize = 0;
5561 case GOT_STATUS_ADD:
5562 printf("A %s\n%s this addition? [y/n] ", path, action);
5564 case GOT_STATUS_DELETE:
5565 printf("D %s\n%s this deletion? [y/n] ", path, action);
5567 case GOT_STATUS_MODIFY:
5568 if (fseek(patch_file, 0L, SEEK_SET) == -1)
5569 return got_error_from_errno("fseek");
5570 printf(GOT_COMMIT_SEP_STR);
5571 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
5573 if (ferror(patch_file))
5574 return got_error_from_errno("getline");
5575 printf(GOT_COMMIT_SEP_STR);
5576 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
5577 path, n, nchanges, action);
5580 return got_error_path(path, GOT_ERR_FILE_STATUS);
5586 static const struct got_error *
5587 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
5588 FILE *patch_file, int n, int nchanges)
5590 const struct got_error *err = NULL;
5592 size_t linesize = 0;
5595 struct choose_patch_arg *a = arg;
5597 *choice = GOT_PATCH_CHOICE_NONE;
5599 if (a->patch_script_file) {
5601 err = show_change(status, path, patch_file, n, nchanges,
5605 linelen = getline(&line, &linesize, a->patch_script_file);
5606 if (linelen == -1) {
5607 if (ferror(a->patch_script_file))
5608 return got_error_from_errno("getline");
5611 nl = strchr(line, '\n');
5614 if (strcmp(line, "y") == 0) {
5615 *choice = GOT_PATCH_CHOICE_YES;
5617 } else if (strcmp(line, "n") == 0) {
5618 *choice = GOT_PATCH_CHOICE_NO;
5620 } else if (strcmp(line, "q") == 0 &&
5621 status == GOT_STATUS_MODIFY) {
5622 *choice = GOT_PATCH_CHOICE_QUIT;
5625 printf("invalid response '%s'\n", line);
5630 while (resp != 'y' && resp != 'n' && resp != 'q') {
5631 err = show_change(status, path, patch_file, n, nchanges,
5638 if (status == GOT_STATUS_MODIFY) {
5639 if (resp != 'y' && resp != 'n' && resp != 'q') {
5640 printf("invalid response '%c'\n", resp);
5643 } else if (resp != 'y' && resp != 'n') {
5644 printf("invalid response '%c'\n", resp);
5650 *choice = GOT_PATCH_CHOICE_YES;
5651 else if (resp == 'n')
5652 *choice = GOT_PATCH_CHOICE_NO;
5653 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
5654 *choice = GOT_PATCH_CHOICE_QUIT;
5660 static const struct got_error *
5661 cmd_revert(int argc, char *argv[])
5663 const struct got_error *error = NULL;
5664 struct got_worktree *worktree = NULL;
5665 struct got_repository *repo = NULL;
5666 char *cwd = NULL, *path = NULL;
5667 struct got_pathlist_head paths;
5668 struct got_pathlist_entry *pe;
5669 int ch, can_recurse = 0, pflag = 0;
5670 FILE *patch_script_file = NULL;
5671 const char *patch_script_path = NULL;
5672 struct choose_patch_arg cpa;
5676 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
5682 patch_script_path = optarg;
5697 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5698 "unveil", NULL) == -1)
5703 if (patch_script_path && !pflag)
5704 errx(1, "-F option can only be used together with -p option");
5706 cwd = getcwd(NULL, 0);
5708 error = got_error_from_errno("getcwd");
5711 error = got_worktree_open(&worktree, cwd);
5715 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5720 if (patch_script_path) {
5721 patch_script_file = fopen(patch_script_path, "r");
5722 if (patch_script_file == NULL) {
5723 error = got_error_from_errno2("fopen",
5728 error = apply_unveil(got_repo_get_path(repo), 1,
5729 got_worktree_get_root_path(worktree));
5733 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5740 TAILQ_FOREACH(pe, &paths, entry) {
5741 if (asprintf(&ondisk_path, "%s/%s",
5742 got_worktree_get_root_path(worktree),
5744 error = got_error_from_errno("asprintf");
5747 if (lstat(ondisk_path, &sb) == -1) {
5748 if (errno == ENOENT) {
5752 error = got_error_from_errno2("lstat",
5758 if (S_ISDIR(sb.st_mode)) {
5759 error = got_error_msg(GOT_ERR_BAD_PATH,
5760 "reverting directories requires -R option");
5766 cpa.patch_script_file = patch_script_file;
5767 cpa.action = "revert";
5768 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
5769 pflag ? choose_patch : NULL, &cpa, repo);
5771 if (patch_script_file && fclose(patch_script_file) == EOF &&
5773 error = got_error_from_errno2("fclose", patch_script_path);
5775 got_repo_close(repo);
5777 got_worktree_close(worktree);
5786 fprintf(stderr, "usage: %s commit [-m msg] [path ...]\n",
5791 struct collect_commit_logmsg_arg {
5792 const char *cmdline_log;
5794 const char *worktree_path;
5795 const char *branch_name;
5796 const char *repo_path;
5801 static const struct got_error *
5802 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
5805 char *initial_content = NULL;
5806 struct got_pathlist_entry *pe;
5807 const struct got_error *err = NULL;
5808 char *template = NULL;
5809 struct collect_commit_logmsg_arg *a = arg;
5813 /* if a message was specified on the command line, just use it */
5814 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
5815 len = strlen(a->cmdline_log) + 1;
5816 *logmsg = malloc(len + 1);
5817 if (*logmsg == NULL)
5818 return got_error_from_errno("malloc");
5819 strlcpy(*logmsg, a->cmdline_log, len);
5823 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
5824 return got_error_from_errno("asprintf");
5826 if (asprintf(&initial_content,
5827 "\n# changes to be committed on branch %s:\n",
5828 a->branch_name) == -1)
5829 return got_error_from_errno("asprintf");
5831 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
5835 dprintf(fd, initial_content);
5837 TAILQ_FOREACH(pe, commitable_paths, entry) {
5838 struct got_commitable *ct = pe->data;
5839 dprintf(fd, "# %c %s\n",
5840 got_commitable_get_status(ct),
5841 got_commitable_get_path(ct));
5845 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
5847 free(initial_content);
5850 /* Editor is done; we can now apply unveil(2) */
5852 err = apply_unveil(a->repo_path, 0, a->worktree_path);
5861 static const struct got_error *
5862 cmd_commit(int argc, char *argv[])
5864 const struct got_error *error = NULL;
5865 struct got_worktree *worktree = NULL;
5866 struct got_repository *repo = NULL;
5867 char *cwd = NULL, *id_str = NULL;
5868 struct got_object_id *id = NULL;
5869 const char *logmsg = NULL;
5870 struct collect_commit_logmsg_arg cl_arg;
5871 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
5872 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
5873 struct got_pathlist_head paths;
5876 cl_arg.logmsg_path = NULL;
5878 while ((ch = getopt(argc, argv, "m:")) != -1) {
5893 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
5894 "unveil", NULL) == -1)
5897 cwd = getcwd(NULL, 0);
5899 error = got_error_from_errno("getcwd");
5902 error = got_worktree_open(&worktree, cwd);
5906 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
5909 if (rebase_in_progress) {
5910 error = got_error(GOT_ERR_REBASING);
5914 error = got_worktree_histedit_in_progress(&histedit_in_progress,
5919 error = get_gitconfig_path(&gitconfig_path);
5922 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5927 error = get_author(&author, repo);
5932 * unveil(2) traverses exec(2); if an editor is used we have
5933 * to apply unveil after the log message has been written.
5935 if (logmsg == NULL || strlen(logmsg) == 0)
5936 error = get_editor(&editor);
5938 error = apply_unveil(got_repo_get_path(repo), 0,
5939 got_worktree_get_root_path(worktree));
5943 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5947 cl_arg.editor = editor;
5948 cl_arg.cmdline_log = logmsg;
5949 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
5950 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
5951 if (!histedit_in_progress) {
5952 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
5953 error = got_error(GOT_ERR_COMMIT_BRANCH);
5956 cl_arg.branch_name += 11;
5958 cl_arg.repo_path = got_repo_get_path(repo);
5959 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
5960 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
5962 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5963 cl_arg.logmsg_path != NULL)
5964 preserve_logmsg = 1;
5968 error = got_object_id_str(&id_str, id);
5971 printf("Created commit %s\n", id_str);
5973 if (preserve_logmsg) {
5974 fprintf(stderr, "%s: log message preserved in %s\n",
5975 getprogname(), cl_arg.logmsg_path);
5976 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
5978 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
5979 free(cl_arg.logmsg_path);
5981 got_repo_close(repo);
5983 got_worktree_close(worktree);
5986 free(gitconfig_path);
5993 usage_cherrypick(void)
5995 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
5999 static const struct got_error *
6000 cmd_cherrypick(int argc, char *argv[])
6002 const struct got_error *error = NULL;
6003 struct got_worktree *worktree = NULL;
6004 struct got_repository *repo = NULL;
6005 char *cwd = NULL, *commit_id_str = NULL;
6006 struct got_object_id *commit_id = NULL;
6007 struct got_commit_object *commit = NULL;
6008 struct got_object_qid *pid;
6009 struct got_reference *head_ref = NULL;
6010 int ch, did_something = 0;
6012 while ((ch = getopt(argc, argv, "")) != -1) {
6024 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6025 "unveil", NULL) == -1)
6031 cwd = getcwd(NULL, 0);
6033 error = got_error_from_errno("getcwd");
6036 error = got_worktree_open(&worktree, cwd);
6040 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6045 error = apply_unveil(got_repo_get_path(repo), 0,
6046 got_worktree_get_root_path(worktree));
6050 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6051 GOT_OBJ_TYPE_COMMIT, repo);
6052 if (error != NULL) {
6053 struct got_reference *ref;
6054 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6056 error = got_ref_open(&ref, repo, argv[0], 0);
6059 error = got_ref_resolve(&commit_id, repo, ref);
6064 error = got_object_id_str(&commit_id_str, commit_id);
6068 error = got_ref_open(&head_ref, repo,
6069 got_worktree_get_head_ref_name(worktree), 0);
6073 error = check_same_branch(commit_id, head_ref, NULL, repo);
6075 if (error->code != GOT_ERR_ANCESTRY)
6079 error = got_error(GOT_ERR_SAME_BRANCH);
6083 error = got_object_open_as_commit(&commit, repo, commit_id);
6086 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6087 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6088 commit_id, repo, update_progress, &did_something, check_cancelled,
6094 printf("Merged commit %s\n", commit_id_str);
6097 got_object_commit_close(commit);
6098 free(commit_id_str);
6100 got_ref_close(head_ref);
6102 got_worktree_close(worktree);
6104 got_repo_close(repo);
6111 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6115 static const struct got_error *
6116 cmd_backout(int argc, char *argv[])
6118 const struct got_error *error = NULL;
6119 struct got_worktree *worktree = NULL;
6120 struct got_repository *repo = NULL;
6121 char *cwd = NULL, *commit_id_str = NULL;
6122 struct got_object_id *commit_id = NULL;
6123 struct got_commit_object *commit = NULL;
6124 struct got_object_qid *pid;
6125 struct got_reference *head_ref = NULL;
6126 int ch, did_something = 0;
6128 while ((ch = getopt(argc, argv, "")) != -1) {
6140 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6141 "unveil", NULL) == -1)
6147 cwd = getcwd(NULL, 0);
6149 error = got_error_from_errno("getcwd");
6152 error = got_worktree_open(&worktree, cwd);
6156 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6161 error = apply_unveil(got_repo_get_path(repo), 0,
6162 got_worktree_get_root_path(worktree));
6166 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6167 GOT_OBJ_TYPE_COMMIT, repo);
6168 if (error != NULL) {
6169 struct got_reference *ref;
6170 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6172 error = got_ref_open(&ref, repo, argv[0], 0);
6175 error = got_ref_resolve(&commit_id, repo, ref);
6180 error = got_object_id_str(&commit_id_str, commit_id);
6184 error = got_ref_open(&head_ref, repo,
6185 got_worktree_get_head_ref_name(worktree), 0);
6189 error = check_same_branch(commit_id, head_ref, NULL, repo);
6193 error = got_object_open_as_commit(&commit, repo, commit_id);
6196 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6198 error = got_error(GOT_ERR_ROOT_COMMIT);
6202 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6203 update_progress, &did_something, check_cancelled, NULL);
6208 printf("Backed out commit %s\n", commit_id_str);
6211 got_object_commit_close(commit);
6212 free(commit_id_str);
6214 got_ref_close(head_ref);
6216 got_worktree_close(worktree);
6218 got_repo_close(repo);
6225 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
6231 trim_logmsg(char *logmsg, int limit)
6236 len = strlen(logmsg);
6240 nl = strchr(logmsg, '\n');
6245 static const struct got_error *
6246 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
6248 const struct got_error *err;
6249 char *logmsg0 = NULL;
6252 err = got_object_commit_get_logmsg(&logmsg0, commit);
6257 while (isspace((unsigned char)s[0]))
6260 *logmsg = strdup(s);
6261 if (*logmsg == NULL) {
6262 err = got_error_from_errno("strdup");
6266 trim_logmsg(*logmsg, limit);
6272 static const struct got_error *
6273 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
6275 const struct got_error *err;
6276 struct got_commit_object *commit = NULL;
6277 char *id_str = NULL, *logmsg = NULL;
6279 err = got_object_open_as_commit(&commit, repo, id);
6283 err = got_object_id_str(&id_str, id);
6289 err = get_short_logmsg(&logmsg, 42, commit);
6293 printf("%s -> merge conflict: %s\n", id_str, logmsg);
6296 got_object_commit_close(commit);
6301 static const struct got_error *
6302 show_rebase_progress(struct got_commit_object *commit,
6303 struct got_object_id *old_id, struct got_object_id *new_id)
6305 const struct got_error *err;
6306 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
6308 err = got_object_id_str(&old_id_str, old_id);
6313 err = got_object_id_str(&new_id_str, new_id);
6318 old_id_str[12] = '\0';
6320 new_id_str[12] = '\0';
6322 err = get_short_logmsg(&logmsg, 42, commit);
6326 printf("%s -> %s: %s\n", old_id_str,
6327 new_id_str ? new_id_str : "no-op change", logmsg);
6335 static const struct got_error *
6336 rebase_progress(void *arg, unsigned char status, const char *path)
6338 unsigned char *rebase_status = arg;
6340 while (path[0] == '/')
6342 printf("%c %s\n", status, path);
6344 if (*rebase_status == GOT_STATUS_CONFLICT)
6346 if (status == GOT_STATUS_CONFLICT || status == GOT_STATUS_MERGE)
6347 *rebase_status = status;
6351 static const struct got_error *
6352 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
6353 struct got_reference *branch, struct got_reference *new_base_branch,
6354 struct got_reference *tmp_branch, struct got_repository *repo)
6356 printf("Switching work tree to %s\n", got_ref_get_name(branch));
6357 return got_worktree_rebase_complete(worktree, fileindex,
6358 new_base_branch, tmp_branch, branch, repo);
6361 static const struct got_error *
6362 rebase_commit(struct got_pathlist_head *merged_paths,
6363 struct got_worktree *worktree, struct got_fileindex *fileindex,
6364 struct got_reference *tmp_branch,
6365 struct got_object_id *commit_id, struct got_repository *repo)
6367 const struct got_error *error;
6368 struct got_commit_object *commit;
6369 struct got_object_id *new_commit_id;
6371 error = got_object_open_as_commit(&commit, repo, commit_id);
6375 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
6376 worktree, fileindex, tmp_branch, commit, commit_id, repo);
6378 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
6380 error = show_rebase_progress(commit, commit_id, NULL);
6382 error = show_rebase_progress(commit, commit_id, new_commit_id);
6383 free(new_commit_id);
6386 got_object_commit_close(commit);
6390 struct check_path_prefix_arg {
6391 const char *path_prefix;
6396 static const struct got_error *
6397 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
6398 struct got_blob_object *blob2, struct got_object_id *id1,
6399 struct got_object_id *id2, const char *path1, const char *path2,
6400 mode_t mode1, mode_t mode2, struct got_repository *repo)
6402 struct check_path_prefix_arg *a = arg;
6404 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
6405 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
6406 return got_error(a->errcode);
6411 static const struct got_error *
6412 check_path_prefix(struct got_object_id *parent_id,
6413 struct got_object_id *commit_id, const char *path_prefix,
6414 int errcode, struct got_repository *repo)
6416 const struct got_error *err;
6417 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
6418 struct got_commit_object *commit = NULL, *parent_commit = NULL;
6419 struct check_path_prefix_arg cpp_arg;
6421 if (got_path_is_root_dir(path_prefix))
6424 err = got_object_open_as_commit(&commit, repo, commit_id);
6428 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
6432 err = got_object_open_as_tree(&tree1, repo,
6433 got_object_commit_get_tree_id(parent_commit));
6437 err = got_object_open_as_tree(&tree2, repo,
6438 got_object_commit_get_tree_id(commit));
6442 cpp_arg.path_prefix = path_prefix;
6443 while (cpp_arg.path_prefix[0] == '/')
6444 cpp_arg.path_prefix++;
6445 cpp_arg.len = strlen(cpp_arg.path_prefix);
6446 cpp_arg.errcode = errcode;
6447 err = got_diff_tree(tree1, tree2, "", "", repo,
6448 check_path_prefix_in_diff, &cpp_arg, 0);
6451 got_object_tree_close(tree1);
6453 got_object_tree_close(tree2);
6455 got_object_commit_close(commit);
6457 got_object_commit_close(parent_commit);
6461 static const struct got_error *
6462 collect_commits(struct got_object_id_queue *commits,
6463 struct got_object_id *initial_commit_id,
6464 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
6465 const char *path_prefix, int path_prefix_errcode,
6466 struct got_repository *repo)
6468 const struct got_error *err = NULL;
6469 struct got_commit_graph *graph = NULL;
6470 struct got_object_id *parent_id = NULL;
6471 struct got_object_qid *qid;
6472 struct got_object_id *commit_id = initial_commit_id;
6474 err = got_commit_graph_open(&graph, "/", 1);
6478 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
6479 check_cancelled, NULL);
6482 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
6483 err = got_commit_graph_iter_next(&parent_id, graph, repo,
6484 check_cancelled, NULL);
6486 if (err->code == GOT_ERR_ITER_COMPLETED) {
6487 err = got_error_msg(GOT_ERR_ANCESTRY,
6488 "ran out of commits to rebase before "
6489 "youngest common ancestor commit has "
6494 err = check_path_prefix(parent_id, commit_id,
6495 path_prefix, path_prefix_errcode, repo);
6499 err = got_object_qid_alloc(&qid, commit_id);
6502 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
6503 commit_id = parent_id;
6507 got_commit_graph_close(graph);
6511 static const struct got_error *
6512 cmd_rebase(int argc, char *argv[])
6514 const struct got_error *error = NULL;
6515 struct got_worktree *worktree = NULL;
6516 struct got_repository *repo = NULL;
6517 struct got_fileindex *fileindex = NULL;
6519 struct got_reference *branch = NULL;
6520 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
6521 struct got_object_id *commit_id = NULL, *parent_id = NULL;
6522 struct got_object_id *resume_commit_id = NULL;
6523 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
6524 struct got_commit_object *commit = NULL;
6525 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
6526 int histedit_in_progress = 0;
6527 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
6528 struct got_object_id_queue commits;
6529 struct got_pathlist_head merged_paths;
6530 const struct got_object_id_queue *parent_ids;
6531 struct got_object_qid *qid, *pid;
6533 SIMPLEQ_INIT(&commits);
6534 TAILQ_INIT(&merged_paths);
6536 while ((ch = getopt(argc, argv, "ac")) != -1) {
6542 continue_rebase = 1;
6554 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6555 "unveil", NULL) == -1)
6558 if (abort_rebase && continue_rebase)
6560 else if (abort_rebase || continue_rebase) {
6563 } else if (argc != 1)
6566 cwd = getcwd(NULL, 0);
6568 error = got_error_from_errno("getcwd");
6571 error = got_worktree_open(&worktree, cwd);
6575 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6580 error = apply_unveil(got_repo_get_path(repo), 0,
6581 got_worktree_get_root_path(worktree));
6585 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6589 if (histedit_in_progress) {
6590 error = got_error(GOT_ERR_HISTEDIT_BUSY);
6594 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6600 if (!rebase_in_progress) {
6601 error = got_error(GOT_ERR_NOT_REBASING);
6604 error = got_worktree_rebase_continue(&resume_commit_id,
6605 &new_base_branch, &tmp_branch, &branch, &fileindex,
6609 printf("Switching work tree to %s\n",
6610 got_ref_get_symref_target(new_base_branch));
6611 error = got_worktree_rebase_abort(worktree, fileindex, repo,
6612 new_base_branch, update_progress, &did_something);
6615 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
6616 goto done; /* nothing else to do */
6619 if (continue_rebase) {
6620 if (!rebase_in_progress) {
6621 error = got_error(GOT_ERR_NOT_REBASING);
6624 error = got_worktree_rebase_continue(&resume_commit_id,
6625 &new_base_branch, &tmp_branch, &branch, &fileindex,
6630 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
6631 resume_commit_id, repo);
6635 yca_id = got_object_id_dup(resume_commit_id);
6636 if (yca_id == NULL) {
6637 error = got_error_from_errno("got_object_id_dup");
6641 error = got_ref_open(&branch, repo, argv[0], 0);
6646 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
6650 if (!continue_rebase) {
6651 struct got_object_id *base_commit_id;
6653 base_commit_id = got_worktree_get_base_commit_id(worktree);
6654 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
6655 base_commit_id, branch_head_commit_id, repo,
6656 check_cancelled, NULL);
6659 if (yca_id == NULL) {
6660 error = got_error_msg(GOT_ERR_ANCESTRY,
6661 "specified branch shares no common ancestry "
6662 "with work tree's branch");
6666 error = check_same_branch(base_commit_id, branch, yca_id, repo);
6668 if (error->code != GOT_ERR_ANCESTRY)
6672 error = got_error_msg(GOT_ERR_SAME_BRANCH,
6673 "specified branch resolves to a commit which "
6674 "is already contained in work tree's branch");
6677 error = got_worktree_rebase_prepare(&new_base_branch,
6678 &tmp_branch, &fileindex, worktree, branch, repo);
6683 commit_id = branch_head_commit_id;
6684 error = got_object_open_as_commit(&commit, repo, commit_id);
6688 parent_ids = got_object_commit_get_parent_ids(commit);
6689 pid = SIMPLEQ_FIRST(parent_ids);
6691 if (!continue_rebase) {
6693 error = got_worktree_rebase_abort(worktree, fileindex,
6694 repo, new_base_branch, update_progress,
6698 printf("Rebase of %s aborted\n",
6699 got_ref_get_name(branch));
6701 error = got_error(GOT_ERR_EMPTY_REBASE);
6704 error = collect_commits(&commits, commit_id, pid->id,
6705 yca_id, got_worktree_get_path_prefix(worktree),
6706 GOT_ERR_REBASE_PATH, repo);
6707 got_object_commit_close(commit);
6712 if (SIMPLEQ_EMPTY(&commits)) {
6713 if (continue_rebase) {
6714 error = rebase_complete(worktree, fileindex,
6715 branch, new_base_branch, tmp_branch, repo);
6718 /* Fast-forward the reference of the branch. */
6719 struct got_object_id *new_head_commit_id;
6721 error = got_ref_resolve(&new_head_commit_id, repo,
6725 error = got_object_id_str(&id_str, new_head_commit_id);
6726 printf("Forwarding %s to commit %s\n",
6727 got_ref_get_name(branch), id_str);
6729 error = got_ref_change_ref(branch,
6730 new_head_commit_id);
6737 SIMPLEQ_FOREACH(qid, &commits, entry) {
6738 commit_id = qid->id;
6739 parent_id = pid ? pid->id : yca_id;
6742 error = got_worktree_rebase_merge_files(&merged_paths,
6743 worktree, fileindex, parent_id, commit_id, repo,
6744 rebase_progress, &rebase_status, check_cancelled, NULL);
6748 if (rebase_status == GOT_STATUS_CONFLICT) {
6749 error = show_rebase_merge_conflict(qid->id, repo);
6752 got_worktree_rebase_pathlist_free(&merged_paths);
6756 error = rebase_commit(&merged_paths, worktree, fileindex,
6757 tmp_branch, commit_id, repo);
6758 got_worktree_rebase_pathlist_free(&merged_paths);
6763 if (rebase_status == GOT_STATUS_CONFLICT) {
6764 error = got_worktree_rebase_postpone(worktree, fileindex);
6767 error = got_error_msg(GOT_ERR_CONFLICTS,
6768 "conflicts must be resolved before rebasing can continue");
6770 error = rebase_complete(worktree, fileindex, branch,
6771 new_base_branch, tmp_branch, repo);
6773 got_object_id_queue_free(&commits);
6774 free(branch_head_commit_id);
6775 free(resume_commit_id);
6778 got_object_commit_close(commit);
6780 got_ref_close(branch);
6781 if (new_base_branch)
6782 got_ref_close(new_base_branch);
6784 got_ref_close(tmp_branch);
6786 got_worktree_close(worktree);
6788 got_repo_close(repo);
6793 usage_histedit(void)
6795 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
6800 #define GOT_HISTEDIT_PICK 'p'
6801 #define GOT_HISTEDIT_EDIT 'e'
6802 #define GOT_HISTEDIT_FOLD 'f'
6803 #define GOT_HISTEDIT_DROP 'd'
6804 #define GOT_HISTEDIT_MESG 'm'
6806 static struct got_histedit_cmd {
6810 } got_histedit_cmds[] = {
6811 { GOT_HISTEDIT_PICK, "pick", "use commit" },
6812 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
6813 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
6815 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
6816 { GOT_HISTEDIT_MESG, "mesg",
6817 "single-line log message for commit above (open editor if empty)" },
6820 struct got_histedit_list_entry {
6821 TAILQ_ENTRY(got_histedit_list_entry) entry;
6822 struct got_object_id *commit_id;
6823 const struct got_histedit_cmd *cmd;
6826 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
6828 static const struct got_error *
6829 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
6830 FILE *f, struct got_repository *repo)
6832 const struct got_error *err = NULL;
6833 char *logmsg = NULL, *id_str = NULL;
6834 struct got_commit_object *commit = NULL;
6837 err = got_object_open_as_commit(&commit, repo, commit_id);
6841 err = get_short_logmsg(&logmsg, 34, commit);
6845 err = got_object_id_str(&id_str, commit_id);
6849 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
6851 err = got_ferror(f, GOT_ERR_IO);
6854 got_object_commit_close(commit);
6860 static const struct got_error *
6861 histedit_write_commit_list(struct got_object_id_queue *commits,
6862 FILE *f, int edit_logmsg_only, struct got_repository *repo)
6864 const struct got_error *err = NULL;
6865 struct got_object_qid *qid;
6867 if (SIMPLEQ_EMPTY(commits))
6868 return got_error(GOT_ERR_EMPTY_HISTEDIT);
6870 SIMPLEQ_FOREACH(qid, commits, entry) {
6871 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
6875 if (edit_logmsg_only) {
6876 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
6878 err = got_ferror(f, GOT_ERR_IO);
6887 static const struct got_error *
6888 write_cmd_list(FILE *f, const char *branch_name,
6889 struct got_object_id_queue *commits)
6891 const struct got_error *err = NULL;
6894 struct got_object_qid *qid;
6896 qid = SIMPLEQ_FIRST(commits);
6897 err = got_object_id_str(&id_str, qid->id);
6902 "# Editing the history of branch '%s' starting at\n"
6904 "# Commits will be processed in order from top to "
6905 "bottom of this file.\n", branch_name, id_str);
6907 err = got_ferror(f, GOT_ERR_IO);
6911 n = fprintf(f, "# Available histedit commands:\n");
6913 err = got_ferror(f, GOT_ERR_IO);
6917 for (i = 0; i < nitems(got_histedit_cmds); i++) {
6918 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
6919 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
6922 err = got_ferror(f, GOT_ERR_IO);
6931 static const struct got_error *
6932 histedit_syntax_error(int lineno)
6934 static char msg[42];
6937 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
6939 if (ret == -1 || ret >= sizeof(msg))
6940 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
6942 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
6945 static const struct got_error *
6946 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
6947 char *logmsg, struct got_repository *repo)
6949 const struct got_error *err;
6950 struct got_commit_object *folded_commit = NULL;
6951 char *id_str, *folded_logmsg = NULL;
6953 err = got_object_id_str(&id_str, hle->commit_id);
6957 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
6961 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
6964 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
6965 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
6966 folded_logmsg) == -1) {
6967 err = got_error_from_errno("asprintf");
6971 got_object_commit_close(folded_commit);
6973 free(folded_logmsg);
6977 static struct got_histedit_list_entry *
6978 get_folded_commits(struct got_histedit_list_entry *hle)
6980 struct got_histedit_list_entry *prev, *folded = NULL;
6982 prev = TAILQ_PREV(hle, got_histedit_list, entry);
6983 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
6984 prev->cmd->code == GOT_HISTEDIT_DROP)) {
6985 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
6987 prev = TAILQ_PREV(prev, got_histedit_list, entry);
6993 static const struct got_error *
6994 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
6995 struct got_repository *repo)
6997 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
6998 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
6999 const struct got_error *err = NULL;
7000 struct got_commit_object *commit = NULL;
7002 struct got_histedit_list_entry *folded = NULL;
7004 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7008 folded = get_folded_commits(hle);
7010 while (folded != hle) {
7011 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7012 folded = TAILQ_NEXT(folded, entry);
7015 err = append_folded_commit_msg(&new_msg, folded,
7021 folded = TAILQ_NEXT(folded, entry);
7025 err = got_object_id_str(&id_str, hle->commit_id);
7028 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7031 if (asprintf(&new_msg,
7032 "%s\n# original log message of commit %s: %s",
7033 logmsg ? logmsg : "", id_str, orig_logmsg) == -1) {
7034 err = got_error_from_errno("asprintf");
7040 err = got_object_id_str(&id_str, hle->commit_id);
7044 err = got_opentemp_named_fd(&logmsg_path, &fd,
7045 GOT_TMPDIR_STR "/got-logmsg");
7049 dprintf(fd, logmsg);
7052 err = get_editor(&editor);
7056 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7058 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7060 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7063 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7064 err = got_error_from_errno2("unlink", logmsg_path);
7070 got_object_commit_close(commit);
7074 static const struct got_error *
7075 histedit_parse_list(struct got_histedit_list *histedit_cmds,
7076 FILE *f, struct got_repository *repo)
7078 const struct got_error *err = NULL;
7079 char *line = NULL, *p, *end;
7083 const struct got_histedit_cmd *cmd;
7084 struct got_object_id *commit_id = NULL;
7085 struct got_histedit_list_entry *hle = NULL;
7088 len = getline(&line, &size, f);
7090 const struct got_error *getline_err;
7093 getline_err = got_error_from_errno("getline");
7094 err = got_ferror(f, getline_err->code);
7099 while (isspace((unsigned char)p[0]))
7101 if (p[0] == '#' || p[0] == '\0') {
7107 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7108 cmd = &got_histedit_cmds[i];
7109 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7110 isspace((unsigned char)p[strlen(cmd->name)])) {
7111 p += strlen(cmd->name);
7114 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7119 if (i == nitems(got_histedit_cmds)) {
7120 err = histedit_syntax_error(lineno);
7123 while (isspace((unsigned char)p[0]))
7125 if (cmd->code == GOT_HISTEDIT_MESG) {
7126 if (hle == NULL || hle->logmsg != NULL) {
7127 err = got_error(GOT_ERR_HISTEDIT_CMD);
7131 err = histedit_edit_logmsg(hle, repo);
7135 hle->logmsg = strdup(p);
7136 if (hle->logmsg == NULL) {
7137 err = got_error_from_errno("strdup");
7146 while (end[0] && !isspace((unsigned char)end[0]))
7150 err = got_object_resolve_id_str(&commit_id, repo, p);
7152 /* override error code */
7153 err = histedit_syntax_error(lineno);
7157 hle = malloc(sizeof(*hle));
7159 err = got_error_from_errno("malloc");
7163 hle->commit_id = commit_id;
7168 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7176 static const struct got_error *
7177 histedit_check_script(struct got_histedit_list *histedit_cmds,
7178 struct got_object_id_queue *commits, struct got_repository *repo)
7180 const struct got_error *err = NULL;
7181 struct got_object_qid *qid;
7182 struct got_histedit_list_entry *hle;
7183 static char msg[92];
7186 if (TAILQ_EMPTY(histedit_cmds))
7187 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7188 "histedit script contains no commands");
7189 if (SIMPLEQ_EMPTY(commits))
7190 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7192 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7193 struct got_histedit_list_entry *hle2;
7194 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7197 if (got_object_id_cmp(hle->commit_id,
7198 hle2->commit_id) != 0)
7200 err = got_object_id_str(&id_str, hle->commit_id);
7203 snprintf(msg, sizeof(msg), "commit %s is listed "
7204 "more than once in histedit script", id_str);
7206 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7210 SIMPLEQ_FOREACH(qid, commits, entry) {
7211 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7212 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7216 err = got_object_id_str(&id_str, qid->id);
7219 snprintf(msg, sizeof(msg),
7220 "commit %s missing from histedit script", id_str);
7222 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7226 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
7227 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
7228 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
7229 "last commit in histedit script cannot be folded");
7234 static const struct got_error *
7235 histedit_run_editor(struct got_histedit_list *histedit_cmds,
7236 const char *path, struct got_object_id_queue *commits,
7237 struct got_repository *repo)
7239 const struct got_error *err = NULL;
7243 err = get_editor(&editor);
7247 if (spawn_editor(editor, path) == -1) {
7248 err = got_error_from_errno("failed spawning editor");
7252 f = fopen(path, "r");
7254 err = got_error_from_errno("fopen");
7257 err = histedit_parse_list(histedit_cmds, f, repo);
7261 err = histedit_check_script(histedit_cmds, commits, repo);
7263 if (f && fclose(f) != 0 && err == NULL)
7264 err = got_error_from_errno("fclose");
7269 static const struct got_error *
7270 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
7271 struct got_object_id_queue *, const char *, const char *,
7272 struct got_repository *);
7274 static const struct got_error *
7275 histedit_edit_script(struct got_histedit_list *histedit_cmds,
7276 struct got_object_id_queue *commits, const char *branch_name,
7277 int edit_logmsg_only, struct got_repository *repo)
7279 const struct got_error *err;
7283 err = got_opentemp_named(&path, &f, "got-histedit");
7287 err = write_cmd_list(f, branch_name, commits);
7291 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
7295 if (edit_logmsg_only) {
7297 err = histedit_parse_list(histedit_cmds, f, repo);
7299 if (fclose(f) != 0) {
7300 err = got_error_from_errno("fclose");
7304 err = histedit_run_editor(histedit_cmds, path, commits, repo);
7306 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7307 err->code != GOT_ERR_HISTEDIT_CMD)
7309 err = histedit_edit_list_retry(histedit_cmds, err,
7310 commits, path, branch_name, repo);
7314 if (f && fclose(f) != 0 && err == NULL)
7315 err = got_error_from_errno("fclose");
7316 if (path && unlink(path) != 0 && err == NULL)
7317 err = got_error_from_errno2("unlink", path);
7322 static const struct got_error *
7323 histedit_save_list(struct got_histedit_list *histedit_cmds,
7324 struct got_worktree *worktree, struct got_repository *repo)
7326 const struct got_error *err = NULL;
7329 struct got_histedit_list_entry *hle;
7330 struct got_commit_object *commit = NULL;
7332 err = got_worktree_get_histedit_script_path(&path, worktree);
7336 f = fopen(path, "w");
7338 err = got_error_from_errno2("fopen", path);
7341 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7342 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
7348 int n = fprintf(f, "%c %s\n",
7349 GOT_HISTEDIT_MESG, hle->logmsg);
7351 err = got_ferror(f, GOT_ERR_IO);
7357 if (f && fclose(f) != 0 && err == NULL)
7358 err = got_error_from_errno("fclose");
7361 got_object_commit_close(commit);
7366 histedit_free_list(struct got_histedit_list *histedit_cmds)
7368 struct got_histedit_list_entry *hle;
7370 while ((hle = TAILQ_FIRST(histedit_cmds))) {
7371 TAILQ_REMOVE(histedit_cmds, hle, entry);
7376 static const struct got_error *
7377 histedit_load_list(struct got_histedit_list *histedit_cmds,
7378 const char *path, struct got_repository *repo)
7380 const struct got_error *err = NULL;
7383 f = fopen(path, "r");
7385 err = got_error_from_errno2("fopen", path);
7389 err = histedit_parse_list(histedit_cmds, f, repo);
7391 if (f && fclose(f) != 0 && err == NULL)
7392 err = got_error_from_errno("fclose");
7396 static const struct got_error *
7397 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
7398 const struct got_error *edit_err, struct got_object_id_queue *commits,
7399 const char *path, const char *branch_name, struct got_repository *repo)
7401 const struct got_error *err = NULL, *prev_err = edit_err;
7404 while (resp != 'c' && resp != 'r' && resp != 'a') {
7405 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
7406 "or (a)bort: ", getprogname(), prev_err->msg);
7411 histedit_free_list(histedit_cmds);
7412 err = histedit_run_editor(histedit_cmds, path, commits,
7415 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7416 err->code != GOT_ERR_HISTEDIT_CMD)
7423 } else if (resp == 'r') {
7424 histedit_free_list(histedit_cmds);
7425 err = histedit_edit_script(histedit_cmds,
7426 commits, branch_name, 0, repo);
7428 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
7429 err->code != GOT_ERR_HISTEDIT_CMD)
7436 } else if (resp == 'a') {
7437 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
7440 printf("invalid response '%c'\n", resp);
7446 static const struct got_error *
7447 histedit_complete(struct got_worktree *worktree,
7448 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7449 struct got_reference *branch, struct got_repository *repo)
7451 printf("Switching work tree to %s\n",
7452 got_ref_get_symref_target(branch));
7453 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
7457 static const struct got_error *
7458 show_histedit_progress(struct got_commit_object *commit,
7459 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
7461 const struct got_error *err;
7462 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7464 err = got_object_id_str(&old_id_str, hle->commit_id);
7469 err = got_object_id_str(&new_id_str, new_id);
7474 old_id_str[12] = '\0';
7476 new_id_str[12] = '\0';
7479 logmsg = strdup(hle->logmsg);
7480 if (logmsg == NULL) {
7481 err = got_error_from_errno("strdup");
7484 trim_logmsg(logmsg, 42);
7486 err = get_short_logmsg(&logmsg, 42, commit);
7491 switch (hle->cmd->code) {
7492 case GOT_HISTEDIT_PICK:
7493 case GOT_HISTEDIT_EDIT:
7494 printf("%s -> %s: %s\n", old_id_str,
7495 new_id_str ? new_id_str : "no-op change", logmsg);
7497 case GOT_HISTEDIT_DROP:
7498 case GOT_HISTEDIT_FOLD:
7499 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
7511 static const struct got_error *
7512 histedit_commit(struct got_pathlist_head *merged_paths,
7513 struct got_worktree *worktree, struct got_fileindex *fileindex,
7514 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
7515 struct got_repository *repo)
7517 const struct got_error *err;
7518 struct got_commit_object *commit;
7519 struct got_object_id *new_commit_id;
7521 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
7522 && hle->logmsg == NULL) {
7523 err = histedit_edit_logmsg(hle, repo);
7528 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7532 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
7533 worktree, fileindex, tmp_branch, commit, hle->commit_id,
7536 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
7538 err = show_histedit_progress(commit, hle, NULL);
7540 err = show_histedit_progress(commit, hle, new_commit_id);
7541 free(new_commit_id);
7544 got_object_commit_close(commit);
7548 static const struct got_error *
7549 histedit_skip_commit(struct got_histedit_list_entry *hle,
7550 struct got_worktree *worktree, struct got_repository *repo)
7552 const struct got_error *error;
7553 struct got_commit_object *commit;
7555 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
7560 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
7564 error = show_histedit_progress(commit, hle, NULL);
7565 got_object_commit_close(commit);
7569 static const struct got_error *
7570 check_local_changes(void *arg, unsigned char status,
7571 unsigned char staged_status, const char *path,
7572 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
7573 struct got_object_id *commit_id, int dirfd, const char *de_name)
7575 int *have_local_changes = arg;
7578 case GOT_STATUS_ADD:
7579 case GOT_STATUS_DELETE:
7580 case GOT_STATUS_MODIFY:
7581 case GOT_STATUS_CONFLICT:
7582 *have_local_changes = 1;
7583 return got_error(GOT_ERR_CANCELLED);
7588 switch (staged_status) {
7589 case GOT_STATUS_ADD:
7590 case GOT_STATUS_DELETE:
7591 case GOT_STATUS_MODIFY:
7592 *have_local_changes = 1;
7593 return got_error(GOT_ERR_CANCELLED);
7601 static const struct got_error *
7602 cmd_histedit(int argc, char *argv[])
7604 const struct got_error *error = NULL;
7605 struct got_worktree *worktree = NULL;
7606 struct got_fileindex *fileindex = NULL;
7607 struct got_repository *repo = NULL;
7609 struct got_reference *branch = NULL;
7610 struct got_reference *tmp_branch = NULL;
7611 struct got_object_id *resume_commit_id = NULL;
7612 struct got_object_id *base_commit_id = NULL;
7613 struct got_object_id *head_commit_id = NULL;
7614 struct got_commit_object *commit = NULL;
7615 int ch, rebase_in_progress = 0, did_something;
7616 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
7617 int edit_logmsg_only = 0;
7618 const char *edit_script_path = NULL;
7619 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7620 struct got_object_id_queue commits;
7621 struct got_pathlist_head merged_paths;
7622 const struct got_object_id_queue *parent_ids;
7623 struct got_object_qid *pid;
7624 struct got_histedit_list histedit_cmds;
7625 struct got_histedit_list_entry *hle;
7627 SIMPLEQ_INIT(&commits);
7628 TAILQ_INIT(&histedit_cmds);
7629 TAILQ_INIT(&merged_paths);
7631 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
7640 edit_script_path = optarg;
7643 edit_logmsg_only = 1;
7655 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7656 "unveil", NULL) == -1)
7659 if (abort_edit && continue_edit)
7660 errx(1, "histedit's -a and -c options are mutually exclusive");
7661 if (edit_script_path && edit_logmsg_only)
7662 errx(1, "histedit's -F and -m options are mutually exclusive");
7663 if (abort_edit && edit_logmsg_only)
7664 errx(1, "histedit's -a and -m options are mutually exclusive");
7665 if (continue_edit && edit_logmsg_only)
7666 errx(1, "histedit's -c and -m options are mutually exclusive");
7671 * This command cannot apply unveil(2) in all cases because the
7672 * user may choose to run an editor to edit the histedit script
7673 * and to edit individual commit log messages.
7674 * unveil(2) traverses exec(2); if an editor is used we have to
7675 * apply unveil after edit script and log messages have been written.
7676 * XXX TODO: Make use of unveil(2) where possible.
7679 cwd = getcwd(NULL, 0);
7681 error = got_error_from_errno("getcwd");
7684 error = got_worktree_open(&worktree, cwd);
7688 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7693 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7696 if (rebase_in_progress) {
7697 error = got_error(GOT_ERR_REBASING);
7701 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
7705 if (edit_in_progress && edit_logmsg_only) {
7706 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
7707 "histedit operation is in progress in this "
7708 "work tree and must be continued or aborted "
7709 "before the -m option can be used");
7713 if (edit_in_progress && abort_edit) {
7714 error = got_worktree_histedit_continue(&resume_commit_id,
7715 &tmp_branch, &branch, &base_commit_id, &fileindex,
7719 printf("Switching work tree to %s\n",
7720 got_ref_get_symref_target(branch));
7721 error = got_worktree_histedit_abort(worktree, fileindex, repo,
7722 branch, base_commit_id, update_progress, &did_something);
7725 printf("Histedit of %s aborted\n",
7726 got_ref_get_symref_target(branch));
7727 goto done; /* nothing else to do */
7728 } else if (abort_edit) {
7729 error = got_error(GOT_ERR_NOT_HISTEDIT);
7733 if (continue_edit) {
7736 if (!edit_in_progress) {
7737 error = got_error(GOT_ERR_NOT_HISTEDIT);
7741 error = got_worktree_get_histedit_script_path(&path, worktree);
7745 error = histedit_load_list(&histedit_cmds, path, repo);
7750 error = got_worktree_histedit_continue(&resume_commit_id,
7751 &tmp_branch, &branch, &base_commit_id, &fileindex,
7756 error = got_ref_resolve(&head_commit_id, repo, branch);
7760 error = got_object_open_as_commit(&commit, repo,
7764 parent_ids = got_object_commit_get_parent_ids(commit);
7765 pid = SIMPLEQ_FIRST(parent_ids);
7767 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
7770 error = collect_commits(&commits, head_commit_id, pid->id,
7771 base_commit_id, got_worktree_get_path_prefix(worktree),
7772 GOT_ERR_HISTEDIT_PATH, repo);
7773 got_object_commit_close(commit);
7778 if (edit_in_progress) {
7779 error = got_error(GOT_ERR_HISTEDIT_BUSY);
7783 error = got_ref_open(&branch, repo,
7784 got_worktree_get_head_ref_name(worktree), 0);
7788 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
7789 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
7790 "will not edit commit history of a branch outside "
7791 "the \"refs/heads/\" reference namespace");
7795 error = got_ref_resolve(&head_commit_id, repo, branch);
7796 got_ref_close(branch);
7801 error = got_object_open_as_commit(&commit, repo,
7805 parent_ids = got_object_commit_get_parent_ids(commit);
7806 pid = SIMPLEQ_FIRST(parent_ids);
7808 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
7811 error = collect_commits(&commits, head_commit_id, pid->id,
7812 got_worktree_get_base_commit_id(worktree),
7813 got_worktree_get_path_prefix(worktree),
7814 GOT_ERR_HISTEDIT_PATH, repo);
7815 got_object_commit_close(commit);
7820 if (SIMPLEQ_EMPTY(&commits)) {
7821 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
7825 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
7826 &base_commit_id, &fileindex, worktree, repo);
7830 if (edit_script_path) {
7831 error = histedit_load_list(&histedit_cmds,
7832 edit_script_path, repo);
7834 got_worktree_histedit_abort(worktree, fileindex,
7835 repo, branch, base_commit_id,
7836 update_progress, &did_something);
7840 const char *branch_name;
7841 branch_name = got_ref_get_symref_target(branch);
7842 if (strncmp(branch_name, "refs/heads/", 11) == 0)
7844 error = histedit_edit_script(&histedit_cmds, &commits,
7845 branch_name, edit_logmsg_only, repo);
7847 got_worktree_histedit_abort(worktree, fileindex,
7848 repo, branch, base_commit_id,
7849 update_progress, &did_something);
7855 error = histedit_save_list(&histedit_cmds, worktree,
7858 got_worktree_histedit_abort(worktree, fileindex,
7859 repo, branch, base_commit_id,
7860 update_progress, &did_something);
7866 error = histedit_check_script(&histedit_cmds, &commits, repo);
7870 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
7871 if (resume_commit_id) {
7872 if (got_object_id_cmp(hle->commit_id,
7873 resume_commit_id) != 0)
7876 resume_commit_id = NULL;
7877 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
7878 hle->cmd->code == GOT_HISTEDIT_FOLD) {
7879 error = histedit_skip_commit(hle, worktree,
7884 struct got_pathlist_head paths;
7885 int have_changes = 0;
7888 error = got_pathlist_append(&paths, "", NULL);
7891 error = got_worktree_status(worktree, &paths,
7892 repo, check_local_changes, &have_changes,
7893 check_cancelled, NULL);
7894 got_pathlist_free(&paths);
7896 if (error->code != GOT_ERR_CANCELLED)
7898 if (sigint_received || sigpipe_received)
7902 error = histedit_commit(NULL, worktree,
7903 fileindex, tmp_branch, hle, repo);
7907 error = got_object_open_as_commit(
7908 &commit, repo, hle->commit_id);
7911 error = show_histedit_progress(commit,
7913 got_object_commit_close(commit);
7922 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
7923 error = histedit_skip_commit(hle, worktree, repo);
7929 error = got_object_open_as_commit(&commit, repo,
7933 parent_ids = got_object_commit_get_parent_ids(commit);
7934 pid = SIMPLEQ_FIRST(parent_ids);
7936 error = got_worktree_histedit_merge_files(&merged_paths,
7937 worktree, fileindex, pid->id, hle->commit_id, repo,
7938 rebase_progress, &rebase_status, check_cancelled, NULL);
7941 got_object_commit_close(commit);
7944 if (rebase_status == GOT_STATUS_CONFLICT) {
7945 error = show_rebase_merge_conflict(hle->commit_id,
7949 got_worktree_rebase_pathlist_free(&merged_paths);
7953 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
7955 error = got_object_id_str(&id_str, hle->commit_id);
7958 printf("Stopping histedit for amending commit %s\n",
7961 got_worktree_rebase_pathlist_free(&merged_paths);
7962 error = got_worktree_histedit_postpone(worktree,
7967 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
7968 error = histedit_skip_commit(hle, worktree, repo);
7974 error = histedit_commit(&merged_paths, worktree, fileindex,
7975 tmp_branch, hle, repo);
7976 got_worktree_rebase_pathlist_free(&merged_paths);
7981 if (rebase_status == GOT_STATUS_CONFLICT) {
7982 error = got_worktree_histedit_postpone(worktree, fileindex);
7985 error = got_error_msg(GOT_ERR_CONFLICTS,
7986 "conflicts must be resolved before histedit can continue");
7988 error = histedit_complete(worktree, fileindex, tmp_branch,
7991 got_object_id_queue_free(&commits);
7992 histedit_free_list(&histedit_cmds);
7993 free(head_commit_id);
7994 free(base_commit_id);
7995 free(resume_commit_id);
7997 got_object_commit_close(commit);
7999 got_ref_close(branch);
8001 got_ref_close(tmp_branch);
8003 got_worktree_close(worktree);
8005 got_repo_close(repo);
8010 usage_integrate(void)
8012 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8016 static const struct got_error *
8017 cmd_integrate(int argc, char *argv[])
8019 const struct got_error *error = NULL;
8020 struct got_repository *repo = NULL;
8021 struct got_worktree *worktree = NULL;
8022 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8023 const char *branch_arg = NULL;
8024 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8025 struct got_fileindex *fileindex = NULL;
8026 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8027 int ch, did_something = 0;
8029 while ((ch = getopt(argc, argv, "")) != -1) {
8042 branch_arg = argv[0];
8044 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8045 "unveil", NULL) == -1)
8048 cwd = getcwd(NULL, 0);
8050 error = got_error_from_errno("getcwd");
8054 error = got_worktree_open(&worktree, cwd);
8058 error = check_rebase_or_histedit_in_progress(worktree);
8062 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8067 error = apply_unveil(got_repo_get_path(repo), 0,
8068 got_worktree_get_root_path(worktree));
8072 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8073 error = got_error_from_errno("asprintf");
8077 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8078 &base_branch_ref, worktree, refname, repo);
8082 refname = strdup(got_ref_get_name(branch_ref));
8083 if (refname == NULL) {
8084 error = got_error_from_errno("strdup");
8085 got_worktree_integrate_abort(worktree, fileindex, repo,
8086 branch_ref, base_branch_ref);
8089 base_refname = strdup(got_ref_get_name(base_branch_ref));
8090 if (base_refname == NULL) {
8091 error = got_error_from_errno("strdup");
8092 got_worktree_integrate_abort(worktree, fileindex, repo,
8093 branch_ref, base_branch_ref);
8097 error = got_ref_resolve(&commit_id, repo, branch_ref);
8101 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8105 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8106 error = got_error_msg(GOT_ERR_SAME_BRANCH,
8107 "specified branch has already been integrated");
8108 got_worktree_integrate_abort(worktree, fileindex, repo,
8109 branch_ref, base_branch_ref);
8113 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8115 if (error->code == GOT_ERR_ANCESTRY)
8116 error = got_error(GOT_ERR_REBASE_REQUIRED);
8117 got_worktree_integrate_abort(worktree, fileindex, repo,
8118 branch_ref, base_branch_ref);
8122 error = got_worktree_integrate_continue(worktree, fileindex, repo,
8123 branch_ref, base_branch_ref, update_progress, &did_something,
8124 check_cancelled, NULL);
8128 printf("Integrated %s into %s\n", refname, base_refname);
8131 got_repo_close(repo);
8133 got_worktree_close(worktree);
8135 free(base_commit_id);
8145 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8146 "[file-path ...]\n",
8151 static const struct got_error *
8152 print_stage(void *arg, unsigned char status, unsigned char staged_status,
8153 const char *path, struct got_object_id *blob_id,
8154 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8155 int dirfd, const char *de_name)
8157 const struct got_error *err = NULL;
8158 char *id_str = NULL;
8160 if (staged_status != GOT_STATUS_ADD &&
8161 staged_status != GOT_STATUS_MODIFY &&
8162 staged_status != GOT_STATUS_DELETE)
8165 if (staged_status == GOT_STATUS_ADD ||
8166 staged_status == GOT_STATUS_MODIFY)
8167 err = got_object_id_str(&id_str, staged_blob_id);
8169 err = got_object_id_str(&id_str, blob_id);
8173 printf("%s %c %s\n", id_str, staged_status, path);
8178 static const struct got_error *
8179 cmd_stage(int argc, char *argv[])
8181 const struct got_error *error = NULL;
8182 struct got_repository *repo = NULL;
8183 struct got_worktree *worktree = NULL;
8185 struct got_pathlist_head paths;
8186 struct got_pathlist_entry *pe;
8187 int ch, list_stage = 0, pflag = 0;
8188 FILE *patch_script_file = NULL;
8189 const char *patch_script_path = NULL;
8190 struct choose_patch_arg cpa;
8194 while ((ch = getopt(argc, argv, "lpF:")) != -1) {
8203 patch_script_path = optarg;
8215 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8216 "unveil", NULL) == -1)
8219 if (list_stage && (pflag || patch_script_path))
8220 errx(1, "-l option cannot be used with other options");
8221 if (patch_script_path && !pflag)
8222 errx(1, "-F option can only be used together with -p option");
8224 cwd = getcwd(NULL, 0);
8226 error = got_error_from_errno("getcwd");
8230 error = got_worktree_open(&worktree, cwd);
8234 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8239 if (patch_script_path) {
8240 patch_script_file = fopen(patch_script_path, "r");
8241 if (patch_script_file == NULL) {
8242 error = got_error_from_errno2("fopen",
8247 error = apply_unveil(got_repo_get_path(repo), 0,
8248 got_worktree_get_root_path(worktree));
8252 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8257 error = got_worktree_status(worktree, &paths, repo,
8258 print_stage, NULL, check_cancelled, NULL);
8260 cpa.patch_script_file = patch_script_file;
8261 cpa.action = "stage";
8262 error = got_worktree_stage(worktree, &paths,
8263 pflag ? NULL : print_status, NULL,
8264 pflag ? choose_patch : NULL, &cpa, repo);
8267 if (patch_script_file && fclose(patch_script_file) == EOF &&
8269 error = got_error_from_errno2("fclose", patch_script_path);
8271 got_repo_close(repo);
8273 got_worktree_close(worktree);
8274 TAILQ_FOREACH(pe, &paths, entry)
8275 free((char *)pe->path);
8276 got_pathlist_free(&paths);
8284 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
8285 "[file-path ...]\n",
8291 static const struct got_error *
8292 cmd_unstage(int argc, char *argv[])
8294 const struct got_error *error = NULL;
8295 struct got_repository *repo = NULL;
8296 struct got_worktree *worktree = NULL;
8298 struct got_pathlist_head paths;
8299 struct got_pathlist_entry *pe;
8300 int ch, did_something = 0, pflag = 0;
8301 FILE *patch_script_file = NULL;
8302 const char *patch_script_path = NULL;
8303 struct choose_patch_arg cpa;
8307 while ((ch = getopt(argc, argv, "pF:")) != -1) {
8313 patch_script_path = optarg;
8325 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8326 "unveil", NULL) == -1)
8329 if (patch_script_path && !pflag)
8330 errx(1, "-F option can only be used together with -p option");
8332 cwd = getcwd(NULL, 0);
8334 error = got_error_from_errno("getcwd");
8338 error = got_worktree_open(&worktree, cwd);
8342 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8347 if (patch_script_path) {
8348 patch_script_file = fopen(patch_script_path, "r");
8349 if (patch_script_file == NULL) {
8350 error = got_error_from_errno2("fopen",
8356 error = apply_unveil(got_repo_get_path(repo), 0,
8357 got_worktree_get_root_path(worktree));
8361 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8365 cpa.patch_script_file = patch_script_file;
8366 cpa.action = "unstage";
8367 error = got_worktree_unstage(worktree, &paths, update_progress,
8368 &did_something, pflag ? choose_patch : NULL, &cpa, repo);
8370 if (patch_script_file && fclose(patch_script_file) == EOF &&
8372 error = got_error_from_errno2("fclose", patch_script_path);
8374 got_repo_close(repo);
8376 got_worktree_close(worktree);
8377 TAILQ_FOREACH(pe, &paths, entry)
8378 free((char *)pe->path);
8379 got_pathlist_free(&paths);
8387 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
8388 "arg1 [arg2 ...]\n", getprogname());
8392 static const struct got_error *
8393 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8395 const struct got_error *err;
8396 struct got_blob_object *blob;
8398 err = got_object_open_as_blob(&blob, repo, id, 8192);
8402 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
8403 got_object_blob_close(blob);
8407 static const struct got_error *
8408 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8410 const struct got_error *err;
8411 struct got_tree_object *tree;
8414 err = got_object_open_as_tree(&tree, repo, id);
8418 nentries = got_object_tree_get_nentries(tree);
8419 for (i = 0; i < nentries; i++) {
8420 struct got_tree_entry *te;
8422 if (sigint_received || sigpipe_received)
8424 te = got_object_tree_get_entry(tree, i);
8425 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
8428 fprintf(outfile, "%s %.7o %s\n", id_str,
8429 got_tree_entry_get_mode(te),
8430 got_tree_entry_get_name(te));
8434 got_object_tree_close(tree);
8438 static const struct got_error *
8439 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8441 const struct got_error *err;
8442 struct got_commit_object *commit;
8443 const struct got_object_id_queue *parent_ids;
8444 struct got_object_qid *pid;
8445 char *id_str = NULL;
8446 const char *logmsg = NULL;
8448 err = got_object_open_as_commit(&commit, repo, id);
8452 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
8456 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
8457 parent_ids = got_object_commit_get_parent_ids(commit);
8458 fprintf(outfile, "numparents %d\n",
8459 got_object_commit_get_nparents(commit));
8460 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
8462 err = got_object_id_str(&pid_str, pid->id);
8465 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
8468 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
8469 got_object_commit_get_author(commit),
8470 got_object_commit_get_author_time(commit));
8472 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
8473 got_object_commit_get_author(commit),
8474 got_object_commit_get_committer_time(commit));
8476 logmsg = got_object_commit_get_logmsg_raw(commit);
8477 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
8478 fprintf(outfile, "%s", logmsg);
8481 got_object_commit_close(commit);
8485 static const struct got_error *
8486 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
8488 const struct got_error *err;
8489 struct got_tag_object *tag;
8490 char *id_str = NULL;
8491 const char *tagmsg = NULL;
8493 err = got_object_open_as_tag(&tag, repo, id);
8497 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
8501 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
8503 switch (got_object_tag_get_object_type(tag)) {
8504 case GOT_OBJ_TYPE_BLOB:
8505 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8506 GOT_OBJ_LABEL_BLOB);
8508 case GOT_OBJ_TYPE_TREE:
8509 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8510 GOT_OBJ_LABEL_TREE);
8512 case GOT_OBJ_TYPE_COMMIT:
8513 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8514 GOT_OBJ_LABEL_COMMIT);
8516 case GOT_OBJ_TYPE_TAG:
8517 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
8524 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
8525 got_object_tag_get_name(tag));
8527 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
8528 got_object_tag_get_tagger(tag),
8529 got_object_tag_get_tagger_time(tag));
8531 tagmsg = got_object_tag_get_message(tag);
8532 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
8533 fprintf(outfile, "%s", tagmsg);
8536 got_object_tag_close(tag);
8540 static const struct got_error *
8541 cmd_cat(int argc, char *argv[])
8543 const struct got_error *error;
8544 struct got_repository *repo = NULL;
8545 struct got_worktree *worktree = NULL;
8546 char *cwd = NULL, *repo_path = NULL, *label = NULL;
8547 const char *commit_id_str = NULL;
8548 struct got_object_id *id = NULL, *commit_id = NULL;
8549 int ch, obj_type, i, force_path = 0;
8552 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8557 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
8560 commit_id_str = optarg;
8563 repo_path = realpath(optarg, NULL);
8564 if (repo_path == NULL)
8565 return got_error_from_errno2("realpath",
8567 got_path_strip_trailing_slashes(repo_path);
8581 cwd = getcwd(NULL, 0);
8583 error = got_error_from_errno("getcwd");
8586 error = got_worktree_open(&worktree, cwd);
8587 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8590 if (repo_path == NULL) {
8592 got_worktree_get_repo_path(worktree));
8593 if (repo_path == NULL) {
8594 error = got_error_from_errno("strdup");
8600 if (repo_path == NULL) {
8601 repo_path = getcwd(NULL, 0);
8602 if (repo_path == NULL)
8603 return got_error_from_errno("getcwd");
8606 error = got_repo_open(&repo, repo_path, NULL);
8611 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
8615 if (commit_id_str == NULL)
8616 commit_id_str = GOT_REF_HEAD;
8617 error = got_repo_match_object_id(&commit_id, NULL,
8618 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
8622 for (i = 0; i < argc; i++) {
8624 error = got_object_id_by_path(&id, repo, commit_id,
8629 error = got_repo_match_object_id(&id, &label, argv[i],
8630 GOT_OBJ_TYPE_ANY, 0, repo);
8632 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
8633 error->code != GOT_ERR_NOT_REF)
8635 error = got_object_id_by_path(&id, repo,
8636 commit_id, argv[i]);
8642 error = got_object_get_type(&obj_type, repo, id);
8647 case GOT_OBJ_TYPE_BLOB:
8648 error = cat_blob(id, repo, stdout);
8650 case GOT_OBJ_TYPE_TREE:
8651 error = cat_tree(id, repo, stdout);
8653 case GOT_OBJ_TYPE_COMMIT:
8654 error = cat_commit(id, repo, stdout);
8656 case GOT_OBJ_TYPE_TAG:
8657 error = cat_tag(id, repo, stdout);
8660 error = got_error(GOT_ERR_OBJ_TYPE);
8675 got_worktree_close(worktree);
8677 const struct got_error *repo_error;
8678 repo_error = got_repo_close(repo);