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) {
2997 if (error->code == GOT_ERR_ANCESTRY) {
2998 error = checkout_ancestry_error(
2999 head_ref, commit_id_str);
3003 error = check_same_branch(commit_id, head_ref, NULL, repo);
3005 if (error->code == GOT_ERR_ANCESTRY) {
3006 error = checkout_ancestry_error(
3007 head_ref, commit_id_str);
3011 error = got_worktree_set_base_commit_id(worktree, repo,
3015 /* Expand potentially abbreviated commit ID string. */
3016 free(commit_id_str);
3017 error = got_object_id_str(&commit_id_str, commit_id);
3021 commit_id = got_object_id_dup(
3022 got_worktree_get_base_commit_id(worktree));
3023 if (commit_id == NULL) {
3024 error = got_error_from_errno("got_object_id_dup");
3027 error = got_object_id_str(&commit_id_str, commit_id);
3032 error = got_pathlist_append(&paths, "", NULL);
3035 cpa.worktree_path = worktree_path;
3036 cpa.had_base_commit_ref_error = 0;
3037 cpa.verbosity = verbosity;
3038 error = got_worktree_checkout_files(worktree, &paths, repo,
3039 checkout_progress, &cpa, check_cancelled, NULL);
3043 if (got_ref_is_symbolic(head_ref)) {
3044 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3047 refname = got_ref_get_name(ref);
3049 refname = got_ref_get_name(head_ref);
3050 printf("Checked out %s: %s\n", refname, commit_id_str);
3051 printf("Now shut up and hack\n");
3052 if (cpa.had_base_commit_ref_error)
3053 show_worktree_base_ref_warning();
3056 got_ref_close(head_ref);
3059 got_pathlist_free(&paths);
3060 free(commit_id_str);
3063 free(worktree_path);
3068 struct got_update_progress_arg {
3080 print_update_progress_stats(struct got_update_progress_arg *upa)
3082 if (!upa->did_something)
3085 if (upa->conflicts > 0)
3086 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3087 if (upa->obstructed > 0)
3088 printf("File paths obstructed by a non-regular file: %d\n",
3090 if (upa->not_updated > 0)
3091 printf("Files not updated because of existing merge "
3092 "conflicts: %d\n", upa->not_updated);
3096 * The meaning of some status codes differs between merge-style operations and
3097 * update operations. For example, the ! status code means "file was missing"
3098 * if changes were merged into the work tree, and "missing file was restored"
3099 * if the work tree was updated. This function should be used by any operation
3100 * which merges changes into the work tree without updating the work tree.
3103 print_merge_progress_stats(struct got_update_progress_arg *upa)
3105 if (!upa->did_something)
3108 if (upa->conflicts > 0)
3109 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3110 if (upa->obstructed > 0)
3111 printf("File paths obstructed by a non-regular file: %d\n",
3113 if (upa->missing > 0)
3114 printf("Files which had incoming changes but could not be "
3115 "found in the work tree: %d\n", upa->missing);
3116 if (upa->not_deleted > 0)
3117 printf("Files not deleted due to differences in deleted "
3118 "content: %d\n", upa->not_deleted);
3119 if (upa->unversioned > 0)
3120 printf("Files not merged because an unversioned file was "
3121 "found in the work tree: %d\n", upa->unversioned);
3127 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [-q] "
3133 static const struct got_error *
3134 update_progress(void *arg, unsigned char status, const char *path)
3136 struct got_update_progress_arg *upa = arg;
3138 if (status == GOT_STATUS_EXISTS ||
3139 status == GOT_STATUS_BASE_REF_ERR)
3142 upa->did_something = 1;
3144 /* Base commit bump happens silently. */
3145 if (status == GOT_STATUS_BUMP_BASE)
3148 if (status == GOT_STATUS_CONFLICT)
3150 if (status == GOT_STATUS_OBSTRUCTED)
3152 if (status == GOT_STATUS_CANNOT_UPDATE)
3154 if (status == GOT_STATUS_MISSING)
3156 if (status == GOT_STATUS_CANNOT_DELETE)
3158 if (status == GOT_STATUS_UNVERSIONED)
3161 while (path[0] == '/')
3163 if (upa->verbosity >= 0)
3164 printf("%c %s\n", status, path);
3169 static const struct got_error *
3170 switch_head_ref(struct got_reference *head_ref,
3171 struct got_object_id *commit_id, struct got_worktree *worktree,
3172 struct got_repository *repo)
3174 const struct got_error *err = NULL;
3176 int ref_has_moved = 0;
3178 /* Trivial case: switching between two different references. */
3179 if (strcmp(got_ref_get_name(head_ref),
3180 got_worktree_get_head_ref_name(worktree)) != 0) {
3181 printf("Switching work tree from %s to %s\n",
3182 got_worktree_get_head_ref_name(worktree),
3183 got_ref_get_name(head_ref));
3184 return got_worktree_set_head_ref(worktree, head_ref);
3187 err = check_linear_ancestry(commit_id,
3188 got_worktree_get_base_commit_id(worktree), 0, repo);
3190 if (err->code != GOT_ERR_ANCESTRY)
3197 /* Switching to a rebased branch with the same reference name. */
3198 err = got_object_id_str(&base_id_str,
3199 got_worktree_get_base_commit_id(worktree));
3202 printf("Reference %s now points at a different branch\n",
3203 got_worktree_get_head_ref_name(worktree));
3204 printf("Switching work tree from %s to %s\n", base_id_str,
3205 got_worktree_get_head_ref_name(worktree));
3209 static const struct got_error *
3210 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3212 const struct got_error *err;
3215 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3219 return got_error(GOT_ERR_REBASING);
3221 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3225 return got_error(GOT_ERR_HISTEDIT_BUSY);
3230 static const struct got_error *
3231 check_merge_in_progress(struct got_worktree *worktree,
3232 struct got_repository *repo)
3234 const struct got_error *err;
3237 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3241 return got_error(GOT_ERR_MERGE_BUSY);
3246 static const struct got_error *
3247 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3248 char *argv[], struct got_worktree *worktree)
3250 const struct got_error *err = NULL;
3252 struct got_pathlist_entry *new;
3258 return got_error_from_errno("strdup");
3259 return got_pathlist_append(paths, path, NULL);
3262 for (i = 0; i < argc; i++) {
3263 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3266 err = got_pathlist_insert(&new, paths, path, NULL);
3267 if (err || new == NULL /* duplicate */) {
3277 static const struct got_error *
3278 wrap_not_worktree_error(const struct got_error *orig_err,
3279 const char *cmdname, const char *path)
3281 const struct got_error *err;
3282 struct got_repository *repo;
3283 static char msg[512];
3285 err = got_repo_open(&repo, path, NULL);
3289 snprintf(msg, sizeof(msg),
3290 "'got %s' needs a work tree in addition to a git repository\n"
3291 "Work trees can be checked out from this Git repository with "
3293 "The got(1) manual page contains more information.", cmdname);
3294 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3295 got_repo_close(repo);
3299 static const struct got_error *
3300 cmd_update(int argc, char *argv[])
3302 const struct got_error *error = NULL;
3303 struct got_repository *repo = NULL;
3304 struct got_worktree *worktree = NULL;
3305 char *worktree_path = NULL;
3306 struct got_object_id *commit_id = NULL;
3307 char *commit_id_str = NULL;
3308 const char *branch_name = NULL;
3309 struct got_reference *head_ref = NULL;
3310 struct got_pathlist_head paths;
3311 struct got_pathlist_entry *pe;
3312 int ch, verbosity = 0;
3313 struct got_update_progress_arg upa;
3317 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3320 branch_name = optarg;
3323 commit_id_str = strdup(optarg);
3324 if (commit_id_str == NULL)
3325 return got_error_from_errno("strdup");
3340 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3341 "unveil", NULL) == -1)
3344 worktree_path = getcwd(NULL, 0);
3345 if (worktree_path == NULL) {
3346 error = got_error_from_errno("getcwd");
3349 error = got_worktree_open(&worktree, worktree_path);
3351 if (error->code == GOT_ERR_NOT_WORKTREE)
3352 error = wrap_not_worktree_error(error, "update",
3357 error = check_rebase_or_histedit_in_progress(worktree);
3361 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3366 error = apply_unveil(got_repo_get_path(repo), 0,
3367 got_worktree_get_root_path(worktree));
3371 error = check_merge_in_progress(worktree, repo);
3375 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3379 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3380 got_worktree_get_head_ref_name(worktree), 0);
3383 if (commit_id_str == NULL) {
3384 error = got_ref_resolve(&commit_id, repo, head_ref);
3387 error = got_object_id_str(&commit_id_str, commit_id);
3391 struct got_reflist_head refs;
3393 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3397 error = got_repo_match_object_id(&commit_id, NULL,
3398 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3399 got_ref_list_free(&refs);
3400 free(commit_id_str);
3401 commit_id_str = NULL;
3404 error = got_object_id_str(&commit_id_str, commit_id);
3410 struct got_object_id *head_commit_id;
3411 TAILQ_FOREACH(pe, &paths, entry) {
3412 if (pe->path_len == 0)
3414 error = got_error_msg(GOT_ERR_BAD_PATH,
3415 "switching between branches requires that "
3416 "the entire work tree gets updated");
3419 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3422 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3424 free(head_commit_id);
3427 error = check_same_branch(commit_id, head_ref, NULL, repo);
3430 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3434 error = check_linear_ancestry(commit_id,
3435 got_worktree_get_base_commit_id(worktree), 0, repo);
3436 if (error != NULL) {
3437 if (error->code == GOT_ERR_ANCESTRY)
3438 error = got_error(GOT_ERR_BRANCH_MOVED);
3441 error = check_same_branch(commit_id, head_ref, NULL, repo);
3446 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3448 error = got_worktree_set_base_commit_id(worktree, repo,
3454 memset(&upa, 0, sizeof(upa));
3455 upa.verbosity = verbosity;
3456 error = got_worktree_checkout_files(worktree, &paths, repo,
3457 update_progress, &upa, check_cancelled, NULL);
3461 if (upa.did_something) {
3462 printf("Updated to %s: %s\n",
3463 got_worktree_get_head_ref_name(worktree), commit_id_str);
3465 printf("Already up-to-date\n");
3466 print_update_progress_stats(&upa);
3468 free(worktree_path);
3469 TAILQ_FOREACH(pe, &paths, entry)
3470 free((char *)pe->path);
3471 got_pathlist_free(&paths);
3473 free(commit_id_str);
3477 static const struct got_error *
3478 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3479 const char *path, int diff_context, int ignore_whitespace,
3480 int force_text_diff, struct got_repository *repo)
3482 const struct got_error *err = NULL;
3483 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3486 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3491 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3495 while (path[0] == '/')
3497 err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3498 diff_context, ignore_whitespace, force_text_diff, stdout);
3501 got_object_blob_close(blob1);
3502 got_object_blob_close(blob2);
3506 static const struct got_error *
3507 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3508 const char *path, int diff_context, int ignore_whitespace,
3509 int force_text_diff, struct got_repository *repo)
3511 const struct got_error *err = NULL;
3512 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3513 struct got_diff_blob_output_unidiff_arg arg;
3516 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3521 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3525 arg.diff_context = diff_context;
3526 arg.ignore_whitespace = ignore_whitespace;
3527 arg.force_text_diff = force_text_diff;
3528 arg.outfile = stdout;
3529 arg.line_offsets = NULL;
3531 while (path[0] == '/')
3533 err = got_diff_tree(tree1, tree2, path, path, repo,
3534 got_diff_blob_output_unidiff, &arg, 1);
3537 got_object_tree_close(tree1);
3539 got_object_tree_close(tree2);
3543 static const struct got_error *
3544 get_changed_paths(struct got_pathlist_head *paths,
3545 struct got_commit_object *commit, struct got_repository *repo)
3547 const struct got_error *err = NULL;
3548 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3549 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3550 struct got_object_qid *qid;
3552 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3554 struct got_commit_object *pcommit;
3555 err = got_object_open_as_commit(&pcommit, repo,
3560 tree_id1 = got_object_id_dup(
3561 got_object_commit_get_tree_id(pcommit));
3562 if (tree_id1 == NULL) {
3563 got_object_commit_close(pcommit);
3564 return got_error_from_errno("got_object_id_dup");
3566 got_object_commit_close(pcommit);
3571 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3576 tree_id2 = got_object_commit_get_tree_id(commit);
3577 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3581 err = got_diff_tree(tree1, tree2, "", "", repo,
3582 got_diff_tree_collect_changed_paths, paths, 0);
3585 got_object_tree_close(tree1);
3587 got_object_tree_close(tree2);
3592 static const struct got_error *
3593 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3594 const char *path, int diff_context, struct got_repository *repo)
3596 const struct got_error *err = NULL;
3597 struct got_commit_object *pcommit = NULL;
3598 char *id_str1 = NULL, *id_str2 = NULL;
3599 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3600 struct got_object_qid *qid;
3602 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3604 err = got_object_open_as_commit(&pcommit, repo,
3610 if (path && path[0] != '\0') {
3612 err = got_object_id_by_path(&obj_id2, repo, id, path);
3615 err = got_object_id_str(&id_str2, obj_id2);
3621 err = got_object_id_by_path(&obj_id1, repo,
3624 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3629 err = got_object_id_str(&id_str1, obj_id1);
3636 err = got_object_get_type(&obj_type, repo, obj_id2);
3641 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3643 case GOT_OBJ_TYPE_BLOB:
3644 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3647 case GOT_OBJ_TYPE_TREE:
3648 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3652 err = got_error(GOT_ERR_OBJ_TYPE);
3658 obj_id2 = got_object_commit_get_tree_id(commit);
3659 err = got_object_id_str(&id_str2, obj_id2);
3663 obj_id1 = got_object_commit_get_tree_id(pcommit);
3664 err = got_object_id_str(&id_str1, obj_id1);
3668 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3670 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3677 got_object_commit_close(pcommit);
3682 get_datestr(time_t *time, char *datebuf)
3684 struct tm mytm, *tm;
3687 tm = gmtime_r(time, &mytm);
3690 s = asctime_r(tm, datebuf);
3693 p = strchr(s, '\n');
3699 static const struct got_error *
3700 match_logmsg(int *have_match, struct got_object_id *id,
3701 struct got_commit_object *commit, regex_t *regex)
3703 const struct got_error *err = NULL;
3704 regmatch_t regmatch;
3705 char *id_str = NULL, *logmsg = NULL;
3709 err = got_object_id_str(&id_str, id);
3713 err = got_object_commit_get_logmsg(&logmsg, commit);
3717 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3726 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3729 regmatch_t regmatch;
3730 struct got_pathlist_entry *pe;
3734 TAILQ_FOREACH(pe, changed_paths, entry) {
3735 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3742 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3744 static const struct got_error*
3745 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3746 struct got_object_id *id, struct got_repository *repo)
3748 static const struct got_error *err = NULL;
3749 struct got_reflist_entry *re;
3755 TAILQ_FOREACH(re, refs, entry) {
3756 struct got_tag_object *tag = NULL;
3757 struct got_object_id *ref_id;
3760 name = got_ref_get_name(re->ref);
3761 if (strcmp(name, GOT_REF_HEAD) == 0)
3763 if (strncmp(name, "refs/", 5) == 0)
3765 if (strncmp(name, "got/", 4) == 0)
3767 if (strncmp(name, "heads/", 6) == 0)
3769 if (strncmp(name, "remotes/", 8) == 0) {
3771 s = strstr(name, "/" GOT_REF_HEAD);
3772 if (s != NULL && s[strlen(s)] == '\0')
3775 err = got_ref_resolve(&ref_id, repo, re->ref);
3778 if (strncmp(name, "tags/", 5) == 0) {
3779 err = got_object_open_as_tag(&tag, repo, ref_id);
3781 if (err->code != GOT_ERR_OBJ_TYPE) {
3785 /* Ref points at something other than a tag. */
3790 cmp = got_object_id_cmp(tag ?
3791 got_object_tag_get_object_id(tag) : ref_id, id);
3794 got_object_tag_close(tag);
3798 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3799 s ? ", " : "", name) == -1) {
3800 err = got_error_from_errno("asprintf");
3811 static const struct got_error *
3812 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3813 struct got_repository *repo, const char *path,
3814 struct got_pathlist_head *changed_paths, int show_patch,
3815 int diff_context, struct got_reflist_object_id_map *refs_idmap,
3816 const char *custom_refs_str)
3818 const struct got_error *err = NULL;
3819 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3821 time_t committer_time;
3822 const char *author, *committer;
3823 char *refs_str = NULL;
3825 err = got_object_id_str(&id_str, id);
3829 if (custom_refs_str == NULL) {
3830 struct got_reflist_head *refs;
3831 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3833 err = build_refs_str(&refs_str, refs, id, repo);
3839 printf(GOT_COMMIT_SEP_STR);
3840 if (custom_refs_str)
3841 printf("commit %s (%s)\n", id_str, custom_refs_str);
3843 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3844 refs_str ? refs_str : "", refs_str ? ")" : "");
3849 printf("from: %s\n", got_object_commit_get_author(commit));
3850 committer_time = got_object_commit_get_committer_time(commit);
3851 datestr = get_datestr(&committer_time, datebuf);
3853 printf("date: %s UTC\n", datestr);
3854 author = got_object_commit_get_author(commit);
3855 committer = got_object_commit_get_committer(commit);
3856 if (strcmp(author, committer) != 0)
3857 printf("via: %s\n", committer);
3858 if (got_object_commit_get_nparents(commit) > 1) {
3859 const struct got_object_id_queue *parent_ids;
3860 struct got_object_qid *qid;
3862 parent_ids = got_object_commit_get_parent_ids(commit);
3863 STAILQ_FOREACH(qid, parent_ids, entry) {
3864 err = got_object_id_str(&id_str, qid->id);
3867 printf("parent %d: %s\n", n++, id_str);
3873 err = got_object_commit_get_logmsg(&logmsg0, commit);
3879 line = strsep(&logmsg, "\n");
3881 printf(" %s\n", line);
3885 if (changed_paths) {
3886 struct got_pathlist_entry *pe;
3887 TAILQ_FOREACH(pe, changed_paths, entry) {
3888 struct got_diff_changed_path *cp = pe->data;
3889 printf(" %c %s\n", cp->status, pe->path);
3894 err = print_patch(commit, id, path, diff_context, repo);
3899 if (fflush(stdout) != 0 && err == NULL)
3900 err = got_error_from_errno("fflush");
3907 static const struct got_error *
3908 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3909 struct got_repository *repo, const char *path, int show_changed_paths,
3910 int show_patch, const char *search_pattern, int diff_context, int limit,
3911 int log_branches, int reverse_display_order,
3912 struct got_reflist_object_id_map *refs_idmap)
3914 const struct got_error *err;
3915 struct got_commit_graph *graph;
3918 struct got_object_id_queue reversed_commits;
3919 struct got_object_qid *qid;
3920 struct got_commit_object *commit;
3921 struct got_pathlist_head changed_paths;
3922 struct got_pathlist_entry *pe;
3924 STAILQ_INIT(&reversed_commits);
3925 TAILQ_INIT(&changed_paths);
3927 if (search_pattern && regcomp(®ex, search_pattern,
3928 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3929 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3931 err = got_commit_graph_open(&graph, path, !log_branches);
3934 err = got_commit_graph_iter_start(graph, root_id, repo,
3935 check_cancelled, NULL);
3939 struct got_object_id *id;
3941 if (sigint_received || sigpipe_received)
3944 err = got_commit_graph_iter_next(&id, graph, repo,
3945 check_cancelled, NULL);
3947 if (err->code == GOT_ERR_ITER_COMPLETED)
3954 err = got_object_open_as_commit(&commit, repo, id);
3958 if (show_changed_paths && !reverse_display_order) {
3959 err = get_changed_paths(&changed_paths, commit, repo);
3964 if (search_pattern) {
3965 err = match_logmsg(&have_match, id, commit, ®ex);
3967 got_object_commit_close(commit);
3970 if (have_match == 0 && show_changed_paths)
3971 match_changed_paths(&have_match,
3972 &changed_paths, ®ex);
3973 if (have_match == 0) {
3974 got_object_commit_close(commit);
3975 TAILQ_FOREACH(pe, &changed_paths, entry) {
3976 free((char *)pe->path);
3979 got_pathlist_free(&changed_paths);
3984 if (reverse_display_order) {
3985 err = got_object_qid_alloc(&qid, id);
3988 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
3989 got_object_commit_close(commit);
3991 err = print_commit(commit, id, repo, path,
3992 show_changed_paths ? &changed_paths : NULL,
3993 show_patch, diff_context, refs_idmap, NULL);
3994 got_object_commit_close(commit);
3998 if ((limit && --limit == 0) ||
3999 (end_id && got_object_id_cmp(id, end_id) == 0))
4002 TAILQ_FOREACH(pe, &changed_paths, entry) {
4003 free((char *)pe->path);
4006 got_pathlist_free(&changed_paths);
4008 if (reverse_display_order) {
4009 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4010 err = got_object_open_as_commit(&commit, repo, qid->id);
4013 if (show_changed_paths) {
4014 err = get_changed_paths(&changed_paths,
4019 err = print_commit(commit, qid->id, repo, path,
4020 show_changed_paths ? &changed_paths : NULL,
4021 show_patch, diff_context, refs_idmap, NULL);
4022 got_object_commit_close(commit);
4025 TAILQ_FOREACH(pe, &changed_paths, entry) {
4026 free((char *)pe->path);
4029 got_pathlist_free(&changed_paths);
4033 while (!STAILQ_EMPTY(&reversed_commits)) {
4034 qid = STAILQ_FIRST(&reversed_commits);
4035 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4036 got_object_qid_free(qid);
4038 TAILQ_FOREACH(pe, &changed_paths, entry) {
4039 free((char *)pe->path);
4042 got_pathlist_free(&changed_paths);
4045 got_commit_graph_close(graph);
4052 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
4053 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
4054 "[-R] [path]\n", getprogname());
4059 get_default_log_limit(void)
4061 const char *got_default_log_limit;
4065 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4066 if (got_default_log_limit == NULL)
4068 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4074 static const struct got_error *
4075 cmd_log(int argc, char *argv[])
4077 const struct got_error *error;
4078 struct got_repository *repo = NULL;
4079 struct got_worktree *worktree = NULL;
4080 struct got_object_id *start_id = NULL, *end_id = NULL;
4081 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4082 const char *start_commit = NULL, *end_commit = NULL;
4083 const char *search_pattern = NULL;
4084 int diff_context = -1, ch;
4085 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4086 int reverse_display_order = 0;
4088 struct got_reflist_head refs;
4089 struct got_reflist_object_id_map *refs_idmap = NULL;
4094 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4100 limit = get_default_log_limit();
4102 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
4108 show_changed_paths = 1;
4111 start_commit = optarg;
4114 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4117 errx(1, "number of context lines is %s: %s",
4121 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4123 errx(1, "number of commits is %s: %s",
4130 repo_path = realpath(optarg, NULL);
4131 if (repo_path == NULL)
4132 return got_error_from_errno2("realpath",
4134 got_path_strip_trailing_slashes(repo_path);
4137 reverse_display_order = 1;
4140 search_pattern = optarg;
4143 end_commit = optarg;
4154 if (diff_context == -1)
4156 else if (!show_patch)
4157 errx(1, "-C requires -p");
4159 cwd = getcwd(NULL, 0);
4161 error = got_error_from_errno("getcwd");
4165 if (repo_path == NULL) {
4166 error = got_worktree_open(&worktree, cwd);
4167 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4174 error = got_worktree_resolve_path(&path, worktree,
4179 path = strdup(argv[0]);
4181 error = got_error_from_errno("strdup");
4185 } else if (argc != 0)
4188 if (repo_path == NULL) {
4189 repo_path = worktree ?
4190 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4192 if (repo_path == NULL) {
4193 error = got_error_from_errno("strdup");
4197 error = got_repo_open(&repo, repo_path, NULL);
4201 error = apply_unveil(got_repo_get_path(repo), 1,
4202 worktree ? got_worktree_get_root_path(worktree) : NULL);
4206 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4210 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4214 if (start_commit == NULL) {
4215 struct got_reference *head_ref;
4216 struct got_commit_object *commit = NULL;
4217 error = got_ref_open(&head_ref, repo,
4218 worktree ? got_worktree_get_head_ref_name(worktree)
4222 error = got_ref_resolve(&start_id, repo, head_ref);
4223 got_ref_close(head_ref);
4226 error = got_object_open_as_commit(&commit, repo,
4230 got_object_commit_close(commit);
4232 error = got_repo_match_object_id(&start_id, NULL,
4233 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4237 if (end_commit != NULL) {
4238 error = got_repo_match_object_id(&end_id, NULL,
4239 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4246 * If a path was specified on the command line it was resolved
4247 * to a path in the work tree above. Prepend the work tree's
4248 * path prefix to obtain the corresponding in-repository path.
4252 prefix = got_worktree_get_path_prefix(worktree);
4253 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4254 (path[0] != '\0') ? "/" : "", path) == -1) {
4255 error = got_error_from_errno("asprintf");
4260 error = got_repo_map_path(&in_repo_path, repo,
4266 path = in_repo_path;
4270 /* Release work tree lock. */
4271 got_worktree_close(worktree);
4275 error = print_commits(start_id, end_id, repo, path ? path : "",
4276 show_changed_paths, show_patch, search_pattern, diff_context,
4277 limit, log_branches, reverse_display_order, refs_idmap);
4283 got_worktree_close(worktree);
4285 const struct got_error *close_err = got_repo_close(repo);
4290 got_reflist_object_id_map_free(refs_idmap);
4291 got_ref_list_free(&refs);
4298 fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4299 "[-r repository-path] [-s] [-w] [-P] "
4300 "[object1 object2 | path ...]\n", getprogname());
4304 struct print_diff_arg {
4305 struct got_repository *repo;
4306 struct got_worktree *worktree;
4311 int ignore_whitespace;
4312 int force_text_diff;
4316 * Create a file which contains the target path of a symlink so we can feed
4317 * it as content to the diff engine.
4319 static const struct got_error *
4320 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4321 const char *abspath)
4323 const struct got_error *err = NULL;
4324 char target_path[PATH_MAX];
4325 ssize_t target_len, outlen;
4330 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4331 if (target_len == -1)
4332 return got_error_from_errno2("readlinkat", abspath);
4334 target_len = readlink(abspath, target_path, PATH_MAX);
4335 if (target_len == -1)
4336 return got_error_from_errno2("readlink", abspath);
4339 *fd = got_opentempfd();
4341 return got_error_from_errno("got_opentempfd");
4343 outlen = write(*fd, target_path, target_len);
4345 err = got_error_from_errno("got_opentempfd");
4349 if (lseek(*fd, 0, SEEK_SET) == -1) {
4350 err = got_error_from_errno2("lseek", abspath);
4361 static const struct got_error *
4362 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4363 const char *path, struct got_object_id *blob_id,
4364 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4365 int dirfd, const char *de_name)
4367 struct print_diff_arg *a = arg;
4368 const struct got_error *err = NULL;
4369 struct got_blob_object *blob1 = NULL;
4372 char *abspath = NULL, *label1 = NULL;
4375 if (a->diff_staged) {
4376 if (staged_status != GOT_STATUS_MODIFY &&
4377 staged_status != GOT_STATUS_ADD &&
4378 staged_status != GOT_STATUS_DELETE)
4381 if (staged_status == GOT_STATUS_DELETE)
4383 if (status == GOT_STATUS_NONEXISTENT)
4384 return got_error_set_errno(ENOENT, path);
4385 if (status != GOT_STATUS_MODIFY &&
4386 status != GOT_STATUS_ADD &&
4387 status != GOT_STATUS_DELETE &&
4388 status != GOT_STATUS_CONFLICT)
4392 if (!a->header_shown) {
4393 printf("diff %s %s%s\n", a->id_str,
4394 got_worktree_get_root_path(a->worktree),
4395 a->diff_staged ? " (staged changes)" : "");
4396 a->header_shown = 1;
4399 if (a->diff_staged) {
4400 const char *label1 = NULL, *label2 = NULL;
4401 switch (staged_status) {
4402 case GOT_STATUS_MODIFY:
4406 case GOT_STATUS_ADD:
4409 case GOT_STATUS_DELETE:
4413 return got_error(GOT_ERR_FILE_STATUS);
4415 return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4416 staged_blob_id, label1, label2, a->diff_context,
4417 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4420 if (staged_status == GOT_STATUS_ADD ||
4421 staged_status == GOT_STATUS_MODIFY) {
4423 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4427 err = got_object_id_str(&id_str, staged_blob_id);
4430 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4431 err = got_error_from_errno("asprintf");
4436 } else if (status != GOT_STATUS_ADD) {
4437 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4442 if (status != GOT_STATUS_DELETE) {
4443 if (asprintf(&abspath, "%s/%s",
4444 got_worktree_get_root_path(a->worktree), path) == -1) {
4445 err = got_error_from_errno("asprintf");
4450 fd = openat(dirfd, de_name,
4451 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4453 if (!got_err_open_nofollow_on_symlink()) {
4454 err = got_error_from_errno2("openat",
4458 err = get_symlink_target_file(&fd, dirfd,
4464 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4466 if (!got_err_open_nofollow_on_symlink()) {
4467 err = got_error_from_errno2("open",
4471 err = get_symlink_target_file(&fd, dirfd,
4477 if (fstat(fd, &sb) == -1) {
4478 err = got_error_from_errno2("fstat", abspath);
4481 f2 = fdopen(fd, "r");
4483 err = got_error_from_errno2("fdopen", abspath);
4490 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4491 a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4494 got_object_blob_close(blob1);
4495 if (f2 && fclose(f2) == EOF && err == NULL)
4496 err = got_error_from_errno("fclose");
4497 if (fd != -1 && close(fd) == -1 && err == NULL)
4498 err = got_error_from_errno("close");
4503 static const struct got_error *
4504 cmd_diff(int argc, char *argv[])
4506 const struct got_error *error;
4507 struct got_repository *repo = NULL;
4508 struct got_worktree *worktree = NULL;
4509 char *cwd = NULL, *repo_path = NULL;
4510 const char *commit_args[2] = { NULL, NULL };
4511 int ncommit_args = 0;
4512 struct got_object_id *ids[2] = { NULL, NULL };
4513 char *labels[2] = { NULL, NULL };
4514 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4515 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4516 int force_text_diff = 0, force_path = 0, rflag = 0;
4518 struct got_reflist_head refs;
4519 struct got_pathlist_head paths;
4520 struct got_pathlist_entry *pe;
4526 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4531 while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4534 force_text_diff = 1;
4537 if (ncommit_args >= 2)
4538 errx(1, "too many -c options used");
4539 commit_args[ncommit_args++] = optarg;
4542 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4545 errx(1, "number of context lines is %s: %s",
4549 repo_path = realpath(optarg, NULL);
4550 if (repo_path == NULL)
4551 return got_error_from_errno2("realpath",
4553 got_path_strip_trailing_slashes(repo_path);
4560 ignore_whitespace = 1;
4574 cwd = getcwd(NULL, 0);
4576 error = got_error_from_errno("getcwd");
4580 if (repo_path == NULL) {
4581 error = got_worktree_open(&worktree, cwd);
4582 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4588 strdup(got_worktree_get_repo_path(worktree));
4589 if (repo_path == NULL) {
4590 error = got_error_from_errno("strdup");
4594 repo_path = strdup(cwd);
4595 if (repo_path == NULL) {
4596 error = got_error_from_errno("strdup");
4602 error = got_repo_open(&repo, repo_path, NULL);
4607 if (rflag || worktree == NULL || ncommit_args > 0) {
4609 error = got_error_msg(GOT_ERR_NOT_IMPL,
4610 "-P option can only be used when diffing "
4615 error = got_error_msg(GOT_ERR_NOT_IMPL,
4616 "-s option can only be used when diffing "
4622 error = apply_unveil(got_repo_get_path(repo), 1,
4623 worktree ? got_worktree_get_root_path(worktree) : NULL);
4627 if ((!force_path && argc == 2) || ncommit_args > 0) {
4628 int obj_type = (ncommit_args > 0 ?
4629 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4630 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4634 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4636 if (ncommit_args > 0)
4637 arg = commit_args[i];
4640 error = got_repo_match_object_id(&ids[i], &labels[i],
4641 arg, obj_type, &refs, repo);
4643 if (error->code != GOT_ERR_NOT_REF &&
4644 error->code != GOT_ERR_NO_OBJ)
4646 if (ncommit_args > 0)
4654 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4655 struct print_diff_arg arg;
4658 if (worktree == NULL) {
4659 if (argc == 2 && ids[0] == NULL) {
4660 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4662 } else if (argc == 2 && ids[1] == NULL) {
4663 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4665 } else if (argc > 0) {
4666 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4667 "%s", "specified paths cannot be resolved");
4670 error = got_error(GOT_ERR_NOT_WORKTREE);
4675 error = get_worktree_paths_from_argv(&paths, argc, argv,
4680 error = got_object_id_str(&id_str,
4681 got_worktree_get_base_commit_id(worktree));
4685 arg.worktree = worktree;
4686 arg.diff_context = diff_context;
4687 arg.id_str = id_str;
4688 arg.header_shown = 0;
4689 arg.diff_staged = diff_staged;
4690 arg.ignore_whitespace = ignore_whitespace;
4691 arg.force_text_diff = force_text_diff;
4693 error = got_worktree_status(worktree, &paths, repo, 0,
4694 print_diff, &arg, check_cancelled, NULL);
4699 if (ncommit_args == 1) {
4700 struct got_commit_object *commit;
4701 error = got_object_open_as_commit(&commit, repo, ids[0]);
4705 labels[1] = labels[0];
4707 if (got_object_commit_get_nparents(commit) > 0) {
4708 const struct got_object_id_queue *pids;
4709 struct got_object_qid *pid;
4710 pids = got_object_commit_get_parent_ids(commit);
4711 pid = STAILQ_FIRST(pids);
4712 ids[0] = got_object_id_dup(pid->id);
4713 if (ids[0] == NULL) {
4714 error = got_error_from_errno(
4715 "got_object_id_dup");
4716 got_object_commit_close(commit);
4719 error = got_object_id_str(&labels[0], ids[0]);
4721 got_object_commit_close(commit);
4726 labels[0] = strdup("/dev/null");
4727 if (labels[0] == NULL) {
4728 error = got_error_from_errno("strdup");
4729 got_object_commit_close(commit);
4734 got_object_commit_close(commit);
4737 if (ncommit_args == 0 && argc > 2) {
4738 error = got_error_msg(GOT_ERR_BAD_PATH,
4739 "path arguments cannot be used when diffing two objects");
4744 error = got_object_get_type(&type1, repo, ids[0]);
4749 error = got_object_get_type(&type2, repo, ids[1]);
4752 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4753 error = got_error(GOT_ERR_OBJ_TYPE);
4756 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
4757 error = got_error_msg(GOT_ERR_OBJ_TYPE,
4758 "path arguments cannot be used when diffing blobs");
4762 for (i = 0; ncommit_args > 0 && i < argc; i++) {
4764 struct got_pathlist_entry *new;
4768 error = got_worktree_resolve_path(&p, worktree,
4772 prefix = got_worktree_get_path_prefix(worktree);
4773 while (prefix[0] == '/')
4775 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4776 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4778 error = got_error_from_errno("asprintf");
4784 char *mapped_path, *s;
4785 error = got_repo_map_path(&mapped_path, repo, argv[i]);
4791 in_repo_path = strdup(s);
4792 if (in_repo_path == NULL) {
4793 error = got_error_from_errno("asprintf");
4800 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4801 if (error || new == NULL /* duplicate */)
4808 /* Release work tree lock. */
4809 got_worktree_close(worktree);
4813 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4814 case GOT_OBJ_TYPE_BLOB:
4815 error = got_diff_objects_as_blobs(NULL, NULL, ids[0], ids[1],
4816 NULL, NULL, diff_context, ignore_whitespace,
4817 force_text_diff, repo, stdout);
4819 case GOT_OBJ_TYPE_TREE:
4820 error = got_diff_objects_as_trees(NULL, NULL, ids[0], ids[1],
4821 &paths, "", "", diff_context, ignore_whitespace,
4822 force_text_diff, repo, stdout);
4824 case GOT_OBJ_TYPE_COMMIT:
4825 printf("diff %s %s\n", labels[0], labels[1]);
4826 error = got_diff_objects_as_commits(NULL, NULL, ids[0], ids[1],
4827 &paths, diff_context, ignore_whitespace, force_text_diff,
4831 error = got_error(GOT_ERR_OBJ_TYPE);
4839 got_worktree_close(worktree);
4841 const struct got_error *close_err = got_repo_close(repo);
4845 TAILQ_FOREACH(pe, &paths, entry)
4846 free((char *)pe->path);
4847 got_pathlist_free(&paths);
4848 got_ref_list_free(&refs);
4856 "usage: %s blame [-c commit] [-r repository-path] path\n",
4865 char datebuf[11]; /* YYYY-MM-DD + NUL */
4868 struct blame_cb_args {
4869 struct blame_line *lines;
4873 off_t *line_offsets;
4875 struct got_repository *repo;
4878 static const struct got_error *
4879 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4881 const struct got_error *err = NULL;
4882 struct blame_cb_args *a = arg;
4883 struct blame_line *bline;
4885 size_t linesize = 0;
4886 struct got_commit_object *commit = NULL;
4889 time_t committer_time;
4891 if (nlines != a->nlines ||
4892 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4893 return got_error(GOT_ERR_RANGE);
4895 if (sigint_received)
4896 return got_error(GOT_ERR_ITER_COMPLETED);
4899 return NULL; /* no change in this commit */
4901 /* Annotate this line. */
4902 bline = &a->lines[lineno - 1];
4903 if (bline->annotated)
4905 err = got_object_id_str(&bline->id_str, id);
4909 err = got_object_open_as_commit(&commit, a->repo, id);
4913 bline->committer = strdup(got_object_commit_get_committer(commit));
4914 if (bline->committer == NULL) {
4915 err = got_error_from_errno("strdup");
4919 committer_time = got_object_commit_get_committer_time(commit);
4920 if (gmtime_r(&committer_time, &tm) == NULL)
4921 return got_error_from_errno("gmtime_r");
4922 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4924 err = got_error(GOT_ERR_NO_SPACE);
4927 bline->annotated = 1;
4929 /* Print lines annotated so far. */
4930 bline = &a->lines[a->lineno_cur - 1];
4931 if (!bline->annotated)
4934 offset = a->line_offsets[a->lineno_cur - 1];
4935 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4936 err = got_error_from_errno("fseeko");
4940 while (bline->annotated) {
4941 char *smallerthan, *at, *nl, *committer;
4944 if (getline(&line, &linesize, a->f) == -1) {
4946 err = got_error_from_errno("getline");
4950 committer = bline->committer;
4951 smallerthan = strchr(committer, '<');
4952 if (smallerthan && smallerthan[1] != '\0')
4953 committer = smallerthan + 1;
4954 at = strchr(committer, '@');
4957 len = strlen(committer);
4959 committer[8] = '\0';
4961 nl = strchr(line, '\n');
4964 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4965 bline->id_str, bline->datebuf, committer, line);
4968 bline = &a->lines[a->lineno_cur - 1];
4972 got_object_commit_close(commit);
4977 static const struct got_error *
4978 cmd_blame(int argc, char *argv[])
4980 const struct got_error *error;
4981 struct got_repository *repo = NULL;
4982 struct got_worktree *worktree = NULL;
4983 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4984 char *link_target = NULL;
4985 struct got_object_id *obj_id = NULL;
4986 struct got_object_id *commit_id = NULL;
4987 struct got_blob_object *blob = NULL;
4988 char *commit_id_str = NULL;
4989 struct blame_cb_args bca;
4990 int ch, obj_type, i;
4993 memset(&bca, 0, sizeof(bca));
4996 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5001 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5004 commit_id_str = optarg;
5007 repo_path = realpath(optarg, NULL);
5008 if (repo_path == NULL)
5009 return got_error_from_errno2("realpath",
5011 got_path_strip_trailing_slashes(repo_path);
5027 cwd = getcwd(NULL, 0);
5029 error = got_error_from_errno("getcwd");
5032 if (repo_path == NULL) {
5033 error = got_worktree_open(&worktree, cwd);
5034 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5040 strdup(got_worktree_get_repo_path(worktree));
5041 if (repo_path == NULL) {
5042 error = got_error_from_errno("strdup");
5047 repo_path = strdup(cwd);
5048 if (repo_path == NULL) {
5049 error = got_error_from_errno("strdup");
5055 error = got_repo_open(&repo, repo_path, NULL);
5060 const char *prefix = got_worktree_get_path_prefix(worktree);
5063 error = got_worktree_resolve_path(&p, worktree, path);
5066 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5067 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5069 error = got_error_from_errno("asprintf");
5074 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5076 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5079 error = got_repo_map_path(&in_repo_path, repo, path);
5084 if (commit_id_str == NULL) {
5085 struct got_reference *head_ref;
5086 error = got_ref_open(&head_ref, repo, worktree ?
5087 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5090 error = got_ref_resolve(&commit_id, repo, head_ref);
5091 got_ref_close(head_ref);
5095 struct got_reflist_head refs;
5097 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5101 error = got_repo_match_object_id(&commit_id, NULL,
5102 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5103 got_ref_list_free(&refs);
5109 /* Release work tree lock. */
5110 got_worktree_close(worktree);
5114 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5119 error = got_object_id_by_path(&obj_id, repo, commit_id,
5120 link_target ? link_target : in_repo_path);
5124 error = got_object_get_type(&obj_type, repo, obj_id);
5128 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5129 error = got_error_path(link_target ? link_target : in_repo_path,
5134 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5137 bca.f = got_opentemp();
5138 if (bca.f == NULL) {
5139 error = got_error_from_errno("got_opentemp");
5142 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5143 &bca.line_offsets, bca.f, blob);
5144 if (error || bca.nlines == 0)
5147 /* Don't include \n at EOF in the blame line count. */
5148 if (bca.line_offsets[bca.nlines - 1] == filesize)
5151 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5152 if (bca.lines == NULL) {
5153 error = got_error_from_errno("calloc");
5157 bca.nlines_prec = 0;
5165 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5166 repo, blame_cb, &bca, check_cancelled, NULL);
5175 got_object_blob_close(blob);
5177 got_worktree_close(worktree);
5179 const struct got_error *close_err = got_repo_close(repo);
5184 for (i = 0; i < bca.nlines; i++) {
5185 struct blame_line *bline = &bca.lines[i];
5186 free(bline->id_str);
5187 free(bline->committer);
5191 free(bca.line_offsets);
5192 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5193 error = got_error_from_errno("fclose");
5201 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5206 static const struct got_error *
5207 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5208 const char *root_path, struct got_repository *repo)
5210 const struct got_error *err = NULL;
5211 int is_root_path = (strcmp(path, root_path) == 0);
5212 const char *modestr = "";
5213 mode_t mode = got_tree_entry_get_mode(te);
5214 char *link_target = NULL;
5216 path += strlen(root_path);
5217 while (path[0] == '/')
5220 if (got_object_tree_entry_is_submodule(te))
5222 else if (S_ISLNK(mode)) {
5225 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5228 for (i = 0; i < strlen(link_target); i++) {
5229 if (!isprint((unsigned char)link_target[i]))
5230 link_target[i] = '?';
5235 else if (S_ISDIR(mode))
5237 else if (mode & S_IXUSR)
5240 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5241 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5242 link_target ? " -> ": "", link_target ? link_target : "");
5248 static const struct got_error *
5249 print_tree(const char *path, struct got_object_id *commit_id,
5250 int show_ids, int recurse, const char *root_path,
5251 struct got_repository *repo)
5253 const struct got_error *err = NULL;
5254 struct got_object_id *tree_id = NULL;
5255 struct got_tree_object *tree = NULL;
5258 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
5262 err = got_object_open_as_tree(&tree, repo, tree_id);
5265 nentries = got_object_tree_get_nentries(tree);
5266 for (i = 0; i < nentries; i++) {
5267 struct got_tree_entry *te;
5270 if (sigint_received || sigpipe_received)
5273 te = got_object_tree_get_entry(tree, i);
5276 err = got_object_id_str(&id_str,
5277 got_tree_entry_get_id(te));
5280 if (asprintf(&id, "%s ", id_str) == -1) {
5281 err = got_error_from_errno("asprintf");
5287 err = print_entry(te, id, path, root_path, repo);
5292 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5294 if (asprintf(&child_path, "%s%s%s", path,
5295 path[0] == '/' && path[1] == '\0' ? "" : "/",
5296 got_tree_entry_get_name(te)) == -1) {
5297 err = got_error_from_errno("asprintf");
5300 err = print_tree(child_path, commit_id, show_ids, 1,
5309 got_object_tree_close(tree);
5314 static const struct got_error *
5315 cmd_tree(int argc, char *argv[])
5317 const struct got_error *error;
5318 struct got_repository *repo = NULL;
5319 struct got_worktree *worktree = NULL;
5320 const char *path, *refname = NULL;
5321 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5322 struct got_object_id *commit_id = NULL;
5323 char *commit_id_str = NULL;
5324 int show_ids = 0, recurse = 0;
5328 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5333 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5336 commit_id_str = optarg;
5339 repo_path = realpath(optarg, NULL);
5340 if (repo_path == NULL)
5341 return got_error_from_errno2("realpath",
5343 got_path_strip_trailing_slashes(repo_path);
5367 cwd = getcwd(NULL, 0);
5369 error = got_error_from_errno("getcwd");
5372 if (repo_path == NULL) {
5373 error = got_worktree_open(&worktree, cwd);
5374 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5380 strdup(got_worktree_get_repo_path(worktree));
5381 if (repo_path == NULL)
5382 error = got_error_from_errno("strdup");
5386 repo_path = strdup(cwd);
5387 if (repo_path == NULL) {
5388 error = got_error_from_errno("strdup");
5394 error = got_repo_open(&repo, repo_path, NULL);
5399 const char *prefix = got_worktree_get_path_prefix(worktree);
5404 error = got_worktree_resolve_path(&p, worktree, path);
5407 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5408 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5410 error = got_error_from_errno("asprintf");
5415 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5419 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5424 error = got_repo_map_path(&in_repo_path, repo, path);
5429 if (commit_id_str == NULL) {
5430 struct got_reference *head_ref;
5432 refname = got_worktree_get_head_ref_name(worktree);
5434 refname = GOT_REF_HEAD;
5435 error = got_ref_open(&head_ref, repo, refname, 0);
5438 error = got_ref_resolve(&commit_id, repo, head_ref);
5439 got_ref_close(head_ref);
5443 struct got_reflist_head refs;
5445 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5449 error = got_repo_match_object_id(&commit_id, NULL,
5450 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5451 got_ref_list_free(&refs);
5457 /* Release work tree lock. */
5458 got_worktree_close(worktree);
5462 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5463 in_repo_path, repo);
5470 got_worktree_close(worktree);
5472 const struct got_error *close_err = got_repo_close(repo);
5482 fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5483 "[-S status-codes] [path ...]\n", getprogname());
5487 struct got_status_arg {
5492 static const struct got_error *
5493 print_status(void *arg, unsigned char status, unsigned char staged_status,
5494 const char *path, struct got_object_id *blob_id,
5495 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5496 int dirfd, const char *de_name)
5498 struct got_status_arg *st = arg;
5500 if (status == staged_status && (status == GOT_STATUS_DELETE))
5501 status = GOT_STATUS_NO_CHANGE;
5502 if (st != NULL && st->status_codes) {
5503 size_t ncodes = strlen(st->status_codes);
5506 for (i = 0; i < ncodes ; i++) {
5508 if (status == st->status_codes[i] ||
5509 staged_status == st->status_codes[i]) {
5514 if (status == st->status_codes[i] ||
5515 staged_status == st->status_codes[i])
5520 if (st->suppress && j == 0)
5527 printf("%c%c %s\n", status, staged_status, path);
5531 static const struct got_error *
5532 cmd_status(int argc, char *argv[])
5534 const struct got_error *error = NULL;
5535 struct got_repository *repo = NULL;
5536 struct got_worktree *worktree = NULL;
5537 struct got_status_arg st;
5539 struct got_pathlist_head paths;
5540 struct got_pathlist_entry *pe;
5541 int ch, i, no_ignores = 0;
5545 memset(&st, 0, sizeof(st));
5546 st.status_codes = NULL;
5549 while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5555 if (st.status_codes != NULL && st.suppress == 0)
5556 option_conflict('S', 's');
5560 for (i = 0; i < strlen(optarg); i++) {
5561 switch (optarg[i]) {
5562 case GOT_STATUS_MODIFY:
5563 case GOT_STATUS_ADD:
5564 case GOT_STATUS_DELETE:
5565 case GOT_STATUS_CONFLICT:
5566 case GOT_STATUS_MISSING:
5567 case GOT_STATUS_OBSTRUCTED:
5568 case GOT_STATUS_UNVERSIONED:
5569 case GOT_STATUS_MODE_CHANGE:
5570 case GOT_STATUS_NONEXISTENT:
5573 errx(1, "invalid status code '%c'",
5577 if (ch == 's' && st.suppress)
5578 option_conflict('s', 'S');
5579 st.status_codes = optarg;
5591 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5595 cwd = getcwd(NULL, 0);
5597 error = got_error_from_errno("getcwd");
5601 error = got_worktree_open(&worktree, cwd);
5603 if (error->code == GOT_ERR_NOT_WORKTREE)
5604 error = wrap_not_worktree_error(error, "status", cwd);
5608 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5613 error = apply_unveil(got_repo_get_path(repo), 1,
5614 got_worktree_get_root_path(worktree));
5618 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5622 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5623 print_status, &st, check_cancelled, NULL);
5625 TAILQ_FOREACH(pe, &paths, entry)
5626 free((char *)pe->path);
5627 got_pathlist_free(&paths);
5636 "usage: %s ref [-r repository] [-l] [-t] [-c object] "
5637 "[-s reference] [-d] [name]\n",
5642 static const struct got_error *
5643 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
5645 static const struct got_error *err = NULL;
5646 struct got_reflist_head refs;
5647 struct got_reflist_entry *re;
5650 err = got_ref_list(&refs, repo, refname, sort_by_time ?
5651 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
5656 TAILQ_FOREACH(re, &refs, entry) {
5658 refstr = got_ref_to_str(re->ref);
5659 if (refstr == NULL) {
5660 err = got_error_from_errno("got_ref_to_str");
5663 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5667 got_ref_list_free(&refs);
5671 static const struct got_error *
5672 delete_ref_by_name(struct got_repository *repo, const char *refname)
5674 const struct got_error *err;
5675 struct got_reference *ref;
5677 err = got_ref_open(&ref, repo, refname, 0);
5681 err = delete_ref(repo, ref);
5686 static const struct got_error *
5687 add_ref(struct got_repository *repo, const char *refname, const char *target)
5689 const struct got_error *err = NULL;
5690 struct got_object_id *id = NULL;
5691 struct got_reference *ref = NULL;
5692 struct got_reflist_head refs;
5695 * Don't let the user create a reference name with a leading '-'.
5696 * While technically a valid reference name, this case is usually
5697 * an unintended typo.
5699 if (refname[0] == '-')
5700 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5703 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5706 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
5708 got_ref_list_free(&refs);
5712 err = got_ref_alloc(&ref, refname, id);
5716 err = got_ref_write(ref, repo);
5724 static const struct got_error *
5725 add_symref(struct got_repository *repo, const char *refname, const char *target)
5727 const struct got_error *err = NULL;
5728 struct got_reference *ref = NULL;
5729 struct got_reference *target_ref = NULL;
5732 * Don't let the user create a reference name with a leading '-'.
5733 * While technically a valid reference name, this case is usually
5734 * an unintended typo.
5736 if (refname[0] == '-')
5737 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5739 err = got_ref_open(&target_ref, repo, target, 0);
5743 err = got_ref_alloc_symref(&ref, refname, target_ref);
5747 err = got_ref_write(ref, repo);
5750 got_ref_close(target_ref);
5756 static const struct got_error *
5757 cmd_ref(int argc, char *argv[])
5759 const struct got_error *error = NULL;
5760 struct got_repository *repo = NULL;
5761 struct got_worktree *worktree = NULL;
5762 char *cwd = NULL, *repo_path = NULL;
5763 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
5764 const char *obj_arg = NULL, *symref_target= NULL;
5765 char *refname = NULL;
5767 while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
5776 repo_path = realpath(optarg, NULL);
5777 if (repo_path == NULL)
5778 return got_error_from_errno2("realpath",
5780 got_path_strip_trailing_slashes(repo_path);
5786 symref_target = optarg;
5797 if (obj_arg && do_list)
5798 option_conflict('c', 'l');
5799 if (obj_arg && do_delete)
5800 option_conflict('c', 'd');
5801 if (obj_arg && symref_target)
5802 option_conflict('c', 's');
5803 if (symref_target && do_delete)
5804 option_conflict('s', 'd');
5805 if (symref_target && do_list)
5806 option_conflict('s', 'l');
5807 if (do_delete && do_list)
5808 option_conflict('d', 'l');
5809 if (sort_by_time && !do_list)
5810 errx(1, "-t option requires -l option");
5816 if (argc != 0 && argc != 1)
5819 refname = strdup(argv[0]);
5820 if (refname == NULL) {
5821 error = got_error_from_errno("strdup");
5828 refname = strdup(argv[0]);
5829 if (refname == NULL) {
5830 error = got_error_from_errno("strdup");
5836 got_path_strip_trailing_slashes(refname);
5840 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5844 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5845 "sendfd unveil", NULL) == -1)
5849 cwd = getcwd(NULL, 0);
5851 error = got_error_from_errno("getcwd");
5855 if (repo_path == NULL) {
5856 error = got_worktree_open(&worktree, cwd);
5857 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5863 strdup(got_worktree_get_repo_path(worktree));
5864 if (repo_path == NULL)
5865 error = got_error_from_errno("strdup");
5869 repo_path = strdup(cwd);
5870 if (repo_path == NULL) {
5871 error = got_error_from_errno("strdup");
5877 error = got_repo_open(&repo, repo_path, NULL);
5881 error = apply_unveil(got_repo_get_path(repo), do_list,
5882 worktree ? got_worktree_get_root_path(worktree) : NULL);
5887 error = list_refs(repo, refname, sort_by_time);
5889 error = delete_ref_by_name(repo, refname);
5890 else if (symref_target)
5891 error = add_symref(repo, refname, symref_target);
5893 if (obj_arg == NULL)
5895 error = add_ref(repo, refname, obj_arg);
5900 const struct got_error *close_err = got_repo_close(repo);
5905 got_worktree_close(worktree);
5915 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
5916 "[-n] [name]\n", getprogname());
5920 static const struct got_error *
5921 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5922 struct got_reference *ref)
5924 const struct got_error *err = NULL;
5925 const char *refname, *marker = " ";
5928 refname = got_ref_get_name(ref);
5929 if (worktree && strcmp(refname,
5930 got_worktree_get_head_ref_name(worktree)) == 0) {
5931 struct got_object_id *id = NULL;
5933 err = got_ref_resolve(&id, repo, ref);
5936 if (got_object_id_cmp(id,
5937 got_worktree_get_base_commit_id(worktree)) == 0)
5944 if (strncmp(refname, "refs/heads/", 11) == 0)
5946 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5948 if (strncmp(refname, "refs/remotes/", 13) == 0)
5951 refstr = got_ref_to_str(ref);
5953 return got_error_from_errno("got_ref_to_str");
5955 printf("%s%s: %s\n", marker, refname, refstr);
5960 static const struct got_error *
5961 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5963 const char *refname;
5965 if (worktree == NULL)
5966 return got_error(GOT_ERR_NOT_WORKTREE);
5968 refname = got_worktree_get_head_ref_name(worktree);
5970 if (strncmp(refname, "refs/heads/", 11) == 0)
5972 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5975 printf("%s\n", refname);
5980 static const struct got_error *
5981 list_branches(struct got_repository *repo, struct got_worktree *worktree,
5984 static const struct got_error *err = NULL;
5985 struct got_reflist_head refs;
5986 struct got_reflist_entry *re;
5987 struct got_reference *temp_ref = NULL;
5988 int rebase_in_progress, histedit_in_progress;
5993 err = got_worktree_rebase_in_progress(&rebase_in_progress,
5998 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6003 if (rebase_in_progress || histedit_in_progress) {
6004 err = got_ref_open(&temp_ref, repo,
6005 got_worktree_get_head_ref_name(worktree), 0);
6008 list_branch(repo, worktree, temp_ref);
6009 got_ref_close(temp_ref);
6013 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6014 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6019 TAILQ_FOREACH(re, &refs, entry)
6020 list_branch(repo, worktree, re->ref);
6022 got_ref_list_free(&refs);
6024 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6025 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6030 TAILQ_FOREACH(re, &refs, entry)
6031 list_branch(repo, worktree, re->ref);
6033 got_ref_list_free(&refs);
6038 static const struct got_error *
6039 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6040 const char *branch_name)
6042 const struct got_error *err = NULL;
6043 struct got_reference *ref = NULL;
6044 char *refname, *remote_refname = NULL;
6046 if (strncmp(branch_name, "refs/", 5) == 0)
6048 if (strncmp(branch_name, "heads/", 6) == 0)
6050 else if (strncmp(branch_name, "remotes/", 8) == 0)
6053 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6054 return got_error_from_errno("asprintf");
6056 if (asprintf(&remote_refname, "refs/remotes/%s",
6057 branch_name) == -1) {
6058 err = got_error_from_errno("asprintf");
6062 err = got_ref_open(&ref, repo, refname, 0);
6064 const struct got_error *err2;
6065 if (err->code != GOT_ERR_NOT_REF)
6068 * Keep 'err' intact such that if neither branch exists
6069 * we report "refs/heads" rather than "refs/remotes" in
6070 * our error message.
6072 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6079 strcmp(got_worktree_get_head_ref_name(worktree),
6080 got_ref_get_name(ref)) == 0) {
6081 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6082 "will not delete this work tree's current branch");
6086 err = delete_ref(repo, ref);
6091 free(remote_refname);
6095 static const struct got_error *
6096 add_branch(struct got_repository *repo, const char *branch_name,
6097 struct got_object_id *base_commit_id)
6099 const struct got_error *err = NULL;
6100 struct got_reference *ref = NULL;
6101 char *base_refname = NULL, *refname = NULL;
6104 * Don't let the user create a branch name with a leading '-'.
6105 * While technically a valid reference name, this case is usually
6106 * an unintended typo.
6108 if (branch_name[0] == '-')
6109 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6111 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6114 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6115 err = got_error_from_errno("asprintf");
6119 err = got_ref_open(&ref, repo, refname, 0);
6121 err = got_error(GOT_ERR_BRANCH_EXISTS);
6123 } else if (err->code != GOT_ERR_NOT_REF)
6126 err = got_ref_alloc(&ref, refname, base_commit_id);
6130 err = got_ref_write(ref, repo);
6139 static const struct got_error *
6140 cmd_branch(int argc, char *argv[])
6142 const struct got_error *error = NULL;
6143 struct got_repository *repo = NULL;
6144 struct got_worktree *worktree = NULL;
6145 char *cwd = NULL, *repo_path = NULL;
6146 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6147 const char *delref = NULL, *commit_id_arg = NULL;
6148 struct got_reference *ref = NULL;
6149 struct got_pathlist_head paths;
6150 struct got_pathlist_entry *pe;
6151 struct got_object_id *commit_id = NULL;
6152 char *commit_id_str = NULL;
6156 while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6159 commit_id_arg = optarg;
6165 repo_path = realpath(optarg, NULL);
6166 if (repo_path == NULL)
6167 return got_error_from_errno2("realpath",
6169 got_path_strip_trailing_slashes(repo_path);
6186 if (do_list && delref)
6187 option_conflict('l', 'd');
6188 if (sort_by_time && !do_list)
6189 errx(1, "-t option requires -l option");
6194 if (!do_list && !delref && argc == 0)
6197 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6198 errx(1, "-c option can only be used when creating a branch");
6200 if (do_list || delref) {
6203 } else if (!do_show && argc != 1)
6207 if (do_list || do_show) {
6208 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6212 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6213 "sendfd unveil", NULL) == -1)
6217 cwd = getcwd(NULL, 0);
6219 error = got_error_from_errno("getcwd");
6223 if (repo_path == NULL) {
6224 error = got_worktree_open(&worktree, cwd);
6225 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6231 strdup(got_worktree_get_repo_path(worktree));
6232 if (repo_path == NULL)
6233 error = got_error_from_errno("strdup");
6237 repo_path = strdup(cwd);
6238 if (repo_path == NULL) {
6239 error = got_error_from_errno("strdup");
6245 error = got_repo_open(&repo, repo_path, NULL);
6249 error = apply_unveil(got_repo_get_path(repo), do_list,
6250 worktree ? got_worktree_get_root_path(worktree) : NULL);
6255 error = show_current_branch(repo, worktree);
6257 error = list_branches(repo, worktree, sort_by_time);
6259 error = delete_branch(repo, worktree, delref);
6261 struct got_reflist_head refs;
6263 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6267 if (commit_id_arg == NULL)
6268 commit_id_arg = worktree ?
6269 got_worktree_get_head_ref_name(worktree) :
6271 error = got_repo_match_object_id(&commit_id, NULL,
6272 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6273 got_ref_list_free(&refs);
6276 error = add_branch(repo, argv[0], commit_id);
6279 if (worktree && do_update) {
6280 struct got_update_progress_arg upa;
6281 char *branch_refname = NULL;
6283 error = got_object_id_str(&commit_id_str, commit_id);
6286 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6290 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6292 error = got_error_from_errno("asprintf");
6295 error = got_ref_open(&ref, repo, branch_refname, 0);
6296 free(branch_refname);
6299 error = switch_head_ref(ref, commit_id, worktree,
6303 error = got_worktree_set_base_commit_id(worktree, repo,
6307 memset(&upa, 0, sizeof(upa));
6308 error = got_worktree_checkout_files(worktree, &paths,
6309 repo, update_progress, &upa, check_cancelled,
6313 if (upa.did_something) {
6314 printf("Updated to %s: %s\n",
6315 got_worktree_get_head_ref_name(worktree),
6318 print_update_progress_stats(&upa);
6325 const struct got_error *close_err = got_repo_close(repo);
6330 got_worktree_close(worktree);
6334 free(commit_id_str);
6335 TAILQ_FOREACH(pe, &paths, entry)
6336 free((char *)pe->path);
6337 got_pathlist_free(&paths);
6346 "usage: %s tag [-c commit] [-r repository] [-l] "
6347 "[-m message] name\n", getprogname());
6352 static const struct got_error *
6353 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6355 const struct got_error *err = NULL;
6356 struct got_reflist_entry *re, *se, *new;
6357 struct got_object_id *re_id, *se_id;
6358 struct got_tag_object *re_tag, *se_tag;
6359 time_t re_time, se_time;
6361 STAILQ_FOREACH(re, tags, entry) {
6362 se = STAILQ_FIRST(sorted);
6364 err = got_reflist_entry_dup(&new, re);
6367 STAILQ_INSERT_HEAD(sorted, new, entry);
6370 err = got_ref_resolve(&re_id, repo, re->ref);
6373 err = got_object_open_as_tag(&re_tag, repo, re_id);
6377 re_time = got_object_tag_get_tagger_time(re_tag);
6378 got_object_tag_close(re_tag);
6382 err = got_ref_resolve(&se_id, repo, re->ref);
6385 err = got_object_open_as_tag(&se_tag, repo, se_id);
6389 se_time = got_object_tag_get_tagger_time(se_tag);
6390 got_object_tag_close(se_tag);
6392 if (se_time > re_time) {
6393 err = got_reflist_entry_dup(&new, re);
6396 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6399 se = STAILQ_NEXT(se, entry);
6408 static const struct got_error *
6409 list_tags(struct got_repository *repo, struct got_worktree *worktree)
6411 static const struct got_error *err = NULL;
6412 struct got_reflist_head refs;
6413 struct got_reflist_entry *re;
6417 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6421 TAILQ_FOREACH(re, &refs, entry) {
6422 const char *refname;
6423 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6427 struct got_object_id *id;
6428 struct got_tag_object *tag;
6429 struct got_commit_object *commit = NULL;
6431 refname = got_ref_get_name(re->ref);
6432 if (strncmp(refname, "refs/tags/", 10) != 0)
6435 refstr = got_ref_to_str(re->ref);
6436 if (refstr == NULL) {
6437 err = got_error_from_errno("got_ref_to_str");
6440 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6443 err = got_ref_resolve(&id, repo, re->ref);
6446 err = got_object_open_as_tag(&tag, repo, id);
6448 if (err->code != GOT_ERR_OBJ_TYPE) {
6452 /* "lightweight" tag */
6453 err = got_object_open_as_commit(&commit, repo, id);
6458 tagger = got_object_commit_get_committer(commit);
6460 got_object_commit_get_committer_time(commit);
6461 err = got_object_id_str(&id_str, id);
6467 tagger = got_object_tag_get_tagger(tag);
6468 tagger_time = got_object_tag_get_tagger_time(tag);
6469 err = got_object_id_str(&id_str,
6470 got_object_tag_get_object_id(tag));
6474 printf("from: %s\n", tagger);
6475 datestr = get_datestr(&tagger_time, datebuf);
6477 printf("date: %s UTC\n", datestr);
6479 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6481 switch (got_object_tag_get_object_type(tag)) {
6482 case GOT_OBJ_TYPE_BLOB:
6483 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6486 case GOT_OBJ_TYPE_TREE:
6487 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6490 case GOT_OBJ_TYPE_COMMIT:
6491 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6494 case GOT_OBJ_TYPE_TAG:
6495 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6504 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6507 got_object_commit_close(commit);
6509 tagmsg0 = strdup(got_object_tag_get_message(tag));
6510 got_object_tag_close(tag);
6511 if (tagmsg0 == NULL) {
6512 err = got_error_from_errno("strdup");
6519 line = strsep(&tagmsg, "\n");
6521 printf(" %s\n", line);
6526 got_ref_list_free(&refs);
6530 static const struct got_error *
6531 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6532 const char *tag_name, const char *repo_path)
6534 const struct got_error *err = NULL;
6535 char *template = NULL, *initial_content = NULL;
6536 char *editor = NULL;
6537 int initial_content_len;
6540 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6541 err = got_error_from_errno("asprintf");
6545 initial_content_len = asprintf(&initial_content,
6546 "\n# tagging commit %s as %s\n",
6547 commit_id_str, tag_name);
6548 if (initial_content_len == -1) {
6549 err = got_error_from_errno("asprintf");
6553 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6557 if (write(fd, initial_content, initial_content_len) == -1) {
6558 err = got_error_from_errno2("write", *tagmsg_path);
6562 err = get_editor(&editor);
6565 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6566 initial_content_len, 1);
6568 free(initial_content);
6572 if (fd != -1 && close(fd) == -1 && err == NULL)
6573 err = got_error_from_errno2("close", *tagmsg_path);
6575 /* Editor is done; we can now apply unveil(2) */
6577 err = apply_unveil(repo_path, 0, NULL);
6585 static const struct got_error *
6586 add_tag(struct got_repository *repo, struct got_worktree *worktree,
6587 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6589 const struct got_error *err = NULL;
6590 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6591 char *label = NULL, *commit_id_str = NULL;
6592 struct got_reference *ref = NULL;
6593 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6594 char *tagmsg_path = NULL, *tag_id_str = NULL;
6595 int preserve_tagmsg = 0;
6596 struct got_reflist_head refs;
6601 * Don't let the user create a tag name with a leading '-'.
6602 * While technically a valid reference name, this case is usually
6603 * an unintended typo.
6605 if (tag_name[0] == '-')
6606 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6608 err = get_author(&tagger, repo, worktree);
6612 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6616 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6617 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6621 err = got_object_id_str(&commit_id_str, commit_id);
6625 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6626 refname = strdup(tag_name);
6627 if (refname == NULL) {
6628 err = got_error_from_errno("strdup");
6632 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6633 err = got_error_from_errno("asprintf");
6637 err = got_ref_open(&ref, repo, refname, 0);
6639 err = got_error(GOT_ERR_TAG_EXISTS);
6641 } else if (err->code != GOT_ERR_NOT_REF)
6644 if (tagmsg_arg == NULL) {
6645 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6646 tag_name, got_repo_get_path(repo));
6648 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6649 tagmsg_path != NULL)
6650 preserve_tagmsg = 1;
6655 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6656 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6659 preserve_tagmsg = 1;
6663 err = got_ref_alloc(&ref, refname, tag_id);
6666 preserve_tagmsg = 1;
6670 err = got_ref_write(ref, repo);
6673 preserve_tagmsg = 1;
6677 err = got_object_id_str(&tag_id_str, tag_id);
6680 preserve_tagmsg = 1;
6683 printf("Created tag %s\n", tag_id_str);
6685 if (preserve_tagmsg) {
6686 fprintf(stderr, "%s: tag message preserved in %s\n",
6687 getprogname(), tagmsg_path);
6688 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6689 err = got_error_from_errno2("unlink", tagmsg_path);
6694 free(commit_id_str);
6699 got_ref_list_free(&refs);
6703 static const struct got_error *
6704 cmd_tag(int argc, char *argv[])
6706 const struct got_error *error = NULL;
6707 struct got_repository *repo = NULL;
6708 struct got_worktree *worktree = NULL;
6709 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6710 char *gitconfig_path = NULL;
6711 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6712 int ch, do_list = 0;
6714 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6717 commit_id_arg = optarg;
6723 repo_path = realpath(optarg, NULL);
6724 if (repo_path == NULL)
6725 return got_error_from_errno2("realpath",
6727 got_path_strip_trailing_slashes(repo_path);
6742 if (commit_id_arg != NULL)
6744 "-c option can only be used when creating a tag");
6746 option_conflict('l', 'm');
6749 } else if (argc != 1)
6756 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6760 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6761 "sendfd unveil", NULL) == -1)
6765 cwd = getcwd(NULL, 0);
6767 error = got_error_from_errno("getcwd");
6771 if (repo_path == NULL) {
6772 error = got_worktree_open(&worktree, cwd);
6773 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6779 strdup(got_worktree_get_repo_path(worktree));
6780 if (repo_path == NULL)
6781 error = got_error_from_errno("strdup");
6785 repo_path = strdup(cwd);
6786 if (repo_path == NULL) {
6787 error = got_error_from_errno("strdup");
6794 error = got_repo_open(&repo, repo_path, NULL);
6797 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6800 error = list_tags(repo, worktree);
6802 error = get_gitconfig_path(&gitconfig_path);
6805 error = got_repo_open(&repo, repo_path, gitconfig_path);
6810 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6815 if (commit_id_arg == NULL) {
6816 struct got_reference *head_ref;
6817 struct got_object_id *commit_id;
6818 error = got_ref_open(&head_ref, repo,
6819 worktree ? got_worktree_get_head_ref_name(worktree)
6823 error = got_ref_resolve(&commit_id, repo, head_ref);
6824 got_ref_close(head_ref);
6827 error = got_object_id_str(&commit_id_str, commit_id);
6833 error = add_tag(repo, worktree, tag_name,
6834 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6838 const struct got_error *close_err = got_repo_close(repo);
6843 got_worktree_close(worktree);
6846 free(gitconfig_path);
6847 free(commit_id_str);
6854 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6859 static const struct got_error *
6860 add_progress(void *arg, unsigned char status, const char *path)
6862 while (path[0] == '/')
6864 printf("%c %s\n", status, path);
6868 static const struct got_error *
6869 cmd_add(int argc, char *argv[])
6871 const struct got_error *error = NULL;
6872 struct got_repository *repo = NULL;
6873 struct got_worktree *worktree = NULL;
6875 struct got_pathlist_head paths;
6876 struct got_pathlist_entry *pe;
6877 int ch, can_recurse = 0, no_ignores = 0;
6881 while ((ch = getopt(argc, argv, "IR")) != -1) {
6899 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6906 cwd = getcwd(NULL, 0);
6908 error = got_error_from_errno("getcwd");
6912 error = got_worktree_open(&worktree, cwd);
6914 if (error->code == GOT_ERR_NOT_WORKTREE)
6915 error = wrap_not_worktree_error(error, "add", cwd);
6919 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6924 error = apply_unveil(got_repo_get_path(repo), 1,
6925 got_worktree_get_root_path(worktree));
6929 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6936 TAILQ_FOREACH(pe, &paths, entry) {
6937 if (asprintf(&ondisk_path, "%s/%s",
6938 got_worktree_get_root_path(worktree),
6940 error = got_error_from_errno("asprintf");
6943 if (lstat(ondisk_path, &sb) == -1) {
6944 if (errno == ENOENT) {
6948 error = got_error_from_errno2("lstat",
6954 if (S_ISDIR(sb.st_mode)) {
6955 error = got_error_msg(GOT_ERR_BAD_PATH,
6956 "adding directories requires -R option");
6962 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6963 NULL, repo, no_ignores);
6966 const struct got_error *close_err = got_repo_close(repo);
6971 got_worktree_close(worktree);
6972 TAILQ_FOREACH(pe, &paths, entry)
6973 free((char *)pe->path);
6974 got_pathlist_free(&paths);
6982 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6983 "path ...\n", getprogname());
6987 static const struct got_error *
6988 print_remove_status(void *arg, unsigned char status,
6989 unsigned char staged_status, const char *path)
6991 while (path[0] == '/')
6993 if (status == GOT_STATUS_NONEXISTENT)
6995 if (status == staged_status && (status == GOT_STATUS_DELETE))
6996 status = GOT_STATUS_NO_CHANGE;
6997 printf("%c%c %s\n", status, staged_status, path);
7001 static const struct got_error *
7002 cmd_remove(int argc, char *argv[])
7004 const struct got_error *error = NULL;
7005 struct got_worktree *worktree = NULL;
7006 struct got_repository *repo = NULL;
7007 const char *status_codes = NULL;
7009 struct got_pathlist_head paths;
7010 struct got_pathlist_entry *pe;
7011 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7012 int ignore_missing_paths = 0;
7016 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7019 delete_local_mods = 1;
7020 ignore_missing_paths = 1;
7029 for (i = 0; i < strlen(optarg); i++) {
7030 switch (optarg[i]) {
7031 case GOT_STATUS_MODIFY:
7032 delete_local_mods = 1;
7034 case GOT_STATUS_MISSING:
7035 ignore_missing_paths = 1;
7038 errx(1, "invalid status code '%c'",
7042 status_codes = optarg;
7054 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7061 cwd = getcwd(NULL, 0);
7063 error = got_error_from_errno("getcwd");
7066 error = got_worktree_open(&worktree, cwd);
7068 if (error->code == GOT_ERR_NOT_WORKTREE)
7069 error = wrap_not_worktree_error(error, "remove", cwd);
7073 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7078 error = apply_unveil(got_repo_get_path(repo), 1,
7079 got_worktree_get_root_path(worktree));
7083 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7090 TAILQ_FOREACH(pe, &paths, entry) {
7091 if (asprintf(&ondisk_path, "%s/%s",
7092 got_worktree_get_root_path(worktree),
7094 error = got_error_from_errno("asprintf");
7097 if (lstat(ondisk_path, &sb) == -1) {
7098 if (errno == ENOENT) {
7102 error = got_error_from_errno2("lstat",
7108 if (S_ISDIR(sb.st_mode)) {
7109 error = got_error_msg(GOT_ERR_BAD_PATH,
7110 "removing directories requires -R option");
7116 error = got_worktree_schedule_delete(worktree, &paths,
7117 delete_local_mods, status_codes, print_remove_status, NULL,
7118 repo, keep_on_disk, ignore_missing_paths);
7121 const struct got_error *close_err = got_repo_close(repo);
7126 got_worktree_close(worktree);
7127 TAILQ_FOREACH(pe, &paths, entry)
7128 free((char *)pe->path);
7129 got_pathlist_free(&paths);
7137 fprintf(stderr, "usage: %s patch [-n] [patchfile]\n",
7142 static const struct got_error *
7143 patch_from_stdin(int *patchfd)
7145 const struct got_error *err = NULL;
7147 char *path, buf[BUFSIZ];
7148 sig_t sighup, sigint, sigquit;
7150 err = got_opentemp_named_fd(&path, patchfd,
7151 GOT_TMPDIR_STR "/got-patch");
7157 sighup = signal(SIGHUP, SIG_DFL);
7158 sigint = signal(SIGINT, SIG_DFL);
7159 sigquit = signal(SIGQUIT, SIG_DFL);
7162 r = read(0, buf, sizeof(buf));
7164 err = got_error_from_errno("read");
7169 if (write(*patchfd, buf, r) == -1) {
7170 err = got_error_from_errno("write");
7175 signal(SIGHUP, sighup);
7176 signal(SIGINT, sigint);
7177 signal(SIGQUIT, sigquit);
7179 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7180 err = got_error_from_errno("lseek");
7190 static const struct got_error *
7191 patch_progress(void *arg, const char *old, const char *new,
7192 unsigned char status, const struct got_error *error, long old_from,
7193 long old_lines, long new_from, long new_lines, long offset,
7194 const struct got_error *hunk_err)
7196 const char *path = new == NULL ? old : new;
7198 while (*path == '/')
7202 printf("%c %s\n", status, path);
7205 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7207 if (offset != 0 || hunk_err != NULL) {
7208 printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
7209 old_lines, new_from, new_lines);
7210 if (hunk_err != NULL)
7211 printf("%s\n", hunk_err->msg);
7213 printf("applied with offset %ld\n", offset);
7219 static const struct got_error *
7220 cmd_patch(int argc, char *argv[])
7222 const struct got_error *error = NULL, *close_error = NULL;
7223 struct got_worktree *worktree = NULL;
7224 struct got_repository *repo = NULL;
7227 int ch, nop = 0, strip = -1;
7230 while ((ch = getopt(argc, argv, "np:")) != -1) {
7236 strip = strtonum(optarg, 0, INT_MAX, &errstr);
7238 errx(1, "pathname strip count is %s: %s",
7251 error = patch_from_stdin(&patchfd);
7254 } else if (argc == 1) {
7255 patchfd = open(argv[0], O_RDONLY);
7256 if (patchfd == -1) {
7257 error = got_error_from_errno2("open", argv[0]);
7263 if ((cwd = getcwd(NULL, 0)) == NULL) {
7264 error = got_error_from_errno("getcwd");
7268 error = got_worktree_open(&worktree, cwd);
7272 const char *repo_path = got_worktree_get_repo_path(worktree);
7273 error = got_repo_open(&repo, repo_path, NULL);
7277 error = apply_unveil(got_repo_get_path(repo), 0,
7278 worktree ? got_worktree_get_root_path(worktree) : NULL);
7283 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock",
7288 error = got_patch(patchfd, worktree, repo, nop, strip,
7289 &patch_progress, NULL, check_cancelled, NULL);
7293 close_error = got_repo_close(repo);
7295 error = close_error;
7297 if (worktree != NULL) {
7298 close_error = got_worktree_close(worktree);
7300 error = close_error;
7309 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7310 "path ...\n", getprogname());
7314 static const struct got_error *
7315 revert_progress(void *arg, unsigned char status, const char *path)
7317 if (status == GOT_STATUS_UNVERSIONED)
7320 while (path[0] == '/')
7322 printf("%c %s\n", status, path);
7326 struct choose_patch_arg {
7327 FILE *patch_script_file;
7331 static const struct got_error *
7332 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7333 int nchanges, const char *action)
7336 size_t linesize = 0;
7340 case GOT_STATUS_ADD:
7341 printf("A %s\n%s this addition? [y/n] ", path, action);
7343 case GOT_STATUS_DELETE:
7344 printf("D %s\n%s this deletion? [y/n] ", path, action);
7346 case GOT_STATUS_MODIFY:
7347 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7348 return got_error_from_errno("fseek");
7349 printf(GOT_COMMIT_SEP_STR);
7350 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7352 if (ferror(patch_file))
7353 return got_error_from_errno("getline");
7354 printf(GOT_COMMIT_SEP_STR);
7355 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7356 path, n, nchanges, action);
7359 return got_error_path(path, GOT_ERR_FILE_STATUS);
7365 static const struct got_error *
7366 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7367 FILE *patch_file, int n, int nchanges)
7369 const struct got_error *err = NULL;
7371 size_t linesize = 0;
7374 struct choose_patch_arg *a = arg;
7376 *choice = GOT_PATCH_CHOICE_NONE;
7378 if (a->patch_script_file) {
7380 err = show_change(status, path, patch_file, n, nchanges,
7384 linelen = getline(&line, &linesize, a->patch_script_file);
7385 if (linelen == -1) {
7386 if (ferror(a->patch_script_file))
7387 return got_error_from_errno("getline");
7390 nl = strchr(line, '\n');
7393 if (strcmp(line, "y") == 0) {
7394 *choice = GOT_PATCH_CHOICE_YES;
7396 } else if (strcmp(line, "n") == 0) {
7397 *choice = GOT_PATCH_CHOICE_NO;
7399 } else if (strcmp(line, "q") == 0 &&
7400 status == GOT_STATUS_MODIFY) {
7401 *choice = GOT_PATCH_CHOICE_QUIT;
7404 printf("invalid response '%s'\n", line);
7409 while (resp != 'y' && resp != 'n' && resp != 'q') {
7410 err = show_change(status, path, patch_file, n, nchanges,
7417 if (status == GOT_STATUS_MODIFY) {
7418 if (resp != 'y' && resp != 'n' && resp != 'q') {
7419 printf("invalid response '%c'\n", resp);
7422 } else if (resp != 'y' && resp != 'n') {
7423 printf("invalid response '%c'\n", resp);
7429 *choice = GOT_PATCH_CHOICE_YES;
7430 else if (resp == 'n')
7431 *choice = GOT_PATCH_CHOICE_NO;
7432 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7433 *choice = GOT_PATCH_CHOICE_QUIT;
7438 static const struct got_error *
7439 cmd_revert(int argc, char *argv[])
7441 const struct got_error *error = NULL;
7442 struct got_worktree *worktree = NULL;
7443 struct got_repository *repo = NULL;
7444 char *cwd = NULL, *path = NULL;
7445 struct got_pathlist_head paths;
7446 struct got_pathlist_entry *pe;
7447 int ch, can_recurse = 0, pflag = 0;
7448 FILE *patch_script_file = NULL;
7449 const char *patch_script_path = NULL;
7450 struct choose_patch_arg cpa;
7454 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7460 patch_script_path = optarg;
7475 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7476 "unveil", NULL) == -1)
7481 if (patch_script_path && !pflag)
7482 errx(1, "-F option can only be used together with -p option");
7484 cwd = getcwd(NULL, 0);
7486 error = got_error_from_errno("getcwd");
7489 error = got_worktree_open(&worktree, cwd);
7491 if (error->code == GOT_ERR_NOT_WORKTREE)
7492 error = wrap_not_worktree_error(error, "revert", cwd);
7496 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7501 if (patch_script_path) {
7502 patch_script_file = fopen(patch_script_path, "re");
7503 if (patch_script_file == NULL) {
7504 error = got_error_from_errno2("fopen",
7509 error = apply_unveil(got_repo_get_path(repo), 1,
7510 got_worktree_get_root_path(worktree));
7514 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7521 TAILQ_FOREACH(pe, &paths, entry) {
7522 if (asprintf(&ondisk_path, "%s/%s",
7523 got_worktree_get_root_path(worktree),
7525 error = got_error_from_errno("asprintf");
7528 if (lstat(ondisk_path, &sb) == -1) {
7529 if (errno == ENOENT) {
7533 error = got_error_from_errno2("lstat",
7539 if (S_ISDIR(sb.st_mode)) {
7540 error = got_error_msg(GOT_ERR_BAD_PATH,
7541 "reverting directories requires -R option");
7547 cpa.patch_script_file = patch_script_file;
7548 cpa.action = "revert";
7549 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7550 pflag ? choose_patch : NULL, &cpa, repo);
7552 if (patch_script_file && fclose(patch_script_file) == EOF &&
7554 error = got_error_from_errno2("fclose", patch_script_path);
7556 const struct got_error *close_err = got_repo_close(repo);
7561 got_worktree_close(worktree);
7570 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
7571 "[path ...]\n", getprogname());
7575 struct collect_commit_logmsg_arg {
7576 const char *cmdline_log;
7577 const char *prepared_log;
7578 int non_interactive;
7580 const char *worktree_path;
7581 const char *branch_name;
7582 const char *repo_path;
7587 static const struct got_error *
7588 read_prepared_logmsg(char **logmsg, const char *path)
7590 const struct got_error *err = NULL;
7596 memset(&sb, 0, sizeof(sb));
7598 f = fopen(path, "re");
7600 return got_error_from_errno2("fopen", path);
7602 if (fstat(fileno(f), &sb) == -1) {
7603 err = got_error_from_errno2("fstat", path);
7606 if (sb.st_size == 0) {
7607 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7611 *logmsg = malloc(sb.st_size + 1);
7612 if (*logmsg == NULL) {
7613 err = got_error_from_errno("malloc");
7617 r = fread(*logmsg, 1, sb.st_size, f);
7618 if (r != sb.st_size) {
7620 err = got_error_from_errno2("fread", path);
7622 err = got_error(GOT_ERR_IO);
7625 (*logmsg)[sb.st_size] = '\0';
7627 if (fclose(f) == EOF && err == NULL)
7628 err = got_error_from_errno2("fclose", path);
7637 static const struct got_error *
7638 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7641 char *initial_content = NULL;
7642 struct got_pathlist_entry *pe;
7643 const struct got_error *err = NULL;
7644 char *template = NULL;
7645 struct collect_commit_logmsg_arg *a = arg;
7646 int initial_content_len;
7650 /* if a message was specified on the command line, just use it */
7651 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7652 len = strlen(a->cmdline_log) + 1;
7653 *logmsg = malloc(len + 1);
7654 if (*logmsg == NULL)
7655 return got_error_from_errno("malloc");
7656 strlcpy(*logmsg, a->cmdline_log, len);
7658 } else if (a->prepared_log != NULL && a->non_interactive)
7659 return read_prepared_logmsg(logmsg, a->prepared_log);
7661 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7662 return got_error_from_errno("asprintf");
7664 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7668 if (a->prepared_log) {
7670 err = read_prepared_logmsg(&msg, a->prepared_log);
7673 if (write(fd, msg, strlen(msg)) == -1) {
7674 err = got_error_from_errno2("write", a->logmsg_path);
7681 initial_content_len = asprintf(&initial_content,
7682 "\n# changes to be committed on branch %s:\n",
7684 if (initial_content_len == -1) {
7685 err = got_error_from_errno("asprintf");
7689 if (write(fd, initial_content, initial_content_len) == -1) {
7690 err = got_error_from_errno2("write", a->logmsg_path);
7694 TAILQ_FOREACH(pe, commitable_paths, entry) {
7695 struct got_commitable *ct = pe->data;
7696 dprintf(fd, "# %c %s\n",
7697 got_commitable_get_status(ct),
7698 got_commitable_get_path(ct));
7701 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7702 initial_content_len, a->prepared_log ? 0 : 1);
7704 free(initial_content);
7707 if (fd != -1 && close(fd) == -1 && err == NULL)
7708 err = got_error_from_errno2("close", a->logmsg_path);
7710 /* Editor is done; we can now apply unveil(2) */
7712 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7720 static const struct got_error *
7721 cmd_commit(int argc, char *argv[])
7723 const struct got_error *error = NULL;
7724 struct got_worktree *worktree = NULL;
7725 struct got_repository *repo = NULL;
7726 char *cwd = NULL, *id_str = NULL;
7727 struct got_object_id *id = NULL;
7728 const char *logmsg = NULL;
7729 char *prepared_logmsg = NULL;
7730 struct collect_commit_logmsg_arg cl_arg;
7731 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7732 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7733 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7734 struct got_pathlist_head paths;
7737 cl_arg.logmsg_path = NULL;
7739 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7743 option_conflict('F', 'm');
7744 prepared_logmsg = realpath(optarg, NULL);
7745 if (prepared_logmsg == NULL)
7746 return got_error_from_errno2("realpath",
7750 if (prepared_logmsg)
7751 option_conflict('m', 'F');
7755 non_interactive = 1;
7758 allow_bad_symlinks = 1;
7770 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7771 "unveil", NULL) == -1)
7774 cwd = getcwd(NULL, 0);
7776 error = got_error_from_errno("getcwd");
7779 error = got_worktree_open(&worktree, cwd);
7781 if (error->code == GOT_ERR_NOT_WORKTREE)
7782 error = wrap_not_worktree_error(error, "commit", cwd);
7786 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7789 if (rebase_in_progress) {
7790 error = got_error(GOT_ERR_REBASING);
7794 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7799 error = get_gitconfig_path(&gitconfig_path);
7802 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7807 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7810 if (merge_in_progress) {
7811 error = got_error(GOT_ERR_MERGE_BUSY);
7815 error = get_author(&author, repo, worktree);
7820 * unveil(2) traverses exec(2); if an editor is used we have
7821 * to apply unveil after the log message has been written.
7823 if (logmsg == NULL || strlen(logmsg) == 0)
7824 error = get_editor(&editor);
7826 error = apply_unveil(got_repo_get_path(repo), 0,
7827 got_worktree_get_root_path(worktree));
7831 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7835 cl_arg.editor = editor;
7836 cl_arg.cmdline_log = logmsg;
7837 cl_arg.prepared_log = prepared_logmsg;
7838 cl_arg.non_interactive = non_interactive;
7839 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7840 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7841 if (!histedit_in_progress) {
7842 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7843 error = got_error(GOT_ERR_COMMIT_BRANCH);
7846 cl_arg.branch_name += 11;
7848 cl_arg.repo_path = got_repo_get_path(repo);
7849 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7850 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7851 print_status, NULL, repo);
7853 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7854 cl_arg.logmsg_path != NULL)
7855 preserve_logmsg = 1;
7859 error = got_object_id_str(&id_str, id);
7862 printf("Created commit %s\n", id_str);
7864 if (preserve_logmsg) {
7865 fprintf(stderr, "%s: log message preserved in %s\n",
7866 getprogname(), cl_arg.logmsg_path);
7867 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7869 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7870 free(cl_arg.logmsg_path);
7872 const struct got_error *close_err = got_repo_close(repo);
7877 got_worktree_close(worktree);
7880 free(gitconfig_path);
7883 free(prepared_logmsg);
7890 fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
7891 "[-r repository-path] [-t tag] [-T] [-q] [-v] "
7892 "[remote-repository]\n", getprogname());
7897 print_load_info(int print_colored, int print_found, int print_trees,
7898 int ncolored, int nfound, int ntrees)
7900 if (print_colored) {
7901 printf("%d commit%s colored", ncolored,
7902 ncolored == 1 ? "" : "s");
7905 printf("%s%d object%s found",
7906 ncolored > 0 ? "; " : "",
7907 nfound, nfound == 1 ? "" : "s");
7910 printf("; %d tree%s scanned", ntrees,
7911 ntrees == 1 ? "" : "s");
7915 struct got_send_progress_arg {
7916 char last_scaled_packsize[FMT_SCALED_STRSIZE];
7923 int last_nobj_total;
7927 int printed_something;
7929 struct got_pathlist_head *delete_branches;
7932 static const struct got_error *
7933 send_progress(void *arg, int ncolored, int nfound, int ntrees,
7934 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
7935 int nobj_written, off_t bytes_sent, const char *refname, int success)
7937 struct got_send_progress_arg *a = arg;
7938 char scaled_packsize[FMT_SCALED_STRSIZE];
7939 char scaled_sent[FMT_SCALED_STRSIZE];
7940 int p_deltify = 0, p_written = 0, p_sent = 0;
7941 int print_colored = 0, print_found = 0, print_trees = 0;
7942 int print_searching = 0, print_total = 0;
7943 int print_deltify = 0, print_written = 0, print_sent = 0;
7945 if (a->verbosity < 0)
7949 const char *status = success ? "accepted" : "rejected";
7952 struct got_pathlist_entry *pe;
7953 TAILQ_FOREACH(pe, a->delete_branches, entry) {
7954 const char *branchname = pe->path;
7955 if (got_path_cmp(branchname, refname,
7956 strlen(branchname), strlen(refname)) == 0) {
7958 a->sent_something = 1;
7964 if (a->printed_something)
7966 printf("Server has %s %s", status, refname);
7967 a->printed_something = 1;
7971 if (a->last_ncolored != ncolored) {
7973 a->last_ncolored = ncolored;
7976 if (a->last_nfound != nfound) {
7979 a->last_nfound = nfound;
7982 if (a->last_ntrees != ntrees) {
7986 a->last_ntrees = ntrees;
7989 if ((print_colored || print_found || print_trees) &&
7992 print_load_info(print_colored, print_found, print_trees,
7993 ncolored, nfound, ntrees);
7994 a->printed_something = 1;
7997 } else if (!a->loading_done) {
7999 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8001 a->loading_done = 1;
8004 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8005 return got_error_from_errno("fmt_scaled");
8006 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8007 return got_error_from_errno("fmt_scaled");
8009 if (a->last_ncommits != ncommits) {
8010 print_searching = 1;
8011 a->last_ncommits = ncommits;
8014 if (a->last_nobj_total != nobj_total) {
8015 print_searching = 1;
8017 a->last_nobj_total = nobj_total;
8020 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8021 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8022 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8023 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8024 return got_error(GOT_ERR_NO_SPACE);
8027 if (nobj_deltify > 0 || nobj_written > 0) {
8028 if (nobj_deltify > 0) {
8029 p_deltify = (nobj_deltify * 100) / nobj_total;
8030 if (p_deltify != a->last_p_deltify) {
8031 a->last_p_deltify = p_deltify;
8032 print_searching = 1;
8037 if (nobj_written > 0) {
8038 p_written = (nobj_written * 100) / nobj_total;
8039 if (p_written != a->last_p_written) {
8040 a->last_p_written = p_written;
8041 print_searching = 1;
8049 if (bytes_sent > 0) {
8050 p_sent = (bytes_sent * 100) / packfile_size;
8051 if (p_sent != a->last_p_sent) {
8052 a->last_p_sent = p_sent;
8053 print_searching = 1;
8059 a->sent_something = 1;
8062 if (print_searching || print_total || print_deltify || print_written ||
8065 if (print_searching)
8066 printf("packing %d reference%s", ncommits,
8067 ncommits == 1 ? "" : "s");
8069 printf("; %d object%s", nobj_total,
8070 nobj_total == 1 ? "" : "s");
8072 printf("; deltify: %d%%", p_deltify);
8074 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8075 scaled_packsize, p_sent);
8076 else if (print_written)
8077 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8078 scaled_packsize, p_written);
8079 if (print_searching || print_total || print_deltify ||
8080 print_written || print_sent) {
8081 a->printed_something = 1;
8087 static const struct got_error *
8088 cmd_send(int argc, char *argv[])
8090 const struct got_error *error = NULL;
8091 char *cwd = NULL, *repo_path = NULL;
8092 const char *remote_name;
8093 char *proto = NULL, *host = NULL, *port = NULL;
8094 char *repo_name = NULL, *server_path = NULL;
8095 const struct got_remote_repo *remotes, *remote = NULL;
8096 int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
8097 struct got_repository *repo = NULL;
8098 struct got_worktree *worktree = NULL;
8099 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8100 struct got_pathlist_head branches;
8101 struct got_pathlist_head tags;
8102 struct got_reflist_head all_branches;
8103 struct got_reflist_head all_tags;
8104 struct got_pathlist_head delete_args;
8105 struct got_pathlist_head delete_branches;
8106 struct got_reflist_entry *re;
8107 struct got_pathlist_entry *pe;
8108 int i, ch, sendfd = -1, sendstatus;
8110 struct got_send_progress_arg spa;
8111 int verbosity = 0, overwrite_refs = 0;
8112 int send_all_branches = 0, send_all_tags = 0;
8113 struct got_reference *ref = NULL;
8115 TAILQ_INIT(&branches);
8117 TAILQ_INIT(&all_branches);
8118 TAILQ_INIT(&all_tags);
8119 TAILQ_INIT(&delete_args);
8120 TAILQ_INIT(&delete_branches);
8122 while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8125 send_all_branches = 1;
8128 error = got_pathlist_append(&branches, optarg, NULL);
8134 error = got_pathlist_append(&delete_args, optarg, NULL);
8142 repo_path = realpath(optarg, NULL);
8143 if (repo_path == NULL)
8144 return got_error_from_errno2("realpath",
8146 got_path_strip_trailing_slashes(repo_path);
8149 error = got_pathlist_append(&tags, optarg, NULL);
8160 else if (verbosity < 3)
8174 if (send_all_branches && !TAILQ_EMPTY(&branches))
8175 option_conflict('a', 'b');
8176 if (send_all_tags && !TAILQ_EMPTY(&tags))
8177 option_conflict('T', 't');
8181 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8183 remote_name = argv[0];
8187 cwd = getcwd(NULL, 0);
8189 error = got_error_from_errno("getcwd");
8193 if (repo_path == NULL) {
8194 error = got_worktree_open(&worktree, cwd);
8195 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8201 strdup(got_worktree_get_repo_path(worktree));
8202 if (repo_path == NULL)
8203 error = got_error_from_errno("strdup");
8207 repo_path = strdup(cwd);
8208 if (repo_path == NULL) {
8209 error = got_error_from_errno("strdup");
8215 error = got_repo_open(&repo, repo_path, NULL);
8220 worktree_conf = got_worktree_get_gotconfig(worktree);
8221 if (worktree_conf) {
8222 got_gotconfig_get_remotes(&nremotes, &remotes,
8224 for (i = 0; i < nremotes; i++) {
8225 if (strcmp(remotes[i].name, remote_name) == 0) {
8226 remote = &remotes[i];
8232 if (remote == NULL) {
8233 repo_conf = got_repo_get_gotconfig(repo);
8235 got_gotconfig_get_remotes(&nremotes, &remotes,
8237 for (i = 0; i < nremotes; i++) {
8238 if (strcmp(remotes[i].name, remote_name) == 0) {
8239 remote = &remotes[i];
8245 if (remote == NULL) {
8246 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8247 for (i = 0; i < nremotes; i++) {
8248 if (strcmp(remotes[i].name, remote_name) == 0) {
8249 remote = &remotes[i];
8254 if (remote == NULL) {
8255 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8259 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8260 &repo_name, remote->send_url);
8264 if (strcmp(proto, "git") == 0) {
8266 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8267 "sendfd dns inet unveil", NULL) == -1)
8270 } else if (strcmp(proto, "git+ssh") == 0 ||
8271 strcmp(proto, "ssh") == 0) {
8273 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8274 "sendfd unveil", NULL) == -1)
8277 } else if (strcmp(proto, "http") == 0 ||
8278 strcmp(proto, "git+http") == 0) {
8279 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8282 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8286 error = got_dial_apply_unveil(proto);
8290 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8294 if (send_all_branches) {
8295 error = got_ref_list(&all_branches, repo, "refs/heads",
8296 got_ref_cmp_by_name, NULL);
8299 TAILQ_FOREACH(re, &all_branches, entry) {
8300 const char *branchname = got_ref_get_name(re->ref);
8301 error = got_pathlist_append(&branches,
8307 } else if (nbranches == 0) {
8308 for (i = 0; i < remote->nsend_branches; i++) {
8309 got_pathlist_append(&branches,
8310 remote->send_branches[i], NULL);
8314 if (send_all_tags) {
8315 error = got_ref_list(&all_tags, repo, "refs/tags",
8316 got_ref_cmp_by_name, NULL);
8319 TAILQ_FOREACH(re, &all_tags, entry) {
8320 const char *tagname = got_ref_get_name(re->ref);
8321 error = got_pathlist_append(&tags,
8330 * To prevent accidents only branches in refs/heads/ can be deleted
8331 * with 'got send -d'.
8332 * Deleting anything else requires local repository access or Git.
8334 TAILQ_FOREACH(pe, &delete_args, entry) {
8335 const char *branchname = pe->path;
8337 struct got_pathlist_entry *new;
8338 if (strncmp(branchname, "refs/heads/", 11) == 0) {
8339 s = strdup(branchname);
8341 error = got_error_from_errno("strdup");
8345 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8346 error = got_error_from_errno("asprintf");
8350 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8351 if (error || new == NULL /* duplicate */)
8358 if (nbranches == 0 && ndelete_branches == 0) {
8359 struct got_reference *head_ref;
8361 error = got_ref_open(&head_ref, repo,
8362 got_worktree_get_head_ref_name(worktree), 0);
8364 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8367 if (got_ref_is_symbolic(head_ref)) {
8368 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8369 got_ref_close(head_ref);
8374 error = got_pathlist_append(&branches, got_ref_get_name(ref),
8382 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8383 port ? ":" : "", port ? port : "");
8385 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8386 server_path, verbosity);
8390 memset(&spa, 0, sizeof(spa));
8391 spa.last_scaled_packsize[0] = '\0';
8392 spa.last_p_deltify = -1;
8393 spa.last_p_written = -1;
8394 spa.verbosity = verbosity;
8395 spa.delete_branches = &delete_branches;
8396 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8397 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8398 check_cancelled, NULL);
8399 if (spa.printed_something)
8403 if (!spa.sent_something && verbosity >= 0)
8404 printf("Already up-to-date\n");
8407 if (kill(sendpid, SIGTERM) == -1)
8408 error = got_error_from_errno("kill");
8409 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8410 error = got_error_from_errno("waitpid");
8412 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8413 error = got_error_from_errno("close");
8415 const struct got_error *close_err = got_repo_close(repo);
8420 got_worktree_close(worktree);
8423 got_pathlist_free(&branches);
8424 got_pathlist_free(&tags);
8425 got_ref_list_free(&all_branches);
8426 got_ref_list_free(&all_tags);
8427 got_pathlist_free(&delete_args);
8428 TAILQ_FOREACH(pe, &delete_branches, entry)
8429 free((char *)pe->path);
8430 got_pathlist_free(&delete_branches);
8442 usage_cherrypick(void)
8444 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8448 static const struct got_error *
8449 cmd_cherrypick(int argc, char *argv[])
8451 const struct got_error *error = NULL;
8452 struct got_worktree *worktree = NULL;
8453 struct got_repository *repo = NULL;
8454 char *cwd = NULL, *commit_id_str = NULL;
8455 struct got_object_id *commit_id = NULL;
8456 struct got_commit_object *commit = NULL;
8457 struct got_object_qid *pid;
8459 struct got_update_progress_arg upa;
8461 while ((ch = getopt(argc, argv, "")) != -1) {
8473 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8474 "unveil", NULL) == -1)
8480 cwd = getcwd(NULL, 0);
8482 error = got_error_from_errno("getcwd");
8485 error = got_worktree_open(&worktree, cwd);
8487 if (error->code == GOT_ERR_NOT_WORKTREE)
8488 error = wrap_not_worktree_error(error, "cherrypick",
8493 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8498 error = apply_unveil(got_repo_get_path(repo), 0,
8499 got_worktree_get_root_path(worktree));
8503 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8504 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8507 error = got_object_id_str(&commit_id_str, commit_id);
8511 error = got_object_open_as_commit(&commit, repo, commit_id);
8514 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8515 memset(&upa, 0, sizeof(upa));
8516 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
8517 commit_id, repo, update_progress, &upa, check_cancelled,
8522 if (upa.did_something)
8523 printf("Merged commit %s\n", commit_id_str);
8524 print_merge_progress_stats(&upa);
8527 got_object_commit_close(commit);
8528 free(commit_id_str);
8530 got_worktree_close(worktree);
8532 const struct got_error *close_err = got_repo_close(repo);
8542 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
8546 static const struct got_error *
8547 cmd_backout(int argc, char *argv[])
8549 const struct got_error *error = NULL;
8550 struct got_worktree *worktree = NULL;
8551 struct got_repository *repo = NULL;
8552 char *cwd = NULL, *commit_id_str = NULL;
8553 struct got_object_id *commit_id = NULL;
8554 struct got_commit_object *commit = NULL;
8555 struct got_object_qid *pid;
8557 struct got_update_progress_arg upa;
8559 while ((ch = getopt(argc, argv, "")) != -1) {
8571 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8572 "unveil", NULL) == -1)
8578 cwd = getcwd(NULL, 0);
8580 error = got_error_from_errno("getcwd");
8583 error = got_worktree_open(&worktree, cwd);
8585 if (error->code == GOT_ERR_NOT_WORKTREE)
8586 error = wrap_not_worktree_error(error, "backout", cwd);
8590 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8595 error = apply_unveil(got_repo_get_path(repo), 0,
8596 got_worktree_get_root_path(worktree));
8600 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8601 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8604 error = got_object_id_str(&commit_id_str, commit_id);
8608 error = got_object_open_as_commit(&commit, repo, commit_id);
8611 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8613 error = got_error(GOT_ERR_ROOT_COMMIT);
8617 memset(&upa, 0, sizeof(upa));
8618 error = got_worktree_merge_files(worktree, commit_id, pid->id,
8619 repo, update_progress, &upa, check_cancelled, NULL);
8623 if (upa.did_something)
8624 printf("Backed out commit %s\n", commit_id_str);
8625 print_merge_progress_stats(&upa);
8628 got_object_commit_close(commit);
8629 free(commit_id_str);
8631 got_worktree_close(worktree);
8633 const struct got_error *close_err = got_repo_close(repo);
8643 fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
8649 trim_logmsg(char *logmsg, int limit)
8654 len = strlen(logmsg);
8658 nl = strchr(logmsg, '\n');
8663 static const struct got_error *
8664 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
8666 const struct got_error *err;
8667 char *logmsg0 = NULL;
8670 err = got_object_commit_get_logmsg(&logmsg0, commit);
8675 while (isspace((unsigned char)s[0]))
8678 *logmsg = strdup(s);
8679 if (*logmsg == NULL) {
8680 err = got_error_from_errno("strdup");
8684 trim_logmsg(*logmsg, limit);
8690 static const struct got_error *
8691 show_rebase_merge_conflict(struct got_object_id *id,
8692 struct got_repository *repo)
8694 const struct got_error *err;
8695 struct got_commit_object *commit = NULL;
8696 char *id_str = NULL, *logmsg = NULL;
8698 err = got_object_open_as_commit(&commit, repo, id);
8702 err = got_object_id_str(&id_str, id);
8708 err = get_short_logmsg(&logmsg, 42, commit);
8712 printf("%s -> merge conflict: %s\n", id_str, logmsg);
8715 got_object_commit_close(commit);
8720 static const struct got_error *
8721 show_rebase_progress(struct got_commit_object *commit,
8722 struct got_object_id *old_id, struct got_object_id *new_id)
8724 const struct got_error *err;
8725 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8727 err = got_object_id_str(&old_id_str, old_id);
8732 err = got_object_id_str(&new_id_str, new_id);
8737 old_id_str[12] = '\0';
8739 new_id_str[12] = '\0';
8741 err = get_short_logmsg(&logmsg, 42, commit);
8745 printf("%s -> %s: %s\n", old_id_str,
8746 new_id_str ? new_id_str : "no-op change", logmsg);
8754 static const struct got_error *
8755 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
8756 struct got_reference *branch, struct got_reference *new_base_branch,
8757 struct got_reference *tmp_branch, struct got_repository *repo,
8760 printf("Switching work tree to %s\n", got_ref_get_name(branch));
8761 return got_worktree_rebase_complete(worktree, fileindex,
8762 new_base_branch, tmp_branch, branch, repo, create_backup);
8765 static const struct got_error *
8766 rebase_commit(struct got_pathlist_head *merged_paths,
8767 struct got_worktree *worktree, struct got_fileindex *fileindex,
8768 struct got_reference *tmp_branch,
8769 struct got_object_id *commit_id, struct got_repository *repo)
8771 const struct got_error *error;
8772 struct got_commit_object *commit;
8773 struct got_object_id *new_commit_id;
8775 error = got_object_open_as_commit(&commit, repo, commit_id);
8779 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
8780 worktree, fileindex, tmp_branch, commit, commit_id, repo);
8782 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
8784 error = show_rebase_progress(commit, commit_id, NULL);
8786 error = show_rebase_progress(commit, commit_id, new_commit_id);
8787 free(new_commit_id);
8790 got_object_commit_close(commit);
8794 struct check_path_prefix_arg {
8795 const char *path_prefix;
8800 static const struct got_error *
8801 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
8802 struct got_blob_object *blob2, struct got_object_id *id1,
8803 struct got_object_id *id2, const char *path1, const char *path2,
8804 mode_t mode1, mode_t mode2, struct got_repository *repo)
8806 struct check_path_prefix_arg *a = arg;
8808 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
8809 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
8810 return got_error(a->errcode);
8815 static const struct got_error *
8816 check_path_prefix(struct got_object_id *parent_id,
8817 struct got_object_id *commit_id, const char *path_prefix,
8818 int errcode, struct got_repository *repo)
8820 const struct got_error *err;
8821 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
8822 struct got_commit_object *commit = NULL, *parent_commit = NULL;
8823 struct check_path_prefix_arg cpp_arg;
8825 if (got_path_is_root_dir(path_prefix))
8828 err = got_object_open_as_commit(&commit, repo, commit_id);
8832 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
8836 err = got_object_open_as_tree(&tree1, repo,
8837 got_object_commit_get_tree_id(parent_commit));
8841 err = got_object_open_as_tree(&tree2, repo,
8842 got_object_commit_get_tree_id(commit));
8846 cpp_arg.path_prefix = path_prefix;
8847 while (cpp_arg.path_prefix[0] == '/')
8848 cpp_arg.path_prefix++;
8849 cpp_arg.len = strlen(cpp_arg.path_prefix);
8850 cpp_arg.errcode = errcode;
8851 err = got_diff_tree(tree1, tree2, "", "", repo,
8852 check_path_prefix_in_diff, &cpp_arg, 0);
8855 got_object_tree_close(tree1);
8857 got_object_tree_close(tree2);
8859 got_object_commit_close(commit);
8861 got_object_commit_close(parent_commit);
8865 static const struct got_error *
8866 collect_commits(struct got_object_id_queue *commits,
8867 struct got_object_id *initial_commit_id,
8868 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
8869 const char *path_prefix, int path_prefix_errcode,
8870 struct got_repository *repo)
8872 const struct got_error *err = NULL;
8873 struct got_commit_graph *graph = NULL;
8874 struct got_object_id *parent_id = NULL;
8875 struct got_object_qid *qid;
8876 struct got_object_id *commit_id = initial_commit_id;
8878 err = got_commit_graph_open(&graph, "/", 1);
8882 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
8883 check_cancelled, NULL);
8886 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
8887 err = got_commit_graph_iter_next(&parent_id, graph, repo,
8888 check_cancelled, NULL);
8890 if (err->code == GOT_ERR_ITER_COMPLETED) {
8891 err = got_error_msg(GOT_ERR_ANCESTRY,
8892 "ran out of commits to rebase before "
8893 "youngest common ancestor commit has "
8898 err = check_path_prefix(parent_id, commit_id,
8899 path_prefix, path_prefix_errcode, repo);
8903 err = got_object_qid_alloc(&qid, commit_id);
8906 STAILQ_INSERT_HEAD(commits, qid, entry);
8907 commit_id = parent_id;
8911 got_commit_graph_close(graph);
8915 static const struct got_error *
8916 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
8918 const struct got_error *err = NULL;
8919 time_t committer_time;
8921 char datebuf[11]; /* YYYY-MM-DD + NUL */
8922 char *author0 = NULL, *author, *smallerthan;
8923 char *logmsg0 = NULL, *logmsg, *newline;
8925 committer_time = got_object_commit_get_committer_time(commit);
8926 if (gmtime_r(&committer_time, &tm) == NULL)
8927 return got_error_from_errno("gmtime_r");
8928 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
8929 return got_error(GOT_ERR_NO_SPACE);
8931 author0 = strdup(got_object_commit_get_author(commit));
8932 if (author0 == NULL)
8933 return got_error_from_errno("strdup");
8935 smallerthan = strchr(author, '<');
8936 if (smallerthan && smallerthan[1] != '\0')
8937 author = smallerthan + 1;
8938 author[strcspn(author, "@>")] = '\0';
8940 err = got_object_commit_get_logmsg(&logmsg0, commit);
8944 while (*logmsg == '\n')
8946 newline = strchr(logmsg, '\n');
8950 if (asprintf(brief_str, "%s %s %s",
8951 datebuf, author, logmsg) == -1)
8952 err = got_error_from_errno("asprintf");
8959 static const struct got_error *
8960 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
8961 struct got_repository *repo)
8963 const struct got_error *err;
8966 err = got_object_id_str(&id_str, id);
8970 err = got_ref_delete(ref, repo);
8974 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
8980 static const struct got_error *
8981 print_backup_ref(const char *branch_name, const char *new_id_str,
8982 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
8983 struct got_reflist_object_id_map *refs_idmap,
8984 struct got_repository *repo)
8986 const struct got_error *err = NULL;
8987 struct got_reflist_head *refs;
8988 char *refs_str = NULL;
8989 struct got_object_id *new_commit_id = NULL;
8990 struct got_commit_object *new_commit = NULL;
8991 char *new_commit_brief_str = NULL;
8992 struct got_object_id *yca_id = NULL;
8993 struct got_commit_object *yca_commit = NULL;
8994 char *yca_id_str = NULL, *yca_brief_str = NULL;
8995 char *custom_refs_str;
8997 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
8998 return got_error_from_errno("asprintf");
9000 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9001 0, 0, refs_idmap, custom_refs_str);
9005 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9009 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9011 err = build_refs_str(&refs_str, refs, new_commit_id, repo);
9016 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9020 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9024 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9025 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9029 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9030 refs_str ? " (" : "", refs_str ? refs_str : "",
9031 refs_str ? ")" : "", new_commit_brief_str);
9032 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9033 got_object_id_cmp(yca_id, old_commit_id) != 0) {
9037 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9041 err = get_commit_brief_str(&yca_brief_str, yca_commit);
9045 err = got_object_id_str(&yca_id_str, yca_id);
9049 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9051 err = build_refs_str(&refs_str, refs, yca_id, repo);
9055 printf("history forked at %s%s%s%s\n %s\n",
9057 refs_str ? " (" : "", refs_str ? refs_str : "",
9058 refs_str ? ")" : "", yca_brief_str);
9061 free(custom_refs_str);
9062 free(new_commit_id);
9066 free(yca_brief_str);
9068 got_object_commit_close(new_commit);
9070 got_object_commit_close(yca_commit);
9075 static const struct got_error *
9076 process_backup_refs(const char *backup_ref_prefix,
9077 const char *wanted_branch_name,
9078 int delete, struct got_repository *repo)
9080 const struct got_error *err;
9081 struct got_reflist_head refs, backup_refs;
9082 struct got_reflist_entry *re;
9083 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9084 struct got_object_id *old_commit_id = NULL;
9085 char *branch_name = NULL;
9086 struct got_commit_object *old_commit = NULL;
9087 struct got_reflist_object_id_map *refs_idmap = NULL;
9088 int wanted_branch_found = 0;
9091 TAILQ_INIT(&backup_refs);
9093 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9097 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9101 if (wanted_branch_name) {
9102 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9103 wanted_branch_name += 11;
9106 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9107 got_ref_cmp_by_commit_timestamp_descending, repo);
9111 TAILQ_FOREACH(re, &backup_refs, entry) {
9112 const char *refname = got_ref_get_name(re->ref);
9115 err = check_cancelled(NULL);
9119 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9123 err = got_object_open_as_commit(&old_commit, repo,
9128 if (strncmp(backup_ref_prefix, refname,
9129 backup_ref_prefix_len) == 0)
9130 refname += backup_ref_prefix_len;
9132 while (refname[0] == '/')
9135 branch_name = strdup(refname);
9136 if (branch_name == NULL) {
9137 err = got_error_from_errno("strdup");
9140 slash = strrchr(branch_name, '/');
9143 refname += strlen(branch_name) + 1;
9146 if (wanted_branch_name == NULL ||
9147 strcmp(wanted_branch_name, branch_name) == 0) {
9148 wanted_branch_found = 1;
9150 err = delete_backup_ref(re->ref,
9151 old_commit_id, repo);
9153 err = print_backup_ref(branch_name, refname,
9154 old_commit_id, old_commit, refs_idmap,
9161 free(old_commit_id);
9162 old_commit_id = NULL;
9165 got_object_commit_close(old_commit);
9169 if (wanted_branch_name && !wanted_branch_found) {
9170 err = got_error_fmt(GOT_ERR_NOT_REF,
9171 "%s/%s/", backup_ref_prefix, wanted_branch_name);
9175 got_reflist_object_id_map_free(refs_idmap);
9176 got_ref_list_free(&refs);
9177 got_ref_list_free(&backup_refs);
9178 free(old_commit_id);
9181 got_object_commit_close(old_commit);
9185 static const struct got_error *
9186 abort_progress(void *arg, unsigned char status, const char *path)
9189 * Unversioned files should not clutter progress output when
9190 * an operation is aborted.
9192 if (status == GOT_STATUS_UNVERSIONED)
9195 return update_progress(arg, status, path);
9198 static const struct got_error *
9199 cmd_rebase(int argc, char *argv[])
9201 const struct got_error *error = NULL;
9202 struct got_worktree *worktree = NULL;
9203 struct got_repository *repo = NULL;
9204 struct got_fileindex *fileindex = NULL;
9206 struct got_reference *branch = NULL;
9207 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9208 struct got_object_id *commit_id = NULL, *parent_id = NULL;
9209 struct got_object_id *resume_commit_id = NULL;
9210 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9211 struct got_commit_object *commit = NULL;
9212 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9213 int histedit_in_progress = 0, merge_in_progress = 0;
9214 int create_backup = 1, list_backups = 0, delete_backups = 0;
9215 struct got_object_id_queue commits;
9216 struct got_pathlist_head merged_paths;
9217 const struct got_object_id_queue *parent_ids;
9218 struct got_object_qid *qid, *pid;
9219 struct got_update_progress_arg upa;
9221 STAILQ_INIT(&commits);
9222 TAILQ_INIT(&merged_paths);
9223 memset(&upa, 0, sizeof(upa));
9225 while ((ch = getopt(argc, argv, "aclX")) != -1) {
9231 continue_rebase = 1;
9249 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9250 "unveil", NULL) == -1)
9255 option_conflict('l', 'a');
9256 if (continue_rebase)
9257 option_conflict('l', 'c');
9259 option_conflict('l', 'X');
9260 if (argc != 0 && argc != 1)
9262 } else if (delete_backups) {
9264 option_conflict('X', 'a');
9265 if (continue_rebase)
9266 option_conflict('X', 'c');
9268 option_conflict('l', 'X');
9269 if (argc != 0 && argc != 1)
9272 if (abort_rebase && continue_rebase)
9274 else if (abort_rebase || continue_rebase) {
9277 } else if (argc != 1)
9281 cwd = getcwd(NULL, 0);
9283 error = got_error_from_errno("getcwd");
9286 error = got_worktree_open(&worktree, cwd);
9288 if (list_backups || delete_backups) {
9289 if (error->code != GOT_ERR_NOT_WORKTREE)
9292 if (error->code == GOT_ERR_NOT_WORKTREE)
9293 error = wrap_not_worktree_error(error,
9299 error = got_repo_open(&repo,
9300 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
9304 error = apply_unveil(got_repo_get_path(repo), 0,
9305 worktree ? got_worktree_get_root_path(worktree) : NULL);
9309 if (list_backups || delete_backups) {
9310 error = process_backup_refs(
9311 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9312 argc == 1 ? argv[0] : NULL, delete_backups, repo);
9313 goto done; /* nothing else to do */
9316 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9320 if (histedit_in_progress) {
9321 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9325 error = got_worktree_merge_in_progress(&merge_in_progress,
9329 if (merge_in_progress) {
9330 error = got_error(GOT_ERR_MERGE_BUSY);
9334 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9339 if (!rebase_in_progress) {
9340 error = got_error(GOT_ERR_NOT_REBASING);
9343 error = got_worktree_rebase_continue(&resume_commit_id,
9344 &new_base_branch, &tmp_branch, &branch, &fileindex,
9348 printf("Switching work tree to %s\n",
9349 got_ref_get_symref_target(new_base_branch));
9350 error = got_worktree_rebase_abort(worktree, fileindex, repo,
9351 new_base_branch, abort_progress, &upa);
9354 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9355 print_merge_progress_stats(&upa);
9356 goto done; /* nothing else to do */
9359 if (continue_rebase) {
9360 if (!rebase_in_progress) {
9361 error = got_error(GOT_ERR_NOT_REBASING);
9364 error = got_worktree_rebase_continue(&resume_commit_id,
9365 &new_base_branch, &tmp_branch, &branch, &fileindex,
9370 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9371 resume_commit_id, repo);
9375 yca_id = got_object_id_dup(resume_commit_id);
9376 if (yca_id == NULL) {
9377 error = got_error_from_errno("got_object_id_dup");
9381 error = got_ref_open(&branch, repo, argv[0], 0);
9386 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9390 if (!continue_rebase) {
9391 struct got_object_id *base_commit_id;
9393 base_commit_id = got_worktree_get_base_commit_id(worktree);
9394 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9395 base_commit_id, branch_head_commit_id, 1, repo,
9396 check_cancelled, NULL);
9399 if (yca_id == NULL) {
9400 error = got_error_msg(GOT_ERR_ANCESTRY,
9401 "specified branch shares no common ancestry "
9402 "with work tree's branch");
9406 error = check_same_branch(base_commit_id, branch, yca_id, repo);
9408 if (error->code != GOT_ERR_ANCESTRY)
9412 struct got_pathlist_head paths;
9413 printf("%s is already based on %s\n",
9414 got_ref_get_name(branch),
9415 got_worktree_get_head_ref_name(worktree));
9416 error = switch_head_ref(branch, branch_head_commit_id,
9420 error = got_worktree_set_base_commit_id(worktree, repo,
9421 branch_head_commit_id);
9425 error = got_pathlist_append(&paths, "", NULL);
9428 error = got_worktree_checkout_files(worktree,
9429 &paths, repo, update_progress, &upa,
9430 check_cancelled, NULL);
9431 got_pathlist_free(&paths);
9434 if (upa.did_something) {
9436 error = got_object_id_str(&id_str,
9437 branch_head_commit_id);
9440 printf("Updated to %s: %s\n",
9441 got_worktree_get_head_ref_name(worktree),
9445 printf("Already up-to-date\n");
9446 print_update_progress_stats(&upa);
9449 error = got_worktree_rebase_prepare(&new_base_branch,
9450 &tmp_branch, &fileindex, worktree, branch, repo);
9455 commit_id = branch_head_commit_id;
9456 error = got_object_open_as_commit(&commit, repo, commit_id);
9460 parent_ids = got_object_commit_get_parent_ids(commit);
9461 pid = STAILQ_FIRST(parent_ids);
9463 if (!continue_rebase) {
9464 error = got_worktree_rebase_abort(worktree, fileindex,
9465 repo, new_base_branch, abort_progress, &upa);
9468 printf("Rebase of %s aborted\n",
9469 got_ref_get_name(branch));
9470 print_merge_progress_stats(&upa);
9473 error = got_error(GOT_ERR_EMPTY_REBASE);
9476 error = collect_commits(&commits, commit_id, pid->id,
9477 yca_id, got_worktree_get_path_prefix(worktree),
9478 GOT_ERR_REBASE_PATH, repo);
9479 got_object_commit_close(commit);
9484 if (STAILQ_EMPTY(&commits)) {
9485 if (continue_rebase) {
9486 error = rebase_complete(worktree, fileindex,
9487 branch, new_base_branch, tmp_branch, repo,
9491 /* Fast-forward the reference of the branch. */
9492 struct got_object_id *new_head_commit_id;
9494 error = got_ref_resolve(&new_head_commit_id, repo,
9498 error = got_object_id_str(&id_str, new_head_commit_id);
9499 printf("Forwarding %s to commit %s\n",
9500 got_ref_get_name(branch), id_str);
9502 error = got_ref_change_ref(branch,
9503 new_head_commit_id);
9506 /* No backup needed since objects did not change. */
9512 STAILQ_FOREACH(qid, &commits, entry) {
9514 commit_id = qid->id;
9515 parent_id = pid ? pid->id : yca_id;
9518 memset(&upa, 0, sizeof(upa));
9519 error = got_worktree_rebase_merge_files(&merged_paths,
9520 worktree, fileindex, parent_id, commit_id, repo,
9521 update_progress, &upa, check_cancelled, NULL);
9525 print_merge_progress_stats(&upa);
9526 if (upa.conflicts > 0 || upa.missing > 0 ||
9527 upa.not_deleted > 0 || upa.unversioned > 0) {
9528 if (upa.conflicts > 0) {
9529 error = show_rebase_merge_conflict(qid->id,
9534 got_worktree_rebase_pathlist_free(&merged_paths);
9538 error = rebase_commit(&merged_paths, worktree, fileindex,
9539 tmp_branch, commit_id, repo);
9540 got_worktree_rebase_pathlist_free(&merged_paths);
9545 if (upa.conflicts > 0 || upa.missing > 0 ||
9546 upa.not_deleted > 0 || upa.unversioned > 0) {
9547 error = got_worktree_rebase_postpone(worktree, fileindex);
9550 if (upa.conflicts > 0 && upa.missing == 0 &&
9551 upa.not_deleted == 0 && upa.unversioned == 0) {
9552 error = got_error_msg(GOT_ERR_CONFLICTS,
9553 "conflicts must be resolved before rebasing "
9555 } else if (upa.conflicts > 0) {
9556 error = got_error_msg(GOT_ERR_CONFLICTS,
9557 "conflicts must be resolved before rebasing "
9558 "can continue; changes destined for some "
9559 "files were not yet merged and should be "
9560 "merged manually if required before the "
9561 "rebase operation is continued");
9563 error = got_error_msg(GOT_ERR_CONFLICTS,
9564 "changes destined for some files were not "
9565 "yet merged and should be merged manually "
9566 "if required before the rebase operation "
9570 error = rebase_complete(worktree, fileindex, branch,
9571 new_base_branch, tmp_branch, repo, create_backup);
9573 got_object_id_queue_free(&commits);
9574 free(branch_head_commit_id);
9575 free(resume_commit_id);
9578 got_object_commit_close(commit);
9580 got_ref_close(branch);
9581 if (new_base_branch)
9582 got_ref_close(new_base_branch);
9584 got_ref_close(tmp_branch);
9586 got_worktree_close(worktree);
9588 const struct got_error *close_err = got_repo_close(repo);
9596 usage_histedit(void)
9598 fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
9599 "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
9604 #define GOT_HISTEDIT_PICK 'p'
9605 #define GOT_HISTEDIT_EDIT 'e'
9606 #define GOT_HISTEDIT_FOLD 'f'
9607 #define GOT_HISTEDIT_DROP 'd'
9608 #define GOT_HISTEDIT_MESG 'm'
9610 static const struct got_histedit_cmd {
9614 } got_histedit_cmds[] = {
9615 { GOT_HISTEDIT_PICK, "pick", "use commit" },
9616 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
9617 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
9619 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
9620 { GOT_HISTEDIT_MESG, "mesg",
9621 "single-line log message for commit above (open editor if empty)" },
9624 struct got_histedit_list_entry {
9625 TAILQ_ENTRY(got_histedit_list_entry) entry;
9626 struct got_object_id *commit_id;
9627 const struct got_histedit_cmd *cmd;
9630 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
9632 static const struct got_error *
9633 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
9634 FILE *f, struct got_repository *repo)
9636 const struct got_error *err = NULL;
9637 char *logmsg = NULL, *id_str = NULL;
9638 struct got_commit_object *commit = NULL;
9641 err = got_object_open_as_commit(&commit, repo, commit_id);
9645 err = get_short_logmsg(&logmsg, 34, commit);
9649 err = got_object_id_str(&id_str, commit_id);
9653 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
9655 err = got_ferror(f, GOT_ERR_IO);
9658 got_object_commit_close(commit);
9664 static const struct got_error *
9665 histedit_write_commit_list(struct got_object_id_queue *commits,
9666 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
9667 struct got_repository *repo)
9669 const struct got_error *err = NULL;
9670 struct got_object_qid *qid;
9671 const char *histedit_cmd = NULL;
9673 if (STAILQ_EMPTY(commits))
9674 return got_error(GOT_ERR_EMPTY_HISTEDIT);
9676 STAILQ_FOREACH(qid, commits, entry) {
9677 histedit_cmd = got_histedit_cmds[0].name;
9679 histedit_cmd = "edit";
9680 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
9681 histedit_cmd = "fold";
9682 err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
9685 if (edit_logmsg_only) {
9686 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
9688 err = got_ferror(f, GOT_ERR_IO);
9697 static const struct got_error *
9698 write_cmd_list(FILE *f, const char *branch_name,
9699 struct got_object_id_queue *commits)
9701 const struct got_error *err = NULL;
9705 struct got_object_qid *qid;
9707 qid = STAILQ_FIRST(commits);
9708 err = got_object_id_str(&id_str, qid->id);
9713 "# Editing the history of branch '%s' starting at\n"
9715 "# Commits will be processed in order from top to "
9716 "bottom of this file.\n", branch_name, id_str);
9718 err = got_ferror(f, GOT_ERR_IO);
9722 n = fprintf(f, "# Available histedit commands:\n");
9724 err = got_ferror(f, GOT_ERR_IO);
9728 for (i = 0; i < nitems(got_histedit_cmds); i++) {
9729 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
9730 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
9733 err = got_ferror(f, GOT_ERR_IO);
9742 static const struct got_error *
9743 histedit_syntax_error(int lineno)
9745 static char msg[42];
9748 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
9750 if (ret == -1 || ret >= sizeof(msg))
9751 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
9753 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
9756 static const struct got_error *
9757 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
9758 char *logmsg, struct got_repository *repo)
9760 const struct got_error *err;
9761 struct got_commit_object *folded_commit = NULL;
9762 char *id_str, *folded_logmsg = NULL;
9764 err = got_object_id_str(&id_str, hle->commit_id);
9768 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
9772 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
9775 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
9776 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
9777 folded_logmsg) == -1) {
9778 err = got_error_from_errno("asprintf");
9782 got_object_commit_close(folded_commit);
9784 free(folded_logmsg);
9788 static struct got_histedit_list_entry *
9789 get_folded_commits(struct got_histedit_list_entry *hle)
9791 struct got_histedit_list_entry *prev, *folded = NULL;
9793 prev = TAILQ_PREV(hle, got_histedit_list, entry);
9794 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
9795 prev->cmd->code == GOT_HISTEDIT_DROP)) {
9796 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
9798 prev = TAILQ_PREV(prev, got_histedit_list, entry);
9804 static const struct got_error *
9805 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
9806 struct got_repository *repo)
9808 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
9809 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
9810 const struct got_error *err = NULL;
9811 struct got_commit_object *commit = NULL;
9814 struct got_histedit_list_entry *folded = NULL;
9816 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9820 folded = get_folded_commits(hle);
9822 while (folded != hle) {
9823 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
9824 folded = TAILQ_NEXT(folded, entry);
9827 err = append_folded_commit_msg(&new_msg, folded,
9833 folded = TAILQ_NEXT(folded, entry);
9837 err = got_object_id_str(&id_str, hle->commit_id);
9840 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
9843 logmsg_len = asprintf(&new_msg,
9844 "%s\n# original log message of commit %s: %s",
9845 logmsg ? logmsg : "", id_str, orig_logmsg);
9846 if (logmsg_len == -1) {
9847 err = got_error_from_errno("asprintf");
9853 err = got_object_id_str(&id_str, hle->commit_id);
9857 err = got_opentemp_named_fd(&logmsg_path, &fd,
9858 GOT_TMPDIR_STR "/got-logmsg");
9862 write(fd, logmsg, logmsg_len);
9865 err = get_editor(&editor);
9869 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
9872 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
9875 hle->logmsg = strdup(new_msg);
9876 if (hle->logmsg == NULL)
9877 err = got_error_from_errno("strdup");
9880 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
9881 err = got_error_from_errno2("unlink", logmsg_path);
9887 got_object_commit_close(commit);
9891 static const struct got_error *
9892 histedit_parse_list(struct got_histedit_list *histedit_cmds,
9893 FILE *f, struct got_repository *repo)
9895 const struct got_error *err = NULL;
9896 char *line = NULL, *p, *end;
9900 const struct got_histedit_cmd *cmd;
9901 struct got_object_id *commit_id = NULL;
9902 struct got_histedit_list_entry *hle = NULL;
9905 len = getline(&line, &size, f);
9907 const struct got_error *getline_err;
9910 getline_err = got_error_from_errno("getline");
9911 err = got_ferror(f, getline_err->code);
9916 while (isspace((unsigned char)p[0]))
9918 if (p[0] == '#' || p[0] == '\0') {
9924 for (i = 0; i < nitems(got_histedit_cmds); i++) {
9925 cmd = &got_histedit_cmds[i];
9926 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
9927 isspace((unsigned char)p[strlen(cmd->name)])) {
9928 p += strlen(cmd->name);
9931 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
9936 if (i == nitems(got_histedit_cmds)) {
9937 err = histedit_syntax_error(lineno);
9940 while (isspace((unsigned char)p[0]))
9942 if (cmd->code == GOT_HISTEDIT_MESG) {
9943 if (hle == NULL || hle->logmsg != NULL) {
9944 err = got_error(GOT_ERR_HISTEDIT_CMD);
9948 err = histedit_edit_logmsg(hle, repo);
9952 hle->logmsg = strdup(p);
9953 if (hle->logmsg == NULL) {
9954 err = got_error_from_errno("strdup");
9963 while (end[0] && !isspace((unsigned char)end[0]))
9967 err = got_object_resolve_id_str(&commit_id, repo, p);
9969 /* override error code */
9970 err = histedit_syntax_error(lineno);
9974 hle = malloc(sizeof(*hle));
9976 err = got_error_from_errno("malloc");
9980 hle->commit_id = commit_id;
9985 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
9993 static const struct got_error *
9994 histedit_check_script(struct got_histedit_list *histedit_cmds,
9995 struct got_object_id_queue *commits, struct got_repository *repo)
9997 const struct got_error *err = NULL;
9998 struct got_object_qid *qid;
9999 struct got_histedit_list_entry *hle;
10000 static char msg[92];
10003 if (TAILQ_EMPTY(histedit_cmds))
10004 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10005 "histedit script contains no commands");
10006 if (STAILQ_EMPTY(commits))
10007 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10009 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10010 struct got_histedit_list_entry *hle2;
10011 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10014 if (got_object_id_cmp(hle->commit_id,
10015 hle2->commit_id) != 0)
10017 err = got_object_id_str(&id_str, hle->commit_id);
10020 snprintf(msg, sizeof(msg), "commit %s is listed "
10021 "more than once in histedit script", id_str);
10023 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10027 STAILQ_FOREACH(qid, commits, entry) {
10028 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10029 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
10033 err = got_object_id_str(&id_str, qid->id);
10036 snprintf(msg, sizeof(msg),
10037 "commit %s missing from histedit script", id_str);
10039 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10043 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10044 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10045 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10046 "last commit in histedit script cannot be folded");
10051 static const struct got_error *
10052 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10053 const char *path, struct got_object_id_queue *commits,
10054 struct got_repository *repo)
10056 const struct got_error *err = NULL;
10060 err = get_editor(&editor);
10064 if (spawn_editor(editor, path) == -1) {
10065 err = got_error_from_errno("failed spawning editor");
10069 f = fopen(path, "re");
10071 err = got_error_from_errno("fopen");
10074 err = histedit_parse_list(histedit_cmds, f, repo);
10078 err = histedit_check_script(histedit_cmds, commits, repo);
10080 if (f && fclose(f) == EOF && err == NULL)
10081 err = got_error_from_errno("fclose");
10086 static const struct got_error *
10087 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10088 struct got_object_id_queue *, const char *, const char *,
10089 struct got_repository *);
10091 static const struct got_error *
10092 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10093 struct got_object_id_queue *commits, const char *branch_name,
10094 int edit_logmsg_only, int fold_only, int edit_only,
10095 struct got_repository *repo)
10097 const struct got_error *err;
10101 err = got_opentemp_named(&path, &f, "got-histedit");
10105 err = write_cmd_list(f, branch_name, commits);
10109 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10110 fold_only, edit_only, repo);
10114 if (edit_logmsg_only || fold_only || edit_only) {
10116 err = histedit_parse_list(histedit_cmds, f, repo);
10118 if (fclose(f) == EOF) {
10119 err = got_error_from_errno("fclose");
10123 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10125 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10126 err->code != GOT_ERR_HISTEDIT_CMD)
10128 err = histedit_edit_list_retry(histedit_cmds, err,
10129 commits, path, branch_name, repo);
10133 if (f && fclose(f) == EOF && err == NULL)
10134 err = got_error_from_errno("fclose");
10135 if (path && unlink(path) != 0 && err == NULL)
10136 err = got_error_from_errno2("unlink", path);
10141 static const struct got_error *
10142 histedit_save_list(struct got_histedit_list *histedit_cmds,
10143 struct got_worktree *worktree, struct got_repository *repo)
10145 const struct got_error *err = NULL;
10148 struct got_histedit_list_entry *hle;
10149 struct got_commit_object *commit = NULL;
10151 err = got_worktree_get_histedit_script_path(&path, worktree);
10155 f = fopen(path, "we");
10157 err = got_error_from_errno2("fopen", path);
10160 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10161 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10167 int n = fprintf(f, "%c %s\n",
10168 GOT_HISTEDIT_MESG, hle->logmsg);
10170 err = got_ferror(f, GOT_ERR_IO);
10176 if (f && fclose(f) == EOF && err == NULL)
10177 err = got_error_from_errno("fclose");
10180 got_object_commit_close(commit);
10185 histedit_free_list(struct got_histedit_list *histedit_cmds)
10187 struct got_histedit_list_entry *hle;
10189 while ((hle = TAILQ_FIRST(histedit_cmds))) {
10190 TAILQ_REMOVE(histedit_cmds, hle, entry);
10195 static const struct got_error *
10196 histedit_load_list(struct got_histedit_list *histedit_cmds,
10197 const char *path, struct got_repository *repo)
10199 const struct got_error *err = NULL;
10202 f = fopen(path, "re");
10204 err = got_error_from_errno2("fopen", path);
10208 err = histedit_parse_list(histedit_cmds, f, repo);
10210 if (f && fclose(f) == EOF && err == NULL)
10211 err = got_error_from_errno("fclose");
10215 static const struct got_error *
10216 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10217 const struct got_error *edit_err, struct got_object_id_queue *commits,
10218 const char *path, const char *branch_name, struct got_repository *repo)
10220 const struct got_error *err = NULL, *prev_err = edit_err;
10223 while (resp != 'c' && resp != 'r' && resp != 'a') {
10224 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10225 "or (a)bort: ", getprogname(), prev_err->msg);
10230 histedit_free_list(histedit_cmds);
10231 err = histedit_run_editor(histedit_cmds, path, commits,
10234 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10235 err->code != GOT_ERR_HISTEDIT_CMD)
10242 } else if (resp == 'r') {
10243 histedit_free_list(histedit_cmds);
10244 err = histedit_edit_script(histedit_cmds,
10245 commits, branch_name, 0, 0, 0, repo);
10247 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10248 err->code != GOT_ERR_HISTEDIT_CMD)
10255 } else if (resp == 'a') {
10256 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10259 printf("invalid response '%c'\n", resp);
10265 static const struct got_error *
10266 histedit_complete(struct got_worktree *worktree,
10267 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10268 struct got_reference *branch, struct got_repository *repo)
10270 printf("Switching work tree to %s\n",
10271 got_ref_get_symref_target(branch));
10272 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10276 static const struct got_error *
10277 show_histedit_progress(struct got_commit_object *commit,
10278 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10280 const struct got_error *err;
10281 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10283 err = got_object_id_str(&old_id_str, hle->commit_id);
10288 err = got_object_id_str(&new_id_str, new_id);
10293 old_id_str[12] = '\0';
10295 new_id_str[12] = '\0';
10298 logmsg = strdup(hle->logmsg);
10299 if (logmsg == NULL) {
10300 err = got_error_from_errno("strdup");
10303 trim_logmsg(logmsg, 42);
10305 err = get_short_logmsg(&logmsg, 42, commit);
10310 switch (hle->cmd->code) {
10311 case GOT_HISTEDIT_PICK:
10312 case GOT_HISTEDIT_EDIT:
10313 printf("%s -> %s: %s\n", old_id_str,
10314 new_id_str ? new_id_str : "no-op change", logmsg);
10316 case GOT_HISTEDIT_DROP:
10317 case GOT_HISTEDIT_FOLD:
10318 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
10330 static const struct got_error *
10331 histedit_commit(struct got_pathlist_head *merged_paths,
10332 struct got_worktree *worktree, struct got_fileindex *fileindex,
10333 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10334 struct got_repository *repo)
10336 const struct got_error *err;
10337 struct got_commit_object *commit;
10338 struct got_object_id *new_commit_id;
10340 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10341 && hle->logmsg == NULL) {
10342 err = histedit_edit_logmsg(hle, repo);
10347 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10351 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10352 worktree, fileindex, tmp_branch, commit, hle->commit_id,
10353 hle->logmsg, repo);
10355 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10357 err = show_histedit_progress(commit, hle, NULL);
10359 err = show_histedit_progress(commit, hle, new_commit_id);
10360 free(new_commit_id);
10363 got_object_commit_close(commit);
10367 static const struct got_error *
10368 histedit_skip_commit(struct got_histedit_list_entry *hle,
10369 struct got_worktree *worktree, struct got_repository *repo)
10371 const struct got_error *error;
10372 struct got_commit_object *commit;
10374 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10379 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10383 error = show_histedit_progress(commit, hle, NULL);
10384 got_object_commit_close(commit);
10388 static const struct got_error *
10389 check_local_changes(void *arg, unsigned char status,
10390 unsigned char staged_status, const char *path,
10391 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10392 struct got_object_id *commit_id, int dirfd, const char *de_name)
10394 int *have_local_changes = arg;
10397 case GOT_STATUS_ADD:
10398 case GOT_STATUS_DELETE:
10399 case GOT_STATUS_MODIFY:
10400 case GOT_STATUS_CONFLICT:
10401 *have_local_changes = 1;
10402 return got_error(GOT_ERR_CANCELLED);
10407 switch (staged_status) {
10408 case GOT_STATUS_ADD:
10409 case GOT_STATUS_DELETE:
10410 case GOT_STATUS_MODIFY:
10411 *have_local_changes = 1;
10412 return got_error(GOT_ERR_CANCELLED);
10420 static const struct got_error *
10421 cmd_histedit(int argc, char *argv[])
10423 const struct got_error *error = NULL;
10424 struct got_worktree *worktree = NULL;
10425 struct got_fileindex *fileindex = NULL;
10426 struct got_repository *repo = NULL;
10428 struct got_reference *branch = NULL;
10429 struct got_reference *tmp_branch = NULL;
10430 struct got_object_id *resume_commit_id = NULL;
10431 struct got_object_id *base_commit_id = NULL;
10432 struct got_object_id *head_commit_id = NULL;
10433 struct got_commit_object *commit = NULL;
10434 int ch, rebase_in_progress = 0, merge_in_progress = 0;
10435 struct got_update_progress_arg upa;
10436 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10437 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10438 int list_backups = 0, delete_backups = 0;
10439 const char *edit_script_path = NULL;
10440 struct got_object_id_queue commits;
10441 struct got_pathlist_head merged_paths;
10442 const struct got_object_id_queue *parent_ids;
10443 struct got_object_qid *pid;
10444 struct got_histedit_list histedit_cmds;
10445 struct got_histedit_list_entry *hle;
10447 STAILQ_INIT(&commits);
10448 TAILQ_INIT(&histedit_cmds);
10449 TAILQ_INIT(&merged_paths);
10450 memset(&upa, 0, sizeof(upa));
10452 while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10467 edit_script_path = optarg;
10470 edit_logmsg_only = 1;
10476 delete_backups = 1;
10488 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10489 "unveil", NULL) == -1)
10492 if (abort_edit && continue_edit)
10493 option_conflict('a', 'c');
10494 if (edit_script_path && edit_logmsg_only)
10495 option_conflict('F', 'm');
10496 if (abort_edit && edit_logmsg_only)
10497 option_conflict('a', 'm');
10498 if (continue_edit && edit_logmsg_only)
10499 option_conflict('c', 'm');
10500 if (abort_edit && fold_only)
10501 option_conflict('a', 'f');
10502 if (continue_edit && fold_only)
10503 option_conflict('c', 'f');
10504 if (fold_only && edit_logmsg_only)
10505 option_conflict('f', 'm');
10506 if (edit_script_path && fold_only)
10507 option_conflict('F', 'f');
10508 if (abort_edit && edit_only)
10509 option_conflict('a', 'e');
10510 if (continue_edit && edit_only)
10511 option_conflict('c', 'e');
10512 if (edit_only && edit_logmsg_only)
10513 option_conflict('e', 'm');
10514 if (edit_script_path && edit_only)
10515 option_conflict('F', 'e');
10516 if (list_backups) {
10518 option_conflict('l', 'a');
10520 option_conflict('l', 'c');
10521 if (edit_script_path)
10522 option_conflict('l', 'F');
10523 if (edit_logmsg_only)
10524 option_conflict('l', 'm');
10526 option_conflict('l', 'f');
10528 option_conflict('l', 'e');
10529 if (delete_backups)
10530 option_conflict('l', 'X');
10531 if (argc != 0 && argc != 1)
10533 } else if (delete_backups) {
10535 option_conflict('X', 'a');
10537 option_conflict('X', 'c');
10538 if (edit_script_path)
10539 option_conflict('X', 'F');
10540 if (edit_logmsg_only)
10541 option_conflict('X', 'm');
10543 option_conflict('X', 'f');
10545 option_conflict('X', 'e');
10547 option_conflict('X', 'l');
10548 if (argc != 0 && argc != 1)
10550 } else if (argc != 0)
10554 * This command cannot apply unveil(2) in all cases because the
10555 * user may choose to run an editor to edit the histedit script
10556 * and to edit individual commit log messages.
10557 * unveil(2) traverses exec(2); if an editor is used we have to
10558 * apply unveil after edit script and log messages have been written.
10559 * XXX TODO: Make use of unveil(2) where possible.
10562 cwd = getcwd(NULL, 0);
10564 error = got_error_from_errno("getcwd");
10567 error = got_worktree_open(&worktree, cwd);
10569 if (list_backups || delete_backups) {
10570 if (error->code != GOT_ERR_NOT_WORKTREE)
10573 if (error->code == GOT_ERR_NOT_WORKTREE)
10574 error = wrap_not_worktree_error(error,
10580 if (list_backups || delete_backups) {
10581 error = got_repo_open(&repo,
10582 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10586 error = apply_unveil(got_repo_get_path(repo), 0,
10587 worktree ? got_worktree_get_root_path(worktree) : NULL);
10590 error = process_backup_refs(
10591 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
10592 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10593 goto done; /* nothing else to do */
10596 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10601 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10604 if (rebase_in_progress) {
10605 error = got_error(GOT_ERR_REBASING);
10609 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10613 if (merge_in_progress) {
10614 error = got_error(GOT_ERR_MERGE_BUSY);
10618 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
10622 if (edit_in_progress && edit_logmsg_only) {
10623 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10624 "histedit operation is in progress in this "
10625 "work tree and must be continued or aborted "
10626 "before the -m option can be used");
10629 if (edit_in_progress && fold_only) {
10630 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10631 "histedit operation is in progress in this "
10632 "work tree and must be continued or aborted "
10633 "before the -f option can be used");
10636 if (edit_in_progress && edit_only) {
10637 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10638 "histedit operation is in progress in this "
10639 "work tree and must be continued or aborted "
10640 "before the -e option can be used");
10644 if (edit_in_progress && abort_edit) {
10645 error = got_worktree_histedit_continue(&resume_commit_id,
10646 &tmp_branch, &branch, &base_commit_id, &fileindex,
10650 printf("Switching work tree to %s\n",
10651 got_ref_get_symref_target(branch));
10652 error = got_worktree_histedit_abort(worktree, fileindex, repo,
10653 branch, base_commit_id, abort_progress, &upa);
10656 printf("Histedit of %s aborted\n",
10657 got_ref_get_symref_target(branch));
10658 print_merge_progress_stats(&upa);
10659 goto done; /* nothing else to do */
10660 } else if (abort_edit) {
10661 error = got_error(GOT_ERR_NOT_HISTEDIT);
10665 if (continue_edit) {
10668 if (!edit_in_progress) {
10669 error = got_error(GOT_ERR_NOT_HISTEDIT);
10673 error = got_worktree_get_histedit_script_path(&path, worktree);
10677 error = histedit_load_list(&histedit_cmds, path, repo);
10682 error = got_worktree_histedit_continue(&resume_commit_id,
10683 &tmp_branch, &branch, &base_commit_id, &fileindex,
10688 error = got_ref_resolve(&head_commit_id, repo, branch);
10692 error = got_object_open_as_commit(&commit, repo,
10696 parent_ids = got_object_commit_get_parent_ids(commit);
10697 pid = STAILQ_FIRST(parent_ids);
10699 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10702 error = collect_commits(&commits, head_commit_id, pid->id,
10703 base_commit_id, got_worktree_get_path_prefix(worktree),
10704 GOT_ERR_HISTEDIT_PATH, repo);
10705 got_object_commit_close(commit);
10710 if (edit_in_progress) {
10711 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10715 error = got_ref_open(&branch, repo,
10716 got_worktree_get_head_ref_name(worktree), 0);
10720 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10721 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10722 "will not edit commit history of a branch outside "
10723 "the \"refs/heads/\" reference namespace");
10727 error = got_ref_resolve(&head_commit_id, repo, branch);
10728 got_ref_close(branch);
10733 error = got_object_open_as_commit(&commit, repo,
10737 parent_ids = got_object_commit_get_parent_ids(commit);
10738 pid = STAILQ_FIRST(parent_ids);
10740 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10743 error = collect_commits(&commits, head_commit_id, pid->id,
10744 got_worktree_get_base_commit_id(worktree),
10745 got_worktree_get_path_prefix(worktree),
10746 GOT_ERR_HISTEDIT_PATH, repo);
10747 got_object_commit_close(commit);
10752 if (STAILQ_EMPTY(&commits)) {
10753 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10757 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
10758 &base_commit_id, &fileindex, worktree, repo);
10762 if (edit_script_path) {
10763 error = histedit_load_list(&histedit_cmds,
10764 edit_script_path, repo);
10766 got_worktree_histedit_abort(worktree, fileindex,
10767 repo, branch, base_commit_id,
10768 abort_progress, &upa);
10769 print_merge_progress_stats(&upa);
10773 const char *branch_name;
10774 branch_name = got_ref_get_symref_target(branch);
10775 if (strncmp(branch_name, "refs/heads/", 11) == 0)
10777 error = histedit_edit_script(&histedit_cmds, &commits,
10778 branch_name, edit_logmsg_only, fold_only,
10781 got_worktree_histedit_abort(worktree, fileindex,
10782 repo, branch, base_commit_id,
10783 abort_progress, &upa);
10784 print_merge_progress_stats(&upa);
10790 error = histedit_save_list(&histedit_cmds, worktree,
10793 got_worktree_histedit_abort(worktree, fileindex,
10794 repo, branch, base_commit_id,
10795 abort_progress, &upa);
10796 print_merge_progress_stats(&upa);
10802 error = histedit_check_script(&histedit_cmds, &commits, repo);
10806 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
10807 if (resume_commit_id) {
10808 if (got_object_id_cmp(hle->commit_id,
10809 resume_commit_id) != 0)
10812 resume_commit_id = NULL;
10813 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
10814 hle->cmd->code == GOT_HISTEDIT_FOLD) {
10815 error = histedit_skip_commit(hle, worktree,
10820 struct got_pathlist_head paths;
10821 int have_changes = 0;
10823 TAILQ_INIT(&paths);
10824 error = got_pathlist_append(&paths, "", NULL);
10827 error = got_worktree_status(worktree, &paths,
10828 repo, 0, check_local_changes, &have_changes,
10829 check_cancelled, NULL);
10830 got_pathlist_free(&paths);
10832 if (error->code != GOT_ERR_CANCELLED)
10834 if (sigint_received || sigpipe_received)
10837 if (have_changes) {
10838 error = histedit_commit(NULL, worktree,
10839 fileindex, tmp_branch, hle, repo);
10843 error = got_object_open_as_commit(
10844 &commit, repo, hle->commit_id);
10847 error = show_histedit_progress(commit,
10849 got_object_commit_close(commit);
10858 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
10859 error = histedit_skip_commit(hle, worktree, repo);
10865 error = got_object_open_as_commit(&commit, repo,
10869 parent_ids = got_object_commit_get_parent_ids(commit);
10870 pid = STAILQ_FIRST(parent_ids);
10872 error = got_worktree_histedit_merge_files(&merged_paths,
10873 worktree, fileindex, pid->id, hle->commit_id, repo,
10874 update_progress, &upa, check_cancelled, NULL);
10877 got_object_commit_close(commit);
10880 print_merge_progress_stats(&upa);
10881 if (upa.conflicts > 0 || upa.missing > 0 ||
10882 upa.not_deleted > 0 || upa.unversioned > 0) {
10883 if (upa.conflicts > 0) {
10884 error = show_rebase_merge_conflict(
10885 hle->commit_id, repo);
10889 got_worktree_rebase_pathlist_free(&merged_paths);
10893 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
10895 error = got_object_id_str(&id_str, hle->commit_id);
10898 printf("Stopping histedit for amending commit %s\n",
10901 got_worktree_rebase_pathlist_free(&merged_paths);
10902 error = got_worktree_histedit_postpone(worktree,
10907 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
10908 error = histedit_skip_commit(hle, worktree, repo);
10914 error = histedit_commit(&merged_paths, worktree, fileindex,
10915 tmp_branch, hle, repo);
10916 got_worktree_rebase_pathlist_free(&merged_paths);
10921 if (upa.conflicts > 0 || upa.missing > 0 ||
10922 upa.not_deleted > 0 || upa.unversioned > 0) {
10923 error = got_worktree_histedit_postpone(worktree, fileindex);
10926 if (upa.conflicts > 0 && upa.missing == 0 &&
10927 upa.not_deleted == 0 && upa.unversioned == 0) {
10928 error = got_error_msg(GOT_ERR_CONFLICTS,
10929 "conflicts must be resolved before histedit "
10931 } else if (upa.conflicts > 0) {
10932 error = got_error_msg(GOT_ERR_CONFLICTS,
10933 "conflicts must be resolved before histedit "
10934 "can continue; changes destined for some "
10935 "files were not yet merged and should be "
10936 "merged manually if required before the "
10937 "histedit operation is continued");
10939 error = got_error_msg(GOT_ERR_CONFLICTS,
10940 "changes destined for some files were not "
10941 "yet merged and should be merged manually "
10942 "if required before the histedit operation "
10946 error = histedit_complete(worktree, fileindex, tmp_branch,
10949 got_object_id_queue_free(&commits);
10950 histedit_free_list(&histedit_cmds);
10951 free(head_commit_id);
10952 free(base_commit_id);
10953 free(resume_commit_id);
10955 got_object_commit_close(commit);
10957 got_ref_close(branch);
10959 got_ref_close(tmp_branch);
10961 got_worktree_close(worktree);
10963 const struct got_error *close_err = got_repo_close(repo);
10971 usage_integrate(void)
10973 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
10977 static const struct got_error *
10978 cmd_integrate(int argc, char *argv[])
10980 const struct got_error *error = NULL;
10981 struct got_repository *repo = NULL;
10982 struct got_worktree *worktree = NULL;
10983 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
10984 const char *branch_arg = NULL;
10985 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
10986 struct got_fileindex *fileindex = NULL;
10987 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
10989 struct got_update_progress_arg upa;
10991 while ((ch = getopt(argc, argv, "")) != -1) {
11004 branch_arg = argv[0];
11006 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11007 "unveil", NULL) == -1)
11010 cwd = getcwd(NULL, 0);
11012 error = got_error_from_errno("getcwd");
11016 error = got_worktree_open(&worktree, cwd);
11018 if (error->code == GOT_ERR_NOT_WORKTREE)
11019 error = wrap_not_worktree_error(error, "integrate",
11024 error = check_rebase_or_histedit_in_progress(worktree);
11028 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11033 error = apply_unveil(got_repo_get_path(repo), 0,
11034 got_worktree_get_root_path(worktree));
11038 error = check_merge_in_progress(worktree, repo);
11042 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11043 error = got_error_from_errno("asprintf");
11047 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11048 &base_branch_ref, worktree, refname, repo);
11052 refname = strdup(got_ref_get_name(branch_ref));
11053 if (refname == NULL) {
11054 error = got_error_from_errno("strdup");
11055 got_worktree_integrate_abort(worktree, fileindex, repo,
11056 branch_ref, base_branch_ref);
11059 base_refname = strdup(got_ref_get_name(base_branch_ref));
11060 if (base_refname == NULL) {
11061 error = got_error_from_errno("strdup");
11062 got_worktree_integrate_abort(worktree, fileindex, repo,
11063 branch_ref, base_branch_ref);
11067 error = got_ref_resolve(&commit_id, repo, branch_ref);
11071 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11075 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11076 error = got_error_msg(GOT_ERR_SAME_BRANCH,
11077 "specified branch has already been integrated");
11078 got_worktree_integrate_abort(worktree, fileindex, repo,
11079 branch_ref, base_branch_ref);
11083 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11085 if (error->code == GOT_ERR_ANCESTRY)
11086 error = got_error(GOT_ERR_REBASE_REQUIRED);
11087 got_worktree_integrate_abort(worktree, fileindex, repo,
11088 branch_ref, base_branch_ref);
11092 memset(&upa, 0, sizeof(upa));
11093 error = got_worktree_integrate_continue(worktree, fileindex, repo,
11094 branch_ref, base_branch_ref, update_progress, &upa,
11095 check_cancelled, NULL);
11099 printf("Integrated %s into %s\n", refname, base_refname);
11100 print_update_progress_stats(&upa);
11103 const struct got_error *close_err = got_repo_close(repo);
11108 got_worktree_close(worktree);
11110 free(base_commit_id);
11113 free(base_refname);
11120 fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11125 static const struct got_error *
11126 cmd_merge(int argc, char *argv[])
11128 const struct got_error *error = NULL;
11129 struct got_worktree *worktree = NULL;
11130 struct got_repository *repo = NULL;
11131 struct got_fileindex *fileindex = NULL;
11132 char *cwd = NULL, *id_str = NULL, *author = NULL;
11133 struct got_reference *branch = NULL, *wt_branch = NULL;
11134 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11135 struct got_object_id *wt_branch_tip = NULL;
11136 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11137 int interrupt_merge = 0;
11138 struct got_update_progress_arg upa;
11139 struct got_object_id *merge_commit_id = NULL;
11140 char *branch_name = NULL;
11142 memset(&upa, 0, sizeof(upa));
11144 while ((ch = getopt(argc, argv, "acn")) != -1) {
11150 continue_merge = 1;
11153 interrupt_merge = 1;
11165 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11166 "unveil", NULL) == -1)
11170 if (abort_merge && continue_merge)
11171 option_conflict('a', 'c');
11172 if (abort_merge || continue_merge) {
11175 } else if (argc != 1)
11178 cwd = getcwd(NULL, 0);
11180 error = got_error_from_errno("getcwd");
11184 error = got_worktree_open(&worktree, cwd);
11186 if (error->code == GOT_ERR_NOT_WORKTREE)
11187 error = wrap_not_worktree_error(error,
11192 error = got_repo_open(&repo,
11193 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
11197 error = apply_unveil(got_repo_get_path(repo), 0,
11198 worktree ? got_worktree_get_root_path(worktree) : NULL);
11202 error = check_rebase_or_histedit_in_progress(worktree);
11206 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11212 if (!merge_in_progress) {
11213 error = got_error(GOT_ERR_NOT_MERGING);
11216 error = got_worktree_merge_continue(&branch_name,
11217 &branch_tip, &fileindex, worktree, repo);
11220 error = got_worktree_merge_abort(worktree, fileindex, repo,
11221 abort_progress, &upa);
11224 printf("Merge of %s aborted\n", branch_name);
11225 goto done; /* nothing else to do */
11228 error = get_author(&author, repo, worktree);
11232 if (continue_merge) {
11233 if (!merge_in_progress) {
11234 error = got_error(GOT_ERR_NOT_MERGING);
11237 error = got_worktree_merge_continue(&branch_name,
11238 &branch_tip, &fileindex, worktree, repo);
11242 error = got_ref_open(&branch, repo, argv[0], 0);
11245 branch_name = strdup(got_ref_get_name(branch));
11246 if (branch_name == NULL) {
11247 error = got_error_from_errno("strdup");
11250 error = got_ref_resolve(&branch_tip, repo, branch);
11255 error = got_ref_open(&wt_branch, repo,
11256 got_worktree_get_head_ref_name(worktree), 0);
11259 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11262 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11263 wt_branch_tip, branch_tip, 0, repo,
11264 check_cancelled, NULL);
11265 if (error && error->code != GOT_ERR_ANCESTRY)
11268 if (!continue_merge) {
11269 error = check_path_prefix(wt_branch_tip, branch_tip,
11270 got_worktree_get_path_prefix(worktree),
11271 GOT_ERR_MERGE_PATH, repo);
11275 error = check_same_branch(wt_branch_tip, branch,
11278 if (error->code != GOT_ERR_ANCESTRY)
11282 static char msg[512];
11283 snprintf(msg, sizeof(msg),
11284 "cannot create a merge commit because "
11285 "%s is based on %s; %s can be integrated "
11286 "with 'got integrate' instead", branch_name,
11287 got_worktree_get_head_ref_name(worktree),
11289 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11293 error = got_worktree_merge_prepare(&fileindex, worktree,
11298 error = got_worktree_merge_branch(worktree, fileindex,
11299 yca_id, branch_tip, repo, update_progress, &upa,
11300 check_cancelled, NULL);
11303 print_merge_progress_stats(&upa);
11304 if (!upa.did_something) {
11305 error = got_worktree_merge_abort(worktree, fileindex,
11306 repo, abort_progress, &upa);
11309 printf("Already up-to-date\n");
11314 if (interrupt_merge) {
11315 error = got_worktree_merge_postpone(worktree, fileindex);
11318 printf("Merge of %s interrupted on request\n", branch_name);
11319 } else if (upa.conflicts > 0 || upa.missing > 0 ||
11320 upa.not_deleted > 0 || upa.unversioned > 0) {
11321 error = got_worktree_merge_postpone(worktree, fileindex);
11324 if (upa.conflicts > 0 && upa.missing == 0 &&
11325 upa.not_deleted == 0 && upa.unversioned == 0) {
11326 error = got_error_msg(GOT_ERR_CONFLICTS,
11327 "conflicts must be resolved before merging "
11329 } else if (upa.conflicts > 0) {
11330 error = got_error_msg(GOT_ERR_CONFLICTS,
11331 "conflicts must be resolved before merging "
11332 "can continue; changes destined for some "
11333 "files were not yet merged and "
11334 "should be merged manually if required before the "
11335 "merge operation is continued");
11337 error = got_error_msg(GOT_ERR_CONFLICTS,
11338 "changes destined for some "
11339 "files were not yet merged and should be "
11340 "merged manually if required before the "
11341 "merge operation is continued");
11345 error = got_worktree_merge_commit(&merge_commit_id, worktree,
11346 fileindex, author, NULL, 1, branch_tip, branch_name,
11347 repo, continue_merge ? print_status : NULL, NULL);
11350 error = got_worktree_merge_complete(worktree, fileindex, repo);
11353 error = got_object_id_str(&id_str, merge_commit_id);
11356 printf("Merged %s into %s: %s\n", branch_name,
11357 got_worktree_get_head_ref_name(worktree),
11363 free(merge_commit_id);
11369 got_ref_close(branch);
11371 got_ref_close(wt_branch);
11373 got_worktree_close(worktree);
11375 const struct got_error *close_err = got_repo_close(repo);
11385 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11386 "[-S] [file-path ...]\n",
11391 static const struct got_error *
11392 print_stage(void *arg, unsigned char status, unsigned char staged_status,
11393 const char *path, struct got_object_id *blob_id,
11394 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11395 int dirfd, const char *de_name)
11397 const struct got_error *err = NULL;
11398 char *id_str = NULL;
11400 if (staged_status != GOT_STATUS_ADD &&
11401 staged_status != GOT_STATUS_MODIFY &&
11402 staged_status != GOT_STATUS_DELETE)
11405 if (staged_status == GOT_STATUS_ADD ||
11406 staged_status == GOT_STATUS_MODIFY)
11407 err = got_object_id_str(&id_str, staged_blob_id);
11409 err = got_object_id_str(&id_str, blob_id);
11413 printf("%s %c %s\n", id_str, staged_status, path);
11418 static const struct got_error *
11419 cmd_stage(int argc, char *argv[])
11421 const struct got_error *error = NULL;
11422 struct got_repository *repo = NULL;
11423 struct got_worktree *worktree = NULL;
11425 struct got_pathlist_head paths;
11426 struct got_pathlist_entry *pe;
11427 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11428 FILE *patch_script_file = NULL;
11429 const char *patch_script_path = NULL;
11430 struct choose_patch_arg cpa;
11432 TAILQ_INIT(&paths);
11434 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11443 patch_script_path = optarg;
11446 allow_bad_symlinks = 1;
11458 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11459 "unveil", NULL) == -1)
11462 if (list_stage && (pflag || patch_script_path))
11463 errx(1, "-l option cannot be used with other options");
11464 if (patch_script_path && !pflag)
11465 errx(1, "-F option can only be used together with -p option");
11467 cwd = getcwd(NULL, 0);
11469 error = got_error_from_errno("getcwd");
11473 error = got_worktree_open(&worktree, cwd);
11475 if (error->code == GOT_ERR_NOT_WORKTREE)
11476 error = wrap_not_worktree_error(error, "stage", cwd);
11480 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11485 if (patch_script_path) {
11486 patch_script_file = fopen(patch_script_path, "re");
11487 if (patch_script_file == NULL) {
11488 error = got_error_from_errno2("fopen",
11489 patch_script_path);
11493 error = apply_unveil(got_repo_get_path(repo), 0,
11494 got_worktree_get_root_path(worktree));
11498 error = check_merge_in_progress(worktree, repo);
11502 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11507 error = got_worktree_status(worktree, &paths, repo, 0,
11508 print_stage, NULL, check_cancelled, NULL);
11510 cpa.patch_script_file = patch_script_file;
11511 cpa.action = "stage";
11512 error = got_worktree_stage(worktree, &paths,
11513 pflag ? NULL : print_status, NULL,
11514 pflag ? choose_patch : NULL, &cpa,
11515 allow_bad_symlinks, repo);
11518 if (patch_script_file && fclose(patch_script_file) == EOF &&
11520 error = got_error_from_errno2("fclose", patch_script_path);
11522 const struct got_error *close_err = got_repo_close(repo);
11527 got_worktree_close(worktree);
11528 TAILQ_FOREACH(pe, &paths, entry)
11529 free((char *)pe->path);
11530 got_pathlist_free(&paths);
11536 usage_unstage(void)
11538 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
11539 "[file-path ...]\n",
11545 static const struct got_error *
11546 cmd_unstage(int argc, char *argv[])
11548 const struct got_error *error = NULL;
11549 struct got_repository *repo = NULL;
11550 struct got_worktree *worktree = NULL;
11552 struct got_pathlist_head paths;
11553 struct got_pathlist_entry *pe;
11555 struct got_update_progress_arg upa;
11556 FILE *patch_script_file = NULL;
11557 const char *patch_script_path = NULL;
11558 struct choose_patch_arg cpa;
11560 TAILQ_INIT(&paths);
11562 while ((ch = getopt(argc, argv, "pF:")) != -1) {
11568 patch_script_path = optarg;
11580 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11581 "unveil", NULL) == -1)
11584 if (patch_script_path && !pflag)
11585 errx(1, "-F option can only be used together with -p option");
11587 cwd = getcwd(NULL, 0);
11589 error = got_error_from_errno("getcwd");
11593 error = got_worktree_open(&worktree, cwd);
11595 if (error->code == GOT_ERR_NOT_WORKTREE)
11596 error = wrap_not_worktree_error(error, "unstage", cwd);
11600 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11605 if (patch_script_path) {
11606 patch_script_file = fopen(patch_script_path, "re");
11607 if (patch_script_file == NULL) {
11608 error = got_error_from_errno2("fopen",
11609 patch_script_path);
11614 error = apply_unveil(got_repo_get_path(repo), 0,
11615 got_worktree_get_root_path(worktree));
11619 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11623 cpa.patch_script_file = patch_script_file;
11624 cpa.action = "unstage";
11625 memset(&upa, 0, sizeof(upa));
11626 error = got_worktree_unstage(worktree, &paths, update_progress,
11627 &upa, pflag ? choose_patch : NULL, &cpa, repo);
11629 print_merge_progress_stats(&upa);
11631 if (patch_script_file && fclose(patch_script_file) == EOF &&
11633 error = got_error_from_errno2("fclose", patch_script_path);
11635 const struct got_error *close_err = got_repo_close(repo);
11640 got_worktree_close(worktree);
11641 TAILQ_FOREACH(pe, &paths, entry)
11642 free((char *)pe->path);
11643 got_pathlist_free(&paths);
11651 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
11652 "arg1 [arg2 ...]\n", getprogname());
11656 static const struct got_error *
11657 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11659 const struct got_error *err;
11660 struct got_blob_object *blob;
11662 err = got_object_open_as_blob(&blob, repo, id, 8192);
11666 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
11667 got_object_blob_close(blob);
11671 static const struct got_error *
11672 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11674 const struct got_error *err;
11675 struct got_tree_object *tree;
11678 err = got_object_open_as_tree(&tree, repo, id);
11682 nentries = got_object_tree_get_nentries(tree);
11683 for (i = 0; i < nentries; i++) {
11684 struct got_tree_entry *te;
11686 if (sigint_received || sigpipe_received)
11688 te = got_object_tree_get_entry(tree, i);
11689 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
11692 fprintf(outfile, "%s %.7o %s\n", id_str,
11693 got_tree_entry_get_mode(te),
11694 got_tree_entry_get_name(te));
11698 got_object_tree_close(tree);
11703 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
11713 h = (long long)gmtoff / 3600;
11714 m = ((long long)gmtoff - h*3600) / 60;
11715 snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
11718 static const struct got_error *
11719 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11721 const struct got_error *err;
11722 struct got_commit_object *commit;
11723 const struct got_object_id_queue *parent_ids;
11724 struct got_object_qid *pid;
11725 char *id_str = NULL;
11726 const char *logmsg = NULL;
11729 err = got_object_open_as_commit(&commit, repo, id);
11733 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
11737 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
11738 parent_ids = got_object_commit_get_parent_ids(commit);
11739 fprintf(outfile, "numparents %d\n",
11740 got_object_commit_get_nparents(commit));
11741 STAILQ_FOREACH(pid, parent_ids, entry) {
11743 err = got_object_id_str(&pid_str, pid->id);
11746 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
11749 format_gmtoff(gmtoff, sizeof(gmtoff),
11750 got_object_commit_get_author_gmtoff(commit));
11751 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
11752 got_object_commit_get_author(commit),
11753 (long long)got_object_commit_get_author_time(commit),
11756 format_gmtoff(gmtoff, sizeof(gmtoff),
11757 got_object_commit_get_committer_gmtoff(commit));
11758 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
11759 got_object_commit_get_author(commit),
11760 (long long)got_object_commit_get_committer_time(commit),
11763 logmsg = got_object_commit_get_logmsg_raw(commit);
11764 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
11765 fprintf(outfile, "%s", logmsg);
11768 got_object_commit_close(commit);
11772 static const struct got_error *
11773 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11775 const struct got_error *err;
11776 struct got_tag_object *tag;
11777 char *id_str = NULL;
11778 const char *tagmsg = NULL;
11781 err = got_object_open_as_tag(&tag, repo, id);
11785 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
11789 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
11791 switch (got_object_tag_get_object_type(tag)) {
11792 case GOT_OBJ_TYPE_BLOB:
11793 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11794 GOT_OBJ_LABEL_BLOB);
11796 case GOT_OBJ_TYPE_TREE:
11797 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11798 GOT_OBJ_LABEL_TREE);
11800 case GOT_OBJ_TYPE_COMMIT:
11801 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11802 GOT_OBJ_LABEL_COMMIT);
11804 case GOT_OBJ_TYPE_TAG:
11805 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11806 GOT_OBJ_LABEL_TAG);
11812 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
11813 got_object_tag_get_name(tag));
11815 format_gmtoff(gmtoff, sizeof(gmtoff),
11816 got_object_tag_get_tagger_gmtoff(tag));
11817 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
11818 got_object_tag_get_tagger(tag),
11819 (long long)got_object_tag_get_tagger_time(tag),
11822 tagmsg = got_object_tag_get_message(tag);
11823 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
11824 fprintf(outfile, "%s", tagmsg);
11827 got_object_tag_close(tag);
11831 static const struct got_error *
11832 cmd_cat(int argc, char *argv[])
11834 const struct got_error *error;
11835 struct got_repository *repo = NULL;
11836 struct got_worktree *worktree = NULL;
11837 char *cwd = NULL, *repo_path = NULL, *label = NULL;
11838 const char *commit_id_str = NULL;
11839 struct got_object_id *id = NULL, *commit_id = NULL;
11840 int ch, obj_type, i, force_path = 0;
11841 struct got_reflist_head refs;
11846 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
11851 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
11854 commit_id_str = optarg;
11857 repo_path = realpath(optarg, NULL);
11858 if (repo_path == NULL)
11859 return got_error_from_errno2("realpath",
11861 got_path_strip_trailing_slashes(repo_path);
11875 cwd = getcwd(NULL, 0);
11877 error = got_error_from_errno("getcwd");
11880 error = got_worktree_open(&worktree, cwd);
11881 if (error && error->code != GOT_ERR_NOT_WORKTREE)
11884 if (repo_path == NULL) {
11885 repo_path = strdup(
11886 got_worktree_get_repo_path(worktree));
11887 if (repo_path == NULL) {
11888 error = got_error_from_errno("strdup");
11893 /* Release work tree lock. */
11894 got_worktree_close(worktree);
11898 if (repo_path == NULL) {
11899 repo_path = getcwd(NULL, 0);
11900 if (repo_path == NULL)
11901 return got_error_from_errno("getcwd");
11904 error = got_repo_open(&repo, repo_path, NULL);
11909 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
11913 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11917 if (commit_id_str == NULL)
11918 commit_id_str = GOT_REF_HEAD;
11919 error = got_repo_match_object_id(&commit_id, NULL,
11920 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
11924 for (i = 0; i < argc; i++) {
11926 error = got_object_id_by_path(&id, repo, commit_id,
11931 error = got_repo_match_object_id(&id, &label, argv[i],
11932 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
11935 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
11936 error->code != GOT_ERR_NOT_REF)
11938 error = got_object_id_by_path(&id, repo,
11939 commit_id, argv[i]);
11945 error = got_object_get_type(&obj_type, repo, id);
11949 switch (obj_type) {
11950 case GOT_OBJ_TYPE_BLOB:
11951 error = cat_blob(id, repo, stdout);
11953 case GOT_OBJ_TYPE_TREE:
11954 error = cat_tree(id, repo, stdout);
11956 case GOT_OBJ_TYPE_COMMIT:
11957 error = cat_commit(id, repo, stdout);
11959 case GOT_OBJ_TYPE_TAG:
11960 error = cat_tag(id, repo, stdout);
11963 error = got_error(GOT_ERR_OBJ_TYPE);
11978 got_worktree_close(worktree);
11980 const struct got_error *close_err = got_repo_close(repo);
11984 got_ref_list_free(&refs);
11991 fprintf(stderr, "usage: %s info [path ...]\n",
11996 static const struct got_error *
11997 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
11998 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11999 struct got_object_id *commit_id)
12001 const struct got_error *err = NULL;
12002 char *id_str = NULL;
12004 struct tm mytm, *tm;
12005 struct got_pathlist_head *paths = arg;
12006 struct got_pathlist_entry *pe;
12009 * Clear error indication from any of the path arguments which
12010 * would cause this file index entry to be displayed.
12012 TAILQ_FOREACH(pe, paths, entry) {
12013 if (got_path_cmp(path, pe->path, strlen(path),
12014 pe->path_len) == 0 ||
12015 got_path_is_child(path, pe->path, pe->path_len))
12016 pe->data = NULL; /* no error */
12019 printf(GOT_COMMIT_SEP_STR);
12021 printf("symlink: %s\n", path);
12022 else if (S_ISREG(mode)) {
12023 printf("file: %s\n", path);
12024 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12025 } else if (S_ISDIR(mode))
12026 printf("directory: %s\n", path);
12028 printf("something: %s\n", path);
12030 tm = localtime_r(&mtime, &mytm);
12033 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12034 return got_error(GOT_ERR_NO_SPACE);
12035 printf("timestamp: %s\n", datebuf);
12038 err = got_object_id_str(&id_str, blob_id);
12041 printf("based on blob: %s\n", id_str);
12045 if (staged_blob_id) {
12046 err = got_object_id_str(&id_str, staged_blob_id);
12049 printf("based on staged blob: %s\n", id_str);
12054 err = got_object_id_str(&id_str, commit_id);
12057 printf("based on commit: %s\n", id_str);
12064 static const struct got_error *
12065 cmd_info(int argc, char *argv[])
12067 const struct got_error *error = NULL;
12068 struct got_worktree *worktree = NULL;
12069 char *cwd = NULL, *id_str = NULL;
12070 struct got_pathlist_head paths;
12071 struct got_pathlist_entry *pe;
12072 char *uuidstr = NULL;
12073 int ch, show_files = 0;
12075 TAILQ_INIT(&paths);
12077 while ((ch = getopt(argc, argv, "")) != -1) {
12089 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
12093 cwd = getcwd(NULL, 0);
12095 error = got_error_from_errno("getcwd");
12099 error = got_worktree_open(&worktree, cwd);
12101 if (error->code == GOT_ERR_NOT_WORKTREE)
12102 error = wrap_not_worktree_error(error, "info", cwd);
12106 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
12111 error = get_worktree_paths_from_argv(&paths, argc, argv,
12118 error = got_object_id_str(&id_str,
12119 got_worktree_get_base_commit_id(worktree));
12123 error = got_worktree_get_uuid(&uuidstr, worktree);
12127 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12128 printf("work tree base commit: %s\n", id_str);
12129 printf("work tree path prefix: %s\n",
12130 got_worktree_get_path_prefix(worktree));
12131 printf("work tree branch reference: %s\n",
12132 got_worktree_get_head_ref_name(worktree));
12133 printf("work tree UUID: %s\n", uuidstr);
12134 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12137 struct got_pathlist_entry *pe;
12138 TAILQ_FOREACH(pe, &paths, entry) {
12139 if (pe->path_len == 0)
12142 * Assume this path will fail. This will be corrected
12143 * in print_path_info() in case the path does suceeed.
12145 pe->data = (void *)got_error_path(pe->path,
12148 error = got_worktree_path_info(worktree, &paths,
12149 print_path_info, &paths, check_cancelled, NULL);
12152 TAILQ_FOREACH(pe, &paths, entry) {
12153 if (pe->data != NULL) {
12154 error = pe->data; /* bad path */
12160 TAILQ_FOREACH(pe, &paths, entry)
12161 free((char *)pe->path);
12162 got_pathlist_free(&paths);