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;
3207 name = got_ref_get_name(re->ref);
3208 if (strcmp(name, GOT_REF_HEAD) == 0)
3210 if (strncmp(name, "refs/", 5) == 0)
3212 if (strncmp(name, "got/", 4) == 0)
3214 if (strncmp(name, "heads/", 6) == 0)
3216 if (strncmp(name, "remotes/", 8) == 0) {
3218 s = strstr(name, "/" GOT_REF_HEAD);
3219 if (s != NULL && s[strlen(s)] == '\0')
3222 if (strncmp(name, "tags/", 5) == 0) {
3223 err = got_object_open_as_tag(&tag, repo, re->id);
3225 if (err->code != GOT_ERR_OBJ_TYPE)
3227 /* Ref points at something other than a tag. */
3232 cmp = got_object_id_cmp(tag ?
3233 got_object_tag_get_object_id(tag) : re->id, id);
3235 got_object_tag_close(tag);
3239 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3241 err = got_error_from_errno("asprintf");
3247 err = got_object_id_str(&id_str, id);
3251 printf(GOT_COMMIT_SEP_STR);
3252 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3253 refs_str ? refs_str : "", refs_str ? ")" : "");
3258 printf("from: %s\n", got_object_commit_get_author(commit));
3259 committer_time = got_object_commit_get_committer_time(commit);
3260 datestr = get_datestr(&committer_time, datebuf);
3262 printf("date: %s UTC\n", datestr);
3263 author = got_object_commit_get_author(commit);
3264 committer = got_object_commit_get_committer(commit);
3265 if (strcmp(author, committer) != 0)
3266 printf("via: %s\n", committer);
3267 if (got_object_commit_get_nparents(commit) > 1) {
3268 const struct got_object_id_queue *parent_ids;
3269 struct got_object_qid *qid;
3271 parent_ids = got_object_commit_get_parent_ids(commit);
3272 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3273 err = got_object_id_str(&id_str, qid->id);
3276 printf("parent %d: %s\n", n++, id_str);
3281 err = got_object_commit_get_logmsg(&logmsg0, commit);
3287 line = strsep(&logmsg, "\n");
3289 printf(" %s\n", line);
3293 if (changed_paths) {
3294 struct got_pathlist_entry *pe;
3295 TAILQ_FOREACH(pe, changed_paths, entry) {
3296 struct got_diff_changed_path *cp = pe->data;
3297 printf(" %c %s\n", cp->status, pe->path);
3302 err = print_patch(commit, id, path, diff_context, repo);
3307 if (fflush(stdout) != 0 && err == NULL)
3308 err = got_error_from_errno("fflush");
3312 static const struct got_error *
3313 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3314 struct got_repository *repo, const char *path, int show_changed_paths,
3315 int show_patch, const char *search_pattern, int diff_context, int limit,
3316 int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3318 const struct got_error *err;
3319 struct got_commit_graph *graph;
3322 struct got_object_id_queue reversed_commits;
3323 struct got_object_qid *qid;
3324 struct got_commit_object *commit;
3325 struct got_pathlist_head changed_paths;
3326 struct got_pathlist_entry *pe;
3328 SIMPLEQ_INIT(&reversed_commits);
3329 TAILQ_INIT(&changed_paths);
3331 if (search_pattern && regcomp(®ex, search_pattern,
3332 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3333 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3335 err = got_commit_graph_open(&graph, path, !log_branches);
3338 err = got_commit_graph_iter_start(graph, root_id, repo,
3339 check_cancelled, NULL);
3343 struct got_object_id *id;
3345 if (sigint_received || sigpipe_received)
3348 err = got_commit_graph_iter_next(&id, graph, repo,
3349 check_cancelled, NULL);
3351 if (err->code == GOT_ERR_ITER_COMPLETED)
3358 err = got_object_open_as_commit(&commit, repo, id);
3362 if (show_changed_paths && !reverse_display_order) {
3363 err = get_changed_paths(&changed_paths, commit, repo);
3368 if (search_pattern) {
3369 err = match_logmsg(&have_match, id, commit, ®ex);
3371 got_object_commit_close(commit);
3374 if (have_match == 0 && show_changed_paths)
3375 match_changed_paths(&have_match,
3376 &changed_paths, ®ex);
3377 if (have_match == 0) {
3378 got_object_commit_close(commit);
3379 TAILQ_FOREACH(pe, &changed_paths, entry) {
3380 free((char *)pe->path);
3383 got_pathlist_free(&changed_paths);
3388 if (reverse_display_order) {
3389 err = got_object_qid_alloc(&qid, id);
3392 SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3393 got_object_commit_close(commit);
3395 err = print_commit(commit, id, repo, path,
3396 show_changed_paths ? &changed_paths : NULL,
3397 show_patch, diff_context, refs);
3398 got_object_commit_close(commit);
3402 if ((limit && --limit == 0) ||
3403 (end_id && got_object_id_cmp(id, end_id) == 0))
3406 TAILQ_FOREACH(pe, &changed_paths, entry) {
3407 free((char *)pe->path);
3410 got_pathlist_free(&changed_paths);
3412 if (reverse_display_order) {
3413 SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3414 err = got_object_open_as_commit(&commit, repo, qid->id);
3417 if (show_changed_paths) {
3418 err = get_changed_paths(&changed_paths,
3423 err = print_commit(commit, qid->id, repo, path,
3424 show_changed_paths ? &changed_paths : NULL,
3425 show_patch, diff_context, refs);
3426 got_object_commit_close(commit);
3429 TAILQ_FOREACH(pe, &changed_paths, entry) {
3430 free((char *)pe->path);
3433 got_pathlist_free(&changed_paths);
3437 while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3438 qid = SIMPLEQ_FIRST(&reversed_commits);
3439 SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3440 got_object_qid_free(qid);
3442 TAILQ_FOREACH(pe, &changed_paths, entry) {
3443 free((char *)pe->path);
3446 got_pathlist_free(&changed_paths);
3449 got_commit_graph_close(graph);
3456 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3457 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3458 "[-R] [path]\n", getprogname());
3463 get_default_log_limit(void)
3465 const char *got_default_log_limit;
3469 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3470 if (got_default_log_limit == NULL)
3472 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3478 static const struct got_error *
3479 resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3480 struct got_repository *repo)
3482 const struct got_error *err = NULL;
3483 struct got_reference *ref;
3487 err = got_ref_open(&ref, repo, commit_arg, 0);
3490 err = got_ref_resolve(id, repo, ref);
3494 err = got_object_get_type(&obj_type, repo, *id);
3497 if (obj_type == GOT_OBJ_TYPE_TAG) {
3498 struct got_tag_object *tag;
3499 err = got_object_open_as_tag(&tag, repo, *id);
3502 if (got_object_tag_get_object_type(tag) !=
3503 GOT_OBJ_TYPE_COMMIT) {
3504 got_object_tag_close(tag);
3505 return got_error(GOT_ERR_OBJ_TYPE);
3508 *id = got_object_id_dup(
3509 got_object_tag_get_object_id(tag));
3511 err = got_error_from_errno(
3512 "got_object_id_dup");
3513 got_object_tag_close(tag);
3516 } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3517 return got_error(GOT_ERR_OBJ_TYPE);
3519 err = got_repo_match_object_id_prefix(id, commit_arg,
3520 GOT_OBJ_TYPE_COMMIT, repo);
3526 static const struct got_error *
3527 cmd_log(int argc, char *argv[])
3529 const struct got_error *error;
3530 struct got_repository *repo = NULL;
3531 struct got_worktree *worktree = NULL;
3532 struct got_object_id *start_id = NULL, *end_id = NULL;
3533 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3534 const char *start_commit = NULL, *end_commit = NULL;
3535 const char *search_pattern = NULL;
3536 int diff_context = -1, ch;
3537 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3538 int reverse_display_order = 0;
3540 struct got_reflist_head refs;
3542 SIMPLEQ_INIT(&refs);
3545 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3551 limit = get_default_log_limit();
3553 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3559 show_changed_paths = 1;
3562 start_commit = optarg;
3565 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3568 err(1, "-C option %s", errstr);
3571 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3573 err(1, "-l option %s", errstr);
3579 repo_path = realpath(optarg, NULL);
3580 if (repo_path == NULL)
3581 return got_error_from_errno2("realpath",
3583 got_path_strip_trailing_slashes(repo_path);
3586 reverse_display_order = 1;
3589 search_pattern = optarg;
3592 end_commit = optarg;
3603 if (diff_context == -1)
3605 else if (!show_patch)
3606 errx(1, "-C requires -p");
3608 cwd = getcwd(NULL, 0);
3610 error = got_error_from_errno("getcwd");
3614 if (repo_path == NULL) {
3615 error = got_worktree_open(&worktree, cwd);
3616 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3624 error = got_error_from_errno("strdup");
3627 } else if (argc == 1) {
3629 error = got_worktree_resolve_path(&path, worktree,
3634 path = strdup(argv[0]);
3636 error = got_error_from_errno("strdup");
3643 if (repo_path == NULL) {
3644 repo_path = worktree ?
3645 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3647 if (repo_path == NULL) {
3648 error = got_error_from_errno("strdup");
3652 error = got_repo_open(&repo, repo_path, NULL);
3656 error = apply_unveil(got_repo_get_path(repo), 1,
3657 worktree ? got_worktree_get_root_path(worktree) : NULL);
3661 if (start_commit == NULL) {
3662 struct got_reference *head_ref;
3663 struct got_commit_object *commit = NULL;
3664 error = got_ref_open(&head_ref, repo,
3665 worktree ? got_worktree_get_head_ref_name(worktree)
3669 error = got_ref_resolve(&start_id, repo, head_ref);
3670 got_ref_close(head_ref);
3673 error = got_object_open_as_commit(&commit, repo,
3677 got_object_commit_close(commit);
3679 error = resolve_commit_arg(&start_id, start_commit, repo);
3683 if (end_commit != NULL) {
3684 error = resolve_commit_arg(&end_id, end_commit, repo);
3690 const char *prefix = got_worktree_get_path_prefix(worktree);
3692 if (asprintf(&p, "%s%s%s", prefix,
3693 (strcmp(prefix, "/") != 0) ? "/" : "", path) == -1) {
3694 error = got_error_from_errno("asprintf");
3697 error = got_repo_map_path(&in_repo_path, repo, p, 0);
3700 error = got_repo_map_path(&in_repo_path, repo, path, 1);
3705 path = in_repo_path;
3708 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3712 error = print_commits(start_id, end_id, repo, path, show_changed_paths,
3713 show_patch, search_pattern, diff_context, limit, log_branches,
3714 reverse_display_order, &refs);
3720 got_worktree_close(worktree);
3722 const struct got_error *repo_error;
3723 repo_error = got_repo_close(repo);
3727 got_ref_list_free(&refs);
3734 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3735 "[-w] [object1 object2 | path]\n", getprogname());
3739 struct print_diff_arg {
3740 struct got_repository *repo;
3741 struct got_worktree *worktree;
3746 int ignore_whitespace;
3750 * Create a file which contains the target path of a symlink so we can feed
3751 * it as content to the diff engine.
3753 static const struct got_error *
3754 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3755 const char *abspath)
3757 const struct got_error *err = NULL;
3758 char target_path[PATH_MAX];
3759 ssize_t target_len, outlen;
3764 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3765 if (target_len == -1)
3766 return got_error_from_errno2("readlinkat", abspath);
3768 target_len = readlink(abspath, target_path, PATH_MAX);
3769 if (target_len == -1)
3770 return got_error_from_errno2("readlink", abspath);
3773 *fd = got_opentempfd();
3775 return got_error_from_errno("got_opentempfd");
3777 outlen = write(*fd, target_path, target_len);
3779 err = got_error_from_errno("got_opentempfd");
3783 if (lseek(*fd, 0, SEEK_SET) == -1) {
3784 err = got_error_from_errno2("lseek", abspath);
3795 static const struct got_error *
3796 print_diff(void *arg, unsigned char status, unsigned char staged_status,
3797 const char *path, struct got_object_id *blob_id,
3798 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3799 int dirfd, const char *de_name)
3801 struct print_diff_arg *a = arg;
3802 const struct got_error *err = NULL;
3803 struct got_blob_object *blob1 = NULL;
3806 char *abspath = NULL, *label1 = NULL;
3809 if (a->diff_staged) {
3810 if (staged_status != GOT_STATUS_MODIFY &&
3811 staged_status != GOT_STATUS_ADD &&
3812 staged_status != GOT_STATUS_DELETE)
3815 if (staged_status == GOT_STATUS_DELETE)
3817 if (status == GOT_STATUS_NONEXISTENT)
3818 return got_error_set_errno(ENOENT, path);
3819 if (status != GOT_STATUS_MODIFY &&
3820 status != GOT_STATUS_ADD &&
3821 status != GOT_STATUS_DELETE &&
3822 status != GOT_STATUS_CONFLICT)
3826 if (!a->header_shown) {
3827 printf("diff %s %s%s\n", a->id_str,
3828 got_worktree_get_root_path(a->worktree),
3829 a->diff_staged ? " (staged changes)" : "");
3830 a->header_shown = 1;
3833 if (a->diff_staged) {
3834 const char *label1 = NULL, *label2 = NULL;
3835 switch (staged_status) {
3836 case GOT_STATUS_MODIFY:
3840 case GOT_STATUS_ADD:
3843 case GOT_STATUS_DELETE:
3847 return got_error(GOT_ERR_FILE_STATUS);
3849 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
3850 label1, label2, a->diff_context, a->ignore_whitespace,
3854 if (staged_status == GOT_STATUS_ADD ||
3855 staged_status == GOT_STATUS_MODIFY) {
3857 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
3861 err = got_object_id_str(&id_str, staged_blob_id);
3864 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
3865 err = got_error_from_errno("asprintf");
3870 } else if (status != GOT_STATUS_ADD) {
3871 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
3876 if (status != GOT_STATUS_DELETE) {
3877 if (asprintf(&abspath, "%s/%s",
3878 got_worktree_get_root_path(a->worktree), path) == -1) {
3879 err = got_error_from_errno("asprintf");
3884 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
3886 if (errno != ELOOP) {
3887 err = got_error_from_errno2("openat",
3891 err = get_symlink_target_file(&fd, dirfd,
3897 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
3899 if (errno != ELOOP) {
3900 err = got_error_from_errno2("open",
3904 err = get_symlink_target_file(&fd, dirfd,
3910 if (fstat(fd, &sb) == -1) {
3911 err = got_error_from_errno2("fstat", abspath);
3914 f2 = fdopen(fd, "r");
3916 err = got_error_from_errno2("fdopen", abspath);
3923 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
3924 a->diff_context, a->ignore_whitespace, stdout);
3927 got_object_blob_close(blob1);
3928 if (f2 && fclose(f2) == EOF && err == NULL)
3929 err = got_error_from_errno("fclose");
3930 if (fd != -1 && close(fd) == -1 && err == NULL)
3931 err = got_error_from_errno("close");
3936 static const struct got_error *
3937 cmd_diff(int argc, char *argv[])
3939 const struct got_error *error;
3940 struct got_repository *repo = NULL;
3941 struct got_worktree *worktree = NULL;
3942 char *cwd = NULL, *repo_path = NULL;
3943 struct got_object_id *id1 = NULL, *id2 = NULL;
3944 const char *id_str1 = NULL, *id_str2 = NULL;
3945 char *label1 = NULL, *label2 = NULL;
3947 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
3952 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3957 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
3960 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3963 err(1, "-C option %s", errstr);
3966 repo_path = realpath(optarg, NULL);
3967 if (repo_path == NULL)
3968 return got_error_from_errno2("realpath",
3970 got_path_strip_trailing_slashes(repo_path);
3976 ignore_whitespace = 1;
3987 cwd = getcwd(NULL, 0);
3989 error = got_error_from_errno("getcwd");
3995 "-r option can't be used when diffing a work tree");
3996 error = got_worktree_open(&worktree, cwd);
3998 if (error->code == GOT_ERR_NOT_WORKTREE)
3999 error = wrap_not_worktree_error(error, "diff",
4003 repo_path = strdup(got_worktree_get_repo_path(worktree));
4004 if (repo_path == NULL) {
4005 error = got_error_from_errno("strdup");
4009 error = got_worktree_resolve_path(&path, worktree,
4016 error = got_error_from_errno("strdup");
4020 } else if (argc == 2) {
4022 errx(1, "-s option can't be used when diffing "
4023 "objects in repository");
4026 if (repo_path == NULL) {
4027 error = got_worktree_open(&worktree, cwd);
4028 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4032 got_worktree_get_repo_path(worktree));
4033 if (repo_path == NULL) {
4034 error = got_error_from_errno("strdup");
4038 repo_path = strdup(cwd);
4039 if (repo_path == NULL) {
4040 error = got_error_from_errno("strdup");
4048 error = got_repo_open(&repo, repo_path, NULL);
4053 error = apply_unveil(got_repo_get_path(repo), 1,
4054 worktree ? got_worktree_get_root_path(worktree) : NULL);
4059 struct print_diff_arg arg;
4060 struct got_pathlist_head paths;
4065 error = got_object_id_str(&id_str,
4066 got_worktree_get_base_commit_id(worktree));
4070 arg.worktree = worktree;
4071 arg.diff_context = diff_context;
4072 arg.id_str = id_str;
4073 arg.header_shown = 0;
4074 arg.diff_staged = diff_staged;
4075 arg.ignore_whitespace = ignore_whitespace;
4077 error = got_pathlist_append(&paths, path, NULL);
4081 error = got_worktree_status(worktree, &paths, repo, print_diff,
4082 &arg, check_cancelled, NULL);
4084 got_pathlist_free(&paths);
4088 error = got_repo_match_object_id(&id1, &label1, id_str1,
4089 GOT_OBJ_TYPE_ANY, 1, repo);
4093 error = got_repo_match_object_id(&id2, &label2, id_str2,
4094 GOT_OBJ_TYPE_ANY, 1, repo);
4098 error = got_object_get_type(&type1, repo, id1);
4102 error = got_object_get_type(&type2, repo, id2);
4106 if (type1 != type2) {
4107 error = got_error(GOT_ERR_OBJ_TYPE);
4112 case GOT_OBJ_TYPE_BLOB:
4113 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
4114 diff_context, ignore_whitespace, repo, stdout);
4116 case GOT_OBJ_TYPE_TREE:
4117 error = got_diff_objects_as_trees(id1, id2, "", "",
4118 diff_context, ignore_whitespace, repo, stdout);
4120 case GOT_OBJ_TYPE_COMMIT:
4121 printf("diff %s %s\n", label1, label2);
4122 error = got_diff_objects_as_commits(id1, id2, diff_context,
4123 ignore_whitespace, repo, stdout);
4126 error = got_error(GOT_ERR_OBJ_TYPE);
4135 got_worktree_close(worktree);
4137 const struct got_error *repo_error;
4138 repo_error = got_repo_close(repo);
4149 "usage: %s blame [-c commit] [-r repository-path] path\n",
4158 char datebuf[11]; /* YYYY-MM-DD + NUL */
4161 struct blame_cb_args {
4162 struct blame_line *lines;
4166 off_t *line_offsets;
4168 struct got_repository *repo;
4171 static const struct got_error *
4172 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4174 const struct got_error *err = NULL;
4175 struct blame_cb_args *a = arg;
4176 struct blame_line *bline;
4178 size_t linesize = 0;
4179 struct got_commit_object *commit = NULL;
4182 time_t committer_time;
4184 if (nlines != a->nlines ||
4185 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4186 return got_error(GOT_ERR_RANGE);
4188 if (sigint_received)
4189 return got_error(GOT_ERR_ITER_COMPLETED);
4192 return NULL; /* no change in this commit */
4194 /* Annotate this line. */
4195 bline = &a->lines[lineno - 1];
4196 if (bline->annotated)
4198 err = got_object_id_str(&bline->id_str, id);
4202 err = got_object_open_as_commit(&commit, a->repo, id);
4206 bline->committer = strdup(got_object_commit_get_committer(commit));
4207 if (bline->committer == NULL) {
4208 err = got_error_from_errno("strdup");
4212 committer_time = got_object_commit_get_committer_time(commit);
4213 if (localtime_r(&committer_time, &tm) == NULL)
4214 return got_error_from_errno("localtime_r");
4215 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4216 &tm) >= sizeof(bline->datebuf)) {
4217 err = got_error(GOT_ERR_NO_SPACE);
4220 bline->annotated = 1;
4222 /* Print lines annotated so far. */
4223 bline = &a->lines[a->lineno_cur - 1];
4224 if (!bline->annotated)
4227 offset = a->line_offsets[a->lineno_cur - 1];
4228 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4229 err = got_error_from_errno("fseeko");
4233 while (bline->annotated) {
4234 char *smallerthan, *at, *nl, *committer;
4237 if (getline(&line, &linesize, a->f) == -1) {
4239 err = got_error_from_errno("getline");
4243 committer = bline->committer;
4244 smallerthan = strchr(committer, '<');
4245 if (smallerthan && smallerthan[1] != '\0')
4246 committer = smallerthan + 1;
4247 at = strchr(committer, '@');
4250 len = strlen(committer);
4252 committer[8] = '\0';
4254 nl = strchr(line, '\n');
4257 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4258 bline->id_str, bline->datebuf, committer, line);
4261 bline = &a->lines[a->lineno_cur - 1];
4265 got_object_commit_close(commit);
4270 static const struct got_error *
4271 cmd_blame(int argc, char *argv[])
4273 const struct got_error *error;
4274 struct got_repository *repo = NULL;
4275 struct got_worktree *worktree = NULL;
4276 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4277 char *link_target = NULL;
4278 struct got_object_id *obj_id = NULL;
4279 struct got_object_id *commit_id = NULL;
4280 struct got_blob_object *blob = NULL;
4281 char *commit_id_str = NULL;
4282 struct blame_cb_args bca;
4283 int ch, obj_type, i;
4286 memset(&bca, 0, sizeof(bca));
4289 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4294 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4297 commit_id_str = optarg;
4300 repo_path = realpath(optarg, NULL);
4301 if (repo_path == NULL)
4302 return got_error_from_errno2("realpath",
4304 got_path_strip_trailing_slashes(repo_path);
4320 cwd = getcwd(NULL, 0);
4322 error = got_error_from_errno("getcwd");
4325 if (repo_path == NULL) {
4326 error = got_worktree_open(&worktree, cwd);
4327 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4333 strdup(got_worktree_get_repo_path(worktree));
4334 if (repo_path == NULL) {
4335 error = got_error_from_errno("strdup");
4340 repo_path = strdup(cwd);
4341 if (repo_path == NULL) {
4342 error = got_error_from_errno("strdup");
4348 error = got_repo_open(&repo, repo_path, NULL);
4352 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4357 const char *prefix = got_worktree_get_path_prefix(worktree);
4358 char *p, *worktree_subdir = cwd +
4359 strlen(got_worktree_get_root_path(worktree));
4360 if (asprintf(&p, "%s%s%s%s%s",
4361 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4362 worktree_subdir, worktree_subdir[0] ? "/" : "",
4364 error = got_error_from_errno("asprintf");
4367 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4370 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4375 if (commit_id_str == NULL) {
4376 struct got_reference *head_ref;
4377 error = got_ref_open(&head_ref, repo, worktree ?
4378 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4381 error = got_ref_resolve(&commit_id, repo, head_ref);
4382 got_ref_close(head_ref);
4386 error = got_repo_match_object_id(&commit_id, NULL,
4387 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4392 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4397 error = got_object_id_by_path(&obj_id, repo, commit_id,
4398 link_target ? link_target : in_repo_path);
4402 error = got_object_get_type(&obj_type, repo, obj_id);
4406 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4407 error = got_error_path(link_target ? link_target : in_repo_path,
4412 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4415 bca.f = got_opentemp();
4416 if (bca.f == NULL) {
4417 error = got_error_from_errno("got_opentemp");
4420 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4421 &bca.line_offsets, bca.f, blob);
4422 if (error || bca.nlines == 0)
4425 /* Don't include \n at EOF in the blame line count. */
4426 if (bca.line_offsets[bca.nlines - 1] == filesize)
4429 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4430 if (bca.lines == NULL) {
4431 error = got_error_from_errno("calloc");
4435 bca.nlines_prec = 0;
4443 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4444 repo, blame_cb, &bca, check_cancelled, NULL);
4453 got_object_blob_close(blob);
4455 got_worktree_close(worktree);
4457 const struct got_error *repo_error;
4458 repo_error = got_repo_close(repo);
4463 for (i = 0; i < bca.nlines; i++) {
4464 struct blame_line *bline = &bca.lines[i];
4465 free(bline->id_str);
4466 free(bline->committer);
4470 free(bca.line_offsets);
4471 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4472 error = got_error_from_errno("fclose");
4480 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4485 static const struct got_error *
4486 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4487 const char *root_path, struct got_repository *repo)
4489 const struct got_error *err = NULL;
4490 int is_root_path = (strcmp(path, root_path) == 0);
4491 const char *modestr = "";
4492 mode_t mode = got_tree_entry_get_mode(te);
4493 char *link_target = NULL;
4495 path += strlen(root_path);
4496 while (path[0] == '/')
4499 if (got_object_tree_entry_is_submodule(te))
4501 else if (S_ISLNK(mode)) {
4504 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4507 for (i = 0; i < strlen(link_target); i++) {
4508 if (!isprint((unsigned char)link_target[i]))
4509 link_target[i] = '?';
4514 else if (S_ISDIR(mode))
4516 else if (mode & S_IXUSR)
4519 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4520 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4521 link_target ? " -> ": "", link_target ? link_target : "");
4527 static const struct got_error *
4528 print_tree(const char *path, struct got_object_id *commit_id,
4529 int show_ids, int recurse, const char *root_path,
4530 struct got_repository *repo)
4532 const struct got_error *err = NULL;
4533 struct got_object_id *tree_id = NULL;
4534 struct got_tree_object *tree = NULL;
4537 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4541 err = got_object_open_as_tree(&tree, repo, tree_id);
4544 nentries = got_object_tree_get_nentries(tree);
4545 for (i = 0; i < nentries; i++) {
4546 struct got_tree_entry *te;
4549 if (sigint_received || sigpipe_received)
4552 te = got_object_tree_get_entry(tree, i);
4555 err = got_object_id_str(&id_str,
4556 got_tree_entry_get_id(te));
4559 if (asprintf(&id, "%s ", id_str) == -1) {
4560 err = got_error_from_errno("asprintf");
4566 err = print_entry(te, id, path, root_path, repo);
4571 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4573 if (asprintf(&child_path, "%s%s%s", path,
4574 path[0] == '/' && path[1] == '\0' ? "" : "/",
4575 got_tree_entry_get_name(te)) == -1) {
4576 err = got_error_from_errno("asprintf");
4579 err = print_tree(child_path, commit_id, show_ids, 1,
4588 got_object_tree_close(tree);
4593 static const struct got_error *
4594 cmd_tree(int argc, char *argv[])
4596 const struct got_error *error;
4597 struct got_repository *repo = NULL;
4598 struct got_worktree *worktree = NULL;
4599 const char *path, *refname = NULL;
4600 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4601 struct got_object_id *commit_id = NULL;
4602 char *commit_id_str = NULL;
4603 int show_ids = 0, recurse = 0;
4607 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4612 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4615 commit_id_str = optarg;
4618 repo_path = realpath(optarg, NULL);
4619 if (repo_path == NULL)
4620 return got_error_from_errno2("realpath",
4622 got_path_strip_trailing_slashes(repo_path);
4646 cwd = getcwd(NULL, 0);
4648 error = got_error_from_errno("getcwd");
4651 if (repo_path == NULL) {
4652 error = got_worktree_open(&worktree, cwd);
4653 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4659 strdup(got_worktree_get_repo_path(worktree));
4660 if (repo_path == NULL)
4661 error = got_error_from_errno("strdup");
4665 repo_path = strdup(cwd);
4666 if (repo_path == NULL) {
4667 error = got_error_from_errno("strdup");
4673 error = got_repo_open(&repo, repo_path, NULL);
4677 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4683 char *p, *worktree_subdir = cwd +
4684 strlen(got_worktree_get_root_path(worktree));
4685 if (asprintf(&p, "%s/%s",
4686 got_worktree_get_path_prefix(worktree),
4687 worktree_subdir) == -1) {
4688 error = got_error_from_errno("asprintf");
4691 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4698 if (in_repo_path == NULL) {
4699 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4704 if (commit_id_str == NULL) {
4705 struct got_reference *head_ref;
4707 refname = got_worktree_get_head_ref_name(worktree);
4709 refname = GOT_REF_HEAD;
4710 error = got_ref_open(&head_ref, repo, refname, 0);
4713 error = got_ref_resolve(&commit_id, repo, head_ref);
4714 got_ref_close(head_ref);
4718 error = got_repo_match_object_id(&commit_id, NULL,
4719 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4724 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4725 in_repo_path, repo);
4732 got_worktree_close(worktree);
4734 const struct got_error *repo_error;
4735 repo_error = got_repo_close(repo);
4745 fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4750 static const struct got_error *
4751 print_status(void *arg, unsigned char status, unsigned char staged_status,
4752 const char *path, struct got_object_id *blob_id,
4753 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4754 int dirfd, const char *de_name)
4756 if (status == staged_status && (status == GOT_STATUS_DELETE))
4757 status = GOT_STATUS_NO_CHANGE;
4759 char *status_codes = arg;
4760 size_t ncodes = strlen(status_codes);
4762 for (i = 0; i < ncodes ; i++) {
4763 if (status == status_codes[i] ||
4764 staged_status == status_codes[i])
4770 printf("%c%c %s\n", status, staged_status, path);
4774 static const struct got_error *
4775 cmd_status(int argc, char *argv[])
4777 const struct got_error *error = NULL;
4778 struct got_repository *repo = NULL;
4779 struct got_worktree *worktree = NULL;
4780 char *cwd = NULL, *status_codes = NULL;;
4781 struct got_pathlist_head paths;
4782 struct got_pathlist_entry *pe;
4787 while ((ch = getopt(argc, argv, "s:")) != -1) {
4790 for (i = 0; i < strlen(optarg); i++) {
4791 switch (optarg[i]) {
4792 case GOT_STATUS_MODIFY:
4793 case GOT_STATUS_ADD:
4794 case GOT_STATUS_DELETE:
4795 case GOT_STATUS_CONFLICT:
4796 case GOT_STATUS_MISSING:
4797 case GOT_STATUS_OBSTRUCTED:
4798 case GOT_STATUS_UNVERSIONED:
4799 case GOT_STATUS_MODE_CHANGE:
4800 case GOT_STATUS_NONEXISTENT:
4803 errx(1, "invalid status code '%c'",
4807 status_codes = optarg;
4819 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4823 cwd = getcwd(NULL, 0);
4825 error = got_error_from_errno("getcwd");
4829 error = got_worktree_open(&worktree, cwd);
4831 if (error->code == GOT_ERR_NOT_WORKTREE)
4832 error = wrap_not_worktree_error(error, "status", cwd);
4836 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
4841 error = apply_unveil(got_repo_get_path(repo), 1,
4842 got_worktree_get_root_path(worktree));
4846 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
4850 error = got_worktree_status(worktree, &paths, repo, print_status,
4851 status_codes, check_cancelled, NULL);
4853 TAILQ_FOREACH(pe, &paths, entry)
4854 free((char *)pe->path);
4855 got_pathlist_free(&paths);
4864 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
4870 static const struct got_error *
4871 list_refs(struct got_repository *repo, const char *refname)
4873 static const struct got_error *err = NULL;
4874 struct got_reflist_head refs;
4875 struct got_reflist_entry *re;
4877 SIMPLEQ_INIT(&refs);
4878 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
4882 SIMPLEQ_FOREACH(re, &refs, entry) {
4884 refstr = got_ref_to_str(re->ref);
4886 return got_error_from_errno("got_ref_to_str");
4887 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
4891 got_ref_list_free(&refs);
4895 static const struct got_error *
4896 delete_ref(struct got_repository *repo, const char *refname)
4898 const struct got_error *err = NULL;
4899 struct got_reference *ref;
4901 err = got_ref_open(&ref, repo, refname, 0);
4905 err = got_ref_delete(ref, repo);
4910 static const struct got_error *
4911 add_ref(struct got_repository *repo, const char *refname, const char *target)
4913 const struct got_error *err = NULL;
4914 struct got_object_id *id;
4915 struct got_reference *ref = NULL;
4918 * Don't let the user create a reference name with a leading '-'.
4919 * While technically a valid reference name, this case is usually
4920 * an unintended typo.
4922 if (refname[0] == '-')
4923 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4925 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
4928 struct got_reference *target_ref;
4930 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
4932 err = got_ref_open(&target_ref, repo, target, 0);
4935 err = got_ref_resolve(&id, repo, target_ref);
4936 got_ref_close(target_ref);
4941 err = got_ref_alloc(&ref, refname, id);
4945 err = got_ref_write(ref, repo);
4953 static const struct got_error *
4954 add_symref(struct got_repository *repo, const char *refname, const char *target)
4956 const struct got_error *err = NULL;
4957 struct got_reference *ref = NULL;
4958 struct got_reference *target_ref = NULL;
4961 * Don't let the user create a reference name with a leading '-'.
4962 * While technically a valid reference name, this case is usually
4963 * an unintended typo.
4965 if (refname[0] == '-')
4966 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
4968 err = got_ref_open(&target_ref, repo, target, 0);
4972 err = got_ref_alloc_symref(&ref, refname, target_ref);
4976 err = got_ref_write(ref, repo);
4979 got_ref_close(target_ref);
4985 static const struct got_error *
4986 cmd_ref(int argc, char *argv[])
4988 const struct got_error *error = NULL;
4989 struct got_repository *repo = NULL;
4990 struct got_worktree *worktree = NULL;
4991 char *cwd = NULL, *repo_path = NULL;
4992 int ch, do_list = 0, do_delete = 0;
4993 const char *obj_arg = NULL, *symref_target= NULL;
4994 char *refname = NULL;
4996 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5005 repo_path = realpath(optarg, NULL);
5006 if (repo_path == NULL)
5007 return got_error_from_errno2("realpath",
5009 got_path_strip_trailing_slashes(repo_path);
5015 symref_target = optarg;
5023 if (obj_arg && do_list)
5024 errx(1, "-c and -l options are mutually exclusive");
5025 if (obj_arg && do_delete)
5026 errx(1, "-c and -d options are mutually exclusive");
5027 if (obj_arg && symref_target)
5028 errx(1, "-c and -s options are mutually exclusive");
5029 if (symref_target && do_delete)
5030 errx(1, "-s and -d options are mutually exclusive");
5031 if (symref_target && do_list)
5032 errx(1, "-s and -l options are mutually exclusive");
5033 if (do_delete && do_list)
5034 errx(1, "-d and -l options are mutually exclusive");
5040 if (argc != 0 && argc != 1)
5043 refname = strdup(argv[0]);
5044 if (refname == NULL) {
5045 error = got_error_from_errno("strdup");
5052 refname = strdup(argv[0]);
5053 if (refname == NULL) {
5054 error = got_error_from_errno("strdup");
5060 got_path_strip_trailing_slashes(refname);
5064 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5068 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5069 "sendfd unveil", NULL) == -1)
5073 cwd = getcwd(NULL, 0);
5075 error = got_error_from_errno("getcwd");
5079 if (repo_path == NULL) {
5080 error = got_worktree_open(&worktree, cwd);
5081 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5087 strdup(got_worktree_get_repo_path(worktree));
5088 if (repo_path == NULL)
5089 error = got_error_from_errno("strdup");
5093 repo_path = strdup(cwd);
5094 if (repo_path == NULL) {
5095 error = got_error_from_errno("strdup");
5101 error = got_repo_open(&repo, repo_path, NULL);
5105 error = apply_unveil(got_repo_get_path(repo), do_list,
5106 worktree ? got_worktree_get_root_path(worktree) : NULL);
5111 error = list_refs(repo, refname);
5113 error = delete_ref(repo, refname);
5114 else if (symref_target)
5115 error = add_symref(repo, refname, symref_target);
5117 if (obj_arg == NULL)
5119 error = add_ref(repo, refname, obj_arg);
5124 got_repo_close(repo);
5126 got_worktree_close(worktree);
5136 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5137 "[name]\n", getprogname());
5141 static const struct got_error *
5142 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5143 struct got_reference *ref)
5145 const struct got_error *err = NULL;
5146 const char *refname, *marker = " ";
5149 refname = got_ref_get_name(ref);
5150 if (worktree && strcmp(refname,
5151 got_worktree_get_head_ref_name(worktree)) == 0) {
5152 struct got_object_id *id = NULL;
5154 err = got_ref_resolve(&id, repo, ref);
5157 if (got_object_id_cmp(id,
5158 got_worktree_get_base_commit_id(worktree)) == 0)
5165 if (strncmp(refname, "refs/heads/", 11) == 0)
5167 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5170 refstr = got_ref_to_str(ref);
5172 return got_error_from_errno("got_ref_to_str");
5174 printf("%s%s: %s\n", marker, refname, refstr);
5179 static const struct got_error *
5180 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5182 const char *refname;
5184 if (worktree == NULL)
5185 return got_error(GOT_ERR_NOT_WORKTREE);
5187 refname = got_worktree_get_head_ref_name(worktree);
5189 if (strncmp(refname, "refs/heads/", 11) == 0)
5191 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5194 printf("%s\n", refname);
5199 static const struct got_error *
5200 list_branches(struct got_repository *repo, struct got_worktree *worktree)
5202 static const struct got_error *err = NULL;
5203 struct got_reflist_head refs;
5204 struct got_reflist_entry *re;
5205 struct got_reference *temp_ref = NULL;
5206 int rebase_in_progress, histedit_in_progress;
5208 SIMPLEQ_INIT(&refs);
5211 err = got_worktree_rebase_in_progress(&rebase_in_progress,
5216 err = got_worktree_histedit_in_progress(&histedit_in_progress,
5221 if (rebase_in_progress || histedit_in_progress) {
5222 err = got_ref_open(&temp_ref, repo,
5223 got_worktree_get_head_ref_name(worktree), 0);
5226 list_branch(repo, worktree, temp_ref);
5227 got_ref_close(temp_ref);
5231 err = got_ref_list(&refs, repo, "refs/heads",
5232 got_ref_cmp_by_name, NULL);
5236 SIMPLEQ_FOREACH(re, &refs, entry)
5237 list_branch(repo, worktree, re->ref);
5239 got_ref_list_free(&refs);
5243 static const struct got_error *
5244 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5245 const char *branch_name)
5247 const struct got_error *err = NULL;
5248 struct got_reference *ref = NULL;
5251 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5252 return got_error_from_errno("asprintf");
5254 err = got_ref_open(&ref, repo, refname, 0);
5259 strcmp(got_worktree_get_head_ref_name(worktree),
5260 got_ref_get_name(ref)) == 0) {
5261 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5262 "will not delete this work tree's current branch");
5266 err = got_ref_delete(ref, repo);
5274 static const struct got_error *
5275 add_branch(struct got_repository *repo, const char *branch_name,
5276 struct got_object_id *base_commit_id)
5278 const struct got_error *err = NULL;
5279 struct got_reference *ref = NULL;
5280 char *base_refname = NULL, *refname = NULL;
5283 * Don't let the user create a branch name with a leading '-'.
5284 * While technically a valid reference name, this case is usually
5285 * an unintended typo.
5287 if (branch_name[0] == '-')
5288 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5290 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5291 err = got_error_from_errno("asprintf");
5295 err = got_ref_open(&ref, repo, refname, 0);
5297 err = got_error(GOT_ERR_BRANCH_EXISTS);
5299 } else if (err->code != GOT_ERR_NOT_REF)
5302 err = got_ref_alloc(&ref, refname, base_commit_id);
5306 err = got_ref_write(ref, repo);
5315 static const struct got_error *
5316 cmd_branch(int argc, char *argv[])
5318 const struct got_error *error = NULL;
5319 struct got_repository *repo = NULL;
5320 struct got_worktree *worktree = NULL;
5321 char *cwd = NULL, *repo_path = NULL;
5322 int ch, do_list = 0, do_show = 0, do_update = 1;
5323 const char *delref = NULL, *commit_id_arg = NULL;
5324 struct got_reference *ref = NULL;
5325 struct got_pathlist_head paths;
5326 struct got_pathlist_entry *pe;
5327 struct got_object_id *commit_id = NULL;
5328 char *commit_id_str = NULL;
5332 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5335 commit_id_arg = optarg;
5341 repo_path = realpath(optarg, NULL);
5342 if (repo_path == NULL)
5343 return got_error_from_errno2("realpath",
5345 got_path_strip_trailing_slashes(repo_path);
5359 if (do_list && delref)
5360 errx(1, "-l and -d options are mutually exclusive");
5365 if (!do_list && !delref && argc == 0)
5368 if ((do_list || delref || do_show) && commit_id_arg != NULL)
5369 errx(1, "-c option can only be used when creating a branch");
5371 if (do_list || delref) {
5374 } else if (!do_show && argc != 1)
5378 if (do_list || do_show) {
5379 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5383 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5384 "sendfd unveil", NULL) == -1)
5388 cwd = getcwd(NULL, 0);
5390 error = got_error_from_errno("getcwd");
5394 if (repo_path == NULL) {
5395 error = got_worktree_open(&worktree, cwd);
5396 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5402 strdup(got_worktree_get_repo_path(worktree));
5403 if (repo_path == NULL)
5404 error = got_error_from_errno("strdup");
5408 repo_path = strdup(cwd);
5409 if (repo_path == NULL) {
5410 error = got_error_from_errno("strdup");
5416 error = got_repo_open(&repo, repo_path, NULL);
5420 error = apply_unveil(got_repo_get_path(repo), do_list,
5421 worktree ? got_worktree_get_root_path(worktree) : NULL);
5426 error = show_current_branch(repo, worktree);
5428 error = list_branches(repo, worktree);
5430 error = delete_branch(repo, worktree, delref);
5432 if (commit_id_arg == NULL)
5433 commit_id_arg = worktree ?
5434 got_worktree_get_head_ref_name(worktree) :
5436 error = got_repo_match_object_id(&commit_id, NULL,
5437 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5440 error = add_branch(repo, argv[0], commit_id);
5443 if (worktree && do_update) {
5444 struct got_update_progress_arg upa;
5445 char *branch_refname = NULL;
5447 error = got_object_id_str(&commit_id_str, commit_id);
5450 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5454 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5456 error = got_error_from_errno("asprintf");
5459 error = got_ref_open(&ref, repo, branch_refname, 0);
5460 free(branch_refname);
5463 error = switch_head_ref(ref, commit_id, worktree,
5467 error = got_worktree_set_base_commit_id(worktree, repo,
5471 memset(&upa, 0, sizeof(upa));
5472 error = got_worktree_checkout_files(worktree, &paths,
5473 repo, update_progress, &upa, check_cancelled,
5477 if (upa.did_something)
5478 printf("Updated to commit %s\n", commit_id_str);
5479 print_update_progress_stats(&upa);
5486 got_repo_close(repo);
5488 got_worktree_close(worktree);
5492 free(commit_id_str);
5493 TAILQ_FOREACH(pe, &paths, entry)
5494 free((char *)pe->path);
5495 got_pathlist_free(&paths);
5504 "usage: %s tag [-c commit] [-r repository] [-l] "
5505 "[-m message] name\n", getprogname());
5510 static const struct got_error *
5511 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5513 const struct got_error *err = NULL;
5514 struct got_reflist_entry *re, *se, *new;
5515 struct got_object_id *re_id, *se_id;
5516 struct got_tag_object *re_tag, *se_tag;
5517 time_t re_time, se_time;
5519 SIMPLEQ_FOREACH(re, tags, entry) {
5520 se = SIMPLEQ_FIRST(sorted);
5522 err = got_reflist_entry_dup(&new, re);
5525 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5528 err = got_ref_resolve(&re_id, repo, re->ref);
5531 err = got_object_open_as_tag(&re_tag, repo, re_id);
5535 re_time = got_object_tag_get_tagger_time(re_tag);
5536 got_object_tag_close(re_tag);
5540 err = got_ref_resolve(&se_id, repo, re->ref);
5543 err = got_object_open_as_tag(&se_tag, repo, se_id);
5547 se_time = got_object_tag_get_tagger_time(se_tag);
5548 got_object_tag_close(se_tag);
5550 if (se_time > re_time) {
5551 err = got_reflist_entry_dup(&new, re);
5554 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5557 se = SIMPLEQ_NEXT(se, entry);
5566 static const struct got_error *
5567 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5569 static const struct got_error *err = NULL;
5570 struct got_reflist_head refs;
5571 struct got_reflist_entry *re;
5573 SIMPLEQ_INIT(&refs);
5575 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5579 SIMPLEQ_FOREACH(re, &refs, entry) {
5580 const char *refname;
5581 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5585 struct got_object_id *id;
5586 struct got_tag_object *tag;
5587 struct got_commit_object *commit = NULL;
5589 refname = got_ref_get_name(re->ref);
5590 if (strncmp(refname, "refs/tags/", 10) != 0)
5593 refstr = got_ref_to_str(re->ref);
5594 if (refstr == NULL) {
5595 err = got_error_from_errno("got_ref_to_str");
5598 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5601 err = got_ref_resolve(&id, repo, re->ref);
5604 err = got_object_open_as_tag(&tag, repo, id);
5606 if (err->code != GOT_ERR_OBJ_TYPE) {
5610 /* "lightweight" tag */
5611 err = got_object_open_as_commit(&commit, repo, id);
5616 tagger = got_object_commit_get_committer(commit);
5618 got_object_commit_get_committer_time(commit);
5619 err = got_object_id_str(&id_str, id);
5625 tagger = got_object_tag_get_tagger(tag);
5626 tagger_time = got_object_tag_get_tagger_time(tag);
5627 err = got_object_id_str(&id_str,
5628 got_object_tag_get_object_id(tag));
5632 printf("from: %s\n", tagger);
5633 datestr = get_datestr(&tagger_time, datebuf);
5635 printf("date: %s UTC\n", datestr);
5637 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5639 switch (got_object_tag_get_object_type(tag)) {
5640 case GOT_OBJ_TYPE_BLOB:
5641 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5644 case GOT_OBJ_TYPE_TREE:
5645 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5648 case GOT_OBJ_TYPE_COMMIT:
5649 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5652 case GOT_OBJ_TYPE_TAG:
5653 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5662 err = got_object_commit_get_logmsg(&tagmsg0, commit);
5665 got_object_commit_close(commit);
5667 tagmsg0 = strdup(got_object_tag_get_message(tag));
5668 got_object_tag_close(tag);
5669 if (tagmsg0 == NULL) {
5670 err = got_error_from_errno("strdup");
5677 line = strsep(&tagmsg, "\n");
5679 printf(" %s\n", line);
5684 got_ref_list_free(&refs);
5688 static const struct got_error *
5689 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5690 const char *tag_name, const char *repo_path)
5692 const struct got_error *err = NULL;
5693 char *template = NULL, *initial_content = NULL;
5694 char *editor = NULL;
5695 int initial_content_len;
5698 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5699 err = got_error_from_errno("asprintf");
5703 initial_content_len = asprintf(&initial_content,
5704 "\n# tagging commit %s as %s\n",
5705 commit_id_str, tag_name);
5706 if (initial_content_len == -1) {
5707 err = got_error_from_errno("asprintf");
5711 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5715 if (write(fd, initial_content, initial_content_len) == -1) {
5716 err = got_error_from_errno2("write", *tagmsg_path);
5720 err = get_editor(&editor);
5723 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content);
5725 free(initial_content);
5729 if (fd != -1 && close(fd) == -1 && err == NULL)
5730 err = got_error_from_errno2("close", *tagmsg_path);
5732 /* Editor is done; we can now apply unveil(2) */
5734 err = apply_unveil(repo_path, 0, NULL);
5742 static const struct got_error *
5743 add_tag(struct got_repository *repo, struct got_worktree *worktree,
5744 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5746 const struct got_error *err = NULL;
5747 struct got_object_id *commit_id = NULL, *tag_id = NULL;
5748 char *label = NULL, *commit_id_str = NULL;
5749 struct got_reference *ref = NULL;
5750 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5751 char *tagmsg_path = NULL, *tag_id_str = NULL;
5752 int preserve_tagmsg = 0;
5755 * Don't let the user create a tag name with a leading '-'.
5756 * While technically a valid reference name, this case is usually
5757 * an unintended typo.
5759 if (tag_name[0] == '-')
5760 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5762 err = get_author(&tagger, repo, worktree);
5766 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5767 GOT_OBJ_TYPE_COMMIT, 1, repo);
5771 err = got_object_id_str(&commit_id_str, commit_id);
5775 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5776 refname = strdup(tag_name);
5777 if (refname == NULL) {
5778 err = got_error_from_errno("strdup");
5782 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5783 err = got_error_from_errno("asprintf");
5787 err = got_ref_open(&ref, repo, refname, 0);
5789 err = got_error(GOT_ERR_TAG_EXISTS);
5791 } else if (err->code != GOT_ERR_NOT_REF)
5794 if (tagmsg_arg == NULL) {
5795 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5796 tag_name, got_repo_get_path(repo));
5798 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5799 tagmsg_path != NULL)
5800 preserve_tagmsg = 1;
5805 err = got_object_tag_create(&tag_id, tag_name, commit_id,
5806 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5809 preserve_tagmsg = 1;
5813 err = got_ref_alloc(&ref, refname, tag_id);
5816 preserve_tagmsg = 1;
5820 err = got_ref_write(ref, repo);
5823 preserve_tagmsg = 1;
5827 err = got_object_id_str(&tag_id_str, tag_id);
5830 preserve_tagmsg = 1;
5833 printf("Created tag %s\n", tag_id_str);
5835 if (preserve_tagmsg) {
5836 fprintf(stderr, "%s: tag message preserved in %s\n",
5837 getprogname(), tagmsg_path);
5838 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
5839 err = got_error_from_errno2("unlink", tagmsg_path);
5844 free(commit_id_str);
5852 static const struct got_error *
5853 cmd_tag(int argc, char *argv[])
5855 const struct got_error *error = NULL;
5856 struct got_repository *repo = NULL;
5857 struct got_worktree *worktree = NULL;
5858 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
5859 char *gitconfig_path = NULL;
5860 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
5861 int ch, do_list = 0;
5863 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
5866 commit_id_arg = optarg;
5872 repo_path = realpath(optarg, NULL);
5873 if (repo_path == NULL)
5874 return got_error_from_errno2("realpath",
5876 got_path_strip_trailing_slashes(repo_path);
5891 if (commit_id_arg != NULL)
5893 "-c option can only be used when creating a tag");
5895 errx(1, "-l and -m options are mutually exclusive");
5898 } else if (argc != 1)
5905 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5909 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5910 "sendfd unveil", NULL) == -1)
5914 cwd = getcwd(NULL, 0);
5916 error = got_error_from_errno("getcwd");
5920 if (repo_path == NULL) {
5921 error = got_worktree_open(&worktree, cwd);
5922 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5928 strdup(got_worktree_get_repo_path(worktree));
5929 if (repo_path == NULL)
5930 error = got_error_from_errno("strdup");
5934 repo_path = strdup(cwd);
5935 if (repo_path == NULL) {
5936 error = got_error_from_errno("strdup");
5943 error = got_repo_open(&repo, repo_path, NULL);
5946 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5949 error = list_tags(repo, worktree);
5951 error = get_gitconfig_path(&gitconfig_path);
5954 error = got_repo_open(&repo, repo_path, gitconfig_path);
5959 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5964 if (commit_id_arg == NULL) {
5965 struct got_reference *head_ref;
5966 struct got_object_id *commit_id;
5967 error = got_ref_open(&head_ref, repo,
5968 worktree ? got_worktree_get_head_ref_name(worktree)
5972 error = got_ref_resolve(&commit_id, repo, head_ref);
5973 got_ref_close(head_ref);
5976 error = got_object_id_str(&commit_id_str, commit_id);
5982 error = add_tag(repo, worktree, tag_name,
5983 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
5987 got_repo_close(repo);
5989 got_worktree_close(worktree);
5992 free(gitconfig_path);
5993 free(commit_id_str);
6000 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6005 static const struct got_error *
6006 add_progress(void *arg, unsigned char status, const char *path)
6008 while (path[0] == '/')
6010 printf("%c %s\n", status, path);
6014 static const struct got_error *
6015 cmd_add(int argc, char *argv[])
6017 const struct got_error *error = NULL;
6018 struct got_repository *repo = NULL;
6019 struct got_worktree *worktree = NULL;
6021 struct got_pathlist_head paths;
6022 struct got_pathlist_entry *pe;
6023 int ch, can_recurse = 0, no_ignores = 0;
6027 while ((ch = getopt(argc, argv, "IR")) != -1) {
6045 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6052 cwd = getcwd(NULL, 0);
6054 error = got_error_from_errno("getcwd");
6058 error = got_worktree_open(&worktree, cwd);
6060 if (error->code == GOT_ERR_NOT_WORKTREE)
6061 error = wrap_not_worktree_error(error, "add", cwd);
6065 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6070 error = apply_unveil(got_repo_get_path(repo), 1,
6071 got_worktree_get_root_path(worktree));
6075 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6079 if (!can_recurse && no_ignores) {
6080 error = got_error_msg(GOT_ERR_BAD_PATH,
6081 "disregarding ignores requires -R option");
6089 TAILQ_FOREACH(pe, &paths, entry) {
6090 if (asprintf(&ondisk_path, "%s/%s",
6091 got_worktree_get_root_path(worktree),
6093 error = got_error_from_errno("asprintf");
6096 if (lstat(ondisk_path, &sb) == -1) {
6097 if (errno == ENOENT) {
6101 error = got_error_from_errno2("lstat",
6107 if (S_ISDIR(sb.st_mode)) {
6108 error = got_error_msg(GOT_ERR_BAD_PATH,
6109 "adding directories requires -R option");
6115 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6116 NULL, repo, no_ignores);
6119 got_repo_close(repo);
6121 got_worktree_close(worktree);
6122 TAILQ_FOREACH(pe, &paths, entry)
6123 free((char *)pe->path);
6124 got_pathlist_free(&paths);
6132 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6133 "path ...\n", getprogname());
6137 static const struct got_error *
6138 print_remove_status(void *arg, unsigned char status,
6139 unsigned char staged_status, const char *path)
6141 while (path[0] == '/')
6143 if (status == GOT_STATUS_NONEXISTENT)
6145 if (status == staged_status && (status == GOT_STATUS_DELETE))
6146 status = GOT_STATUS_NO_CHANGE;
6147 printf("%c%c %s\n", status, staged_status, path);
6151 static const struct got_error *
6152 cmd_remove(int argc, char *argv[])
6154 const struct got_error *error = NULL;
6155 struct got_worktree *worktree = NULL;
6156 struct got_repository *repo = NULL;
6157 const char *status_codes = NULL;
6159 struct got_pathlist_head paths;
6160 struct got_pathlist_entry *pe;
6161 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6165 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6168 delete_local_mods = 1;
6177 for (i = 0; i < strlen(optarg); i++) {
6178 switch (optarg[i]) {
6179 case GOT_STATUS_MODIFY:
6180 delete_local_mods = 1;
6182 case GOT_STATUS_MISSING:
6185 errx(1, "invalid status code '%c'",
6189 status_codes = optarg;
6201 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6208 cwd = getcwd(NULL, 0);
6210 error = got_error_from_errno("getcwd");
6213 error = got_worktree_open(&worktree, cwd);
6215 if (error->code == GOT_ERR_NOT_WORKTREE)
6216 error = wrap_not_worktree_error(error, "remove", cwd);
6220 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6225 error = apply_unveil(got_repo_get_path(repo), 1,
6226 got_worktree_get_root_path(worktree));
6230 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6237 TAILQ_FOREACH(pe, &paths, entry) {
6238 if (asprintf(&ondisk_path, "%s/%s",
6239 got_worktree_get_root_path(worktree),
6241 error = got_error_from_errno("asprintf");
6244 if (lstat(ondisk_path, &sb) == -1) {
6245 if (errno == ENOENT) {
6249 error = got_error_from_errno2("lstat",
6255 if (S_ISDIR(sb.st_mode)) {
6256 error = got_error_msg(GOT_ERR_BAD_PATH,
6257 "removing directories requires -R option");
6263 error = got_worktree_schedule_delete(worktree, &paths,
6264 delete_local_mods, status_codes, print_remove_status, NULL,
6265 repo, keep_on_disk);
6268 got_repo_close(repo);
6270 got_worktree_close(worktree);
6271 TAILQ_FOREACH(pe, &paths, entry)
6272 free((char *)pe->path);
6273 got_pathlist_free(&paths);
6281 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6282 "path ...\n", getprogname());
6286 static const struct got_error *
6287 revert_progress(void *arg, unsigned char status, const char *path)
6289 if (status == GOT_STATUS_UNVERSIONED)
6292 while (path[0] == '/')
6294 printf("%c %s\n", status, path);
6298 struct choose_patch_arg {
6299 FILE *patch_script_file;
6303 static const struct got_error *
6304 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6305 int nchanges, const char *action)
6308 size_t linesize = 0;
6312 case GOT_STATUS_ADD:
6313 printf("A %s\n%s this addition? [y/n] ", path, action);
6315 case GOT_STATUS_DELETE:
6316 printf("D %s\n%s this deletion? [y/n] ", path, action);
6318 case GOT_STATUS_MODIFY:
6319 if (fseek(patch_file, 0L, SEEK_SET) == -1)
6320 return got_error_from_errno("fseek");
6321 printf(GOT_COMMIT_SEP_STR);
6322 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6324 if (ferror(patch_file))
6325 return got_error_from_errno("getline");
6326 printf(GOT_COMMIT_SEP_STR);
6327 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6328 path, n, nchanges, action);
6331 return got_error_path(path, GOT_ERR_FILE_STATUS);
6337 static const struct got_error *
6338 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6339 FILE *patch_file, int n, int nchanges)
6341 const struct got_error *err = NULL;
6343 size_t linesize = 0;
6346 struct choose_patch_arg *a = arg;
6348 *choice = GOT_PATCH_CHOICE_NONE;
6350 if (a->patch_script_file) {
6352 err = show_change(status, path, patch_file, n, nchanges,
6356 linelen = getline(&line, &linesize, a->patch_script_file);
6357 if (linelen == -1) {
6358 if (ferror(a->patch_script_file))
6359 return got_error_from_errno("getline");
6362 nl = strchr(line, '\n');
6365 if (strcmp(line, "y") == 0) {
6366 *choice = GOT_PATCH_CHOICE_YES;
6368 } else if (strcmp(line, "n") == 0) {
6369 *choice = GOT_PATCH_CHOICE_NO;
6371 } else if (strcmp(line, "q") == 0 &&
6372 status == GOT_STATUS_MODIFY) {
6373 *choice = GOT_PATCH_CHOICE_QUIT;
6376 printf("invalid response '%s'\n", line);
6381 while (resp != 'y' && resp != 'n' && resp != 'q') {
6382 err = show_change(status, path, patch_file, n, nchanges,
6389 if (status == GOT_STATUS_MODIFY) {
6390 if (resp != 'y' && resp != 'n' && resp != 'q') {
6391 printf("invalid response '%c'\n", resp);
6394 } else if (resp != 'y' && resp != 'n') {
6395 printf("invalid response '%c'\n", resp);
6401 *choice = GOT_PATCH_CHOICE_YES;
6402 else if (resp == 'n')
6403 *choice = GOT_PATCH_CHOICE_NO;
6404 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6405 *choice = GOT_PATCH_CHOICE_QUIT;
6411 static const struct got_error *
6412 cmd_revert(int argc, char *argv[])
6414 const struct got_error *error = NULL;
6415 struct got_worktree *worktree = NULL;
6416 struct got_repository *repo = NULL;
6417 char *cwd = NULL, *path = NULL;
6418 struct got_pathlist_head paths;
6419 struct got_pathlist_entry *pe;
6420 int ch, can_recurse = 0, pflag = 0;
6421 FILE *patch_script_file = NULL;
6422 const char *patch_script_path = NULL;
6423 struct choose_patch_arg cpa;
6427 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6433 patch_script_path = optarg;
6448 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6449 "unveil", NULL) == -1)
6454 if (patch_script_path && !pflag)
6455 errx(1, "-F option can only be used together with -p option");
6457 cwd = getcwd(NULL, 0);
6459 error = got_error_from_errno("getcwd");
6462 error = got_worktree_open(&worktree, cwd);
6464 if (error->code == GOT_ERR_NOT_WORKTREE)
6465 error = wrap_not_worktree_error(error, "revert", cwd);
6469 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6474 if (patch_script_path) {
6475 patch_script_file = fopen(patch_script_path, "r");
6476 if (patch_script_file == NULL) {
6477 error = got_error_from_errno2("fopen",
6482 error = apply_unveil(got_repo_get_path(repo), 1,
6483 got_worktree_get_root_path(worktree));
6487 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6494 TAILQ_FOREACH(pe, &paths, entry) {
6495 if (asprintf(&ondisk_path, "%s/%s",
6496 got_worktree_get_root_path(worktree),
6498 error = got_error_from_errno("asprintf");
6501 if (lstat(ondisk_path, &sb) == -1) {
6502 if (errno == ENOENT) {
6506 error = got_error_from_errno2("lstat",
6512 if (S_ISDIR(sb.st_mode)) {
6513 error = got_error_msg(GOT_ERR_BAD_PATH,
6514 "reverting directories requires -R option");
6520 cpa.patch_script_file = patch_script_file;
6521 cpa.action = "revert";
6522 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6523 pflag ? choose_patch : NULL, &cpa, repo);
6525 if (patch_script_file && fclose(patch_script_file) == EOF &&
6527 error = got_error_from_errno2("fclose", patch_script_path);
6529 got_repo_close(repo);
6531 got_worktree_close(worktree);
6540 fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6545 struct collect_commit_logmsg_arg {
6546 const char *cmdline_log;
6548 const char *worktree_path;
6549 const char *branch_name;
6550 const char *repo_path;
6555 static const struct got_error *
6556 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6559 char *initial_content = NULL;
6560 struct got_pathlist_entry *pe;
6561 const struct got_error *err = NULL;
6562 char *template = NULL;
6563 struct collect_commit_logmsg_arg *a = arg;
6564 int initial_content_len;
6568 /* if a message was specified on the command line, just use it */
6569 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6570 len = strlen(a->cmdline_log) + 1;
6571 *logmsg = malloc(len + 1);
6572 if (*logmsg == NULL)
6573 return got_error_from_errno("malloc");
6574 strlcpy(*logmsg, a->cmdline_log, len);
6578 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6579 return got_error_from_errno("asprintf");
6581 initial_content_len = asprintf(&initial_content,
6582 "\n# changes to be committed on branch %s:\n",
6584 if (initial_content_len == -1)
6585 return got_error_from_errno("asprintf");
6587 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6591 if (write(fd, initial_content, initial_content_len) == -1) {
6592 err = got_error_from_errno2("write", a->logmsg_path);
6596 TAILQ_FOREACH(pe, commitable_paths, entry) {
6597 struct got_commitable *ct = pe->data;
6598 dprintf(fd, "# %c %s\n",
6599 got_commitable_get_status(ct),
6600 got_commitable_get_path(ct));
6603 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content);
6605 free(initial_content);
6608 if (fd != -1 && close(fd) == -1 && err == NULL)
6609 err = got_error_from_errno2("close", a->logmsg_path);
6611 /* Editor is done; we can now apply unveil(2) */
6613 err = apply_unveil(a->repo_path, 0, a->worktree_path);
6621 static const struct got_error *
6622 cmd_commit(int argc, char *argv[])
6624 const struct got_error *error = NULL;
6625 struct got_worktree *worktree = NULL;
6626 struct got_repository *repo = NULL;
6627 char *cwd = NULL, *id_str = NULL;
6628 struct got_object_id *id = NULL;
6629 const char *logmsg = NULL;
6630 struct collect_commit_logmsg_arg cl_arg;
6631 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6632 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6633 int allow_bad_symlinks = 0;
6634 struct got_pathlist_head paths;
6637 cl_arg.logmsg_path = NULL;
6639 while ((ch = getopt(argc, argv, "m:S")) != -1) {
6645 allow_bad_symlinks = 1;
6657 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6658 "unveil", NULL) == -1)
6661 cwd = getcwd(NULL, 0);
6663 error = got_error_from_errno("getcwd");
6666 error = got_worktree_open(&worktree, cwd);
6668 if (error->code == GOT_ERR_NOT_WORKTREE)
6669 error = wrap_not_worktree_error(error, "commit", cwd);
6673 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6676 if (rebase_in_progress) {
6677 error = got_error(GOT_ERR_REBASING);
6681 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6686 error = get_gitconfig_path(&gitconfig_path);
6689 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6694 error = get_author(&author, repo, worktree);
6699 * unveil(2) traverses exec(2); if an editor is used we have
6700 * to apply unveil after the log message has been written.
6702 if (logmsg == NULL || strlen(logmsg) == 0)
6703 error = get_editor(&editor);
6705 error = apply_unveil(got_repo_get_path(repo), 0,
6706 got_worktree_get_root_path(worktree));
6710 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6714 cl_arg.editor = editor;
6715 cl_arg.cmdline_log = logmsg;
6716 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6717 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6718 if (!histedit_in_progress) {
6719 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6720 error = got_error(GOT_ERR_COMMIT_BRANCH);
6723 cl_arg.branch_name += 11;
6725 cl_arg.repo_path = got_repo_get_path(repo);
6726 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6727 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6728 print_status, NULL, repo);
6730 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6731 cl_arg.logmsg_path != NULL)
6732 preserve_logmsg = 1;
6736 error = got_object_id_str(&id_str, id);
6739 printf("Created commit %s\n", id_str);
6741 if (preserve_logmsg) {
6742 fprintf(stderr, "%s: log message preserved in %s\n",
6743 getprogname(), cl_arg.logmsg_path);
6744 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6746 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6747 free(cl_arg.logmsg_path);
6749 got_repo_close(repo);
6751 got_worktree_close(worktree);
6754 free(gitconfig_path);
6761 usage_cherrypick(void)
6763 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6767 static const struct got_error *
6768 cmd_cherrypick(int argc, char *argv[])
6770 const struct got_error *error = NULL;
6771 struct got_worktree *worktree = NULL;
6772 struct got_repository *repo = NULL;
6773 char *cwd = NULL, *commit_id_str = NULL;
6774 struct got_object_id *commit_id = NULL;
6775 struct got_commit_object *commit = NULL;
6776 struct got_object_qid *pid;
6777 struct got_reference *head_ref = NULL;
6779 struct got_update_progress_arg upa;
6781 while ((ch = getopt(argc, argv, "")) != -1) {
6793 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6794 "unveil", NULL) == -1)
6800 cwd = getcwd(NULL, 0);
6802 error = got_error_from_errno("getcwd");
6805 error = got_worktree_open(&worktree, cwd);
6807 if (error->code == GOT_ERR_NOT_WORKTREE)
6808 error = wrap_not_worktree_error(error, "cherrypick",
6813 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6818 error = apply_unveil(got_repo_get_path(repo), 0,
6819 got_worktree_get_root_path(worktree));
6823 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6824 GOT_OBJ_TYPE_COMMIT, repo);
6825 if (error != NULL) {
6826 struct got_reference *ref;
6827 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6829 error = got_ref_open(&ref, repo, argv[0], 0);
6832 error = got_ref_resolve(&commit_id, repo, ref);
6837 error = got_object_id_str(&commit_id_str, commit_id);
6841 error = got_ref_open(&head_ref, repo,
6842 got_worktree_get_head_ref_name(worktree), 0);
6846 error = check_same_branch(commit_id, head_ref, NULL, repo);
6848 if (error->code != GOT_ERR_ANCESTRY)
6852 error = got_error(GOT_ERR_SAME_BRANCH);
6856 error = got_object_open_as_commit(&commit, repo, commit_id);
6859 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6860 memset(&upa, 0, sizeof(upa));
6861 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
6862 commit_id, repo, update_progress, &upa, check_cancelled,
6867 if (upa.did_something)
6868 printf("Merged commit %s\n", commit_id_str);
6869 print_update_progress_stats(&upa);
6872 got_object_commit_close(commit);
6873 free(commit_id_str);
6875 got_ref_close(head_ref);
6877 got_worktree_close(worktree);
6879 got_repo_close(repo);
6886 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
6890 static const struct got_error *
6891 cmd_backout(int argc, char *argv[])
6893 const struct got_error *error = NULL;
6894 struct got_worktree *worktree = NULL;
6895 struct got_repository *repo = NULL;
6896 char *cwd = NULL, *commit_id_str = NULL;
6897 struct got_object_id *commit_id = NULL;
6898 struct got_commit_object *commit = NULL;
6899 struct got_object_qid *pid;
6900 struct got_reference *head_ref = NULL;
6902 struct got_update_progress_arg upa;
6904 while ((ch = getopt(argc, argv, "")) != -1) {
6916 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6917 "unveil", NULL) == -1)
6923 cwd = getcwd(NULL, 0);
6925 error = got_error_from_errno("getcwd");
6928 error = got_worktree_open(&worktree, cwd);
6930 if (error->code == GOT_ERR_NOT_WORKTREE)
6931 error = wrap_not_worktree_error(error, "backout", cwd);
6935 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6940 error = apply_unveil(got_repo_get_path(repo), 0,
6941 got_worktree_get_root_path(worktree));
6945 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
6946 GOT_OBJ_TYPE_COMMIT, repo);
6947 if (error != NULL) {
6948 struct got_reference *ref;
6949 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
6951 error = got_ref_open(&ref, repo, argv[0], 0);
6954 error = got_ref_resolve(&commit_id, repo, ref);
6959 error = got_object_id_str(&commit_id_str, commit_id);
6963 error = got_ref_open(&head_ref, repo,
6964 got_worktree_get_head_ref_name(worktree), 0);
6968 error = check_same_branch(commit_id, head_ref, NULL, repo);
6972 error = got_object_open_as_commit(&commit, repo, commit_id);
6975 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
6977 error = got_error(GOT_ERR_ROOT_COMMIT);
6981 memset(&upa, 0, sizeof(upa));
6982 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
6983 update_progress, &upa, check_cancelled, NULL);
6987 if (upa.did_something)
6988 printf("Backed out commit %s\n", commit_id_str);
6989 print_update_progress_stats(&upa);
6992 got_object_commit_close(commit);
6993 free(commit_id_str);
6995 got_ref_close(head_ref);
6997 got_worktree_close(worktree);
6999 got_repo_close(repo);
7006 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7012 trim_logmsg(char *logmsg, int limit)
7017 len = strlen(logmsg);
7021 nl = strchr(logmsg, '\n');
7026 static const struct got_error *
7027 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7029 const struct got_error *err;
7030 char *logmsg0 = NULL;
7033 err = got_object_commit_get_logmsg(&logmsg0, commit);
7038 while (isspace((unsigned char)s[0]))
7041 *logmsg = strdup(s);
7042 if (*logmsg == NULL) {
7043 err = got_error_from_errno("strdup");
7047 trim_logmsg(*logmsg, limit);
7053 static const struct got_error *
7054 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7056 const struct got_error *err;
7057 struct got_commit_object *commit = NULL;
7058 char *id_str = NULL, *logmsg = NULL;
7060 err = got_object_open_as_commit(&commit, repo, id);
7064 err = got_object_id_str(&id_str, id);
7070 err = get_short_logmsg(&logmsg, 42, commit);
7074 printf("%s -> merge conflict: %s\n", id_str, logmsg);
7077 got_object_commit_close(commit);
7082 static const struct got_error *
7083 show_rebase_progress(struct got_commit_object *commit,
7084 struct got_object_id *old_id, struct got_object_id *new_id)
7086 const struct got_error *err;
7087 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7089 err = got_object_id_str(&old_id_str, old_id);
7094 err = got_object_id_str(&new_id_str, new_id);
7099 old_id_str[12] = '\0';
7101 new_id_str[12] = '\0';
7103 err = get_short_logmsg(&logmsg, 42, commit);
7107 printf("%s -> %s: %s\n", old_id_str,
7108 new_id_str ? new_id_str : "no-op change", logmsg);
7116 static const struct got_error *
7117 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7118 struct got_reference *branch, struct got_reference *new_base_branch,
7119 struct got_reference *tmp_branch, struct got_repository *repo)
7121 printf("Switching work tree to %s\n", got_ref_get_name(branch));
7122 return got_worktree_rebase_complete(worktree, fileindex,
7123 new_base_branch, tmp_branch, branch, repo);
7126 static const struct got_error *
7127 rebase_commit(struct got_pathlist_head *merged_paths,
7128 struct got_worktree *worktree, struct got_fileindex *fileindex,
7129 struct got_reference *tmp_branch,
7130 struct got_object_id *commit_id, struct got_repository *repo)
7132 const struct got_error *error;
7133 struct got_commit_object *commit;
7134 struct got_object_id *new_commit_id;
7136 error = got_object_open_as_commit(&commit, repo, commit_id);
7140 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7141 worktree, fileindex, tmp_branch, commit, commit_id, repo);
7143 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7145 error = show_rebase_progress(commit, commit_id, NULL);
7147 error = show_rebase_progress(commit, commit_id, new_commit_id);
7148 free(new_commit_id);
7151 got_object_commit_close(commit);
7155 struct check_path_prefix_arg {
7156 const char *path_prefix;
7161 static const struct got_error *
7162 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7163 struct got_blob_object *blob2, struct got_object_id *id1,
7164 struct got_object_id *id2, const char *path1, const char *path2,
7165 mode_t mode1, mode_t mode2, struct got_repository *repo)
7167 struct check_path_prefix_arg *a = arg;
7169 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7170 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7171 return got_error(a->errcode);
7176 static const struct got_error *
7177 check_path_prefix(struct got_object_id *parent_id,
7178 struct got_object_id *commit_id, const char *path_prefix,
7179 int errcode, struct got_repository *repo)
7181 const struct got_error *err;
7182 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7183 struct got_commit_object *commit = NULL, *parent_commit = NULL;
7184 struct check_path_prefix_arg cpp_arg;
7186 if (got_path_is_root_dir(path_prefix))
7189 err = got_object_open_as_commit(&commit, repo, commit_id);
7193 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7197 err = got_object_open_as_tree(&tree1, repo,
7198 got_object_commit_get_tree_id(parent_commit));
7202 err = got_object_open_as_tree(&tree2, repo,
7203 got_object_commit_get_tree_id(commit));
7207 cpp_arg.path_prefix = path_prefix;
7208 while (cpp_arg.path_prefix[0] == '/')
7209 cpp_arg.path_prefix++;
7210 cpp_arg.len = strlen(cpp_arg.path_prefix);
7211 cpp_arg.errcode = errcode;
7212 err = got_diff_tree(tree1, tree2, "", "", repo,
7213 check_path_prefix_in_diff, &cpp_arg, 0);
7216 got_object_tree_close(tree1);
7218 got_object_tree_close(tree2);
7220 got_object_commit_close(commit);
7222 got_object_commit_close(parent_commit);
7226 static const struct got_error *
7227 collect_commits(struct got_object_id_queue *commits,
7228 struct got_object_id *initial_commit_id,
7229 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7230 const char *path_prefix, int path_prefix_errcode,
7231 struct got_repository *repo)
7233 const struct got_error *err = NULL;
7234 struct got_commit_graph *graph = NULL;
7235 struct got_object_id *parent_id = NULL;
7236 struct got_object_qid *qid;
7237 struct got_object_id *commit_id = initial_commit_id;
7239 err = got_commit_graph_open(&graph, "/", 1);
7243 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7244 check_cancelled, NULL);
7247 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7248 err = got_commit_graph_iter_next(&parent_id, graph, repo,
7249 check_cancelled, NULL);
7251 if (err->code == GOT_ERR_ITER_COMPLETED) {
7252 err = got_error_msg(GOT_ERR_ANCESTRY,
7253 "ran out of commits to rebase before "
7254 "youngest common ancestor commit has "
7259 err = check_path_prefix(parent_id, commit_id,
7260 path_prefix, path_prefix_errcode, repo);
7264 err = got_object_qid_alloc(&qid, commit_id);
7267 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7268 commit_id = parent_id;
7272 got_commit_graph_close(graph);
7276 static const struct got_error *
7277 cmd_rebase(int argc, char *argv[])
7279 const struct got_error *error = NULL;
7280 struct got_worktree *worktree = NULL;
7281 struct got_repository *repo = NULL;
7282 struct got_fileindex *fileindex = NULL;
7284 struct got_reference *branch = NULL;
7285 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7286 struct got_object_id *commit_id = NULL, *parent_id = NULL;
7287 struct got_object_id *resume_commit_id = NULL;
7288 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7289 struct got_commit_object *commit = NULL;
7290 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7291 int histedit_in_progress = 0;
7292 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7293 struct got_object_id_queue commits;
7294 struct got_pathlist_head merged_paths;
7295 const struct got_object_id_queue *parent_ids;
7296 struct got_object_qid *qid, *pid;
7298 SIMPLEQ_INIT(&commits);
7299 TAILQ_INIT(&merged_paths);
7301 while ((ch = getopt(argc, argv, "ac")) != -1) {
7307 continue_rebase = 1;
7319 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7320 "unveil", NULL) == -1)
7323 if (abort_rebase && continue_rebase)
7325 else if (abort_rebase || continue_rebase) {
7328 } else if (argc != 1)
7331 cwd = getcwd(NULL, 0);
7333 error = got_error_from_errno("getcwd");
7336 error = got_worktree_open(&worktree, cwd);
7338 if (error->code == GOT_ERR_NOT_WORKTREE)
7339 error = wrap_not_worktree_error(error, "rebase", cwd);
7343 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7348 error = apply_unveil(got_repo_get_path(repo), 0,
7349 got_worktree_get_root_path(worktree));
7353 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7357 if (histedit_in_progress) {
7358 error = got_error(GOT_ERR_HISTEDIT_BUSY);
7362 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7367 struct got_update_progress_arg upa;
7368 if (!rebase_in_progress) {
7369 error = got_error(GOT_ERR_NOT_REBASING);
7372 error = got_worktree_rebase_continue(&resume_commit_id,
7373 &new_base_branch, &tmp_branch, &branch, &fileindex,
7377 printf("Switching work tree to %s\n",
7378 got_ref_get_symref_target(new_base_branch));
7379 memset(&upa, 0, sizeof(upa));
7380 error = got_worktree_rebase_abort(worktree, fileindex, repo,
7381 new_base_branch, update_progress, &upa);
7384 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7385 print_update_progress_stats(&upa);
7386 goto done; /* nothing else to do */
7389 if (continue_rebase) {
7390 if (!rebase_in_progress) {
7391 error = got_error(GOT_ERR_NOT_REBASING);
7394 error = got_worktree_rebase_continue(&resume_commit_id,
7395 &new_base_branch, &tmp_branch, &branch, &fileindex,
7400 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7401 resume_commit_id, repo);
7405 yca_id = got_object_id_dup(resume_commit_id);
7406 if (yca_id == NULL) {
7407 error = got_error_from_errno("got_object_id_dup");
7411 error = got_ref_open(&branch, repo, argv[0], 0);
7416 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7420 if (!continue_rebase) {
7421 struct got_object_id *base_commit_id;
7423 base_commit_id = got_worktree_get_base_commit_id(worktree);
7424 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7425 base_commit_id, branch_head_commit_id, repo,
7426 check_cancelled, NULL);
7429 if (yca_id == NULL) {
7430 error = got_error_msg(GOT_ERR_ANCESTRY,
7431 "specified branch shares no common ancestry "
7432 "with work tree's branch");
7436 error = check_same_branch(base_commit_id, branch, yca_id, repo);
7438 if (error->code != GOT_ERR_ANCESTRY)
7442 error = got_error_msg(GOT_ERR_SAME_BRANCH,
7443 "specified branch resolves to a commit which "
7444 "is already contained in work tree's branch");
7447 error = got_worktree_rebase_prepare(&new_base_branch,
7448 &tmp_branch, &fileindex, worktree, branch, repo);
7453 commit_id = branch_head_commit_id;
7454 error = got_object_open_as_commit(&commit, repo, commit_id);
7458 parent_ids = got_object_commit_get_parent_ids(commit);
7459 pid = SIMPLEQ_FIRST(parent_ids);
7461 if (!continue_rebase) {
7462 struct got_update_progress_arg upa;
7463 memset(&upa, 0, sizeof(upa));
7464 error = got_worktree_rebase_abort(worktree, fileindex,
7465 repo, new_base_branch, update_progress, &upa);
7468 printf("Rebase of %s aborted\n",
7469 got_ref_get_name(branch));
7470 print_update_progress_stats(&upa);
7473 error = got_error(GOT_ERR_EMPTY_REBASE);
7476 error = collect_commits(&commits, commit_id, pid->id,
7477 yca_id, got_worktree_get_path_prefix(worktree),
7478 GOT_ERR_REBASE_PATH, repo);
7479 got_object_commit_close(commit);
7484 if (SIMPLEQ_EMPTY(&commits)) {
7485 if (continue_rebase) {
7486 error = rebase_complete(worktree, fileindex,
7487 branch, new_base_branch, tmp_branch, repo);
7490 /* Fast-forward the reference of the branch. */
7491 struct got_object_id *new_head_commit_id;
7493 error = got_ref_resolve(&new_head_commit_id, repo,
7497 error = got_object_id_str(&id_str, new_head_commit_id);
7498 printf("Forwarding %s to commit %s\n",
7499 got_ref_get_name(branch), id_str);
7501 error = got_ref_change_ref(branch,
7502 new_head_commit_id);
7509 SIMPLEQ_FOREACH(qid, &commits, entry) {
7510 struct got_update_progress_arg upa;
7512 commit_id = qid->id;
7513 parent_id = pid ? pid->id : yca_id;
7516 memset(&upa, 0, sizeof(upa));
7517 error = got_worktree_rebase_merge_files(&merged_paths,
7518 worktree, fileindex, parent_id, commit_id, repo,
7519 update_progress, &upa, check_cancelled, NULL);
7523 print_update_progress_stats(&upa);
7524 if (upa.conflicts > 0)
7525 rebase_status = GOT_STATUS_CONFLICT;
7527 if (rebase_status == GOT_STATUS_CONFLICT) {
7528 error = show_rebase_merge_conflict(qid->id, repo);
7531 got_worktree_rebase_pathlist_free(&merged_paths);
7535 error = rebase_commit(&merged_paths, worktree, fileindex,
7536 tmp_branch, commit_id, repo);
7537 got_worktree_rebase_pathlist_free(&merged_paths);
7542 if (rebase_status == GOT_STATUS_CONFLICT) {
7543 error = got_worktree_rebase_postpone(worktree, fileindex);
7546 error = got_error_msg(GOT_ERR_CONFLICTS,
7547 "conflicts must be resolved before rebasing can continue");
7549 error = rebase_complete(worktree, fileindex, branch,
7550 new_base_branch, tmp_branch, repo);
7552 got_object_id_queue_free(&commits);
7553 free(branch_head_commit_id);
7554 free(resume_commit_id);
7557 got_object_commit_close(commit);
7559 got_ref_close(branch);
7560 if (new_base_branch)
7561 got_ref_close(new_base_branch);
7563 got_ref_close(tmp_branch);
7565 got_worktree_close(worktree);
7567 got_repo_close(repo);
7572 usage_histedit(void)
7574 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7579 #define GOT_HISTEDIT_PICK 'p'
7580 #define GOT_HISTEDIT_EDIT 'e'
7581 #define GOT_HISTEDIT_FOLD 'f'
7582 #define GOT_HISTEDIT_DROP 'd'
7583 #define GOT_HISTEDIT_MESG 'm'
7585 static struct got_histedit_cmd {
7589 } got_histedit_cmds[] = {
7590 { GOT_HISTEDIT_PICK, "pick", "use commit" },
7591 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7592 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7594 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7595 { GOT_HISTEDIT_MESG, "mesg",
7596 "single-line log message for commit above (open editor if empty)" },
7599 struct got_histedit_list_entry {
7600 TAILQ_ENTRY(got_histedit_list_entry) entry;
7601 struct got_object_id *commit_id;
7602 const struct got_histedit_cmd *cmd;
7605 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7607 static const struct got_error *
7608 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7609 FILE *f, struct got_repository *repo)
7611 const struct got_error *err = NULL;
7612 char *logmsg = NULL, *id_str = NULL;
7613 struct got_commit_object *commit = NULL;
7616 err = got_object_open_as_commit(&commit, repo, commit_id);
7620 err = get_short_logmsg(&logmsg, 34, commit);
7624 err = got_object_id_str(&id_str, commit_id);
7628 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7630 err = got_ferror(f, GOT_ERR_IO);
7633 got_object_commit_close(commit);
7639 static const struct got_error *
7640 histedit_write_commit_list(struct got_object_id_queue *commits,
7641 FILE *f, int edit_logmsg_only, struct got_repository *repo)
7643 const struct got_error *err = NULL;
7644 struct got_object_qid *qid;
7646 if (SIMPLEQ_EMPTY(commits))
7647 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7649 SIMPLEQ_FOREACH(qid, commits, entry) {
7650 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7654 if (edit_logmsg_only) {
7655 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7657 err = got_ferror(f, GOT_ERR_IO);
7666 static const struct got_error *
7667 write_cmd_list(FILE *f, const char *branch_name,
7668 struct got_object_id_queue *commits)
7670 const struct got_error *err = NULL;
7673 struct got_object_qid *qid;
7675 qid = SIMPLEQ_FIRST(commits);
7676 err = got_object_id_str(&id_str, qid->id);
7681 "# Editing the history of branch '%s' starting at\n"
7683 "# Commits will be processed in order from top to "
7684 "bottom of this file.\n", branch_name, id_str);
7686 err = got_ferror(f, GOT_ERR_IO);
7690 n = fprintf(f, "# Available histedit commands:\n");
7692 err = got_ferror(f, GOT_ERR_IO);
7696 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7697 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7698 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7701 err = got_ferror(f, GOT_ERR_IO);
7710 static const struct got_error *
7711 histedit_syntax_error(int lineno)
7713 static char msg[42];
7716 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7718 if (ret == -1 || ret >= sizeof(msg))
7719 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7721 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7724 static const struct got_error *
7725 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7726 char *logmsg, struct got_repository *repo)
7728 const struct got_error *err;
7729 struct got_commit_object *folded_commit = NULL;
7730 char *id_str, *folded_logmsg = NULL;
7732 err = got_object_id_str(&id_str, hle->commit_id);
7736 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7740 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7743 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7744 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7745 folded_logmsg) == -1) {
7746 err = got_error_from_errno("asprintf");
7750 got_object_commit_close(folded_commit);
7752 free(folded_logmsg);
7756 static struct got_histedit_list_entry *
7757 get_folded_commits(struct got_histedit_list_entry *hle)
7759 struct got_histedit_list_entry *prev, *folded = NULL;
7761 prev = TAILQ_PREV(hle, got_histedit_list, entry);
7762 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7763 prev->cmd->code == GOT_HISTEDIT_DROP)) {
7764 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7766 prev = TAILQ_PREV(prev, got_histedit_list, entry);
7772 static const struct got_error *
7773 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7774 struct got_repository *repo)
7776 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7777 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7778 const struct got_error *err = NULL;
7779 struct got_commit_object *commit = NULL;
7782 struct got_histedit_list_entry *folded = NULL;
7784 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7788 folded = get_folded_commits(hle);
7790 while (folded != hle) {
7791 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7792 folded = TAILQ_NEXT(folded, entry);
7795 err = append_folded_commit_msg(&new_msg, folded,
7801 folded = TAILQ_NEXT(folded, entry);
7805 err = got_object_id_str(&id_str, hle->commit_id);
7808 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7811 logmsg_len = asprintf(&new_msg,
7812 "%s\n# original log message of commit %s: %s",
7813 logmsg ? logmsg : "", id_str, orig_logmsg);
7814 if (logmsg_len == -1) {
7815 err = got_error_from_errno("asprintf");
7821 err = got_object_id_str(&id_str, hle->commit_id);
7825 err = got_opentemp_named_fd(&logmsg_path, &fd,
7826 GOT_TMPDIR_STR "/got-logmsg");
7830 write(fd, logmsg, logmsg_len);
7833 err = get_editor(&editor);
7837 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg);
7839 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
7841 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
7844 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
7845 err = got_error_from_errno2("unlink", logmsg_path);
7851 got_object_commit_close(commit);
7855 static const struct got_error *
7856 histedit_parse_list(struct got_histedit_list *histedit_cmds,
7857 FILE *f, struct got_repository *repo)
7859 const struct got_error *err = NULL;
7860 char *line = NULL, *p, *end;
7864 const struct got_histedit_cmd *cmd;
7865 struct got_object_id *commit_id = NULL;
7866 struct got_histedit_list_entry *hle = NULL;
7869 len = getline(&line, &size, f);
7871 const struct got_error *getline_err;
7874 getline_err = got_error_from_errno("getline");
7875 err = got_ferror(f, getline_err->code);
7880 while (isspace((unsigned char)p[0]))
7882 if (p[0] == '#' || p[0] == '\0') {
7888 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7889 cmd = &got_histedit_cmds[i];
7890 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
7891 isspace((unsigned char)p[strlen(cmd->name)])) {
7892 p += strlen(cmd->name);
7895 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
7900 if (i == nitems(got_histedit_cmds)) {
7901 err = histedit_syntax_error(lineno);
7904 while (isspace((unsigned char)p[0]))
7906 if (cmd->code == GOT_HISTEDIT_MESG) {
7907 if (hle == NULL || hle->logmsg != NULL) {
7908 err = got_error(GOT_ERR_HISTEDIT_CMD);
7912 err = histedit_edit_logmsg(hle, repo);
7916 hle->logmsg = strdup(p);
7917 if (hle->logmsg == NULL) {
7918 err = got_error_from_errno("strdup");
7927 while (end[0] && !isspace((unsigned char)end[0]))
7931 err = got_object_resolve_id_str(&commit_id, repo, p);
7933 /* override error code */
7934 err = histedit_syntax_error(lineno);
7938 hle = malloc(sizeof(*hle));
7940 err = got_error_from_errno("malloc");
7944 hle->commit_id = commit_id;
7949 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
7957 static const struct got_error *
7958 histedit_check_script(struct got_histedit_list *histedit_cmds,
7959 struct got_object_id_queue *commits, struct got_repository *repo)
7961 const struct got_error *err = NULL;
7962 struct got_object_qid *qid;
7963 struct got_histedit_list_entry *hle;
7964 static char msg[92];
7967 if (TAILQ_EMPTY(histedit_cmds))
7968 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
7969 "histedit script contains no commands");
7970 if (SIMPLEQ_EMPTY(commits))
7971 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7973 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7974 struct got_histedit_list_entry *hle2;
7975 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
7978 if (got_object_id_cmp(hle->commit_id,
7979 hle2->commit_id) != 0)
7981 err = got_object_id_str(&id_str, hle->commit_id);
7984 snprintf(msg, sizeof(msg), "commit %s is listed "
7985 "more than once in histedit script", id_str);
7987 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
7991 SIMPLEQ_FOREACH(qid, commits, entry) {
7992 TAILQ_FOREACH(hle, histedit_cmds, entry) {
7993 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
7997 err = got_object_id_str(&id_str, qid->id);
8000 snprintf(msg, sizeof(msg),
8001 "commit %s missing from histedit script", id_str);
8003 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8007 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8008 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8009 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8010 "last commit in histedit script cannot be folded");
8015 static const struct got_error *
8016 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8017 const char *path, struct got_object_id_queue *commits,
8018 struct got_repository *repo)
8020 const struct got_error *err = NULL;
8024 err = get_editor(&editor);
8028 if (spawn_editor(editor, path) == -1) {
8029 err = got_error_from_errno("failed spawning editor");
8033 f = fopen(path, "r");
8035 err = got_error_from_errno("fopen");
8038 err = histedit_parse_list(histedit_cmds, f, repo);
8042 err = histedit_check_script(histedit_cmds, commits, repo);
8044 if (f && fclose(f) != 0 && err == NULL)
8045 err = got_error_from_errno("fclose");
8050 static const struct got_error *
8051 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8052 struct got_object_id_queue *, const char *, const char *,
8053 struct got_repository *);
8055 static const struct got_error *
8056 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8057 struct got_object_id_queue *commits, const char *branch_name,
8058 int edit_logmsg_only, struct got_repository *repo)
8060 const struct got_error *err;
8064 err = got_opentemp_named(&path, &f, "got-histedit");
8068 err = write_cmd_list(f, branch_name, commits);
8072 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
8076 if (edit_logmsg_only) {
8078 err = histedit_parse_list(histedit_cmds, f, repo);
8080 if (fclose(f) != 0) {
8081 err = got_error_from_errno("fclose");
8085 err = histedit_run_editor(histedit_cmds, path, commits, repo);
8087 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8088 err->code != GOT_ERR_HISTEDIT_CMD)
8090 err = histedit_edit_list_retry(histedit_cmds, err,
8091 commits, path, branch_name, repo);
8095 if (f && fclose(f) != 0 && err == NULL)
8096 err = got_error_from_errno("fclose");
8097 if (path && unlink(path) != 0 && err == NULL)
8098 err = got_error_from_errno2("unlink", path);
8103 static const struct got_error *
8104 histedit_save_list(struct got_histedit_list *histedit_cmds,
8105 struct got_worktree *worktree, struct got_repository *repo)
8107 const struct got_error *err = NULL;
8110 struct got_histedit_list_entry *hle;
8111 struct got_commit_object *commit = NULL;
8113 err = got_worktree_get_histedit_script_path(&path, worktree);
8117 f = fopen(path, "w");
8119 err = got_error_from_errno2("fopen", path);
8122 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8123 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8129 int n = fprintf(f, "%c %s\n",
8130 GOT_HISTEDIT_MESG, hle->logmsg);
8132 err = got_ferror(f, GOT_ERR_IO);
8138 if (f && fclose(f) != 0 && err == NULL)
8139 err = got_error_from_errno("fclose");
8142 got_object_commit_close(commit);
8147 histedit_free_list(struct got_histedit_list *histedit_cmds)
8149 struct got_histedit_list_entry *hle;
8151 while ((hle = TAILQ_FIRST(histedit_cmds))) {
8152 TAILQ_REMOVE(histedit_cmds, hle, entry);
8157 static const struct got_error *
8158 histedit_load_list(struct got_histedit_list *histedit_cmds,
8159 const char *path, struct got_repository *repo)
8161 const struct got_error *err = NULL;
8164 f = fopen(path, "r");
8166 err = got_error_from_errno2("fopen", path);
8170 err = histedit_parse_list(histedit_cmds, f, repo);
8172 if (f && fclose(f) != 0 && err == NULL)
8173 err = got_error_from_errno("fclose");
8177 static const struct got_error *
8178 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8179 const struct got_error *edit_err, struct got_object_id_queue *commits,
8180 const char *path, const char *branch_name, struct got_repository *repo)
8182 const struct got_error *err = NULL, *prev_err = edit_err;
8185 while (resp != 'c' && resp != 'r' && resp != 'a') {
8186 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8187 "or (a)bort: ", getprogname(), prev_err->msg);
8192 histedit_free_list(histedit_cmds);
8193 err = histedit_run_editor(histedit_cmds, path, commits,
8196 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8197 err->code != GOT_ERR_HISTEDIT_CMD)
8204 } else if (resp == 'r') {
8205 histedit_free_list(histedit_cmds);
8206 err = histedit_edit_script(histedit_cmds,
8207 commits, branch_name, 0, repo);
8209 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8210 err->code != GOT_ERR_HISTEDIT_CMD)
8217 } else if (resp == 'a') {
8218 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8221 printf("invalid response '%c'\n", resp);
8227 static const struct got_error *
8228 histedit_complete(struct got_worktree *worktree,
8229 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8230 struct got_reference *branch, struct got_repository *repo)
8232 printf("Switching work tree to %s\n",
8233 got_ref_get_symref_target(branch));
8234 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8238 static const struct got_error *
8239 show_histedit_progress(struct got_commit_object *commit,
8240 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8242 const struct got_error *err;
8243 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8245 err = got_object_id_str(&old_id_str, hle->commit_id);
8250 err = got_object_id_str(&new_id_str, new_id);
8255 old_id_str[12] = '\0';
8257 new_id_str[12] = '\0';
8260 logmsg = strdup(hle->logmsg);
8261 if (logmsg == NULL) {
8262 err = got_error_from_errno("strdup");
8265 trim_logmsg(logmsg, 42);
8267 err = get_short_logmsg(&logmsg, 42, commit);
8272 switch (hle->cmd->code) {
8273 case GOT_HISTEDIT_PICK:
8274 case GOT_HISTEDIT_EDIT:
8275 printf("%s -> %s: %s\n", old_id_str,
8276 new_id_str ? new_id_str : "no-op change", logmsg);
8278 case GOT_HISTEDIT_DROP:
8279 case GOT_HISTEDIT_FOLD:
8280 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8292 static const struct got_error *
8293 histedit_commit(struct got_pathlist_head *merged_paths,
8294 struct got_worktree *worktree, struct got_fileindex *fileindex,
8295 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8296 struct got_repository *repo)
8298 const struct got_error *err;
8299 struct got_commit_object *commit;
8300 struct got_object_id *new_commit_id;
8302 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8303 && hle->logmsg == NULL) {
8304 err = histedit_edit_logmsg(hle, repo);
8309 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8313 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8314 worktree, fileindex, tmp_branch, commit, hle->commit_id,
8317 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8319 err = show_histedit_progress(commit, hle, NULL);
8321 err = show_histedit_progress(commit, hle, new_commit_id);
8322 free(new_commit_id);
8325 got_object_commit_close(commit);
8329 static const struct got_error *
8330 histedit_skip_commit(struct got_histedit_list_entry *hle,
8331 struct got_worktree *worktree, struct got_repository *repo)
8333 const struct got_error *error;
8334 struct got_commit_object *commit;
8336 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8341 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8345 error = show_histedit_progress(commit, hle, NULL);
8346 got_object_commit_close(commit);
8350 static const struct got_error *
8351 check_local_changes(void *arg, unsigned char status,
8352 unsigned char staged_status, const char *path,
8353 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8354 struct got_object_id *commit_id, int dirfd, const char *de_name)
8356 int *have_local_changes = arg;
8359 case GOT_STATUS_ADD:
8360 case GOT_STATUS_DELETE:
8361 case GOT_STATUS_MODIFY:
8362 case GOT_STATUS_CONFLICT:
8363 *have_local_changes = 1;
8364 return got_error(GOT_ERR_CANCELLED);
8369 switch (staged_status) {
8370 case GOT_STATUS_ADD:
8371 case GOT_STATUS_DELETE:
8372 case GOT_STATUS_MODIFY:
8373 *have_local_changes = 1;
8374 return got_error(GOT_ERR_CANCELLED);
8382 static const struct got_error *
8383 cmd_histedit(int argc, char *argv[])
8385 const struct got_error *error = NULL;
8386 struct got_worktree *worktree = NULL;
8387 struct got_fileindex *fileindex = NULL;
8388 struct got_repository *repo = NULL;
8390 struct got_reference *branch = NULL;
8391 struct got_reference *tmp_branch = NULL;
8392 struct got_object_id *resume_commit_id = NULL;
8393 struct got_object_id *base_commit_id = NULL;
8394 struct got_object_id *head_commit_id = NULL;
8395 struct got_commit_object *commit = NULL;
8396 int ch, rebase_in_progress = 0;
8397 struct got_update_progress_arg upa;
8398 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8399 int edit_logmsg_only = 0;
8400 const char *edit_script_path = NULL;
8401 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8402 struct got_object_id_queue commits;
8403 struct got_pathlist_head merged_paths;
8404 const struct got_object_id_queue *parent_ids;
8405 struct got_object_qid *pid;
8406 struct got_histedit_list histedit_cmds;
8407 struct got_histedit_list_entry *hle;
8409 SIMPLEQ_INIT(&commits);
8410 TAILQ_INIT(&histedit_cmds);
8411 TAILQ_INIT(&merged_paths);
8412 memset(&upa, 0, sizeof(upa));
8414 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8423 edit_script_path = optarg;
8426 edit_logmsg_only = 1;
8438 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8439 "unveil", NULL) == -1)
8442 if (abort_edit && continue_edit)
8443 errx(1, "histedit's -a and -c options are mutually exclusive");
8444 if (edit_script_path && edit_logmsg_only)
8445 errx(1, "histedit's -F and -m options are mutually exclusive");
8446 if (abort_edit && edit_logmsg_only)
8447 errx(1, "histedit's -a and -m options are mutually exclusive");
8448 if (continue_edit && edit_logmsg_only)
8449 errx(1, "histedit's -c and -m options are mutually exclusive");
8454 * This command cannot apply unveil(2) in all cases because the
8455 * user may choose to run an editor to edit the histedit script
8456 * and to edit individual commit log messages.
8457 * unveil(2) traverses exec(2); if an editor is used we have to
8458 * apply unveil after edit script and log messages have been written.
8459 * XXX TODO: Make use of unveil(2) where possible.
8462 cwd = getcwd(NULL, 0);
8464 error = got_error_from_errno("getcwd");
8467 error = got_worktree_open(&worktree, cwd);
8469 if (error->code == GOT_ERR_NOT_WORKTREE)
8470 error = wrap_not_worktree_error(error, "histedit", cwd);
8474 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8479 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8482 if (rebase_in_progress) {
8483 error = got_error(GOT_ERR_REBASING);
8487 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8491 if (edit_in_progress && edit_logmsg_only) {
8492 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8493 "histedit operation is in progress in this "
8494 "work tree and must be continued or aborted "
8495 "before the -m option can be used");
8499 if (edit_in_progress && abort_edit) {
8500 error = got_worktree_histedit_continue(&resume_commit_id,
8501 &tmp_branch, &branch, &base_commit_id, &fileindex,
8505 printf("Switching work tree to %s\n",
8506 got_ref_get_symref_target(branch));
8507 error = got_worktree_histedit_abort(worktree, fileindex, repo,
8508 branch, base_commit_id, update_progress, &upa);
8511 printf("Histedit of %s aborted\n",
8512 got_ref_get_symref_target(branch));
8513 print_update_progress_stats(&upa);
8514 goto done; /* nothing else to do */
8515 } else if (abort_edit) {
8516 error = got_error(GOT_ERR_NOT_HISTEDIT);
8520 if (continue_edit) {
8523 if (!edit_in_progress) {
8524 error = got_error(GOT_ERR_NOT_HISTEDIT);
8528 error = got_worktree_get_histedit_script_path(&path, worktree);
8532 error = histedit_load_list(&histedit_cmds, path, repo);
8537 error = got_worktree_histedit_continue(&resume_commit_id,
8538 &tmp_branch, &branch, &base_commit_id, &fileindex,
8543 error = got_ref_resolve(&head_commit_id, repo, branch);
8547 error = got_object_open_as_commit(&commit, repo,
8551 parent_ids = got_object_commit_get_parent_ids(commit);
8552 pid = SIMPLEQ_FIRST(parent_ids);
8554 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8557 error = collect_commits(&commits, head_commit_id, pid->id,
8558 base_commit_id, got_worktree_get_path_prefix(worktree),
8559 GOT_ERR_HISTEDIT_PATH, repo);
8560 got_object_commit_close(commit);
8565 if (edit_in_progress) {
8566 error = got_error(GOT_ERR_HISTEDIT_BUSY);
8570 error = got_ref_open(&branch, repo,
8571 got_worktree_get_head_ref_name(worktree), 0);
8575 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8576 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8577 "will not edit commit history of a branch outside "
8578 "the \"refs/heads/\" reference namespace");
8582 error = got_ref_resolve(&head_commit_id, repo, branch);
8583 got_ref_close(branch);
8588 error = got_object_open_as_commit(&commit, repo,
8592 parent_ids = got_object_commit_get_parent_ids(commit);
8593 pid = SIMPLEQ_FIRST(parent_ids);
8595 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8598 error = collect_commits(&commits, head_commit_id, pid->id,
8599 got_worktree_get_base_commit_id(worktree),
8600 got_worktree_get_path_prefix(worktree),
8601 GOT_ERR_HISTEDIT_PATH, repo);
8602 got_object_commit_close(commit);
8607 if (SIMPLEQ_EMPTY(&commits)) {
8608 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8612 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8613 &base_commit_id, &fileindex, worktree, repo);
8617 if (edit_script_path) {
8618 error = histedit_load_list(&histedit_cmds,
8619 edit_script_path, repo);
8621 got_worktree_histedit_abort(worktree, fileindex,
8622 repo, branch, base_commit_id,
8623 update_progress, &upa);
8624 print_update_progress_stats(&upa);
8628 const char *branch_name;
8629 branch_name = got_ref_get_symref_target(branch);
8630 if (strncmp(branch_name, "refs/heads/", 11) == 0)
8632 error = histedit_edit_script(&histedit_cmds, &commits,
8633 branch_name, edit_logmsg_only, repo);
8635 got_worktree_histedit_abort(worktree, fileindex,
8636 repo, branch, base_commit_id,
8637 update_progress, &upa);
8638 print_update_progress_stats(&upa);
8644 error = histedit_save_list(&histedit_cmds, worktree,
8647 got_worktree_histedit_abort(worktree, fileindex,
8648 repo, branch, base_commit_id,
8649 update_progress, &upa);
8650 print_update_progress_stats(&upa);
8656 error = histedit_check_script(&histedit_cmds, &commits, repo);
8660 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8661 if (resume_commit_id) {
8662 if (got_object_id_cmp(hle->commit_id,
8663 resume_commit_id) != 0)
8666 resume_commit_id = NULL;
8667 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8668 hle->cmd->code == GOT_HISTEDIT_FOLD) {
8669 error = histedit_skip_commit(hle, worktree,
8674 struct got_pathlist_head paths;
8675 int have_changes = 0;
8678 error = got_pathlist_append(&paths, "", NULL);
8681 error = got_worktree_status(worktree, &paths,
8682 repo, check_local_changes, &have_changes,
8683 check_cancelled, NULL);
8684 got_pathlist_free(&paths);
8686 if (error->code != GOT_ERR_CANCELLED)
8688 if (sigint_received || sigpipe_received)
8692 error = histedit_commit(NULL, worktree,
8693 fileindex, tmp_branch, hle, repo);
8697 error = got_object_open_as_commit(
8698 &commit, repo, hle->commit_id);
8701 error = show_histedit_progress(commit,
8703 got_object_commit_close(commit);
8712 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8713 error = histedit_skip_commit(hle, worktree, repo);
8719 error = got_object_open_as_commit(&commit, repo,
8723 parent_ids = got_object_commit_get_parent_ids(commit);
8724 pid = SIMPLEQ_FIRST(parent_ids);
8726 error = got_worktree_histedit_merge_files(&merged_paths,
8727 worktree, fileindex, pid->id, hle->commit_id, repo,
8728 update_progress, &upa, check_cancelled, NULL);
8731 got_object_commit_close(commit);
8734 print_update_progress_stats(&upa);
8735 if (upa.conflicts > 0)
8736 rebase_status = GOT_STATUS_CONFLICT;
8738 if (rebase_status == GOT_STATUS_CONFLICT) {
8739 error = show_rebase_merge_conflict(hle->commit_id,
8743 got_worktree_rebase_pathlist_free(&merged_paths);
8747 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8749 error = got_object_id_str(&id_str, hle->commit_id);
8752 printf("Stopping histedit for amending commit %s\n",
8755 got_worktree_rebase_pathlist_free(&merged_paths);
8756 error = got_worktree_histedit_postpone(worktree,
8761 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8762 error = histedit_skip_commit(hle, worktree, repo);
8768 error = histedit_commit(&merged_paths, worktree, fileindex,
8769 tmp_branch, hle, repo);
8770 got_worktree_rebase_pathlist_free(&merged_paths);
8775 if (rebase_status == GOT_STATUS_CONFLICT) {
8776 error = got_worktree_histedit_postpone(worktree, fileindex);
8779 error = got_error_msg(GOT_ERR_CONFLICTS,
8780 "conflicts must be resolved before histedit can continue");
8782 error = histedit_complete(worktree, fileindex, tmp_branch,
8785 got_object_id_queue_free(&commits);
8786 histedit_free_list(&histedit_cmds);
8787 free(head_commit_id);
8788 free(base_commit_id);
8789 free(resume_commit_id);
8791 got_object_commit_close(commit);
8793 got_ref_close(branch);
8795 got_ref_close(tmp_branch);
8797 got_worktree_close(worktree);
8799 got_repo_close(repo);
8804 usage_integrate(void)
8806 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8810 static const struct got_error *
8811 cmd_integrate(int argc, char *argv[])
8813 const struct got_error *error = NULL;
8814 struct got_repository *repo = NULL;
8815 struct got_worktree *worktree = NULL;
8816 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8817 const char *branch_arg = NULL;
8818 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8819 struct got_fileindex *fileindex = NULL;
8820 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8822 struct got_update_progress_arg upa;
8824 while ((ch = getopt(argc, argv, "")) != -1) {
8837 branch_arg = argv[0];
8839 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8840 "unveil", NULL) == -1)
8843 cwd = getcwd(NULL, 0);
8845 error = got_error_from_errno("getcwd");
8849 error = got_worktree_open(&worktree, cwd);
8851 if (error->code == GOT_ERR_NOT_WORKTREE)
8852 error = wrap_not_worktree_error(error, "integrate",
8857 error = check_rebase_or_histedit_in_progress(worktree);
8861 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8866 error = apply_unveil(got_repo_get_path(repo), 0,
8867 got_worktree_get_root_path(worktree));
8871 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
8872 error = got_error_from_errno("asprintf");
8876 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
8877 &base_branch_ref, worktree, refname, repo);
8881 refname = strdup(got_ref_get_name(branch_ref));
8882 if (refname == NULL) {
8883 error = got_error_from_errno("strdup");
8884 got_worktree_integrate_abort(worktree, fileindex, repo,
8885 branch_ref, base_branch_ref);
8888 base_refname = strdup(got_ref_get_name(base_branch_ref));
8889 if (base_refname == NULL) {
8890 error = got_error_from_errno("strdup");
8891 got_worktree_integrate_abort(worktree, fileindex, repo,
8892 branch_ref, base_branch_ref);
8896 error = got_ref_resolve(&commit_id, repo, branch_ref);
8900 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
8904 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
8905 error = got_error_msg(GOT_ERR_SAME_BRANCH,
8906 "specified branch has already been integrated");
8907 got_worktree_integrate_abort(worktree, fileindex, repo,
8908 branch_ref, base_branch_ref);
8912 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
8914 if (error->code == GOT_ERR_ANCESTRY)
8915 error = got_error(GOT_ERR_REBASE_REQUIRED);
8916 got_worktree_integrate_abort(worktree, fileindex, repo,
8917 branch_ref, base_branch_ref);
8921 memset(&upa, 0, sizeof(upa));
8922 error = got_worktree_integrate_continue(worktree, fileindex, repo,
8923 branch_ref, base_branch_ref, update_progress, &upa,
8924 check_cancelled, NULL);
8928 printf("Integrated %s into %s\n", refname, base_refname);
8929 print_update_progress_stats(&upa);
8932 got_repo_close(repo);
8934 got_worktree_close(worktree);
8936 free(base_commit_id);
8946 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
8947 "[-S] [file-path ...]\n",
8952 static const struct got_error *
8953 print_stage(void *arg, unsigned char status, unsigned char staged_status,
8954 const char *path, struct got_object_id *blob_id,
8955 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
8956 int dirfd, const char *de_name)
8958 const struct got_error *err = NULL;
8959 char *id_str = NULL;
8961 if (staged_status != GOT_STATUS_ADD &&
8962 staged_status != GOT_STATUS_MODIFY &&
8963 staged_status != GOT_STATUS_DELETE)
8966 if (staged_status == GOT_STATUS_ADD ||
8967 staged_status == GOT_STATUS_MODIFY)
8968 err = got_object_id_str(&id_str, staged_blob_id);
8970 err = got_object_id_str(&id_str, blob_id);
8974 printf("%s %c %s\n", id_str, staged_status, path);
8979 static const struct got_error *
8980 cmd_stage(int argc, char *argv[])
8982 const struct got_error *error = NULL;
8983 struct got_repository *repo = NULL;
8984 struct got_worktree *worktree = NULL;
8986 struct got_pathlist_head paths;
8987 struct got_pathlist_entry *pe;
8988 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
8989 FILE *patch_script_file = NULL;
8990 const char *patch_script_path = NULL;
8991 struct choose_patch_arg cpa;
8995 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9004 patch_script_path = optarg;
9007 allow_bad_symlinks = 1;
9019 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9020 "unveil", NULL) == -1)
9023 if (list_stage && (pflag || patch_script_path))
9024 errx(1, "-l option cannot be used with other options");
9025 if (patch_script_path && !pflag)
9026 errx(1, "-F option can only be used together with -p option");
9028 cwd = getcwd(NULL, 0);
9030 error = got_error_from_errno("getcwd");
9034 error = got_worktree_open(&worktree, cwd);
9036 if (error->code == GOT_ERR_NOT_WORKTREE)
9037 error = wrap_not_worktree_error(error, "stage", cwd);
9041 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9046 if (patch_script_path) {
9047 patch_script_file = fopen(patch_script_path, "r");
9048 if (patch_script_file == NULL) {
9049 error = got_error_from_errno2("fopen",
9054 error = apply_unveil(got_repo_get_path(repo), 0,
9055 got_worktree_get_root_path(worktree));
9059 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9064 error = got_worktree_status(worktree, &paths, repo,
9065 print_stage, NULL, check_cancelled, NULL);
9067 cpa.patch_script_file = patch_script_file;
9068 cpa.action = "stage";
9069 error = got_worktree_stage(worktree, &paths,
9070 pflag ? NULL : print_status, NULL,
9071 pflag ? choose_patch : NULL, &cpa,
9072 allow_bad_symlinks, repo);
9075 if (patch_script_file && fclose(patch_script_file) == EOF &&
9077 error = got_error_from_errno2("fclose", patch_script_path);
9079 got_repo_close(repo);
9081 got_worktree_close(worktree);
9082 TAILQ_FOREACH(pe, &paths, entry)
9083 free((char *)pe->path);
9084 got_pathlist_free(&paths);
9092 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9093 "[file-path ...]\n",
9099 static const struct got_error *
9100 cmd_unstage(int argc, char *argv[])
9102 const struct got_error *error = NULL;
9103 struct got_repository *repo = NULL;
9104 struct got_worktree *worktree = NULL;
9106 struct got_pathlist_head paths;
9107 struct got_pathlist_entry *pe;
9109 struct got_update_progress_arg upa;
9110 FILE *patch_script_file = NULL;
9111 const char *patch_script_path = NULL;
9112 struct choose_patch_arg cpa;
9116 while ((ch = getopt(argc, argv, "pF:")) != -1) {
9122 patch_script_path = optarg;
9134 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9135 "unveil", NULL) == -1)
9138 if (patch_script_path && !pflag)
9139 errx(1, "-F option can only be used together with -p option");
9141 cwd = getcwd(NULL, 0);
9143 error = got_error_from_errno("getcwd");
9147 error = got_worktree_open(&worktree, cwd);
9149 if (error->code == GOT_ERR_NOT_WORKTREE)
9150 error = wrap_not_worktree_error(error, "unstage", cwd);
9154 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9159 if (patch_script_path) {
9160 patch_script_file = fopen(patch_script_path, "r");
9161 if (patch_script_file == NULL) {
9162 error = got_error_from_errno2("fopen",
9168 error = apply_unveil(got_repo_get_path(repo), 0,
9169 got_worktree_get_root_path(worktree));
9173 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9177 cpa.patch_script_file = patch_script_file;
9178 cpa.action = "unstage";
9179 memset(&upa, 0, sizeof(upa));
9180 error = got_worktree_unstage(worktree, &paths, update_progress,
9181 &upa, pflag ? choose_patch : NULL, &cpa, repo);
9183 print_update_progress_stats(&upa);
9185 if (patch_script_file && fclose(patch_script_file) == EOF &&
9187 error = got_error_from_errno2("fclose", patch_script_path);
9189 got_repo_close(repo);
9191 got_worktree_close(worktree);
9192 TAILQ_FOREACH(pe, &paths, entry)
9193 free((char *)pe->path);
9194 got_pathlist_free(&paths);
9202 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9203 "arg1 [arg2 ...]\n", getprogname());
9207 static const struct got_error *
9208 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9210 const struct got_error *err;
9211 struct got_blob_object *blob;
9213 err = got_object_open_as_blob(&blob, repo, id, 8192);
9217 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9218 got_object_blob_close(blob);
9222 static const struct got_error *
9223 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9225 const struct got_error *err;
9226 struct got_tree_object *tree;
9229 err = got_object_open_as_tree(&tree, repo, id);
9233 nentries = got_object_tree_get_nentries(tree);
9234 for (i = 0; i < nentries; i++) {
9235 struct got_tree_entry *te;
9237 if (sigint_received || sigpipe_received)
9239 te = got_object_tree_get_entry(tree, i);
9240 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9243 fprintf(outfile, "%s %.7o %s\n", id_str,
9244 got_tree_entry_get_mode(te),
9245 got_tree_entry_get_name(te));
9249 got_object_tree_close(tree);
9253 static const struct got_error *
9254 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9256 const struct got_error *err;
9257 struct got_commit_object *commit;
9258 const struct got_object_id_queue *parent_ids;
9259 struct got_object_qid *pid;
9260 char *id_str = NULL;
9261 const char *logmsg = NULL;
9263 err = got_object_open_as_commit(&commit, repo, id);
9267 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9271 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9272 parent_ids = got_object_commit_get_parent_ids(commit);
9273 fprintf(outfile, "numparents %d\n",
9274 got_object_commit_get_nparents(commit));
9275 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9277 err = got_object_id_str(&pid_str, pid->id);
9280 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9283 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9284 got_object_commit_get_author(commit),
9285 got_object_commit_get_author_time(commit));
9287 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9288 got_object_commit_get_author(commit),
9289 got_object_commit_get_committer_time(commit));
9291 logmsg = got_object_commit_get_logmsg_raw(commit);
9292 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9293 fprintf(outfile, "%s", logmsg);
9296 got_object_commit_close(commit);
9300 static const struct got_error *
9301 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9303 const struct got_error *err;
9304 struct got_tag_object *tag;
9305 char *id_str = NULL;
9306 const char *tagmsg = NULL;
9308 err = got_object_open_as_tag(&tag, repo, id);
9312 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9316 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9318 switch (got_object_tag_get_object_type(tag)) {
9319 case GOT_OBJ_TYPE_BLOB:
9320 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9321 GOT_OBJ_LABEL_BLOB);
9323 case GOT_OBJ_TYPE_TREE:
9324 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9325 GOT_OBJ_LABEL_TREE);
9327 case GOT_OBJ_TYPE_COMMIT:
9328 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9329 GOT_OBJ_LABEL_COMMIT);
9331 case GOT_OBJ_TYPE_TAG:
9332 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9339 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9340 got_object_tag_get_name(tag));
9342 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9343 got_object_tag_get_tagger(tag),
9344 got_object_tag_get_tagger_time(tag));
9346 tagmsg = got_object_tag_get_message(tag);
9347 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9348 fprintf(outfile, "%s", tagmsg);
9351 got_object_tag_close(tag);
9355 static const struct got_error *
9356 cmd_cat(int argc, char *argv[])
9358 const struct got_error *error;
9359 struct got_repository *repo = NULL;
9360 struct got_worktree *worktree = NULL;
9361 char *cwd = NULL, *repo_path = NULL, *label = NULL;
9362 const char *commit_id_str = NULL;
9363 struct got_object_id *id = NULL, *commit_id = NULL;
9364 int ch, obj_type, i, force_path = 0;
9367 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9372 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9375 commit_id_str = optarg;
9378 repo_path = realpath(optarg, NULL);
9379 if (repo_path == NULL)
9380 return got_error_from_errno2("realpath",
9382 got_path_strip_trailing_slashes(repo_path);
9396 cwd = getcwd(NULL, 0);
9398 error = got_error_from_errno("getcwd");
9401 error = got_worktree_open(&worktree, cwd);
9402 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9405 if (repo_path == NULL) {
9407 got_worktree_get_repo_path(worktree));
9408 if (repo_path == NULL) {
9409 error = got_error_from_errno("strdup");
9415 if (repo_path == NULL) {
9416 repo_path = getcwd(NULL, 0);
9417 if (repo_path == NULL)
9418 return got_error_from_errno("getcwd");
9421 error = got_repo_open(&repo, repo_path, NULL);
9426 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9430 if (commit_id_str == NULL)
9431 commit_id_str = GOT_REF_HEAD;
9432 error = got_repo_match_object_id(&commit_id, NULL,
9433 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9437 for (i = 0; i < argc; i++) {
9439 error = got_object_id_by_path(&id, repo, commit_id,
9444 error = got_repo_match_object_id(&id, &label, argv[i],
9445 GOT_OBJ_TYPE_ANY, 0, repo);
9447 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9448 error->code != GOT_ERR_NOT_REF)
9450 error = got_object_id_by_path(&id, repo,
9451 commit_id, argv[i]);
9457 error = got_object_get_type(&obj_type, repo, id);
9462 case GOT_OBJ_TYPE_BLOB:
9463 error = cat_blob(id, repo, stdout);
9465 case GOT_OBJ_TYPE_TREE:
9466 error = cat_tree(id, repo, stdout);
9468 case GOT_OBJ_TYPE_COMMIT:
9469 error = cat_commit(id, repo, stdout);
9471 case GOT_OBJ_TYPE_TAG:
9472 error = cat_tag(id, repo, stdout);
9475 error = got_error(GOT_ERR_OBJ_TYPE);
9490 got_worktree_close(worktree);
9492 const struct got_error *repo_error;
9493 repo_error = got_repo_close(repo);
9503 fprintf(stderr, "usage: %s info [path ...]\n",
9508 static const struct got_error *
9509 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9510 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9511 struct got_object_id *commit_id)
9513 const struct got_error *err = NULL;
9514 char *id_str = NULL;
9516 struct tm mytm, *tm;
9517 struct got_pathlist_head *paths = arg;
9518 struct got_pathlist_entry *pe;
9521 * Clear error indication from any of the path arguments which
9522 * would cause this file index entry to be displayed.
9524 TAILQ_FOREACH(pe, paths, entry) {
9525 if (got_path_cmp(path, pe->path, strlen(path),
9526 pe->path_len) == 0 ||
9527 got_path_is_child(path, pe->path, pe->path_len))
9528 pe->data = NULL; /* no error */
9531 printf(GOT_COMMIT_SEP_STR);
9533 printf("symlink: %s\n", path);
9534 else if (S_ISREG(mode)) {
9535 printf("file: %s\n", path);
9536 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9537 } else if (S_ISDIR(mode))
9538 printf("directory: %s\n", path);
9540 printf("something: %s\n", path);
9542 tm = localtime_r(&mtime, &mytm);
9545 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9546 return got_error(GOT_ERR_NO_SPACE);
9547 printf("timestamp: %s\n", datebuf);
9550 err = got_object_id_str(&id_str, blob_id);
9553 printf("based on blob: %s\n", id_str);
9557 if (staged_blob_id) {
9558 err = got_object_id_str(&id_str, staged_blob_id);
9561 printf("based on staged blob: %s\n", id_str);
9566 err = got_object_id_str(&id_str, commit_id);
9569 printf("based on commit: %s\n", id_str);
9576 static const struct got_error *
9577 cmd_info(int argc, char *argv[])
9579 const struct got_error *error = NULL;
9580 struct got_worktree *worktree = NULL;
9581 char *cwd = NULL, *id_str = NULL;
9582 struct got_pathlist_head paths;
9583 struct got_pathlist_entry *pe;
9584 char *uuidstr = NULL;
9585 int ch, show_files = 0;
9589 while ((ch = getopt(argc, argv, "")) != -1) {
9601 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9605 cwd = getcwd(NULL, 0);
9607 error = got_error_from_errno("getcwd");
9611 error = got_worktree_open(&worktree, cwd);
9613 if (error->code == GOT_ERR_NOT_WORKTREE)
9614 error = wrap_not_worktree_error(error, "status", cwd);
9618 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9623 error = get_worktree_paths_from_argv(&paths, argc, argv,
9630 error = got_object_id_str(&id_str,
9631 got_worktree_get_base_commit_id(worktree));
9635 error = got_worktree_get_uuid(&uuidstr, worktree);
9639 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9640 printf("work tree base commit: %s\n", id_str);
9641 printf("work tree path prefix: %s\n",
9642 got_worktree_get_path_prefix(worktree));
9643 printf("work tree branch reference: %s\n",
9644 got_worktree_get_head_ref_name(worktree));
9645 printf("work tree UUID: %s\n", uuidstr);
9646 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9649 struct got_pathlist_entry *pe;
9650 TAILQ_FOREACH(pe, &paths, entry) {
9651 if (pe->path_len == 0)
9654 * Assume this path will fail. This will be corrected
9655 * in print_path_info() in case the path does suceeed.
9657 pe->data = (void *)got_error_path(pe->path,
9660 error = got_worktree_path_info(worktree, &paths,
9661 print_path_info, &paths, check_cancelled, NULL);
9664 TAILQ_FOREACH(pe, &paths, entry) {
9665 if (pe->data != NULL) {
9666 error = pe->data; /* bad path */
9672 TAILQ_FOREACH(pe, &paths, entry)
9673 free((char *)pe->path);
9674 got_pathlist_free(&paths);