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/types.h>
40 #include "got_compat.h"
42 #include "got_version.h"
43 #include "got_error.h"
44 #include "got_object.h"
45 #include "got_reference.h"
46 #include "got_repository.h"
48 #include "got_cancel.h"
49 #include "got_worktree.h"
51 #include "got_commit_graph.h"
52 #include "got_fetch.h"
54 #include "got_blame.h"
55 #include "got_privsep.h"
56 #include "got_opentemp.h"
57 #include "got_gotconfig.h"
59 #include "got_patch.h"
62 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
65 static volatile sig_atomic_t sigint_received;
66 static volatile sig_atomic_t sigpipe_received;
69 catch_sigint(int signo)
75 catch_sigpipe(int signo)
83 const struct got_error *(*cmd_main)(int, char *[]);
84 void (*cmd_usage)(void);
85 const char *cmd_alias;
88 __dead static void usage(int, int);
89 __dead static void usage_init(void);
90 __dead static void usage_import(void);
91 __dead static void usage_clone(void);
92 __dead static void usage_fetch(void);
93 __dead static void usage_checkout(void);
94 __dead static void usage_update(void);
95 __dead static void usage_log(void);
96 __dead static void usage_diff(void);
97 __dead static void usage_blame(void);
98 __dead static void usage_tree(void);
99 __dead static void usage_status(void);
100 __dead static void usage_ref(void);
101 __dead static void usage_branch(void);
102 __dead static void usage_tag(void);
103 __dead static void usage_add(void);
104 __dead static void usage_remove(void);
105 __dead static void usage_patch(void);
106 __dead static void usage_revert(void);
107 __dead static void usage_commit(void);
108 __dead static void usage_send(void);
109 __dead static void usage_cherrypick(void);
110 __dead static void usage_backout(void);
111 __dead static void usage_rebase(void);
112 __dead static void usage_histedit(void);
113 __dead static void usage_integrate(void);
114 __dead static void usage_merge(void);
115 __dead static void usage_stage(void);
116 __dead static void usage_unstage(void);
117 __dead static void usage_cat(void);
118 __dead static void usage_info(void);
120 static const struct got_error* cmd_init(int, char *[]);
121 static const struct got_error* cmd_import(int, char *[]);
122 static const struct got_error* cmd_clone(int, char *[]);
123 static const struct got_error* cmd_fetch(int, char *[]);
124 static const struct got_error* cmd_checkout(int, char *[]);
125 static const struct got_error* cmd_update(int, char *[]);
126 static const struct got_error* cmd_log(int, char *[]);
127 static const struct got_error* cmd_diff(int, char *[]);
128 static const struct got_error* cmd_blame(int, char *[]);
129 static const struct got_error* cmd_tree(int, char *[]);
130 static const struct got_error* cmd_status(int, char *[]);
131 static const struct got_error* cmd_ref(int, char *[]);
132 static const struct got_error* cmd_branch(int, char *[]);
133 static const struct got_error* cmd_tag(int, char *[]);
134 static const struct got_error* cmd_add(int, char *[]);
135 static const struct got_error* cmd_remove(int, char *[]);
136 static const struct got_error* cmd_patch(int, char *[]);
137 static const struct got_error* cmd_revert(int, char *[]);
138 static const struct got_error* cmd_commit(int, char *[]);
139 static const struct got_error* cmd_send(int, char *[]);
140 static const struct got_error* cmd_cherrypick(int, char *[]);
141 static const struct got_error* cmd_backout(int, char *[]);
142 static const struct got_error* cmd_rebase(int, char *[]);
143 static const struct got_error* cmd_histedit(int, char *[]);
144 static const struct got_error* cmd_integrate(int, char *[]);
145 static const struct got_error* cmd_merge(int, char *[]);
146 static const struct got_error* cmd_stage(int, char *[]);
147 static const struct got_error* cmd_unstage(int, char *[]);
148 static const struct got_error* cmd_cat(int, char *[]);
149 static const struct got_error* cmd_info(int, char *[]);
151 static const struct got_cmd got_commands[] = {
152 { "init", cmd_init, usage_init, "" },
153 { "import", cmd_import, usage_import, "im" },
154 { "clone", cmd_clone, usage_clone, "cl" },
155 { "fetch", cmd_fetch, usage_fetch, "fe" },
156 { "checkout", cmd_checkout, usage_checkout, "co" },
157 { "update", cmd_update, usage_update, "up" },
158 { "log", cmd_log, usage_log, "" },
159 { "diff", cmd_diff, usage_diff, "di" },
160 { "blame", cmd_blame, usage_blame, "bl" },
161 { "tree", cmd_tree, usage_tree, "tr" },
162 { "status", cmd_status, usage_status, "st" },
163 { "ref", cmd_ref, usage_ref, "" },
164 { "branch", cmd_branch, usage_branch, "br" },
165 { "tag", cmd_tag, usage_tag, "" },
166 { "add", cmd_add, usage_add, "" },
167 { "remove", cmd_remove, usage_remove, "rm" },
168 { "patch", cmd_patch, usage_patch, "pa" },
169 { "revert", cmd_revert, usage_revert, "rv" },
170 { "commit", cmd_commit, usage_commit, "ci" },
171 { "send", cmd_send, usage_send, "se" },
172 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
173 { "backout", cmd_backout, usage_backout, "bo" },
174 { "rebase", cmd_rebase, usage_rebase, "rb" },
175 { "histedit", cmd_histedit, usage_histedit, "he" },
176 { "integrate", cmd_integrate, usage_integrate,"ig" },
177 { "merge", cmd_merge, usage_merge, "mg" },
178 { "stage", cmd_stage, usage_stage, "sg" },
179 { "unstage", cmd_unstage, usage_unstage, "ug" },
180 { "cat", cmd_cat, usage_cat, "" },
181 { "info", cmd_info, usage_info, "" },
185 list_commands(FILE *fp)
189 fprintf(fp, "commands:");
190 for (i = 0; i < nitems(got_commands); i++) {
191 const struct got_cmd *cmd = &got_commands[i];
192 fprintf(fp, " %s", cmd->cmd_name);
198 option_conflict(char a, char b)
200 errx(1, "-%c and -%c options are mutually exclusive", a, b);
204 main(int argc, char *argv[])
206 const struct got_cmd *cmd;
209 int hflag = 0, Vflag = 0;
210 static const struct option longopts[] = {
211 { "version", no_argument, NULL, 'V' },
215 setlocale(LC_CTYPE, "");
217 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
237 got_version_print_str();
242 usage(hflag, hflag ? 0 : 1);
244 signal(SIGINT, catch_sigint);
245 signal(SIGPIPE, catch_sigpipe);
247 for (i = 0; i < nitems(got_commands); i++) {
248 const struct got_error *error;
250 cmd = &got_commands[i];
252 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
253 strcmp(cmd->cmd_alias, argv[0]) != 0)
259 error = cmd->cmd_main(argc, argv);
260 if (error && error->code != GOT_ERR_CANCELLED &&
261 error->code != GOT_ERR_PRIVSEP_EXIT &&
262 !(sigpipe_received &&
263 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
265 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
266 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
273 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
274 list_commands(stderr);
279 usage(int hflag, int status)
281 FILE *fp = (status == 0) ? stdout : stderr;
283 fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
290 static const struct got_error *
291 get_editor(char **abspath)
293 const struct got_error *err = NULL;
298 editor = getenv("VISUAL");
300 editor = getenv("EDITOR");
303 err = got_path_find_prog(abspath, editor);
308 if (*abspath == NULL) {
309 *abspath = strdup("/bin/ed");
310 if (*abspath == NULL)
311 return got_error_from_errno("strdup");
317 static const struct got_error *
318 apply_unveil(const char *repo_path, int repo_read_only,
319 const char *worktree_path)
321 const struct got_error *err;
324 if (unveil("gmon.out", "rwc") != 0)
325 return got_error_from_errno2("unveil", "gmon.out");
327 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
328 return got_error_from_errno2("unveil", repo_path);
330 if (worktree_path && unveil(worktree_path, "rwc") != 0)
331 return got_error_from_errno2("unveil", worktree_path);
333 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
334 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
336 err = got_privsep_unveil_exec_helpers();
340 if (unveil(NULL, NULL) != 0)
341 return got_error_from_errno("unveil");
349 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
353 static const struct got_error *
354 cmd_init(int argc, char *argv[])
356 const struct got_error *error = NULL;
357 char *repo_path = NULL;
360 while ((ch = getopt(argc, argv, "")) != -1) {
372 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
378 repo_path = strdup(argv[0]);
379 if (repo_path == NULL)
380 return got_error_from_errno("strdup");
382 got_path_strip_trailing_slashes(repo_path);
384 error = got_path_mkdir(repo_path);
386 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
389 error = apply_unveil(repo_path, 0, NULL);
393 error = got_repo_init(repo_path);
402 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
403 "[-r repository-path] [-I pattern] path\n", getprogname());
408 spawn_editor(const char *editor, const char *file)
411 sig_t sighup, sigint, sigquit;
414 sighup = signal(SIGHUP, SIG_IGN);
415 sigint = signal(SIGINT, SIG_IGN);
416 sigquit = signal(SIGQUIT, SIG_IGN);
418 switch (pid = fork()) {
422 execl(editor, editor, file, (char *)NULL);
426 while (waitpid(pid, &st, 0) == -1)
431 (void)signal(SIGHUP, sighup);
432 (void)signal(SIGINT, sigint);
433 (void)signal(SIGQUIT, sigquit);
435 if (!WIFEXITED(st)) {
440 return WEXITSTATUS(st);
443 static const struct got_error *
444 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
445 const char *initial_content, size_t initial_content_len,
446 int require_modification)
448 const struct got_error *err = NULL;
454 size_t len, logmsg_len;
455 char *initial_content_stripped = NULL, *buf = NULL, *s;
459 if (stat(logmsg_path, &st) == -1)
460 return got_error_from_errno2("stat", logmsg_path);
462 if (spawn_editor(editor, logmsg_path) == -1)
463 return got_error_from_errno("failed spawning editor");
465 if (stat(logmsg_path, &st2) == -1)
466 return got_error_from_errno("stat");
468 if (require_modification &&
469 st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
470 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
471 "no changes made to commit message, aborting");
474 * Set up a stripped version of the initial content without comments
475 * and blank lines. We need this in order to check if the message
476 * has in fact been edited.
478 initial_content_stripped = malloc(initial_content_len + 1);
479 if (initial_content_stripped == NULL)
480 return got_error_from_errno("malloc");
481 initial_content_stripped[0] = '\0';
483 buf = strdup(initial_content);
485 err = got_error_from_errno("strdup");
490 while ((line = strsep(&s, "\n")) != NULL) {
491 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
492 continue; /* remove comments and leading empty lines */
493 len = strlcat(initial_content_stripped, line,
494 initial_content_len + 1);
495 if (len >= initial_content_len + 1) {
496 err = got_error(GOT_ERR_NO_SPACE);
500 while (len > 0 && initial_content_stripped[len - 1] == '\n') {
501 initial_content_stripped[len - 1] = '\0';
505 logmsg_len = st2.st_size;
506 *logmsg = malloc(logmsg_len + 1);
508 return got_error_from_errno("malloc");
511 fp = fopen(logmsg_path, "re");
513 err = got_error_from_errno("fopen");
518 while ((linelen = getline(&line, &linesize, fp)) != -1) {
519 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
520 continue; /* remove comments and leading empty lines */
521 len = strlcat(*logmsg, line, logmsg_len + 1);
522 if (len >= logmsg_len + 1) {
523 err = got_error(GOT_ERR_NO_SPACE);
529 err = got_ferror(fp, GOT_ERR_IO);
532 while (len > 0 && (*logmsg)[len - 1] == '\n') {
533 (*logmsg)[len - 1] = '\0';
538 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
539 "commit message cannot be empty, aborting");
542 if (require_modification &&
543 strcmp(*logmsg, initial_content_stripped) == 0)
544 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
545 "no changes made to commit message, aborting");
547 free(initial_content_stripped);
549 if (fp && fclose(fp) == EOF && err == NULL)
550 err = got_error_from_errno("fclose");
558 static const struct got_error *
559 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
560 const char *path_dir, const char *branch_name)
562 char *initial_content = NULL;
563 const struct got_error *err = NULL;
564 int initial_content_len;
567 initial_content_len = asprintf(&initial_content,
568 "\n# %s to be imported to branch %s\n", path_dir,
570 if (initial_content_len == -1)
571 return got_error_from_errno("asprintf");
573 err = got_opentemp_named_fd(logmsg_path, &fd,
574 GOT_TMPDIR_STR "/got-importmsg");
578 if (write(fd, initial_content, initial_content_len) == -1) {
579 err = got_error_from_errno2("write", *logmsg_path);
583 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
584 initial_content_len, 1);
586 if (fd != -1 && close(fd) == -1 && err == NULL)
587 err = got_error_from_errno2("close", *logmsg_path);
588 free(initial_content);
596 static const struct got_error *
597 import_progress(void *arg, const char *path)
599 printf("A %s\n", path);
604 valid_author(const char *author)
607 * Really dumb email address check; we're only doing this to
608 * avoid git's object parser breaking on commits we create.
610 while (*author && *author != '<')
614 while (*author && *author != '@')
618 while (*author && *author != '>')
620 return *author == '>';
623 static const struct got_error *
624 get_author(char **author, struct got_repository *repo,
625 struct got_worktree *worktree)
627 const struct got_error *err = NULL;
628 const char *got_author = NULL, *name, *email;
629 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
634 worktree_conf = got_worktree_get_gotconfig(worktree);
635 repo_conf = got_repo_get_gotconfig(repo);
638 * Priority of potential author information sources, from most
639 * significant to least significant:
640 * 1) work tree's .got/got.conf file
641 * 2) repository's got.conf file
642 * 3) repository's git config file
643 * 4) environment variables
644 * 5) global git config files (in user's home directory or /etc)
648 got_author = got_gotconfig_get_author(worktree_conf);
649 if (got_author == NULL)
650 got_author = got_gotconfig_get_author(repo_conf);
651 if (got_author == NULL) {
652 name = got_repo_get_gitconfig_author_name(repo);
653 email = got_repo_get_gitconfig_author_email(repo);
655 if (asprintf(author, "%s <%s>", name, email) == -1)
656 return got_error_from_errno("asprintf");
660 got_author = getenv("GOT_AUTHOR");
661 if (got_author == NULL) {
662 name = got_repo_get_global_gitconfig_author_name(repo);
663 email = got_repo_get_global_gitconfig_author_email(
666 if (asprintf(author, "%s <%s>", name, email)
668 return got_error_from_errno("asprintf");
671 /* TODO: Look up user in password database? */
672 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
676 *author = strdup(got_author);
678 return got_error_from_errno("strdup");
680 if (!valid_author(*author)) {
681 err = got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", *author);
688 static const struct got_error *
689 get_gitconfig_path(char **gitconfig_path)
691 const char *homedir = getenv("HOME");
693 *gitconfig_path = NULL;
695 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
696 return got_error_from_errno("asprintf");
702 static const struct got_error *
703 cmd_import(int argc, char *argv[])
705 const struct got_error *error = NULL;
706 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
707 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
708 const char *branch_name = "main";
709 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
710 struct got_repository *repo = NULL;
711 struct got_reference *branch_ref = NULL, *head_ref = NULL;
712 struct got_object_id *new_commit_id = NULL;
714 struct got_pathlist_head ignores;
715 struct got_pathlist_entry *pe;
716 int preserve_logmsg = 0;
718 TAILQ_INIT(&ignores);
720 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
723 branch_name = optarg;
726 logmsg = strdup(optarg);
727 if (logmsg == NULL) {
728 error = got_error_from_errno("strdup");
733 repo_path = realpath(optarg, NULL);
734 if (repo_path == NULL) {
735 error = got_error_from_errno2("realpath",
741 if (optarg[0] == '\0')
743 error = got_pathlist_insert(&pe, &ignores, optarg,
758 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
766 if (repo_path == NULL) {
767 repo_path = getcwd(NULL, 0);
768 if (repo_path == NULL)
769 return got_error_from_errno("getcwd");
771 got_path_strip_trailing_slashes(repo_path);
772 error = get_gitconfig_path(&gitconfig_path);
775 error = got_repo_open(&repo, repo_path, gitconfig_path);
779 error = get_author(&author, repo, NULL);
784 * Don't let the user create a branch name with a leading '-'.
785 * While technically a valid reference name, this case is usually
786 * an unintended typo.
788 if (branch_name[0] == '-')
789 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
791 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
792 error = got_error_from_errno("asprintf");
796 error = got_ref_open(&branch_ref, repo, refname, 0);
798 if (error->code != GOT_ERR_NOT_REF)
801 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
802 "import target branch already exists");
806 path_dir = realpath(argv[0], NULL);
807 if (path_dir == NULL) {
808 error = got_error_from_errno2("realpath", argv[0]);
811 got_path_strip_trailing_slashes(path_dir);
814 * unveil(2) traverses exec(2); if an editor is used we have
815 * to apply unveil after the log message has been written.
817 if (logmsg == NULL || strlen(logmsg) == 0) {
818 error = get_editor(&editor);
822 error = collect_import_msg(&logmsg, &logmsg_path, editor,
825 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
832 if (unveil(path_dir, "r") != 0) {
833 error = got_error_from_errno2("unveil", path_dir);
839 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
846 error = got_repo_import(&new_commit_id, path_dir, logmsg,
847 author, &ignores, repo, import_progress, NULL);
854 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
861 error = got_ref_write(branch_ref, repo);
868 error = got_object_id_str(&id_str, new_commit_id);
875 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
877 if (error->code != GOT_ERR_NOT_REF) {
883 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
891 error = got_ref_write(head_ref, repo);
899 printf("Created branch %s with commit %s\n",
900 got_ref_get_name(branch_ref), id_str);
902 if (preserve_logmsg) {
903 fprintf(stderr, "%s: log message preserved in %s\n",
904 getprogname(), logmsg_path);
905 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
906 error = got_error_from_errno2("unlink", logmsg_path);
915 free(gitconfig_path);
917 got_ref_close(branch_ref);
919 got_ref_close(head_ref);
926 fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
927 "[-R reference] repository-url [directory]\n", getprogname());
931 struct got_fetch_progress_arg {
932 char last_scaled_size[FMT_SCALED_STRSIZE];
937 struct got_repository *repo;
942 struct got_pathlist_head *symrefs;
943 struct got_pathlist_head *wanted_branches;
944 struct got_pathlist_head *wanted_refs;
948 const char *remote_repo_path;
950 int fetch_all_branches;
951 int mirror_references;
955 /* XXX forward declaration */
956 static const struct got_error *
957 create_config_files(const char *proto, const char *host, const char *port,
958 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
959 int mirror_references, struct got_pathlist_head *symrefs,
960 struct got_pathlist_head *wanted_branches,
961 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
963 static const struct got_error *
964 fetch_progress(void *arg, const char *message, off_t packfile_size,
965 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
967 const struct got_error *err = NULL;
968 struct got_fetch_progress_arg *a = arg;
969 char scaled_size[FMT_SCALED_STRSIZE];
970 int p_indexed, p_resolved;
971 int print_size = 0, print_indexed = 0, print_resolved = 0;
974 * In order to allow a failed clone to be resumed with 'got fetch'
975 * we try to create configuration files as soon as possible.
976 * Once the server has sent information about its default branch
977 * we have all required information.
979 if (a->create_configs && !a->configs_created &&
980 !TAILQ_EMPTY(a->config_info.symrefs)) {
981 err = create_config_files(a->config_info.proto,
982 a->config_info.host, a->config_info.port,
983 a->config_info.remote_repo_path,
984 a->config_info.git_url,
985 a->config_info.fetch_all_branches,
986 a->config_info.mirror_references,
987 a->config_info.symrefs,
988 a->config_info.wanted_branches,
989 a->config_info.wanted_refs, a->repo);
992 a->configs_created = 1;
995 if (a->verbosity < 0)
998 if (message && message[0] != '\0') {
999 printf("\rserver: %s", message);
1004 if (packfile_size > 0 || nobj_indexed > 0) {
1005 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1006 (a->last_scaled_size[0] == '\0' ||
1007 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1009 if (strlcpy(a->last_scaled_size, scaled_size,
1010 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1011 return got_error(GOT_ERR_NO_SPACE);
1013 if (nobj_indexed > 0) {
1014 p_indexed = (nobj_indexed * 100) / nobj_total;
1015 if (p_indexed != a->last_p_indexed) {
1016 a->last_p_indexed = p_indexed;
1021 if (nobj_resolved > 0) {
1022 p_resolved = (nobj_resolved * 100) /
1023 (nobj_total - nobj_loose);
1024 if (p_resolved != a->last_p_resolved) {
1025 a->last_p_resolved = p_resolved;
1033 if (print_size || print_indexed || print_resolved)
1036 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1038 printf("; indexing %d%%", p_indexed);
1040 printf("; resolving deltas %d%%", p_resolved);
1041 if (print_size || print_indexed || print_resolved)
1047 static const struct got_error *
1048 create_symref(const char *refname, struct got_reference *target_ref,
1049 int verbosity, struct got_repository *repo)
1051 const struct got_error *err;
1052 struct got_reference *head_symref;
1054 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1058 err = got_ref_write(head_symref, repo);
1059 if (err == NULL && verbosity > 0) {
1060 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1061 got_ref_get_name(target_ref));
1063 got_ref_close(head_symref);
1067 static const struct got_error *
1068 list_remote_refs(struct got_pathlist_head *symrefs,
1069 struct got_pathlist_head *refs)
1071 const struct got_error *err;
1072 struct got_pathlist_entry *pe;
1074 TAILQ_FOREACH(pe, symrefs, entry) {
1075 const char *refname = pe->path;
1076 const char *targetref = pe->data;
1078 printf("%s: %s\n", refname, targetref);
1081 TAILQ_FOREACH(pe, refs, entry) {
1082 const char *refname = pe->path;
1083 struct got_object_id *id = pe->data;
1086 err = got_object_id_str(&id_str, id);
1089 printf("%s: %s\n", refname, id_str);
1096 static const struct got_error *
1097 create_ref(const char *refname, struct got_object_id *id,
1098 int verbosity, struct got_repository *repo)
1100 const struct got_error *err = NULL;
1101 struct got_reference *ref;
1104 err = got_object_id_str(&id_str, id);
1108 err = got_ref_alloc(&ref, refname, id);
1112 err = got_ref_write(ref, repo);
1115 if (err == NULL && verbosity >= 0)
1116 printf("Created reference %s: %s\n", refname, id_str);
1123 match_wanted_ref(const char *refname, const char *wanted_ref)
1125 if (strncmp(refname, "refs/", 5) != 0)
1130 * Prevent fetching of references that won't make any
1131 * sense outside of the remote repository's context.
1133 if (strncmp(refname, "got/", 4) == 0)
1135 if (strncmp(refname, "remotes/", 8) == 0)
1138 if (strncmp(wanted_ref, "refs/", 5) == 0)
1141 /* Allow prefix match. */
1142 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1145 /* Allow exact match. */
1146 return (strcmp(refname, wanted_ref) == 0);
1150 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1152 struct got_pathlist_entry *pe;
1154 TAILQ_FOREACH(pe, wanted_refs, entry) {
1155 if (match_wanted_ref(refname, pe->path))
1162 static const struct got_error *
1163 create_wanted_ref(const char *refname, struct got_object_id *id,
1164 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1166 const struct got_error *err;
1167 char *remote_refname;
1169 if (strncmp("refs/", refname, 5) == 0)
1172 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1173 remote_repo_name, refname) == -1)
1174 return got_error_from_errno("asprintf");
1176 err = create_ref(remote_refname, id, verbosity, repo);
1177 free(remote_refname);
1181 static const struct got_error *
1182 create_gotconfig(const char *proto, const char *host, const char *port,
1183 const char *remote_repo_path, const char *default_branch,
1184 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1185 struct got_pathlist_head *wanted_refs, int mirror_references,
1186 struct got_repository *repo)
1188 const struct got_error *err = NULL;
1189 char *gotconfig_path = NULL;
1190 char *gotconfig = NULL;
1191 FILE *gotconfig_file = NULL;
1192 const char *branchname = NULL;
1193 char *branches = NULL, *refs = NULL;
1196 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1197 struct got_pathlist_entry *pe;
1198 TAILQ_FOREACH(pe, wanted_branches, entry) {
1200 branchname = pe->path;
1201 if (strncmp(branchname, "refs/heads/", 11) == 0)
1203 if (asprintf(&s, "%s\"%s\" ",
1204 branches ? branches : "", branchname) == -1) {
1205 err = got_error_from_errno("asprintf");
1211 } else if (!fetch_all_branches && default_branch) {
1212 branchname = default_branch;
1213 if (strncmp(branchname, "refs/heads/", 11) == 0)
1215 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1216 err = got_error_from_errno("asprintf");
1220 if (!TAILQ_EMPTY(wanted_refs)) {
1221 struct got_pathlist_entry *pe;
1222 TAILQ_FOREACH(pe, wanted_refs, entry) {
1224 const char *refname = pe->path;
1225 if (strncmp(refname, "refs/", 5) == 0)
1227 if (asprintf(&s, "%s\"%s\" ",
1228 refs ? refs : "", refname) == -1) {
1229 err = got_error_from_errno("asprintf");
1237 /* Create got.conf(5). */
1238 gotconfig_path = got_repo_get_path_gotconfig(repo);
1239 if (gotconfig_path == NULL) {
1240 err = got_error_from_errno("got_repo_get_path_gotconfig");
1243 gotconfig_file = fopen(gotconfig_path, "ae");
1244 if (gotconfig_file == NULL) {
1245 err = got_error_from_errno2("fopen", gotconfig_path);
1248 if (asprintf(&gotconfig,
1253 "\trepository \"%s\"\n"
1259 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1260 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1261 remote_repo_path, branches ? "\tbranch { " : "",
1262 branches ? branches : "", branches ? "}\n" : "",
1263 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1264 mirror_references ? "\tmirror-references yes\n" : "",
1265 fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1266 err = got_error_from_errno("asprintf");
1269 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1270 if (n != strlen(gotconfig)) {
1271 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1276 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1277 err = got_error_from_errno2("fclose", gotconfig_path);
1278 free(gotconfig_path);
1283 static const struct got_error *
1284 create_gitconfig(const char *git_url, const char *default_branch,
1285 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1286 struct got_pathlist_head *wanted_refs, int mirror_references,
1287 struct got_repository *repo)
1289 const struct got_error *err = NULL;
1290 char *gitconfig_path = NULL;
1291 char *gitconfig = NULL;
1292 FILE *gitconfig_file = NULL;
1293 char *branches = NULL, *refs = NULL;
1294 const char *branchname;
1297 /* Create a config file Git can understand. */
1298 gitconfig_path = got_repo_get_path_gitconfig(repo);
1299 if (gitconfig_path == NULL) {
1300 err = got_error_from_errno("got_repo_get_path_gitconfig");
1303 gitconfig_file = fopen(gitconfig_path, "ae");
1304 if (gitconfig_file == NULL) {
1305 err = got_error_from_errno2("fopen", gitconfig_path);
1308 if (fetch_all_branches) {
1309 if (mirror_references) {
1310 if (asprintf(&branches,
1311 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1312 err = got_error_from_errno("asprintf");
1315 } else if (asprintf(&branches,
1316 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1317 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1318 err = got_error_from_errno("asprintf");
1321 } else if (!TAILQ_EMPTY(wanted_branches)) {
1322 struct got_pathlist_entry *pe;
1323 TAILQ_FOREACH(pe, wanted_branches, entry) {
1325 branchname = pe->path;
1326 if (strncmp(branchname, "refs/heads/", 11) == 0)
1328 if (mirror_references) {
1330 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1331 branches ? branches : "",
1332 branchname, branchname) == -1) {
1333 err = got_error_from_errno("asprintf");
1336 } else if (asprintf(&s,
1337 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1338 branches ? branches : "",
1339 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1340 branchname) == -1) {
1341 err = got_error_from_errno("asprintf");
1349 * If the server specified a default branch, use just that one.
1350 * Otherwise fall back to fetching all branches on next fetch.
1352 if (default_branch) {
1353 branchname = default_branch;
1354 if (strncmp(branchname, "refs/heads/", 11) == 0)
1357 branchname = "*"; /* fall back to all branches */
1358 if (mirror_references) {
1359 if (asprintf(&branches,
1360 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1361 branchname, branchname) == -1) {
1362 err = got_error_from_errno("asprintf");
1365 } else if (asprintf(&branches,
1366 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1367 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1368 branchname) == -1) {
1369 err = got_error_from_errno("asprintf");
1373 if (!TAILQ_EMPTY(wanted_refs)) {
1374 struct got_pathlist_entry *pe;
1375 TAILQ_FOREACH(pe, wanted_refs, entry) {
1377 const char *refname = pe->path;
1378 if (strncmp(refname, "refs/", 5) == 0)
1380 if (mirror_references) {
1382 "%s\tfetch = refs/%s:refs/%s\n",
1383 refs ? refs : "", refname, refname) == -1) {
1384 err = got_error_from_errno("asprintf");
1387 } else if (asprintf(&s,
1388 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1390 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1392 err = got_error_from_errno("asprintf");
1400 if (asprintf(&gitconfig,
1405 "\tfetch = refs/tags/*:refs/tags/*\n",
1406 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1407 refs ? refs : "") == -1) {
1408 err = got_error_from_errno("asprintf");
1411 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1412 if (n != strlen(gitconfig)) {
1413 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1417 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1418 err = got_error_from_errno2("fclose", gitconfig_path);
1419 free(gitconfig_path);
1424 static const struct got_error *
1425 create_config_files(const char *proto, const char *host, const char *port,
1426 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1427 int mirror_references, struct got_pathlist_head *symrefs,
1428 struct got_pathlist_head *wanted_branches,
1429 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1431 const struct got_error *err = NULL;
1432 const char *default_branch = NULL;
1433 struct got_pathlist_entry *pe;
1436 * If we asked for a set of wanted branches then use the first
1439 if (!TAILQ_EMPTY(wanted_branches)) {
1440 pe = TAILQ_FIRST(wanted_branches);
1441 default_branch = pe->path;
1443 /* First HEAD ref listed by server is the default branch. */
1444 TAILQ_FOREACH(pe, symrefs, entry) {
1445 const char *refname = pe->path;
1446 const char *target = pe->data;
1448 if (strcmp(refname, GOT_REF_HEAD) != 0)
1451 default_branch = target;
1456 /* Create got.conf(5). */
1457 err = create_gotconfig(proto, host, port, remote_repo_path,
1458 default_branch, fetch_all_branches, wanted_branches,
1459 wanted_refs, mirror_references, repo);
1463 /* Create a config file Git can understand. */
1464 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1465 wanted_branches, wanted_refs, mirror_references, repo);
1468 static const struct got_error *
1469 cmd_clone(int argc, char *argv[])
1471 const struct got_error *error = NULL;
1472 const char *uri, *dirname;
1473 char *proto, *host, *port, *repo_name, *server_path;
1474 char *default_destdir = NULL, *id_str = NULL;
1475 const char *repo_path;
1476 struct got_repository *repo = NULL;
1477 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1478 struct got_pathlist_entry *pe;
1479 struct got_object_id *pack_hash = NULL;
1480 int ch, fetchfd = -1, fetchstatus;
1481 pid_t fetchpid = -1;
1482 struct got_fetch_progress_arg fpa;
1483 char *git_url = NULL;
1484 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1485 int list_refs_only = 0;
1488 TAILQ_INIT(&symrefs);
1489 TAILQ_INIT(&wanted_branches);
1490 TAILQ_INIT(&wanted_refs);
1492 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1495 fetch_all_branches = 1;
1498 error = got_pathlist_append(&wanted_branches,
1507 mirror_references = 1;
1512 else if (verbosity < 3)
1519 error = got_pathlist_append(&wanted_refs,
1532 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1533 option_conflict('a', 'b');
1534 if (list_refs_only) {
1535 if (!TAILQ_EMPTY(&wanted_branches))
1536 option_conflict('l', 'b');
1537 if (fetch_all_branches)
1538 option_conflict('l', 'a');
1539 if (mirror_references)
1540 option_conflict('l', 'm');
1541 if (!TAILQ_EMPTY(&wanted_refs))
1542 option_conflict('l', 'R');
1554 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1559 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1560 host, port ? ":" : "", port ? port : "",
1561 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1562 error = got_error_from_errno("asprintf");
1566 if (strcmp(proto, "git") == 0) {
1568 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1569 "sendfd dns inet unveil", NULL) == -1)
1572 } else if (strcmp(proto, "git+ssh") == 0 ||
1573 strcmp(proto, "ssh") == 0) {
1575 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1576 "sendfd unveil", NULL) == -1)
1579 } else if (strcmp(proto, "http") == 0 ||
1580 strcmp(proto, "git+http") == 0) {
1581 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1584 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1587 if (dirname == NULL) {
1588 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1589 error = got_error_from_errno("asprintf");
1592 repo_path = default_destdir;
1594 repo_path = dirname;
1596 if (!list_refs_only) {
1597 error = got_path_mkdir(repo_path);
1599 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1600 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1602 if (!got_path_dir_is_empty(repo_path)) {
1603 error = got_error_path(repo_path,
1604 GOT_ERR_DIR_NOT_EMPTY);
1609 error = got_dial_apply_unveil(proto);
1613 error = apply_unveil(repo_path, 0, NULL);
1618 printf("Connecting to %s%s%s\n", host,
1619 port ? ":" : "", port ? port : "");
1621 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1622 server_path, verbosity);
1626 if (!list_refs_only) {
1627 error = got_repo_init(repo_path);
1630 error = got_repo_open(&repo, repo_path, NULL);
1635 fpa.last_scaled_size[0] = '\0';
1636 fpa.last_p_indexed = -1;
1637 fpa.last_p_resolved = -1;
1638 fpa.verbosity = verbosity;
1639 fpa.create_configs = 1;
1640 fpa.configs_created = 0;
1642 fpa.config_info.symrefs = &symrefs;
1643 fpa.config_info.wanted_branches = &wanted_branches;
1644 fpa.config_info.wanted_refs = &wanted_refs;
1645 fpa.config_info.proto = proto;
1646 fpa.config_info.host = host;
1647 fpa.config_info.port = port;
1648 fpa.config_info.remote_repo_path = server_path;
1649 fpa.config_info.git_url = git_url;
1650 fpa.config_info.fetch_all_branches = fetch_all_branches;
1651 fpa.config_info.mirror_references = mirror_references;
1652 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1653 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1654 fetch_all_branches, &wanted_branches, &wanted_refs,
1655 list_refs_only, verbosity, fetchfd, repo,
1656 fetch_progress, &fpa);
1660 if (list_refs_only) {
1661 error = list_remote_refs(&symrefs, &refs);
1665 if (pack_hash == NULL) {
1666 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1667 "server sent an empty pack file");
1670 error = got_object_id_str(&id_str, pack_hash);
1674 printf("\nFetched %s.pack\n", id_str);
1677 /* Set up references provided with the pack file. */
1678 TAILQ_FOREACH(pe, &refs, entry) {
1679 const char *refname = pe->path;
1680 struct got_object_id *id = pe->data;
1681 char *remote_refname;
1683 if (is_wanted_ref(&wanted_refs, refname) &&
1684 !mirror_references) {
1685 error = create_wanted_ref(refname, id,
1686 GOT_FETCH_DEFAULT_REMOTE_NAME,
1687 verbosity - 1, repo);
1693 error = create_ref(refname, id, verbosity - 1, repo);
1697 if (mirror_references)
1700 if (strncmp("refs/heads/", refname, 11) != 0)
1703 if (asprintf(&remote_refname,
1704 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1705 refname + 11) == -1) {
1706 error = got_error_from_errno("asprintf");
1709 error = create_ref(remote_refname, id, verbosity - 1, repo);
1710 free(remote_refname);
1715 /* Set the HEAD reference if the server provided one. */
1716 TAILQ_FOREACH(pe, &symrefs, entry) {
1717 struct got_reference *target_ref;
1718 const char *refname = pe->path;
1719 const char *target = pe->data;
1720 char *remote_refname = NULL, *remote_target = NULL;
1722 if (strcmp(refname, GOT_REF_HEAD) != 0)
1725 error = got_ref_open(&target_ref, repo, target, 0);
1727 if (error->code == GOT_ERR_NOT_REF) {
1734 error = create_symref(refname, target_ref, verbosity, repo);
1735 got_ref_close(target_ref);
1739 if (mirror_references)
1742 if (strncmp("refs/heads/", target, 11) != 0)
1745 if (asprintf(&remote_refname,
1746 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1748 error = got_error_from_errno("asprintf");
1751 if (asprintf(&remote_target,
1752 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1753 target + 11) == -1) {
1754 error = got_error_from_errno("asprintf");
1755 free(remote_refname);
1758 error = got_ref_open(&target_ref, repo, remote_target, 0);
1760 free(remote_refname);
1761 free(remote_target);
1762 if (error->code == GOT_ERR_NOT_REF) {
1768 error = create_symref(remote_refname, target_ref,
1769 verbosity - 1, repo);
1770 free(remote_refname);
1771 free(remote_target);
1772 got_ref_close(target_ref);
1778 * We failed to set the HEAD reference. If we asked for
1779 * a set of wanted branches use the first of one of those
1780 * which could be fetched instead.
1782 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1783 const char *target = pe->path;
1784 struct got_reference *target_ref;
1786 error = got_ref_open(&target_ref, repo, target, 0);
1788 if (error->code == GOT_ERR_NOT_REF) {
1795 error = create_symref(GOT_REF_HEAD, target_ref,
1797 got_ref_close(target_ref);
1805 printf("Created %s repository '%s'\n",
1806 mirror_references ? "mirrored" : "cloned", repo_path);
1809 if (kill(fetchpid, SIGTERM) == -1)
1810 error = got_error_from_errno("kill");
1811 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1812 error = got_error_from_errno("waitpid");
1814 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1815 error = got_error_from_errno("close");
1817 const struct got_error *close_err = got_repo_close(repo);
1821 TAILQ_FOREACH(pe, &refs, entry) {
1822 free((void *)pe->path);
1825 got_pathlist_free(&refs);
1826 TAILQ_FOREACH(pe, &symrefs, entry) {
1827 free((void *)pe->path);
1830 got_pathlist_free(&symrefs);
1831 got_pathlist_free(&wanted_branches);
1832 got_pathlist_free(&wanted_refs);
1839 free(default_destdir);
1844 static const struct got_error *
1845 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1846 int replace_tags, int verbosity, struct got_repository *repo)
1848 const struct got_error *err = NULL;
1849 char *new_id_str = NULL;
1850 struct got_object_id *old_id = NULL;
1852 err = got_object_id_str(&new_id_str, new_id);
1856 if (!replace_tags &&
1857 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1858 err = got_ref_resolve(&old_id, repo, ref);
1861 if (got_object_id_cmp(old_id, new_id) == 0)
1863 if (verbosity >= 0) {
1864 printf("Rejecting update of existing tag %s: %s\n",
1865 got_ref_get_name(ref), new_id_str);
1870 if (got_ref_is_symbolic(ref)) {
1871 if (verbosity >= 0) {
1872 printf("Replacing reference %s: %s\n",
1873 got_ref_get_name(ref),
1874 got_ref_get_symref_target(ref));
1876 err = got_ref_change_symref_to_ref(ref, new_id);
1879 err = got_ref_write(ref, repo);
1883 err = got_ref_resolve(&old_id, repo, ref);
1886 if (got_object_id_cmp(old_id, new_id) == 0)
1889 err = got_ref_change_ref(ref, new_id);
1892 err = got_ref_write(ref, repo);
1898 printf("Updated %s: %s\n", got_ref_get_name(ref),
1906 static const struct got_error *
1907 update_symref(const char *refname, struct got_reference *target_ref,
1908 int verbosity, struct got_repository *repo)
1910 const struct got_error *err = NULL, *unlock_err;
1911 struct got_reference *symref;
1912 int symref_is_locked = 0;
1914 err = got_ref_open(&symref, repo, refname, 1);
1916 if (err->code != GOT_ERR_NOT_REF)
1918 err = got_ref_alloc_symref(&symref, refname, target_ref);
1922 err = got_ref_write(symref, repo);
1927 printf("Created reference %s: %s\n",
1928 got_ref_get_name(symref),
1929 got_ref_get_symref_target(symref));
1931 symref_is_locked = 1;
1933 if (strcmp(got_ref_get_symref_target(symref),
1934 got_ref_get_name(target_ref)) == 0)
1937 err = got_ref_change_symref(symref,
1938 got_ref_get_name(target_ref));
1942 err = got_ref_write(symref, repo);
1947 printf("Updated %s: %s\n", got_ref_get_name(symref),
1948 got_ref_get_symref_target(symref));
1952 if (symref_is_locked) {
1953 unlock_err = got_ref_unlock(symref);
1954 if (unlock_err && err == NULL)
1957 got_ref_close(symref);
1964 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1965 "[-r repository-path] [-t] [-q] [-v] [-R reference] [-X] "
1966 "[remote-repository-name]\n",
1971 static const struct got_error *
1972 delete_missing_ref(struct got_reference *ref,
1973 int verbosity, struct got_repository *repo)
1975 const struct got_error *err = NULL;
1976 struct got_object_id *id = NULL;
1977 char *id_str = NULL;
1979 if (got_ref_is_symbolic(ref)) {
1980 err = got_ref_delete(ref, repo);
1983 if (verbosity >= 0) {
1984 printf("Deleted %s: %s\n",
1985 got_ref_get_name(ref),
1986 got_ref_get_symref_target(ref));
1989 err = got_ref_resolve(&id, repo, ref);
1992 err = got_object_id_str(&id_str, id);
1996 err = got_ref_delete(ref, repo);
1999 if (verbosity >= 0) {
2000 printf("Deleted %s: %s\n",
2001 got_ref_get_name(ref), id_str);
2010 static const struct got_error *
2011 delete_missing_refs(struct got_pathlist_head *their_refs,
2012 struct got_pathlist_head *their_symrefs,
2013 const struct got_remote_repo *remote,
2014 int verbosity, struct got_repository *repo)
2016 const struct got_error *err = NULL, *unlock_err;
2017 struct got_reflist_head my_refs;
2018 struct got_reflist_entry *re;
2019 struct got_pathlist_entry *pe;
2020 char *remote_namespace = NULL;
2021 char *local_refname = NULL;
2023 TAILQ_INIT(&my_refs);
2025 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2027 return got_error_from_errno("asprintf");
2029 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2033 TAILQ_FOREACH(re, &my_refs, entry) {
2034 const char *refname = got_ref_get_name(re->ref);
2035 const char *their_refname;
2037 if (remote->mirror_references) {
2038 their_refname = refname;
2040 if (strncmp(refname, remote_namespace,
2041 strlen(remote_namespace)) == 0) {
2042 if (strcmp(refname + strlen(remote_namespace),
2045 if (asprintf(&local_refname, "refs/heads/%s",
2046 refname + strlen(remote_namespace)) == -1) {
2047 err = got_error_from_errno("asprintf");
2050 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2053 their_refname = local_refname;
2056 TAILQ_FOREACH(pe, their_refs, entry) {
2057 if (strcmp(their_refname, pe->path) == 0)
2063 TAILQ_FOREACH(pe, their_symrefs, entry) {
2064 if (strcmp(their_refname, pe->path) == 0)
2070 err = delete_missing_ref(re->ref, verbosity, repo);
2074 if (local_refname) {
2075 struct got_reference *ref;
2076 err = got_ref_open(&ref, repo, local_refname, 1);
2078 if (err->code != GOT_ERR_NOT_REF)
2080 free(local_refname);
2081 local_refname = NULL;
2084 err = delete_missing_ref(ref, verbosity, repo);
2087 unlock_err = got_ref_unlock(ref);
2089 if (unlock_err && err == NULL) {
2094 free(local_refname);
2095 local_refname = NULL;
2099 free(remote_namespace);
2100 free(local_refname);
2104 static const struct got_error *
2105 update_wanted_ref(const char *refname, struct got_object_id *id,
2106 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2108 const struct got_error *err, *unlock_err;
2109 char *remote_refname;
2110 struct got_reference *ref;
2112 if (strncmp("refs/", refname, 5) == 0)
2115 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2116 remote_repo_name, refname) == -1)
2117 return got_error_from_errno("asprintf");
2119 err = got_ref_open(&ref, repo, remote_refname, 1);
2121 if (err->code != GOT_ERR_NOT_REF)
2123 err = create_ref(remote_refname, id, verbosity, repo);
2125 err = update_ref(ref, id, 0, verbosity, repo);
2126 unlock_err = got_ref_unlock(ref);
2127 if (unlock_err && err == NULL)
2132 free(remote_refname);
2136 static const struct got_error *
2137 delete_ref(struct got_repository *repo, struct got_reference *ref)
2139 const struct got_error *err = NULL;
2140 struct got_object_id *id = NULL;
2141 char *id_str = NULL;
2144 if (got_ref_is_symbolic(ref)) {
2145 target = got_ref_get_symref_target(ref);
2147 err = got_ref_resolve(&id, repo, ref);
2150 err = got_object_id_str(&id_str, id);
2156 err = got_ref_delete(ref, repo);
2160 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2167 static const struct got_error *
2168 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2170 const struct got_error *err = NULL;
2171 struct got_reflist_head refs;
2172 struct got_reflist_entry *re;
2177 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2178 err = got_error_from_errno("asprintf");
2181 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2185 TAILQ_FOREACH(re, &refs, entry)
2186 delete_ref(repo, re->ref);
2188 got_ref_list_free(&refs);
2192 static const struct got_error *
2193 cmd_fetch(int argc, char *argv[])
2195 const struct got_error *error = NULL, *unlock_err;
2196 char *cwd = NULL, *repo_path = NULL;
2197 const char *remote_name;
2198 char *proto = NULL, *host = NULL, *port = NULL;
2199 char *repo_name = NULL, *server_path = NULL;
2200 const struct got_remote_repo *remotes, *remote = NULL;
2202 char *id_str = NULL;
2203 struct got_repository *repo = NULL;
2204 struct got_worktree *worktree = NULL;
2205 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2206 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2207 struct got_pathlist_entry *pe;
2208 struct got_object_id *pack_hash = NULL;
2209 int i, ch, fetchfd = -1, fetchstatus;
2210 pid_t fetchpid = -1;
2211 struct got_fetch_progress_arg fpa;
2212 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2213 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2216 TAILQ_INIT(&symrefs);
2217 TAILQ_INIT(&wanted_branches);
2218 TAILQ_INIT(&wanted_refs);
2220 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:X")) != -1) {
2223 fetch_all_branches = 1;
2226 error = got_pathlist_append(&wanted_branches,
2238 repo_path = realpath(optarg, NULL);
2239 if (repo_path == NULL)
2240 return got_error_from_errno2("realpath",
2242 got_path_strip_trailing_slashes(repo_path);
2250 else if (verbosity < 3)
2257 error = got_pathlist_append(&wanted_refs,
2273 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2274 option_conflict('a', 'b');
2275 if (list_refs_only) {
2276 if (!TAILQ_EMPTY(&wanted_branches))
2277 option_conflict('l', 'b');
2278 if (fetch_all_branches)
2279 option_conflict('l', 'a');
2281 option_conflict('l', 'd');
2283 option_conflict('l', 'X');
2285 if (delete_remote) {
2286 if (fetch_all_branches)
2287 option_conflict('X', 'a');
2288 if (!TAILQ_EMPTY(&wanted_branches))
2289 option_conflict('X', 'b');
2291 option_conflict('X', 'd');
2293 option_conflict('X', 't');
2294 if (!TAILQ_EMPTY(&wanted_refs))
2295 option_conflict('X', 'R');
2300 errx(1, "-X option requires a remote name");
2301 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2302 } else if (argc == 1)
2303 remote_name = argv[0];
2307 cwd = getcwd(NULL, 0);
2309 error = got_error_from_errno("getcwd");
2313 if (repo_path == NULL) {
2314 error = got_worktree_open(&worktree, cwd);
2315 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2321 strdup(got_worktree_get_repo_path(worktree));
2322 if (repo_path == NULL)
2323 error = got_error_from_errno("strdup");
2327 repo_path = strdup(cwd);
2328 if (repo_path == NULL) {
2329 error = got_error_from_errno("strdup");
2335 error = got_repo_open(&repo, repo_path, NULL);
2339 if (delete_remote) {
2340 error = delete_refs_for_remote(repo, remote_name);
2341 goto done; /* nothing else to do */
2345 worktree_conf = got_worktree_get_gotconfig(worktree);
2346 if (worktree_conf) {
2347 got_gotconfig_get_remotes(&nremotes, &remotes,
2349 for (i = 0; i < nremotes; i++) {
2350 if (strcmp(remotes[i].name, remote_name) == 0) {
2351 remote = &remotes[i];
2357 if (remote == NULL) {
2358 repo_conf = got_repo_get_gotconfig(repo);
2360 got_gotconfig_get_remotes(&nremotes, &remotes,
2362 for (i = 0; i < nremotes; i++) {
2363 if (strcmp(remotes[i].name, remote_name) == 0) {
2364 remote = &remotes[i];
2370 if (remote == NULL) {
2371 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2372 for (i = 0; i < nremotes; i++) {
2373 if (strcmp(remotes[i].name, remote_name) == 0) {
2374 remote = &remotes[i];
2379 if (remote == NULL) {
2380 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2384 if (TAILQ_EMPTY(&wanted_branches)) {
2385 if (!fetch_all_branches)
2386 fetch_all_branches = remote->fetch_all_branches;
2387 for (i = 0; i < remote->nfetch_branches; i++) {
2388 got_pathlist_append(&wanted_branches,
2389 remote->fetch_branches[i], NULL);
2392 if (TAILQ_EMPTY(&wanted_refs)) {
2393 for (i = 0; i < remote->nfetch_refs; i++) {
2394 got_pathlist_append(&wanted_refs,
2395 remote->fetch_refs[i], NULL);
2399 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2400 &repo_name, remote->fetch_url);
2404 if (strcmp(proto, "git") == 0) {
2406 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2407 "sendfd dns inet unveil", NULL) == -1)
2410 } else if (strcmp(proto, "git+ssh") == 0 ||
2411 strcmp(proto, "ssh") == 0) {
2413 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2414 "sendfd unveil", NULL) == -1)
2417 } else if (strcmp(proto, "http") == 0 ||
2418 strcmp(proto, "git+http") == 0) {
2419 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2422 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2426 error = got_dial_apply_unveil(proto);
2430 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2435 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2436 port ? ":" : "", port ? port : "");
2438 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2439 server_path, verbosity);
2443 fpa.last_scaled_size[0] = '\0';
2444 fpa.last_p_indexed = -1;
2445 fpa.last_p_resolved = -1;
2446 fpa.verbosity = verbosity;
2448 fpa.create_configs = 0;
2449 fpa.configs_created = 0;
2450 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2451 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2452 remote->mirror_references, fetch_all_branches, &wanted_branches,
2453 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2454 fetch_progress, &fpa);
2458 if (list_refs_only) {
2459 error = list_remote_refs(&symrefs, &refs);
2463 if (pack_hash == NULL) {
2465 printf("Already up-to-date\n");
2466 } else if (verbosity >= 0) {
2467 error = got_object_id_str(&id_str, pack_hash);
2470 printf("\nFetched %s.pack\n", id_str);
2475 /* Update references provided with the pack file. */
2476 TAILQ_FOREACH(pe, &refs, entry) {
2477 const char *refname = pe->path;
2478 struct got_object_id *id = pe->data;
2479 struct got_reference *ref;
2480 char *remote_refname;
2482 if (is_wanted_ref(&wanted_refs, refname) &&
2483 !remote->mirror_references) {
2484 error = update_wanted_ref(refname, id,
2485 remote->name, verbosity, repo);
2491 if (remote->mirror_references ||
2492 strncmp("refs/tags/", refname, 10) == 0) {
2493 error = got_ref_open(&ref, repo, refname, 1);
2495 if (error->code != GOT_ERR_NOT_REF)
2497 error = create_ref(refname, id, verbosity,
2502 error = update_ref(ref, id, replace_tags,
2504 unlock_err = got_ref_unlock(ref);
2505 if (unlock_err && error == NULL)
2511 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2512 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2513 remote_name, refname + 11) == -1) {
2514 error = got_error_from_errno("asprintf");
2518 error = got_ref_open(&ref, repo, remote_refname, 1);
2520 if (error->code != GOT_ERR_NOT_REF)
2522 error = create_ref(remote_refname, id,
2527 error = update_ref(ref, id, replace_tags,
2529 unlock_err = got_ref_unlock(ref);
2530 if (unlock_err && error == NULL)
2537 /* Also create a local branch if none exists yet. */
2538 error = got_ref_open(&ref, repo, refname, 1);
2540 if (error->code != GOT_ERR_NOT_REF)
2542 error = create_ref(refname, id, verbosity,
2547 unlock_err = got_ref_unlock(ref);
2548 if (unlock_err && error == NULL)
2555 error = delete_missing_refs(&refs, &symrefs, remote,
2561 if (!remote->mirror_references) {
2562 /* Update remote HEAD reference if the server provided one. */
2563 TAILQ_FOREACH(pe, &symrefs, entry) {
2564 struct got_reference *target_ref;
2565 const char *refname = pe->path;
2566 const char *target = pe->data;
2567 char *remote_refname = NULL, *remote_target = NULL;
2569 if (strcmp(refname, GOT_REF_HEAD) != 0)
2572 if (strncmp("refs/heads/", target, 11) != 0)
2575 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2576 remote->name, refname) == -1) {
2577 error = got_error_from_errno("asprintf");
2580 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2581 remote->name, target + 11) == -1) {
2582 error = got_error_from_errno("asprintf");
2583 free(remote_refname);
2587 error = got_ref_open(&target_ref, repo, remote_target,
2590 free(remote_refname);
2591 free(remote_target);
2592 if (error->code == GOT_ERR_NOT_REF) {
2598 error = update_symref(remote_refname, target_ref,
2600 free(remote_refname);
2601 free(remote_target);
2602 got_ref_close(target_ref);
2609 if (kill(fetchpid, SIGTERM) == -1)
2610 error = got_error_from_errno("kill");
2611 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2612 error = got_error_from_errno("waitpid");
2614 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2615 error = got_error_from_errno("close");
2617 const struct got_error *close_err = got_repo_close(repo);
2622 got_worktree_close(worktree);
2623 TAILQ_FOREACH(pe, &refs, entry) {
2624 free((void *)pe->path);
2627 got_pathlist_free(&refs);
2628 TAILQ_FOREACH(pe, &symrefs, entry) {
2629 free((void *)pe->path);
2632 got_pathlist_free(&symrefs);
2633 got_pathlist_free(&wanted_branches);
2634 got_pathlist_free(&wanted_refs);
2649 usage_checkout(void)
2651 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2652 "[-p prefix] [-q] repository-path [worktree-path]\n",
2658 show_worktree_base_ref_warning(void)
2660 fprintf(stderr, "%s: warning: could not create a reference "
2661 "to the work tree's base commit; the commit could be "
2662 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2663 "repository writable and running 'got update' will prevent this\n",
2667 struct got_checkout_progress_arg {
2668 const char *worktree_path;
2669 int had_base_commit_ref_error;
2673 static const struct got_error *
2674 checkout_progress(void *arg, unsigned char status, const char *path)
2676 struct got_checkout_progress_arg *a = arg;
2678 /* Base commit bump happens silently. */
2679 if (status == GOT_STATUS_BUMP_BASE)
2682 if (status == GOT_STATUS_BASE_REF_ERR) {
2683 a->had_base_commit_ref_error = 1;
2687 while (path[0] == '/')
2690 if (a->verbosity >= 0)
2691 printf("%c %s/%s\n", status, a->worktree_path, path);
2696 static const struct got_error *
2697 check_cancelled(void *arg)
2699 if (sigint_received || sigpipe_received)
2700 return got_error(GOT_ERR_CANCELLED);
2704 static const struct got_error *
2705 check_linear_ancestry(struct got_object_id *commit_id,
2706 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2707 struct got_repository *repo)
2709 const struct got_error *err = NULL;
2710 struct got_object_id *yca_id;
2712 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2713 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2718 return got_error(GOT_ERR_ANCESTRY);
2721 * Require a straight line of history between the target commit
2722 * and the work tree's base commit.
2724 * Non-linear situations such as this require a rebase:
2726 * (commit) D F (base_commit)
2734 * 'got update' only handles linear cases:
2735 * Update forwards in time: A (base/yca) - B - C - D (commit)
2736 * Update backwards in time: D (base) - C - B - A (commit/yca)
2738 if (allow_forwards_in_time_only) {
2739 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2740 return got_error(GOT_ERR_ANCESTRY);
2741 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2742 got_object_id_cmp(base_commit_id, yca_id) != 0)
2743 return got_error(GOT_ERR_ANCESTRY);
2749 static const struct got_error *
2750 check_same_branch(struct got_object_id *commit_id,
2751 struct got_reference *head_ref, struct got_object_id *yca_id,
2752 struct got_repository *repo)
2754 const struct got_error *err = NULL;
2755 struct got_commit_graph *graph = NULL;
2756 struct got_object_id *head_commit_id = NULL;
2757 int is_same_branch = 0;
2759 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2763 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2767 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2772 err = got_commit_graph_open(&graph, "/", 1);
2776 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2777 check_cancelled, NULL);
2782 struct got_object_id *id;
2783 err = got_commit_graph_iter_next(&id, graph, repo,
2784 check_cancelled, NULL);
2786 if (err->code == GOT_ERR_ITER_COMPLETED)
2792 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2794 if (got_object_id_cmp(id, commit_id) == 0) {
2802 got_commit_graph_close(graph);
2803 free(head_commit_id);
2804 if (!err && !is_same_branch)
2805 err = got_error(GOT_ERR_ANCESTRY);
2809 static const struct got_error *
2810 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2812 static char msg[512];
2813 const char *branch_name;
2815 if (got_ref_is_symbolic(ref))
2816 branch_name = got_ref_get_symref_target(ref);
2818 branch_name = got_ref_get_name(ref);
2820 if (strncmp("refs/heads/", branch_name, 11) == 0)
2823 snprintf(msg, sizeof(msg),
2824 "target commit is not contained in branch '%s'; "
2825 "the branch to use must be specified with -b; "
2826 "if necessary a new branch can be created for "
2827 "this commit with 'got branch -c %s BRANCH_NAME'",
2828 branch_name, commit_id_str);
2830 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2833 static const struct got_error *
2834 cmd_checkout(int argc, char *argv[])
2836 const struct got_error *error = NULL;
2837 struct got_repository *repo = NULL;
2838 struct got_reference *head_ref = NULL, *ref = NULL;
2839 struct got_worktree *worktree = NULL;
2840 char *repo_path = NULL;
2841 char *worktree_path = NULL;
2842 const char *path_prefix = "";
2843 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2844 char *commit_id_str = NULL;
2845 struct got_object_id *commit_id = NULL;
2847 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2848 struct got_pathlist_head paths;
2849 struct got_checkout_progress_arg cpa;
2853 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2856 branch_name = optarg;
2859 commit_id_str = strdup(optarg);
2860 if (commit_id_str == NULL)
2861 return got_error_from_errno("strdup");
2867 path_prefix = optarg;
2882 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2883 "unveil", NULL) == -1)
2887 char *base, *dotgit;
2889 repo_path = realpath(argv[0], NULL);
2890 if (repo_path == NULL)
2891 return got_error_from_errno2("realpath", argv[0]);
2892 cwd = getcwd(NULL, 0);
2894 error = got_error_from_errno("getcwd");
2901 error = got_path_basename(&base, path);
2904 dotgit = strstr(base, ".git");
2907 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2908 error = got_error_from_errno("asprintf");
2913 } else if (argc == 2) {
2914 repo_path = realpath(argv[0], NULL);
2915 if (repo_path == NULL) {
2916 error = got_error_from_errno2("realpath", argv[0]);
2919 worktree_path = realpath(argv[1], NULL);
2920 if (worktree_path == NULL) {
2921 if (errno != ENOENT) {
2922 error = got_error_from_errno2("realpath",
2926 worktree_path = strdup(argv[1]);
2927 if (worktree_path == NULL) {
2928 error = got_error_from_errno("strdup");
2935 got_path_strip_trailing_slashes(repo_path);
2936 got_path_strip_trailing_slashes(worktree_path);
2938 error = got_repo_open(&repo, repo_path, NULL);
2942 /* Pre-create work tree path for unveil(2) */
2943 error = got_path_mkdir(worktree_path);
2945 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2946 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2948 if (!allow_nonempty &&
2949 !got_path_dir_is_empty(worktree_path)) {
2950 error = got_error_path(worktree_path,
2951 GOT_ERR_DIR_NOT_EMPTY);
2956 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2960 error = got_ref_open(&head_ref, repo, branch_name, 0);
2964 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2965 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2968 error = got_worktree_open(&worktree, worktree_path);
2972 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2976 if (!same_path_prefix) {
2977 error = got_error(GOT_ERR_PATH_PREFIX);
2981 if (commit_id_str) {
2982 struct got_reflist_head refs;
2984 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2988 error = got_repo_match_object_id(&commit_id, NULL,
2989 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2990 got_ref_list_free(&refs);
2993 error = check_linear_ancestry(commit_id,
2994 got_worktree_get_base_commit_id(worktree), 0, repo);
2995 if (error != NULL) {
2996 if (error->code == GOT_ERR_ANCESTRY) {
2997 error = checkout_ancestry_error(
2998 head_ref, commit_id_str);
3002 error = check_same_branch(commit_id, head_ref, NULL, repo);
3004 if (error->code == GOT_ERR_ANCESTRY) {
3005 error = checkout_ancestry_error(
3006 head_ref, commit_id_str);
3010 error = got_worktree_set_base_commit_id(worktree, repo,
3014 /* Expand potentially abbreviated commit ID string. */
3015 free(commit_id_str);
3016 error = got_object_id_str(&commit_id_str, commit_id);
3020 commit_id = got_object_id_dup(
3021 got_worktree_get_base_commit_id(worktree));
3022 if (commit_id == NULL) {
3023 error = got_error_from_errno("got_object_id_dup");
3026 error = got_object_id_str(&commit_id_str, commit_id);
3031 error = got_pathlist_append(&paths, "", NULL);
3034 cpa.worktree_path = worktree_path;
3035 cpa.had_base_commit_ref_error = 0;
3036 cpa.verbosity = verbosity;
3037 error = got_worktree_checkout_files(worktree, &paths, repo,
3038 checkout_progress, &cpa, check_cancelled, NULL);
3042 if (got_ref_is_symbolic(head_ref)) {
3043 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3046 refname = got_ref_get_name(ref);
3048 refname = got_ref_get_name(head_ref);
3049 printf("Checked out %s: %s\n", refname, commit_id_str);
3050 printf("Now shut up and hack\n");
3051 if (cpa.had_base_commit_ref_error)
3052 show_worktree_base_ref_warning();
3055 got_ref_close(head_ref);
3058 got_pathlist_free(&paths);
3059 free(commit_id_str);
3062 free(worktree_path);
3067 struct got_update_progress_arg {
3079 print_update_progress_stats(struct got_update_progress_arg *upa)
3081 if (!upa->did_something)
3084 if (upa->conflicts > 0)
3085 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3086 if (upa->obstructed > 0)
3087 printf("File paths obstructed by a non-regular file: %d\n",
3089 if (upa->not_updated > 0)
3090 printf("Files not updated because of existing merge "
3091 "conflicts: %d\n", upa->not_updated);
3095 * The meaning of some status codes differs between merge-style operations and
3096 * update operations. For example, the ! status code means "file was missing"
3097 * if changes were merged into the work tree, and "missing file was restored"
3098 * if the work tree was updated. This function should be used by any operation
3099 * which merges changes into the work tree without updating the work tree.
3102 print_merge_progress_stats(struct got_update_progress_arg *upa)
3104 if (!upa->did_something)
3107 if (upa->conflicts > 0)
3108 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3109 if (upa->obstructed > 0)
3110 printf("File paths obstructed by a non-regular file: %d\n",
3112 if (upa->missing > 0)
3113 printf("Files which had incoming changes but could not be "
3114 "found in the work tree: %d\n", upa->missing);
3115 if (upa->not_deleted > 0)
3116 printf("Files not deleted due to differences in deleted "
3117 "content: %d\n", upa->not_deleted);
3118 if (upa->unversioned > 0)
3119 printf("Files not merged because an unversioned file was "
3120 "found in the work tree: %d\n", upa->unversioned);
3126 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [-q] "
3132 static const struct got_error *
3133 update_progress(void *arg, unsigned char status, const char *path)
3135 struct got_update_progress_arg *upa = arg;
3137 if (status == GOT_STATUS_EXISTS ||
3138 status == GOT_STATUS_BASE_REF_ERR)
3141 upa->did_something = 1;
3143 /* Base commit bump happens silently. */
3144 if (status == GOT_STATUS_BUMP_BASE)
3147 if (status == GOT_STATUS_CONFLICT)
3149 if (status == GOT_STATUS_OBSTRUCTED)
3151 if (status == GOT_STATUS_CANNOT_UPDATE)
3153 if (status == GOT_STATUS_MISSING)
3155 if (status == GOT_STATUS_CANNOT_DELETE)
3157 if (status == GOT_STATUS_UNVERSIONED)
3160 while (path[0] == '/')
3162 if (upa->verbosity >= 0)
3163 printf("%c %s\n", status, path);
3168 static const struct got_error *
3169 switch_head_ref(struct got_reference *head_ref,
3170 struct got_object_id *commit_id, struct got_worktree *worktree,
3171 struct got_repository *repo)
3173 const struct got_error *err = NULL;
3175 int ref_has_moved = 0;
3177 /* Trivial case: switching between two different references. */
3178 if (strcmp(got_ref_get_name(head_ref),
3179 got_worktree_get_head_ref_name(worktree)) != 0) {
3180 printf("Switching work tree from %s to %s\n",
3181 got_worktree_get_head_ref_name(worktree),
3182 got_ref_get_name(head_ref));
3183 return got_worktree_set_head_ref(worktree, head_ref);
3186 err = check_linear_ancestry(commit_id,
3187 got_worktree_get_base_commit_id(worktree), 0, repo);
3189 if (err->code != GOT_ERR_ANCESTRY)
3196 /* Switching to a rebased branch with the same reference name. */
3197 err = got_object_id_str(&base_id_str,
3198 got_worktree_get_base_commit_id(worktree));
3201 printf("Reference %s now points at a different branch\n",
3202 got_worktree_get_head_ref_name(worktree));
3203 printf("Switching work tree from %s to %s\n", base_id_str,
3204 got_worktree_get_head_ref_name(worktree));
3208 static const struct got_error *
3209 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3211 const struct got_error *err;
3214 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3218 return got_error(GOT_ERR_REBASING);
3220 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3224 return got_error(GOT_ERR_HISTEDIT_BUSY);
3229 static const struct got_error *
3230 check_merge_in_progress(struct got_worktree *worktree,
3231 struct got_repository *repo)
3233 const struct got_error *err;
3236 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3240 return got_error(GOT_ERR_MERGE_BUSY);
3245 static const struct got_error *
3246 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3247 char *argv[], struct got_worktree *worktree)
3249 const struct got_error *err = NULL;
3251 struct got_pathlist_entry *new;
3257 return got_error_from_errno("strdup");
3258 return got_pathlist_append(paths, path, NULL);
3261 for (i = 0; i < argc; i++) {
3262 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3265 err = got_pathlist_insert(&new, paths, path, NULL);
3266 if (err || new == NULL /* duplicate */) {
3276 static const struct got_error *
3277 wrap_not_worktree_error(const struct got_error *orig_err,
3278 const char *cmdname, const char *path)
3280 const struct got_error *err;
3281 struct got_repository *repo;
3282 static char msg[512];
3284 err = got_repo_open(&repo, path, NULL);
3288 snprintf(msg, sizeof(msg),
3289 "'got %s' needs a work tree in addition to a git repository\n"
3290 "Work trees can be checked out from this Git repository with "
3292 "The got(1) manual page contains more information.", cmdname);
3293 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3294 got_repo_close(repo);
3298 static const struct got_error *
3299 cmd_update(int argc, char *argv[])
3301 const struct got_error *error = NULL;
3302 struct got_repository *repo = NULL;
3303 struct got_worktree *worktree = NULL;
3304 char *worktree_path = NULL;
3305 struct got_object_id *commit_id = NULL;
3306 char *commit_id_str = NULL;
3307 const char *branch_name = NULL;
3308 struct got_reference *head_ref = NULL;
3309 struct got_pathlist_head paths;
3310 struct got_pathlist_entry *pe;
3311 int ch, verbosity = 0;
3312 struct got_update_progress_arg upa;
3316 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3319 branch_name = optarg;
3322 commit_id_str = strdup(optarg);
3323 if (commit_id_str == NULL)
3324 return got_error_from_errno("strdup");
3339 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3340 "unveil", NULL) == -1)
3343 worktree_path = getcwd(NULL, 0);
3344 if (worktree_path == NULL) {
3345 error = got_error_from_errno("getcwd");
3348 error = got_worktree_open(&worktree, worktree_path);
3350 if (error->code == GOT_ERR_NOT_WORKTREE)
3351 error = wrap_not_worktree_error(error, "update",
3356 error = check_rebase_or_histedit_in_progress(worktree);
3360 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3365 error = apply_unveil(got_repo_get_path(repo), 0,
3366 got_worktree_get_root_path(worktree));
3370 error = check_merge_in_progress(worktree, repo);
3374 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3378 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3379 got_worktree_get_head_ref_name(worktree), 0);
3382 if (commit_id_str == NULL) {
3383 error = got_ref_resolve(&commit_id, repo, head_ref);
3386 error = got_object_id_str(&commit_id_str, commit_id);
3390 struct got_reflist_head refs;
3392 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3396 error = got_repo_match_object_id(&commit_id, NULL,
3397 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3398 got_ref_list_free(&refs);
3399 free(commit_id_str);
3400 commit_id_str = NULL;
3403 error = got_object_id_str(&commit_id_str, commit_id);
3409 struct got_object_id *head_commit_id;
3410 TAILQ_FOREACH(pe, &paths, entry) {
3411 if (pe->path_len == 0)
3413 error = got_error_msg(GOT_ERR_BAD_PATH,
3414 "switching between branches requires that "
3415 "the entire work tree gets updated");
3418 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3421 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3423 free(head_commit_id);
3426 error = check_same_branch(commit_id, head_ref, NULL, repo);
3429 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3433 error = check_linear_ancestry(commit_id,
3434 got_worktree_get_base_commit_id(worktree), 0, repo);
3435 if (error != NULL) {
3436 if (error->code == GOT_ERR_ANCESTRY)
3437 error = got_error(GOT_ERR_BRANCH_MOVED);
3440 error = check_same_branch(commit_id, head_ref, NULL, repo);
3445 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3447 error = got_worktree_set_base_commit_id(worktree, repo,
3453 memset(&upa, 0, sizeof(upa));
3454 upa.verbosity = verbosity;
3455 error = got_worktree_checkout_files(worktree, &paths, repo,
3456 update_progress, &upa, check_cancelled, NULL);
3460 if (upa.did_something) {
3461 printf("Updated to %s: %s\n",
3462 got_worktree_get_head_ref_name(worktree), commit_id_str);
3464 printf("Already up-to-date\n");
3465 print_update_progress_stats(&upa);
3467 free(worktree_path);
3468 TAILQ_FOREACH(pe, &paths, entry)
3469 free((char *)pe->path);
3470 got_pathlist_free(&paths);
3472 free(commit_id_str);
3476 static const struct got_error *
3477 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3478 const char *path, int diff_context, int ignore_whitespace,
3479 int force_text_diff, struct got_repository *repo)
3481 const struct got_error *err = NULL;
3482 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3483 FILE *f1 = NULL, *f2 = NULL;
3486 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3489 f1 = got_opentemp();
3491 err = got_error_from_errno("got_opentemp");
3496 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3500 f2 = got_opentemp();
3502 err = got_error_from_errno("got_opentemp");
3506 while (path[0] == '/')
3508 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3509 diff_context, ignore_whitespace, force_text_diff, stdout);
3512 got_object_blob_close(blob1);
3513 got_object_blob_close(blob2);
3514 if (f1 && fclose(f1) == EOF && err == NULL)
3515 err = got_error_from_errno("fclose");
3516 if (f2 && fclose(f2) == EOF && err == NULL)
3517 err = got_error_from_errno("fclose");
3521 static const struct got_error *
3522 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3523 const char *path, int diff_context, int ignore_whitespace,
3524 int force_text_diff, struct got_repository *repo)
3526 const struct got_error *err = NULL;
3527 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3528 struct got_diff_blob_output_unidiff_arg arg;
3529 FILE *f1 = NULL, *f2 = NULL;
3532 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3535 f1 = got_opentemp();
3537 err = got_error_from_errno("got_opentemp");
3542 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3546 f2 = got_opentemp();
3548 err = got_error_from_errno("got_opentemp");
3552 arg.diff_context = diff_context;
3553 arg.ignore_whitespace = ignore_whitespace;
3554 arg.force_text_diff = force_text_diff;
3555 arg.outfile = stdout;
3556 arg.line_offsets = NULL;
3558 while (path[0] == '/')
3560 err = got_diff_tree(tree1, tree2, f1, f2, path, path, repo,
3561 got_diff_blob_output_unidiff, &arg, 1);
3564 got_object_tree_close(tree1);
3566 got_object_tree_close(tree2);
3567 if (f1 && fclose(f1) == EOF && err == NULL)
3568 err = got_error_from_errno("fclose");
3569 if (f2 && fclose(f2) == EOF && err == NULL)
3570 err = got_error_from_errno("fclose");
3574 static const struct got_error *
3575 get_changed_paths(struct got_pathlist_head *paths,
3576 struct got_commit_object *commit, struct got_repository *repo)
3578 const struct got_error *err = NULL;
3579 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3580 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3581 struct got_object_qid *qid;
3583 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3585 struct got_commit_object *pcommit;
3586 err = got_object_open_as_commit(&pcommit, repo,
3591 tree_id1 = got_object_id_dup(
3592 got_object_commit_get_tree_id(pcommit));
3593 if (tree_id1 == NULL) {
3594 got_object_commit_close(pcommit);
3595 return got_error_from_errno("got_object_id_dup");
3597 got_object_commit_close(pcommit);
3602 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3607 tree_id2 = got_object_commit_get_tree_id(commit);
3608 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3612 err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
3613 got_diff_tree_collect_changed_paths, paths, 0);
3616 got_object_tree_close(tree1);
3618 got_object_tree_close(tree2);
3623 static const struct got_error *
3624 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3625 const char *path, int diff_context, struct got_repository *repo)
3627 const struct got_error *err = NULL;
3628 struct got_commit_object *pcommit = NULL;
3629 char *id_str1 = NULL, *id_str2 = NULL;
3630 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3631 struct got_object_qid *qid;
3633 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3635 err = got_object_open_as_commit(&pcommit, repo,
3641 if (path && path[0] != '\0') {
3643 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3646 err = got_object_id_str(&id_str2, obj_id2);
3652 err = got_object_id_by_path(&obj_id1, repo,
3655 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3660 err = got_object_id_str(&id_str1, obj_id1);
3667 err = got_object_get_type(&obj_type, repo, obj_id2);
3672 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3674 case GOT_OBJ_TYPE_BLOB:
3675 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3678 case GOT_OBJ_TYPE_TREE:
3679 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3683 err = got_error(GOT_ERR_OBJ_TYPE);
3689 obj_id2 = got_object_commit_get_tree_id(commit);
3690 err = got_object_id_str(&id_str2, obj_id2);
3694 obj_id1 = got_object_commit_get_tree_id(pcommit);
3695 err = got_object_id_str(&id_str1, obj_id1);
3699 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3701 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3708 got_object_commit_close(pcommit);
3713 get_datestr(time_t *time, char *datebuf)
3715 struct tm mytm, *tm;
3718 tm = gmtime_r(time, &mytm);
3721 s = asctime_r(tm, datebuf);
3724 p = strchr(s, '\n');
3730 static const struct got_error *
3731 match_logmsg(int *have_match, struct got_object_id *id,
3732 struct got_commit_object *commit, regex_t *regex)
3734 const struct got_error *err = NULL;
3735 regmatch_t regmatch;
3736 char *id_str = NULL, *logmsg = NULL;
3740 err = got_object_id_str(&id_str, id);
3744 err = got_object_commit_get_logmsg(&logmsg, commit);
3748 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3757 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3760 regmatch_t regmatch;
3761 struct got_pathlist_entry *pe;
3765 TAILQ_FOREACH(pe, changed_paths, entry) {
3766 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3773 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3775 static const struct got_error*
3776 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3777 struct got_object_id *id, struct got_repository *repo)
3779 static const struct got_error *err = NULL;
3780 struct got_reflist_entry *re;
3786 TAILQ_FOREACH(re, refs, entry) {
3787 struct got_tag_object *tag = NULL;
3788 struct got_object_id *ref_id;
3791 name = got_ref_get_name(re->ref);
3792 if (strcmp(name, GOT_REF_HEAD) == 0)
3794 if (strncmp(name, "refs/", 5) == 0)
3796 if (strncmp(name, "got/", 4) == 0)
3798 if (strncmp(name, "heads/", 6) == 0)
3800 if (strncmp(name, "remotes/", 8) == 0) {
3802 s = strstr(name, "/" GOT_REF_HEAD);
3803 if (s != NULL && s[strlen(s)] == '\0')
3806 err = got_ref_resolve(&ref_id, repo, re->ref);
3809 if (strncmp(name, "tags/", 5) == 0) {
3810 err = got_object_open_as_tag(&tag, repo, ref_id);
3812 if (err->code != GOT_ERR_OBJ_TYPE) {
3816 /* Ref points at something other than a tag. */
3821 cmp = got_object_id_cmp(tag ?
3822 got_object_tag_get_object_id(tag) : ref_id, id);
3825 got_object_tag_close(tag);
3829 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3830 s ? ", " : "", name) == -1) {
3831 err = got_error_from_errno("asprintf");
3842 static const struct got_error *
3843 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3844 struct got_repository *repo, const char *path,
3845 struct got_pathlist_head *changed_paths, int show_patch,
3846 int diff_context, struct got_reflist_object_id_map *refs_idmap,
3847 const char *custom_refs_str)
3849 const struct got_error *err = NULL;
3850 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3852 time_t committer_time;
3853 const char *author, *committer;
3854 char *refs_str = NULL;
3856 err = got_object_id_str(&id_str, id);
3860 if (custom_refs_str == NULL) {
3861 struct got_reflist_head *refs;
3862 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3864 err = build_refs_str(&refs_str, refs, id, repo);
3870 printf(GOT_COMMIT_SEP_STR);
3871 if (custom_refs_str)
3872 printf("commit %s (%s)\n", id_str, custom_refs_str);
3874 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3875 refs_str ? refs_str : "", refs_str ? ")" : "");
3880 printf("from: %s\n", got_object_commit_get_author(commit));
3881 committer_time = got_object_commit_get_committer_time(commit);
3882 datestr = get_datestr(&committer_time, datebuf);
3884 printf("date: %s UTC\n", datestr);
3885 author = got_object_commit_get_author(commit);
3886 committer = got_object_commit_get_committer(commit);
3887 if (strcmp(author, committer) != 0)
3888 printf("via: %s\n", committer);
3889 if (got_object_commit_get_nparents(commit) > 1) {
3890 const struct got_object_id_queue *parent_ids;
3891 struct got_object_qid *qid;
3893 parent_ids = got_object_commit_get_parent_ids(commit);
3894 STAILQ_FOREACH(qid, parent_ids, entry) {
3895 err = got_object_id_str(&id_str, &qid->id);
3898 printf("parent %d: %s\n", n++, id_str);
3904 err = got_object_commit_get_logmsg(&logmsg0, commit);
3910 line = strsep(&logmsg, "\n");
3912 printf(" %s\n", line);
3916 if (changed_paths) {
3917 struct got_pathlist_entry *pe;
3918 TAILQ_FOREACH(pe, changed_paths, entry) {
3919 struct got_diff_changed_path *cp = pe->data;
3920 printf(" %c %s\n", cp->status, pe->path);
3925 err = print_patch(commit, id, path, diff_context, repo);
3930 if (fflush(stdout) != 0 && err == NULL)
3931 err = got_error_from_errno("fflush");
3938 static const struct got_error *
3939 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3940 struct got_repository *repo, const char *path, int show_changed_paths,
3941 int show_patch, const char *search_pattern, int diff_context, int limit,
3942 int log_branches, int reverse_display_order,
3943 struct got_reflist_object_id_map *refs_idmap)
3945 const struct got_error *err;
3946 struct got_commit_graph *graph;
3949 struct got_object_id_queue reversed_commits;
3950 struct got_object_qid *qid;
3951 struct got_commit_object *commit;
3952 struct got_pathlist_head changed_paths;
3953 struct got_pathlist_entry *pe;
3955 STAILQ_INIT(&reversed_commits);
3956 TAILQ_INIT(&changed_paths);
3958 if (search_pattern && regcomp(®ex, search_pattern,
3959 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3960 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3962 err = got_commit_graph_open(&graph, path, !log_branches);
3965 err = got_commit_graph_iter_start(graph, root_id, repo,
3966 check_cancelled, NULL);
3970 struct got_object_id *id;
3972 if (sigint_received || sigpipe_received)
3975 err = got_commit_graph_iter_next(&id, graph, repo,
3976 check_cancelled, NULL);
3978 if (err->code == GOT_ERR_ITER_COMPLETED)
3985 err = got_object_open_as_commit(&commit, repo, id);
3989 if (show_changed_paths && !reverse_display_order) {
3990 err = get_changed_paths(&changed_paths, commit, repo);
3995 if (search_pattern) {
3996 err = match_logmsg(&have_match, id, commit, ®ex);
3998 got_object_commit_close(commit);
4001 if (have_match == 0 && show_changed_paths)
4002 match_changed_paths(&have_match,
4003 &changed_paths, ®ex);
4004 if (have_match == 0) {
4005 got_object_commit_close(commit);
4006 TAILQ_FOREACH(pe, &changed_paths, entry) {
4007 free((char *)pe->path);
4010 got_pathlist_free(&changed_paths);
4015 if (reverse_display_order) {
4016 err = got_object_qid_alloc(&qid, id);
4019 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4020 got_object_commit_close(commit);
4022 err = print_commit(commit, id, repo, path,
4023 show_changed_paths ? &changed_paths : NULL,
4024 show_patch, diff_context, refs_idmap, NULL);
4025 got_object_commit_close(commit);
4029 if ((limit && --limit == 0) ||
4030 (end_id && got_object_id_cmp(id, end_id) == 0))
4033 TAILQ_FOREACH(pe, &changed_paths, entry) {
4034 free((char *)pe->path);
4037 got_pathlist_free(&changed_paths);
4039 if (reverse_display_order) {
4040 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4041 err = got_object_open_as_commit(&commit, repo,
4045 if (show_changed_paths) {
4046 err = get_changed_paths(&changed_paths,
4051 err = print_commit(commit, &qid->id, repo, path,
4052 show_changed_paths ? &changed_paths : NULL,
4053 show_patch, diff_context, refs_idmap, NULL);
4054 got_object_commit_close(commit);
4057 TAILQ_FOREACH(pe, &changed_paths, entry) {
4058 free((char *)pe->path);
4061 got_pathlist_free(&changed_paths);
4065 while (!STAILQ_EMPTY(&reversed_commits)) {
4066 qid = STAILQ_FIRST(&reversed_commits);
4067 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4068 got_object_qid_free(qid);
4070 TAILQ_FOREACH(pe, &changed_paths, entry) {
4071 free((char *)pe->path);
4074 got_pathlist_free(&changed_paths);
4077 got_commit_graph_close(graph);
4084 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
4085 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
4086 "[-R] [path]\n", getprogname());
4091 get_default_log_limit(void)
4093 const char *got_default_log_limit;
4097 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4098 if (got_default_log_limit == NULL)
4100 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4106 static const struct got_error *
4107 cmd_log(int argc, char *argv[])
4109 const struct got_error *error;
4110 struct got_repository *repo = NULL;
4111 struct got_worktree *worktree = NULL;
4112 struct got_object_id *start_id = NULL, *end_id = NULL;
4113 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4114 const char *start_commit = NULL, *end_commit = NULL;
4115 const char *search_pattern = NULL;
4116 int diff_context = -1, ch;
4117 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4118 int reverse_display_order = 0;
4120 struct got_reflist_head refs;
4121 struct got_reflist_object_id_map *refs_idmap = NULL;
4126 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4132 limit = get_default_log_limit();
4134 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
4140 show_changed_paths = 1;
4143 start_commit = optarg;
4146 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4149 errx(1, "number of context lines is %s: %s",
4153 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4155 errx(1, "number of commits is %s: %s",
4162 repo_path = realpath(optarg, NULL);
4163 if (repo_path == NULL)
4164 return got_error_from_errno2("realpath",
4166 got_path_strip_trailing_slashes(repo_path);
4169 reverse_display_order = 1;
4172 search_pattern = optarg;
4175 end_commit = optarg;
4186 if (diff_context == -1)
4188 else if (!show_patch)
4189 errx(1, "-C requires -p");
4191 cwd = getcwd(NULL, 0);
4193 error = got_error_from_errno("getcwd");
4197 if (repo_path == NULL) {
4198 error = got_worktree_open(&worktree, cwd);
4199 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4206 error = got_worktree_resolve_path(&path, worktree,
4211 path = strdup(argv[0]);
4213 error = got_error_from_errno("strdup");
4217 } else if (argc != 0)
4220 if (repo_path == NULL) {
4221 repo_path = worktree ?
4222 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4224 if (repo_path == NULL) {
4225 error = got_error_from_errno("strdup");
4229 error = got_repo_open(&repo, repo_path, NULL);
4233 error = apply_unveil(got_repo_get_path(repo), 1,
4234 worktree ? got_worktree_get_root_path(worktree) : NULL);
4238 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4242 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4246 if (start_commit == NULL) {
4247 struct got_reference *head_ref;
4248 struct got_commit_object *commit = NULL;
4249 error = got_ref_open(&head_ref, repo,
4250 worktree ? got_worktree_get_head_ref_name(worktree)
4254 error = got_ref_resolve(&start_id, repo, head_ref);
4255 got_ref_close(head_ref);
4258 error = got_object_open_as_commit(&commit, repo,
4262 got_object_commit_close(commit);
4264 error = got_repo_match_object_id(&start_id, NULL,
4265 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4269 if (end_commit != NULL) {
4270 error = got_repo_match_object_id(&end_id, NULL,
4271 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4278 * If a path was specified on the command line it was resolved
4279 * to a path in the work tree above. Prepend the work tree's
4280 * path prefix to obtain the corresponding in-repository path.
4284 prefix = got_worktree_get_path_prefix(worktree);
4285 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4286 (path[0] != '\0') ? "/" : "", path) == -1) {
4287 error = got_error_from_errno("asprintf");
4292 error = got_repo_map_path(&in_repo_path, repo,
4298 path = in_repo_path;
4302 /* Release work tree lock. */
4303 got_worktree_close(worktree);
4307 error = print_commits(start_id, end_id, repo, path ? path : "",
4308 show_changed_paths, show_patch, search_pattern, diff_context,
4309 limit, log_branches, reverse_display_order, refs_idmap);
4315 got_worktree_close(worktree);
4317 const struct got_error *close_err = got_repo_close(repo);
4322 got_reflist_object_id_map_free(refs_idmap);
4323 got_ref_list_free(&refs);
4330 fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4331 "[-r repository-path] [-s] [-w] [-P] "
4332 "[object1 object2 | path ...]\n", getprogname());
4336 struct print_diff_arg {
4337 struct got_repository *repo;
4338 struct got_worktree *worktree;
4343 int ignore_whitespace;
4344 int force_text_diff;
4348 * Create a file which contains the target path of a symlink so we can feed
4349 * it as content to the diff engine.
4351 static const struct got_error *
4352 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4353 const char *abspath)
4355 const struct got_error *err = NULL;
4356 char target_path[PATH_MAX];
4357 ssize_t target_len, outlen;
4362 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4363 if (target_len == -1)
4364 return got_error_from_errno2("readlinkat", abspath);
4366 target_len = readlink(abspath, target_path, PATH_MAX);
4367 if (target_len == -1)
4368 return got_error_from_errno2("readlink", abspath);
4371 *fd = got_opentempfd();
4373 return got_error_from_errno("got_opentempfd");
4375 outlen = write(*fd, target_path, target_len);
4377 err = got_error_from_errno("got_opentempfd");
4381 if (lseek(*fd, 0, SEEK_SET) == -1) {
4382 err = got_error_from_errno2("lseek", abspath);
4393 static const struct got_error *
4394 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4395 const char *path, struct got_object_id *blob_id,
4396 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4397 int dirfd, const char *de_name)
4399 struct print_diff_arg *a = arg;
4400 const struct got_error *err = NULL;
4401 struct got_blob_object *blob1 = NULL;
4403 FILE *f1 = NULL, *f2 = NULL;
4404 char *abspath = NULL, *label1 = NULL;
4408 if (a->diff_staged) {
4409 if (staged_status != GOT_STATUS_MODIFY &&
4410 staged_status != GOT_STATUS_ADD &&
4411 staged_status != GOT_STATUS_DELETE)
4414 if (staged_status == GOT_STATUS_DELETE)
4416 if (status == GOT_STATUS_NONEXISTENT)
4417 return got_error_set_errno(ENOENT, path);
4418 if (status != GOT_STATUS_MODIFY &&
4419 status != GOT_STATUS_ADD &&
4420 status != GOT_STATUS_DELETE &&
4421 status != GOT_STATUS_CONFLICT)
4425 if (!a->header_shown) {
4426 printf("diff %s %s%s\n", a->id_str,
4427 got_worktree_get_root_path(a->worktree),
4428 a->diff_staged ? " (staged changes)" : "");
4429 a->header_shown = 1;
4432 if (a->diff_staged) {
4433 const char *label1 = NULL, *label2 = NULL;
4434 switch (staged_status) {
4435 case GOT_STATUS_MODIFY:
4439 case GOT_STATUS_ADD:
4442 case GOT_STATUS_DELETE:
4446 return got_error(GOT_ERR_FILE_STATUS);
4448 f1 = got_opentemp();
4450 err = got_error_from_errno("got_opentemp");
4453 f2 = got_opentemp();
4455 err = got_error_from_errno("got_opentemp");
4458 err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4459 blob_id, staged_blob_id, label1, label2, a->diff_context,
4460 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4464 if (staged_status == GOT_STATUS_ADD ||
4465 staged_status == GOT_STATUS_MODIFY) {
4467 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4471 err = got_object_id_str(&id_str, staged_blob_id);
4474 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4475 err = got_error_from_errno("asprintf");
4480 } else if (status != GOT_STATUS_ADD) {
4481 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4486 if (status != GOT_STATUS_DELETE) {
4487 if (asprintf(&abspath, "%s/%s",
4488 got_worktree_get_root_path(a->worktree), path) == -1) {
4489 err = got_error_from_errno("asprintf");
4494 fd = openat(dirfd, de_name,
4495 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4497 if (!got_err_open_nofollow_on_symlink()) {
4498 err = got_error_from_errno2("openat",
4502 err = get_symlink_target_file(&fd, dirfd,
4508 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4510 if (!got_err_open_nofollow_on_symlink()) {
4511 err = got_error_from_errno2("open",
4515 err = get_symlink_target_file(&fd, dirfd,
4521 if (fstat(fd, &sb) == -1) {
4522 err = got_error_from_errno2("fstat", abspath);
4525 f2 = fdopen(fd, "r");
4527 err = got_error_from_errno2("fdopen", abspath);
4535 f1 = got_opentemp();
4537 err = got_error_from_errno("got_opentemp");
4540 err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
4546 err = got_diff_blob_file(blob1, f1, size1, label1, f2, sb.st_size,
4547 path, a->diff_context, a->ignore_whitespace, a->force_text_diff,
4551 got_object_blob_close(blob1);
4552 if (f1 && fclose(f1) == EOF && err == NULL)
4553 err = got_error_from_errno("fclose");
4554 if (f2 && fclose(f2) == EOF && err == NULL)
4555 err = got_error_from_errno("fclose");
4556 if (fd != -1 && close(fd) == -1 && err == NULL)
4557 err = got_error_from_errno("close");
4562 static const struct got_error *
4563 cmd_diff(int argc, char *argv[])
4565 const struct got_error *error;
4566 struct got_repository *repo = NULL;
4567 struct got_worktree *worktree = NULL;
4568 char *cwd = NULL, *repo_path = NULL;
4569 const char *commit_args[2] = { NULL, NULL };
4570 int ncommit_args = 0;
4571 struct got_object_id *ids[2] = { NULL, NULL };
4572 char *labels[2] = { NULL, NULL };
4573 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4574 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4575 int force_text_diff = 0, force_path = 0, rflag = 0;
4577 struct got_reflist_head refs;
4578 struct got_pathlist_head paths;
4579 struct got_pathlist_entry *pe;
4580 FILE *f1 = NULL, *f2 = NULL;
4586 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4591 while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4594 force_text_diff = 1;
4597 if (ncommit_args >= 2)
4598 errx(1, "too many -c options used");
4599 commit_args[ncommit_args++] = optarg;
4602 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4605 errx(1, "number of context lines is %s: %s",
4609 repo_path = realpath(optarg, NULL);
4610 if (repo_path == NULL)
4611 return got_error_from_errno2("realpath",
4613 got_path_strip_trailing_slashes(repo_path);
4620 ignore_whitespace = 1;
4634 cwd = getcwd(NULL, 0);
4636 error = got_error_from_errno("getcwd");
4640 if (repo_path == NULL) {
4641 error = got_worktree_open(&worktree, cwd);
4642 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4648 strdup(got_worktree_get_repo_path(worktree));
4649 if (repo_path == NULL) {
4650 error = got_error_from_errno("strdup");
4654 repo_path = strdup(cwd);
4655 if (repo_path == NULL) {
4656 error = got_error_from_errno("strdup");
4662 error = got_repo_open(&repo, repo_path, NULL);
4667 if (rflag || worktree == NULL || ncommit_args > 0) {
4669 error = got_error_msg(GOT_ERR_NOT_IMPL,
4670 "-P option can only be used when diffing "
4675 error = got_error_msg(GOT_ERR_NOT_IMPL,
4676 "-s option can only be used when diffing "
4682 error = apply_unveil(got_repo_get_path(repo), 1,
4683 worktree ? got_worktree_get_root_path(worktree) : NULL);
4687 if ((!force_path && argc == 2) || ncommit_args > 0) {
4688 int obj_type = (ncommit_args > 0 ?
4689 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4690 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4694 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4696 if (ncommit_args > 0)
4697 arg = commit_args[i];
4700 error = got_repo_match_object_id(&ids[i], &labels[i],
4701 arg, obj_type, &refs, repo);
4703 if (error->code != GOT_ERR_NOT_REF &&
4704 error->code != GOT_ERR_NO_OBJ)
4706 if (ncommit_args > 0)
4714 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4715 struct print_diff_arg arg;
4718 if (worktree == NULL) {
4719 if (argc == 2 && ids[0] == NULL) {
4720 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4722 } else if (argc == 2 && ids[1] == NULL) {
4723 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4725 } else if (argc > 0) {
4726 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4727 "%s", "specified paths cannot be resolved");
4730 error = got_error(GOT_ERR_NOT_WORKTREE);
4735 error = get_worktree_paths_from_argv(&paths, argc, argv,
4740 error = got_object_id_str(&id_str,
4741 got_worktree_get_base_commit_id(worktree));
4745 arg.worktree = worktree;
4746 arg.diff_context = diff_context;
4747 arg.id_str = id_str;
4748 arg.header_shown = 0;
4749 arg.diff_staged = diff_staged;
4750 arg.ignore_whitespace = ignore_whitespace;
4751 arg.force_text_diff = force_text_diff;
4753 error = got_worktree_status(worktree, &paths, repo, 0,
4754 print_diff, &arg, check_cancelled, NULL);
4759 if (ncommit_args == 1) {
4760 struct got_commit_object *commit;
4761 error = got_object_open_as_commit(&commit, repo, ids[0]);
4765 labels[1] = labels[0];
4767 if (got_object_commit_get_nparents(commit) > 0) {
4768 const struct got_object_id_queue *pids;
4769 struct got_object_qid *pid;
4770 pids = got_object_commit_get_parent_ids(commit);
4771 pid = STAILQ_FIRST(pids);
4772 ids[0] = got_object_id_dup(&pid->id);
4773 if (ids[0] == NULL) {
4774 error = got_error_from_errno(
4775 "got_object_id_dup");
4776 got_object_commit_close(commit);
4779 error = got_object_id_str(&labels[0], ids[0]);
4781 got_object_commit_close(commit);
4786 labels[0] = strdup("/dev/null");
4787 if (labels[0] == NULL) {
4788 error = got_error_from_errno("strdup");
4789 got_object_commit_close(commit);
4794 got_object_commit_close(commit);
4797 if (ncommit_args == 0 && argc > 2) {
4798 error = got_error_msg(GOT_ERR_BAD_PATH,
4799 "path arguments cannot be used when diffing two objects");
4804 error = got_object_get_type(&type1, repo, ids[0]);
4809 error = got_object_get_type(&type2, repo, ids[1]);
4812 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4813 error = got_error(GOT_ERR_OBJ_TYPE);
4816 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
4817 error = got_error_msg(GOT_ERR_OBJ_TYPE,
4818 "path arguments cannot be used when diffing blobs");
4822 for (i = 0; ncommit_args > 0 && i < argc; i++) {
4824 struct got_pathlist_entry *new;
4828 error = got_worktree_resolve_path(&p, worktree,
4832 prefix = got_worktree_get_path_prefix(worktree);
4833 while (prefix[0] == '/')
4835 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4836 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4838 error = got_error_from_errno("asprintf");
4844 char *mapped_path, *s;
4845 error = got_repo_map_path(&mapped_path, repo, argv[i]);
4851 in_repo_path = strdup(s);
4852 if (in_repo_path == NULL) {
4853 error = got_error_from_errno("asprintf");
4860 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4861 if (error || new == NULL /* duplicate */)
4868 /* Release work tree lock. */
4869 got_worktree_close(worktree);
4873 f1 = got_opentemp();
4875 error = got_error_from_errno("got_opentemp");
4879 f2 = got_opentemp();
4881 error = got_error_from_errno("got_opentemp");
4885 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4886 case GOT_OBJ_TYPE_BLOB:
4887 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4888 ids[0], ids[1], NULL, NULL, diff_context,
4889 ignore_whitespace, force_text_diff, repo, stdout);
4891 case GOT_OBJ_TYPE_TREE:
4892 error = got_diff_objects_as_trees(NULL, NULL, f1, f2,
4893 ids[0], ids[1], &paths, "", "", diff_context,
4894 ignore_whitespace, force_text_diff, repo, stdout);
4896 case GOT_OBJ_TYPE_COMMIT:
4897 printf("diff %s %s\n", labels[0], labels[1]);
4898 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4899 ids[0], ids[1], &paths, diff_context, ignore_whitespace,
4900 force_text_diff, repo, stdout);
4903 error = got_error(GOT_ERR_OBJ_TYPE);
4911 got_worktree_close(worktree);
4913 const struct got_error *close_err = got_repo_close(repo);
4917 TAILQ_FOREACH(pe, &paths, entry)
4918 free((char *)pe->path);
4919 got_pathlist_free(&paths);
4920 got_ref_list_free(&refs);
4921 if (f1 && fclose(f1) == EOF && error == NULL)
4922 error = got_error_from_errno("fclose");
4923 if (f2 && fclose(f2) == EOF && error == NULL)
4924 error = got_error_from_errno("fclose");
4932 "usage: %s blame [-c commit] [-r repository-path] path\n",
4941 char datebuf[11]; /* YYYY-MM-DD + NUL */
4944 struct blame_cb_args {
4945 struct blame_line *lines;
4949 off_t *line_offsets;
4951 struct got_repository *repo;
4954 static const struct got_error *
4955 blame_cb(void *arg, int nlines, int lineno,
4956 struct got_commit_object *commit, struct got_object_id *id)
4958 const struct got_error *err = NULL;
4959 struct blame_cb_args *a = arg;
4960 struct blame_line *bline;
4962 size_t linesize = 0;
4965 time_t committer_time;
4967 if (nlines != a->nlines ||
4968 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4969 return got_error(GOT_ERR_RANGE);
4971 if (sigint_received)
4972 return got_error(GOT_ERR_ITER_COMPLETED);
4975 return NULL; /* no change in this commit */
4977 /* Annotate this line. */
4978 bline = &a->lines[lineno - 1];
4979 if (bline->annotated)
4981 err = got_object_id_str(&bline->id_str, id);
4985 bline->committer = strdup(got_object_commit_get_committer(commit));
4986 if (bline->committer == NULL) {
4987 err = got_error_from_errno("strdup");
4991 committer_time = got_object_commit_get_committer_time(commit);
4992 if (gmtime_r(&committer_time, &tm) == NULL)
4993 return got_error_from_errno("gmtime_r");
4994 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4996 err = got_error(GOT_ERR_NO_SPACE);
4999 bline->annotated = 1;
5001 /* Print lines annotated so far. */
5002 bline = &a->lines[a->lineno_cur - 1];
5003 if (!bline->annotated)
5006 offset = a->line_offsets[a->lineno_cur - 1];
5007 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5008 err = got_error_from_errno("fseeko");
5012 while (bline->annotated) {
5013 char *smallerthan, *at, *nl, *committer;
5016 if (getline(&line, &linesize, a->f) == -1) {
5018 err = got_error_from_errno("getline");
5022 committer = bline->committer;
5023 smallerthan = strchr(committer, '<');
5024 if (smallerthan && smallerthan[1] != '\0')
5025 committer = smallerthan + 1;
5026 at = strchr(committer, '@');
5029 len = strlen(committer);
5031 committer[8] = '\0';
5033 nl = strchr(line, '\n');
5036 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5037 bline->id_str, bline->datebuf, committer, line);
5040 bline = &a->lines[a->lineno_cur - 1];
5047 static const struct got_error *
5048 cmd_blame(int argc, char *argv[])
5050 const struct got_error *error;
5051 struct got_repository *repo = NULL;
5052 struct got_worktree *worktree = NULL;
5053 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5054 char *link_target = NULL;
5055 struct got_object_id *obj_id = NULL;
5056 struct got_object_id *commit_id = NULL;
5057 struct got_commit_object *commit = NULL;
5058 struct got_blob_object *blob = NULL;
5059 char *commit_id_str = NULL;
5060 struct blame_cb_args bca;
5061 int ch, obj_type, i;
5064 memset(&bca, 0, sizeof(bca));
5067 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5072 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5075 commit_id_str = optarg;
5078 repo_path = realpath(optarg, NULL);
5079 if (repo_path == NULL)
5080 return got_error_from_errno2("realpath",
5082 got_path_strip_trailing_slashes(repo_path);
5098 cwd = getcwd(NULL, 0);
5100 error = got_error_from_errno("getcwd");
5103 if (repo_path == NULL) {
5104 error = got_worktree_open(&worktree, cwd);
5105 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5111 strdup(got_worktree_get_repo_path(worktree));
5112 if (repo_path == NULL) {
5113 error = got_error_from_errno("strdup");
5118 repo_path = strdup(cwd);
5119 if (repo_path == NULL) {
5120 error = got_error_from_errno("strdup");
5126 error = got_repo_open(&repo, repo_path, NULL);
5131 const char *prefix = got_worktree_get_path_prefix(worktree);
5134 error = got_worktree_resolve_path(&p, worktree, path);
5137 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5138 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5140 error = got_error_from_errno("asprintf");
5145 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5147 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5150 error = got_repo_map_path(&in_repo_path, repo, path);
5155 if (commit_id_str == NULL) {
5156 struct got_reference *head_ref;
5157 error = got_ref_open(&head_ref, repo, worktree ?
5158 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5161 error = got_ref_resolve(&commit_id, repo, head_ref);
5162 got_ref_close(head_ref);
5166 struct got_reflist_head refs;
5168 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5172 error = got_repo_match_object_id(&commit_id, NULL,
5173 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5174 got_ref_list_free(&refs);
5180 /* Release work tree lock. */
5181 got_worktree_close(worktree);
5185 error = got_object_open_as_commit(&commit, repo, commit_id);
5189 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5194 error = got_object_id_by_path(&obj_id, repo, commit,
5195 link_target ? link_target : in_repo_path);
5199 error = got_object_get_type(&obj_type, repo, obj_id);
5203 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5204 error = got_error_path(link_target ? link_target : in_repo_path,
5209 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5212 bca.f = got_opentemp();
5213 if (bca.f == NULL) {
5214 error = got_error_from_errno("got_opentemp");
5217 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5218 &bca.line_offsets, bca.f, blob);
5219 if (error || bca.nlines == 0)
5222 /* Don't include \n at EOF in the blame line count. */
5223 if (bca.line_offsets[bca.nlines - 1] == filesize)
5226 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5227 if (bca.lines == NULL) {
5228 error = got_error_from_errno("calloc");
5232 bca.nlines_prec = 0;
5240 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5241 repo, blame_cb, &bca, check_cancelled, NULL);
5250 got_object_commit_close(commit);
5252 got_object_blob_close(blob);
5254 got_worktree_close(worktree);
5256 const struct got_error *close_err = got_repo_close(repo);
5261 for (i = 0; i < bca.nlines; i++) {
5262 struct blame_line *bline = &bca.lines[i];
5263 free(bline->id_str);
5264 free(bline->committer);
5268 free(bca.line_offsets);
5269 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5270 error = got_error_from_errno("fclose");
5278 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5283 static const struct got_error *
5284 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5285 const char *root_path, struct got_repository *repo)
5287 const struct got_error *err = NULL;
5288 int is_root_path = (strcmp(path, root_path) == 0);
5289 const char *modestr = "";
5290 mode_t mode = got_tree_entry_get_mode(te);
5291 char *link_target = NULL;
5293 path += strlen(root_path);
5294 while (path[0] == '/')
5297 if (got_object_tree_entry_is_submodule(te))
5299 else if (S_ISLNK(mode)) {
5302 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5305 for (i = 0; i < strlen(link_target); i++) {
5306 if (!isprint((unsigned char)link_target[i]))
5307 link_target[i] = '?';
5312 else if (S_ISDIR(mode))
5314 else if (mode & S_IXUSR)
5317 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5318 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5319 link_target ? " -> ": "", link_target ? link_target : "");
5325 static const struct got_error *
5326 print_tree(const char *path, struct got_commit_object *commit,
5327 int show_ids, int recurse, const char *root_path,
5328 struct got_repository *repo)
5330 const struct got_error *err = NULL;
5331 struct got_object_id *tree_id = NULL;
5332 struct got_tree_object *tree = NULL;
5335 err = got_object_id_by_path(&tree_id, repo, commit, path);
5339 err = got_object_open_as_tree(&tree, repo, tree_id);
5342 nentries = got_object_tree_get_nentries(tree);
5343 for (i = 0; i < nentries; i++) {
5344 struct got_tree_entry *te;
5347 if (sigint_received || sigpipe_received)
5350 te = got_object_tree_get_entry(tree, i);
5353 err = got_object_id_str(&id_str,
5354 got_tree_entry_get_id(te));
5357 if (asprintf(&id, "%s ", id_str) == -1) {
5358 err = got_error_from_errno("asprintf");
5364 err = print_entry(te, id, path, root_path, repo);
5369 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5371 if (asprintf(&child_path, "%s%s%s", path,
5372 path[0] == '/' && path[1] == '\0' ? "" : "/",
5373 got_tree_entry_get_name(te)) == -1) {
5374 err = got_error_from_errno("asprintf");
5377 err = print_tree(child_path, commit, show_ids, 1,
5386 got_object_tree_close(tree);
5391 static const struct got_error *
5392 cmd_tree(int argc, char *argv[])
5394 const struct got_error *error;
5395 struct got_repository *repo = NULL;
5396 struct got_worktree *worktree = NULL;
5397 const char *path, *refname = NULL;
5398 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5399 struct got_object_id *commit_id = NULL;
5400 struct got_commit_object *commit = NULL;
5401 char *commit_id_str = NULL;
5402 int show_ids = 0, recurse = 0;
5406 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5411 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5414 commit_id_str = optarg;
5417 repo_path = realpath(optarg, NULL);
5418 if (repo_path == NULL)
5419 return got_error_from_errno2("realpath",
5421 got_path_strip_trailing_slashes(repo_path);
5445 cwd = getcwd(NULL, 0);
5447 error = got_error_from_errno("getcwd");
5450 if (repo_path == NULL) {
5451 error = got_worktree_open(&worktree, cwd);
5452 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5458 strdup(got_worktree_get_repo_path(worktree));
5459 if (repo_path == NULL)
5460 error = got_error_from_errno("strdup");
5464 repo_path = strdup(cwd);
5465 if (repo_path == NULL) {
5466 error = got_error_from_errno("strdup");
5472 error = got_repo_open(&repo, repo_path, NULL);
5477 const char *prefix = got_worktree_get_path_prefix(worktree);
5482 error = got_worktree_resolve_path(&p, worktree, path);
5485 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5486 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5488 error = got_error_from_errno("asprintf");
5493 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5497 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5502 error = got_repo_map_path(&in_repo_path, repo, path);
5507 if (commit_id_str == NULL) {
5508 struct got_reference *head_ref;
5510 refname = got_worktree_get_head_ref_name(worktree);
5512 refname = GOT_REF_HEAD;
5513 error = got_ref_open(&head_ref, repo, refname, 0);
5516 error = got_ref_resolve(&commit_id, repo, head_ref);
5517 got_ref_close(head_ref);
5521 struct got_reflist_head refs;
5523 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5527 error = got_repo_match_object_id(&commit_id, NULL,
5528 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5529 got_ref_list_free(&refs);
5535 /* Release work tree lock. */
5536 got_worktree_close(worktree);
5540 error = got_object_open_as_commit(&commit, repo, commit_id);
5544 error = print_tree(in_repo_path, commit, show_ids, recurse,
5545 in_repo_path, repo);
5552 got_object_commit_close(commit);
5554 got_worktree_close(worktree);
5556 const struct got_error *close_err = got_repo_close(repo);
5566 fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5567 "[-S status-codes] [path ...]\n", getprogname());
5571 struct got_status_arg {
5576 static const struct got_error *
5577 print_status(void *arg, unsigned char status, unsigned char staged_status,
5578 const char *path, struct got_object_id *blob_id,
5579 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5580 int dirfd, const char *de_name)
5582 struct got_status_arg *st = arg;
5584 if (status == staged_status && (status == GOT_STATUS_DELETE))
5585 status = GOT_STATUS_NO_CHANGE;
5586 if (st != NULL && st->status_codes) {
5587 size_t ncodes = strlen(st->status_codes);
5590 for (i = 0; i < ncodes ; i++) {
5592 if (status == st->status_codes[i] ||
5593 staged_status == st->status_codes[i]) {
5598 if (status == st->status_codes[i] ||
5599 staged_status == st->status_codes[i])
5604 if (st->suppress && j == 0)
5611 printf("%c%c %s\n", status, staged_status, path);
5615 static const struct got_error *
5616 cmd_status(int argc, char *argv[])
5618 const struct got_error *error = NULL;
5619 struct got_repository *repo = NULL;
5620 struct got_worktree *worktree = NULL;
5621 struct got_status_arg st;
5623 struct got_pathlist_head paths;
5624 struct got_pathlist_entry *pe;
5625 int ch, i, no_ignores = 0;
5629 memset(&st, 0, sizeof(st));
5630 st.status_codes = NULL;
5633 while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5639 if (st.status_codes != NULL && st.suppress == 0)
5640 option_conflict('S', 's');
5644 for (i = 0; i < strlen(optarg); i++) {
5645 switch (optarg[i]) {
5646 case GOT_STATUS_MODIFY:
5647 case GOT_STATUS_ADD:
5648 case GOT_STATUS_DELETE:
5649 case GOT_STATUS_CONFLICT:
5650 case GOT_STATUS_MISSING:
5651 case GOT_STATUS_OBSTRUCTED:
5652 case GOT_STATUS_UNVERSIONED:
5653 case GOT_STATUS_MODE_CHANGE:
5654 case GOT_STATUS_NONEXISTENT:
5657 errx(1, "invalid status code '%c'",
5661 if (ch == 's' && st.suppress)
5662 option_conflict('s', 'S');
5663 st.status_codes = optarg;
5675 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5679 cwd = getcwd(NULL, 0);
5681 error = got_error_from_errno("getcwd");
5685 error = got_worktree_open(&worktree, cwd);
5687 if (error->code == GOT_ERR_NOT_WORKTREE)
5688 error = wrap_not_worktree_error(error, "status", cwd);
5692 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5697 error = apply_unveil(got_repo_get_path(repo), 1,
5698 got_worktree_get_root_path(worktree));
5702 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5706 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5707 print_status, &st, check_cancelled, NULL);
5709 TAILQ_FOREACH(pe, &paths, entry)
5710 free((char *)pe->path);
5711 got_pathlist_free(&paths);
5720 "usage: %s ref [-r repository] [-l] [-t] [-c object] "
5721 "[-s reference] [-d] [name]\n",
5726 static const struct got_error *
5727 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
5729 static const struct got_error *err = NULL;
5730 struct got_reflist_head refs;
5731 struct got_reflist_entry *re;
5734 err = got_ref_list(&refs, repo, refname, sort_by_time ?
5735 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
5740 TAILQ_FOREACH(re, &refs, entry) {
5742 refstr = got_ref_to_str(re->ref);
5743 if (refstr == NULL) {
5744 err = got_error_from_errno("got_ref_to_str");
5747 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5751 got_ref_list_free(&refs);
5755 static const struct got_error *
5756 delete_ref_by_name(struct got_repository *repo, const char *refname)
5758 const struct got_error *err;
5759 struct got_reference *ref;
5761 err = got_ref_open(&ref, repo, refname, 0);
5765 err = delete_ref(repo, ref);
5770 static const struct got_error *
5771 add_ref(struct got_repository *repo, const char *refname, const char *target)
5773 const struct got_error *err = NULL;
5774 struct got_object_id *id = NULL;
5775 struct got_reference *ref = NULL;
5776 struct got_reflist_head refs;
5779 * Don't let the user create a reference name with a leading '-'.
5780 * While technically a valid reference name, this case is usually
5781 * an unintended typo.
5783 if (refname[0] == '-')
5784 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5787 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5790 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
5792 got_ref_list_free(&refs);
5796 err = got_ref_alloc(&ref, refname, id);
5800 err = got_ref_write(ref, repo);
5808 static const struct got_error *
5809 add_symref(struct got_repository *repo, const char *refname, const char *target)
5811 const struct got_error *err = NULL;
5812 struct got_reference *ref = NULL;
5813 struct got_reference *target_ref = NULL;
5816 * Don't let the user create a reference name with a leading '-'.
5817 * While technically a valid reference name, this case is usually
5818 * an unintended typo.
5820 if (refname[0] == '-')
5821 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5823 err = got_ref_open(&target_ref, repo, target, 0);
5827 err = got_ref_alloc_symref(&ref, refname, target_ref);
5831 err = got_ref_write(ref, repo);
5834 got_ref_close(target_ref);
5840 static const struct got_error *
5841 cmd_ref(int argc, char *argv[])
5843 const struct got_error *error = NULL;
5844 struct got_repository *repo = NULL;
5845 struct got_worktree *worktree = NULL;
5846 char *cwd = NULL, *repo_path = NULL;
5847 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
5848 const char *obj_arg = NULL, *symref_target= NULL;
5849 char *refname = NULL;
5851 while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
5860 repo_path = realpath(optarg, NULL);
5861 if (repo_path == NULL)
5862 return got_error_from_errno2("realpath",
5864 got_path_strip_trailing_slashes(repo_path);
5870 symref_target = optarg;
5881 if (obj_arg && do_list)
5882 option_conflict('c', 'l');
5883 if (obj_arg && do_delete)
5884 option_conflict('c', 'd');
5885 if (obj_arg && symref_target)
5886 option_conflict('c', 's');
5887 if (symref_target && do_delete)
5888 option_conflict('s', 'd');
5889 if (symref_target && do_list)
5890 option_conflict('s', 'l');
5891 if (do_delete && do_list)
5892 option_conflict('d', 'l');
5893 if (sort_by_time && !do_list)
5894 errx(1, "-t option requires -l option");
5900 if (argc != 0 && argc != 1)
5903 refname = strdup(argv[0]);
5904 if (refname == NULL) {
5905 error = got_error_from_errno("strdup");
5912 refname = strdup(argv[0]);
5913 if (refname == NULL) {
5914 error = got_error_from_errno("strdup");
5920 got_path_strip_trailing_slashes(refname);
5923 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5924 "sendfd unveil", NULL) == -1)
5927 cwd = getcwd(NULL, 0);
5929 error = got_error_from_errno("getcwd");
5933 if (repo_path == NULL) {
5934 error = got_worktree_open(&worktree, cwd);
5935 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5941 strdup(got_worktree_get_repo_path(worktree));
5942 if (repo_path == NULL)
5943 error = got_error_from_errno("strdup");
5947 repo_path = strdup(cwd);
5948 if (repo_path == NULL) {
5949 error = got_error_from_errno("strdup");
5955 error = got_repo_open(&repo, repo_path, NULL);
5961 /* Remove "cpath" promise. */
5962 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5968 error = apply_unveil(got_repo_get_path(repo), do_list,
5969 worktree ? got_worktree_get_root_path(worktree) : NULL);
5974 error = list_refs(repo, refname, sort_by_time);
5976 error = delete_ref_by_name(repo, refname);
5977 else if (symref_target)
5978 error = add_symref(repo, refname, symref_target);
5980 if (obj_arg == NULL)
5982 error = add_ref(repo, refname, obj_arg);
5987 const struct got_error *close_err = got_repo_close(repo);
5992 got_worktree_close(worktree);
6002 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
6003 "[-n] [name]\n", getprogname());
6007 static const struct got_error *
6008 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6009 struct got_reference *ref)
6011 const struct got_error *err = NULL;
6012 const char *refname, *marker = " ";
6015 refname = got_ref_get_name(ref);
6016 if (worktree && strcmp(refname,
6017 got_worktree_get_head_ref_name(worktree)) == 0) {
6018 struct got_object_id *id = NULL;
6020 err = got_ref_resolve(&id, repo, ref);
6023 if (got_object_id_cmp(id,
6024 got_worktree_get_base_commit_id(worktree)) == 0)
6031 if (strncmp(refname, "refs/heads/", 11) == 0)
6033 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6035 if (strncmp(refname, "refs/remotes/", 13) == 0)
6038 refstr = got_ref_to_str(ref);
6040 return got_error_from_errno("got_ref_to_str");
6042 printf("%s%s: %s\n", marker, refname, refstr);
6047 static const struct got_error *
6048 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6050 const char *refname;
6052 if (worktree == NULL)
6053 return got_error(GOT_ERR_NOT_WORKTREE);
6055 refname = got_worktree_get_head_ref_name(worktree);
6057 if (strncmp(refname, "refs/heads/", 11) == 0)
6059 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6062 printf("%s\n", refname);
6067 static const struct got_error *
6068 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6071 static const struct got_error *err = NULL;
6072 struct got_reflist_head refs;
6073 struct got_reflist_entry *re;
6074 struct got_reference *temp_ref = NULL;
6075 int rebase_in_progress, histedit_in_progress;
6080 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6085 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6090 if (rebase_in_progress || histedit_in_progress) {
6091 err = got_ref_open(&temp_ref, repo,
6092 got_worktree_get_head_ref_name(worktree), 0);
6095 list_branch(repo, worktree, temp_ref);
6096 got_ref_close(temp_ref);
6100 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6101 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6106 TAILQ_FOREACH(re, &refs, entry)
6107 list_branch(repo, worktree, re->ref);
6109 got_ref_list_free(&refs);
6111 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6112 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6117 TAILQ_FOREACH(re, &refs, entry)
6118 list_branch(repo, worktree, re->ref);
6120 got_ref_list_free(&refs);
6125 static const struct got_error *
6126 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6127 const char *branch_name)
6129 const struct got_error *err = NULL;
6130 struct got_reference *ref = NULL;
6131 char *refname, *remote_refname = NULL;
6133 if (strncmp(branch_name, "refs/", 5) == 0)
6135 if (strncmp(branch_name, "heads/", 6) == 0)
6137 else if (strncmp(branch_name, "remotes/", 8) == 0)
6140 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6141 return got_error_from_errno("asprintf");
6143 if (asprintf(&remote_refname, "refs/remotes/%s",
6144 branch_name) == -1) {
6145 err = got_error_from_errno("asprintf");
6149 err = got_ref_open(&ref, repo, refname, 0);
6151 const struct got_error *err2;
6152 if (err->code != GOT_ERR_NOT_REF)
6155 * Keep 'err' intact such that if neither branch exists
6156 * we report "refs/heads" rather than "refs/remotes" in
6157 * our error message.
6159 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6166 strcmp(got_worktree_get_head_ref_name(worktree),
6167 got_ref_get_name(ref)) == 0) {
6168 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6169 "will not delete this work tree's current branch");
6173 err = delete_ref(repo, ref);
6178 free(remote_refname);
6182 static const struct got_error *
6183 add_branch(struct got_repository *repo, const char *branch_name,
6184 struct got_object_id *base_commit_id)
6186 const struct got_error *err = NULL;
6187 struct got_reference *ref = NULL;
6188 char *base_refname = NULL, *refname = NULL;
6191 * Don't let the user create a branch name with a leading '-'.
6192 * While technically a valid reference name, this case is usually
6193 * an unintended typo.
6195 if (branch_name[0] == '-')
6196 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6198 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6201 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6202 err = got_error_from_errno("asprintf");
6206 err = got_ref_open(&ref, repo, refname, 0);
6208 err = got_error(GOT_ERR_BRANCH_EXISTS);
6210 } else if (err->code != GOT_ERR_NOT_REF)
6213 err = got_ref_alloc(&ref, refname, base_commit_id);
6217 err = got_ref_write(ref, repo);
6226 static const struct got_error *
6227 cmd_branch(int argc, char *argv[])
6229 const struct got_error *error = NULL;
6230 struct got_repository *repo = NULL;
6231 struct got_worktree *worktree = NULL;
6232 char *cwd = NULL, *repo_path = NULL;
6233 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6234 const char *delref = NULL, *commit_id_arg = NULL;
6235 struct got_reference *ref = NULL;
6236 struct got_pathlist_head paths;
6237 struct got_pathlist_entry *pe;
6238 struct got_object_id *commit_id = NULL;
6239 char *commit_id_str = NULL;
6243 while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6246 commit_id_arg = optarg;
6252 repo_path = realpath(optarg, NULL);
6253 if (repo_path == NULL)
6254 return got_error_from_errno2("realpath",
6256 got_path_strip_trailing_slashes(repo_path);
6273 if (do_list && delref)
6274 option_conflict('l', 'd');
6275 if (sort_by_time && !do_list)
6276 errx(1, "-t option requires -l option");
6281 if (!do_list && !delref && argc == 0)
6284 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6285 errx(1, "-c option can only be used when creating a branch");
6287 if (do_list || delref) {
6290 } else if (!do_show && argc != 1)
6294 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6295 "sendfd unveil", NULL) == -1)
6298 cwd = getcwd(NULL, 0);
6300 error = got_error_from_errno("getcwd");
6304 if (repo_path == NULL) {
6305 error = got_worktree_open(&worktree, cwd);
6306 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6312 strdup(got_worktree_get_repo_path(worktree));
6313 if (repo_path == NULL)
6314 error = got_error_from_errno("strdup");
6318 repo_path = strdup(cwd);
6319 if (repo_path == NULL) {
6320 error = got_error_from_errno("strdup");
6326 error = got_repo_open(&repo, repo_path, NULL);
6331 if (do_list || do_show) {
6332 /* Remove "cpath" promise. */
6333 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6339 error = apply_unveil(got_repo_get_path(repo), do_list,
6340 worktree ? got_worktree_get_root_path(worktree) : NULL);
6345 error = show_current_branch(repo, worktree);
6347 error = list_branches(repo, worktree, sort_by_time);
6349 error = delete_branch(repo, worktree, delref);
6351 struct got_reflist_head refs;
6353 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6357 if (commit_id_arg == NULL)
6358 commit_id_arg = worktree ?
6359 got_worktree_get_head_ref_name(worktree) :
6361 error = got_repo_match_object_id(&commit_id, NULL,
6362 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6363 got_ref_list_free(&refs);
6366 error = add_branch(repo, argv[0], commit_id);
6369 if (worktree && do_update) {
6370 struct got_update_progress_arg upa;
6371 char *branch_refname = NULL;
6373 error = got_object_id_str(&commit_id_str, commit_id);
6376 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6380 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6382 error = got_error_from_errno("asprintf");
6385 error = got_ref_open(&ref, repo, branch_refname, 0);
6386 free(branch_refname);
6389 error = switch_head_ref(ref, commit_id, worktree,
6393 error = got_worktree_set_base_commit_id(worktree, repo,
6397 memset(&upa, 0, sizeof(upa));
6398 error = got_worktree_checkout_files(worktree, &paths,
6399 repo, update_progress, &upa, check_cancelled,
6403 if (upa.did_something) {
6404 printf("Updated to %s: %s\n",
6405 got_worktree_get_head_ref_name(worktree),
6408 print_update_progress_stats(&upa);
6415 const struct got_error *close_err = got_repo_close(repo);
6420 got_worktree_close(worktree);
6424 free(commit_id_str);
6425 TAILQ_FOREACH(pe, &paths, entry)
6426 free((char *)pe->path);
6427 got_pathlist_free(&paths);
6436 "usage: %s tag [-c commit] [-r repository] [-l] "
6437 "[-m message] name\n", getprogname());
6442 static const struct got_error *
6443 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6445 const struct got_error *err = NULL;
6446 struct got_reflist_entry *re, *se, *new;
6447 struct got_object_id *re_id, *se_id;
6448 struct got_tag_object *re_tag, *se_tag;
6449 time_t re_time, se_time;
6451 STAILQ_FOREACH(re, tags, entry) {
6452 se = STAILQ_FIRST(sorted);
6454 err = got_reflist_entry_dup(&new, re);
6457 STAILQ_INSERT_HEAD(sorted, new, entry);
6460 err = got_ref_resolve(&re_id, repo, re->ref);
6463 err = got_object_open_as_tag(&re_tag, repo, re_id);
6467 re_time = got_object_tag_get_tagger_time(re_tag);
6468 got_object_tag_close(re_tag);
6472 err = got_ref_resolve(&se_id, repo, re->ref);
6475 err = got_object_open_as_tag(&se_tag, repo, se_id);
6479 se_time = got_object_tag_get_tagger_time(se_tag);
6480 got_object_tag_close(se_tag);
6482 if (se_time > re_time) {
6483 err = got_reflist_entry_dup(&new, re);
6486 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6489 se = STAILQ_NEXT(se, entry);
6498 static const struct got_error *
6499 list_tags(struct got_repository *repo)
6501 static const struct got_error *err = NULL;
6502 struct got_reflist_head refs;
6503 struct got_reflist_entry *re;
6507 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6511 TAILQ_FOREACH(re, &refs, entry) {
6512 const char *refname;
6513 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6517 struct got_object_id *id;
6518 struct got_tag_object *tag;
6519 struct got_commit_object *commit = NULL;
6521 refname = got_ref_get_name(re->ref);
6522 if (strncmp(refname, "refs/tags/", 10) != 0)
6525 refstr = got_ref_to_str(re->ref);
6526 if (refstr == NULL) {
6527 err = got_error_from_errno("got_ref_to_str");
6530 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6533 err = got_ref_resolve(&id, repo, re->ref);
6536 err = got_object_open_as_tag(&tag, repo, id);
6538 if (err->code != GOT_ERR_OBJ_TYPE) {
6542 /* "lightweight" tag */
6543 err = got_object_open_as_commit(&commit, repo, id);
6548 tagger = got_object_commit_get_committer(commit);
6550 got_object_commit_get_committer_time(commit);
6551 err = got_object_id_str(&id_str, id);
6557 tagger = got_object_tag_get_tagger(tag);
6558 tagger_time = got_object_tag_get_tagger_time(tag);
6559 err = got_object_id_str(&id_str,
6560 got_object_tag_get_object_id(tag));
6564 printf("from: %s\n", tagger);
6565 datestr = get_datestr(&tagger_time, datebuf);
6567 printf("date: %s UTC\n", datestr);
6569 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6571 switch (got_object_tag_get_object_type(tag)) {
6572 case GOT_OBJ_TYPE_BLOB:
6573 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6576 case GOT_OBJ_TYPE_TREE:
6577 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6580 case GOT_OBJ_TYPE_COMMIT:
6581 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6584 case GOT_OBJ_TYPE_TAG:
6585 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6594 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6597 got_object_commit_close(commit);
6599 tagmsg0 = strdup(got_object_tag_get_message(tag));
6600 got_object_tag_close(tag);
6601 if (tagmsg0 == NULL) {
6602 err = got_error_from_errno("strdup");
6609 line = strsep(&tagmsg, "\n");
6611 printf(" %s\n", line);
6616 got_ref_list_free(&refs);
6620 static const struct got_error *
6621 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6622 const char *tag_name, const char *repo_path)
6624 const struct got_error *err = NULL;
6625 char *template = NULL, *initial_content = NULL;
6626 char *editor = NULL;
6627 int initial_content_len;
6630 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6631 err = got_error_from_errno("asprintf");
6635 initial_content_len = asprintf(&initial_content,
6636 "\n# tagging commit %s as %s\n",
6637 commit_id_str, tag_name);
6638 if (initial_content_len == -1) {
6639 err = got_error_from_errno("asprintf");
6643 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6647 if (write(fd, initial_content, initial_content_len) == -1) {
6648 err = got_error_from_errno2("write", *tagmsg_path);
6652 err = get_editor(&editor);
6655 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6656 initial_content_len, 1);
6658 free(initial_content);
6662 if (fd != -1 && close(fd) == -1 && err == NULL)
6663 err = got_error_from_errno2("close", *tagmsg_path);
6665 /* Editor is done; we can now apply unveil(2) */
6667 err = apply_unveil(repo_path, 0, NULL);
6675 static const struct got_error *
6676 add_tag(struct got_repository *repo, const char *tagger,
6677 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6679 const struct got_error *err = NULL;
6680 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6681 char *label = NULL, *commit_id_str = NULL;
6682 struct got_reference *ref = NULL;
6683 char *refname = NULL, *tagmsg = NULL;
6684 char *tagmsg_path = NULL, *tag_id_str = NULL;
6685 int preserve_tagmsg = 0;
6686 struct got_reflist_head refs;
6691 * Don't let the user create a tag name with a leading '-'.
6692 * While technically a valid reference name, this case is usually
6693 * an unintended typo.
6695 if (tag_name[0] == '-')
6696 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6698 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6702 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6703 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6707 err = got_object_id_str(&commit_id_str, commit_id);
6711 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6712 refname = strdup(tag_name);
6713 if (refname == NULL) {
6714 err = got_error_from_errno("strdup");
6718 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6719 err = got_error_from_errno("asprintf");
6723 err = got_ref_open(&ref, repo, refname, 0);
6725 err = got_error(GOT_ERR_TAG_EXISTS);
6727 } else if (err->code != GOT_ERR_NOT_REF)
6730 if (tagmsg_arg == NULL) {
6731 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6732 tag_name, got_repo_get_path(repo));
6734 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6735 tagmsg_path != NULL)
6736 preserve_tagmsg = 1;
6741 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6742 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6745 preserve_tagmsg = 1;
6749 err = got_ref_alloc(&ref, refname, tag_id);
6752 preserve_tagmsg = 1;
6756 err = got_ref_write(ref, repo);
6759 preserve_tagmsg = 1;
6763 err = got_object_id_str(&tag_id_str, tag_id);
6766 preserve_tagmsg = 1;
6769 printf("Created tag %s\n", tag_id_str);
6771 if (preserve_tagmsg) {
6772 fprintf(stderr, "%s: tag message preserved in %s\n",
6773 getprogname(), tagmsg_path);
6774 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6775 err = got_error_from_errno2("unlink", tagmsg_path);
6780 free(commit_id_str);
6784 got_ref_list_free(&refs);
6788 static const struct got_error *
6789 cmd_tag(int argc, char *argv[])
6791 const struct got_error *error = NULL;
6792 struct got_repository *repo = NULL;
6793 struct got_worktree *worktree = NULL;
6794 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6795 char *gitconfig_path = NULL, *tagger = NULL;
6796 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6797 int ch, do_list = 0;
6799 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6802 commit_id_arg = optarg;
6808 repo_path = realpath(optarg, NULL);
6809 if (repo_path == NULL)
6810 return got_error_from_errno2("realpath",
6812 got_path_strip_trailing_slashes(repo_path);
6827 if (commit_id_arg != NULL)
6829 "-c option can only be used when creating a tag");
6831 option_conflict('l', 'm');
6834 } else if (argc != 1)
6840 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6841 "sendfd unveil", NULL) == -1)
6844 cwd = getcwd(NULL, 0);
6846 error = got_error_from_errno("getcwd");
6850 if (repo_path == NULL) {
6851 error = got_worktree_open(&worktree, cwd);
6852 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6858 strdup(got_worktree_get_repo_path(worktree));
6859 if (repo_path == NULL)
6860 error = got_error_from_errno("strdup");
6864 repo_path = strdup(cwd);
6865 if (repo_path == NULL) {
6866 error = got_error_from_errno("strdup");
6874 /* Release work tree lock. */
6875 got_worktree_close(worktree);
6878 error = got_repo_open(&repo, repo_path, NULL);
6882 /* Remove "cpath" promise. */
6883 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6887 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6890 error = list_tags(repo);
6892 error = get_gitconfig_path(&gitconfig_path);
6895 error = got_repo_open(&repo, repo_path, gitconfig_path);
6899 error = get_author(&tagger, repo, worktree);
6903 /* Release work tree lock. */
6904 got_worktree_close(worktree);
6909 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6914 if (commit_id_arg == NULL) {
6915 struct got_reference *head_ref;
6916 struct got_object_id *commit_id;
6917 error = got_ref_open(&head_ref, repo,
6918 worktree ? got_worktree_get_head_ref_name(worktree)
6922 error = got_ref_resolve(&commit_id, repo, head_ref);
6923 got_ref_close(head_ref);
6926 error = got_object_id_str(&commit_id_str, commit_id);
6932 error = add_tag(repo, tagger, tag_name,
6933 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6937 const struct got_error *close_err = got_repo_close(repo);
6942 got_worktree_close(worktree);
6945 free(gitconfig_path);
6946 free(commit_id_str);
6954 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6959 static const struct got_error *
6960 add_progress(void *arg, unsigned char status, const char *path)
6962 while (path[0] == '/')
6964 printf("%c %s\n", status, path);
6968 static const struct got_error *
6969 cmd_add(int argc, char *argv[])
6971 const struct got_error *error = NULL;
6972 struct got_repository *repo = NULL;
6973 struct got_worktree *worktree = NULL;
6975 struct got_pathlist_head paths;
6976 struct got_pathlist_entry *pe;
6977 int ch, can_recurse = 0, no_ignores = 0;
6981 while ((ch = getopt(argc, argv, "IR")) != -1) {
6999 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7006 cwd = getcwd(NULL, 0);
7008 error = got_error_from_errno("getcwd");
7012 error = got_worktree_open(&worktree, cwd);
7014 if (error->code == GOT_ERR_NOT_WORKTREE)
7015 error = wrap_not_worktree_error(error, "add", cwd);
7019 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7024 error = apply_unveil(got_repo_get_path(repo), 1,
7025 got_worktree_get_root_path(worktree));
7029 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7036 TAILQ_FOREACH(pe, &paths, entry) {
7037 if (asprintf(&ondisk_path, "%s/%s",
7038 got_worktree_get_root_path(worktree),
7040 error = got_error_from_errno("asprintf");
7043 if (lstat(ondisk_path, &sb) == -1) {
7044 if (errno == ENOENT) {
7048 error = got_error_from_errno2("lstat",
7054 if (S_ISDIR(sb.st_mode)) {
7055 error = got_error_msg(GOT_ERR_BAD_PATH,
7056 "adding directories requires -R option");
7062 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7063 NULL, repo, no_ignores);
7066 const struct got_error *close_err = got_repo_close(repo);
7071 got_worktree_close(worktree);
7072 TAILQ_FOREACH(pe, &paths, entry)
7073 free((char *)pe->path);
7074 got_pathlist_free(&paths);
7082 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
7083 "path ...\n", getprogname());
7087 static const struct got_error *
7088 print_remove_status(void *arg, unsigned char status,
7089 unsigned char staged_status, const char *path)
7091 while (path[0] == '/')
7093 if (status == GOT_STATUS_NONEXISTENT)
7095 if (status == staged_status && (status == GOT_STATUS_DELETE))
7096 status = GOT_STATUS_NO_CHANGE;
7097 printf("%c%c %s\n", status, staged_status, path);
7101 static const struct got_error *
7102 cmd_remove(int argc, char *argv[])
7104 const struct got_error *error = NULL;
7105 struct got_worktree *worktree = NULL;
7106 struct got_repository *repo = NULL;
7107 const char *status_codes = NULL;
7109 struct got_pathlist_head paths;
7110 struct got_pathlist_entry *pe;
7111 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7112 int ignore_missing_paths = 0;
7116 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7119 delete_local_mods = 1;
7120 ignore_missing_paths = 1;
7129 for (i = 0; i < strlen(optarg); i++) {
7130 switch (optarg[i]) {
7131 case GOT_STATUS_MODIFY:
7132 delete_local_mods = 1;
7134 case GOT_STATUS_MISSING:
7135 ignore_missing_paths = 1;
7138 errx(1, "invalid status code '%c'",
7142 status_codes = optarg;
7154 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7161 cwd = getcwd(NULL, 0);
7163 error = got_error_from_errno("getcwd");
7166 error = got_worktree_open(&worktree, cwd);
7168 if (error->code == GOT_ERR_NOT_WORKTREE)
7169 error = wrap_not_worktree_error(error, "remove", cwd);
7173 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7178 error = apply_unveil(got_repo_get_path(repo), 1,
7179 got_worktree_get_root_path(worktree));
7183 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7190 TAILQ_FOREACH(pe, &paths, entry) {
7191 if (asprintf(&ondisk_path, "%s/%s",
7192 got_worktree_get_root_path(worktree),
7194 error = got_error_from_errno("asprintf");
7197 if (lstat(ondisk_path, &sb) == -1) {
7198 if (errno == ENOENT) {
7202 error = got_error_from_errno2("lstat",
7208 if (S_ISDIR(sb.st_mode)) {
7209 error = got_error_msg(GOT_ERR_BAD_PATH,
7210 "removing directories requires -R option");
7216 error = got_worktree_schedule_delete(worktree, &paths,
7217 delete_local_mods, status_codes, print_remove_status, NULL,
7218 repo, keep_on_disk, ignore_missing_paths);
7221 const struct got_error *close_err = got_repo_close(repo);
7226 got_worktree_close(worktree);
7227 TAILQ_FOREACH(pe, &paths, entry)
7228 free((char *)pe->path);
7229 got_pathlist_free(&paths);
7237 fprintf(stderr, "usage: %s patch [-n] [-p strip-count] "
7238 "[-R] [patchfile]\n", getprogname());
7242 static const struct got_error *
7243 patch_from_stdin(int *patchfd)
7245 const struct got_error *err = NULL;
7247 char *path, buf[BUFSIZ];
7248 sig_t sighup, sigint, sigquit;
7250 err = got_opentemp_named_fd(&path, patchfd,
7251 GOT_TMPDIR_STR "/got-patch");
7257 sighup = signal(SIGHUP, SIG_DFL);
7258 sigint = signal(SIGINT, SIG_DFL);
7259 sigquit = signal(SIGQUIT, SIG_DFL);
7262 r = read(0, buf, sizeof(buf));
7264 err = got_error_from_errno("read");
7269 if (write(*patchfd, buf, r) == -1) {
7270 err = got_error_from_errno("write");
7275 signal(SIGHUP, sighup);
7276 signal(SIGINT, sigint);
7277 signal(SIGQUIT, sigquit);
7279 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7280 err = got_error_from_errno("lseek");
7290 static const struct got_error *
7291 patch_progress(void *arg, const char *old, const char *new,
7292 unsigned char status, const struct got_error *error, long old_from,
7293 long old_lines, long new_from, long new_lines, long offset,
7294 const struct got_error *hunk_err)
7296 const char *path = new == NULL ? old : new;
7298 while (*path == '/')
7302 printf("%c %s\n", status, path);
7305 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7307 if (offset != 0 || hunk_err != NULL) {
7308 printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
7309 old_lines, new_from, new_lines);
7310 if (hunk_err != NULL)
7311 printf("%s\n", hunk_err->msg);
7313 printf("applied with offset %ld\n", offset);
7319 static const struct got_error *
7320 cmd_patch(int argc, char *argv[])
7322 const struct got_error *error = NULL, *close_error = NULL;
7323 struct got_worktree *worktree = NULL;
7324 struct got_repository *repo = NULL;
7327 int ch, nop = 0, strip = -1, reverse = 0;
7330 while ((ch = getopt(argc, argv, "np:R")) != -1) {
7336 strip = strtonum(optarg, 0, INT_MAX, &errstr);
7338 errx(1, "pathname strip count is %s: %s",
7354 error = patch_from_stdin(&patchfd);
7357 } else if (argc == 1) {
7358 patchfd = open(argv[0], O_RDONLY);
7359 if (patchfd == -1) {
7360 error = got_error_from_errno2("open", argv[0]);
7366 if ((cwd = getcwd(NULL, 0)) == NULL) {
7367 error = got_error_from_errno("getcwd");
7371 error = got_worktree_open(&worktree, cwd);
7375 const char *repo_path = got_worktree_get_repo_path(worktree);
7376 error = got_repo_open(&repo, repo_path, NULL);
7380 error = apply_unveil(got_repo_get_path(repo), 0,
7381 got_worktree_get_root_path(worktree));
7386 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock",
7391 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
7392 &patch_progress, NULL, check_cancelled, NULL);
7396 close_error = got_repo_close(repo);
7398 error = close_error;
7400 if (worktree != NULL) {
7401 close_error = got_worktree_close(worktree);
7403 error = close_error;
7412 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7413 "path ...\n", getprogname());
7417 static const struct got_error *
7418 revert_progress(void *arg, unsigned char status, const char *path)
7420 if (status == GOT_STATUS_UNVERSIONED)
7423 while (path[0] == '/')
7425 printf("%c %s\n", status, path);
7429 struct choose_patch_arg {
7430 FILE *patch_script_file;
7434 static const struct got_error *
7435 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7436 int nchanges, const char *action)
7439 size_t linesize = 0;
7443 case GOT_STATUS_ADD:
7444 printf("A %s\n%s this addition? [y/n] ", path, action);
7446 case GOT_STATUS_DELETE:
7447 printf("D %s\n%s this deletion? [y/n] ", path, action);
7449 case GOT_STATUS_MODIFY:
7450 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7451 return got_error_from_errno("fseek");
7452 printf(GOT_COMMIT_SEP_STR);
7453 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7455 if (ferror(patch_file))
7456 return got_error_from_errno("getline");
7457 printf(GOT_COMMIT_SEP_STR);
7458 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7459 path, n, nchanges, action);
7462 return got_error_path(path, GOT_ERR_FILE_STATUS);
7468 static const struct got_error *
7469 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7470 FILE *patch_file, int n, int nchanges)
7472 const struct got_error *err = NULL;
7474 size_t linesize = 0;
7477 struct choose_patch_arg *a = arg;
7479 *choice = GOT_PATCH_CHOICE_NONE;
7481 if (a->patch_script_file) {
7483 err = show_change(status, path, patch_file, n, nchanges,
7487 linelen = getline(&line, &linesize, a->patch_script_file);
7488 if (linelen == -1) {
7489 if (ferror(a->patch_script_file))
7490 return got_error_from_errno("getline");
7493 nl = strchr(line, '\n');
7496 if (strcmp(line, "y") == 0) {
7497 *choice = GOT_PATCH_CHOICE_YES;
7499 } else if (strcmp(line, "n") == 0) {
7500 *choice = GOT_PATCH_CHOICE_NO;
7502 } else if (strcmp(line, "q") == 0 &&
7503 status == GOT_STATUS_MODIFY) {
7504 *choice = GOT_PATCH_CHOICE_QUIT;
7507 printf("invalid response '%s'\n", line);
7512 while (resp != 'y' && resp != 'n' && resp != 'q') {
7513 err = show_change(status, path, patch_file, n, nchanges,
7520 if (status == GOT_STATUS_MODIFY) {
7521 if (resp != 'y' && resp != 'n' && resp != 'q') {
7522 printf("invalid response '%c'\n", resp);
7525 } else if (resp != 'y' && resp != 'n') {
7526 printf("invalid response '%c'\n", resp);
7532 *choice = GOT_PATCH_CHOICE_YES;
7533 else if (resp == 'n')
7534 *choice = GOT_PATCH_CHOICE_NO;
7535 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7536 *choice = GOT_PATCH_CHOICE_QUIT;
7541 static const struct got_error *
7542 cmd_revert(int argc, char *argv[])
7544 const struct got_error *error = NULL;
7545 struct got_worktree *worktree = NULL;
7546 struct got_repository *repo = NULL;
7547 char *cwd = NULL, *path = NULL;
7548 struct got_pathlist_head paths;
7549 struct got_pathlist_entry *pe;
7550 int ch, can_recurse = 0, pflag = 0;
7551 FILE *patch_script_file = NULL;
7552 const char *patch_script_path = NULL;
7553 struct choose_patch_arg cpa;
7557 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7563 patch_script_path = optarg;
7578 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7579 "unveil", NULL) == -1)
7584 if (patch_script_path && !pflag)
7585 errx(1, "-F option can only be used together with -p option");
7587 cwd = getcwd(NULL, 0);
7589 error = got_error_from_errno("getcwd");
7592 error = got_worktree_open(&worktree, cwd);
7594 if (error->code == GOT_ERR_NOT_WORKTREE)
7595 error = wrap_not_worktree_error(error, "revert", cwd);
7599 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7604 if (patch_script_path) {
7605 patch_script_file = fopen(patch_script_path, "re");
7606 if (patch_script_file == NULL) {
7607 error = got_error_from_errno2("fopen",
7612 error = apply_unveil(got_repo_get_path(repo), 1,
7613 got_worktree_get_root_path(worktree));
7617 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7624 TAILQ_FOREACH(pe, &paths, entry) {
7625 if (asprintf(&ondisk_path, "%s/%s",
7626 got_worktree_get_root_path(worktree),
7628 error = got_error_from_errno("asprintf");
7631 if (lstat(ondisk_path, &sb) == -1) {
7632 if (errno == ENOENT) {
7636 error = got_error_from_errno2("lstat",
7642 if (S_ISDIR(sb.st_mode)) {
7643 error = got_error_msg(GOT_ERR_BAD_PATH,
7644 "reverting directories requires -R option");
7650 cpa.patch_script_file = patch_script_file;
7651 cpa.action = "revert";
7652 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7653 pflag ? choose_patch : NULL, &cpa, repo);
7655 if (patch_script_file && fclose(patch_script_file) == EOF &&
7657 error = got_error_from_errno2("fclose", patch_script_path);
7659 const struct got_error *close_err = got_repo_close(repo);
7664 got_worktree_close(worktree);
7673 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
7674 "[path ...]\n", getprogname());
7678 struct collect_commit_logmsg_arg {
7679 const char *cmdline_log;
7680 const char *prepared_log;
7681 int non_interactive;
7683 const char *worktree_path;
7684 const char *branch_name;
7685 const char *repo_path;
7690 static const struct got_error *
7691 read_prepared_logmsg(char **logmsg, const char *path)
7693 const struct got_error *err = NULL;
7699 memset(&sb, 0, sizeof(sb));
7701 f = fopen(path, "re");
7703 return got_error_from_errno2("fopen", path);
7705 if (fstat(fileno(f), &sb) == -1) {
7706 err = got_error_from_errno2("fstat", path);
7709 if (sb.st_size == 0) {
7710 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7714 *logmsg = malloc(sb.st_size + 1);
7715 if (*logmsg == NULL) {
7716 err = got_error_from_errno("malloc");
7720 r = fread(*logmsg, 1, sb.st_size, f);
7721 if (r != sb.st_size) {
7723 err = got_error_from_errno2("fread", path);
7725 err = got_error(GOT_ERR_IO);
7728 (*logmsg)[sb.st_size] = '\0';
7730 if (fclose(f) == EOF && err == NULL)
7731 err = got_error_from_errno2("fclose", path);
7740 static const struct got_error *
7741 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7744 char *initial_content = NULL;
7745 struct got_pathlist_entry *pe;
7746 const struct got_error *err = NULL;
7747 char *template = NULL;
7748 struct collect_commit_logmsg_arg *a = arg;
7749 int initial_content_len;
7753 /* if a message was specified on the command line, just use it */
7754 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7755 len = strlen(a->cmdline_log) + 1;
7756 *logmsg = malloc(len + 1);
7757 if (*logmsg == NULL)
7758 return got_error_from_errno("malloc");
7759 strlcpy(*logmsg, a->cmdline_log, len);
7761 } else if (a->prepared_log != NULL && a->non_interactive)
7762 return read_prepared_logmsg(logmsg, a->prepared_log);
7764 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7765 return got_error_from_errno("asprintf");
7767 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7771 if (a->prepared_log) {
7773 err = read_prepared_logmsg(&msg, a->prepared_log);
7776 if (write(fd, msg, strlen(msg)) == -1) {
7777 err = got_error_from_errno2("write", a->logmsg_path);
7784 initial_content_len = asprintf(&initial_content,
7785 "\n# changes to be committed on branch %s:\n",
7787 if (initial_content_len == -1) {
7788 err = got_error_from_errno("asprintf");
7792 if (write(fd, initial_content, initial_content_len) == -1) {
7793 err = got_error_from_errno2("write", a->logmsg_path);
7797 TAILQ_FOREACH(pe, commitable_paths, entry) {
7798 struct got_commitable *ct = pe->data;
7799 dprintf(fd, "# %c %s\n",
7800 got_commitable_get_status(ct),
7801 got_commitable_get_path(ct));
7804 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7805 initial_content_len, a->prepared_log ? 0 : 1);
7807 free(initial_content);
7810 if (fd != -1 && close(fd) == -1 && err == NULL)
7811 err = got_error_from_errno2("close", a->logmsg_path);
7813 /* Editor is done; we can now apply unveil(2) */
7815 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7823 static const struct got_error *
7824 cmd_commit(int argc, char *argv[])
7826 const struct got_error *error = NULL;
7827 struct got_worktree *worktree = NULL;
7828 struct got_repository *repo = NULL;
7829 char *cwd = NULL, *id_str = NULL;
7830 struct got_object_id *id = NULL;
7831 const char *logmsg = NULL;
7832 char *prepared_logmsg = NULL;
7833 struct collect_commit_logmsg_arg cl_arg;
7834 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7835 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7836 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7837 struct got_pathlist_head paths;
7840 cl_arg.logmsg_path = NULL;
7842 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7846 option_conflict('F', 'm');
7847 prepared_logmsg = realpath(optarg, NULL);
7848 if (prepared_logmsg == NULL)
7849 return got_error_from_errno2("realpath",
7853 if (prepared_logmsg)
7854 option_conflict('m', 'F');
7858 non_interactive = 1;
7861 allow_bad_symlinks = 1;
7873 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7874 "unveil", NULL) == -1)
7877 cwd = getcwd(NULL, 0);
7879 error = got_error_from_errno("getcwd");
7882 error = got_worktree_open(&worktree, cwd);
7884 if (error->code == GOT_ERR_NOT_WORKTREE)
7885 error = wrap_not_worktree_error(error, "commit", cwd);
7889 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7892 if (rebase_in_progress) {
7893 error = got_error(GOT_ERR_REBASING);
7897 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7902 error = get_gitconfig_path(&gitconfig_path);
7905 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7910 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7913 if (merge_in_progress) {
7914 error = got_error(GOT_ERR_MERGE_BUSY);
7918 error = get_author(&author, repo, worktree);
7923 * unveil(2) traverses exec(2); if an editor is used we have
7924 * to apply unveil after the log message has been written.
7926 if (logmsg == NULL || strlen(logmsg) == 0)
7927 error = get_editor(&editor);
7929 error = apply_unveil(got_repo_get_path(repo), 0,
7930 got_worktree_get_root_path(worktree));
7934 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7938 cl_arg.editor = editor;
7939 cl_arg.cmdline_log = logmsg;
7940 cl_arg.prepared_log = prepared_logmsg;
7941 cl_arg.non_interactive = non_interactive;
7942 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7943 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7944 if (!histedit_in_progress) {
7945 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7946 error = got_error(GOT_ERR_COMMIT_BRANCH);
7949 cl_arg.branch_name += 11;
7951 cl_arg.repo_path = got_repo_get_path(repo);
7952 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7953 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7954 print_status, NULL, repo);
7956 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7957 cl_arg.logmsg_path != NULL)
7958 preserve_logmsg = 1;
7962 error = got_object_id_str(&id_str, id);
7965 printf("Created commit %s\n", id_str);
7967 if (preserve_logmsg) {
7968 fprintf(stderr, "%s: log message preserved in %s\n",
7969 getprogname(), cl_arg.logmsg_path);
7970 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7972 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7973 free(cl_arg.logmsg_path);
7975 const struct got_error *close_err = got_repo_close(repo);
7980 got_worktree_close(worktree);
7983 free(gitconfig_path);
7986 free(prepared_logmsg);
7993 fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
7994 "[-r repository-path] [-t tag] [-T] [-q] [-v] "
7995 "[remote-repository]\n", getprogname());
8000 print_load_info(int print_colored, int print_found, int print_trees,
8001 int ncolored, int nfound, int ntrees)
8003 if (print_colored) {
8004 printf("%d commit%s colored", ncolored,
8005 ncolored == 1 ? "" : "s");
8008 printf("%s%d object%s found",
8009 ncolored > 0 ? "; " : "",
8010 nfound, nfound == 1 ? "" : "s");
8013 printf("; %d tree%s scanned", ntrees,
8014 ntrees == 1 ? "" : "s");
8018 struct got_send_progress_arg {
8019 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8026 int last_nobj_total;
8030 int printed_something;
8032 struct got_pathlist_head *delete_branches;
8035 static const struct got_error *
8036 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8037 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8038 int nobj_written, off_t bytes_sent, const char *refname, int success)
8040 struct got_send_progress_arg *a = arg;
8041 char scaled_packsize[FMT_SCALED_STRSIZE];
8042 char scaled_sent[FMT_SCALED_STRSIZE];
8043 int p_deltify = 0, p_written = 0, p_sent = 0;
8044 int print_colored = 0, print_found = 0, print_trees = 0;
8045 int print_searching = 0, print_total = 0;
8046 int print_deltify = 0, print_written = 0, print_sent = 0;
8048 if (a->verbosity < 0)
8052 const char *status = success ? "accepted" : "rejected";
8055 struct got_pathlist_entry *pe;
8056 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8057 const char *branchname = pe->path;
8058 if (got_path_cmp(branchname, refname,
8059 strlen(branchname), strlen(refname)) == 0) {
8061 a->sent_something = 1;
8067 if (a->printed_something)
8069 printf("Server has %s %s", status, refname);
8070 a->printed_something = 1;
8074 if (a->last_ncolored != ncolored) {
8076 a->last_ncolored = ncolored;
8079 if (a->last_nfound != nfound) {
8082 a->last_nfound = nfound;
8085 if (a->last_ntrees != ntrees) {
8089 a->last_ntrees = ntrees;
8092 if ((print_colored || print_found || print_trees) &&
8095 print_load_info(print_colored, print_found, print_trees,
8096 ncolored, nfound, ntrees);
8097 a->printed_something = 1;
8100 } else if (!a->loading_done) {
8102 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8104 a->loading_done = 1;
8107 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8108 return got_error_from_errno("fmt_scaled");
8109 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8110 return got_error_from_errno("fmt_scaled");
8112 if (a->last_ncommits != ncommits) {
8113 print_searching = 1;
8114 a->last_ncommits = ncommits;
8117 if (a->last_nobj_total != nobj_total) {
8118 print_searching = 1;
8120 a->last_nobj_total = nobj_total;
8123 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8124 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8125 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8126 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8127 return got_error(GOT_ERR_NO_SPACE);
8130 if (nobj_deltify > 0 || nobj_written > 0) {
8131 if (nobj_deltify > 0) {
8132 p_deltify = (nobj_deltify * 100) / nobj_total;
8133 if (p_deltify != a->last_p_deltify) {
8134 a->last_p_deltify = p_deltify;
8135 print_searching = 1;
8140 if (nobj_written > 0) {
8141 p_written = (nobj_written * 100) / nobj_total;
8142 if (p_written != a->last_p_written) {
8143 a->last_p_written = p_written;
8144 print_searching = 1;
8152 if (bytes_sent > 0) {
8153 p_sent = (bytes_sent * 100) / packfile_size;
8154 if (p_sent != a->last_p_sent) {
8155 a->last_p_sent = p_sent;
8156 print_searching = 1;
8162 a->sent_something = 1;
8165 if (print_searching || print_total || print_deltify || print_written ||
8168 if (print_searching)
8169 printf("packing %d reference%s", ncommits,
8170 ncommits == 1 ? "" : "s");
8172 printf("; %d object%s", nobj_total,
8173 nobj_total == 1 ? "" : "s");
8175 printf("; deltify: %d%%", p_deltify);
8177 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8178 scaled_packsize, p_sent);
8179 else if (print_written)
8180 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8181 scaled_packsize, p_written);
8182 if (print_searching || print_total || print_deltify ||
8183 print_written || print_sent) {
8184 a->printed_something = 1;
8190 static const struct got_error *
8191 cmd_send(int argc, char *argv[])
8193 const struct got_error *error = NULL;
8194 char *cwd = NULL, *repo_path = NULL;
8195 const char *remote_name;
8196 char *proto = NULL, *host = NULL, *port = NULL;
8197 char *repo_name = NULL, *server_path = NULL;
8198 const struct got_remote_repo *remotes, *remote = NULL;
8199 int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
8200 struct got_repository *repo = NULL;
8201 struct got_worktree *worktree = NULL;
8202 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8203 struct got_pathlist_head branches;
8204 struct got_pathlist_head tags;
8205 struct got_reflist_head all_branches;
8206 struct got_reflist_head all_tags;
8207 struct got_pathlist_head delete_args;
8208 struct got_pathlist_head delete_branches;
8209 struct got_reflist_entry *re;
8210 struct got_pathlist_entry *pe;
8211 int i, ch, sendfd = -1, sendstatus;
8213 struct got_send_progress_arg spa;
8214 int verbosity = 0, overwrite_refs = 0;
8215 int send_all_branches = 0, send_all_tags = 0;
8216 struct got_reference *ref = NULL;
8218 TAILQ_INIT(&branches);
8220 TAILQ_INIT(&all_branches);
8221 TAILQ_INIT(&all_tags);
8222 TAILQ_INIT(&delete_args);
8223 TAILQ_INIT(&delete_branches);
8225 while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8228 send_all_branches = 1;
8231 error = got_pathlist_append(&branches, optarg, NULL);
8237 error = got_pathlist_append(&delete_args, optarg, NULL);
8245 repo_path = realpath(optarg, NULL);
8246 if (repo_path == NULL)
8247 return got_error_from_errno2("realpath",
8249 got_path_strip_trailing_slashes(repo_path);
8252 error = got_pathlist_append(&tags, optarg, NULL);
8263 else if (verbosity < 3)
8277 if (send_all_branches && !TAILQ_EMPTY(&branches))
8278 option_conflict('a', 'b');
8279 if (send_all_tags && !TAILQ_EMPTY(&tags))
8280 option_conflict('T', 't');
8284 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8286 remote_name = argv[0];
8290 cwd = getcwd(NULL, 0);
8292 error = got_error_from_errno("getcwd");
8296 if (repo_path == NULL) {
8297 error = got_worktree_open(&worktree, cwd);
8298 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8304 strdup(got_worktree_get_repo_path(worktree));
8305 if (repo_path == NULL)
8306 error = got_error_from_errno("strdup");
8310 repo_path = strdup(cwd);
8311 if (repo_path == NULL) {
8312 error = got_error_from_errno("strdup");
8318 error = got_repo_open(&repo, repo_path, NULL);
8323 worktree_conf = got_worktree_get_gotconfig(worktree);
8324 if (worktree_conf) {
8325 got_gotconfig_get_remotes(&nremotes, &remotes,
8327 for (i = 0; i < nremotes; i++) {
8328 if (strcmp(remotes[i].name, remote_name) == 0) {
8329 remote = &remotes[i];
8335 if (remote == NULL) {
8336 repo_conf = got_repo_get_gotconfig(repo);
8338 got_gotconfig_get_remotes(&nremotes, &remotes,
8340 for (i = 0; i < nremotes; i++) {
8341 if (strcmp(remotes[i].name, remote_name) == 0) {
8342 remote = &remotes[i];
8348 if (remote == NULL) {
8349 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8350 for (i = 0; i < nremotes; i++) {
8351 if (strcmp(remotes[i].name, remote_name) == 0) {
8352 remote = &remotes[i];
8357 if (remote == NULL) {
8358 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8362 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8363 &repo_name, remote->send_url);
8367 if (strcmp(proto, "git") == 0) {
8369 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8370 "sendfd dns inet unveil", NULL) == -1)
8373 } else if (strcmp(proto, "git+ssh") == 0 ||
8374 strcmp(proto, "ssh") == 0) {
8376 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8377 "sendfd unveil", NULL) == -1)
8380 } else if (strcmp(proto, "http") == 0 ||
8381 strcmp(proto, "git+http") == 0) {
8382 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8385 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8389 error = got_dial_apply_unveil(proto);
8393 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8397 if (send_all_branches) {
8398 error = got_ref_list(&all_branches, repo, "refs/heads",
8399 got_ref_cmp_by_name, NULL);
8402 TAILQ_FOREACH(re, &all_branches, entry) {
8403 const char *branchname = got_ref_get_name(re->ref);
8404 error = got_pathlist_append(&branches,
8410 } else if (nbranches == 0) {
8411 for (i = 0; i < remote->nsend_branches; i++) {
8412 got_pathlist_append(&branches,
8413 remote->send_branches[i], NULL);
8417 if (send_all_tags) {
8418 error = got_ref_list(&all_tags, repo, "refs/tags",
8419 got_ref_cmp_by_name, NULL);
8422 TAILQ_FOREACH(re, &all_tags, entry) {
8423 const char *tagname = got_ref_get_name(re->ref);
8424 error = got_pathlist_append(&tags,
8433 * To prevent accidents only branches in refs/heads/ can be deleted
8434 * with 'got send -d'.
8435 * Deleting anything else requires local repository access or Git.
8437 TAILQ_FOREACH(pe, &delete_args, entry) {
8438 const char *branchname = pe->path;
8440 struct got_pathlist_entry *new;
8441 if (strncmp(branchname, "refs/heads/", 11) == 0) {
8442 s = strdup(branchname);
8444 error = got_error_from_errno("strdup");
8448 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8449 error = got_error_from_errno("asprintf");
8453 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8454 if (error || new == NULL /* duplicate */)
8461 if (nbranches == 0 && ndelete_branches == 0) {
8462 struct got_reference *head_ref;
8464 error = got_ref_open(&head_ref, repo,
8465 got_worktree_get_head_ref_name(worktree), 0);
8467 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8470 if (got_ref_is_symbolic(head_ref)) {
8471 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8472 got_ref_close(head_ref);
8477 error = got_pathlist_append(&branches, got_ref_get_name(ref),
8485 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8486 port ? ":" : "", port ? port : "");
8488 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8489 server_path, verbosity);
8493 memset(&spa, 0, sizeof(spa));
8494 spa.last_scaled_packsize[0] = '\0';
8495 spa.last_p_deltify = -1;
8496 spa.last_p_written = -1;
8497 spa.verbosity = verbosity;
8498 spa.delete_branches = &delete_branches;
8499 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8500 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8501 check_cancelled, NULL);
8502 if (spa.printed_something)
8506 if (!spa.sent_something && verbosity >= 0)
8507 printf("Already up-to-date\n");
8510 if (kill(sendpid, SIGTERM) == -1)
8511 error = got_error_from_errno("kill");
8512 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8513 error = got_error_from_errno("waitpid");
8515 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8516 error = got_error_from_errno("close");
8518 const struct got_error *close_err = got_repo_close(repo);
8523 got_worktree_close(worktree);
8526 got_pathlist_free(&branches);
8527 got_pathlist_free(&tags);
8528 got_ref_list_free(&all_branches);
8529 got_ref_list_free(&all_tags);
8530 got_pathlist_free(&delete_args);
8531 TAILQ_FOREACH(pe, &delete_branches, entry)
8532 free((char *)pe->path);
8533 got_pathlist_free(&delete_branches);
8545 usage_cherrypick(void)
8547 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8551 static const struct got_error *
8552 cmd_cherrypick(int argc, char *argv[])
8554 const struct got_error *error = NULL;
8555 struct got_worktree *worktree = NULL;
8556 struct got_repository *repo = NULL;
8557 char *cwd = NULL, *commit_id_str = NULL;
8558 struct got_object_id *commit_id = NULL;
8559 struct got_commit_object *commit = NULL;
8560 struct got_object_qid *pid;
8562 struct got_update_progress_arg upa;
8564 while ((ch = getopt(argc, argv, "")) != -1) {
8576 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8577 "unveil", NULL) == -1)
8583 cwd = getcwd(NULL, 0);
8585 error = got_error_from_errno("getcwd");
8588 error = got_worktree_open(&worktree, cwd);
8590 if (error->code == GOT_ERR_NOT_WORKTREE)
8591 error = wrap_not_worktree_error(error, "cherrypick",
8596 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8601 error = apply_unveil(got_repo_get_path(repo), 0,
8602 got_worktree_get_root_path(worktree));
8606 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8607 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8610 error = got_object_id_str(&commit_id_str, commit_id);
8614 error = got_object_open_as_commit(&commit, repo, commit_id);
8617 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8618 memset(&upa, 0, sizeof(upa));
8619 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8620 commit_id, repo, update_progress, &upa, check_cancelled,
8625 if (upa.did_something)
8626 printf("Merged commit %s\n", commit_id_str);
8627 print_merge_progress_stats(&upa);
8630 got_object_commit_close(commit);
8631 free(commit_id_str);
8633 got_worktree_close(worktree);
8635 const struct got_error *close_err = got_repo_close(repo);
8645 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
8649 static const struct got_error *
8650 cmd_backout(int argc, char *argv[])
8652 const struct got_error *error = NULL;
8653 struct got_worktree *worktree = NULL;
8654 struct got_repository *repo = NULL;
8655 char *cwd = NULL, *commit_id_str = NULL;
8656 struct got_object_id *commit_id = NULL;
8657 struct got_commit_object *commit = NULL;
8658 struct got_object_qid *pid;
8660 struct got_update_progress_arg upa;
8662 while ((ch = getopt(argc, argv, "")) != -1) {
8674 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8675 "unveil", NULL) == -1)
8681 cwd = getcwd(NULL, 0);
8683 error = got_error_from_errno("getcwd");
8686 error = got_worktree_open(&worktree, cwd);
8688 if (error->code == GOT_ERR_NOT_WORKTREE)
8689 error = wrap_not_worktree_error(error, "backout", cwd);
8693 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8698 error = apply_unveil(got_repo_get_path(repo), 0,
8699 got_worktree_get_root_path(worktree));
8703 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8704 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8707 error = got_object_id_str(&commit_id_str, commit_id);
8711 error = got_object_open_as_commit(&commit, repo, commit_id);
8714 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8716 error = got_error(GOT_ERR_ROOT_COMMIT);
8720 memset(&upa, 0, sizeof(upa));
8721 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8722 repo, update_progress, &upa, check_cancelled, NULL);
8726 if (upa.did_something)
8727 printf("Backed out commit %s\n", commit_id_str);
8728 print_merge_progress_stats(&upa);
8731 got_object_commit_close(commit);
8732 free(commit_id_str);
8734 got_worktree_close(worktree);
8736 const struct got_error *close_err = got_repo_close(repo);
8746 fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
8752 trim_logmsg(char *logmsg, int limit)
8757 len = strlen(logmsg);
8761 nl = strchr(logmsg, '\n');
8766 static const struct got_error *
8767 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
8769 const struct got_error *err;
8770 char *logmsg0 = NULL;
8773 err = got_object_commit_get_logmsg(&logmsg0, commit);
8778 while (isspace((unsigned char)s[0]))
8781 *logmsg = strdup(s);
8782 if (*logmsg == NULL) {
8783 err = got_error_from_errno("strdup");
8787 trim_logmsg(*logmsg, limit);
8793 static const struct got_error *
8794 show_rebase_merge_conflict(struct got_object_id *id,
8795 struct got_repository *repo)
8797 const struct got_error *err;
8798 struct got_commit_object *commit = NULL;
8799 char *id_str = NULL, *logmsg = NULL;
8801 err = got_object_open_as_commit(&commit, repo, id);
8805 err = got_object_id_str(&id_str, id);
8811 err = get_short_logmsg(&logmsg, 42, commit);
8815 printf("%s -> merge conflict: %s\n", id_str, logmsg);
8818 got_object_commit_close(commit);
8823 static const struct got_error *
8824 show_rebase_progress(struct got_commit_object *commit,
8825 struct got_object_id *old_id, struct got_object_id *new_id)
8827 const struct got_error *err;
8828 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8830 err = got_object_id_str(&old_id_str, old_id);
8835 err = got_object_id_str(&new_id_str, new_id);
8840 old_id_str[12] = '\0';
8842 new_id_str[12] = '\0';
8844 err = get_short_logmsg(&logmsg, 42, commit);
8848 printf("%s -> %s: %s\n", old_id_str,
8849 new_id_str ? new_id_str : "no-op change", logmsg);
8857 static const struct got_error *
8858 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
8859 struct got_reference *branch, struct got_reference *new_base_branch,
8860 struct got_reference *tmp_branch, struct got_repository *repo,
8863 printf("Switching work tree to %s\n", got_ref_get_name(branch));
8864 return got_worktree_rebase_complete(worktree, fileindex,
8865 new_base_branch, tmp_branch, branch, repo, create_backup);
8868 static const struct got_error *
8869 rebase_commit(struct got_pathlist_head *merged_paths,
8870 struct got_worktree *worktree, struct got_fileindex *fileindex,
8871 struct got_reference *tmp_branch,
8872 struct got_object_id *commit_id, struct got_repository *repo)
8874 const struct got_error *error;
8875 struct got_commit_object *commit;
8876 struct got_object_id *new_commit_id;
8878 error = got_object_open_as_commit(&commit, repo, commit_id);
8882 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
8883 worktree, fileindex, tmp_branch, commit, commit_id, repo);
8885 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
8887 error = show_rebase_progress(commit, commit_id, NULL);
8889 error = show_rebase_progress(commit, commit_id, new_commit_id);
8890 free(new_commit_id);
8893 got_object_commit_close(commit);
8897 struct check_path_prefix_arg {
8898 const char *path_prefix;
8903 static const struct got_error *
8904 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
8905 struct got_blob_object *blob2, FILE *f1, FILE *f2,
8906 struct got_object_id *id1, struct got_object_id *id2,
8907 const char *path1, const char *path2,
8908 mode_t mode1, mode_t mode2, struct got_repository *repo)
8910 struct check_path_prefix_arg *a = arg;
8912 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
8913 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
8914 return got_error(a->errcode);
8919 static const struct got_error *
8920 check_path_prefix(struct got_object_id *parent_id,
8921 struct got_object_id *commit_id, const char *path_prefix,
8922 int errcode, struct got_repository *repo)
8924 const struct got_error *err;
8925 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
8926 struct got_commit_object *commit = NULL, *parent_commit = NULL;
8927 struct check_path_prefix_arg cpp_arg;
8929 if (got_path_is_root_dir(path_prefix))
8932 err = got_object_open_as_commit(&commit, repo, commit_id);
8936 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
8940 err = got_object_open_as_tree(&tree1, repo,
8941 got_object_commit_get_tree_id(parent_commit));
8945 err = got_object_open_as_tree(&tree2, repo,
8946 got_object_commit_get_tree_id(commit));
8950 cpp_arg.path_prefix = path_prefix;
8951 while (cpp_arg.path_prefix[0] == '/')
8952 cpp_arg.path_prefix++;
8953 cpp_arg.len = strlen(cpp_arg.path_prefix);
8954 cpp_arg.errcode = errcode;
8955 err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
8956 check_path_prefix_in_diff, &cpp_arg, 0);
8959 got_object_tree_close(tree1);
8961 got_object_tree_close(tree2);
8963 got_object_commit_close(commit);
8965 got_object_commit_close(parent_commit);
8969 static const struct got_error *
8970 collect_commits(struct got_object_id_queue *commits,
8971 struct got_object_id *initial_commit_id,
8972 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
8973 const char *path_prefix, int path_prefix_errcode,
8974 struct got_repository *repo)
8976 const struct got_error *err = NULL;
8977 struct got_commit_graph *graph = NULL;
8978 struct got_object_id *parent_id = NULL;
8979 struct got_object_qid *qid;
8980 struct got_object_id *commit_id = initial_commit_id;
8982 err = got_commit_graph_open(&graph, "/", 1);
8986 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
8987 check_cancelled, NULL);
8990 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
8991 err = got_commit_graph_iter_next(&parent_id, graph, repo,
8992 check_cancelled, NULL);
8994 if (err->code == GOT_ERR_ITER_COMPLETED) {
8995 err = got_error_msg(GOT_ERR_ANCESTRY,
8996 "ran out of commits to rebase before "
8997 "youngest common ancestor commit has "
9002 err = check_path_prefix(parent_id, commit_id,
9003 path_prefix, path_prefix_errcode, repo);
9007 err = got_object_qid_alloc(&qid, commit_id);
9010 STAILQ_INSERT_HEAD(commits, qid, entry);
9011 commit_id = parent_id;
9015 got_commit_graph_close(graph);
9019 static const struct got_error *
9020 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9022 const struct got_error *err = NULL;
9023 time_t committer_time;
9025 char datebuf[11]; /* YYYY-MM-DD + NUL */
9026 char *author0 = NULL, *author, *smallerthan;
9027 char *logmsg0 = NULL, *logmsg, *newline;
9029 committer_time = got_object_commit_get_committer_time(commit);
9030 if (gmtime_r(&committer_time, &tm) == NULL)
9031 return got_error_from_errno("gmtime_r");
9032 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9033 return got_error(GOT_ERR_NO_SPACE);
9035 author0 = strdup(got_object_commit_get_author(commit));
9036 if (author0 == NULL)
9037 return got_error_from_errno("strdup");
9039 smallerthan = strchr(author, '<');
9040 if (smallerthan && smallerthan[1] != '\0')
9041 author = smallerthan + 1;
9042 author[strcspn(author, "@>")] = '\0';
9044 err = got_object_commit_get_logmsg(&logmsg0, commit);
9048 while (*logmsg == '\n')
9050 newline = strchr(logmsg, '\n');
9054 if (asprintf(brief_str, "%s %s %s",
9055 datebuf, author, logmsg) == -1)
9056 err = got_error_from_errno("asprintf");
9063 static const struct got_error *
9064 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9065 struct got_repository *repo)
9067 const struct got_error *err;
9070 err = got_object_id_str(&id_str, id);
9074 err = got_ref_delete(ref, repo);
9078 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
9084 static const struct got_error *
9085 print_backup_ref(const char *branch_name, const char *new_id_str,
9086 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
9087 struct got_reflist_object_id_map *refs_idmap,
9088 struct got_repository *repo)
9090 const struct got_error *err = NULL;
9091 struct got_reflist_head *refs;
9092 char *refs_str = NULL;
9093 struct got_object_id *new_commit_id = NULL;
9094 struct got_commit_object *new_commit = NULL;
9095 char *new_commit_brief_str = NULL;
9096 struct got_object_id *yca_id = NULL;
9097 struct got_commit_object *yca_commit = NULL;
9098 char *yca_id_str = NULL, *yca_brief_str = NULL;
9099 char *custom_refs_str;
9101 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9102 return got_error_from_errno("asprintf");
9104 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9105 0, 0, refs_idmap, custom_refs_str);
9109 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9113 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9115 err = build_refs_str(&refs_str, refs, new_commit_id, repo);
9120 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9124 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9128 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9129 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9133 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9134 refs_str ? " (" : "", refs_str ? refs_str : "",
9135 refs_str ? ")" : "", new_commit_brief_str);
9136 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9137 got_object_id_cmp(yca_id, old_commit_id) != 0) {
9141 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9145 err = get_commit_brief_str(&yca_brief_str, yca_commit);
9149 err = got_object_id_str(&yca_id_str, yca_id);
9153 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9155 err = build_refs_str(&refs_str, refs, yca_id, repo);
9159 printf("history forked at %s%s%s%s\n %s\n",
9161 refs_str ? " (" : "", refs_str ? refs_str : "",
9162 refs_str ? ")" : "", yca_brief_str);
9165 free(custom_refs_str);
9166 free(new_commit_id);
9170 free(yca_brief_str);
9172 got_object_commit_close(new_commit);
9174 got_object_commit_close(yca_commit);
9179 static const struct got_error *
9180 process_backup_refs(const char *backup_ref_prefix,
9181 const char *wanted_branch_name,
9182 int delete, struct got_repository *repo)
9184 const struct got_error *err;
9185 struct got_reflist_head refs, backup_refs;
9186 struct got_reflist_entry *re;
9187 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9188 struct got_object_id *old_commit_id = NULL;
9189 char *branch_name = NULL;
9190 struct got_commit_object *old_commit = NULL;
9191 struct got_reflist_object_id_map *refs_idmap = NULL;
9192 int wanted_branch_found = 0;
9195 TAILQ_INIT(&backup_refs);
9197 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9201 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9205 if (wanted_branch_name) {
9206 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9207 wanted_branch_name += 11;
9210 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9211 got_ref_cmp_by_commit_timestamp_descending, repo);
9215 TAILQ_FOREACH(re, &backup_refs, entry) {
9216 const char *refname = got_ref_get_name(re->ref);
9219 err = check_cancelled(NULL);
9223 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9227 err = got_object_open_as_commit(&old_commit, repo,
9232 if (strncmp(backup_ref_prefix, refname,
9233 backup_ref_prefix_len) == 0)
9234 refname += backup_ref_prefix_len;
9236 while (refname[0] == '/')
9239 branch_name = strdup(refname);
9240 if (branch_name == NULL) {
9241 err = got_error_from_errno("strdup");
9244 slash = strrchr(branch_name, '/');
9247 refname += strlen(branch_name) + 1;
9250 if (wanted_branch_name == NULL ||
9251 strcmp(wanted_branch_name, branch_name) == 0) {
9252 wanted_branch_found = 1;
9254 err = delete_backup_ref(re->ref,
9255 old_commit_id, repo);
9257 err = print_backup_ref(branch_name, refname,
9258 old_commit_id, old_commit, refs_idmap,
9265 free(old_commit_id);
9266 old_commit_id = NULL;
9269 got_object_commit_close(old_commit);
9273 if (wanted_branch_name && !wanted_branch_found) {
9274 err = got_error_fmt(GOT_ERR_NOT_REF,
9275 "%s/%s/", backup_ref_prefix, wanted_branch_name);
9279 got_reflist_object_id_map_free(refs_idmap);
9280 got_ref_list_free(&refs);
9281 got_ref_list_free(&backup_refs);
9282 free(old_commit_id);
9285 got_object_commit_close(old_commit);
9289 static const struct got_error *
9290 abort_progress(void *arg, unsigned char status, const char *path)
9293 * Unversioned files should not clutter progress output when
9294 * an operation is aborted.
9296 if (status == GOT_STATUS_UNVERSIONED)
9299 return update_progress(arg, status, path);
9302 static const struct got_error *
9303 cmd_rebase(int argc, char *argv[])
9305 const struct got_error *error = NULL;
9306 struct got_worktree *worktree = NULL;
9307 struct got_repository *repo = NULL;
9308 struct got_fileindex *fileindex = NULL;
9310 struct got_reference *branch = NULL;
9311 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9312 struct got_object_id *commit_id = NULL, *parent_id = NULL;
9313 struct got_object_id *resume_commit_id = NULL;
9314 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9315 struct got_commit_object *commit = NULL;
9316 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9317 int histedit_in_progress = 0, merge_in_progress = 0;
9318 int create_backup = 1, list_backups = 0, delete_backups = 0;
9319 struct got_object_id_queue commits;
9320 struct got_pathlist_head merged_paths;
9321 const struct got_object_id_queue *parent_ids;
9322 struct got_object_qid *qid, *pid;
9323 struct got_update_progress_arg upa;
9325 STAILQ_INIT(&commits);
9326 TAILQ_INIT(&merged_paths);
9327 memset(&upa, 0, sizeof(upa));
9329 while ((ch = getopt(argc, argv, "aclX")) != -1) {
9335 continue_rebase = 1;
9353 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9354 "unveil", NULL) == -1)
9359 option_conflict('l', 'a');
9360 if (continue_rebase)
9361 option_conflict('l', 'c');
9363 option_conflict('l', 'X');
9364 if (argc != 0 && argc != 1)
9366 } else if (delete_backups) {
9368 option_conflict('X', 'a');
9369 if (continue_rebase)
9370 option_conflict('X', 'c');
9372 option_conflict('l', 'X');
9373 if (argc != 0 && argc != 1)
9376 if (abort_rebase && continue_rebase)
9378 else if (abort_rebase || continue_rebase) {
9381 } else if (argc != 1)
9385 cwd = getcwd(NULL, 0);
9387 error = got_error_from_errno("getcwd");
9390 error = got_worktree_open(&worktree, cwd);
9392 if (list_backups || delete_backups) {
9393 if (error->code != GOT_ERR_NOT_WORKTREE)
9396 if (error->code == GOT_ERR_NOT_WORKTREE)
9397 error = wrap_not_worktree_error(error,
9403 error = got_repo_open(&repo,
9404 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
9408 error = apply_unveil(got_repo_get_path(repo), 0,
9409 worktree ? got_worktree_get_root_path(worktree) : NULL);
9413 if (list_backups || delete_backups) {
9414 error = process_backup_refs(
9415 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9416 argc == 1 ? argv[0] : NULL, delete_backups, repo);
9417 goto done; /* nothing else to do */
9420 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9424 if (histedit_in_progress) {
9425 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9429 error = got_worktree_merge_in_progress(&merge_in_progress,
9433 if (merge_in_progress) {
9434 error = got_error(GOT_ERR_MERGE_BUSY);
9438 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9443 if (!rebase_in_progress) {
9444 error = got_error(GOT_ERR_NOT_REBASING);
9447 error = got_worktree_rebase_continue(&resume_commit_id,
9448 &new_base_branch, &tmp_branch, &branch, &fileindex,
9452 printf("Switching work tree to %s\n",
9453 got_ref_get_symref_target(new_base_branch));
9454 error = got_worktree_rebase_abort(worktree, fileindex, repo,
9455 new_base_branch, abort_progress, &upa);
9458 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9459 print_merge_progress_stats(&upa);
9460 goto done; /* nothing else to do */
9463 if (continue_rebase) {
9464 if (!rebase_in_progress) {
9465 error = got_error(GOT_ERR_NOT_REBASING);
9468 error = got_worktree_rebase_continue(&resume_commit_id,
9469 &new_base_branch, &tmp_branch, &branch, &fileindex,
9474 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9475 resume_commit_id, repo);
9479 yca_id = got_object_id_dup(resume_commit_id);
9480 if (yca_id == NULL) {
9481 error = got_error_from_errno("got_object_id_dup");
9485 error = got_ref_open(&branch, repo, argv[0], 0);
9490 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9494 if (!continue_rebase) {
9495 struct got_object_id *base_commit_id;
9497 base_commit_id = got_worktree_get_base_commit_id(worktree);
9498 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9499 base_commit_id, branch_head_commit_id, 1, repo,
9500 check_cancelled, NULL);
9503 if (yca_id == NULL) {
9504 error = got_error_msg(GOT_ERR_ANCESTRY,
9505 "specified branch shares no common ancestry "
9506 "with work tree's branch");
9510 error = check_same_branch(base_commit_id, branch, yca_id, repo);
9512 if (error->code != GOT_ERR_ANCESTRY)
9516 struct got_pathlist_head paths;
9517 printf("%s is already based on %s\n",
9518 got_ref_get_name(branch),
9519 got_worktree_get_head_ref_name(worktree));
9520 error = switch_head_ref(branch, branch_head_commit_id,
9524 error = got_worktree_set_base_commit_id(worktree, repo,
9525 branch_head_commit_id);
9529 error = got_pathlist_append(&paths, "", NULL);
9532 error = got_worktree_checkout_files(worktree,
9533 &paths, repo, update_progress, &upa,
9534 check_cancelled, NULL);
9535 got_pathlist_free(&paths);
9538 if (upa.did_something) {
9540 error = got_object_id_str(&id_str,
9541 branch_head_commit_id);
9544 printf("Updated to %s: %s\n",
9545 got_worktree_get_head_ref_name(worktree),
9549 printf("Already up-to-date\n");
9550 print_update_progress_stats(&upa);
9555 commit_id = branch_head_commit_id;
9556 error = got_object_open_as_commit(&commit, repo, commit_id);
9560 parent_ids = got_object_commit_get_parent_ids(commit);
9561 pid = STAILQ_FIRST(parent_ids);
9563 error = got_error(GOT_ERR_EMPTY_REBASE);
9566 error = collect_commits(&commits, commit_id, &pid->id,
9567 yca_id, got_worktree_get_path_prefix(worktree),
9568 GOT_ERR_REBASE_PATH, repo);
9569 got_object_commit_close(commit);
9574 if (!continue_rebase) {
9575 error = got_worktree_rebase_prepare(&new_base_branch,
9576 &tmp_branch, &fileindex, worktree, branch, repo);
9581 if (STAILQ_EMPTY(&commits)) {
9582 if (continue_rebase) {
9583 error = rebase_complete(worktree, fileindex,
9584 branch, new_base_branch, tmp_branch, repo,
9588 /* Fast-forward the reference of the branch. */
9589 struct got_object_id *new_head_commit_id;
9591 error = got_ref_resolve(&new_head_commit_id, repo,
9595 error = got_object_id_str(&id_str, new_head_commit_id);
9596 printf("Forwarding %s to commit %s\n",
9597 got_ref_get_name(branch), id_str);
9599 error = got_ref_change_ref(branch,
9600 new_head_commit_id);
9603 /* No backup needed since objects did not change. */
9609 STAILQ_FOREACH(qid, &commits, entry) {
9611 commit_id = &qid->id;
9612 parent_id = pid ? &pid->id : yca_id;
9615 memset(&upa, 0, sizeof(upa));
9616 error = got_worktree_rebase_merge_files(&merged_paths,
9617 worktree, fileindex, parent_id, commit_id, repo,
9618 update_progress, &upa, check_cancelled, NULL);
9622 print_merge_progress_stats(&upa);
9623 if (upa.conflicts > 0 || upa.missing > 0 ||
9624 upa.not_deleted > 0 || upa.unversioned > 0) {
9625 if (upa.conflicts > 0) {
9626 error = show_rebase_merge_conflict(&qid->id,
9631 got_worktree_rebase_pathlist_free(&merged_paths);
9635 error = rebase_commit(&merged_paths, worktree, fileindex,
9636 tmp_branch, commit_id, repo);
9637 got_worktree_rebase_pathlist_free(&merged_paths);
9642 if (upa.conflicts > 0 || upa.missing > 0 ||
9643 upa.not_deleted > 0 || upa.unversioned > 0) {
9644 error = got_worktree_rebase_postpone(worktree, fileindex);
9647 if (upa.conflicts > 0 && upa.missing == 0 &&
9648 upa.not_deleted == 0 && upa.unversioned == 0) {
9649 error = got_error_msg(GOT_ERR_CONFLICTS,
9650 "conflicts must be resolved before rebasing "
9652 } else if (upa.conflicts > 0) {
9653 error = got_error_msg(GOT_ERR_CONFLICTS,
9654 "conflicts must be resolved before rebasing "
9655 "can continue; changes destined for some "
9656 "files were not yet merged and should be "
9657 "merged manually if required before the "
9658 "rebase operation is continued");
9660 error = got_error_msg(GOT_ERR_CONFLICTS,
9661 "changes destined for some files were not "
9662 "yet merged and should be merged manually "
9663 "if required before the rebase operation "
9667 error = rebase_complete(worktree, fileindex, branch,
9668 new_base_branch, tmp_branch, repo, create_backup);
9670 got_object_id_queue_free(&commits);
9671 free(branch_head_commit_id);
9672 free(resume_commit_id);
9675 got_object_commit_close(commit);
9677 got_ref_close(branch);
9678 if (new_base_branch)
9679 got_ref_close(new_base_branch);
9681 got_ref_close(tmp_branch);
9683 got_worktree_close(worktree);
9685 const struct got_error *close_err = got_repo_close(repo);
9693 usage_histedit(void)
9695 fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
9696 "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
9701 #define GOT_HISTEDIT_PICK 'p'
9702 #define GOT_HISTEDIT_EDIT 'e'
9703 #define GOT_HISTEDIT_FOLD 'f'
9704 #define GOT_HISTEDIT_DROP 'd'
9705 #define GOT_HISTEDIT_MESG 'm'
9707 static const struct got_histedit_cmd {
9711 } got_histedit_cmds[] = {
9712 { GOT_HISTEDIT_PICK, "pick", "use commit" },
9713 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
9714 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
9716 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
9717 { GOT_HISTEDIT_MESG, "mesg",
9718 "single-line log message for commit above (open editor if empty)" },
9721 struct got_histedit_list_entry {
9722 TAILQ_ENTRY(got_histedit_list_entry) entry;
9723 struct got_object_id *commit_id;
9724 const struct got_histedit_cmd *cmd;
9727 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
9729 static const struct got_error *
9730 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
9731 FILE *f, struct got_repository *repo)
9733 const struct got_error *err = NULL;
9734 char *logmsg = NULL, *id_str = NULL;
9735 struct got_commit_object *commit = NULL;
9738 err = got_object_open_as_commit(&commit, repo, commit_id);
9742 err = get_short_logmsg(&logmsg, 34, commit);
9746 err = got_object_id_str(&id_str, commit_id);
9750 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
9752 err = got_ferror(f, GOT_ERR_IO);
9755 got_object_commit_close(commit);
9761 static const struct got_error *
9762 histedit_write_commit_list(struct got_object_id_queue *commits,
9763 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
9764 struct got_repository *repo)
9766 const struct got_error *err = NULL;
9767 struct got_object_qid *qid;
9768 const char *histedit_cmd = NULL;
9770 if (STAILQ_EMPTY(commits))
9771 return got_error(GOT_ERR_EMPTY_HISTEDIT);
9773 STAILQ_FOREACH(qid, commits, entry) {
9774 histedit_cmd = got_histedit_cmds[0].name;
9776 histedit_cmd = "edit";
9777 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
9778 histedit_cmd = "fold";
9779 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
9782 if (edit_logmsg_only) {
9783 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
9785 err = got_ferror(f, GOT_ERR_IO);
9794 static const struct got_error *
9795 write_cmd_list(FILE *f, const char *branch_name,
9796 struct got_object_id_queue *commits)
9798 const struct got_error *err = NULL;
9802 struct got_object_qid *qid;
9804 qid = STAILQ_FIRST(commits);
9805 err = got_object_id_str(&id_str, &qid->id);
9810 "# Editing the history of branch '%s' starting at\n"
9812 "# Commits will be processed in order from top to "
9813 "bottom of this file.\n", branch_name, id_str);
9815 err = got_ferror(f, GOT_ERR_IO);
9819 n = fprintf(f, "# Available histedit commands:\n");
9821 err = got_ferror(f, GOT_ERR_IO);
9825 for (i = 0; i < nitems(got_histedit_cmds); i++) {
9826 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
9827 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
9830 err = got_ferror(f, GOT_ERR_IO);
9839 static const struct got_error *
9840 histedit_syntax_error(int lineno)
9842 static char msg[42];
9845 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
9847 if (ret == -1 || ret >= sizeof(msg))
9848 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
9850 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
9853 static const struct got_error *
9854 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
9855 char *logmsg, struct got_repository *repo)
9857 const struct got_error *err;
9858 struct got_commit_object *folded_commit = NULL;
9859 char *id_str, *folded_logmsg = NULL;
9861 err = got_object_id_str(&id_str, hle->commit_id);
9865 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
9869 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
9872 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
9873 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
9874 folded_logmsg) == -1) {
9875 err = got_error_from_errno("asprintf");
9879 got_object_commit_close(folded_commit);
9881 free(folded_logmsg);
9885 static struct got_histedit_list_entry *
9886 get_folded_commits(struct got_histedit_list_entry *hle)
9888 struct got_histedit_list_entry *prev, *folded = NULL;
9890 prev = TAILQ_PREV(hle, got_histedit_list, entry);
9891 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
9892 prev->cmd->code == GOT_HISTEDIT_DROP)) {
9893 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
9895 prev = TAILQ_PREV(prev, got_histedit_list, entry);
9901 static const struct got_error *
9902 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
9903 struct got_repository *repo)
9905 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
9906 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
9907 const struct got_error *err = NULL;
9908 struct got_commit_object *commit = NULL;
9911 struct got_histedit_list_entry *folded = NULL;
9913 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9917 folded = get_folded_commits(hle);
9919 while (folded != hle) {
9920 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
9921 folded = TAILQ_NEXT(folded, entry);
9924 err = append_folded_commit_msg(&new_msg, folded,
9930 folded = TAILQ_NEXT(folded, entry);
9934 err = got_object_id_str(&id_str, hle->commit_id);
9937 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
9940 logmsg_len = asprintf(&new_msg,
9941 "%s\n# original log message of commit %s: %s",
9942 logmsg ? logmsg : "", id_str, orig_logmsg);
9943 if (logmsg_len == -1) {
9944 err = got_error_from_errno("asprintf");
9950 err = got_object_id_str(&id_str, hle->commit_id);
9954 err = got_opentemp_named_fd(&logmsg_path, &fd,
9955 GOT_TMPDIR_STR "/got-logmsg");
9959 write(fd, logmsg, logmsg_len);
9962 err = get_editor(&editor);
9966 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
9969 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
9972 hle->logmsg = strdup(new_msg);
9973 if (hle->logmsg == NULL)
9974 err = got_error_from_errno("strdup");
9977 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
9978 err = got_error_from_errno2("unlink", logmsg_path);
9984 got_object_commit_close(commit);
9988 static const struct got_error *
9989 histedit_parse_list(struct got_histedit_list *histedit_cmds,
9990 FILE *f, struct got_repository *repo)
9992 const struct got_error *err = NULL;
9993 char *line = NULL, *p, *end;
9997 const struct got_histedit_cmd *cmd;
9998 struct got_object_id *commit_id = NULL;
9999 struct got_histedit_list_entry *hle = NULL;
10002 len = getline(&line, &size, f);
10004 const struct got_error *getline_err;
10007 getline_err = got_error_from_errno("getline");
10008 err = got_ferror(f, getline_err->code);
10013 while (isspace((unsigned char)p[0]))
10015 if (p[0] == '#' || p[0] == '\0') {
10021 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10022 cmd = &got_histedit_cmds[i];
10023 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10024 isspace((unsigned char)p[strlen(cmd->name)])) {
10025 p += strlen(cmd->name);
10028 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
10033 if (i == nitems(got_histedit_cmds)) {
10034 err = histedit_syntax_error(lineno);
10037 while (isspace((unsigned char)p[0]))
10039 if (cmd->code == GOT_HISTEDIT_MESG) {
10040 if (hle == NULL || hle->logmsg != NULL) {
10041 err = got_error(GOT_ERR_HISTEDIT_CMD);
10044 if (p[0] == '\0') {
10045 err = histedit_edit_logmsg(hle, repo);
10049 hle->logmsg = strdup(p);
10050 if (hle->logmsg == NULL) {
10051 err = got_error_from_errno("strdup");
10060 while (end[0] && !isspace((unsigned char)end[0]))
10064 err = got_object_resolve_id_str(&commit_id, repo, p);
10066 /* override error code */
10067 err = histedit_syntax_error(lineno);
10071 hle = malloc(sizeof(*hle));
10073 err = got_error_from_errno("malloc");
10077 hle->commit_id = commit_id;
10078 hle->logmsg = NULL;
10082 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10090 static const struct got_error *
10091 histedit_check_script(struct got_histedit_list *histedit_cmds,
10092 struct got_object_id_queue *commits, struct got_repository *repo)
10094 const struct got_error *err = NULL;
10095 struct got_object_qid *qid;
10096 struct got_histedit_list_entry *hle;
10097 static char msg[92];
10100 if (TAILQ_EMPTY(histedit_cmds))
10101 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10102 "histedit script contains no commands");
10103 if (STAILQ_EMPTY(commits))
10104 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10106 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10107 struct got_histedit_list_entry *hle2;
10108 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10111 if (got_object_id_cmp(hle->commit_id,
10112 hle2->commit_id) != 0)
10114 err = got_object_id_str(&id_str, hle->commit_id);
10117 snprintf(msg, sizeof(msg), "commit %s is listed "
10118 "more than once in histedit script", id_str);
10120 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10124 STAILQ_FOREACH(qid, commits, entry) {
10125 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10126 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
10130 err = got_object_id_str(&id_str, &qid->id);
10133 snprintf(msg, sizeof(msg),
10134 "commit %s missing from histedit script", id_str);
10136 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10140 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10141 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10142 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10143 "last commit in histedit script cannot be folded");
10148 static const struct got_error *
10149 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10150 const char *path, struct got_object_id_queue *commits,
10151 struct got_repository *repo)
10153 const struct got_error *err = NULL;
10157 err = get_editor(&editor);
10161 if (spawn_editor(editor, path) == -1) {
10162 err = got_error_from_errno("failed spawning editor");
10166 f = fopen(path, "re");
10168 err = got_error_from_errno("fopen");
10171 err = histedit_parse_list(histedit_cmds, f, repo);
10175 err = histedit_check_script(histedit_cmds, commits, repo);
10177 if (f && fclose(f) == EOF && err == NULL)
10178 err = got_error_from_errno("fclose");
10183 static const struct got_error *
10184 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10185 struct got_object_id_queue *, const char *, const char *,
10186 struct got_repository *);
10188 static const struct got_error *
10189 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10190 struct got_object_id_queue *commits, const char *branch_name,
10191 int edit_logmsg_only, int fold_only, int edit_only,
10192 struct got_repository *repo)
10194 const struct got_error *err;
10198 err = got_opentemp_named(&path, &f, "got-histedit");
10202 err = write_cmd_list(f, branch_name, commits);
10206 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10207 fold_only, edit_only, repo);
10211 if (edit_logmsg_only || fold_only || edit_only) {
10213 err = histedit_parse_list(histedit_cmds, f, repo);
10215 if (fclose(f) == EOF) {
10216 err = got_error_from_errno("fclose");
10220 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10222 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10223 err->code != GOT_ERR_HISTEDIT_CMD)
10225 err = histedit_edit_list_retry(histedit_cmds, err,
10226 commits, path, branch_name, repo);
10230 if (f && fclose(f) == EOF && err == NULL)
10231 err = got_error_from_errno("fclose");
10232 if (path && unlink(path) != 0 && err == NULL)
10233 err = got_error_from_errno2("unlink", path);
10238 static const struct got_error *
10239 histedit_save_list(struct got_histedit_list *histedit_cmds,
10240 struct got_worktree *worktree, struct got_repository *repo)
10242 const struct got_error *err = NULL;
10245 struct got_histedit_list_entry *hle;
10246 struct got_commit_object *commit = NULL;
10248 err = got_worktree_get_histedit_script_path(&path, worktree);
10252 f = fopen(path, "we");
10254 err = got_error_from_errno2("fopen", path);
10257 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10258 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10264 int n = fprintf(f, "%c %s\n",
10265 GOT_HISTEDIT_MESG, hle->logmsg);
10267 err = got_ferror(f, GOT_ERR_IO);
10273 if (f && fclose(f) == EOF && err == NULL)
10274 err = got_error_from_errno("fclose");
10277 got_object_commit_close(commit);
10282 histedit_free_list(struct got_histedit_list *histedit_cmds)
10284 struct got_histedit_list_entry *hle;
10286 while ((hle = TAILQ_FIRST(histedit_cmds))) {
10287 TAILQ_REMOVE(histedit_cmds, hle, entry);
10292 static const struct got_error *
10293 histedit_load_list(struct got_histedit_list *histedit_cmds,
10294 const char *path, struct got_repository *repo)
10296 const struct got_error *err = NULL;
10299 f = fopen(path, "re");
10301 err = got_error_from_errno2("fopen", path);
10305 err = histedit_parse_list(histedit_cmds, f, repo);
10307 if (f && fclose(f) == EOF && err == NULL)
10308 err = got_error_from_errno("fclose");
10312 static const struct got_error *
10313 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10314 const struct got_error *edit_err, struct got_object_id_queue *commits,
10315 const char *path, const char *branch_name, struct got_repository *repo)
10317 const struct got_error *err = NULL, *prev_err = edit_err;
10320 while (resp != 'c' && resp != 'r' && resp != 'a') {
10321 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10322 "or (a)bort: ", getprogname(), prev_err->msg);
10327 histedit_free_list(histedit_cmds);
10328 err = histedit_run_editor(histedit_cmds, path, commits,
10331 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10332 err->code != GOT_ERR_HISTEDIT_CMD)
10339 } else if (resp == 'r') {
10340 histedit_free_list(histedit_cmds);
10341 err = histedit_edit_script(histedit_cmds,
10342 commits, branch_name, 0, 0, 0, repo);
10344 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10345 err->code != GOT_ERR_HISTEDIT_CMD)
10352 } else if (resp == 'a') {
10353 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10356 printf("invalid response '%c'\n", resp);
10362 static const struct got_error *
10363 histedit_complete(struct got_worktree *worktree,
10364 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10365 struct got_reference *branch, struct got_repository *repo)
10367 printf("Switching work tree to %s\n",
10368 got_ref_get_symref_target(branch));
10369 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10373 static const struct got_error *
10374 show_histedit_progress(struct got_commit_object *commit,
10375 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10377 const struct got_error *err;
10378 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10380 err = got_object_id_str(&old_id_str, hle->commit_id);
10385 err = got_object_id_str(&new_id_str, new_id);
10390 old_id_str[12] = '\0';
10392 new_id_str[12] = '\0';
10395 logmsg = strdup(hle->logmsg);
10396 if (logmsg == NULL) {
10397 err = got_error_from_errno("strdup");
10400 trim_logmsg(logmsg, 42);
10402 err = get_short_logmsg(&logmsg, 42, commit);
10407 switch (hle->cmd->code) {
10408 case GOT_HISTEDIT_PICK:
10409 case GOT_HISTEDIT_EDIT:
10410 printf("%s -> %s: %s\n", old_id_str,
10411 new_id_str ? new_id_str : "no-op change", logmsg);
10413 case GOT_HISTEDIT_DROP:
10414 case GOT_HISTEDIT_FOLD:
10415 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
10427 static const struct got_error *
10428 histedit_commit(struct got_pathlist_head *merged_paths,
10429 struct got_worktree *worktree, struct got_fileindex *fileindex,
10430 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10431 struct got_repository *repo)
10433 const struct got_error *err;
10434 struct got_commit_object *commit;
10435 struct got_object_id *new_commit_id;
10437 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10438 && hle->logmsg == NULL) {
10439 err = histedit_edit_logmsg(hle, repo);
10444 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10448 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10449 worktree, fileindex, tmp_branch, commit, hle->commit_id,
10450 hle->logmsg, repo);
10452 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10454 err = show_histedit_progress(commit, hle, NULL);
10456 err = show_histedit_progress(commit, hle, new_commit_id);
10457 free(new_commit_id);
10460 got_object_commit_close(commit);
10464 static const struct got_error *
10465 histedit_skip_commit(struct got_histedit_list_entry *hle,
10466 struct got_worktree *worktree, struct got_repository *repo)
10468 const struct got_error *error;
10469 struct got_commit_object *commit;
10471 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10476 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10480 error = show_histedit_progress(commit, hle, NULL);
10481 got_object_commit_close(commit);
10485 static const struct got_error *
10486 check_local_changes(void *arg, unsigned char status,
10487 unsigned char staged_status, const char *path,
10488 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10489 struct got_object_id *commit_id, int dirfd, const char *de_name)
10491 int *have_local_changes = arg;
10494 case GOT_STATUS_ADD:
10495 case GOT_STATUS_DELETE:
10496 case GOT_STATUS_MODIFY:
10497 case GOT_STATUS_CONFLICT:
10498 *have_local_changes = 1;
10499 return got_error(GOT_ERR_CANCELLED);
10504 switch (staged_status) {
10505 case GOT_STATUS_ADD:
10506 case GOT_STATUS_DELETE:
10507 case GOT_STATUS_MODIFY:
10508 *have_local_changes = 1;
10509 return got_error(GOT_ERR_CANCELLED);
10517 static const struct got_error *
10518 cmd_histedit(int argc, char *argv[])
10520 const struct got_error *error = NULL;
10521 struct got_worktree *worktree = NULL;
10522 struct got_fileindex *fileindex = NULL;
10523 struct got_repository *repo = NULL;
10525 struct got_reference *branch = NULL;
10526 struct got_reference *tmp_branch = NULL;
10527 struct got_object_id *resume_commit_id = NULL;
10528 struct got_object_id *base_commit_id = NULL;
10529 struct got_object_id *head_commit_id = NULL;
10530 struct got_commit_object *commit = NULL;
10531 int ch, rebase_in_progress = 0, merge_in_progress = 0;
10532 struct got_update_progress_arg upa;
10533 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10534 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10535 int list_backups = 0, delete_backups = 0;
10536 const char *edit_script_path = NULL;
10537 struct got_object_id_queue commits;
10538 struct got_pathlist_head merged_paths;
10539 const struct got_object_id_queue *parent_ids;
10540 struct got_object_qid *pid;
10541 struct got_histedit_list histedit_cmds;
10542 struct got_histedit_list_entry *hle;
10544 STAILQ_INIT(&commits);
10545 TAILQ_INIT(&histedit_cmds);
10546 TAILQ_INIT(&merged_paths);
10547 memset(&upa, 0, sizeof(upa));
10549 while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10564 edit_script_path = optarg;
10567 edit_logmsg_only = 1;
10573 delete_backups = 1;
10585 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10586 "unveil", NULL) == -1)
10589 if (abort_edit && continue_edit)
10590 option_conflict('a', 'c');
10591 if (edit_script_path && edit_logmsg_only)
10592 option_conflict('F', 'm');
10593 if (abort_edit && edit_logmsg_only)
10594 option_conflict('a', 'm');
10595 if (continue_edit && edit_logmsg_only)
10596 option_conflict('c', 'm');
10597 if (abort_edit && fold_only)
10598 option_conflict('a', 'f');
10599 if (continue_edit && fold_only)
10600 option_conflict('c', 'f');
10601 if (fold_only && edit_logmsg_only)
10602 option_conflict('f', 'm');
10603 if (edit_script_path && fold_only)
10604 option_conflict('F', 'f');
10605 if (abort_edit && edit_only)
10606 option_conflict('a', 'e');
10607 if (continue_edit && edit_only)
10608 option_conflict('c', 'e');
10609 if (edit_only && edit_logmsg_only)
10610 option_conflict('e', 'm');
10611 if (edit_script_path && edit_only)
10612 option_conflict('F', 'e');
10613 if (list_backups) {
10615 option_conflict('l', 'a');
10617 option_conflict('l', 'c');
10618 if (edit_script_path)
10619 option_conflict('l', 'F');
10620 if (edit_logmsg_only)
10621 option_conflict('l', 'm');
10623 option_conflict('l', 'f');
10625 option_conflict('l', 'e');
10626 if (delete_backups)
10627 option_conflict('l', 'X');
10628 if (argc != 0 && argc != 1)
10630 } else if (delete_backups) {
10632 option_conflict('X', 'a');
10634 option_conflict('X', 'c');
10635 if (edit_script_path)
10636 option_conflict('X', 'F');
10637 if (edit_logmsg_only)
10638 option_conflict('X', 'm');
10640 option_conflict('X', 'f');
10642 option_conflict('X', 'e');
10644 option_conflict('X', 'l');
10645 if (argc != 0 && argc != 1)
10647 } else if (argc != 0)
10651 * This command cannot apply unveil(2) in all cases because the
10652 * user may choose to run an editor to edit the histedit script
10653 * and to edit individual commit log messages.
10654 * unveil(2) traverses exec(2); if an editor is used we have to
10655 * apply unveil after edit script and log messages have been written.
10656 * XXX TODO: Make use of unveil(2) where possible.
10659 cwd = getcwd(NULL, 0);
10661 error = got_error_from_errno("getcwd");
10664 error = got_worktree_open(&worktree, cwd);
10666 if (list_backups || delete_backups) {
10667 if (error->code != GOT_ERR_NOT_WORKTREE)
10670 if (error->code == GOT_ERR_NOT_WORKTREE)
10671 error = wrap_not_worktree_error(error,
10677 if (list_backups || delete_backups) {
10678 error = got_repo_open(&repo,
10679 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10683 error = apply_unveil(got_repo_get_path(repo), 0,
10684 worktree ? got_worktree_get_root_path(worktree) : NULL);
10687 error = process_backup_refs(
10688 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
10689 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10690 goto done; /* nothing else to do */
10693 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10698 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10701 if (rebase_in_progress) {
10702 error = got_error(GOT_ERR_REBASING);
10706 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10710 if (merge_in_progress) {
10711 error = got_error(GOT_ERR_MERGE_BUSY);
10715 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
10719 if (edit_in_progress && edit_logmsg_only) {
10720 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10721 "histedit operation is in progress in this "
10722 "work tree and must be continued or aborted "
10723 "before the -m option can be used");
10726 if (edit_in_progress && fold_only) {
10727 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10728 "histedit operation is in progress in this "
10729 "work tree and must be continued or aborted "
10730 "before the -f option can be used");
10733 if (edit_in_progress && edit_only) {
10734 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10735 "histedit operation is in progress in this "
10736 "work tree and must be continued or aborted "
10737 "before the -e option can be used");
10741 if (edit_in_progress && abort_edit) {
10742 error = got_worktree_histedit_continue(&resume_commit_id,
10743 &tmp_branch, &branch, &base_commit_id, &fileindex,
10747 printf("Switching work tree to %s\n",
10748 got_ref_get_symref_target(branch));
10749 error = got_worktree_histedit_abort(worktree, fileindex, repo,
10750 branch, base_commit_id, abort_progress, &upa);
10753 printf("Histedit of %s aborted\n",
10754 got_ref_get_symref_target(branch));
10755 print_merge_progress_stats(&upa);
10756 goto done; /* nothing else to do */
10757 } else if (abort_edit) {
10758 error = got_error(GOT_ERR_NOT_HISTEDIT);
10762 if (continue_edit) {
10765 if (!edit_in_progress) {
10766 error = got_error(GOT_ERR_NOT_HISTEDIT);
10770 error = got_worktree_get_histedit_script_path(&path, worktree);
10774 error = histedit_load_list(&histedit_cmds, path, repo);
10779 error = got_worktree_histedit_continue(&resume_commit_id,
10780 &tmp_branch, &branch, &base_commit_id, &fileindex,
10785 error = got_ref_resolve(&head_commit_id, repo, branch);
10789 error = got_object_open_as_commit(&commit, repo,
10793 parent_ids = got_object_commit_get_parent_ids(commit);
10794 pid = STAILQ_FIRST(parent_ids);
10796 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10799 error = collect_commits(&commits, head_commit_id, &pid->id,
10800 base_commit_id, got_worktree_get_path_prefix(worktree),
10801 GOT_ERR_HISTEDIT_PATH, repo);
10802 got_object_commit_close(commit);
10807 if (edit_in_progress) {
10808 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10812 error = got_ref_open(&branch, repo,
10813 got_worktree_get_head_ref_name(worktree), 0);
10817 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10818 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10819 "will not edit commit history of a branch outside "
10820 "the \"refs/heads/\" reference namespace");
10824 error = got_ref_resolve(&head_commit_id, repo, branch);
10825 got_ref_close(branch);
10830 error = got_object_open_as_commit(&commit, repo,
10834 parent_ids = got_object_commit_get_parent_ids(commit);
10835 pid = STAILQ_FIRST(parent_ids);
10837 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10840 error = collect_commits(&commits, head_commit_id, &pid->id,
10841 got_worktree_get_base_commit_id(worktree),
10842 got_worktree_get_path_prefix(worktree),
10843 GOT_ERR_HISTEDIT_PATH, repo);
10844 got_object_commit_close(commit);
10849 if (STAILQ_EMPTY(&commits)) {
10850 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10854 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
10855 &base_commit_id, &fileindex, worktree, repo);
10859 if (edit_script_path) {
10860 error = histedit_load_list(&histedit_cmds,
10861 edit_script_path, repo);
10863 got_worktree_histedit_abort(worktree, fileindex,
10864 repo, branch, base_commit_id,
10865 abort_progress, &upa);
10866 print_merge_progress_stats(&upa);
10870 const char *branch_name;
10871 branch_name = got_ref_get_symref_target(branch);
10872 if (strncmp(branch_name, "refs/heads/", 11) == 0)
10874 error = histedit_edit_script(&histedit_cmds, &commits,
10875 branch_name, edit_logmsg_only, fold_only,
10878 got_worktree_histedit_abort(worktree, fileindex,
10879 repo, branch, base_commit_id,
10880 abort_progress, &upa);
10881 print_merge_progress_stats(&upa);
10887 error = histedit_save_list(&histedit_cmds, worktree,
10890 got_worktree_histedit_abort(worktree, fileindex,
10891 repo, branch, base_commit_id,
10892 abort_progress, &upa);
10893 print_merge_progress_stats(&upa);
10899 error = histedit_check_script(&histedit_cmds, &commits, repo);
10903 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
10904 if (resume_commit_id) {
10905 if (got_object_id_cmp(hle->commit_id,
10906 resume_commit_id) != 0)
10909 resume_commit_id = NULL;
10910 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
10911 hle->cmd->code == GOT_HISTEDIT_FOLD) {
10912 error = histedit_skip_commit(hle, worktree,
10917 struct got_pathlist_head paths;
10918 int have_changes = 0;
10920 TAILQ_INIT(&paths);
10921 error = got_pathlist_append(&paths, "", NULL);
10924 error = got_worktree_status(worktree, &paths,
10925 repo, 0, check_local_changes, &have_changes,
10926 check_cancelled, NULL);
10927 got_pathlist_free(&paths);
10929 if (error->code != GOT_ERR_CANCELLED)
10931 if (sigint_received || sigpipe_received)
10934 if (have_changes) {
10935 error = histedit_commit(NULL, worktree,
10936 fileindex, tmp_branch, hle, repo);
10940 error = got_object_open_as_commit(
10941 &commit, repo, hle->commit_id);
10944 error = show_histedit_progress(commit,
10946 got_object_commit_close(commit);
10955 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
10956 error = histedit_skip_commit(hle, worktree, repo);
10962 error = got_object_open_as_commit(&commit, repo,
10966 parent_ids = got_object_commit_get_parent_ids(commit);
10967 pid = STAILQ_FIRST(parent_ids);
10969 error = got_worktree_histedit_merge_files(&merged_paths,
10970 worktree, fileindex, &pid->id, hle->commit_id, repo,
10971 update_progress, &upa, check_cancelled, NULL);
10974 got_object_commit_close(commit);
10977 print_merge_progress_stats(&upa);
10978 if (upa.conflicts > 0 || upa.missing > 0 ||
10979 upa.not_deleted > 0 || upa.unversioned > 0) {
10980 if (upa.conflicts > 0) {
10981 error = show_rebase_merge_conflict(
10982 hle->commit_id, repo);
10986 got_worktree_rebase_pathlist_free(&merged_paths);
10990 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
10992 error = got_object_id_str(&id_str, hle->commit_id);
10995 printf("Stopping histedit for amending commit %s\n",
10998 got_worktree_rebase_pathlist_free(&merged_paths);
10999 error = got_worktree_histedit_postpone(worktree,
11004 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11005 error = histedit_skip_commit(hle, worktree, repo);
11011 error = histedit_commit(&merged_paths, worktree, fileindex,
11012 tmp_branch, hle, repo);
11013 got_worktree_rebase_pathlist_free(&merged_paths);
11018 if (upa.conflicts > 0 || upa.missing > 0 ||
11019 upa.not_deleted > 0 || upa.unversioned > 0) {
11020 error = got_worktree_histedit_postpone(worktree, fileindex);
11023 if (upa.conflicts > 0 && upa.missing == 0 &&
11024 upa.not_deleted == 0 && upa.unversioned == 0) {
11025 error = got_error_msg(GOT_ERR_CONFLICTS,
11026 "conflicts must be resolved before histedit "
11028 } else if (upa.conflicts > 0) {
11029 error = got_error_msg(GOT_ERR_CONFLICTS,
11030 "conflicts must be resolved before histedit "
11031 "can continue; changes destined for some "
11032 "files were not yet merged and should be "
11033 "merged manually if required before the "
11034 "histedit operation is continued");
11036 error = got_error_msg(GOT_ERR_CONFLICTS,
11037 "changes destined for some files were not "
11038 "yet merged and should be merged manually "
11039 "if required before the histedit operation "
11043 error = histedit_complete(worktree, fileindex, tmp_branch,
11046 got_object_id_queue_free(&commits);
11047 histedit_free_list(&histedit_cmds);
11048 free(head_commit_id);
11049 free(base_commit_id);
11050 free(resume_commit_id);
11052 got_object_commit_close(commit);
11054 got_ref_close(branch);
11056 got_ref_close(tmp_branch);
11058 got_worktree_close(worktree);
11060 const struct got_error *close_err = got_repo_close(repo);
11068 usage_integrate(void)
11070 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
11074 static const struct got_error *
11075 cmd_integrate(int argc, char *argv[])
11077 const struct got_error *error = NULL;
11078 struct got_repository *repo = NULL;
11079 struct got_worktree *worktree = NULL;
11080 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
11081 const char *branch_arg = NULL;
11082 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11083 struct got_fileindex *fileindex = NULL;
11084 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11086 struct got_update_progress_arg upa;
11088 while ((ch = getopt(argc, argv, "")) != -1) {
11101 branch_arg = argv[0];
11103 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11104 "unveil", NULL) == -1)
11107 cwd = getcwd(NULL, 0);
11109 error = got_error_from_errno("getcwd");
11113 error = got_worktree_open(&worktree, cwd);
11115 if (error->code == GOT_ERR_NOT_WORKTREE)
11116 error = wrap_not_worktree_error(error, "integrate",
11121 error = check_rebase_or_histedit_in_progress(worktree);
11125 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11130 error = apply_unveil(got_repo_get_path(repo), 0,
11131 got_worktree_get_root_path(worktree));
11135 error = check_merge_in_progress(worktree, repo);
11139 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11140 error = got_error_from_errno("asprintf");
11144 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11145 &base_branch_ref, worktree, refname, repo);
11149 refname = strdup(got_ref_get_name(branch_ref));
11150 if (refname == NULL) {
11151 error = got_error_from_errno("strdup");
11152 got_worktree_integrate_abort(worktree, fileindex, repo,
11153 branch_ref, base_branch_ref);
11156 base_refname = strdup(got_ref_get_name(base_branch_ref));
11157 if (base_refname == NULL) {
11158 error = got_error_from_errno("strdup");
11159 got_worktree_integrate_abort(worktree, fileindex, repo,
11160 branch_ref, base_branch_ref);
11164 error = got_ref_resolve(&commit_id, repo, branch_ref);
11168 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11172 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11173 error = got_error_msg(GOT_ERR_SAME_BRANCH,
11174 "specified branch has already been integrated");
11175 got_worktree_integrate_abort(worktree, fileindex, repo,
11176 branch_ref, base_branch_ref);
11180 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11182 if (error->code == GOT_ERR_ANCESTRY)
11183 error = got_error(GOT_ERR_REBASE_REQUIRED);
11184 got_worktree_integrate_abort(worktree, fileindex, repo,
11185 branch_ref, base_branch_ref);
11189 memset(&upa, 0, sizeof(upa));
11190 error = got_worktree_integrate_continue(worktree, fileindex, repo,
11191 branch_ref, base_branch_ref, update_progress, &upa,
11192 check_cancelled, NULL);
11196 printf("Integrated %s into %s\n", refname, base_refname);
11197 print_update_progress_stats(&upa);
11200 const struct got_error *close_err = got_repo_close(repo);
11205 got_worktree_close(worktree);
11207 free(base_commit_id);
11210 free(base_refname);
11217 fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11222 static const struct got_error *
11223 cmd_merge(int argc, char *argv[])
11225 const struct got_error *error = NULL;
11226 struct got_worktree *worktree = NULL;
11227 struct got_repository *repo = NULL;
11228 struct got_fileindex *fileindex = NULL;
11229 char *cwd = NULL, *id_str = NULL, *author = NULL;
11230 struct got_reference *branch = NULL, *wt_branch = NULL;
11231 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11232 struct got_object_id *wt_branch_tip = NULL;
11233 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11234 int interrupt_merge = 0;
11235 struct got_update_progress_arg upa;
11236 struct got_object_id *merge_commit_id = NULL;
11237 char *branch_name = NULL;
11239 memset(&upa, 0, sizeof(upa));
11241 while ((ch = getopt(argc, argv, "acn")) != -1) {
11247 continue_merge = 1;
11250 interrupt_merge = 1;
11262 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11263 "unveil", NULL) == -1)
11267 if (abort_merge && continue_merge)
11268 option_conflict('a', 'c');
11269 if (abort_merge || continue_merge) {
11272 } else if (argc != 1)
11275 cwd = getcwd(NULL, 0);
11277 error = got_error_from_errno("getcwd");
11281 error = got_worktree_open(&worktree, cwd);
11283 if (error->code == GOT_ERR_NOT_WORKTREE)
11284 error = wrap_not_worktree_error(error,
11289 error = got_repo_open(&repo,
11290 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
11294 error = apply_unveil(got_repo_get_path(repo), 0,
11295 worktree ? got_worktree_get_root_path(worktree) : NULL);
11299 error = check_rebase_or_histedit_in_progress(worktree);
11303 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11309 if (!merge_in_progress) {
11310 error = got_error(GOT_ERR_NOT_MERGING);
11313 error = got_worktree_merge_continue(&branch_name,
11314 &branch_tip, &fileindex, worktree, repo);
11317 error = got_worktree_merge_abort(worktree, fileindex, repo,
11318 abort_progress, &upa);
11321 printf("Merge of %s aborted\n", branch_name);
11322 goto done; /* nothing else to do */
11325 error = get_author(&author, repo, worktree);
11329 if (continue_merge) {
11330 if (!merge_in_progress) {
11331 error = got_error(GOT_ERR_NOT_MERGING);
11334 error = got_worktree_merge_continue(&branch_name,
11335 &branch_tip, &fileindex, worktree, repo);
11339 error = got_ref_open(&branch, repo, argv[0], 0);
11342 branch_name = strdup(got_ref_get_name(branch));
11343 if (branch_name == NULL) {
11344 error = got_error_from_errno("strdup");
11347 error = got_ref_resolve(&branch_tip, repo, branch);
11352 error = got_ref_open(&wt_branch, repo,
11353 got_worktree_get_head_ref_name(worktree), 0);
11356 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11359 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11360 wt_branch_tip, branch_tip, 0, repo,
11361 check_cancelled, NULL);
11362 if (error && error->code != GOT_ERR_ANCESTRY)
11365 if (!continue_merge) {
11366 error = check_path_prefix(wt_branch_tip, branch_tip,
11367 got_worktree_get_path_prefix(worktree),
11368 GOT_ERR_MERGE_PATH, repo);
11372 error = check_same_branch(wt_branch_tip, branch,
11375 if (error->code != GOT_ERR_ANCESTRY)
11379 static char msg[512];
11380 snprintf(msg, sizeof(msg),
11381 "cannot create a merge commit because "
11382 "%s is based on %s; %s can be integrated "
11383 "with 'got integrate' instead", branch_name,
11384 got_worktree_get_head_ref_name(worktree),
11386 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11390 error = got_worktree_merge_prepare(&fileindex, worktree,
11395 error = got_worktree_merge_branch(worktree, fileindex,
11396 yca_id, branch_tip, repo, update_progress, &upa,
11397 check_cancelled, NULL);
11400 print_merge_progress_stats(&upa);
11401 if (!upa.did_something) {
11402 error = got_worktree_merge_abort(worktree, fileindex,
11403 repo, abort_progress, &upa);
11406 printf("Already up-to-date\n");
11411 if (interrupt_merge) {
11412 error = got_worktree_merge_postpone(worktree, fileindex);
11415 printf("Merge of %s interrupted on request\n", branch_name);
11416 } else if (upa.conflicts > 0 || upa.missing > 0 ||
11417 upa.not_deleted > 0 || upa.unversioned > 0) {
11418 error = got_worktree_merge_postpone(worktree, fileindex);
11421 if (upa.conflicts > 0 && upa.missing == 0 &&
11422 upa.not_deleted == 0 && upa.unversioned == 0) {
11423 error = got_error_msg(GOT_ERR_CONFLICTS,
11424 "conflicts must be resolved before merging "
11426 } else if (upa.conflicts > 0) {
11427 error = got_error_msg(GOT_ERR_CONFLICTS,
11428 "conflicts must be resolved before merging "
11429 "can continue; changes destined for some "
11430 "files were not yet merged and "
11431 "should be merged manually if required before the "
11432 "merge operation is continued");
11434 error = got_error_msg(GOT_ERR_CONFLICTS,
11435 "changes destined for some "
11436 "files were not yet merged and should be "
11437 "merged manually if required before the "
11438 "merge operation is continued");
11442 error = got_worktree_merge_commit(&merge_commit_id, worktree,
11443 fileindex, author, NULL, 1, branch_tip, branch_name,
11444 repo, continue_merge ? print_status : NULL, NULL);
11447 error = got_worktree_merge_complete(worktree, fileindex, repo);
11450 error = got_object_id_str(&id_str, merge_commit_id);
11453 printf("Merged %s into %s: %s\n", branch_name,
11454 got_worktree_get_head_ref_name(worktree),
11460 free(merge_commit_id);
11466 got_ref_close(branch);
11468 got_ref_close(wt_branch);
11470 got_worktree_close(worktree);
11472 const struct got_error *close_err = got_repo_close(repo);
11482 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11483 "[-S] [file-path ...]\n",
11488 static const struct got_error *
11489 print_stage(void *arg, unsigned char status, unsigned char staged_status,
11490 const char *path, struct got_object_id *blob_id,
11491 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11492 int dirfd, const char *de_name)
11494 const struct got_error *err = NULL;
11495 char *id_str = NULL;
11497 if (staged_status != GOT_STATUS_ADD &&
11498 staged_status != GOT_STATUS_MODIFY &&
11499 staged_status != GOT_STATUS_DELETE)
11502 if (staged_status == GOT_STATUS_ADD ||
11503 staged_status == GOT_STATUS_MODIFY)
11504 err = got_object_id_str(&id_str, staged_blob_id);
11506 err = got_object_id_str(&id_str, blob_id);
11510 printf("%s %c %s\n", id_str, staged_status, path);
11515 static const struct got_error *
11516 cmd_stage(int argc, char *argv[])
11518 const struct got_error *error = NULL;
11519 struct got_repository *repo = NULL;
11520 struct got_worktree *worktree = NULL;
11522 struct got_pathlist_head paths;
11523 struct got_pathlist_entry *pe;
11524 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11525 FILE *patch_script_file = NULL;
11526 const char *patch_script_path = NULL;
11527 struct choose_patch_arg cpa;
11529 TAILQ_INIT(&paths);
11531 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11540 patch_script_path = optarg;
11543 allow_bad_symlinks = 1;
11555 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11556 "unveil", NULL) == -1)
11559 if (list_stage && (pflag || patch_script_path))
11560 errx(1, "-l option cannot be used with other options");
11561 if (patch_script_path && !pflag)
11562 errx(1, "-F option can only be used together with -p option");
11564 cwd = getcwd(NULL, 0);
11566 error = got_error_from_errno("getcwd");
11570 error = got_worktree_open(&worktree, cwd);
11572 if (error->code == GOT_ERR_NOT_WORKTREE)
11573 error = wrap_not_worktree_error(error, "stage", cwd);
11577 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11582 if (patch_script_path) {
11583 patch_script_file = fopen(patch_script_path, "re");
11584 if (patch_script_file == NULL) {
11585 error = got_error_from_errno2("fopen",
11586 patch_script_path);
11590 error = apply_unveil(got_repo_get_path(repo), 0,
11591 got_worktree_get_root_path(worktree));
11595 error = check_merge_in_progress(worktree, repo);
11599 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11604 error = got_worktree_status(worktree, &paths, repo, 0,
11605 print_stage, NULL, check_cancelled, NULL);
11607 cpa.patch_script_file = patch_script_file;
11608 cpa.action = "stage";
11609 error = got_worktree_stage(worktree, &paths,
11610 pflag ? NULL : print_status, NULL,
11611 pflag ? choose_patch : NULL, &cpa,
11612 allow_bad_symlinks, repo);
11615 if (patch_script_file && fclose(patch_script_file) == EOF &&
11617 error = got_error_from_errno2("fclose", patch_script_path);
11619 const struct got_error *close_err = got_repo_close(repo);
11624 got_worktree_close(worktree);
11625 TAILQ_FOREACH(pe, &paths, entry)
11626 free((char *)pe->path);
11627 got_pathlist_free(&paths);
11633 usage_unstage(void)
11635 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
11636 "[file-path ...]\n",
11642 static const struct got_error *
11643 cmd_unstage(int argc, char *argv[])
11645 const struct got_error *error = NULL;
11646 struct got_repository *repo = NULL;
11647 struct got_worktree *worktree = NULL;
11649 struct got_pathlist_head paths;
11650 struct got_pathlist_entry *pe;
11652 struct got_update_progress_arg upa;
11653 FILE *patch_script_file = NULL;
11654 const char *patch_script_path = NULL;
11655 struct choose_patch_arg cpa;
11657 TAILQ_INIT(&paths);
11659 while ((ch = getopt(argc, argv, "pF:")) != -1) {
11665 patch_script_path = optarg;
11677 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11678 "unveil", NULL) == -1)
11681 if (patch_script_path && !pflag)
11682 errx(1, "-F option can only be used together with -p option");
11684 cwd = getcwd(NULL, 0);
11686 error = got_error_from_errno("getcwd");
11690 error = got_worktree_open(&worktree, cwd);
11692 if (error->code == GOT_ERR_NOT_WORKTREE)
11693 error = wrap_not_worktree_error(error, "unstage", cwd);
11697 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11702 if (patch_script_path) {
11703 patch_script_file = fopen(patch_script_path, "re");
11704 if (patch_script_file == NULL) {
11705 error = got_error_from_errno2("fopen",
11706 patch_script_path);
11711 error = apply_unveil(got_repo_get_path(repo), 0,
11712 got_worktree_get_root_path(worktree));
11716 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11720 cpa.patch_script_file = patch_script_file;
11721 cpa.action = "unstage";
11722 memset(&upa, 0, sizeof(upa));
11723 error = got_worktree_unstage(worktree, &paths, update_progress,
11724 &upa, pflag ? choose_patch : NULL, &cpa, repo);
11726 print_merge_progress_stats(&upa);
11728 if (patch_script_file && fclose(patch_script_file) == EOF &&
11730 error = got_error_from_errno2("fclose", patch_script_path);
11732 const struct got_error *close_err = got_repo_close(repo);
11737 got_worktree_close(worktree);
11738 TAILQ_FOREACH(pe, &paths, entry)
11739 free((char *)pe->path);
11740 got_pathlist_free(&paths);
11748 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
11749 "arg1 [arg2 ...]\n", getprogname());
11753 static const struct got_error *
11754 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11756 const struct got_error *err;
11757 struct got_blob_object *blob;
11759 err = got_object_open_as_blob(&blob, repo, id, 8192);
11763 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
11764 got_object_blob_close(blob);
11768 static const struct got_error *
11769 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11771 const struct got_error *err;
11772 struct got_tree_object *tree;
11775 err = got_object_open_as_tree(&tree, repo, id);
11779 nentries = got_object_tree_get_nentries(tree);
11780 for (i = 0; i < nentries; i++) {
11781 struct got_tree_entry *te;
11783 if (sigint_received || sigpipe_received)
11785 te = got_object_tree_get_entry(tree, i);
11786 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
11789 fprintf(outfile, "%s %.7o %s\n", id_str,
11790 got_tree_entry_get_mode(te),
11791 got_tree_entry_get_name(te));
11795 got_object_tree_close(tree);
11800 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
11810 h = (long long)gmtoff / 3600;
11811 m = ((long long)gmtoff - h*3600) / 60;
11812 snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
11815 static const struct got_error *
11816 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11818 const struct got_error *err;
11819 struct got_commit_object *commit;
11820 const struct got_object_id_queue *parent_ids;
11821 struct got_object_qid *pid;
11822 char *id_str = NULL;
11823 const char *logmsg = NULL;
11826 err = got_object_open_as_commit(&commit, repo, id);
11830 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
11834 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
11835 parent_ids = got_object_commit_get_parent_ids(commit);
11836 fprintf(outfile, "numparents %d\n",
11837 got_object_commit_get_nparents(commit));
11838 STAILQ_FOREACH(pid, parent_ids, entry) {
11840 err = got_object_id_str(&pid_str, &pid->id);
11843 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
11846 format_gmtoff(gmtoff, sizeof(gmtoff),
11847 got_object_commit_get_author_gmtoff(commit));
11848 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
11849 got_object_commit_get_author(commit),
11850 (long long)got_object_commit_get_author_time(commit),
11853 format_gmtoff(gmtoff, sizeof(gmtoff),
11854 got_object_commit_get_committer_gmtoff(commit));
11855 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
11856 got_object_commit_get_author(commit),
11857 (long long)got_object_commit_get_committer_time(commit),
11860 logmsg = got_object_commit_get_logmsg_raw(commit);
11861 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
11862 fprintf(outfile, "%s", logmsg);
11865 got_object_commit_close(commit);
11869 static const struct got_error *
11870 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11872 const struct got_error *err;
11873 struct got_tag_object *tag;
11874 char *id_str = NULL;
11875 const char *tagmsg = NULL;
11878 err = got_object_open_as_tag(&tag, repo, id);
11882 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
11886 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
11888 switch (got_object_tag_get_object_type(tag)) {
11889 case GOT_OBJ_TYPE_BLOB:
11890 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11891 GOT_OBJ_LABEL_BLOB);
11893 case GOT_OBJ_TYPE_TREE:
11894 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11895 GOT_OBJ_LABEL_TREE);
11897 case GOT_OBJ_TYPE_COMMIT:
11898 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11899 GOT_OBJ_LABEL_COMMIT);
11901 case GOT_OBJ_TYPE_TAG:
11902 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11903 GOT_OBJ_LABEL_TAG);
11909 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
11910 got_object_tag_get_name(tag));
11912 format_gmtoff(gmtoff, sizeof(gmtoff),
11913 got_object_tag_get_tagger_gmtoff(tag));
11914 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
11915 got_object_tag_get_tagger(tag),
11916 (long long)got_object_tag_get_tagger_time(tag),
11919 tagmsg = got_object_tag_get_message(tag);
11920 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
11921 fprintf(outfile, "%s", tagmsg);
11924 got_object_tag_close(tag);
11928 static const struct got_error *
11929 cmd_cat(int argc, char *argv[])
11931 const struct got_error *error;
11932 struct got_repository *repo = NULL;
11933 struct got_worktree *worktree = NULL;
11934 char *cwd = NULL, *repo_path = NULL, *label = NULL;
11935 const char *commit_id_str = NULL;
11936 struct got_object_id *id = NULL, *commit_id = NULL;
11937 struct got_commit_object *commit = NULL;
11938 int ch, obj_type, i, force_path = 0;
11939 struct got_reflist_head refs;
11944 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
11949 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
11952 commit_id_str = optarg;
11955 repo_path = realpath(optarg, NULL);
11956 if (repo_path == NULL)
11957 return got_error_from_errno2("realpath",
11959 got_path_strip_trailing_slashes(repo_path);
11973 cwd = getcwd(NULL, 0);
11975 error = got_error_from_errno("getcwd");
11979 if (repo_path == NULL) {
11980 error = got_worktree_open(&worktree, cwd);
11981 if (error && error->code != GOT_ERR_NOT_WORKTREE)
11984 repo_path = strdup(
11985 got_worktree_get_repo_path(worktree));
11986 if (repo_path == NULL) {
11987 error = got_error_from_errno("strdup");
11991 /* Release work tree lock. */
11992 got_worktree_close(worktree);
11997 if (repo_path == NULL) {
11998 repo_path = strdup(cwd);
11999 if (repo_path == NULL)
12000 return got_error_from_errno("strdup");
12003 error = got_repo_open(&repo, repo_path, NULL);
12008 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
12012 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
12016 if (commit_id_str == NULL)
12017 commit_id_str = GOT_REF_HEAD;
12018 error = got_repo_match_object_id(&commit_id, NULL,
12019 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
12023 error = got_object_open_as_commit(&commit, repo, commit_id);
12027 for (i = 0; i < argc; i++) {
12029 error = got_object_id_by_path(&id, repo, commit,
12034 error = got_repo_match_object_id(&id, &label, argv[i],
12035 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
12038 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
12039 error->code != GOT_ERR_NOT_REF)
12041 error = got_object_id_by_path(&id, repo,
12048 error = got_object_get_type(&obj_type, repo, id);
12052 switch (obj_type) {
12053 case GOT_OBJ_TYPE_BLOB:
12054 error = cat_blob(id, repo, stdout);
12056 case GOT_OBJ_TYPE_TREE:
12057 error = cat_tree(id, repo, stdout);
12059 case GOT_OBJ_TYPE_COMMIT:
12060 error = cat_commit(id, repo, stdout);
12062 case GOT_OBJ_TYPE_TAG:
12063 error = cat_tag(id, repo, stdout);
12066 error = got_error(GOT_ERR_OBJ_TYPE);
12081 got_object_commit_close(commit);
12083 got_worktree_close(worktree);
12085 const struct got_error *close_err = got_repo_close(repo);
12089 got_ref_list_free(&refs);
12096 fprintf(stderr, "usage: %s info [path ...]\n",
12101 static const struct got_error *
12102 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12103 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12104 struct got_object_id *commit_id)
12106 const struct got_error *err = NULL;
12107 char *id_str = NULL;
12109 struct tm mytm, *tm;
12110 struct got_pathlist_head *paths = arg;
12111 struct got_pathlist_entry *pe;
12114 * Clear error indication from any of the path arguments which
12115 * would cause this file index entry to be displayed.
12117 TAILQ_FOREACH(pe, paths, entry) {
12118 if (got_path_cmp(path, pe->path, strlen(path),
12119 pe->path_len) == 0 ||
12120 got_path_is_child(path, pe->path, pe->path_len))
12121 pe->data = NULL; /* no error */
12124 printf(GOT_COMMIT_SEP_STR);
12126 printf("symlink: %s\n", path);
12127 else if (S_ISREG(mode)) {
12128 printf("file: %s\n", path);
12129 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12130 } else if (S_ISDIR(mode))
12131 printf("directory: %s\n", path);
12133 printf("something: %s\n", path);
12135 tm = localtime_r(&mtime, &mytm);
12138 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12139 return got_error(GOT_ERR_NO_SPACE);
12140 printf("timestamp: %s\n", datebuf);
12143 err = got_object_id_str(&id_str, blob_id);
12146 printf("based on blob: %s\n", id_str);
12150 if (staged_blob_id) {
12151 err = got_object_id_str(&id_str, staged_blob_id);
12154 printf("based on staged blob: %s\n", id_str);
12159 err = got_object_id_str(&id_str, commit_id);
12162 printf("based on commit: %s\n", id_str);
12169 static const struct got_error *
12170 cmd_info(int argc, char *argv[])
12172 const struct got_error *error = NULL;
12173 struct got_worktree *worktree = NULL;
12174 char *cwd = NULL, *id_str = NULL;
12175 struct got_pathlist_head paths;
12176 struct got_pathlist_entry *pe;
12177 char *uuidstr = NULL;
12178 int ch, show_files = 0;
12180 TAILQ_INIT(&paths);
12182 while ((ch = getopt(argc, argv, "")) != -1) {
12194 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12198 cwd = getcwd(NULL, 0);
12200 error = got_error_from_errno("getcwd");
12204 error = got_worktree_open(&worktree, cwd);
12206 if (error->code == GOT_ERR_NOT_WORKTREE)
12207 error = wrap_not_worktree_error(error, "info", cwd);
12212 /* Remove "cpath" promise. */
12213 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
12217 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
12222 error = get_worktree_paths_from_argv(&paths, argc, argv,
12229 error = got_object_id_str(&id_str,
12230 got_worktree_get_base_commit_id(worktree));
12234 error = got_worktree_get_uuid(&uuidstr, worktree);
12238 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12239 printf("work tree base commit: %s\n", id_str);
12240 printf("work tree path prefix: %s\n",
12241 got_worktree_get_path_prefix(worktree));
12242 printf("work tree branch reference: %s\n",
12243 got_worktree_get_head_ref_name(worktree));
12244 printf("work tree UUID: %s\n", uuidstr);
12245 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12248 struct got_pathlist_entry *pe;
12249 TAILQ_FOREACH(pe, &paths, entry) {
12250 if (pe->path_len == 0)
12253 * Assume this path will fail. This will be corrected
12254 * in print_path_info() in case the path does suceeed.
12256 pe->data = (void *)got_error_path(pe->path,
12259 error = got_worktree_path_info(worktree, &paths,
12260 print_path_info, &paths, check_cancelled, NULL);
12263 TAILQ_FOREACH(pe, &paths, entry) {
12264 if (pe->data != NULL) {
12265 error = pe->data; /* bad path */
12271 TAILQ_FOREACH(pe, &paths, entry)
12272 free((char *)pe->path);
12273 got_pathlist_free(&paths);