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"
57 #include "got_gotconfig.h"
60 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
63 static volatile sig_atomic_t sigint_received;
64 static volatile sig_atomic_t sigpipe_received;
67 catch_sigint(int signo)
73 catch_sigpipe(int signo)
81 const struct got_error *(*cmd_main)(int, char *[]);
82 void (*cmd_usage)(void);
83 const char *cmd_alias;
86 __dead static void usage(int);
87 __dead static void usage_init(void);
88 __dead static void usage_import(void);
89 __dead static void usage_clone(void);
90 __dead static void usage_fetch(void);
91 __dead static void usage_checkout(void);
92 __dead static void usage_update(void);
93 __dead static void usage_log(void);
94 __dead static void usage_diff(void);
95 __dead static void usage_blame(void);
96 __dead static void usage_tree(void);
97 __dead static void usage_status(void);
98 __dead static void usage_ref(void);
99 __dead static void usage_branch(void);
100 __dead static void usage_tag(void);
101 __dead static void usage_add(void);
102 __dead static void usage_remove(void);
103 __dead static void usage_revert(void);
104 __dead static void usage_commit(void);
105 __dead static void usage_cherrypick(void);
106 __dead static void usage_backout(void);
107 __dead static void usage_rebase(void);
108 __dead static void usage_histedit(void);
109 __dead static void usage_integrate(void);
110 __dead static void usage_stage(void);
111 __dead static void usage_unstage(void);
112 __dead static void usage_cat(void);
113 __dead static void usage_info(void);
115 static const struct got_error* cmd_init(int, char *[]);
116 static const struct got_error* cmd_import(int, char *[]);
117 static const struct got_error* cmd_clone(int, char *[]);
118 static const struct got_error* cmd_fetch(int, char *[]);
119 static const struct got_error* cmd_checkout(int, char *[]);
120 static const struct got_error* cmd_update(int, char *[]);
121 static const struct got_error* cmd_log(int, char *[]);
122 static const struct got_error* cmd_diff(int, char *[]);
123 static const struct got_error* cmd_blame(int, char *[]);
124 static const struct got_error* cmd_tree(int, char *[]);
125 static const struct got_error* cmd_status(int, char *[]);
126 static const struct got_error* cmd_ref(int, char *[]);
127 static const struct got_error* cmd_branch(int, char *[]);
128 static const struct got_error* cmd_tag(int, char *[]);
129 static const struct got_error* cmd_add(int, char *[]);
130 static const struct got_error* cmd_remove(int, char *[]);
131 static const struct got_error* cmd_revert(int, char *[]);
132 static const struct got_error* cmd_commit(int, char *[]);
133 static const struct got_error* cmd_cherrypick(int, char *[]);
134 static const struct got_error* cmd_backout(int, char *[]);
135 static const struct got_error* cmd_rebase(int, char *[]);
136 static const struct got_error* cmd_histedit(int, char *[]);
137 static const struct got_error* cmd_integrate(int, char *[]);
138 static const struct got_error* cmd_stage(int, char *[]);
139 static const struct got_error* cmd_unstage(int, char *[]);
140 static const struct got_error* cmd_cat(int, char *[]);
141 static const struct got_error* cmd_info(int, char *[]);
143 static struct got_cmd got_commands[] = {
144 { "init", cmd_init, usage_init, "" },
145 { "import", cmd_import, usage_import, "im" },
146 { "clone", cmd_clone, usage_clone, "cl" },
147 { "fetch", cmd_fetch, usage_fetch, "fe" },
148 { "checkout", cmd_checkout, usage_checkout, "co" },
149 { "update", cmd_update, usage_update, "up" },
150 { "log", cmd_log, usage_log, "" },
151 { "diff", cmd_diff, usage_diff, "di" },
152 { "blame", cmd_blame, usage_blame, "bl" },
153 { "tree", cmd_tree, usage_tree, "tr" },
154 { "status", cmd_status, usage_status, "st" },
155 { "ref", cmd_ref, usage_ref, "" },
156 { "branch", cmd_branch, usage_branch, "br" },
157 { "tag", cmd_tag, usage_tag, "" },
158 { "add", cmd_add, usage_add, "" },
159 { "remove", cmd_remove, usage_remove, "rm" },
160 { "revert", cmd_revert, usage_revert, "rv" },
161 { "commit", cmd_commit, usage_commit, "ci" },
162 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
163 { "backout", cmd_backout, usage_backout, "bo" },
164 { "rebase", cmd_rebase, usage_rebase, "rb" },
165 { "histedit", cmd_histedit, usage_histedit, "he" },
166 { "integrate", cmd_integrate, usage_integrate,"ig" },
167 { "stage", cmd_stage, usage_stage, "sg" },
168 { "unstage", cmd_unstage, usage_unstage, "ug" },
169 { "cat", cmd_cat, usage_cat, "" },
170 { "info", cmd_info, usage_info, "" },
178 fprintf(stderr, "commands:");
179 for (i = 0; i < nitems(got_commands); i++) {
180 struct got_cmd *cmd = &got_commands[i];
181 fprintf(stderr, " %s", cmd->cmd_name);
187 main(int argc, char *argv[])
192 int hflag = 0, Vflag = 0;
193 static struct option longopts[] = {
194 { "version", no_argument, NULL, 'V' },
198 setlocale(LC_CTYPE, "");
200 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
219 got_version_print_str();
226 signal(SIGINT, catch_sigint);
227 signal(SIGPIPE, catch_sigpipe);
229 for (i = 0; i < nitems(got_commands); i++) {
230 const struct got_error *error;
232 cmd = &got_commands[i];
234 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
235 strcmp(cmd->cmd_alias, argv[0]) != 0)
239 got_commands[i].cmd_usage();
241 error = got_commands[i].cmd_main(argc, argv);
242 if (error && error->code != GOT_ERR_CANCELLED &&
243 error->code != GOT_ERR_PRIVSEP_EXIT &&
244 !(sigpipe_received &&
245 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
247 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
248 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
255 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
263 fprintf(stderr, "usage: %s [-h] [-V | --version] command [arg ...]\n",
270 static const struct got_error *
271 get_editor(char **abspath)
273 const struct got_error *err = NULL;
278 editor = getenv("VISUAL");
280 editor = getenv("EDITOR");
283 err = got_path_find_prog(abspath, editor);
288 if (*abspath == NULL) {
289 *abspath = strdup("/bin/ed");
290 if (*abspath == NULL)
291 return got_error_from_errno("strdup");
297 static const struct got_error *
298 apply_unveil(const char *repo_path, int repo_read_only,
299 const char *worktree_path)
301 const struct got_error *err;
304 if (unveil("gmon.out", "rwc") != 0)
305 return got_error_from_errno2("unveil", "gmon.out");
307 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
308 return got_error_from_errno2("unveil", repo_path);
310 if (worktree_path && unveil(worktree_path, "rwc") != 0)
311 return got_error_from_errno2("unveil", worktree_path);
313 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
314 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
316 err = got_privsep_unveil_exec_helpers();
320 if (unveil(NULL, NULL) != 0)
321 return got_error_from_errno("unveil");
329 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
333 static const struct got_error *
334 cmd_init(int argc, char *argv[])
336 const struct got_error *error = NULL;
337 char *repo_path = NULL;
340 while ((ch = getopt(argc, argv, "")) != -1) {
352 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
358 repo_path = strdup(argv[0]);
359 if (repo_path == NULL)
360 return got_error_from_errno("strdup");
362 got_path_strip_trailing_slashes(repo_path);
364 error = got_path_mkdir(repo_path);
366 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
369 error = apply_unveil(repo_path, 0, NULL);
373 error = got_repo_init(repo_path);
382 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
383 "[-r repository-path] [-I pattern] path\n", getprogname());
388 spawn_editor(const char *editor, const char *file)
391 sig_t sighup, sigint, sigquit;
394 sighup = signal(SIGHUP, SIG_IGN);
395 sigint = signal(SIGINT, SIG_IGN);
396 sigquit = signal(SIGQUIT, SIG_IGN);
398 switch (pid = fork()) {
402 execl(editor, editor, file, (char *)NULL);
406 while (waitpid(pid, &st, 0) == -1)
411 (void)signal(SIGHUP, sighup);
412 (void)signal(SIGINT, sigint);
413 (void)signal(SIGQUIT, sigquit);
415 if (!WIFEXITED(st)) {
420 return WEXITSTATUS(st);
423 static const struct got_error *
424 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
425 const char *initial_content)
427 const struct got_error *err = NULL;
431 int content_changed = 0;
436 if (stat(logmsg_path, &st) == -1)
437 return got_error_from_errno2("stat", logmsg_path);
439 if (spawn_editor(editor, logmsg_path) == -1)
440 return got_error_from_errno("failed spawning editor");
442 if (stat(logmsg_path, &st2) == -1)
443 return got_error_from_errno("stat");
445 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
446 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
447 "no changes made to commit message, aborting");
449 *logmsg = malloc(st2.st_size + 1);
451 return got_error_from_errno("malloc");
455 fp = fopen(logmsg_path, "r");
457 err = got_error_from_errno("fopen");
460 while (fgets(buf, sizeof(buf), fp) != NULL) {
461 if (!content_changed && strcmp(buf, initial_content) != 0)
463 if (buf[0] == '#' || (len == 0 && buf[0] == '\n'))
464 continue; /* remove comments and leading empty lines */
465 len = strlcat(*logmsg, buf, st2.st_size);
469 while (len > 0 && (*logmsg)[len - 1] == '\n') {
470 (*logmsg)[len - 1] = '\0';
474 if (len == 0 || !content_changed)
475 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
476 "commit message cannot be empty, aborting");
485 static const struct got_error *
486 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
487 const char *path_dir, const char *branch_name)
489 char *initial_content = NULL;
490 const struct got_error *err = NULL;
491 int initial_content_len;
494 initial_content_len = asprintf(&initial_content,
495 "\n# %s to be imported to branch %s\n", path_dir,
497 if (initial_content_len == -1)
498 return got_error_from_errno("asprintf");
500 err = got_opentemp_named_fd(logmsg_path, &fd,
501 GOT_TMPDIR_STR "/got-importmsg");
505 if (write(fd, initial_content, initial_content_len) == -1) {
506 err = got_error_from_errno2("write", *logmsg_path);
510 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content);
512 if (fd != -1 && close(fd) == -1 && err == NULL)
513 err = got_error_from_errno2("close", *logmsg_path);
514 free(initial_content);
522 static const struct got_error *
523 import_progress(void *arg, const char *path)
525 printf("A %s\n", path);
529 static const struct got_error *
530 get_author(char **author, struct got_repository *repo,
531 struct got_worktree *worktree)
533 const struct got_error *err = NULL;
534 const char *got_author = NULL, *name, *email;
535 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
540 worktree_conf = got_worktree_get_gotconfig(worktree);
541 repo_conf = got_repo_get_gotconfig(repo);
544 * Priority of potential author information sources, from most
545 * significant to least significant:
546 * 1) work tree's .got/got.conf file
547 * 2) repository's got.conf file
548 * 3) repository's git config file
549 * 4) environment variables
550 * 5) global git config files (in user's home directory or /etc)
554 got_author = got_gotconfig_get_author(worktree_conf);
555 if (got_author == NULL)
556 got_author = got_gotconfig_get_author(repo_conf);
557 if (got_author == NULL) {
558 name = got_repo_get_gitconfig_author_name(repo);
559 email = got_repo_get_gitconfig_author_email(repo);
561 if (asprintf(author, "%s <%s>", name, email) == -1)
562 return got_error_from_errno("asprintf");
566 got_author = getenv("GOT_AUTHOR");
567 if (got_author == NULL) {
568 name = got_repo_get_global_gitconfig_author_name(repo);
569 email = got_repo_get_global_gitconfig_author_email(
572 if (asprintf(author, "%s <%s>", name, email)
574 return got_error_from_errno("asprintf");
577 /* TODO: Look up user in password database? */
578 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
582 *author = strdup(got_author);
584 return got_error_from_errno("strdup");
587 * Really dumb email address check; we're only doing this to
588 * avoid git's object parser breaking on commits we create.
590 while (*got_author && *got_author != '<')
592 if (*got_author != '<') {
593 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
596 while (*got_author && *got_author != '@')
598 if (*got_author != '@') {
599 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
602 while (*got_author && *got_author != '>')
604 if (*got_author != '>')
605 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
614 static const struct got_error *
615 get_gitconfig_path(char **gitconfig_path)
617 const char *homedir = getenv("HOME");
619 *gitconfig_path = NULL;
621 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
622 return got_error_from_errno("asprintf");
628 static const struct got_error *
629 cmd_import(int argc, char *argv[])
631 const struct got_error *error = NULL;
632 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
633 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
634 const char *branch_name = "main";
635 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
636 struct got_repository *repo = NULL;
637 struct got_reference *branch_ref = NULL, *head_ref = NULL;
638 struct got_object_id *new_commit_id = NULL;
640 struct got_pathlist_head ignores;
641 struct got_pathlist_entry *pe;
642 int preserve_logmsg = 0;
644 TAILQ_INIT(&ignores);
646 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
649 branch_name = optarg;
652 logmsg = strdup(optarg);
653 if (logmsg == NULL) {
654 error = got_error_from_errno("strdup");
659 repo_path = realpath(optarg, NULL);
660 if (repo_path == NULL) {
661 error = got_error_from_errno2("realpath",
667 if (optarg[0] == '\0')
669 error = got_pathlist_insert(&pe, &ignores, optarg,
684 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
692 if (repo_path == NULL) {
693 repo_path = getcwd(NULL, 0);
694 if (repo_path == NULL)
695 return got_error_from_errno("getcwd");
697 got_path_strip_trailing_slashes(repo_path);
698 error = get_gitconfig_path(&gitconfig_path);
701 error = got_repo_open(&repo, repo_path, gitconfig_path);
705 error = get_author(&author, repo, NULL);
710 * Don't let the user create a branch name with a leading '-'.
711 * While technically a valid reference name, this case is usually
712 * an unintended typo.
714 if (branch_name[0] == '-')
715 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
717 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
718 error = got_error_from_errno("asprintf");
722 error = got_ref_open(&branch_ref, repo, refname, 0);
724 if (error->code != GOT_ERR_NOT_REF)
727 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
728 "import target branch already exists");
732 path_dir = realpath(argv[0], NULL);
733 if (path_dir == NULL) {
734 error = got_error_from_errno2("realpath", argv[0]);
737 got_path_strip_trailing_slashes(path_dir);
740 * unveil(2) traverses exec(2); if an editor is used we have
741 * to apply unveil after the log message has been written.
743 if (logmsg == NULL || strlen(logmsg) == 0) {
744 error = get_editor(&editor);
748 error = collect_import_msg(&logmsg, &logmsg_path, editor,
751 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
758 if (unveil(path_dir, "r") != 0) {
759 error = got_error_from_errno2("unveil", path_dir);
765 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
772 error = got_repo_import(&new_commit_id, path_dir, logmsg,
773 author, &ignores, repo, import_progress, NULL);
780 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
787 error = got_ref_write(branch_ref, repo);
794 error = got_object_id_str(&id_str, new_commit_id);
801 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
803 if (error->code != GOT_ERR_NOT_REF) {
809 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
817 error = got_ref_write(head_ref, repo);
825 printf("Created branch %s with commit %s\n",
826 got_ref_get_name(branch_ref), id_str);
828 if (preserve_logmsg) {
829 fprintf(stderr, "%s: log message preserved in %s\n",
830 getprogname(), logmsg_path);
831 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
832 error = got_error_from_errno2("unlink", logmsg_path);
841 free(gitconfig_path);
843 got_ref_close(branch_ref);
845 got_ref_close(head_ref);
852 fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
853 "[-R reference] repository-url [directory]\n", getprogname());
857 struct got_fetch_progress_arg {
858 char last_scaled_size[FMT_SCALED_STRSIZE];
864 static const struct got_error *
865 fetch_progress(void *arg, const char *message, off_t packfile_size,
866 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
868 struct got_fetch_progress_arg *a = arg;
869 char scaled_size[FMT_SCALED_STRSIZE];
870 int p_indexed, p_resolved;
871 int print_size = 0, print_indexed = 0, print_resolved = 0;
873 if (a->verbosity < 0)
876 if (message && message[0] != '\0') {
877 printf("\rserver: %s", message);
882 if (packfile_size > 0 || nobj_indexed > 0) {
883 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
884 (a->last_scaled_size[0] == '\0' ||
885 strcmp(scaled_size, a->last_scaled_size)) != 0) {
887 if (strlcpy(a->last_scaled_size, scaled_size,
888 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
889 return got_error(GOT_ERR_NO_SPACE);
891 if (nobj_indexed > 0) {
892 p_indexed = (nobj_indexed * 100) / nobj_total;
893 if (p_indexed != a->last_p_indexed) {
894 a->last_p_indexed = p_indexed;
899 if (nobj_resolved > 0) {
900 p_resolved = (nobj_resolved * 100) /
901 (nobj_total - nobj_loose);
902 if (p_resolved != a->last_p_resolved) {
903 a->last_p_resolved = p_resolved;
911 if (print_size || print_indexed || print_resolved)
914 printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
916 printf("; indexing %d%%", p_indexed);
918 printf("; resolving deltas %d%%", p_resolved);
919 if (print_size || print_indexed || print_resolved)
925 static const struct got_error *
926 create_symref(const char *refname, struct got_reference *target_ref,
927 int verbosity, struct got_repository *repo)
929 const struct got_error *err;
930 struct got_reference *head_symref;
932 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
936 err = got_ref_write(head_symref, repo);
937 got_ref_close(head_symref);
938 if (err == NULL && verbosity > 0) {
939 printf("Created reference %s: %s\n", GOT_REF_HEAD,
940 got_ref_get_name(target_ref));
945 static const struct got_error *
946 list_remote_refs(struct got_pathlist_head *symrefs,
947 struct got_pathlist_head *refs)
949 const struct got_error *err;
950 struct got_pathlist_entry *pe;
952 TAILQ_FOREACH(pe, symrefs, entry) {
953 const char *refname = pe->path;
954 const char *targetref = pe->data;
956 printf("%s: %s\n", refname, targetref);
959 TAILQ_FOREACH(pe, refs, entry) {
960 const char *refname = pe->path;
961 struct got_object_id *id = pe->data;
964 err = got_object_id_str(&id_str, id);
967 printf("%s: %s\n", refname, id_str);
974 static const struct got_error *
975 create_ref(const char *refname, struct got_object_id *id,
976 int verbosity, struct got_repository *repo)
978 const struct got_error *err = NULL;
979 struct got_reference *ref;
982 err = got_object_id_str(&id_str, id);
986 err = got_ref_alloc(&ref, refname, id);
990 err = got_ref_write(ref, repo);
993 if (err == NULL && verbosity >= 0)
994 printf("Created reference %s: %s\n", refname, id_str);
1001 match_wanted_ref(const char *refname, const char *wanted_ref)
1003 if (strncmp(refname, "refs/", 5) != 0)
1008 * Prevent fetching of references that won't make any
1009 * sense outside of the remote repository's context.
1011 if (strncmp(refname, "got/", 4) == 0)
1013 if (strncmp(refname, "remotes/", 8) == 0)
1016 if (strncmp(wanted_ref, "refs/", 5) == 0)
1019 /* Allow prefix match. */
1020 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1023 /* Allow exact match. */
1024 return (strcmp(refname, wanted_ref) == 0);
1028 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1030 struct got_pathlist_entry *pe;
1032 TAILQ_FOREACH(pe, wanted_refs, entry) {
1033 if (match_wanted_ref(refname, pe->path))
1040 static const struct got_error *
1041 create_wanted_ref(const char *refname, struct got_object_id *id,
1042 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1044 const struct got_error *err;
1045 char *remote_refname;
1047 if (strncmp("refs/", refname, 5) == 0)
1050 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1051 remote_repo_name, refname) == -1)
1052 return got_error_from_errno("asprintf");
1054 err = create_ref(remote_refname, id, verbosity, repo);
1055 free(remote_refname);
1059 static const struct got_error *
1060 cmd_clone(int argc, char *argv[])
1062 const struct got_error *error = NULL;
1063 const char *uri, *dirname;
1064 char *proto, *host, *port, *repo_name, *server_path;
1065 char *default_destdir = NULL, *id_str = NULL;
1066 const char *repo_path;
1067 struct got_repository *repo = NULL;
1068 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1069 struct got_pathlist_entry *pe;
1070 struct got_object_id *pack_hash = NULL;
1071 int ch, fetchfd = -1, fetchstatus;
1072 pid_t fetchpid = -1;
1073 struct got_fetch_progress_arg fpa;
1074 char *git_url = NULL;
1075 char *gitconfig_path = NULL, *gotconfig_path = NULL;
1076 char *gitconfig = NULL, *gotconfig = NULL;
1077 FILE *gitconfig_file = NULL, *gotconfig_file = NULL;
1079 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1080 int list_refs_only = 0;
1081 struct got_reference *head_symref = NULL;
1084 TAILQ_INIT(&symrefs);
1085 TAILQ_INIT(&wanted_branches);
1086 TAILQ_INIT(&wanted_refs);
1088 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1091 fetch_all_branches = 1;
1094 error = got_pathlist_append(&wanted_branches,
1103 mirror_references = 1;
1108 else if (verbosity < 3)
1115 error = got_pathlist_append(&wanted_refs,
1128 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1129 errx(1, "-a and -b options are mutually exclusive");
1130 if (list_refs_only) {
1131 if (!TAILQ_EMPTY(&wanted_branches))
1132 errx(1, "-l and -b options are mutually exclusive");
1133 if (fetch_all_branches)
1134 errx(1, "-l and -a options are mutually exclusive");
1135 if (mirror_references)
1136 errx(1, "-l and -m options are mutually exclusive");
1137 if (verbosity == -1)
1138 errx(1, "-l and -q options are mutually exclusive");
1139 if (!TAILQ_EMPTY(&wanted_refs))
1140 errx(1, "-l and -R options are mutually exclusive");
1152 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1157 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1158 host, port ? ":" : "", port ? port : "",
1159 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1160 error = got_error_from_errno("asprintf");
1164 if (strcmp(proto, "git") == 0) {
1166 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1167 "sendfd dns inet unveil", NULL) == -1)
1170 } else if (strcmp(proto, "git+ssh") == 0 ||
1171 strcmp(proto, "ssh") == 0) {
1173 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1174 "sendfd unveil", NULL) == -1)
1177 } else if (strcmp(proto, "http") == 0 ||
1178 strcmp(proto, "git+http") == 0) {
1179 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1182 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1185 if (dirname == NULL) {
1186 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1187 error = got_error_from_errno("asprintf");
1190 repo_path = default_destdir;
1192 repo_path = dirname;
1194 if (!list_refs_only) {
1195 error = got_path_mkdir(repo_path);
1199 error = got_repo_init(repo_path);
1202 error = got_repo_open(&repo, repo_path, NULL);
1207 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1208 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1209 error = got_error_from_errno2("unveil",
1210 GOT_FETCH_PATH_SSH);
1214 error = apply_unveil(repo ? got_repo_get_path(repo) : NULL, 0, NULL);
1219 printf("Connecting to %s%s%s\n", host,
1220 port ? ":" : "", port ? port : "");
1222 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1223 server_path, verbosity);
1227 fpa.last_scaled_size[0] = '\0';
1228 fpa.last_p_indexed = -1;
1229 fpa.last_p_resolved = -1;
1230 fpa.verbosity = verbosity;
1231 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1232 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1233 fetch_all_branches, &wanted_branches, &wanted_refs,
1234 list_refs_only, verbosity, fetchfd, repo,
1235 fetch_progress, &fpa);
1239 if (list_refs_only) {
1240 error = list_remote_refs(&symrefs, &refs);
1244 error = got_object_id_str(&id_str, pack_hash);
1248 printf("\nFetched %s.pack\n", id_str);
1251 /* Set up references provided with the pack file. */
1252 TAILQ_FOREACH(pe, &refs, entry) {
1253 const char *refname = pe->path;
1254 struct got_object_id *id = pe->data;
1255 char *remote_refname;
1257 if (is_wanted_ref(&wanted_refs, refname) &&
1258 !mirror_references) {
1259 error = create_wanted_ref(refname, id,
1260 GOT_FETCH_DEFAULT_REMOTE_NAME,
1261 verbosity - 1, repo);
1267 error = create_ref(refname, id, verbosity - 1, repo);
1271 if (mirror_references)
1274 if (strncmp("refs/heads/", refname, 11) != 0)
1277 if (asprintf(&remote_refname,
1278 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1279 refname + 11) == -1) {
1280 error = got_error_from_errno("asprintf");
1283 error = create_ref(remote_refname, id, verbosity - 1, repo);
1284 free(remote_refname);
1289 /* Set the HEAD reference if the server provided one. */
1290 TAILQ_FOREACH(pe, &symrefs, entry) {
1291 struct got_reference *target_ref;
1292 const char *refname = pe->path;
1293 const char *target = pe->data;
1294 char *remote_refname = NULL, *remote_target = NULL;
1296 if (strcmp(refname, GOT_REF_HEAD) != 0)
1299 error = got_ref_open(&target_ref, repo, target, 0);
1301 if (error->code == GOT_ERR_NOT_REF) {
1308 error = create_symref(refname, target_ref, verbosity, repo);
1309 got_ref_close(target_ref);
1313 if (mirror_references)
1316 if (strncmp("refs/heads/", target, 11) != 0)
1319 if (asprintf(&remote_refname,
1320 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1322 error = got_error_from_errno("asprintf");
1325 if (asprintf(&remote_target,
1326 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1327 target + 11) == -1) {
1328 error = got_error_from_errno("asprintf");
1329 free(remote_refname);
1332 error = got_ref_open(&target_ref, repo, remote_target, 0);
1334 free(remote_refname);
1335 free(remote_target);
1336 if (error->code == GOT_ERR_NOT_REF) {
1342 error = create_symref(remote_refname, target_ref,
1343 verbosity - 1, repo);
1344 free(remote_refname);
1345 free(remote_target);
1346 got_ref_close(target_ref);
1352 * We failed to set the HEAD reference. If we asked for
1353 * a set of wanted branches use the first of one of those
1354 * which could be fetched instead.
1356 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1357 const char *target = pe->path;
1358 struct got_reference *target_ref;
1360 error = got_ref_open(&target_ref, repo, target, 0);
1362 if (error->code == GOT_ERR_NOT_REF) {
1369 error = create_symref(GOT_REF_HEAD, target_ref,
1371 got_ref_close(target_ref);
1378 /* Create got.conf(5). */
1379 gotconfig_path = got_repo_get_path_gotconfig(repo);
1380 if (gotconfig_path == NULL) {
1381 error = got_error_from_errno("got_repo_get_path_gotconfig");
1384 gotconfig_file = fopen(gotconfig_path, "a");
1385 if (gotconfig_file == NULL) {
1386 error = got_error_from_errno2("fopen", gotconfig_path);
1389 got_path_strip_trailing_slashes(server_path);
1390 if (asprintf(&gotconfig,
1395 "\trepository \"%s\"\n"
1398 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1399 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1401 mirror_references ? "\tmirror-references yes\n" : "") == -1) {
1402 error = got_error_from_errno("asprintf");
1405 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1406 if (n != strlen(gotconfig)) {
1407 error = got_ferror(gotconfig_file, GOT_ERR_IO);
1411 /* Create a config file Git can understand. */
1412 gitconfig_path = got_repo_get_path_gitconfig(repo);
1413 if (gitconfig_path == NULL) {
1414 error = got_error_from_errno("got_repo_get_path_gitconfig");
1417 gitconfig_file = fopen(gitconfig_path, "a");
1418 if (gitconfig_file == NULL) {
1419 error = got_error_from_errno2("fopen", gitconfig_path);
1422 if (mirror_references) {
1423 if (asprintf(&gitconfig,
1426 "\tfetch = +refs/*:refs/*\n"
1427 "\tmirror = true\n",
1428 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1429 error = got_error_from_errno("asprintf");
1432 } else if (fetch_all_branches) {
1433 if (asprintf(&gitconfig,
1436 "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1437 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1438 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1439 error = got_error_from_errno("asprintf");
1443 const char *branchname;
1446 * If the server specified a default branch, use just that one.
1447 * Otherwise fall back to fetching all branches on next fetch.
1450 branchname = got_ref_get_symref_target(head_symref);
1451 if (strncmp(branchname, "refs/heads/", 11) == 0)
1454 branchname = "*"; /* fall back to all branches */
1455 if (asprintf(&gitconfig,
1458 "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1459 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1460 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1461 branchname) == -1) {
1462 error = got_error_from_errno("asprintf");
1466 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1467 if (n != strlen(gitconfig)) {
1468 error = got_ferror(gitconfig_file, GOT_ERR_IO);
1473 printf("Created %s repository '%s'\n",
1474 mirror_references ? "mirrored" : "cloned", repo_path);
1477 if (kill(fetchpid, SIGTERM) == -1)
1478 error = got_error_from_errno("kill");
1479 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1480 error = got_error_from_errno("waitpid");
1482 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1483 error = got_error_from_errno("close");
1484 if (gotconfig_file && fclose(gotconfig_file) == EOF && error == NULL)
1485 error = got_error_from_errno("fclose");
1486 if (gitconfig_file && fclose(gitconfig_file) == EOF && error == NULL)
1487 error = got_error_from_errno("fclose");
1489 got_repo_close(repo);
1491 got_ref_close(head_symref);
1492 TAILQ_FOREACH(pe, &refs, entry) {
1493 free((void *)pe->path);
1496 got_pathlist_free(&refs);
1497 TAILQ_FOREACH(pe, &symrefs, entry) {
1498 free((void *)pe->path);
1501 got_pathlist_free(&symrefs);
1502 got_pathlist_free(&wanted_branches);
1503 got_pathlist_free(&wanted_refs);
1510 free(default_destdir);
1513 free(gotconfig_path);
1514 free(gitconfig_path);
1519 static const struct got_error *
1520 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1521 int replace_tags, int verbosity, struct got_repository *repo)
1523 const struct got_error *err = NULL;
1524 char *new_id_str = NULL;
1525 struct got_object_id *old_id = NULL;
1527 err = got_object_id_str(&new_id_str, new_id);
1531 if (!replace_tags &&
1532 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1533 err = got_ref_resolve(&old_id, repo, ref);
1536 if (got_object_id_cmp(old_id, new_id) == 0)
1538 if (verbosity >= 0) {
1539 printf("Rejecting update of existing tag %s: %s\n",
1540 got_ref_get_name(ref), new_id_str);
1545 if (got_ref_is_symbolic(ref)) {
1546 if (verbosity >= 0) {
1547 printf("Replacing reference %s: %s\n",
1548 got_ref_get_name(ref),
1549 got_ref_get_symref_target(ref));
1551 err = got_ref_change_symref_to_ref(ref, new_id);
1554 err = got_ref_write(ref, repo);
1558 err = got_ref_resolve(&old_id, repo, ref);
1561 if (got_object_id_cmp(old_id, new_id) == 0)
1564 err = got_ref_change_ref(ref, new_id);
1567 err = got_ref_write(ref, repo);
1573 printf("Updated %s: %s\n", got_ref_get_name(ref),
1581 static const struct got_error *
1582 update_symref(const char *refname, struct got_reference *target_ref,
1583 int verbosity, struct got_repository *repo)
1585 const struct got_error *err = NULL, *unlock_err;
1586 struct got_reference *symref;
1587 int symref_is_locked = 0;
1589 err = got_ref_open(&symref, repo, refname, 1);
1591 if (err->code != GOT_ERR_NOT_REF)
1593 err = got_ref_alloc_symref(&symref, refname, target_ref);
1597 err = got_ref_write(symref, repo);
1602 printf("Created reference %s: %s\n",
1603 got_ref_get_name(symref),
1604 got_ref_get_symref_target(symref));
1606 symref_is_locked = 1;
1608 if (strcmp(got_ref_get_symref_target(symref),
1609 got_ref_get_name(target_ref)) == 0)
1612 err = got_ref_change_symref(symref,
1613 got_ref_get_name(target_ref));
1617 err = got_ref_write(symref, repo);
1622 printf("Updated %s: %s\n", got_ref_get_name(symref),
1623 got_ref_get_symref_target(symref));
1627 if (symref_is_locked) {
1628 unlock_err = got_ref_unlock(symref);
1629 if (unlock_err && err == NULL)
1632 got_ref_close(symref);
1639 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1640 "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1641 "[remote-repository-name]\n",
1646 static const struct got_error *
1647 delete_missing_ref(struct got_reference *ref,
1648 int verbosity, struct got_repository *repo)
1650 const struct got_error *err = NULL;
1651 struct got_object_id *id = NULL;
1652 char *id_str = NULL;
1654 if (got_ref_is_symbolic(ref)) {
1655 err = got_ref_delete(ref, repo);
1658 if (verbosity >= 0) {
1659 printf("Deleted reference %s: %s\n",
1660 got_ref_get_name(ref),
1661 got_ref_get_symref_target(ref));
1664 err = got_ref_resolve(&id, repo, ref);
1667 err = got_object_id_str(&id_str, id);
1671 err = got_ref_delete(ref, repo);
1674 if (verbosity >= 0) {
1675 printf("Deleted reference %s: %s\n",
1676 got_ref_get_name(ref), id_str);
1685 static const struct got_error *
1686 delete_missing_refs(struct got_pathlist_head *their_refs,
1687 struct got_pathlist_head *their_symrefs,
1688 const struct got_remote_repo *remote,
1689 int verbosity, struct got_repository *repo)
1691 const struct got_error *err = NULL, *unlock_err;
1692 struct got_reflist_head my_refs;
1693 struct got_reflist_entry *re;
1694 struct got_pathlist_entry *pe;
1695 char *remote_namespace = NULL;
1696 char *local_refname = NULL;
1698 SIMPLEQ_INIT(&my_refs);
1700 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1702 return got_error_from_errno("asprintf");
1704 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1708 SIMPLEQ_FOREACH(re, &my_refs, entry) {
1709 const char *refname = got_ref_get_name(re->ref);
1711 if (!remote->mirror_references) {
1712 if (strncmp(refname, remote_namespace,
1713 strlen(remote_namespace)) == 0) {
1714 if (strcmp(refname + strlen(remote_namespace),
1717 if (asprintf(&local_refname, "refs/heads/%s",
1718 refname + strlen(remote_namespace)) == -1) {
1719 err = got_error_from_errno("asprintf");
1722 } else if (strncmp(refname, "refs/tags/", 10) != 0)
1726 TAILQ_FOREACH(pe, their_refs, entry) {
1727 if (strcmp(local_refname, pe->path) == 0)
1733 TAILQ_FOREACH(pe, their_symrefs, entry) {
1734 if (strcmp(local_refname, pe->path) == 0)
1740 err = delete_missing_ref(re->ref, verbosity, repo);
1744 if (local_refname) {
1745 struct got_reference *ref;
1746 err = got_ref_open(&ref, repo, local_refname, 1);
1748 if (err->code != GOT_ERR_NOT_REF)
1750 free(local_refname);
1751 local_refname = NULL;
1754 err = delete_missing_ref(ref, verbosity, repo);
1757 unlock_err = got_ref_unlock(ref);
1759 if (unlock_err && err == NULL) {
1764 free(local_refname);
1765 local_refname = NULL;
1769 free(remote_namespace);
1770 free(local_refname);
1774 static const struct got_error *
1775 update_wanted_ref(const char *refname, struct got_object_id *id,
1776 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1778 const struct got_error *err, *unlock_err;
1779 char *remote_refname;
1780 struct got_reference *ref;
1782 if (strncmp("refs/", refname, 5) == 0)
1785 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1786 remote_repo_name, refname) == -1)
1787 return got_error_from_errno("asprintf");
1789 err = got_ref_open(&ref, repo, remote_refname, 1);
1791 if (err->code != GOT_ERR_NOT_REF)
1793 err = create_ref(remote_refname, id, verbosity, repo);
1795 err = update_ref(ref, id, 0, verbosity, repo);
1796 unlock_err = got_ref_unlock(ref);
1797 if (unlock_err && err == NULL)
1802 free(remote_refname);
1806 static const struct got_error *
1807 cmd_fetch(int argc, char *argv[])
1809 const struct got_error *error = NULL, *unlock_err;
1810 char *cwd = NULL, *repo_path = NULL;
1811 const char *remote_name;
1812 char *proto = NULL, *host = NULL, *port = NULL;
1813 char *repo_name = NULL, *server_path = NULL;
1814 const struct got_remote_repo *remotes, *remote = NULL;
1816 char *id_str = NULL;
1817 struct got_repository *repo = NULL;
1818 struct got_worktree *worktree = NULL;
1819 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
1820 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1821 struct got_pathlist_entry *pe;
1822 struct got_object_id *pack_hash = NULL;
1823 int i, ch, fetchfd = -1, fetchstatus;
1824 pid_t fetchpid = -1;
1825 struct got_fetch_progress_arg fpa;
1826 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
1827 int delete_refs = 0, replace_tags = 0;
1830 TAILQ_INIT(&symrefs);
1831 TAILQ_INIT(&wanted_branches);
1832 TAILQ_INIT(&wanted_refs);
1834 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
1837 fetch_all_branches = 1;
1840 error = got_pathlist_append(&wanted_branches,
1852 repo_path = realpath(optarg, NULL);
1853 if (repo_path == NULL)
1854 return got_error_from_errno2("realpath",
1856 got_path_strip_trailing_slashes(repo_path);
1864 else if (verbosity < 3)
1871 error = got_pathlist_append(&wanted_refs,
1884 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1885 errx(1, "-a and -b options are mutually exclusive");
1886 if (list_refs_only) {
1887 if (!TAILQ_EMPTY(&wanted_branches))
1888 errx(1, "-l and -b options are mutually exclusive");
1889 if (fetch_all_branches)
1890 errx(1, "-l and -a options are mutually exclusive");
1892 errx(1, "-l and -d options are mutually exclusive");
1893 if (verbosity == -1)
1894 errx(1, "-l and -q options are mutually exclusive");
1898 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
1900 remote_name = argv[0];
1904 cwd = getcwd(NULL, 0);
1906 error = got_error_from_errno("getcwd");
1910 if (repo_path == NULL) {
1911 error = got_worktree_open(&worktree, cwd);
1912 if (error && error->code != GOT_ERR_NOT_WORKTREE)
1918 strdup(got_worktree_get_repo_path(worktree));
1919 if (repo_path == NULL)
1920 error = got_error_from_errno("strdup");
1924 repo_path = strdup(cwd);
1925 if (repo_path == NULL) {
1926 error = got_error_from_errno("strdup");
1932 error = got_repo_open(&repo, repo_path, NULL);
1937 worktree_conf = got_worktree_get_gotconfig(worktree);
1938 if (worktree_conf) {
1939 got_gotconfig_get_remotes(&nremotes, &remotes,
1941 for (i = 0; i < nremotes; i++) {
1942 remote = &remotes[i];
1943 if (strcmp(remote->name, remote_name) == 0)
1948 if (remote == NULL) {
1949 repo_conf = got_repo_get_gotconfig(repo);
1951 got_gotconfig_get_remotes(&nremotes, &remotes,
1953 for (i = 0; i < nremotes; i++) {
1954 remote = &remotes[i];
1955 if (strcmp(remote->name, remote_name) == 0)
1960 if (remote == NULL) {
1961 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
1962 for (i = 0; i < nremotes; i++) {
1963 remote = &remotes[i];
1964 if (strcmp(remote->name, remote_name) == 0)
1968 if (remote == NULL) {
1969 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
1973 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1974 &repo_name, remote->url);
1978 if (strcmp(proto, "git") == 0) {
1980 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1981 "sendfd dns inet unveil", NULL) == -1)
1984 } else if (strcmp(proto, "git+ssh") == 0 ||
1985 strcmp(proto, "ssh") == 0) {
1987 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1988 "sendfd unveil", NULL) == -1)
1991 } else if (strcmp(proto, "http") == 0 ||
1992 strcmp(proto, "git+http") == 0) {
1993 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1996 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2000 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2001 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2002 error = got_error_from_errno2("unveil",
2003 GOT_FETCH_PATH_SSH);
2007 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2012 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2013 port ? ":" : "", port ? port : "");
2015 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2016 server_path, verbosity);
2020 fpa.last_scaled_size[0] = '\0';
2021 fpa.last_p_indexed = -1;
2022 fpa.last_p_resolved = -1;
2023 fpa.verbosity = verbosity;
2024 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2025 remote->mirror_references, fetch_all_branches, &wanted_branches,
2026 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2027 fetch_progress, &fpa);
2031 if (list_refs_only) {
2032 error = list_remote_refs(&symrefs, &refs);
2036 if (pack_hash == NULL) {
2038 printf("Already up-to-date\n");
2039 } else if (verbosity >= 0) {
2040 error = got_object_id_str(&id_str, pack_hash);
2043 printf("\nFetched %s.pack\n", id_str);
2048 /* Update references provided with the pack file. */
2049 TAILQ_FOREACH(pe, &refs, entry) {
2050 const char *refname = pe->path;
2051 struct got_object_id *id = pe->data;
2052 struct got_reference *ref;
2053 char *remote_refname;
2055 if (is_wanted_ref(&wanted_refs, refname) &&
2056 !remote->mirror_references) {
2057 error = update_wanted_ref(refname, id,
2058 remote->name, verbosity, repo);
2064 if (remote->mirror_references ||
2065 strncmp("refs/tags/", refname, 10) == 0) {
2066 error = got_ref_open(&ref, repo, refname, 1);
2068 if (error->code != GOT_ERR_NOT_REF)
2070 error = create_ref(refname, id, verbosity,
2075 error = update_ref(ref, id, replace_tags,
2077 unlock_err = got_ref_unlock(ref);
2078 if (unlock_err && error == NULL)
2084 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2085 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2086 remote_name, refname + 11) == -1) {
2087 error = got_error_from_errno("asprintf");
2091 error = got_ref_open(&ref, repo, remote_refname, 1);
2093 if (error->code != GOT_ERR_NOT_REF)
2095 error = create_ref(remote_refname, id,
2100 error = update_ref(ref, id, replace_tags,
2102 unlock_err = got_ref_unlock(ref);
2103 if (unlock_err && error == NULL)
2110 /* Also create a local branch if none exists yet. */
2111 error = got_ref_open(&ref, repo, refname, 1);
2113 if (error->code != GOT_ERR_NOT_REF)
2115 error = create_ref(refname, id, verbosity,
2120 unlock_err = got_ref_unlock(ref);
2121 if (unlock_err && error == NULL)
2128 error = delete_missing_refs(&refs, &symrefs, remote,
2134 if (!remote->mirror_references) {
2135 /* Update remote HEAD reference if the server provided one. */
2136 TAILQ_FOREACH(pe, &symrefs, entry) {
2137 struct got_reference *target_ref;
2138 const char *refname = pe->path;
2139 const char *target = pe->data;
2140 char *remote_refname = NULL, *remote_target = NULL;
2142 if (strcmp(refname, GOT_REF_HEAD) != 0)
2145 if (strncmp("refs/heads/", target, 11) != 0)
2148 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2149 remote->name, refname) == -1) {
2150 error = got_error_from_errno("asprintf");
2153 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2154 remote->name, target + 11) == -1) {
2155 error = got_error_from_errno("asprintf");
2156 free(remote_refname);
2160 error = got_ref_open(&target_ref, repo, remote_target,
2163 free(remote_refname);
2164 free(remote_target);
2165 if (error->code == GOT_ERR_NOT_REF) {
2171 error = update_symref(remote_refname, target_ref,
2173 free(remote_refname);
2174 free(remote_target);
2175 got_ref_close(target_ref);
2182 if (kill(fetchpid, SIGTERM) == -1)
2183 error = got_error_from_errno("kill");
2184 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2185 error = got_error_from_errno("waitpid");
2187 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2188 error = got_error_from_errno("close");
2190 got_repo_close(repo);
2192 got_worktree_close(worktree);
2193 TAILQ_FOREACH(pe, &refs, entry) {
2194 free((void *)pe->path);
2197 got_pathlist_free(&refs);
2198 TAILQ_FOREACH(pe, &symrefs, entry) {
2199 free((void *)pe->path);
2202 got_pathlist_free(&symrefs);
2203 got_pathlist_free(&wanted_branches);
2204 got_pathlist_free(&wanted_refs);
2219 usage_checkout(void)
2221 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2222 "[-p prefix] repository-path [worktree-path]\n", getprogname());
2227 show_worktree_base_ref_warning(void)
2229 fprintf(stderr, "%s: warning: could not create a reference "
2230 "to the work tree's base commit; the commit could be "
2231 "garbage-collected by Git; making the repository "
2232 "writable and running 'got update' will prevent this\n",
2236 struct got_checkout_progress_arg {
2237 const char *worktree_path;
2238 int had_base_commit_ref_error;
2241 static const struct got_error *
2242 checkout_progress(void *arg, unsigned char status, const char *path)
2244 struct got_checkout_progress_arg *a = arg;
2246 /* Base commit bump happens silently. */
2247 if (status == GOT_STATUS_BUMP_BASE)
2250 if (status == GOT_STATUS_BASE_REF_ERR) {
2251 a->had_base_commit_ref_error = 1;
2255 while (path[0] == '/')
2258 printf("%c %s/%s\n", status, a->worktree_path, path);
2262 static const struct got_error *
2263 check_cancelled(void *arg)
2265 if (sigint_received || sigpipe_received)
2266 return got_error(GOT_ERR_CANCELLED);
2270 static const struct got_error *
2271 check_linear_ancestry(struct got_object_id *commit_id,
2272 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2273 struct got_repository *repo)
2275 const struct got_error *err = NULL;
2276 struct got_object_id *yca_id;
2278 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2279 commit_id, base_commit_id, repo, check_cancelled, NULL);
2284 return got_error(GOT_ERR_ANCESTRY);
2287 * Require a straight line of history between the target commit
2288 * and the work tree's base commit.
2290 * Non-linear situations such as this require a rebase:
2292 * (commit) D F (base_commit)
2300 * 'got update' only handles linear cases:
2301 * Update forwards in time: A (base/yca) - B - C - D (commit)
2302 * Update backwards in time: D (base) - C - B - A (commit/yca)
2304 if (allow_forwards_in_time_only) {
2305 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2306 return got_error(GOT_ERR_ANCESTRY);
2307 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2308 got_object_id_cmp(base_commit_id, yca_id) != 0)
2309 return got_error(GOT_ERR_ANCESTRY);
2315 static const struct got_error *
2316 check_same_branch(struct got_object_id *commit_id,
2317 struct got_reference *head_ref, struct got_object_id *yca_id,
2318 struct got_repository *repo)
2320 const struct got_error *err = NULL;
2321 struct got_commit_graph *graph = NULL;
2322 struct got_object_id *head_commit_id = NULL;
2323 int is_same_branch = 0;
2325 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2329 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2333 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2338 err = got_commit_graph_open(&graph, "/", 1);
2342 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2343 check_cancelled, NULL);
2348 struct got_object_id *id;
2349 err = got_commit_graph_iter_next(&id, graph, repo,
2350 check_cancelled, NULL);
2352 if (err->code == GOT_ERR_ITER_COMPLETED)
2358 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2360 if (got_object_id_cmp(id, commit_id) == 0) {
2368 got_commit_graph_close(graph);
2369 free(head_commit_id);
2370 if (!err && !is_same_branch)
2371 err = got_error(GOT_ERR_ANCESTRY);
2375 static const struct got_error *
2376 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2378 static char msg[512];
2379 const char *branch_name;
2381 if (got_ref_is_symbolic(ref))
2382 branch_name = got_ref_get_symref_target(ref);
2384 branch_name = got_ref_get_name(ref);
2386 if (strncmp("refs/heads/", branch_name, 11) == 0)
2389 snprintf(msg, sizeof(msg),
2390 "target commit is not contained in branch '%s'; "
2391 "the branch to use must be specified with -b; "
2392 "if necessary a new branch can be created for "
2393 "this commit with 'got branch -c %s BRANCH_NAME'",
2394 branch_name, commit_id_str);
2396 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2399 static const struct got_error *
2400 cmd_checkout(int argc, char *argv[])
2402 const struct got_error *error = NULL;
2403 struct got_repository *repo = NULL;
2404 struct got_reference *head_ref = NULL;
2405 struct got_worktree *worktree = NULL;
2406 char *repo_path = NULL;
2407 char *worktree_path = NULL;
2408 const char *path_prefix = "";
2409 const char *branch_name = GOT_REF_HEAD;
2410 char *commit_id_str = NULL;
2411 char *cwd = NULL, *path = NULL;
2412 int ch, same_path_prefix, allow_nonempty = 0;
2413 struct got_pathlist_head paths;
2414 struct got_checkout_progress_arg cpa;
2418 while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2421 branch_name = optarg;
2424 commit_id_str = strdup(optarg);
2425 if (commit_id_str == NULL)
2426 return got_error_from_errno("strdup");
2432 path_prefix = optarg;
2444 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2445 "unveil", NULL) == -1)
2449 char *base, *dotgit;
2450 repo_path = realpath(argv[0], NULL);
2451 if (repo_path == NULL)
2452 return got_error_from_errno2("realpath", argv[0]);
2453 cwd = getcwd(NULL, 0);
2455 error = got_error_from_errno("getcwd");
2459 path = strdup(path_prefix);
2461 path = strdup(repo_path);
2463 error = got_error_from_errno("strdup");
2466 base = basename(path);
2468 error = got_error_from_errno2("basename", path);
2471 dotgit = strstr(base, ".git");
2474 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2475 error = got_error_from_errno("asprintf");
2478 } else if (argc == 2) {
2479 repo_path = realpath(argv[0], NULL);
2480 if (repo_path == NULL) {
2481 error = got_error_from_errno2("realpath", argv[0]);
2484 worktree_path = realpath(argv[1], NULL);
2485 if (worktree_path == NULL) {
2486 if (errno != ENOENT) {
2487 error = got_error_from_errno2("realpath",
2491 worktree_path = strdup(argv[1]);
2492 if (worktree_path == NULL) {
2493 error = got_error_from_errno("strdup");
2500 got_path_strip_trailing_slashes(repo_path);
2501 got_path_strip_trailing_slashes(worktree_path);
2503 error = got_repo_open(&repo, repo_path, NULL);
2507 /* Pre-create work tree path for unveil(2) */
2508 error = got_path_mkdir(worktree_path);
2510 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2511 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2513 if (!allow_nonempty &&
2514 !got_path_dir_is_empty(worktree_path)) {
2515 error = got_error_path(worktree_path,
2516 GOT_ERR_DIR_NOT_EMPTY);
2521 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2525 error = got_ref_open(&head_ref, repo, branch_name, 0);
2529 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2530 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2533 error = got_worktree_open(&worktree, worktree_path);
2537 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2541 if (!same_path_prefix) {
2542 error = got_error(GOT_ERR_PATH_PREFIX);
2546 if (commit_id_str) {
2547 struct got_object_id *commit_id;
2548 error = got_repo_match_object_id(&commit_id, NULL,
2549 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2552 error = check_linear_ancestry(commit_id,
2553 got_worktree_get_base_commit_id(worktree), 0, repo);
2554 if (error != NULL) {
2556 if (error->code == GOT_ERR_ANCESTRY) {
2557 error = checkout_ancestry_error(
2558 head_ref, commit_id_str);
2562 error = check_same_branch(commit_id, head_ref, NULL, repo);
2564 if (error->code == GOT_ERR_ANCESTRY) {
2565 error = checkout_ancestry_error(
2566 head_ref, commit_id_str);
2570 error = got_worktree_set_base_commit_id(worktree, repo,
2577 error = got_pathlist_append(&paths, "", NULL);
2580 cpa.worktree_path = worktree_path;
2581 cpa.had_base_commit_ref_error = 0;
2582 error = got_worktree_checkout_files(worktree, &paths, repo,
2583 checkout_progress, &cpa, check_cancelled, NULL);
2587 printf("Now shut up and hack\n");
2588 if (cpa.had_base_commit_ref_error)
2589 show_worktree_base_ref_warning();
2591 got_pathlist_free(&paths);
2592 free(commit_id_str);
2594 free(worktree_path);
2600 struct got_update_progress_arg {
2608 print_update_progress_stats(struct got_update_progress_arg *upa)
2610 if (!upa->did_something)
2613 if (upa->conflicts > 0)
2614 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2615 if (upa->obstructed > 0)
2616 printf("File paths obstructed by a non-regular file: %d\n",
2618 if (upa->not_updated > 0)
2619 printf("Files not updated because of existing merge "
2620 "conflicts: %d\n", upa->not_updated);
2626 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2631 static const struct got_error *
2632 update_progress(void *arg, unsigned char status, const char *path)
2634 struct got_update_progress_arg *upa = arg;
2636 if (status == GOT_STATUS_EXISTS ||
2637 status == GOT_STATUS_BASE_REF_ERR)
2640 upa->did_something = 1;
2642 /* Base commit bump happens silently. */
2643 if (status == GOT_STATUS_BUMP_BASE)
2646 if (status == GOT_STATUS_CONFLICT)
2648 if (status == GOT_STATUS_OBSTRUCTED)
2650 if (status == GOT_STATUS_CANNOT_UPDATE)
2653 while (path[0] == '/')
2655 printf("%c %s\n", status, path);
2659 static const struct got_error *
2660 switch_head_ref(struct got_reference *head_ref,
2661 struct got_object_id *commit_id, struct got_worktree *worktree,
2662 struct got_repository *repo)
2664 const struct got_error *err = NULL;
2666 int ref_has_moved = 0;
2668 /* Trivial case: switching between two different references. */
2669 if (strcmp(got_ref_get_name(head_ref),
2670 got_worktree_get_head_ref_name(worktree)) != 0) {
2671 printf("Switching work tree from %s to %s\n",
2672 got_worktree_get_head_ref_name(worktree),
2673 got_ref_get_name(head_ref));
2674 return got_worktree_set_head_ref(worktree, head_ref);
2677 err = check_linear_ancestry(commit_id,
2678 got_worktree_get_base_commit_id(worktree), 0, repo);
2680 if (err->code != GOT_ERR_ANCESTRY)
2687 /* Switching to a rebased branch with the same reference name. */
2688 err = got_object_id_str(&base_id_str,
2689 got_worktree_get_base_commit_id(worktree));
2692 printf("Reference %s now points at a different branch\n",
2693 got_worktree_get_head_ref_name(worktree));
2694 printf("Switching work tree from %s to %s\n", base_id_str,
2695 got_worktree_get_head_ref_name(worktree));
2699 static const struct got_error *
2700 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2702 const struct got_error *err;
2705 err = got_worktree_rebase_in_progress(&in_progress, worktree);
2709 return got_error(GOT_ERR_REBASING);
2711 err = got_worktree_histedit_in_progress(&in_progress, worktree);
2715 return got_error(GOT_ERR_HISTEDIT_BUSY);
2720 static const struct got_error *
2721 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2722 char *argv[], struct got_worktree *worktree)
2724 const struct got_error *err = NULL;
2731 return got_error_from_errno("strdup");
2732 return got_pathlist_append(paths, path, NULL);
2735 for (i = 0; i < argc; i++) {
2736 err = got_worktree_resolve_path(&path, worktree, argv[i]);
2739 err = got_pathlist_append(paths, path, NULL);
2749 static const struct got_error *
2750 wrap_not_worktree_error(const struct got_error *orig_err,
2751 const char *cmdname, const char *path)
2753 const struct got_error *err;
2754 struct got_repository *repo;
2755 static char msg[512];
2757 err = got_repo_open(&repo, path, NULL);
2761 snprintf(msg, sizeof(msg),
2762 "'got %s' needs a work tree in addition to a git repository\n"
2763 "Work trees can be checked out from this Git repository with "
2765 "The got(1) manual page contains more information.", cmdname);
2766 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2767 got_repo_close(repo);
2771 static const struct got_error *
2772 cmd_update(int argc, char *argv[])
2774 const struct got_error *error = NULL;
2775 struct got_repository *repo = NULL;
2776 struct got_worktree *worktree = NULL;
2777 char *worktree_path = NULL;
2778 struct got_object_id *commit_id = NULL;
2779 char *commit_id_str = NULL;
2780 const char *branch_name = NULL;
2781 struct got_reference *head_ref = NULL;
2782 struct got_pathlist_head paths;
2783 struct got_pathlist_entry *pe;
2785 struct got_update_progress_arg upa;
2789 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2792 branch_name = optarg;
2795 commit_id_str = strdup(optarg);
2796 if (commit_id_str == NULL)
2797 return got_error_from_errno("strdup");
2809 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2810 "unveil", NULL) == -1)
2813 worktree_path = getcwd(NULL, 0);
2814 if (worktree_path == NULL) {
2815 error = got_error_from_errno("getcwd");
2818 error = got_worktree_open(&worktree, worktree_path);
2820 if (error->code == GOT_ERR_NOT_WORKTREE)
2821 error = wrap_not_worktree_error(error, "update",
2826 error = check_rebase_or_histedit_in_progress(worktree);
2830 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
2835 error = apply_unveil(got_repo_get_path(repo), 0,
2836 got_worktree_get_root_path(worktree));
2840 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
2844 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
2845 got_worktree_get_head_ref_name(worktree), 0);
2848 if (commit_id_str == NULL) {
2849 error = got_ref_resolve(&commit_id, repo, head_ref);
2852 error = got_object_id_str(&commit_id_str, commit_id);
2856 error = got_repo_match_object_id(&commit_id, NULL,
2857 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2858 free(commit_id_str);
2859 commit_id_str = NULL;
2862 error = got_object_id_str(&commit_id_str, commit_id);
2868 struct got_object_id *head_commit_id;
2869 TAILQ_FOREACH(pe, &paths, entry) {
2870 if (pe->path_len == 0)
2872 error = got_error_msg(GOT_ERR_BAD_PATH,
2873 "switching between branches requires that "
2874 "the entire work tree gets updated");
2877 error = got_ref_resolve(&head_commit_id, repo, head_ref);
2880 error = check_linear_ancestry(commit_id, head_commit_id, 0,
2882 free(head_commit_id);
2885 error = check_same_branch(commit_id, head_ref, NULL, repo);
2888 error = switch_head_ref(head_ref, commit_id, worktree, repo);
2892 error = check_linear_ancestry(commit_id,
2893 got_worktree_get_base_commit_id(worktree), 0, repo);
2894 if (error != NULL) {
2895 if (error->code == GOT_ERR_ANCESTRY)
2896 error = got_error(GOT_ERR_BRANCH_MOVED);
2899 error = check_same_branch(commit_id, head_ref, NULL, repo);
2904 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
2906 error = got_worktree_set_base_commit_id(worktree, repo,
2912 memset(&upa, 0, sizeof(upa));
2913 error = got_worktree_checkout_files(worktree, &paths, repo,
2914 update_progress, &upa, check_cancelled, NULL);
2918 if (upa.did_something)
2919 printf("Updated to commit %s\n", commit_id_str);
2921 printf("Already up-to-date\n");
2922 print_update_progress_stats(&upa);
2924 free(worktree_path);
2925 TAILQ_FOREACH(pe, &paths, entry)
2926 free((char *)pe->path);
2927 got_pathlist_free(&paths);
2929 free(commit_id_str);
2933 static const struct got_error *
2934 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
2935 const char *path, int diff_context, int ignore_whitespace,
2936 struct got_repository *repo)
2938 const struct got_error *err = NULL;
2939 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
2942 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
2947 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
2951 while (path[0] == '/')
2953 err = got_diff_blob(blob1, blob2, path, path, diff_context,
2954 ignore_whitespace, stdout);
2957 got_object_blob_close(blob1);
2958 got_object_blob_close(blob2);
2962 static const struct got_error *
2963 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
2964 const char *path, int diff_context, int ignore_whitespace,
2965 struct got_repository *repo)
2967 const struct got_error *err = NULL;
2968 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
2969 struct got_diff_blob_output_unidiff_arg arg;
2972 err = got_object_open_as_tree(&tree1, repo, tree_id1);
2977 err = got_object_open_as_tree(&tree2, repo, tree_id2);
2981 arg.diff_context = diff_context;
2982 arg.ignore_whitespace = ignore_whitespace;
2983 arg.outfile = stdout;
2984 while (path[0] == '/')
2986 err = got_diff_tree(tree1, tree2, path, path, repo,
2987 got_diff_blob_output_unidiff, &arg, 1);
2990 got_object_tree_close(tree1);
2992 got_object_tree_close(tree2);
2996 static const struct got_error *
2997 get_changed_paths(struct got_pathlist_head *paths,
2998 struct got_commit_object *commit, struct got_repository *repo)
3000 const struct got_error *err = NULL;
3001 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3002 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3003 struct got_object_qid *qid;
3005 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3007 struct got_commit_object *pcommit;
3008 err = got_object_open_as_commit(&pcommit, repo,
3013 tree_id1 = got_object_commit_get_tree_id(pcommit);
3014 got_object_commit_close(pcommit);
3019 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3024 tree_id2 = got_object_commit_get_tree_id(commit);
3025 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3029 err = got_diff_tree(tree1, tree2, "", "", repo,
3030 got_diff_tree_collect_changed_paths, paths, 0);
3033 got_object_tree_close(tree1);
3035 got_object_tree_close(tree2);
3039 static const struct got_error *
3040 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3041 const char *path, int diff_context, struct got_repository *repo)
3043 const struct got_error *err = NULL;
3044 struct got_commit_object *pcommit = NULL;
3045 char *id_str1 = NULL, *id_str2 = NULL;
3046 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3047 struct got_object_qid *qid;
3049 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3051 err = got_object_open_as_commit(&pcommit, repo,
3057 if (path && path[0] != '\0') {
3059 err = got_object_id_by_path(&obj_id2, repo, id, path);
3062 err = got_object_id_str(&id_str2, obj_id2);
3068 err = got_object_id_by_path(&obj_id1, repo,
3071 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3076 err = got_object_id_str(&id_str1, obj_id1);
3083 err = got_object_get_type(&obj_type, repo, obj_id2);
3088 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3090 case GOT_OBJ_TYPE_BLOB:
3091 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3094 case GOT_OBJ_TYPE_TREE:
3095 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3099 err = got_error(GOT_ERR_OBJ_TYPE);
3105 obj_id2 = got_object_commit_get_tree_id(commit);
3106 err = got_object_id_str(&id_str2, obj_id2);
3109 obj_id1 = got_object_commit_get_tree_id(pcommit);
3110 err = got_object_id_str(&id_str1, obj_id1);
3113 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3114 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
3120 got_object_commit_close(pcommit);
3125 get_datestr(time_t *time, char *datebuf)
3127 struct tm mytm, *tm;
3130 tm = gmtime_r(time, &mytm);
3133 s = asctime_r(tm, datebuf);
3136 p = strchr(s, '\n');
3142 static const struct got_error *
3143 match_logmsg(int *have_match, struct got_object_id *id,
3144 struct got_commit_object *commit, regex_t *regex)
3146 const struct got_error *err = NULL;
3147 regmatch_t regmatch;
3148 char *id_str = NULL, *logmsg = NULL;
3152 err = got_object_id_str(&id_str, id);
3156 err = got_object_commit_get_logmsg(&logmsg, commit);
3160 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3169 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3172 regmatch_t regmatch;
3173 struct got_pathlist_entry *pe;
3177 TAILQ_FOREACH(pe, changed_paths, entry) {
3178 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3185 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3187 static const struct got_error *
3188 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3189 struct got_repository *repo, const char *path,
3190 struct got_pathlist_head *changed_paths, int show_patch,
3191 int diff_context, struct got_reflist_head *refs)
3193 const struct got_error *err = NULL;
3194 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3196 time_t committer_time;
3197 const char *author, *committer;
3198 char *refs_str = NULL;
3199 struct got_reflist_entry *re;
3201 SIMPLEQ_FOREACH(re, refs, entry) {
3204 struct got_tag_object *tag = NULL;
3205 struct got_object_id *ref_id;
3208 name = got_ref_get_name(re->ref);
3209 if (strcmp(name, GOT_REF_HEAD) == 0)
3211 if (strncmp(name, "refs/", 5) == 0)
3213 if (strncmp(name, "got/", 4) == 0)
3215 if (strncmp(name, "heads/", 6) == 0)
3217 if (strncmp(name, "remotes/", 8) == 0) {
3219 s = strstr(name, "/" GOT_REF_HEAD);
3220 if (s != NULL && s[strlen(s)] == '\0')
3223 err = got_ref_resolve(&ref_id, repo, re->ref);
3226 if (strncmp(name, "tags/", 5) == 0) {
3227 err = got_object_open_as_tag(&tag, repo, ref_id);
3229 if (err->code != GOT_ERR_OBJ_TYPE) {
3233 /* Ref points at something other than a tag. */
3238 cmp = got_object_id_cmp(tag ?
3239 got_object_tag_get_object_id(tag) : ref_id, id);
3242 got_object_tag_close(tag);
3246 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3248 err = got_error_from_errno("asprintf");
3254 err = got_object_id_str(&id_str, id);
3258 printf(GOT_COMMIT_SEP_STR);
3259 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3260 refs_str ? refs_str : "", refs_str ? ")" : "");
3265 printf("from: %s\n", got_object_commit_get_author(commit));
3266 committer_time = got_object_commit_get_committer_time(commit);
3267 datestr = get_datestr(&committer_time, datebuf);
3269 printf("date: %s UTC\n", datestr);
3270 author = got_object_commit_get_author(commit);
3271 committer = got_object_commit_get_committer(commit);
3272 if (strcmp(author, committer) != 0)
3273 printf("via: %s\n", committer);
3274 if (got_object_commit_get_nparents(commit) > 1) {
3275 const struct got_object_id_queue *parent_ids;
3276 struct got_object_qid *qid;
3278 parent_ids = got_object_commit_get_parent_ids(commit);
3279 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3280 err = got_object_id_str(&id_str, qid->id);
3283 printf("parent %d: %s\n", n++, id_str);
3288 err = got_object_commit_get_logmsg(&logmsg0, commit);
3294 line = strsep(&logmsg, "\n");
3296 printf(" %s\n", line);
3300 if (changed_paths) {
3301 struct got_pathlist_entry *pe;
3302 TAILQ_FOREACH(pe, changed_paths, entry) {
3303 struct got_diff_changed_path *cp = pe->data;
3304 printf(" %c %s\n", cp->status, pe->path);
3309 err = print_patch(commit, id, path, diff_context, repo);
3314 if (fflush(stdout) != 0 && err == NULL)
3315 err = got_error_from_errno("fflush");
3319 static const struct got_error *
3320 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3321 struct got_repository *repo, const char *path, int show_changed_paths,
3322 int show_patch, const char *search_pattern, int diff_context, int limit,
3323 int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3325 const struct got_error *err;
3326 struct got_commit_graph *graph;
3329 struct got_object_id_queue reversed_commits;
3330 struct got_object_qid *qid;
3331 struct got_commit_object *commit;
3332 struct got_pathlist_head changed_paths;
3333 struct got_pathlist_entry *pe;
3335 SIMPLEQ_INIT(&reversed_commits);
3336 TAILQ_INIT(&changed_paths);
3338 if (search_pattern && regcomp(®ex, search_pattern,
3339 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3340 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3342 err = got_commit_graph_open(&graph, path, !log_branches);
3345 err = got_commit_graph_iter_start(graph, root_id, repo,
3346 check_cancelled, NULL);
3350 struct got_object_id *id;
3352 if (sigint_received || sigpipe_received)
3355 err = got_commit_graph_iter_next(&id, graph, repo,
3356 check_cancelled, NULL);
3358 if (err->code == GOT_ERR_ITER_COMPLETED)
3365 err = got_object_open_as_commit(&commit, repo, id);
3369 if (show_changed_paths && !reverse_display_order) {
3370 err = get_changed_paths(&changed_paths, commit, repo);
3375 if (search_pattern) {
3376 err = match_logmsg(&have_match, id, commit, ®ex);
3378 got_object_commit_close(commit);
3381 if (have_match == 0 && show_changed_paths)
3382 match_changed_paths(&have_match,
3383 &changed_paths, ®ex);
3384 if (have_match == 0) {
3385 got_object_commit_close(commit);
3386 TAILQ_FOREACH(pe, &changed_paths, entry) {
3387 free((char *)pe->path);
3390 got_pathlist_free(&changed_paths);
3395 if (reverse_display_order) {
3396 err = got_object_qid_alloc(&qid, id);
3399 SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3400 got_object_commit_close(commit);
3402 err = print_commit(commit, id, repo, path,
3403 show_changed_paths ? &changed_paths : NULL,
3404 show_patch, diff_context, refs);
3405 got_object_commit_close(commit);
3409 if ((limit && --limit == 0) ||
3410 (end_id && got_object_id_cmp(id, end_id) == 0))
3413 TAILQ_FOREACH(pe, &changed_paths, entry) {
3414 free((char *)pe->path);
3417 got_pathlist_free(&changed_paths);
3419 if (reverse_display_order) {
3420 SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3421 err = got_object_open_as_commit(&commit, repo, qid->id);
3424 if (show_changed_paths) {
3425 err = get_changed_paths(&changed_paths,
3430 err = print_commit(commit, qid->id, repo, path,
3431 show_changed_paths ? &changed_paths : NULL,
3432 show_patch, diff_context, refs);
3433 got_object_commit_close(commit);
3436 TAILQ_FOREACH(pe, &changed_paths, entry) {
3437 free((char *)pe->path);
3440 got_pathlist_free(&changed_paths);
3444 while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3445 qid = SIMPLEQ_FIRST(&reversed_commits);
3446 SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3447 got_object_qid_free(qid);
3449 TAILQ_FOREACH(pe, &changed_paths, entry) {
3450 free((char *)pe->path);
3453 got_pathlist_free(&changed_paths);
3456 got_commit_graph_close(graph);
3463 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3464 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3465 "[-R] [path]\n", getprogname());
3470 get_default_log_limit(void)
3472 const char *got_default_log_limit;
3476 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3477 if (got_default_log_limit == NULL)
3479 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3485 static const struct got_error *
3486 resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3487 struct got_repository *repo)
3489 const struct got_error *err = NULL;
3490 struct got_reference *ref;
3494 err = got_ref_open(&ref, repo, commit_arg, 0);
3497 err = got_ref_resolve(id, repo, ref);
3501 err = got_object_get_type(&obj_type, repo, *id);
3504 if (obj_type == GOT_OBJ_TYPE_TAG) {
3505 struct got_tag_object *tag;
3506 err = got_object_open_as_tag(&tag, repo, *id);
3509 if (got_object_tag_get_object_type(tag) !=
3510 GOT_OBJ_TYPE_COMMIT) {
3511 got_object_tag_close(tag);
3512 return got_error(GOT_ERR_OBJ_TYPE);
3515 *id = got_object_id_dup(
3516 got_object_tag_get_object_id(tag));
3518 err = got_error_from_errno(
3519 "got_object_id_dup");
3520 got_object_tag_close(tag);
3523 } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3524 return got_error(GOT_ERR_OBJ_TYPE);
3526 err = got_repo_match_object_id_prefix(id, commit_arg,
3527 GOT_OBJ_TYPE_COMMIT, repo);
3533 static const struct got_error *
3534 cmd_log(int argc, char *argv[])
3536 const struct got_error *error;
3537 struct got_repository *repo = NULL;
3538 struct got_worktree *worktree = NULL;
3539 struct got_object_id *start_id = NULL, *end_id = NULL;
3540 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3541 const char *start_commit = NULL, *end_commit = NULL;
3542 const char *search_pattern = NULL;
3543 int diff_context = -1, ch;
3544 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3545 int reverse_display_order = 0;
3547 struct got_reflist_head refs;
3549 SIMPLEQ_INIT(&refs);
3552 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3558 limit = get_default_log_limit();
3560 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3566 show_changed_paths = 1;
3569 start_commit = optarg;
3572 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3575 err(1, "-C option %s", errstr);
3578 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3580 err(1, "-l option %s", errstr);
3586 repo_path = realpath(optarg, NULL);
3587 if (repo_path == NULL)
3588 return got_error_from_errno2("realpath",
3590 got_path_strip_trailing_slashes(repo_path);
3593 reverse_display_order = 1;
3596 search_pattern = optarg;
3599 end_commit = optarg;
3610 if (diff_context == -1)
3612 else if (!show_patch)
3613 errx(1, "-C requires -p");
3615 cwd = getcwd(NULL, 0);
3617 error = got_error_from_errno("getcwd");
3621 if (repo_path == NULL) {
3622 error = got_worktree_open(&worktree, cwd);
3623 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3631 error = got_error_from_errno("strdup");
3634 } else if (argc == 1) {
3636 error = got_worktree_resolve_path(&path, worktree,
3641 path = strdup(argv[0]);
3643 error = got_error_from_errno("strdup");
3650 if (repo_path == NULL) {
3651 repo_path = worktree ?
3652 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3654 if (repo_path == NULL) {
3655 error = got_error_from_errno("strdup");
3659 error = got_repo_open(&repo, repo_path, NULL);
3663 error = apply_unveil(got_repo_get_path(repo), 1,
3664 worktree ? got_worktree_get_root_path(worktree) : NULL);
3668 if (start_commit == NULL) {
3669 struct got_reference *head_ref;
3670 struct got_commit_object *commit = NULL;
3671 error = got_ref_open(&head_ref, repo,
3672 worktree ? got_worktree_get_head_ref_name(worktree)
3676 error = got_ref_resolve(&start_id, repo, head_ref);
3677 got_ref_close(head_ref);
3680 error = got_object_open_as_commit(&commit, repo,
3684 got_object_commit_close(commit);
3686 error = resolve_commit_arg(&start_id, start_commit, repo);
3690 if (end_commit != NULL) {
3691 error = resolve_commit_arg(&end_id, end_commit, repo);
3697 const char *prefix = got_worktree_get_path_prefix(worktree);
3699 if (asprintf(&p, "%s%s%s", prefix,
3700 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3701 error = got_error_from_errno("asprintf");
3704 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3707 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3712 path = in_repo_path;
3715 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3719 error = print_commits(start_id, end_id, repo, path, show_changed_paths,
3720 show_patch, search_pattern, diff_context, limit, log_branches,
3721 reverse_display_order, &refs);
3727 got_worktree_close(worktree);
3729 const struct got_error *repo_error;
3730 repo_error = got_repo_close(repo);
3734 got_ref_list_free(&refs);
3741 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3742 "[-w] [object1 object2 | path]\n", getprogname());
3746 struct print_diff_arg {
3747 struct got_repository *repo;
3748 struct got_worktree *worktree;
3753 int ignore_whitespace;
3757 * Create a file which contains the target path of a symlink so we can feed
3758 * it as content to the diff engine.
3760 static const struct got_error *
3761 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3762 const char *abspath)
3764 const struct got_error *err = NULL;
3765 char target_path[PATH_MAX];
3766 ssize_t target_len, outlen;
3771 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3772 if (target_len == -1)
3773 return got_error_from_errno2("readlinkat", abspath);
3775 target_len = readlink(abspath, target_path, PATH_MAX);
3776 if (target_len == -1)
3777 return got_error_from_errno2("readlink", abspath);
3780 *fd = got_opentempfd();
3782 return got_error_from_errno("got_opentempfd");
3784 outlen = write(*fd, target_path, target_len);
3786 err = got_error_from_errno("got_opentempfd");
3790 if (lseek(*fd, 0, SEEK_SET) == -1) {
3791 err = got_error_from_errno2("lseek", abspath);
3802 static const struct got_error *
3803 print_diff(void *arg, unsigned char status, unsigned char staged_status,
3804 const char *path, struct got_object_id *blob_id,
3805 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3806 int dirfd, const char *de_name)
3808 struct print_diff_arg *a = arg;
3809 const struct got_error *err = NULL;
3810 struct got_blob_object *blob1 = NULL;
3813 char *abspath = NULL, *label1 = NULL;
3816 if (a->diff_staged) {
3817 if (staged_status != GOT_STATUS_MODIFY &&
3818 staged_status != GOT_STATUS_ADD &&
3819 staged_status != GOT_STATUS_DELETE)
3822 if (staged_status == GOT_STATUS_DELETE)
3824 if (status == GOT_STATUS_NONEXISTENT)
3825 return got_error_set_errno(ENOENT, path);
3826 if (status != GOT_STATUS_MODIFY &&
3827 status != GOT_STATUS_ADD &&
3828 status != GOT_STATUS_DELETE &&
3829 status != GOT_STATUS_CONFLICT)
3833 if (!a->header_shown) {
3834 printf("diff %s %s%s\n", a->id_str,
3835 got_worktree_get_root_path(a->worktree),
3836 a->diff_staged ? " (staged changes)" : "");
3837 a->header_shown = 1;
3840 if (a->diff_staged) {
3841 const char *label1 = NULL, *label2 = NULL;
3842 switch (staged_status) {
3843 case GOT_STATUS_MODIFY:
3847 case GOT_STATUS_ADD:
3850 case GOT_STATUS_DELETE:
3854 return got_error(GOT_ERR_FILE_STATUS);
3856 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3857 label1, label2, a->diff_context, a->ignore_whitespace,
3861 if (staged_status == GOT_STATUS_ADD ||
3862 staged_status == GOT_STATUS_MODIFY) {
3864 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3868 err = got_object_id_str(&id_str, staged_blob_id);
3871 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3872 err = got_error_from_errno("asprintf");
3877 } else if (status != GOT_STATUS_ADD) {
3878 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3883 if (status != GOT_STATUS_DELETE) {
3884 if (asprintf(&abspath, "%s/%s",
3885 got_worktree_get_root_path(a->worktree), path) == -1) {
3886 err = got_error_from_errno("asprintf");
3891 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3893 if (errno != ELOOP) {
3894 err = got_error_from_errno2("openat",
3898 err = get_symlink_target_file(&fd, dirfd,
3904 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3906 if (errno != ELOOP) {
3907 err = got_error_from_errno2("open",
3911 err = get_symlink_target_file(&fd, dirfd,
3917 if (fstat(fd, &sb) == -1) {
3918 err = got_error_from_errno2("fstat", abspath);
3921 f2 = fdopen(fd, "r");
3923 err = got_error_from_errno2("fdopen", abspath);
3930 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3931 a->diff_context, a->ignore_whitespace, stdout);
3934 got_object_blob_close(blob1);
3935 if (f2 && fclose(f2) == EOF && err == NULL)
3936 err = got_error_from_errno("fclose");
3937 if (fd != -1 && close(fd) == -1 && err == NULL)
3938 err = got_error_from_errno("close");
3943 static const struct got_error *
3944 cmd_diff(int argc, char *argv[])
3946 const struct got_error *error;
3947 struct got_repository *repo = NULL;
3948 struct got_worktree *worktree = NULL;
3949 char *cwd = NULL, *repo_path = NULL;
3950 struct got_object_id *id1 = NULL, *id2 = NULL;
3951 const char *id_str1 = NULL, *id_str2 = NULL;
3952 char *label1 = NULL, *label2 = NULL;
3954 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3959 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3964 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3967 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3970 err(1, "-C option %s", errstr);
3973 repo_path = realpath(optarg, NULL);
3974 if (repo_path == NULL)
3975 return got_error_from_errno2("realpath",
3977 got_path_strip_trailing_slashes(repo_path);
3983 ignore_whitespace = 1;
3994 cwd = getcwd(NULL, 0);
3996 error = got_error_from_errno("getcwd");
4002 "-r option can't be used when diffing a work tree");
4003 error = got_worktree_open(&worktree, cwd);
4005 if (error->code == GOT_ERR_NOT_WORKTREE)
4006 error = wrap_not_worktree_error(error, "diff",
4010 repo_path = strdup(got_worktree_get_repo_path(worktree));
4011 if (repo_path == NULL) {
4012 error = got_error_from_errno("strdup");
4016 error = got_worktree_resolve_path(&path, worktree,
4023 error = got_error_from_errno("strdup");
4027 } else if (argc == 2) {
4029 errx(1, "-s option can't be used when diffing "
4030 "objects in repository");
4033 if (repo_path == NULL) {
4034 error = got_worktree_open(&worktree, cwd);
4035 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4039 got_worktree_get_repo_path(worktree));
4040 if (repo_path == NULL) {
4041 error = got_error_from_errno("strdup");
4045 repo_path = strdup(cwd);
4046 if (repo_path == NULL) {
4047 error = got_error_from_errno("strdup");
4055 error = got_repo_open(&repo, repo_path, NULL);
4060 error = apply_unveil(got_repo_get_path(repo), 1,
4061 worktree ? got_worktree_get_root_path(worktree) : NULL);
4066 struct print_diff_arg arg;
4067 struct got_pathlist_head paths;
4072 error = got_object_id_str(&id_str,
4073 got_worktree_get_base_commit_id(worktree));
4077 arg.worktree = worktree;
4078 arg.diff_context = diff_context;
4079 arg.id_str = id_str;
4080 arg.header_shown = 0;
4081 arg.diff_staged = diff_staged;
4082 arg.ignore_whitespace = ignore_whitespace;
4084 error = got_pathlist_append(&paths, path, NULL);
4088 error = got_worktree_status(worktree, &paths, repo, print_diff,
4089 &arg, check_cancelled, NULL);
4091 got_pathlist_free(&paths);
4095 error = got_repo_match_object_id(&id1, &label1, id_str1,
4096 GOT_OBJ_TYPE_ANY, 1, repo);
4100 error = got_repo_match_object_id(&id2, &label2, id_str2,
4101 GOT_OBJ_TYPE_ANY, 1, repo);
4105 error = got_object_get_type(&type1, repo, id1);
4109 error = got_object_get_type(&type2, repo, id2);
4113 if (type1 != type2) {
4114 error = got_error(GOT_ERR_OBJ_TYPE);
4119 case GOT_OBJ_TYPE_BLOB:
4120 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
4121 diff_context, ignore_whitespace, repo, stdout);
4123 case GOT_OBJ_TYPE_TREE:
4124 error = got_diff_objects_as_trees(id1, id2, "", "",
4125 diff_context, ignore_whitespace, repo, stdout);
4127 case GOT_OBJ_TYPE_COMMIT:
4128 printf("diff %s %s\n", label1, label2);
4129 error = got_diff_objects_as_commits(id1, id2, diff_context,
4130 ignore_whitespace, repo, stdout);
4133 error = got_error(GOT_ERR_OBJ_TYPE);
4142 got_worktree_close(worktree);
4144 const struct got_error *repo_error;
4145 repo_error = got_repo_close(repo);
4156 "usage: %s blame [-c commit] [-r repository-path] path\n",
4165 char datebuf[11]; /* YYYY-MM-DD + NUL */
4168 struct blame_cb_args {
4169 struct blame_line *lines;
4173 off_t *line_offsets;
4175 struct got_repository *repo;
4178 static const struct got_error *
4179 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4181 const struct got_error *err = NULL;
4182 struct blame_cb_args *a = arg;
4183 struct blame_line *bline;
4185 size_t linesize = 0;
4186 struct got_commit_object *commit = NULL;
4189 time_t committer_time;
4191 if (nlines != a->nlines ||
4192 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4193 return got_error(GOT_ERR_RANGE);
4195 if (sigint_received)
4196 return got_error(GOT_ERR_ITER_COMPLETED);
4199 return NULL; /* no change in this commit */
4201 /* Annotate this line. */
4202 bline = &a->lines[lineno - 1];
4203 if (bline->annotated)
4205 err = got_object_id_str(&bline->id_str, id);
4209 err = got_object_open_as_commit(&commit, a->repo, id);
4213 bline->committer = strdup(got_object_commit_get_committer(commit));
4214 if (bline->committer == NULL) {
4215 err = got_error_from_errno("strdup");
4219 committer_time = got_object_commit_get_committer_time(commit);
4220 if (localtime_r(&committer_time, &tm) == NULL)
4221 return got_error_from_errno("localtime_r");
4222 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4223 &tm) >= sizeof(bline->datebuf)) {
4224 err = got_error(GOT_ERR_NO_SPACE);
4227 bline->annotated = 1;
4229 /* Print lines annotated so far. */
4230 bline = &a->lines[a->lineno_cur - 1];
4231 if (!bline->annotated)
4234 offset = a->line_offsets[a->lineno_cur - 1];
4235 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4236 err = got_error_from_errno("fseeko");
4240 while (bline->annotated) {
4241 char *smallerthan, *at, *nl, *committer;
4244 if (getline(&line, &linesize, a->f) == -1) {
4246 err = got_error_from_errno("getline");
4250 committer = bline->committer;
4251 smallerthan = strchr(committer, '<');
4252 if (smallerthan && smallerthan[1] != '\0')
4253 committer = smallerthan + 1;
4254 at = strchr(committer, '@');
4257 len = strlen(committer);
4259 committer[8] = '\0';
4261 nl = strchr(line, '\n');
4264 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4265 bline->id_str, bline->datebuf, committer, line);
4268 bline = &a->lines[a->lineno_cur - 1];
4272 got_object_commit_close(commit);
4277 static const struct got_error *
4278 cmd_blame(int argc, char *argv[])
4280 const struct got_error *error;
4281 struct got_repository *repo = NULL;
4282 struct got_worktree *worktree = NULL;
4283 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4284 char *link_target = NULL;
4285 struct got_object_id *obj_id = NULL;
4286 struct got_object_id *commit_id = NULL;
4287 struct got_blob_object *blob = NULL;
4288 char *commit_id_str = NULL;
4289 struct blame_cb_args bca;
4290 int ch, obj_type, i;
4293 memset(&bca, 0, sizeof(bca));
4296 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4301 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4304 commit_id_str = optarg;
4307 repo_path = realpath(optarg, NULL);
4308 if (repo_path == NULL)
4309 return got_error_from_errno2("realpath",
4311 got_path_strip_trailing_slashes(repo_path);
4327 cwd = getcwd(NULL, 0);
4329 error = got_error_from_errno("getcwd");
4332 if (repo_path == NULL) {
4333 error = got_worktree_open(&worktree, cwd);
4334 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4340 strdup(got_worktree_get_repo_path(worktree));
4341 if (repo_path == NULL) {
4342 error = got_error_from_errno("strdup");
4347 repo_path = strdup(cwd);
4348 if (repo_path == NULL) {
4349 error = got_error_from_errno("strdup");
4355 error = got_repo_open(&repo, repo_path, NULL);
4359 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4364 const char *prefix = got_worktree_get_path_prefix(worktree);
4365 char *p, *worktree_subdir = cwd +
4366 strlen(got_worktree_get_root_path(worktree));
4367 if (asprintf(&p, "%s%s%s%s%s",
4368 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4369 worktree_subdir, worktree_subdir[0] ? "/" : "",
4371 error = got_error_from_errno("asprintf");
4374 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4377 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4382 if (commit_id_str == NULL) {
4383 struct got_reference *head_ref;
4384 error = got_ref_open(&head_ref, repo, worktree ?
4385 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4388 error = got_ref_resolve(&commit_id, repo, head_ref);
4389 got_ref_close(head_ref);
4393 error = got_repo_match_object_id(&commit_id, NULL,
4394 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4399 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4404 error = got_object_id_by_path(&obj_id, repo, commit_id,
4405 link_target ? link_target : in_repo_path);
4409 error = got_object_get_type(&obj_type, repo, obj_id);
4413 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4414 error = got_error_path(link_target ? link_target : in_repo_path,
4419 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4422 bca.f = got_opentemp();
4423 if (bca.f == NULL) {
4424 error = got_error_from_errno("got_opentemp");
4427 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4428 &bca.line_offsets, bca.f, blob);
4429 if (error || bca.nlines == 0)
4432 /* Don't include \n at EOF in the blame line count. */
4433 if (bca.line_offsets[bca.nlines - 1] == filesize)
4436 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4437 if (bca.lines == NULL) {
4438 error = got_error_from_errno("calloc");
4442 bca.nlines_prec = 0;
4450 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4451 repo, blame_cb, &bca, check_cancelled, NULL);
4460 got_object_blob_close(blob);
4462 got_worktree_close(worktree);
4464 const struct got_error *repo_error;
4465 repo_error = got_repo_close(repo);
4470 for (i = 0; i < bca.nlines; i++) {
4471 struct blame_line *bline = &bca.lines[i];
4472 free(bline->id_str);
4473 free(bline->committer);
4477 free(bca.line_offsets);
4478 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4479 error = got_error_from_errno("fclose");
4487 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4492 static const struct got_error *
4493 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4494 const char *root_path, struct got_repository *repo)
4496 const struct got_error *err = NULL;
4497 int is_root_path = (strcmp(path, root_path) == 0);
4498 const char *modestr = "";
4499 mode_t mode = got_tree_entry_get_mode(te);
4500 char *link_target = NULL;
4502 path += strlen(root_path);
4503 while (path[0] == '/')
4506 if (got_object_tree_entry_is_submodule(te))
4508 else if (S_ISLNK(mode)) {
4511 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4514 for (i = 0; i < strlen(link_target); i++) {
4515 if (!isprint((unsigned char)link_target[i]))
4516 link_target[i] = '?';
4521 else if (S_ISDIR(mode))
4523 else if (mode & S_IXUSR)
4526 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4527 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4528 link_target ? " -> ": "", link_target ? link_target : "");
4534 static const struct got_error *
4535 print_tree(const char *path, struct got_object_id *commit_id,
4536 int show_ids, int recurse, const char *root_path,
4537 struct got_repository *repo)
4539 const struct got_error *err = NULL;
4540 struct got_object_id *tree_id = NULL;
4541 struct got_tree_object *tree = NULL;
4544 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4548 err = got_object_open_as_tree(&tree, repo, tree_id);
4551 nentries = got_object_tree_get_nentries(tree);
4552 for (i = 0; i < nentries; i++) {
4553 struct got_tree_entry *te;
4556 if (sigint_received || sigpipe_received)
4559 te = got_object_tree_get_entry(tree, i);
4562 err = got_object_id_str(&id_str,
4563 got_tree_entry_get_id(te));
4566 if (asprintf(&id, "%s ", id_str) == -1) {
4567 err = got_error_from_errno("asprintf");
4573 err = print_entry(te, id, path, root_path, repo);
4578 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4580 if (asprintf(&child_path, "%s%s%s", path,
4581 path[0] == '/' && path[1] == '\0' ? "" : "/",
4582 got_tree_entry_get_name(te)) == -1) {
4583 err = got_error_from_errno("asprintf");
4586 err = print_tree(child_path, commit_id, show_ids, 1,
4595 got_object_tree_close(tree);
4600 static const struct got_error *
4601 cmd_tree(int argc, char *argv[])
4603 const struct got_error *error;
4604 struct got_repository *repo = NULL;
4605 struct got_worktree *worktree = NULL;
4606 const char *path, *refname = NULL;
4607 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4608 struct got_object_id *commit_id = NULL;
4609 char *commit_id_str = NULL;
4610 int show_ids = 0, recurse = 0;
4614 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4619 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4622 commit_id_str = optarg;
4625 repo_path = realpath(optarg, NULL);
4626 if (repo_path == NULL)
4627 return got_error_from_errno2("realpath",
4629 got_path_strip_trailing_slashes(repo_path);
4653 cwd = getcwd(NULL, 0);
4655 error = got_error_from_errno("getcwd");
4658 if (repo_path == NULL) {
4659 error = got_worktree_open(&worktree, cwd);
4660 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4666 strdup(got_worktree_get_repo_path(worktree));
4667 if (repo_path == NULL)
4668 error = got_error_from_errno("strdup");
4672 repo_path = strdup(cwd);
4673 if (repo_path == NULL) {
4674 error = got_error_from_errno("strdup");
4680 error = got_repo_open(&repo, repo_path, NULL);
4684 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4690 char *p, *worktree_subdir = cwd +
4691 strlen(got_worktree_get_root_path(worktree));
4692 if (asprintf(&p, "%s/%s",
4693 got_worktree_get_path_prefix(worktree),
4694 worktree_subdir) == -1) {
4695 error = got_error_from_errno("asprintf");
4698 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4705 if (in_repo_path == NULL) {
4706 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4711 if (commit_id_str == NULL) {
4712 struct got_reference *head_ref;
4714 refname = got_worktree_get_head_ref_name(worktree);
4716 refname = GOT_REF_HEAD;
4717 error = got_ref_open(&head_ref, repo, refname, 0);
4720 error = got_ref_resolve(&commit_id, repo, head_ref);
4721 got_ref_close(head_ref);
4725 error = got_repo_match_object_id(&commit_id, NULL,
4726 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4731 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4732 in_repo_path, repo);
4739 got_worktree_close(worktree);
4741 const struct got_error *repo_error;
4742 repo_error = got_repo_close(repo);
4752 fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4757 static const struct got_error *
4758 print_status(void *arg, unsigned char status, unsigned char staged_status,
4759 const char *path, struct got_object_id *blob_id,
4760 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4761 int dirfd, const char *de_name)
4763 if (status == staged_status && (status == GOT_STATUS_DELETE))
4764 status = GOT_STATUS_NO_CHANGE;
4766 char *status_codes = arg;
4767 size_t ncodes = strlen(status_codes);
4769 for (i = 0; i < ncodes ; i++) {
4770 if (status == status_codes[i] ||
4771 staged_status == status_codes[i])
4777 printf("%c%c %s\n", status, staged_status, path);
4781 static const struct got_error *
4782 cmd_status(int argc, char *argv[])
4784 const struct got_error *error = NULL;
4785 struct got_repository *repo = NULL;
4786 struct got_worktree *worktree = NULL;
4787 char *cwd = NULL, *status_codes = NULL;;
4788 struct got_pathlist_head paths;
4789 struct got_pathlist_entry *pe;
4794 while ((ch = getopt(argc, argv, "s:")) != -1) {
4797 for (i = 0; i < strlen(optarg); i++) {
4798 switch (optarg[i]) {
4799 case GOT_STATUS_MODIFY:
4800 case GOT_STATUS_ADD:
4801 case GOT_STATUS_DELETE:
4802 case GOT_STATUS_CONFLICT:
4803 case GOT_STATUS_MISSING:
4804 case GOT_STATUS_OBSTRUCTED:
4805 case GOT_STATUS_UNVERSIONED:
4806 case GOT_STATUS_MODE_CHANGE:
4807 case GOT_STATUS_NONEXISTENT:
4810 errx(1, "invalid status code '%c'",
4814 status_codes = optarg;
4826 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4830 cwd = getcwd(NULL, 0);
4832 error = got_error_from_errno("getcwd");
4836 error = got_worktree_open(&worktree, cwd);
4838 if (error->code == GOT_ERR_NOT_WORKTREE)
4839 error = wrap_not_worktree_error(error, "status", cwd);
4843 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4848 error = apply_unveil(got_repo_get_path(repo), 1,
4849 got_worktree_get_root_path(worktree));
4853 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4857 error = got_worktree_status(worktree, &paths, repo, print_status,
4858 status_codes, check_cancelled, NULL);
4860 TAILQ_FOREACH(pe, &paths, entry)
4861 free((char *)pe->path);
4862 got_pathlist_free(&paths);
4871 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4877 static const struct got_error *
4878 list_refs(struct got_repository *repo, const char *refname)
4880 static const struct got_error *err = NULL;
4881 struct got_reflist_head refs;
4882 struct got_reflist_entry *re;
4884 SIMPLEQ_INIT(&refs);
4885 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4889 SIMPLEQ_FOREACH(re, &refs, entry) {
4891 refstr = got_ref_to_str(re->ref);
4893 return got_error_from_errno("got_ref_to_str");
4894 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4898 got_ref_list_free(&refs);
4902 static const struct got_error *
4903 delete_ref(struct got_repository *repo, const char *refname)
4905 const struct got_error *err = NULL;
4906 struct got_reference *ref;
4908 err = got_ref_open(&ref, repo, refname, 0);
4912 err = got_ref_delete(ref, repo);
4917 static const struct got_error *
4918 add_ref(struct got_repository *repo, const char *refname, const char *target)
4920 const struct got_error *err = NULL;
4921 struct got_object_id *id;
4922 struct got_reference *ref = NULL;
4925 * Don't let the user create a reference name with a leading '-'.
4926 * While technically a valid reference name, this case is usually
4927 * an unintended typo.
4929 if (refname[0] == '-')
4930 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4932 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4935 struct got_reference *target_ref;
4937 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4939 err = got_ref_open(&target_ref, repo, target, 0);
4942 err = got_ref_resolve(&id, repo, target_ref);
4943 got_ref_close(target_ref);
4948 err = got_ref_alloc(&ref, refname, id);
4952 err = got_ref_write(ref, repo);
4960 static const struct got_error *
4961 add_symref(struct got_repository *repo, const char *refname, const char *target)
4963 const struct got_error *err = NULL;
4964 struct got_reference *ref = NULL;
4965 struct got_reference *target_ref = NULL;
4968 * Don't let the user create a reference name with a leading '-'.
4969 * While technically a valid reference name, this case is usually
4970 * an unintended typo.
4972 if (refname[0] == '-')
4973 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4975 err = got_ref_open(&target_ref, repo, target, 0);
4979 err = got_ref_alloc_symref(&ref, refname, target_ref);
4983 err = got_ref_write(ref, repo);
4986 got_ref_close(target_ref);
4992 static const struct got_error *
4993 cmd_ref(int argc, char *argv[])
4995 const struct got_error *error = NULL;
4996 struct got_repository *repo = NULL;
4997 struct got_worktree *worktree = NULL;
4998 char *cwd = NULL, *repo_path = NULL;
4999 int ch, do_list = 0, do_delete = 0;
5000 const char *obj_arg = NULL, *symref_target= NULL;
5001 char *refname = NULL;
5003 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5012 repo_path = realpath(optarg, NULL);
5013 if (repo_path == NULL)
5014 return got_error_from_errno2("realpath",
5016 got_path_strip_trailing_slashes(repo_path);
5022 symref_target = optarg;
5030 if (obj_arg && do_list)
5031 errx(1, "-c and -l options are mutually exclusive");
5032 if (obj_arg && do_delete)
5033 errx(1, "-c and -d options are mutually exclusive");
5034 if (obj_arg && symref_target)
5035 errx(1, "-c and -s options are mutually exclusive");
5036 if (symref_target && do_delete)
5037 errx(1, "-s and -d options are mutually exclusive");
5038 if (symref_target && do_list)
5039 errx(1, "-s and -l options are mutually exclusive");
5040 if (do_delete && do_list)
5041 errx(1, "-d and -l options are mutually exclusive");
5047 if (argc != 0 && argc != 1)
5050 refname = strdup(argv[0]);
5051 if (refname == NULL) {
5052 error = got_error_from_errno("strdup");
5059 refname = strdup(argv[0]);
5060 if (refname == NULL) {
5061 error = got_error_from_errno("strdup");
5067 got_path_strip_trailing_slashes(refname);
5071 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5075 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5076 "sendfd unveil", NULL) == -1)
5080 cwd = getcwd(NULL, 0);
5082 error = got_error_from_errno("getcwd");
5086 if (repo_path == NULL) {
5087 error = got_worktree_open(&worktree, cwd);
5088 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5094 strdup(got_worktree_get_repo_path(worktree));
5095 if (repo_path == NULL)
5096 error = got_error_from_errno("strdup");
5100 repo_path = strdup(cwd);
5101 if (repo_path == NULL) {
5102 error = got_error_from_errno("strdup");
5108 error = got_repo_open(&repo, repo_path, NULL);
5112 error = apply_unveil(got_repo_get_path(repo), do_list,
5113 worktree ? got_worktree_get_root_path(worktree) : NULL);
5118 error = list_refs(repo, refname);
5120 error = delete_ref(repo, refname);
5121 else if (symref_target)
5122 error = add_symref(repo, refname, symref_target);
5124 if (obj_arg == NULL)
5126 error = add_ref(repo, refname, obj_arg);
5131 got_repo_close(repo);
5133 got_worktree_close(worktree);
5143 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5144 "[name]\n", getprogname());
5148 static const struct got_error *
5149 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5150 struct got_reference *ref)
5152 const struct got_error *err = NULL;
5153 const char *refname, *marker = " ";
5156 refname = got_ref_get_name(ref);
5157 if (worktree && strcmp(refname,
5158 got_worktree_get_head_ref_name(worktree)) == 0) {
5159 struct got_object_id *id = NULL;
5161 err = got_ref_resolve(&id, repo, ref);
5164 if (got_object_id_cmp(id,
5165 got_worktree_get_base_commit_id(worktree)) == 0)
5172 if (strncmp(refname, "refs/heads/", 11) == 0)
5174 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5177 refstr = got_ref_to_str(ref);
5179 return got_error_from_errno("got_ref_to_str");
5181 printf("%s%s: %s\n", marker, refname, refstr);
5186 static const struct got_error *
5187 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5189 const char *refname;
5191 if (worktree == NULL)
5192 return got_error(GOT_ERR_NOT_WORKTREE);
5194 refname = got_worktree_get_head_ref_name(worktree);
5196 if (strncmp(refname, "refs/heads/", 11) == 0)
5198 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5201 printf("%s\n", refname);
5206 static const struct got_error *
5207 list_branches(struct got_repository *repo, struct got_worktree *worktree)
5209 static const struct got_error *err = NULL;
5210 struct got_reflist_head refs;
5211 struct got_reflist_entry *re;
5212 struct got_reference *temp_ref = NULL;
5213 int rebase_in_progress, histedit_in_progress;
5215 SIMPLEQ_INIT(&refs);
5218 err = got_worktree_rebase_in_progress(&rebase_in_progress,
5223 err = got_worktree_histedit_in_progress(&histedit_in_progress,
5228 if (rebase_in_progress || histedit_in_progress) {
5229 err = got_ref_open(&temp_ref, repo,
5230 got_worktree_get_head_ref_name(worktree), 0);
5233 list_branch(repo, worktree, temp_ref);
5234 got_ref_close(temp_ref);
5238 err = got_ref_list(&refs, repo, "refs/heads",
5239 got_ref_cmp_by_name, NULL);
5243 SIMPLEQ_FOREACH(re, &refs, entry)
5244 list_branch(repo, worktree, re->ref);
5246 got_ref_list_free(&refs);
5250 static const struct got_error *
5251 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5252 const char *branch_name)
5254 const struct got_error *err = NULL;
5255 struct got_reference *ref = NULL;
5258 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5259 return got_error_from_errno("asprintf");
5261 err = got_ref_open(&ref, repo, refname, 0);
5266 strcmp(got_worktree_get_head_ref_name(worktree),
5267 got_ref_get_name(ref)) == 0) {
5268 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5269 "will not delete this work tree's current branch");
5273 err = got_ref_delete(ref, repo);
5281 static const struct got_error *
5282 add_branch(struct got_repository *repo, const char *branch_name,
5283 struct got_object_id *base_commit_id)
5285 const struct got_error *err = NULL;
5286 struct got_reference *ref = NULL;
5287 char *base_refname = NULL, *refname = NULL;
5290 * Don't let the user create a branch name with a leading '-'.
5291 * While technically a valid reference name, this case is usually
5292 * an unintended typo.
5294 if (branch_name[0] == '-')
5295 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5297 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5298 err = got_error_from_errno("asprintf");
5302 err = got_ref_open(&ref, repo, refname, 0);
5304 err = got_error(GOT_ERR_BRANCH_EXISTS);
5306 } else if (err->code != GOT_ERR_NOT_REF)
5309 err = got_ref_alloc(&ref, refname, base_commit_id);
5313 err = got_ref_write(ref, repo);
5322 static const struct got_error *
5323 cmd_branch(int argc, char *argv[])
5325 const struct got_error *error = NULL;
5326 struct got_repository *repo = NULL;
5327 struct got_worktree *worktree = NULL;
5328 char *cwd = NULL, *repo_path = NULL;
5329 int ch, do_list = 0, do_show = 0, do_update = 1;
5330 const char *delref = NULL, *commit_id_arg = NULL;
5331 struct got_reference *ref = NULL;
5332 struct got_pathlist_head paths;
5333 struct got_pathlist_entry *pe;
5334 struct got_object_id *commit_id = NULL;
5335 char *commit_id_str = NULL;
5339 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5342 commit_id_arg = optarg;
5348 repo_path = realpath(optarg, NULL);
5349 if (repo_path == NULL)
5350 return got_error_from_errno2("realpath",
5352 got_path_strip_trailing_slashes(repo_path);
5366 if (do_list && delref)
5367 errx(1, "-l and -d options are mutually exclusive");
5372 if (!do_list && !delref && argc == 0)
5375 if ((do_list || delref || do_show) && commit_id_arg != NULL)
5376 errx(1, "-c option can only be used when creating a branch");
5378 if (do_list || delref) {
5381 } else if (!do_show && argc != 1)
5385 if (do_list || do_show) {
5386 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5390 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5391 "sendfd unveil", NULL) == -1)
5395 cwd = getcwd(NULL, 0);
5397 error = got_error_from_errno("getcwd");
5401 if (repo_path == NULL) {
5402 error = got_worktree_open(&worktree, cwd);
5403 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5409 strdup(got_worktree_get_repo_path(worktree));
5410 if (repo_path == NULL)
5411 error = got_error_from_errno("strdup");
5415 repo_path = strdup(cwd);
5416 if (repo_path == NULL) {
5417 error = got_error_from_errno("strdup");
5423 error = got_repo_open(&repo, repo_path, NULL);
5427 error = apply_unveil(got_repo_get_path(repo), do_list,
5428 worktree ? got_worktree_get_root_path(worktree) : NULL);
5433 error = show_current_branch(repo, worktree);
5435 error = list_branches(repo, worktree);
5437 error = delete_branch(repo, worktree, delref);
5439 if (commit_id_arg == NULL)
5440 commit_id_arg = worktree ?
5441 got_worktree_get_head_ref_name(worktree) :
5443 error = got_repo_match_object_id(&commit_id, NULL,
5444 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5447 error = add_branch(repo, argv[0], commit_id);
5450 if (worktree && do_update) {
5451 struct got_update_progress_arg upa;
5452 char *branch_refname = NULL;
5454 error = got_object_id_str(&commit_id_str, commit_id);
5457 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5461 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5463 error = got_error_from_errno("asprintf");
5466 error = got_ref_open(&ref, repo, branch_refname, 0);
5467 free(branch_refname);
5470 error = switch_head_ref(ref, commit_id, worktree,
5474 error = got_worktree_set_base_commit_id(worktree, repo,
5478 memset(&upa, 0, sizeof(upa));
5479 error = got_worktree_checkout_files(worktree, &paths,
5480 repo, update_progress, &upa, check_cancelled,
5484 if (upa.did_something)
5485 printf("Updated to commit %s\n", commit_id_str);
5486 print_update_progress_stats(&upa);
5493 got_repo_close(repo);
5495 got_worktree_close(worktree);
5499 free(commit_id_str);
5500 TAILQ_FOREACH(pe, &paths, entry)
5501 free((char *)pe->path);
5502 got_pathlist_free(&paths);
5511 "usage: %s tag [-c commit] [-r repository] [-l] "
5512 "[-m message] name\n", getprogname());
5517 static const struct got_error *
5518 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5520 const struct got_error *err = NULL;
5521 struct got_reflist_entry *re, *se, *new;
5522 struct got_object_id *re_id, *se_id;
5523 struct got_tag_object *re_tag, *se_tag;
5524 time_t re_time, se_time;
5526 SIMPLEQ_FOREACH(re, tags, entry) {
5527 se = SIMPLEQ_FIRST(sorted);
5529 err = got_reflist_entry_dup(&new, re);
5532 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5535 err = got_ref_resolve(&re_id, repo, re->ref);
5538 err = got_object_open_as_tag(&re_tag, repo, re_id);
5542 re_time = got_object_tag_get_tagger_time(re_tag);
5543 got_object_tag_close(re_tag);
5547 err = got_ref_resolve(&se_id, repo, re->ref);
5550 err = got_object_open_as_tag(&se_tag, repo, se_id);
5554 se_time = got_object_tag_get_tagger_time(se_tag);
5555 got_object_tag_close(se_tag);
5557 if (se_time > re_time) {
5558 err = got_reflist_entry_dup(&new, re);
5561 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5564 se = SIMPLEQ_NEXT(se, entry);
5573 static const struct got_error *
5574 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5576 static const struct got_error *err = NULL;
5577 struct got_reflist_head refs;
5578 struct got_reflist_entry *re;
5580 SIMPLEQ_INIT(&refs);
5582 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5586 SIMPLEQ_FOREACH(re, &refs, entry) {
5587 const char *refname;
5588 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5592 struct got_object_id *id;
5593 struct got_tag_object *tag;
5594 struct got_commit_object *commit = NULL;
5596 refname = got_ref_get_name(re->ref);
5597 if (strncmp(refname, "refs/tags/", 10) != 0)
5600 refstr = got_ref_to_str(re->ref);
5601 if (refstr == NULL) {
5602 err = got_error_from_errno("got_ref_to_str");
5605 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5608 err = got_ref_resolve(&id, repo, re->ref);
5611 err = got_object_open_as_tag(&tag, repo, id);
5613 if (err->code != GOT_ERR_OBJ_TYPE) {
5617 /* "lightweight" tag */
5618 err = got_object_open_as_commit(&commit, repo, id);
5623 tagger = got_object_commit_get_committer(commit);
5625 got_object_commit_get_committer_time(commit);
5626 err = got_object_id_str(&id_str, id);
5632 tagger = got_object_tag_get_tagger(tag);
5633 tagger_time = got_object_tag_get_tagger_time(tag);
5634 err = got_object_id_str(&id_str,
5635 got_object_tag_get_object_id(tag));
5639 printf("from: %s\n", tagger);
5640 datestr = get_datestr(&tagger_time, datebuf);
5642 printf("date: %s UTC\n", datestr);
5644 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5646 switch (got_object_tag_get_object_type(tag)) {
5647 case GOT_OBJ_TYPE_BLOB:
5648 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5651 case GOT_OBJ_TYPE_TREE:
5652 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5655 case GOT_OBJ_TYPE_COMMIT:
5656 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5659 case GOT_OBJ_TYPE_TAG:
5660 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5669 err = got_object_commit_get_logmsg(&tagmsg0, commit);
5672 got_object_commit_close(commit);
5674 tagmsg0 = strdup(got_object_tag_get_message(tag));
5675 got_object_tag_close(tag);
5676 if (tagmsg0 == NULL) {
5677 err = got_error_from_errno("strdup");
5684 line = strsep(&tagmsg, "\n");
5686 printf(" %s\n", line);
5691 got_ref_list_free(&refs);
5695 static const struct got_error *
5696 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5697 const char *tag_name, const char *repo_path)
5699 const struct got_error *err = NULL;
5700 char *template = NULL, *initial_content = NULL;
5701 char *editor = NULL;
5702 int initial_content_len;
5705 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5706 err = got_error_from_errno("asprintf");
5710 initial_content_len = asprintf(&initial_content,
5711 "\n# tagging commit %s as %s\n",
5712 commit_id_str, tag_name);
5713 if (initial_content_len == -1) {
5714 err = got_error_from_errno("asprintf");
5718 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5722 if (write(fd, initial_content, initial_content_len) == -1) {
5723 err = got_error_from_errno2("write", *tagmsg_path);
5727 err = get_editor(&editor);
5730 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5732 free(initial_content);
5736 if (fd != -1 && close(fd) == -1 && err == NULL)
5737 err = got_error_from_errno2("close", *tagmsg_path);
5739 /* Editor is done; we can now apply unveil(2) */
5741 err = apply_unveil(repo_path, 0, NULL);
5749 static const struct got_error *
5750 add_tag(struct got_repository *repo, struct got_worktree *worktree,
5751 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5753 const struct got_error *err = NULL;
5754 struct got_object_id *commit_id = NULL, *tag_id = NULL;
5755 char *label = NULL, *commit_id_str = NULL;
5756 struct got_reference *ref = NULL;
5757 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5758 char *tagmsg_path = NULL, *tag_id_str = NULL;
5759 int preserve_tagmsg = 0;
5762 * Don't let the user create a tag name with a leading '-'.
5763 * While technically a valid reference name, this case is usually
5764 * an unintended typo.
5766 if (tag_name[0] == '-')
5767 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5769 err = get_author(&tagger, repo, worktree);
5773 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5774 GOT_OBJ_TYPE_COMMIT, 1, repo);
5778 err = got_object_id_str(&commit_id_str, commit_id);
5782 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5783 refname = strdup(tag_name);
5784 if (refname == NULL) {
5785 err = got_error_from_errno("strdup");
5789 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5790 err = got_error_from_errno("asprintf");
5794 err = got_ref_open(&ref, repo, refname, 0);
5796 err = got_error(GOT_ERR_TAG_EXISTS);
5798 } else if (err->code != GOT_ERR_NOT_REF)
5801 if (tagmsg_arg == NULL) {
5802 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5803 tag_name, got_repo_get_path(repo));
5805 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5806 tagmsg_path != NULL)
5807 preserve_tagmsg = 1;
5812 err = got_object_tag_create(&tag_id, tag_name, commit_id,
5813 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5816 preserve_tagmsg = 1;
5820 err = got_ref_alloc(&ref, refname, tag_id);
5823 preserve_tagmsg = 1;
5827 err = got_ref_write(ref, repo);
5830 preserve_tagmsg = 1;
5834 err = got_object_id_str(&tag_id_str, tag_id);
5837 preserve_tagmsg = 1;
5840 printf("Created tag %s\n", tag_id_str);
5842 if (preserve_tagmsg) {
5843 fprintf(stderr, "%s: tag message preserved in %s\n",
5844 getprogname(), tagmsg_path);
5845 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5846 err = got_error_from_errno2("unlink", tagmsg_path);
5851 free(commit_id_str);
5859 static const struct got_error *
5860 cmd_tag(int argc, char *argv[])
5862 const struct got_error *error = NULL;
5863 struct got_repository *repo = NULL;
5864 struct got_worktree *worktree = NULL;
5865 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5866 char *gitconfig_path = NULL;
5867 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5868 int ch, do_list = 0;
5870 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5873 commit_id_arg = optarg;
5879 repo_path = realpath(optarg, NULL);
5880 if (repo_path == NULL)
5881 return got_error_from_errno2("realpath",
5883 got_path_strip_trailing_slashes(repo_path);
5898 if (commit_id_arg != NULL)
5900 "-c option can only be used when creating a tag");
5902 errx(1, "-l and -m options are mutually exclusive");
5905 } else if (argc != 1)
5912 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5916 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5917 "sendfd unveil", NULL) == -1)
5921 cwd = getcwd(NULL, 0);
5923 error = got_error_from_errno("getcwd");
5927 if (repo_path == NULL) {
5928 error = got_worktree_open(&worktree, cwd);
5929 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5935 strdup(got_worktree_get_repo_path(worktree));
5936 if (repo_path == NULL)
5937 error = got_error_from_errno("strdup");
5941 repo_path = strdup(cwd);
5942 if (repo_path == NULL) {
5943 error = got_error_from_errno("strdup");
5950 error = got_repo_open(&repo, repo_path, NULL);
5953 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5956 error = list_tags(repo, worktree);
5958 error = get_gitconfig_path(&gitconfig_path);
5961 error = got_repo_open(&repo, repo_path, gitconfig_path);
5966 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5971 if (commit_id_arg == NULL) {
5972 struct got_reference *head_ref;
5973 struct got_object_id *commit_id;
5974 error = got_ref_open(&head_ref, repo,
5975 worktree ? got_worktree_get_head_ref_name(worktree)
5979 error = got_ref_resolve(&commit_id, repo, head_ref);
5980 got_ref_close(head_ref);
5983 error = got_object_id_str(&commit_id_str, commit_id);
5989 error = add_tag(repo, worktree, tag_name,
5990 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5994 got_repo_close(repo);
5996 got_worktree_close(worktree);
5999 free(gitconfig_path);
6000 free(commit_id_str);
6007 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6012 static const struct got_error *
6013 add_progress(void *arg, unsigned char status, const char *path)
6015 while (path[0] == '/')
6017 printf("%c %s\n", status, path);
6021 static const struct got_error *
6022 cmd_add(int argc, char *argv[])
6024 const struct got_error *error = NULL;
6025 struct got_repository *repo = NULL;
6026 struct got_worktree *worktree = NULL;
6028 struct got_pathlist_head paths;
6029 struct got_pathlist_entry *pe;
6030 int ch, can_recurse = 0, no_ignores = 0;
6034 while ((ch = getopt(argc, argv, "IR")) != -1) {
6052 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6059 cwd = getcwd(NULL, 0);
6061 error = got_error_from_errno("getcwd");
6065 error = got_worktree_open(&worktree, cwd);
6067 if (error->code == GOT_ERR_NOT_WORKTREE)
6068 error = wrap_not_worktree_error(error, "add", cwd);
6072 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6077 error = apply_unveil(got_repo_get_path(repo), 1,
6078 got_worktree_get_root_path(worktree));
6082 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6086 if (!can_recurse && no_ignores) {
6087 error = got_error_msg(GOT_ERR_BAD_PATH,
6088 "disregarding ignores requires -R option");
6096 TAILQ_FOREACH(pe, &paths, entry) {
6097 if (asprintf(&ondisk_path, "%s/%s",
6098 got_worktree_get_root_path(worktree),
6100 error = got_error_from_errno("asprintf");
6103 if (lstat(ondisk_path, &sb) == -1) {
6104 if (errno == ENOENT) {
6108 error = got_error_from_errno2("lstat",
6114 if (S_ISDIR(sb.st_mode)) {
6115 error = got_error_msg(GOT_ERR_BAD_PATH,
6116 "adding directories requires -R option");
6122 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6123 NULL, repo, no_ignores);
6126 got_repo_close(repo);
6128 got_worktree_close(worktree);
6129 TAILQ_FOREACH(pe, &paths, entry)
6130 free((char *)pe->path);
6131 got_pathlist_free(&paths);
6139 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6140 "path ...\n", getprogname());
6144 static const struct got_error *
6145 print_remove_status(void *arg, unsigned char status,
6146 unsigned char staged_status, const char *path)
6148 while (path[0] == '/')
6150 if (status == GOT_STATUS_NONEXISTENT)
6152 if (status == staged_status && (status == GOT_STATUS_DELETE))
6153 status = GOT_STATUS_NO_CHANGE;
6154 printf("%c%c %s\n", status, staged_status, path);
6158 static const struct got_error *
6159 cmd_remove(int argc, char *argv[])
6161 const struct got_error *error = NULL;
6162 struct got_worktree *worktree = NULL;
6163 struct got_repository *repo = NULL;
6164 const char *status_codes = NULL;
6166 struct got_pathlist_head paths;
6167 struct got_pathlist_entry *pe;
6168 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6172 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6175 delete_local_mods = 1;
6184 for (i = 0; i < strlen(optarg); i++) {
6185 switch (optarg[i]) {
6186 case GOT_STATUS_MODIFY:
6187 delete_local_mods = 1;
6189 case GOT_STATUS_MISSING:
6192 errx(1, "invalid status code '%c'",
6196 status_codes = optarg;
6208 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6215 cwd = getcwd(NULL, 0);
6217 error = got_error_from_errno("getcwd");
6220 error = got_worktree_open(&worktree, cwd);
6222 if (error->code == GOT_ERR_NOT_WORKTREE)
6223 error = wrap_not_worktree_error(error, "remove", cwd);
6227 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6232 error = apply_unveil(got_repo_get_path(repo), 1,
6233 got_worktree_get_root_path(worktree));
6237 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6244 TAILQ_FOREACH(pe, &paths, entry) {
6245 if (asprintf(&ondisk_path, "%s/%s",
6246 got_worktree_get_root_path(worktree),
6248 error = got_error_from_errno("asprintf");
6251 if (lstat(ondisk_path, &sb) == -1) {
6252 if (errno == ENOENT) {
6256 error = got_error_from_errno2("lstat",
6262 if (S_ISDIR(sb.st_mode)) {
6263 error = got_error_msg(GOT_ERR_BAD_PATH,
6264 "removing directories requires -R option");
6270 error = got_worktree_schedule_delete(worktree, &paths,
6271 delete_local_mods, status_codes, print_remove_status, NULL,
6272 repo, keep_on_disk);
6275 got_repo_close(repo);
6277 got_worktree_close(worktree);
6278 TAILQ_FOREACH(pe, &paths, entry)
6279 free((char *)pe->path);
6280 got_pathlist_free(&paths);
6288 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6289 "path ...\n", getprogname());
6293 static const struct got_error *
6294 revert_progress(void *arg, unsigned char status, const char *path)
6296 if (status == GOT_STATUS_UNVERSIONED)
6299 while (path[0] == '/')
6301 printf("%c %s\n", status, path);
6305 struct choose_patch_arg {
6306 FILE *patch_script_file;
6310 static const struct got_error *
6311 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6312 int nchanges, const char *action)
6315 size_t linesize = 0;
6319 case GOT_STATUS_ADD:
6320 printf("A %s\n%s this addition? [y/n] ", path, action);
6322 case GOT_STATUS_DELETE:
6323 printf("D %s\n%s this deletion? [y/n] ", path, action);
6325 case GOT_STATUS_MODIFY:
6326 if (fseek(patch_file, 0L, SEEK_SET) == -1)
6327 return got_error_from_errno("fseek");
6328 printf(GOT_COMMIT_SEP_STR);
6329 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6331 if (ferror(patch_file))
6332 return got_error_from_errno("getline");
6333 printf(GOT_COMMIT_SEP_STR);
6334 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6335 path, n, nchanges, action);
6338 return got_error_path(path, GOT_ERR_FILE_STATUS);
6344 static const struct got_error *
6345 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6346 FILE *patch_file, int n, int nchanges)
6348 const struct got_error *err = NULL;
6350 size_t linesize = 0;
6353 struct choose_patch_arg *a = arg;
6355 *choice = GOT_PATCH_CHOICE_NONE;
6357 if (a->patch_script_file) {
6359 err = show_change(status, path, patch_file, n, nchanges,
6363 linelen = getline(&line, &linesize, a->patch_script_file);
6364 if (linelen == -1) {
6365 if (ferror(a->patch_script_file))
6366 return got_error_from_errno("getline");
6369 nl = strchr(line, '\n');
6372 if (strcmp(line, "y") == 0) {
6373 *choice = GOT_PATCH_CHOICE_YES;
6375 } else if (strcmp(line, "n") == 0) {
6376 *choice = GOT_PATCH_CHOICE_NO;
6378 } else if (strcmp(line, "q") == 0 &&
6379 status == GOT_STATUS_MODIFY) {
6380 *choice = GOT_PATCH_CHOICE_QUIT;
6383 printf("invalid response '%s'\n", line);
6388 while (resp != 'y' && resp != 'n' && resp != 'q') {
6389 err = show_change(status, path, patch_file, n, nchanges,
6396 if (status == GOT_STATUS_MODIFY) {
6397 if (resp != 'y' && resp != 'n' && resp != 'q') {
6398 printf("invalid response '%c'\n", resp);
6401 } else if (resp != 'y' && resp != 'n') {
6402 printf("invalid response '%c'\n", resp);
6408 *choice = GOT_PATCH_CHOICE_YES;
6409 else if (resp == 'n')
6410 *choice = GOT_PATCH_CHOICE_NO;
6411 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6412 *choice = GOT_PATCH_CHOICE_QUIT;
6418 static const struct got_error *
6419 cmd_revert(int argc, char *argv[])
6421 const struct got_error *error = NULL;
6422 struct got_worktree *worktree = NULL;
6423 struct got_repository *repo = NULL;
6424 char *cwd = NULL, *path = NULL;
6425 struct got_pathlist_head paths;
6426 struct got_pathlist_entry *pe;
6427 int ch, can_recurse = 0, pflag = 0;
6428 FILE *patch_script_file = NULL;
6429 const char *patch_script_path = NULL;
6430 struct choose_patch_arg cpa;
6434 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6440 patch_script_path = optarg;
6455 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6456 "unveil", NULL) == -1)
6461 if (patch_script_path && !pflag)
6462 errx(1, "-F option can only be used together with -p option");
6464 cwd = getcwd(NULL, 0);
6466 error = got_error_from_errno("getcwd");
6469 error = got_worktree_open(&worktree, cwd);
6471 if (error->code == GOT_ERR_NOT_WORKTREE)
6472 error = wrap_not_worktree_error(error, "revert", cwd);
6476 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6481 if (patch_script_path) {
6482 patch_script_file = fopen(patch_script_path, "r");
6483 if (patch_script_file == NULL) {
6484 error = got_error_from_errno2("fopen",
6489 error = apply_unveil(got_repo_get_path(repo), 1,
6490 got_worktree_get_root_path(worktree));
6494 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6501 TAILQ_FOREACH(pe, &paths, entry) {
6502 if (asprintf(&ondisk_path, "%s/%s",
6503 got_worktree_get_root_path(worktree),
6505 error = got_error_from_errno("asprintf");
6508 if (lstat(ondisk_path, &sb) == -1) {
6509 if (errno == ENOENT) {
6513 error = got_error_from_errno2("lstat",
6519 if (S_ISDIR(sb.st_mode)) {
6520 error = got_error_msg(GOT_ERR_BAD_PATH,
6521 "reverting directories requires -R option");
6527 cpa.patch_script_file = patch_script_file;
6528 cpa.action = "revert";
6529 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6530 pflag ? choose_patch : NULL, &cpa, repo);
6532 if (patch_script_file && fclose(patch_script_file) == EOF &&
6534 error = got_error_from_errno2("fclose", patch_script_path);
6536 got_repo_close(repo);
6538 got_worktree_close(worktree);
6547 fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6552 struct collect_commit_logmsg_arg {
6553 const char *cmdline_log;
6555 const char *worktree_path;
6556 const char *branch_name;
6557 const char *repo_path;
6562 static const struct got_error *
6563 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6566 char *initial_content = NULL;
6567 struct got_pathlist_entry *pe;
6568 const struct got_error *err = NULL;
6569 char *template = NULL;
6570 struct collect_commit_logmsg_arg *a = arg;
6571 int initial_content_len;
6575 /* if a message was specified on the command line, just use it */
6576 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6577 len = strlen(a->cmdline_log) + 1;
6578 *logmsg = malloc(len + 1);
6579 if (*logmsg == NULL)
6580 return got_error_from_errno("malloc");
6581 strlcpy(*logmsg, a->cmdline_log, len);
6585 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6586 return got_error_from_errno("asprintf");
6588 initial_content_len = asprintf(&initial_content,
6589 "\n# changes to be committed on branch %s:\n",
6591 if (initial_content_len == -1)
6592 return got_error_from_errno("asprintf");
6594 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6598 if (write(fd, initial_content, initial_content_len) == -1) {
6599 err = got_error_from_errno2("write", a->logmsg_path);
6603 TAILQ_FOREACH(pe, commitable_paths, entry) {
6604 struct got_commitable *ct = pe->data;
6605 dprintf(fd, "# %c %s\n",
6606 got_commitable_get_status(ct),
6607 got_commitable_get_path(ct));
6610 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6612 free(initial_content);
6615 if (fd != -1 && close(fd) == -1 && err == NULL)
6616 err = got_error_from_errno2("close", a->logmsg_path);
6618 /* Editor is done; we can now apply unveil(2) */
6620 err = apply_unveil(a->repo_path, 0, a->worktree_path);
6628 static const struct got_error *
6629 cmd_commit(int argc, char *argv[])
6631 const struct got_error *error = NULL;
6632 struct got_worktree *worktree = NULL;
6633 struct got_repository *repo = NULL;
6634 char *cwd = NULL, *id_str = NULL;
6635 struct got_object_id *id = NULL;
6636 const char *logmsg = NULL;
6637 struct collect_commit_logmsg_arg cl_arg;
6638 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6639 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6640 int allow_bad_symlinks = 0;
6641 struct got_pathlist_head paths;
6644 cl_arg.logmsg_path = NULL;
6646 while ((ch = getopt(argc, argv, "m:S")) != -1) {
6652 allow_bad_symlinks = 1;
6664 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6665 "unveil", NULL) == -1)
6668 cwd = getcwd(NULL, 0);
6670 error = got_error_from_errno("getcwd");
6673 error = got_worktree_open(&worktree, cwd);
6675 if (error->code == GOT_ERR_NOT_WORKTREE)
6676 error = wrap_not_worktree_error(error, "commit", cwd);
6680 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6683 if (rebase_in_progress) {
6684 error = got_error(GOT_ERR_REBASING);
6688 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6693 error = get_gitconfig_path(&gitconfig_path);
6696 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6701 error = get_author(&author, repo, worktree);
6706 * unveil(2) traverses exec(2); if an editor is used we have
6707 * to apply unveil after the log message has been written.
6709 if (logmsg == NULL || strlen(logmsg) == 0)
6710 error = get_editor(&editor);
6712 error = apply_unveil(got_repo_get_path(repo), 0,
6713 got_worktree_get_root_path(worktree));
6717 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6721 cl_arg.editor = editor;
6722 cl_arg.cmdline_log = logmsg;
6723 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6724 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6725 if (!histedit_in_progress) {
6726 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6727 error = got_error(GOT_ERR_COMMIT_BRANCH);
6730 cl_arg.branch_name += 11;
6732 cl_arg.repo_path = got_repo_get_path(repo);
6733 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6734 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6735 print_status, NULL, repo);
6737 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6738 cl_arg.logmsg_path != NULL)
6739 preserve_logmsg = 1;
6743 error = got_object_id_str(&id_str, id);
6746 printf("Created commit %s\n", id_str);
6748 if (preserve_logmsg) {
6749 fprintf(stderr, "%s: log message preserved in %s\n",
6750 getprogname(), cl_arg.logmsg_path);
6751 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6753 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6754 free(cl_arg.logmsg_path);
6756 got_repo_close(repo);
6758 got_worktree_close(worktree);
6761 free(gitconfig_path);
6768 usage_cherrypick(void)
6770 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6774 static const struct got_error *
6775 cmd_cherrypick(int argc, char *argv[])
6777 const struct got_error *error = NULL;
6778 struct got_worktree *worktree = NULL;
6779 struct got_repository *repo = NULL;
6780 char *cwd = NULL, *commit_id_str = NULL;
6781 struct got_object_id *commit_id = NULL;
6782 struct got_commit_object *commit = NULL;
6783 struct got_object_qid *pid;
6784 struct got_reference *head_ref = NULL;
6786 struct got_update_progress_arg upa;
6788 while ((ch = getopt(argc, argv, "")) != -1) {
6800 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6801 "unveil", NULL) == -1)
6807 cwd = getcwd(NULL, 0);
6809 error = got_error_from_errno("getcwd");
6812 error = got_worktree_open(&worktree, cwd);
6814 if (error->code == GOT_ERR_NOT_WORKTREE)
6815 error = wrap_not_worktree_error(error, "cherrypick",
6820 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6825 error = apply_unveil(got_repo_get_path(repo), 0,
6826 got_worktree_get_root_path(worktree));
6830 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6831 GOT_OBJ_TYPE_COMMIT, repo);
6832 if (error != NULL) {
6833 struct got_reference *ref;
6834 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6836 error = got_ref_open(&ref, repo, argv[0], 0);
6839 error = got_ref_resolve(&commit_id, repo, ref);
6844 error = got_object_id_str(&commit_id_str, commit_id);
6848 error = got_ref_open(&head_ref, repo,
6849 got_worktree_get_head_ref_name(worktree), 0);
6853 error = check_same_branch(commit_id, head_ref, NULL, repo);
6855 if (error->code != GOT_ERR_ANCESTRY)
6859 error = got_error(GOT_ERR_SAME_BRANCH);
6863 error = got_object_open_as_commit(&commit, repo, commit_id);
6866 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6867 memset(&upa, 0, sizeof(upa));
6868 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6869 commit_id, repo, update_progress, &upa, check_cancelled,
6874 if (upa.did_something)
6875 printf("Merged commit %s\n", commit_id_str);
6876 print_update_progress_stats(&upa);
6879 got_object_commit_close(commit);
6880 free(commit_id_str);
6882 got_ref_close(head_ref);
6884 got_worktree_close(worktree);
6886 got_repo_close(repo);
6893 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6897 static const struct got_error *
6898 cmd_backout(int argc, char *argv[])
6900 const struct got_error *error = NULL;
6901 struct got_worktree *worktree = NULL;
6902 struct got_repository *repo = NULL;
6903 char *cwd = NULL, *commit_id_str = NULL;
6904 struct got_object_id *commit_id = NULL;
6905 struct got_commit_object *commit = NULL;
6906 struct got_object_qid *pid;
6907 struct got_reference *head_ref = NULL;
6909 struct got_update_progress_arg upa;
6911 while ((ch = getopt(argc, argv, "")) != -1) {
6923 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6924 "unveil", NULL) == -1)
6930 cwd = getcwd(NULL, 0);
6932 error = got_error_from_errno("getcwd");
6935 error = got_worktree_open(&worktree, cwd);
6937 if (error->code == GOT_ERR_NOT_WORKTREE)
6938 error = wrap_not_worktree_error(error, "backout", cwd);
6942 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6947 error = apply_unveil(got_repo_get_path(repo), 0,
6948 got_worktree_get_root_path(worktree));
6952 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6953 GOT_OBJ_TYPE_COMMIT, repo);
6954 if (error != NULL) {
6955 struct got_reference *ref;
6956 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6958 error = got_ref_open(&ref, repo, argv[0], 0);
6961 error = got_ref_resolve(&commit_id, repo, ref);
6966 error = got_object_id_str(&commit_id_str, commit_id);
6970 error = got_ref_open(&head_ref, repo,
6971 got_worktree_get_head_ref_name(worktree), 0);
6975 error = check_same_branch(commit_id, head_ref, NULL, repo);
6979 error = got_object_open_as_commit(&commit, repo, commit_id);
6982 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6984 error = got_error(GOT_ERR_ROOT_COMMIT);
6988 memset(&upa, 0, sizeof(upa));
6989 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6990 update_progress, &upa, check_cancelled, NULL);
6994 if (upa.did_something)
6995 printf("Backed out commit %s\n", commit_id_str);
6996 print_update_progress_stats(&upa);
6999 got_object_commit_close(commit);
7000 free(commit_id_str);
7002 got_ref_close(head_ref);
7004 got_worktree_close(worktree);
7006 got_repo_close(repo);
7013 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7019 trim_logmsg(char *logmsg, int limit)
7024 len = strlen(logmsg);
7028 nl = strchr(logmsg, '\n');
7033 static const struct got_error *
7034 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7036 const struct got_error *err;
7037 char *logmsg0 = NULL;
7040 err = got_object_commit_get_logmsg(&logmsg0, commit);
7045 while (isspace((unsigned char)s[0]))
7048 *logmsg = strdup(s);
7049 if (*logmsg == NULL) {
7050 err = got_error_from_errno("strdup");
7054 trim_logmsg(*logmsg, limit);
7060 static const struct got_error *
7061 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7063 const struct got_error *err;
7064 struct got_commit_object *commit = NULL;
7065 char *id_str = NULL, *logmsg = NULL;
7067 err = got_object_open_as_commit(&commit, repo, id);
7071 err = got_object_id_str(&id_str, id);
7077 err = get_short_logmsg(&logmsg, 42, commit);
7081 printf("%s -> merge conflict: %s\n", id_str, logmsg);
7084 got_object_commit_close(commit);
7089 static const struct got_error *
7090 show_rebase_progress(struct got_commit_object *commit,
7091 struct got_object_id *old_id, struct got_object_id *new_id)
7093 const struct got_error *err;
7094 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7096 err = got_object_id_str(&old_id_str, old_id);
7101 err = got_object_id_str(&new_id_str, new_id);
7106 old_id_str[12] = '\0';
7108 new_id_str[12] = '\0';
7110 err = get_short_logmsg(&logmsg, 42, commit);
7114 printf("%s -> %s: %s\n", old_id_str,
7115 new_id_str ? new_id_str : "no-op change", logmsg);
7123 static const struct got_error *
7124 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7125 struct got_reference *branch, struct got_reference *new_base_branch,
7126 struct got_reference *tmp_branch, struct got_repository *repo)
7128 printf("Switching work tree to %s\n", got_ref_get_name(branch));
7129 return got_worktree_rebase_complete(worktree, fileindex,
7130 new_base_branch, tmp_branch, branch, repo);
7133 static const struct got_error *
7134 rebase_commit(struct got_pathlist_head *merged_paths,
7135 struct got_worktree *worktree, struct got_fileindex *fileindex,
7136 struct got_reference *tmp_branch,
7137 struct got_object_id *commit_id, struct got_repository *repo)
7139 const struct got_error *error;
7140 struct got_commit_object *commit;
7141 struct got_object_id *new_commit_id;
7143 error = got_object_open_as_commit(&commit, repo, commit_id);
7147 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7148 worktree, fileindex, tmp_branch, commit, commit_id, repo);
7150 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7152 error = show_rebase_progress(commit, commit_id, NULL);
7154 error = show_rebase_progress(commit, commit_id, new_commit_id);
7155 free(new_commit_id);
7158 got_object_commit_close(commit);
7162 struct check_path_prefix_arg {
7163 const char *path_prefix;
7168 static const struct got_error *
7169 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7170 struct got_blob_object *blob2, struct got_object_id *id1,
7171 struct got_object_id *id2, const char *path1, const char *path2,
7172 mode_t mode1, mode_t mode2, struct got_repository *repo)
7174 struct check_path_prefix_arg *a = arg;
7176 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7177 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7178 return got_error(a->errcode);
7183 static const struct got_error *
7184 check_path_prefix(struct got_object_id *parent_id,
7185 struct got_object_id *commit_id, const char *path_prefix,
7186 int errcode, struct got_repository *repo)
7188 const struct got_error *err;
7189 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7190 struct got_commit_object *commit = NULL, *parent_commit = NULL;
7191 struct check_path_prefix_arg cpp_arg;
7193 if (got_path_is_root_dir(path_prefix))
7196 err = got_object_open_as_commit(&commit, repo, commit_id);
7200 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7204 err = got_object_open_as_tree(&tree1, repo,
7205 got_object_commit_get_tree_id(parent_commit));
7209 err = got_object_open_as_tree(&tree2, repo,
7210 got_object_commit_get_tree_id(commit));
7214 cpp_arg.path_prefix = path_prefix;
7215 while (cpp_arg.path_prefix[0] == '/')
7216 cpp_arg.path_prefix++;
7217 cpp_arg.len = strlen(cpp_arg.path_prefix);
7218 cpp_arg.errcode = errcode;
7219 err = got_diff_tree(tree1, tree2, "", "", repo,
7220 check_path_prefix_in_diff, &cpp_arg, 0);
7223 got_object_tree_close(tree1);
7225 got_object_tree_close(tree2);
7227 got_object_commit_close(commit);
7229 got_object_commit_close(parent_commit);
7233 static const struct got_error *
7234 collect_commits(struct got_object_id_queue *commits,
7235 struct got_object_id *initial_commit_id,
7236 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7237 const char *path_prefix, int path_prefix_errcode,
7238 struct got_repository *repo)
7240 const struct got_error *err = NULL;
7241 struct got_commit_graph *graph = NULL;
7242 struct got_object_id *parent_id = NULL;
7243 struct got_object_qid *qid;
7244 struct got_object_id *commit_id = initial_commit_id;
7246 err = got_commit_graph_open(&graph, "/", 1);
7250 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7251 check_cancelled, NULL);
7254 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7255 err = got_commit_graph_iter_next(&parent_id, graph, repo,
7256 check_cancelled, NULL);
7258 if (err->code == GOT_ERR_ITER_COMPLETED) {
7259 err = got_error_msg(GOT_ERR_ANCESTRY,
7260 "ran out of commits to rebase before "
7261 "youngest common ancestor commit has "
7266 err = check_path_prefix(parent_id, commit_id,
7267 path_prefix, path_prefix_errcode, repo);
7271 err = got_object_qid_alloc(&qid, commit_id);
7274 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7275 commit_id = parent_id;
7279 got_commit_graph_close(graph);
7283 static const struct got_error *
7284 cmd_rebase(int argc, char *argv[])
7286 const struct got_error *error = NULL;
7287 struct got_worktree *worktree = NULL;
7288 struct got_repository *repo = NULL;
7289 struct got_fileindex *fileindex = NULL;
7291 struct got_reference *branch = NULL;
7292 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7293 struct got_object_id *commit_id = NULL, *parent_id = NULL;
7294 struct got_object_id *resume_commit_id = NULL;
7295 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7296 struct got_commit_object *commit = NULL;
7297 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7298 int histedit_in_progress = 0;
7299 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7300 struct got_object_id_queue commits;
7301 struct got_pathlist_head merged_paths;
7302 const struct got_object_id_queue *parent_ids;
7303 struct got_object_qid *qid, *pid;
7305 SIMPLEQ_INIT(&commits);
7306 TAILQ_INIT(&merged_paths);
7308 while ((ch = getopt(argc, argv, "ac")) != -1) {
7314 continue_rebase = 1;
7326 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7327 "unveil", NULL) == -1)
7330 if (abort_rebase && continue_rebase)
7332 else if (abort_rebase || continue_rebase) {
7335 } else if (argc != 1)
7338 cwd = getcwd(NULL, 0);
7340 error = got_error_from_errno("getcwd");
7343 error = got_worktree_open(&worktree, cwd);
7345 if (error->code == GOT_ERR_NOT_WORKTREE)
7346 error = wrap_not_worktree_error(error, "rebase", cwd);
7350 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7355 error = apply_unveil(got_repo_get_path(repo), 0,
7356 got_worktree_get_root_path(worktree));
7360 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7364 if (histedit_in_progress) {
7365 error = got_error(GOT_ERR_HISTEDIT_BUSY);
7369 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7374 struct got_update_progress_arg upa;
7375 if (!rebase_in_progress) {
7376 error = got_error(GOT_ERR_NOT_REBASING);
7379 error = got_worktree_rebase_continue(&resume_commit_id,
7380 &new_base_branch, &tmp_branch, &branch, &fileindex,
7384 printf("Switching work tree to %s\n",
7385 got_ref_get_symref_target(new_base_branch));
7386 memset(&upa, 0, sizeof(upa));
7387 error = got_worktree_rebase_abort(worktree, fileindex, repo,
7388 new_base_branch, update_progress, &upa);
7391 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7392 print_update_progress_stats(&upa);
7393 goto done; /* nothing else to do */
7396 if (continue_rebase) {
7397 if (!rebase_in_progress) {
7398 error = got_error(GOT_ERR_NOT_REBASING);
7401 error = got_worktree_rebase_continue(&resume_commit_id,
7402 &new_base_branch, &tmp_branch, &branch, &fileindex,
7407 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7408 resume_commit_id, repo);
7412 yca_id = got_object_id_dup(resume_commit_id);
7413 if (yca_id == NULL) {
7414 error = got_error_from_errno("got_object_id_dup");
7418 error = got_ref_open(&branch, repo, argv[0], 0);
7423 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7427 if (!continue_rebase) {
7428 struct got_object_id *base_commit_id;
7430 base_commit_id = got_worktree_get_base_commit_id(worktree);
7431 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7432 base_commit_id, branch_head_commit_id, repo,
7433 check_cancelled, NULL);
7436 if (yca_id == NULL) {
7437 error = got_error_msg(GOT_ERR_ANCESTRY,
7438 "specified branch shares no common ancestry "
7439 "with work tree's branch");
7443 error = check_same_branch(base_commit_id, branch, yca_id, repo);
7445 if (error->code != GOT_ERR_ANCESTRY)
7449 error = got_error_msg(GOT_ERR_SAME_BRANCH,
7450 "specified branch resolves to a commit which "
7451 "is already contained in work tree's branch");
7454 error = got_worktree_rebase_prepare(&new_base_branch,
7455 &tmp_branch, &fileindex, worktree, branch, repo);
7460 commit_id = branch_head_commit_id;
7461 error = got_object_open_as_commit(&commit, repo, commit_id);
7465 parent_ids = got_object_commit_get_parent_ids(commit);
7466 pid = SIMPLEQ_FIRST(parent_ids);
7468 if (!continue_rebase) {
7469 struct got_update_progress_arg upa;
7470 memset(&upa, 0, sizeof(upa));
7471 error = got_worktree_rebase_abort(worktree, fileindex,
7472 repo, new_base_branch, update_progress, &upa);
7475 printf("Rebase of %s aborted\n",
7476 got_ref_get_name(branch));
7477 print_update_progress_stats(&upa);
7480 error = got_error(GOT_ERR_EMPTY_REBASE);
7483 error = collect_commits(&commits, commit_id, pid->id,
7484 yca_id, got_worktree_get_path_prefix(worktree),
7485 GOT_ERR_REBASE_PATH, repo);
7486 got_object_commit_close(commit);
7491 if (SIMPLEQ_EMPTY(&commits)) {
7492 if (continue_rebase) {
7493 error = rebase_complete(worktree, fileindex,
7494 branch, new_base_branch, tmp_branch, repo);
7497 /* Fast-forward the reference of the branch. */
7498 struct got_object_id *new_head_commit_id;
7500 error = got_ref_resolve(&new_head_commit_id, repo,
7504 error = got_object_id_str(&id_str, new_head_commit_id);
7505 printf("Forwarding %s to commit %s\n",
7506 got_ref_get_name(branch), id_str);
7508 error = got_ref_change_ref(branch,
7509 new_head_commit_id);
7516 SIMPLEQ_FOREACH(qid, &commits, entry) {
7517 struct got_update_progress_arg upa;
7519 commit_id = qid->id;
7520 parent_id = pid ? pid->id : yca_id;
7523 memset(&upa, 0, sizeof(upa));
7524 error = got_worktree_rebase_merge_files(&merged_paths,
7525 worktree, fileindex, parent_id, commit_id, repo,
7526 update_progress, &upa, check_cancelled, NULL);
7530 print_update_progress_stats(&upa);
7531 if (upa.conflicts > 0)
7532 rebase_status = GOT_STATUS_CONFLICT;
7534 if (rebase_status == GOT_STATUS_CONFLICT) {
7535 error = show_rebase_merge_conflict(qid->id, repo);
7538 got_worktree_rebase_pathlist_free(&merged_paths);
7542 error = rebase_commit(&merged_paths, worktree, fileindex,
7543 tmp_branch, commit_id, repo);
7544 got_worktree_rebase_pathlist_free(&merged_paths);
7549 if (rebase_status == GOT_STATUS_CONFLICT) {
7550 error = got_worktree_rebase_postpone(worktree, fileindex);
7553 error = got_error_msg(GOT_ERR_CONFLICTS,
7554 "conflicts must be resolved before rebasing can continue");
7556 error = rebase_complete(worktree, fileindex, branch,
7557 new_base_branch, tmp_branch, repo);
7559 got_object_id_queue_free(&commits);
7560 free(branch_head_commit_id);
7561 free(resume_commit_id);
7564 got_object_commit_close(commit);
7566 got_ref_close(branch);
7567 if (new_base_branch)
7568 got_ref_close(new_base_branch);
7570 got_ref_close(tmp_branch);
7572 got_worktree_close(worktree);
7574 got_repo_close(repo);
7579 usage_histedit(void)
7581 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7586 #define GOT_HISTEDIT_PICK 'p'
7587 #define GOT_HISTEDIT_EDIT 'e'
7588 #define GOT_HISTEDIT_FOLD 'f'
7589 #define GOT_HISTEDIT_DROP 'd'
7590 #define GOT_HISTEDIT_MESG 'm'
7592 static struct got_histedit_cmd {
7596 } got_histedit_cmds[] = {
7597 { GOT_HISTEDIT_PICK, "pick", "use commit" },
7598 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7599 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7601 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7602 { GOT_HISTEDIT_MESG, "mesg",
7603 "single-line log message for commit above (open editor if empty)" },
7606 struct got_histedit_list_entry {
7607 TAILQ_ENTRY(got_histedit_list_entry) entry;
7608 struct got_object_id *commit_id;
7609 const struct got_histedit_cmd *cmd;
7612 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7614 static const struct got_error *
7615 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7616 FILE *f, struct got_repository *repo)
7618 const struct got_error *err = NULL;
7619 char *logmsg = NULL, *id_str = NULL;
7620 struct got_commit_object *commit = NULL;
7623 err = got_object_open_as_commit(&commit, repo, commit_id);
7627 err = get_short_logmsg(&logmsg, 34, commit);
7631 err = got_object_id_str(&id_str, commit_id);
7635 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7637 err = got_ferror(f, GOT_ERR_IO);
7640 got_object_commit_close(commit);
7646 static const struct got_error *
7647 histedit_write_commit_list(struct got_object_id_queue *commits,
7648 FILE *f, int edit_logmsg_only, struct got_repository *repo)
7650 const struct got_error *err = NULL;
7651 struct got_object_qid *qid;
7653 if (SIMPLEQ_EMPTY(commits))
7654 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7656 SIMPLEQ_FOREACH(qid, commits, entry) {
7657 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7661 if (edit_logmsg_only) {
7662 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7664 err = got_ferror(f, GOT_ERR_IO);
7673 static const struct got_error *
7674 write_cmd_list(FILE *f, const char *branch_name,
7675 struct got_object_id_queue *commits)
7677 const struct got_error *err = NULL;
7680 struct got_object_qid *qid;
7682 qid = SIMPLEQ_FIRST(commits);
7683 err = got_object_id_str(&id_str, qid->id);
7688 "# Editing the history of branch '%s' starting at\n"
7690 "# Commits will be processed in order from top to "
7691 "bottom of this file.\n", branch_name, id_str);
7693 err = got_ferror(f, GOT_ERR_IO);
7697 n = fprintf(f, "# Available histedit commands:\n");
7699 err = got_ferror(f, GOT_ERR_IO);
7703 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7704 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7705 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7708 err = got_ferror(f, GOT_ERR_IO);
7717 static const struct got_error *
7718 histedit_syntax_error(int lineno)
7720 static char msg[42];
7723 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7725 if (ret == -1 || ret >= sizeof(msg))
7726 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7728 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7731 static const struct got_error *
7732 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7733 char *logmsg, struct got_repository *repo)
7735 const struct got_error *err;
7736 struct got_commit_object *folded_commit = NULL;
7737 char *id_str, *folded_logmsg = NULL;
7739 err = got_object_id_str(&id_str, hle->commit_id);
7743 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7747 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7750 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7751 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7752 folded_logmsg) == -1) {
7753 err = got_error_from_errno("asprintf");
7757 got_object_commit_close(folded_commit);
7759 free(folded_logmsg);
7763 static struct got_histedit_list_entry *
7764 get_folded_commits(struct got_histedit_list_entry *hle)
7766 struct got_histedit_list_entry *prev, *folded = NULL;
7768 prev = TAILQ_PREV(hle, got_histedit_list, entry);
7769 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7770 prev->cmd->code == GOT_HISTEDIT_DROP)) {
7771 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7773 prev = TAILQ_PREV(prev, got_histedit_list, entry);
7779 static const struct got_error *
7780 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7781 struct got_repository *repo)
7783 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7784 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7785 const struct got_error *err = NULL;
7786 struct got_commit_object *commit = NULL;
7789 struct got_histedit_list_entry *folded = NULL;
7791 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7795 folded = get_folded_commits(hle);
7797 while (folded != hle) {
7798 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7799 folded = TAILQ_NEXT(folded, entry);
7802 err = append_folded_commit_msg(&new_msg, folded,
7808 folded = TAILQ_NEXT(folded, entry);
7812 err = got_object_id_str(&id_str, hle->commit_id);
7815 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7818 logmsg_len = asprintf(&new_msg,
7819 "%s\n# original log message of commit %s: %s",
7820 logmsg ? logmsg : "", id_str, orig_logmsg);
7821 if (logmsg_len == -1) {
7822 err = got_error_from_errno("asprintf");
7828 err = got_object_id_str(&id_str, hle->commit_id);
7832 err = got_opentemp_named_fd(&logmsg_path, &fd,
7833 GOT_TMPDIR_STR "/got-logmsg");
7837 write(fd, logmsg, logmsg_len);
7840 err = get_editor(&editor);
7844 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7846 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7848 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7851 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7852 err = got_error_from_errno2("unlink", logmsg_path);
7858 got_object_commit_close(commit);
7862 static const struct got_error *
7863 histedit_parse_list(struct got_histedit_list *histedit_cmds,
7864 FILE *f, struct got_repository *repo)
7866 const struct got_error *err = NULL;
7867 char *line = NULL, *p, *end;
7871 const struct got_histedit_cmd *cmd;
7872 struct got_object_id *commit_id = NULL;
7873 struct got_histedit_list_entry *hle = NULL;
7876 len = getline(&line, &size, f);
7878 const struct got_error *getline_err;
7881 getline_err = got_error_from_errno("getline");
7882 err = got_ferror(f, getline_err->code);
7887 while (isspace((unsigned char)p[0]))
7889 if (p[0] == '#' || p[0] == '\0') {
7895 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7896 cmd = &got_histedit_cmds[i];
7897 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7898 isspace((unsigned char)p[strlen(cmd->name)])) {
7899 p += strlen(cmd->name);
7902 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7907 if (i == nitems(got_histedit_cmds)) {
7908 err = histedit_syntax_error(lineno);
7911 while (isspace((unsigned char)p[0]))
7913 if (cmd->code == GOT_HISTEDIT_MESG) {
7914 if (hle == NULL || hle->logmsg != NULL) {
7915 err = got_error(GOT_ERR_HISTEDIT_CMD);
7919 err = histedit_edit_logmsg(hle, repo);
7923 hle->logmsg = strdup(p);
7924 if (hle->logmsg == NULL) {
7925 err = got_error_from_errno("strdup");
7934 while (end[0] && !isspace((unsigned char)end[0]))
7938 err = got_object_resolve_id_str(&commit_id, repo, p);
7940 /* override error code */
7941 err = histedit_syntax_error(lineno);
7945 hle = malloc(sizeof(*hle));
7947 err = got_error_from_errno("malloc");
7951 hle->commit_id = commit_id;
7956 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7964 static const struct got_error *
7965 histedit_check_script(struct got_histedit_list *histedit_cmds,
7966 struct got_object_id_queue *commits, struct got_repository *repo)
7968 const struct got_error *err = NULL;
7969 struct got_object_qid *qid;
7970 struct got_histedit_list_entry *hle;
7971 static char msg[92];
7974 if (TAILQ_EMPTY(histedit_cmds))
7975 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7976 "histedit script contains no commands");
7977 if (SIMPLEQ_EMPTY(commits))
7978 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7980 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7981 struct got_histedit_list_entry *hle2;
7982 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7985 if (got_object_id_cmp(hle->commit_id,
7986 hle2->commit_id) != 0)
7988 err = got_object_id_str(&id_str, hle->commit_id);
7991 snprintf(msg, sizeof(msg), "commit %s is listed "
7992 "more than once in histedit script", id_str);
7994 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7998 SIMPLEQ_FOREACH(qid, commits, entry) {
7999 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8000 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8004 err = got_object_id_str(&id_str, qid->id);
8007 snprintf(msg, sizeof(msg),
8008 "commit %s missing from histedit script", id_str);
8010 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8014 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8015 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8016 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8017 "last commit in histedit script cannot be folded");
8022 static const struct got_error *
8023 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8024 const char *path, struct got_object_id_queue *commits,
8025 struct got_repository *repo)
8027 const struct got_error *err = NULL;
8031 err = get_editor(&editor);
8035 if (spawn_editor(editor, path) == -1) {
8036 err = got_error_from_errno("failed spawning editor");
8040 f = fopen(path, "r");
8042 err = got_error_from_errno("fopen");
8045 err = histedit_parse_list(histedit_cmds, f, repo);
8049 err = histedit_check_script(histedit_cmds, commits, repo);
8051 if (f && fclose(f) != 0 && err == NULL)
8052 err = got_error_from_errno("fclose");
8057 static const struct got_error *
8058 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8059 struct got_object_id_queue *, const char *, const char *,
8060 struct got_repository *);
8062 static const struct got_error *
8063 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8064 struct got_object_id_queue *commits, const char *branch_name,
8065 int edit_logmsg_only, struct got_repository *repo)
8067 const struct got_error *err;
8071 err = got_opentemp_named(&path, &f, "got-histedit");
8075 err = write_cmd_list(f, branch_name, commits);
8079 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
8083 if (edit_logmsg_only) {
8085 err = histedit_parse_list(histedit_cmds, f, repo);
8087 if (fclose(f) != 0) {
8088 err = got_error_from_errno("fclose");
8092 err = histedit_run_editor(histedit_cmds, path, commits, repo);
8094 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8095 err->code != GOT_ERR_HISTEDIT_CMD)
8097 err = histedit_edit_list_retry(histedit_cmds, err,
8098 commits, path, branch_name, repo);
8102 if (f && fclose(f) != 0 && err == NULL)
8103 err = got_error_from_errno("fclose");
8104 if (path && unlink(path) != 0 && err == NULL)
8105 err = got_error_from_errno2("unlink", path);
8110 static const struct got_error *
8111 histedit_save_list(struct got_histedit_list *histedit_cmds,
8112 struct got_worktree *worktree, struct got_repository *repo)
8114 const struct got_error *err = NULL;
8117 struct got_histedit_list_entry *hle;
8118 struct got_commit_object *commit = NULL;
8120 err = got_worktree_get_histedit_script_path(&path, worktree);
8124 f = fopen(path, "w");
8126 err = got_error_from_errno2("fopen", path);
8129 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8130 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8136 int n = fprintf(f, "%c %s\n",
8137 GOT_HISTEDIT_MESG, hle->logmsg);
8139 err = got_ferror(f, GOT_ERR_IO);
8145 if (f && fclose(f) != 0 && err == NULL)
8146 err = got_error_from_errno("fclose");
8149 got_object_commit_close(commit);
8154 histedit_free_list(struct got_histedit_list *histedit_cmds)
8156 struct got_histedit_list_entry *hle;
8158 while ((hle = TAILQ_FIRST(histedit_cmds))) {
8159 TAILQ_REMOVE(histedit_cmds, hle, entry);
8164 static const struct got_error *
8165 histedit_load_list(struct got_histedit_list *histedit_cmds,
8166 const char *path, struct got_repository *repo)
8168 const struct got_error *err = NULL;
8171 f = fopen(path, "r");
8173 err = got_error_from_errno2("fopen", path);
8177 err = histedit_parse_list(histedit_cmds, f, repo);
8179 if (f && fclose(f) != 0 && err == NULL)
8180 err = got_error_from_errno("fclose");
8184 static const struct got_error *
8185 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8186 const struct got_error *edit_err, struct got_object_id_queue *commits,
8187 const char *path, const char *branch_name, struct got_repository *repo)
8189 const struct got_error *err = NULL, *prev_err = edit_err;
8192 while (resp != 'c' && resp != 'r' && resp != 'a') {
8193 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8194 "or (a)bort: ", getprogname(), prev_err->msg);
8199 histedit_free_list(histedit_cmds);
8200 err = histedit_run_editor(histedit_cmds, path, commits,
8203 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8204 err->code != GOT_ERR_HISTEDIT_CMD)
8211 } else if (resp == 'r') {
8212 histedit_free_list(histedit_cmds);
8213 err = histedit_edit_script(histedit_cmds,
8214 commits, branch_name, 0, repo);
8216 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8217 err->code != GOT_ERR_HISTEDIT_CMD)
8224 } else if (resp == 'a') {
8225 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8228 printf("invalid response '%c'\n", resp);
8234 static const struct got_error *
8235 histedit_complete(struct got_worktree *worktree,
8236 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8237 struct got_reference *branch, struct got_repository *repo)
8239 printf("Switching work tree to %s\n",
8240 got_ref_get_symref_target(branch));
8241 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8245 static const struct got_error *
8246 show_histedit_progress(struct got_commit_object *commit,
8247 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8249 const struct got_error *err;
8250 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8252 err = got_object_id_str(&old_id_str, hle->commit_id);
8257 err = got_object_id_str(&new_id_str, new_id);
8262 old_id_str[12] = '\0';
8264 new_id_str[12] = '\0';
8267 logmsg = strdup(hle->logmsg);
8268 if (logmsg == NULL) {
8269 err = got_error_from_errno("strdup");
8272 trim_logmsg(logmsg, 42);
8274 err = get_short_logmsg(&logmsg, 42, commit);
8279 switch (hle->cmd->code) {
8280 case GOT_HISTEDIT_PICK:
8281 case GOT_HISTEDIT_EDIT:
8282 printf("%s -> %s: %s\n", old_id_str,
8283 new_id_str ? new_id_str : "no-op change", logmsg);
8285 case GOT_HISTEDIT_DROP:
8286 case GOT_HISTEDIT_FOLD:
8287 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8299 static const struct got_error *
8300 histedit_commit(struct got_pathlist_head *merged_paths,
8301 struct got_worktree *worktree, struct got_fileindex *fileindex,
8302 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8303 struct got_repository *repo)
8305 const struct got_error *err;
8306 struct got_commit_object *commit;
8307 struct got_object_id *new_commit_id;
8309 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8310 && hle->logmsg == NULL) {
8311 err = histedit_edit_logmsg(hle, repo);
8316 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8320 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8321 worktree, fileindex, tmp_branch, commit, hle->commit_id,
8324 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8326 err = show_histedit_progress(commit, hle, NULL);
8328 err = show_histedit_progress(commit, hle, new_commit_id);
8329 free(new_commit_id);
8332 got_object_commit_close(commit);
8336 static const struct got_error *
8337 histedit_skip_commit(struct got_histedit_list_entry *hle,
8338 struct got_worktree *worktree, struct got_repository *repo)
8340 const struct got_error *error;
8341 struct got_commit_object *commit;
8343 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8348 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8352 error = show_histedit_progress(commit, hle, NULL);
8353 got_object_commit_close(commit);
8357 static const struct got_error *
8358 check_local_changes(void *arg, unsigned char status,
8359 unsigned char staged_status, const char *path,
8360 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8361 struct got_object_id *commit_id, int dirfd, const char *de_name)
8363 int *have_local_changes = arg;
8366 case GOT_STATUS_ADD:
8367 case GOT_STATUS_DELETE:
8368 case GOT_STATUS_MODIFY:
8369 case GOT_STATUS_CONFLICT:
8370 *have_local_changes = 1;
8371 return got_error(GOT_ERR_CANCELLED);
8376 switch (staged_status) {
8377 case GOT_STATUS_ADD:
8378 case GOT_STATUS_DELETE:
8379 case GOT_STATUS_MODIFY:
8380 *have_local_changes = 1;
8381 return got_error(GOT_ERR_CANCELLED);
8389 static const struct got_error *
8390 cmd_histedit(int argc, char *argv[])
8392 const struct got_error *error = NULL;
8393 struct got_worktree *worktree = NULL;
8394 struct got_fileindex *fileindex = NULL;
8395 struct got_repository *repo = NULL;
8397 struct got_reference *branch = NULL;
8398 struct got_reference *tmp_branch = NULL;
8399 struct got_object_id *resume_commit_id = NULL;
8400 struct got_object_id *base_commit_id = NULL;
8401 struct got_object_id *head_commit_id = NULL;
8402 struct got_commit_object *commit = NULL;
8403 int ch, rebase_in_progress = 0;
8404 struct got_update_progress_arg upa;
8405 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8406 int edit_logmsg_only = 0;
8407 const char *edit_script_path = NULL;
8408 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8409 struct got_object_id_queue commits;
8410 struct got_pathlist_head merged_paths;
8411 const struct got_object_id_queue *parent_ids;
8412 struct got_object_qid *pid;
8413 struct got_histedit_list histedit_cmds;
8414 struct got_histedit_list_entry *hle;
8416 SIMPLEQ_INIT(&commits);
8417 TAILQ_INIT(&histedit_cmds);
8418 TAILQ_INIT(&merged_paths);
8419 memset(&upa, 0, sizeof(upa));
8421 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8430 edit_script_path = optarg;
8433 edit_logmsg_only = 1;
8445 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8446 "unveil", NULL) == -1)
8449 if (abort_edit && continue_edit)
8450 errx(1, "histedit's -a and -c options are mutually exclusive");
8451 if (edit_script_path && edit_logmsg_only)
8452 errx(1, "histedit's -F and -m options are mutually exclusive");
8453 if (abort_edit && edit_logmsg_only)
8454 errx(1, "histedit's -a and -m options are mutually exclusive");
8455 if (continue_edit && edit_logmsg_only)
8456 errx(1, "histedit's -c and -m options are mutually exclusive");
8461 * This command cannot apply unveil(2) in all cases because the
8462 * user may choose to run an editor to edit the histedit script
8463 * and to edit individual commit log messages.
8464 * unveil(2) traverses exec(2); if an editor is used we have to
8465 * apply unveil after edit script and log messages have been written.
8466 * XXX TODO: Make use of unveil(2) where possible.
8469 cwd = getcwd(NULL, 0);
8471 error = got_error_from_errno("getcwd");
8474 error = got_worktree_open(&worktree, cwd);
8476 if (error->code == GOT_ERR_NOT_WORKTREE)
8477 error = wrap_not_worktree_error(error, "histedit", cwd);
8481 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8486 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8489 if (rebase_in_progress) {
8490 error = got_error(GOT_ERR_REBASING);
8494 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8498 if (edit_in_progress && edit_logmsg_only) {
8499 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8500 "histedit operation is in progress in this "
8501 "work tree and must be continued or aborted "
8502 "before the -m option can be used");
8506 if (edit_in_progress && abort_edit) {
8507 error = got_worktree_histedit_continue(&resume_commit_id,
8508 &tmp_branch, &branch, &base_commit_id, &fileindex,
8512 printf("Switching work tree to %s\n",
8513 got_ref_get_symref_target(branch));
8514 error = got_worktree_histedit_abort(worktree, fileindex, repo,
8515 branch, base_commit_id, update_progress, &upa);
8518 printf("Histedit of %s aborted\n",
8519 got_ref_get_symref_target(branch));
8520 print_update_progress_stats(&upa);
8521 goto done; /* nothing else to do */
8522 } else if (abort_edit) {
8523 error = got_error(GOT_ERR_NOT_HISTEDIT);
8527 if (continue_edit) {
8530 if (!edit_in_progress) {
8531 error = got_error(GOT_ERR_NOT_HISTEDIT);
8535 error = got_worktree_get_histedit_script_path(&path, worktree);
8539 error = histedit_load_list(&histedit_cmds, path, repo);
8544 error = got_worktree_histedit_continue(&resume_commit_id,
8545 &tmp_branch, &branch, &base_commit_id, &fileindex,
8550 error = got_ref_resolve(&head_commit_id, repo, branch);
8554 error = got_object_open_as_commit(&commit, repo,
8558 parent_ids = got_object_commit_get_parent_ids(commit);
8559 pid = SIMPLEQ_FIRST(parent_ids);
8561 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8564 error = collect_commits(&commits, head_commit_id, pid->id,
8565 base_commit_id, got_worktree_get_path_prefix(worktree),
8566 GOT_ERR_HISTEDIT_PATH, repo);
8567 got_object_commit_close(commit);
8572 if (edit_in_progress) {
8573 error = got_error(GOT_ERR_HISTEDIT_BUSY);
8577 error = got_ref_open(&branch, repo,
8578 got_worktree_get_head_ref_name(worktree), 0);
8582 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8583 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8584 "will not edit commit history of a branch outside "
8585 "the \"refs/heads/\" reference namespace");
8589 error = got_ref_resolve(&head_commit_id, repo, branch);
8590 got_ref_close(branch);
8595 error = got_object_open_as_commit(&commit, repo,
8599 parent_ids = got_object_commit_get_parent_ids(commit);
8600 pid = SIMPLEQ_FIRST(parent_ids);
8602 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8605 error = collect_commits(&commits, head_commit_id, pid->id,
8606 got_worktree_get_base_commit_id(worktree),
8607 got_worktree_get_path_prefix(worktree),
8608 GOT_ERR_HISTEDIT_PATH, repo);
8609 got_object_commit_close(commit);
8614 if (SIMPLEQ_EMPTY(&commits)) {
8615 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8619 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8620 &base_commit_id, &fileindex, worktree, repo);
8624 if (edit_script_path) {
8625 error = histedit_load_list(&histedit_cmds,
8626 edit_script_path, repo);
8628 got_worktree_histedit_abort(worktree, fileindex,
8629 repo, branch, base_commit_id,
8630 update_progress, &upa);
8631 print_update_progress_stats(&upa);
8635 const char *branch_name;
8636 branch_name = got_ref_get_symref_target(branch);
8637 if (strncmp(branch_name, "refs/heads/", 11) == 0)
8639 error = histedit_edit_script(&histedit_cmds, &commits,
8640 branch_name, edit_logmsg_only, repo);
8642 got_worktree_histedit_abort(worktree, fileindex,
8643 repo, branch, base_commit_id,
8644 update_progress, &upa);
8645 print_update_progress_stats(&upa);
8651 error = histedit_save_list(&histedit_cmds, worktree,
8654 got_worktree_histedit_abort(worktree, fileindex,
8655 repo, branch, base_commit_id,
8656 update_progress, &upa);
8657 print_update_progress_stats(&upa);
8663 error = histedit_check_script(&histedit_cmds, &commits, repo);
8667 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8668 if (resume_commit_id) {
8669 if (got_object_id_cmp(hle->commit_id,
8670 resume_commit_id) != 0)
8673 resume_commit_id = NULL;
8674 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8675 hle->cmd->code == GOT_HISTEDIT_FOLD) {
8676 error = histedit_skip_commit(hle, worktree,
8681 struct got_pathlist_head paths;
8682 int have_changes = 0;
8685 error = got_pathlist_append(&paths, "", NULL);
8688 error = got_worktree_status(worktree, &paths,
8689 repo, check_local_changes, &have_changes,
8690 check_cancelled, NULL);
8691 got_pathlist_free(&paths);
8693 if (error->code != GOT_ERR_CANCELLED)
8695 if (sigint_received || sigpipe_received)
8699 error = histedit_commit(NULL, worktree,
8700 fileindex, tmp_branch, hle, repo);
8704 error = got_object_open_as_commit(
8705 &commit, repo, hle->commit_id);
8708 error = show_histedit_progress(commit,
8710 got_object_commit_close(commit);
8719 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8720 error = histedit_skip_commit(hle, worktree, repo);
8726 error = got_object_open_as_commit(&commit, repo,
8730 parent_ids = got_object_commit_get_parent_ids(commit);
8731 pid = SIMPLEQ_FIRST(parent_ids);
8733 error = got_worktree_histedit_merge_files(&merged_paths,
8734 worktree, fileindex, pid->id, hle->commit_id, repo,
8735 update_progress, &upa, check_cancelled, NULL);
8738 got_object_commit_close(commit);
8741 print_update_progress_stats(&upa);
8742 if (upa.conflicts > 0)
8743 rebase_status = GOT_STATUS_CONFLICT;
8745 if (rebase_status == GOT_STATUS_CONFLICT) {
8746 error = show_rebase_merge_conflict(hle->commit_id,
8750 got_worktree_rebase_pathlist_free(&merged_paths);
8754 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8756 error = got_object_id_str(&id_str, hle->commit_id);
8759 printf("Stopping histedit for amending commit %s\n",
8762 got_worktree_rebase_pathlist_free(&merged_paths);
8763 error = got_worktree_histedit_postpone(worktree,
8768 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8769 error = histedit_skip_commit(hle, worktree, repo);
8775 error = histedit_commit(&merged_paths, worktree, fileindex,
8776 tmp_branch, hle, repo);
8777 got_worktree_rebase_pathlist_free(&merged_paths);
8782 if (rebase_status == GOT_STATUS_CONFLICT) {
8783 error = got_worktree_histedit_postpone(worktree, fileindex);
8786 error = got_error_msg(GOT_ERR_CONFLICTS,
8787 "conflicts must be resolved before histedit can continue");
8789 error = histedit_complete(worktree, fileindex, tmp_branch,
8792 got_object_id_queue_free(&commits);
8793 histedit_free_list(&histedit_cmds);
8794 free(head_commit_id);
8795 free(base_commit_id);
8796 free(resume_commit_id);
8798 got_object_commit_close(commit);
8800 got_ref_close(branch);
8802 got_ref_close(tmp_branch);
8804 got_worktree_close(worktree);
8806 got_repo_close(repo);
8811 usage_integrate(void)
8813 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8817 static const struct got_error *
8818 cmd_integrate(int argc, char *argv[])
8820 const struct got_error *error = NULL;
8821 struct got_repository *repo = NULL;
8822 struct got_worktree *worktree = NULL;
8823 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8824 const char *branch_arg = NULL;
8825 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8826 struct got_fileindex *fileindex = NULL;
8827 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8829 struct got_update_progress_arg upa;
8831 while ((ch = getopt(argc, argv, "")) != -1) {
8844 branch_arg = argv[0];
8846 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8847 "unveil", NULL) == -1)
8850 cwd = getcwd(NULL, 0);
8852 error = got_error_from_errno("getcwd");
8856 error = got_worktree_open(&worktree, cwd);
8858 if (error->code == GOT_ERR_NOT_WORKTREE)
8859 error = wrap_not_worktree_error(error, "integrate",
8864 error = check_rebase_or_histedit_in_progress(worktree);
8868 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8873 error = apply_unveil(got_repo_get_path(repo), 0,
8874 got_worktree_get_root_path(worktree));
8878 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8879 error = got_error_from_errno("asprintf");
8883 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8884 &base_branch_ref, worktree, refname, repo);
8888 refname = strdup(got_ref_get_name(branch_ref));
8889 if (refname == NULL) {
8890 error = got_error_from_errno("strdup");
8891 got_worktree_integrate_abort(worktree, fileindex, repo,
8892 branch_ref, base_branch_ref);
8895 base_refname = strdup(got_ref_get_name(base_branch_ref));
8896 if (base_refname == NULL) {
8897 error = got_error_from_errno("strdup");
8898 got_worktree_integrate_abort(worktree, fileindex, repo,
8899 branch_ref, base_branch_ref);
8903 error = got_ref_resolve(&commit_id, repo, branch_ref);
8907 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8911 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8912 error = got_error_msg(GOT_ERR_SAME_BRANCH,
8913 "specified branch has already been integrated");
8914 got_worktree_integrate_abort(worktree, fileindex, repo,
8915 branch_ref, base_branch_ref);
8919 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8921 if (error->code == GOT_ERR_ANCESTRY)
8922 error = got_error(GOT_ERR_REBASE_REQUIRED);
8923 got_worktree_integrate_abort(worktree, fileindex, repo,
8924 branch_ref, base_branch_ref);
8928 memset(&upa, 0, sizeof(upa));
8929 error = got_worktree_integrate_continue(worktree, fileindex, repo,
8930 branch_ref, base_branch_ref, update_progress, &upa,
8931 check_cancelled, NULL);
8935 printf("Integrated %s into %s\n", refname, base_refname);
8936 print_update_progress_stats(&upa);
8939 got_repo_close(repo);
8941 got_worktree_close(worktree);
8943 free(base_commit_id);
8953 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8954 "[-S] [file-path ...]\n",
8959 static const struct got_error *
8960 print_stage(void *arg, unsigned char status, unsigned char staged_status,
8961 const char *path, struct got_object_id *blob_id,
8962 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8963 int dirfd, const char *de_name)
8965 const struct got_error *err = NULL;
8966 char *id_str = NULL;
8968 if (staged_status != GOT_STATUS_ADD &&
8969 staged_status != GOT_STATUS_MODIFY &&
8970 staged_status != GOT_STATUS_DELETE)
8973 if (staged_status == GOT_STATUS_ADD ||
8974 staged_status == GOT_STATUS_MODIFY)
8975 err = got_object_id_str(&id_str, staged_blob_id);
8977 err = got_object_id_str(&id_str, blob_id);
8981 printf("%s %c %s\n", id_str, staged_status, path);
8986 static const struct got_error *
8987 cmd_stage(int argc, char *argv[])
8989 const struct got_error *error = NULL;
8990 struct got_repository *repo = NULL;
8991 struct got_worktree *worktree = NULL;
8993 struct got_pathlist_head paths;
8994 struct got_pathlist_entry *pe;
8995 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
8996 FILE *patch_script_file = NULL;
8997 const char *patch_script_path = NULL;
8998 struct choose_patch_arg cpa;
9002 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9011 patch_script_path = optarg;
9014 allow_bad_symlinks = 1;
9026 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9027 "unveil", NULL) == -1)
9030 if (list_stage && (pflag || patch_script_path))
9031 errx(1, "-l option cannot be used with other options");
9032 if (patch_script_path && !pflag)
9033 errx(1, "-F option can only be used together with -p option");
9035 cwd = getcwd(NULL, 0);
9037 error = got_error_from_errno("getcwd");
9041 error = got_worktree_open(&worktree, cwd);
9043 if (error->code == GOT_ERR_NOT_WORKTREE)
9044 error = wrap_not_worktree_error(error, "stage", cwd);
9048 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9053 if (patch_script_path) {
9054 patch_script_file = fopen(patch_script_path, "r");
9055 if (patch_script_file == NULL) {
9056 error = got_error_from_errno2("fopen",
9061 error = apply_unveil(got_repo_get_path(repo), 0,
9062 got_worktree_get_root_path(worktree));
9066 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9071 error = got_worktree_status(worktree, &paths, repo,
9072 print_stage, NULL, check_cancelled, NULL);
9074 cpa.patch_script_file = patch_script_file;
9075 cpa.action = "stage";
9076 error = got_worktree_stage(worktree, &paths,
9077 pflag ? NULL : print_status, NULL,
9078 pflag ? choose_patch : NULL, &cpa,
9079 allow_bad_symlinks, repo);
9082 if (patch_script_file && fclose(patch_script_file) == EOF &&
9084 error = got_error_from_errno2("fclose", patch_script_path);
9086 got_repo_close(repo);
9088 got_worktree_close(worktree);
9089 TAILQ_FOREACH(pe, &paths, entry)
9090 free((char *)pe->path);
9091 got_pathlist_free(&paths);
9099 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9100 "[file-path ...]\n",
9106 static const struct got_error *
9107 cmd_unstage(int argc, char *argv[])
9109 const struct got_error *error = NULL;
9110 struct got_repository *repo = NULL;
9111 struct got_worktree *worktree = NULL;
9113 struct got_pathlist_head paths;
9114 struct got_pathlist_entry *pe;
9116 struct got_update_progress_arg upa;
9117 FILE *patch_script_file = NULL;
9118 const char *patch_script_path = NULL;
9119 struct choose_patch_arg cpa;
9123 while ((ch = getopt(argc, argv, "pF:")) != -1) {
9129 patch_script_path = optarg;
9141 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9142 "unveil", NULL) == -1)
9145 if (patch_script_path && !pflag)
9146 errx(1, "-F option can only be used together with -p option");
9148 cwd = getcwd(NULL, 0);
9150 error = got_error_from_errno("getcwd");
9154 error = got_worktree_open(&worktree, cwd);
9156 if (error->code == GOT_ERR_NOT_WORKTREE)
9157 error = wrap_not_worktree_error(error, "unstage", cwd);
9161 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9166 if (patch_script_path) {
9167 patch_script_file = fopen(patch_script_path, "r");
9168 if (patch_script_file == NULL) {
9169 error = got_error_from_errno2("fopen",
9175 error = apply_unveil(got_repo_get_path(repo), 0,
9176 got_worktree_get_root_path(worktree));
9180 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9184 cpa.patch_script_file = patch_script_file;
9185 cpa.action = "unstage";
9186 memset(&upa, 0, sizeof(upa));
9187 error = got_worktree_unstage(worktree, &paths, update_progress,
9188 &upa, pflag ? choose_patch : NULL, &cpa, repo);
9190 print_update_progress_stats(&upa);
9192 if (patch_script_file && fclose(patch_script_file) == EOF &&
9194 error = got_error_from_errno2("fclose", patch_script_path);
9196 got_repo_close(repo);
9198 got_worktree_close(worktree);
9199 TAILQ_FOREACH(pe, &paths, entry)
9200 free((char *)pe->path);
9201 got_pathlist_free(&paths);
9209 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9210 "arg1 [arg2 ...]\n", getprogname());
9214 static const struct got_error *
9215 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9217 const struct got_error *err;
9218 struct got_blob_object *blob;
9220 err = got_object_open_as_blob(&blob, repo, id, 8192);
9224 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9225 got_object_blob_close(blob);
9229 static const struct got_error *
9230 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9232 const struct got_error *err;
9233 struct got_tree_object *tree;
9236 err = got_object_open_as_tree(&tree, repo, id);
9240 nentries = got_object_tree_get_nentries(tree);
9241 for (i = 0; i < nentries; i++) {
9242 struct got_tree_entry *te;
9244 if (sigint_received || sigpipe_received)
9246 te = got_object_tree_get_entry(tree, i);
9247 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9250 fprintf(outfile, "%s %.7o %s\n", id_str,
9251 got_tree_entry_get_mode(te),
9252 got_tree_entry_get_name(te));
9256 got_object_tree_close(tree);
9260 static const struct got_error *
9261 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9263 const struct got_error *err;
9264 struct got_commit_object *commit;
9265 const struct got_object_id_queue *parent_ids;
9266 struct got_object_qid *pid;
9267 char *id_str = NULL;
9268 const char *logmsg = NULL;
9270 err = got_object_open_as_commit(&commit, repo, id);
9274 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9278 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9279 parent_ids = got_object_commit_get_parent_ids(commit);
9280 fprintf(outfile, "numparents %d\n",
9281 got_object_commit_get_nparents(commit));
9282 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9284 err = got_object_id_str(&pid_str, pid->id);
9287 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9290 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9291 got_object_commit_get_author(commit),
9292 got_object_commit_get_author_time(commit));
9294 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9295 got_object_commit_get_author(commit),
9296 got_object_commit_get_committer_time(commit));
9298 logmsg = got_object_commit_get_logmsg_raw(commit);
9299 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9300 fprintf(outfile, "%s", logmsg);
9303 got_object_commit_close(commit);
9307 static const struct got_error *
9308 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9310 const struct got_error *err;
9311 struct got_tag_object *tag;
9312 char *id_str = NULL;
9313 const char *tagmsg = NULL;
9315 err = got_object_open_as_tag(&tag, repo, id);
9319 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9323 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9325 switch (got_object_tag_get_object_type(tag)) {
9326 case GOT_OBJ_TYPE_BLOB:
9327 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9328 GOT_OBJ_LABEL_BLOB);
9330 case GOT_OBJ_TYPE_TREE:
9331 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9332 GOT_OBJ_LABEL_TREE);
9334 case GOT_OBJ_TYPE_COMMIT:
9335 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9336 GOT_OBJ_LABEL_COMMIT);
9338 case GOT_OBJ_TYPE_TAG:
9339 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9346 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9347 got_object_tag_get_name(tag));
9349 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9350 got_object_tag_get_tagger(tag),
9351 got_object_tag_get_tagger_time(tag));
9353 tagmsg = got_object_tag_get_message(tag);
9354 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9355 fprintf(outfile, "%s", tagmsg);
9358 got_object_tag_close(tag);
9362 static const struct got_error *
9363 cmd_cat(int argc, char *argv[])
9365 const struct got_error *error;
9366 struct got_repository *repo = NULL;
9367 struct got_worktree *worktree = NULL;
9368 char *cwd = NULL, *repo_path = NULL, *label = NULL;
9369 const char *commit_id_str = NULL;
9370 struct got_object_id *id = NULL, *commit_id = NULL;
9371 int ch, obj_type, i, force_path = 0;
9374 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9379 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9382 commit_id_str = optarg;
9385 repo_path = realpath(optarg, NULL);
9386 if (repo_path == NULL)
9387 return got_error_from_errno2("realpath",
9389 got_path_strip_trailing_slashes(repo_path);
9403 cwd = getcwd(NULL, 0);
9405 error = got_error_from_errno("getcwd");
9408 error = got_worktree_open(&worktree, cwd);
9409 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9412 if (repo_path == NULL) {
9414 got_worktree_get_repo_path(worktree));
9415 if (repo_path == NULL) {
9416 error = got_error_from_errno("strdup");
9422 if (repo_path == NULL) {
9423 repo_path = getcwd(NULL, 0);
9424 if (repo_path == NULL)
9425 return got_error_from_errno("getcwd");
9428 error = got_repo_open(&repo, repo_path, NULL);
9433 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9437 if (commit_id_str == NULL)
9438 commit_id_str = GOT_REF_HEAD;
9439 error = got_repo_match_object_id(&commit_id, NULL,
9440 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9444 for (i = 0; i < argc; i++) {
9446 error = got_object_id_by_path(&id, repo, commit_id,
9451 error = got_repo_match_object_id(&id, &label, argv[i],
9452 GOT_OBJ_TYPE_ANY, 0, repo);
9454 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9455 error->code != GOT_ERR_NOT_REF)
9457 error = got_object_id_by_path(&id, repo,
9458 commit_id, argv[i]);
9464 error = got_object_get_type(&obj_type, repo, id);
9469 case GOT_OBJ_TYPE_BLOB:
9470 error = cat_blob(id, repo, stdout);
9472 case GOT_OBJ_TYPE_TREE:
9473 error = cat_tree(id, repo, stdout);
9475 case GOT_OBJ_TYPE_COMMIT:
9476 error = cat_commit(id, repo, stdout);
9478 case GOT_OBJ_TYPE_TAG:
9479 error = cat_tag(id, repo, stdout);
9482 error = got_error(GOT_ERR_OBJ_TYPE);
9497 got_worktree_close(worktree);
9499 const struct got_error *repo_error;
9500 repo_error = got_repo_close(repo);
9510 fprintf(stderr, "usage: %s info [path ...]\n",
9515 static const struct got_error *
9516 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9517 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9518 struct got_object_id *commit_id)
9520 const struct got_error *err = NULL;
9521 char *id_str = NULL;
9523 struct tm mytm, *tm;
9524 struct got_pathlist_head *paths = arg;
9525 struct got_pathlist_entry *pe;
9528 * Clear error indication from any of the path arguments which
9529 * would cause this file index entry to be displayed.
9531 TAILQ_FOREACH(pe, paths, entry) {
9532 if (got_path_cmp(path, pe->path, strlen(path),
9533 pe->path_len) == 0 ||
9534 got_path_is_child(path, pe->path, pe->path_len))
9535 pe->data = NULL; /* no error */
9538 printf(GOT_COMMIT_SEP_STR);
9540 printf("symlink: %s\n", path);
9541 else if (S_ISREG(mode)) {
9542 printf("file: %s\n", path);
9543 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9544 } else if (S_ISDIR(mode))
9545 printf("directory: %s\n", path);
9547 printf("something: %s\n", path);
9549 tm = localtime_r(&mtime, &mytm);
9552 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9553 return got_error(GOT_ERR_NO_SPACE);
9554 printf("timestamp: %s\n", datebuf);
9557 err = got_object_id_str(&id_str, blob_id);
9560 printf("based on blob: %s\n", id_str);
9564 if (staged_blob_id) {
9565 err = got_object_id_str(&id_str, staged_blob_id);
9568 printf("based on staged blob: %s\n", id_str);
9573 err = got_object_id_str(&id_str, commit_id);
9576 printf("based on commit: %s\n", id_str);
9583 static const struct got_error *
9584 cmd_info(int argc, char *argv[])
9586 const struct got_error *error = NULL;
9587 struct got_worktree *worktree = NULL;
9588 char *cwd = NULL, *id_str = NULL;
9589 struct got_pathlist_head paths;
9590 struct got_pathlist_entry *pe;
9591 char *uuidstr = NULL;
9592 int ch, show_files = 0;
9596 while ((ch = getopt(argc, argv, "")) != -1) {
9608 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9612 cwd = getcwd(NULL, 0);
9614 error = got_error_from_errno("getcwd");
9618 error = got_worktree_open(&worktree, cwd);
9620 if (error->code == GOT_ERR_NOT_WORKTREE)
9621 error = wrap_not_worktree_error(error, "status", cwd);
9625 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9630 error = get_worktree_paths_from_argv(&paths, argc, argv,
9637 error = got_object_id_str(&id_str,
9638 got_worktree_get_base_commit_id(worktree));
9642 error = got_worktree_get_uuid(&uuidstr, worktree);
9646 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9647 printf("work tree base commit: %s\n", id_str);
9648 printf("work tree path prefix: %s\n",
9649 got_worktree_get_path_prefix(worktree));
9650 printf("work tree branch reference: %s\n",
9651 got_worktree_get_head_ref_name(worktree));
9652 printf("work tree UUID: %s\n", uuidstr);
9653 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9656 struct got_pathlist_entry *pe;
9657 TAILQ_FOREACH(pe, &paths, entry) {
9658 if (pe->path_len == 0)
9661 * Assume this path will fail. This will be corrected
9662 * in print_path_info() in case the path does suceeed.
9664 pe->data = (void *)got_error_path(pe->path,
9667 error = got_worktree_path_info(worktree, &paths,
9668 print_path_info, &paths, check_cancelled, NULL);
9671 TAILQ_FOREACH(pe, &paths, entry) {
9672 if (pe->data != NULL) {
9673 error = pe->data; /* bad path */
9679 TAILQ_FOREACH(pe, &paths, entry)
9680 free((char *)pe->path);
9681 got_pathlist_free(&paths);