2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/queue.h>
20 #include <sys/types.h>
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;
4269 error = print_commits(start_id, end_id, repo, path ? path : "",
4270 show_changed_paths, show_patch, search_pattern, diff_context,
4271 limit, log_branches, reverse_display_order, refs_idmap);
4277 got_worktree_close(worktree);
4279 const struct got_error *close_err = got_repo_close(repo);
4284 got_reflist_object_id_map_free(refs_idmap);
4285 got_ref_list_free(&refs);
4292 fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4293 "[-r repository-path] [-s] [-w] [-P] "
4294 "[object1 object2 | path ...]\n", getprogname());
4298 struct print_diff_arg {
4299 struct got_repository *repo;
4300 struct got_worktree *worktree;
4305 int ignore_whitespace;
4306 int force_text_diff;
4310 * Create a file which contains the target path of a symlink so we can feed
4311 * it as content to the diff engine.
4313 static const struct got_error *
4314 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4315 const char *abspath)
4317 const struct got_error *err = NULL;
4318 char target_path[PATH_MAX];
4319 ssize_t target_len, outlen;
4324 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4325 if (target_len == -1)
4326 return got_error_from_errno2("readlinkat", abspath);
4328 target_len = readlink(abspath, target_path, PATH_MAX);
4329 if (target_len == -1)
4330 return got_error_from_errno2("readlink", abspath);
4333 *fd = got_opentempfd();
4335 return got_error_from_errno("got_opentempfd");
4337 outlen = write(*fd, target_path, target_len);
4339 err = got_error_from_errno("got_opentempfd");
4343 if (lseek(*fd, 0, SEEK_SET) == -1) {
4344 err = got_error_from_errno2("lseek", abspath);
4355 static const struct got_error *
4356 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4357 const char *path, struct got_object_id *blob_id,
4358 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4359 int dirfd, const char *de_name)
4361 struct print_diff_arg *a = arg;
4362 const struct got_error *err = NULL;
4363 struct got_blob_object *blob1 = NULL;
4366 char *abspath = NULL, *label1 = NULL;
4369 if (a->diff_staged) {
4370 if (staged_status != GOT_STATUS_MODIFY &&
4371 staged_status != GOT_STATUS_ADD &&
4372 staged_status != GOT_STATUS_DELETE)
4375 if (staged_status == GOT_STATUS_DELETE)
4377 if (status == GOT_STATUS_NONEXISTENT)
4378 return got_error_set_errno(ENOENT, path);
4379 if (status != GOT_STATUS_MODIFY &&
4380 status != GOT_STATUS_ADD &&
4381 status != GOT_STATUS_DELETE &&
4382 status != GOT_STATUS_CONFLICT)
4386 if (!a->header_shown) {
4387 printf("diff %s %s%s\n", a->id_str,
4388 got_worktree_get_root_path(a->worktree),
4389 a->diff_staged ? " (staged changes)" : "");
4390 a->header_shown = 1;
4393 if (a->diff_staged) {
4394 const char *label1 = NULL, *label2 = NULL;
4395 switch (staged_status) {
4396 case GOT_STATUS_MODIFY:
4400 case GOT_STATUS_ADD:
4403 case GOT_STATUS_DELETE:
4407 return got_error(GOT_ERR_FILE_STATUS);
4409 return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4410 staged_blob_id, label1, label2, a->diff_context,
4411 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4414 if (staged_status == GOT_STATUS_ADD ||
4415 staged_status == GOT_STATUS_MODIFY) {
4417 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4421 err = got_object_id_str(&id_str, staged_blob_id);
4424 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4425 err = got_error_from_errno("asprintf");
4430 } else if (status != GOT_STATUS_ADD) {
4431 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4436 if (status != GOT_STATUS_DELETE) {
4437 if (asprintf(&abspath, "%s/%s",
4438 got_worktree_get_root_path(a->worktree), path) == -1) {
4439 err = got_error_from_errno("asprintf");
4444 fd = openat(dirfd, de_name,
4445 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4447 if (!got_err_open_nofollow_on_symlink()) {
4448 err = got_error_from_errno2("openat",
4452 err = get_symlink_target_file(&fd, dirfd,
4458 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4460 if (!got_err_open_nofollow_on_symlink()) {
4461 err = got_error_from_errno2("open",
4465 err = get_symlink_target_file(&fd, dirfd,
4471 if (fstat(fd, &sb) == -1) {
4472 err = got_error_from_errno2("fstat", abspath);
4475 f2 = fdopen(fd, "r");
4477 err = got_error_from_errno2("fdopen", abspath);
4484 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4485 a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4488 got_object_blob_close(blob1);
4489 if (f2 && fclose(f2) == EOF && err == NULL)
4490 err = got_error_from_errno("fclose");
4491 if (fd != -1 && close(fd) == -1 && err == NULL)
4492 err = got_error_from_errno("close");
4497 static const struct got_error *
4498 cmd_diff(int argc, char *argv[])
4500 const struct got_error *error;
4501 struct got_repository *repo = NULL;
4502 struct got_worktree *worktree = NULL;
4503 char *cwd = NULL, *repo_path = NULL;
4504 const char *commit_args[2] = { NULL, NULL };
4505 int ncommit_args = 0;
4506 struct got_object_id *ids[2] = { NULL, NULL };
4507 char *labels[2] = { NULL, NULL };
4508 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4509 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4510 int force_text_diff = 0, force_path = 0, rflag = 0;
4512 struct got_reflist_head refs;
4513 struct got_pathlist_head paths;
4514 struct got_pathlist_entry *pe;
4520 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4525 while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4528 force_text_diff = 1;
4531 if (ncommit_args >= 2)
4532 errx(1, "too many -c options used");
4533 commit_args[ncommit_args++] = optarg;
4536 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4539 errx(1, "number of context lines is %s: %s",
4543 repo_path = realpath(optarg, NULL);
4544 if (repo_path == NULL)
4545 return got_error_from_errno2("realpath",
4547 got_path_strip_trailing_slashes(repo_path);
4554 ignore_whitespace = 1;
4568 cwd = getcwd(NULL, 0);
4570 error = got_error_from_errno("getcwd");
4574 if (repo_path == NULL) {
4575 error = got_worktree_open(&worktree, cwd);
4576 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4582 strdup(got_worktree_get_repo_path(worktree));
4583 if (repo_path == NULL) {
4584 error = got_error_from_errno("strdup");
4588 repo_path = strdup(cwd);
4589 if (repo_path == NULL) {
4590 error = got_error_from_errno("strdup");
4596 error = got_repo_open(&repo, repo_path, NULL);
4601 if (rflag || worktree == NULL || ncommit_args > 0) {
4603 error = got_error_msg(GOT_ERR_NOT_IMPL,
4604 "-P option can only be used when diffing "
4609 error = got_error_msg(GOT_ERR_NOT_IMPL,
4610 "-s option can only be used when diffing "
4616 error = apply_unveil(got_repo_get_path(repo), 1,
4617 worktree ? got_worktree_get_root_path(worktree) : NULL);
4621 if ((!force_path && argc == 2) || ncommit_args > 0) {
4622 int obj_type = (ncommit_args > 0 ?
4623 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4624 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4628 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4630 if (ncommit_args > 0)
4631 arg = commit_args[i];
4634 error = got_repo_match_object_id(&ids[i], &labels[i],
4635 arg, obj_type, &refs, repo);
4637 if (error->code != GOT_ERR_NOT_REF &&
4638 error->code != GOT_ERR_NO_OBJ)
4640 if (ncommit_args > 0)
4648 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4649 struct print_diff_arg arg;
4652 if (worktree == NULL) {
4653 if (argc == 2 && ids[0] == NULL) {
4654 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4656 } else if (argc == 2 && ids[1] == NULL) {
4657 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4659 } else if (argc > 0) {
4660 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4661 "%s", "specified paths cannot be resolved");
4664 error = got_error(GOT_ERR_NOT_WORKTREE);
4669 error = get_worktree_paths_from_argv(&paths, argc, argv,
4674 error = got_object_id_str(&id_str,
4675 got_worktree_get_base_commit_id(worktree));
4679 arg.worktree = worktree;
4680 arg.diff_context = diff_context;
4681 arg.id_str = id_str;
4682 arg.header_shown = 0;
4683 arg.diff_staged = diff_staged;
4684 arg.ignore_whitespace = ignore_whitespace;
4685 arg.force_text_diff = force_text_diff;
4687 error = got_worktree_status(worktree, &paths, repo, 0,
4688 print_diff, &arg, check_cancelled, NULL);
4693 if (ncommit_args == 1) {
4694 struct got_commit_object *commit;
4695 error = got_object_open_as_commit(&commit, repo, ids[0]);
4699 labels[1] = labels[0];
4701 if (got_object_commit_get_nparents(commit) > 0) {
4702 const struct got_object_id_queue *pids;
4703 struct got_object_qid *pid;
4704 pids = got_object_commit_get_parent_ids(commit);
4705 pid = STAILQ_FIRST(pids);
4706 ids[0] = got_object_id_dup(pid->id);
4707 if (ids[0] == NULL) {
4708 error = got_error_from_errno(
4709 "got_object_id_dup");
4710 got_object_commit_close(commit);
4713 error = got_object_id_str(&labels[0], ids[0]);
4715 got_object_commit_close(commit);
4720 labels[0] = strdup("/dev/null");
4721 if (labels[0] == NULL) {
4722 error = got_error_from_errno("strdup");
4723 got_object_commit_close(commit);
4728 got_object_commit_close(commit);
4731 if (ncommit_args == 0 && argc > 2) {
4732 error = got_error_msg(GOT_ERR_BAD_PATH,
4733 "path arguments cannot be used when diffing two objects");
4738 error = got_object_get_type(&type1, repo, ids[0]);
4743 error = got_object_get_type(&type2, repo, ids[1]);
4746 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4747 error = got_error(GOT_ERR_OBJ_TYPE);
4750 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
4751 error = got_error_msg(GOT_ERR_OBJ_TYPE,
4752 "path arguments cannot be used when diffing blobs");
4756 for (i = 0; ncommit_args > 0 && i < argc; i++) {
4758 struct got_pathlist_entry *new;
4762 error = got_worktree_resolve_path(&p, worktree,
4766 prefix = got_worktree_get_path_prefix(worktree);
4767 while (prefix[0] == '/')
4769 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4770 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4772 error = got_error_from_errno("asprintf");
4778 char *mapped_path, *s;
4779 error = got_repo_map_path(&mapped_path, repo, argv[i]);
4785 in_repo_path = strdup(s);
4786 if (in_repo_path == NULL) {
4787 error = got_error_from_errno("asprintf");
4794 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4795 if (error || new == NULL /* duplicate */)
4801 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4802 case GOT_OBJ_TYPE_BLOB:
4803 error = got_diff_objects_as_blobs(NULL, NULL, ids[0], ids[1],
4804 NULL, NULL, diff_context, ignore_whitespace,
4805 force_text_diff, repo, stdout);
4807 case GOT_OBJ_TYPE_TREE:
4808 error = got_diff_objects_as_trees(NULL, NULL, ids[0], ids[1],
4809 &paths, "", "", diff_context, ignore_whitespace,
4810 force_text_diff, repo, stdout);
4812 case GOT_OBJ_TYPE_COMMIT:
4813 printf("diff %s %s\n", labels[0], labels[1]);
4814 error = got_diff_objects_as_commits(NULL, NULL, ids[0], ids[1],
4815 &paths, diff_context, ignore_whitespace, force_text_diff,
4819 error = got_error(GOT_ERR_OBJ_TYPE);
4827 got_worktree_close(worktree);
4829 const struct got_error *close_err = got_repo_close(repo);
4833 TAILQ_FOREACH(pe, &paths, entry)
4834 free((char *)pe->path);
4835 got_pathlist_free(&paths);
4836 got_ref_list_free(&refs);
4844 "usage: %s blame [-c commit] [-r repository-path] path\n",
4853 char datebuf[11]; /* YYYY-MM-DD + NUL */
4856 struct blame_cb_args {
4857 struct blame_line *lines;
4861 off_t *line_offsets;
4863 struct got_repository *repo;
4866 static const struct got_error *
4867 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4869 const struct got_error *err = NULL;
4870 struct blame_cb_args *a = arg;
4871 struct blame_line *bline;
4873 size_t linesize = 0;
4874 struct got_commit_object *commit = NULL;
4877 time_t committer_time;
4879 if (nlines != a->nlines ||
4880 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4881 return got_error(GOT_ERR_RANGE);
4883 if (sigint_received)
4884 return got_error(GOT_ERR_ITER_COMPLETED);
4887 return NULL; /* no change in this commit */
4889 /* Annotate this line. */
4890 bline = &a->lines[lineno - 1];
4891 if (bline->annotated)
4893 err = got_object_id_str(&bline->id_str, id);
4897 err = got_object_open_as_commit(&commit, a->repo, id);
4901 bline->committer = strdup(got_object_commit_get_committer(commit));
4902 if (bline->committer == NULL) {
4903 err = got_error_from_errno("strdup");
4907 committer_time = got_object_commit_get_committer_time(commit);
4908 if (gmtime_r(&committer_time, &tm) == NULL)
4909 return got_error_from_errno("gmtime_r");
4910 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4912 err = got_error(GOT_ERR_NO_SPACE);
4915 bline->annotated = 1;
4917 /* Print lines annotated so far. */
4918 bline = &a->lines[a->lineno_cur - 1];
4919 if (!bline->annotated)
4922 offset = a->line_offsets[a->lineno_cur - 1];
4923 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4924 err = got_error_from_errno("fseeko");
4928 while (bline->annotated) {
4929 char *smallerthan, *at, *nl, *committer;
4932 if (getline(&line, &linesize, a->f) == -1) {
4934 err = got_error_from_errno("getline");
4938 committer = bline->committer;
4939 smallerthan = strchr(committer, '<');
4940 if (smallerthan && smallerthan[1] != '\0')
4941 committer = smallerthan + 1;
4942 at = strchr(committer, '@');
4945 len = strlen(committer);
4947 committer[8] = '\0';
4949 nl = strchr(line, '\n');
4952 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4953 bline->id_str, bline->datebuf, committer, line);
4956 bline = &a->lines[a->lineno_cur - 1];
4960 got_object_commit_close(commit);
4965 static const struct got_error *
4966 cmd_blame(int argc, char *argv[])
4968 const struct got_error *error;
4969 struct got_repository *repo = NULL;
4970 struct got_worktree *worktree = NULL;
4971 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4972 char *link_target = NULL;
4973 struct got_object_id *obj_id = NULL;
4974 struct got_object_id *commit_id = NULL;
4975 struct got_blob_object *blob = NULL;
4976 char *commit_id_str = NULL;
4977 struct blame_cb_args bca;
4978 int ch, obj_type, i;
4981 memset(&bca, 0, sizeof(bca));
4984 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4989 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4992 commit_id_str = optarg;
4995 repo_path = realpath(optarg, NULL);
4996 if (repo_path == NULL)
4997 return got_error_from_errno2("realpath",
4999 got_path_strip_trailing_slashes(repo_path);
5015 cwd = getcwd(NULL, 0);
5017 error = got_error_from_errno("getcwd");
5020 if (repo_path == NULL) {
5021 error = got_worktree_open(&worktree, cwd);
5022 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5028 strdup(got_worktree_get_repo_path(worktree));
5029 if (repo_path == NULL) {
5030 error = got_error_from_errno("strdup");
5035 repo_path = strdup(cwd);
5036 if (repo_path == NULL) {
5037 error = got_error_from_errno("strdup");
5043 error = got_repo_open(&repo, repo_path, NULL);
5048 const char *prefix = got_worktree_get_path_prefix(worktree);
5051 error = got_worktree_resolve_path(&p, worktree, path);
5054 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5055 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5057 error = got_error_from_errno("asprintf");
5062 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5064 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5067 error = got_repo_map_path(&in_repo_path, repo, path);
5072 if (commit_id_str == NULL) {
5073 struct got_reference *head_ref;
5074 error = got_ref_open(&head_ref, repo, worktree ?
5075 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5078 error = got_ref_resolve(&commit_id, repo, head_ref);
5079 got_ref_close(head_ref);
5083 struct got_reflist_head refs;
5085 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5089 error = got_repo_match_object_id(&commit_id, NULL,
5090 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5091 got_ref_list_free(&refs);
5096 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5101 error = got_object_id_by_path(&obj_id, repo, commit_id,
5102 link_target ? link_target : in_repo_path);
5106 error = got_object_get_type(&obj_type, repo, obj_id);
5110 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5111 error = got_error_path(link_target ? link_target : in_repo_path,
5116 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5119 bca.f = got_opentemp();
5120 if (bca.f == NULL) {
5121 error = got_error_from_errno("got_opentemp");
5124 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5125 &bca.line_offsets, bca.f, blob);
5126 if (error || bca.nlines == 0)
5129 /* Don't include \n at EOF in the blame line count. */
5130 if (bca.line_offsets[bca.nlines - 1] == filesize)
5133 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5134 if (bca.lines == NULL) {
5135 error = got_error_from_errno("calloc");
5139 bca.nlines_prec = 0;
5147 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5148 repo, blame_cb, &bca, check_cancelled, NULL);
5157 got_object_blob_close(blob);
5159 got_worktree_close(worktree);
5161 const struct got_error *close_err = got_repo_close(repo);
5166 for (i = 0; i < bca.nlines; i++) {
5167 struct blame_line *bline = &bca.lines[i];
5168 free(bline->id_str);
5169 free(bline->committer);
5173 free(bca.line_offsets);
5174 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5175 error = got_error_from_errno("fclose");
5183 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5188 static const struct got_error *
5189 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5190 const char *root_path, struct got_repository *repo)
5192 const struct got_error *err = NULL;
5193 int is_root_path = (strcmp(path, root_path) == 0);
5194 const char *modestr = "";
5195 mode_t mode = got_tree_entry_get_mode(te);
5196 char *link_target = NULL;
5198 path += strlen(root_path);
5199 while (path[0] == '/')
5202 if (got_object_tree_entry_is_submodule(te))
5204 else if (S_ISLNK(mode)) {
5207 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5210 for (i = 0; i < strlen(link_target); i++) {
5211 if (!isprint((unsigned char)link_target[i]))
5212 link_target[i] = '?';
5217 else if (S_ISDIR(mode))
5219 else if (mode & S_IXUSR)
5222 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5223 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5224 link_target ? " -> ": "", link_target ? link_target : "");
5230 static const struct got_error *
5231 print_tree(const char *path, struct got_object_id *commit_id,
5232 int show_ids, int recurse, const char *root_path,
5233 struct got_repository *repo)
5235 const struct got_error *err = NULL;
5236 struct got_object_id *tree_id = NULL;
5237 struct got_tree_object *tree = NULL;
5240 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
5244 err = got_object_open_as_tree(&tree, repo, tree_id);
5247 nentries = got_object_tree_get_nentries(tree);
5248 for (i = 0; i < nentries; i++) {
5249 struct got_tree_entry *te;
5252 if (sigint_received || sigpipe_received)
5255 te = got_object_tree_get_entry(tree, i);
5258 err = got_object_id_str(&id_str,
5259 got_tree_entry_get_id(te));
5262 if (asprintf(&id, "%s ", id_str) == -1) {
5263 err = got_error_from_errno("asprintf");
5269 err = print_entry(te, id, path, root_path, repo);
5274 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5276 if (asprintf(&child_path, "%s%s%s", path,
5277 path[0] == '/' && path[1] == '\0' ? "" : "/",
5278 got_tree_entry_get_name(te)) == -1) {
5279 err = got_error_from_errno("asprintf");
5282 err = print_tree(child_path, commit_id, show_ids, 1,
5291 got_object_tree_close(tree);
5296 static const struct got_error *
5297 cmd_tree(int argc, char *argv[])
5299 const struct got_error *error;
5300 struct got_repository *repo = NULL;
5301 struct got_worktree *worktree = NULL;
5302 const char *path, *refname = NULL;
5303 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5304 struct got_object_id *commit_id = NULL;
5305 char *commit_id_str = NULL;
5306 int show_ids = 0, recurse = 0;
5310 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5315 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5318 commit_id_str = optarg;
5321 repo_path = realpath(optarg, NULL);
5322 if (repo_path == NULL)
5323 return got_error_from_errno2("realpath",
5325 got_path_strip_trailing_slashes(repo_path);
5349 cwd = getcwd(NULL, 0);
5351 error = got_error_from_errno("getcwd");
5354 if (repo_path == NULL) {
5355 error = got_worktree_open(&worktree, cwd);
5356 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5362 strdup(got_worktree_get_repo_path(worktree));
5363 if (repo_path == NULL)
5364 error = got_error_from_errno("strdup");
5368 repo_path = strdup(cwd);
5369 if (repo_path == NULL) {
5370 error = got_error_from_errno("strdup");
5376 error = got_repo_open(&repo, repo_path, NULL);
5381 const char *prefix = got_worktree_get_path_prefix(worktree);
5386 error = got_worktree_resolve_path(&p, worktree, path);
5389 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5390 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5392 error = got_error_from_errno("asprintf");
5397 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5401 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5406 error = got_repo_map_path(&in_repo_path, repo, path);
5411 if (commit_id_str == NULL) {
5412 struct got_reference *head_ref;
5414 refname = got_worktree_get_head_ref_name(worktree);
5416 refname = GOT_REF_HEAD;
5417 error = got_ref_open(&head_ref, repo, refname, 0);
5420 error = got_ref_resolve(&commit_id, repo, head_ref);
5421 got_ref_close(head_ref);
5425 struct got_reflist_head refs;
5427 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5431 error = got_repo_match_object_id(&commit_id, NULL,
5432 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5433 got_ref_list_free(&refs);
5438 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5439 in_repo_path, repo);
5446 got_worktree_close(worktree);
5448 const struct got_error *close_err = got_repo_close(repo);
5458 fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5459 "[-S status-codes] [path ...]\n", getprogname());
5463 struct got_status_arg {
5468 static const struct got_error *
5469 print_status(void *arg, unsigned char status, unsigned char staged_status,
5470 const char *path, struct got_object_id *blob_id,
5471 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5472 int dirfd, const char *de_name)
5474 struct got_status_arg *st = arg;
5476 if (status == staged_status && (status == GOT_STATUS_DELETE))
5477 status = GOT_STATUS_NO_CHANGE;
5478 if (st != NULL && st->status_codes) {
5479 size_t ncodes = strlen(st->status_codes);
5482 for (i = 0; i < ncodes ; i++) {
5484 if (status == st->status_codes[i] ||
5485 staged_status == st->status_codes[i]) {
5490 if (status == st->status_codes[i] ||
5491 staged_status == st->status_codes[i])
5496 if (st->suppress && j == 0)
5503 printf("%c%c %s\n", status, staged_status, path);
5507 static const struct got_error *
5508 cmd_status(int argc, char *argv[])
5510 const struct got_error *error = NULL;
5511 struct got_repository *repo = NULL;
5512 struct got_worktree *worktree = NULL;
5513 struct got_status_arg st;
5515 struct got_pathlist_head paths;
5516 struct got_pathlist_entry *pe;
5517 int ch, i, no_ignores = 0;
5521 memset(&st, 0, sizeof(st));
5522 st.status_codes = NULL;
5525 while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5531 if (st.status_codes != NULL && st.suppress == 0)
5532 option_conflict('S', 's');
5536 for (i = 0; i < strlen(optarg); i++) {
5537 switch (optarg[i]) {
5538 case GOT_STATUS_MODIFY:
5539 case GOT_STATUS_ADD:
5540 case GOT_STATUS_DELETE:
5541 case GOT_STATUS_CONFLICT:
5542 case GOT_STATUS_MISSING:
5543 case GOT_STATUS_OBSTRUCTED:
5544 case GOT_STATUS_UNVERSIONED:
5545 case GOT_STATUS_MODE_CHANGE:
5546 case GOT_STATUS_NONEXISTENT:
5549 errx(1, "invalid status code '%c'",
5553 if (ch == 's' && st.suppress)
5554 option_conflict('s', 'S');
5555 st.status_codes = optarg;
5567 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5571 cwd = getcwd(NULL, 0);
5573 error = got_error_from_errno("getcwd");
5577 error = got_worktree_open(&worktree, cwd);
5579 if (error->code == GOT_ERR_NOT_WORKTREE)
5580 error = wrap_not_worktree_error(error, "status", cwd);
5584 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5589 error = apply_unveil(got_repo_get_path(repo), 1,
5590 got_worktree_get_root_path(worktree));
5594 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5598 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5599 print_status, &st, check_cancelled, NULL);
5601 TAILQ_FOREACH(pe, &paths, entry)
5602 free((char *)pe->path);
5603 got_pathlist_free(&paths);
5612 "usage: %s ref [-r repository] [-l] [-t] [-c object] "
5613 "[-s reference] [-d] [name]\n",
5618 static const struct got_error *
5619 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
5621 static const struct got_error *err = NULL;
5622 struct got_reflist_head refs;
5623 struct got_reflist_entry *re;
5626 err = got_ref_list(&refs, repo, refname, sort_by_time ?
5627 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
5632 TAILQ_FOREACH(re, &refs, entry) {
5634 refstr = got_ref_to_str(re->ref);
5636 return got_error_from_errno("got_ref_to_str");
5637 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5641 got_ref_list_free(&refs);
5645 static const struct got_error *
5646 delete_ref_by_name(struct got_repository *repo, const char *refname)
5648 const struct got_error *err;
5649 struct got_reference *ref;
5651 err = got_ref_open(&ref, repo, refname, 0);
5655 err = delete_ref(repo, ref);
5660 static const struct got_error *
5661 add_ref(struct got_repository *repo, const char *refname, const char *target)
5663 const struct got_error *err = NULL;
5664 struct got_object_id *id = NULL;
5665 struct got_reference *ref = NULL;
5666 struct got_reflist_head refs;
5669 * Don't let the user create a reference name with a leading '-'.
5670 * While technically a valid reference name, this case is usually
5671 * an unintended typo.
5673 if (refname[0] == '-')
5674 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5677 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5680 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
5682 got_ref_list_free(&refs);
5686 err = got_ref_alloc(&ref, refname, id);
5690 err = got_ref_write(ref, repo);
5698 static const struct got_error *
5699 add_symref(struct got_repository *repo, const char *refname, const char *target)
5701 const struct got_error *err = NULL;
5702 struct got_reference *ref = NULL;
5703 struct got_reference *target_ref = NULL;
5706 * Don't let the user create a reference name with a leading '-'.
5707 * While technically a valid reference name, this case is usually
5708 * an unintended typo.
5710 if (refname[0] == '-')
5711 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5713 err = got_ref_open(&target_ref, repo, target, 0);
5717 err = got_ref_alloc_symref(&ref, refname, target_ref);
5721 err = got_ref_write(ref, repo);
5724 got_ref_close(target_ref);
5730 static const struct got_error *
5731 cmd_ref(int argc, char *argv[])
5733 const struct got_error *error = NULL;
5734 struct got_repository *repo = NULL;
5735 struct got_worktree *worktree = NULL;
5736 char *cwd = NULL, *repo_path = NULL;
5737 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
5738 const char *obj_arg = NULL, *symref_target= NULL;
5739 char *refname = NULL;
5741 while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
5750 repo_path = realpath(optarg, NULL);
5751 if (repo_path == NULL)
5752 return got_error_from_errno2("realpath",
5754 got_path_strip_trailing_slashes(repo_path);
5760 symref_target = optarg;
5771 if (obj_arg && do_list)
5772 option_conflict('c', 'l');
5773 if (obj_arg && do_delete)
5774 option_conflict('c', 'd');
5775 if (obj_arg && symref_target)
5776 option_conflict('c', 's');
5777 if (symref_target && do_delete)
5778 option_conflict('s', 'd');
5779 if (symref_target && do_list)
5780 option_conflict('s', 'l');
5781 if (do_delete && do_list)
5782 option_conflict('d', 'l');
5783 if (sort_by_time && !do_list)
5784 errx(1, "-t option requires -l option");
5790 if (argc != 0 && argc != 1)
5793 refname = strdup(argv[0]);
5794 if (refname == NULL) {
5795 error = got_error_from_errno("strdup");
5802 refname = strdup(argv[0]);
5803 if (refname == NULL) {
5804 error = got_error_from_errno("strdup");
5810 got_path_strip_trailing_slashes(refname);
5814 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5818 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5819 "sendfd unveil", NULL) == -1)
5823 cwd = getcwd(NULL, 0);
5825 error = got_error_from_errno("getcwd");
5829 if (repo_path == NULL) {
5830 error = got_worktree_open(&worktree, cwd);
5831 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5837 strdup(got_worktree_get_repo_path(worktree));
5838 if (repo_path == NULL)
5839 error = got_error_from_errno("strdup");
5843 repo_path = strdup(cwd);
5844 if (repo_path == NULL) {
5845 error = got_error_from_errno("strdup");
5851 error = got_repo_open(&repo, repo_path, NULL);
5855 error = apply_unveil(got_repo_get_path(repo), do_list,
5856 worktree ? got_worktree_get_root_path(worktree) : NULL);
5861 error = list_refs(repo, refname, sort_by_time);
5863 error = delete_ref_by_name(repo, refname);
5864 else if (symref_target)
5865 error = add_symref(repo, refname, symref_target);
5867 if (obj_arg == NULL)
5869 error = add_ref(repo, refname, obj_arg);
5874 const struct got_error *close_err = got_repo_close(repo);
5879 got_worktree_close(worktree);
5889 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
5890 "[-n] [name]\n", getprogname());
5894 static const struct got_error *
5895 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5896 struct got_reference *ref)
5898 const struct got_error *err = NULL;
5899 const char *refname, *marker = " ";
5902 refname = got_ref_get_name(ref);
5903 if (worktree && strcmp(refname,
5904 got_worktree_get_head_ref_name(worktree)) == 0) {
5905 struct got_object_id *id = NULL;
5907 err = got_ref_resolve(&id, repo, ref);
5910 if (got_object_id_cmp(id,
5911 got_worktree_get_base_commit_id(worktree)) == 0)
5918 if (strncmp(refname, "refs/heads/", 11) == 0)
5920 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5922 if (strncmp(refname, "refs/remotes/", 13) == 0)
5925 refstr = got_ref_to_str(ref);
5927 return got_error_from_errno("got_ref_to_str");
5929 printf("%s%s: %s\n", marker, refname, refstr);
5934 static const struct got_error *
5935 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5937 const char *refname;
5939 if (worktree == NULL)
5940 return got_error(GOT_ERR_NOT_WORKTREE);
5942 refname = got_worktree_get_head_ref_name(worktree);
5944 if (strncmp(refname, "refs/heads/", 11) == 0)
5946 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5949 printf("%s\n", refname);
5954 static const struct got_error *
5955 list_branches(struct got_repository *repo, struct got_worktree *worktree,
5958 static const struct got_error *err = NULL;
5959 struct got_reflist_head refs;
5960 struct got_reflist_entry *re;
5961 struct got_reference *temp_ref = NULL;
5962 int rebase_in_progress, histedit_in_progress;
5967 err = got_worktree_rebase_in_progress(&rebase_in_progress,
5972 err = got_worktree_histedit_in_progress(&histedit_in_progress,
5977 if (rebase_in_progress || histedit_in_progress) {
5978 err = got_ref_open(&temp_ref, repo,
5979 got_worktree_get_head_ref_name(worktree), 0);
5982 list_branch(repo, worktree, temp_ref);
5983 got_ref_close(temp_ref);
5987 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
5988 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
5993 TAILQ_FOREACH(re, &refs, entry)
5994 list_branch(repo, worktree, re->ref);
5996 got_ref_list_free(&refs);
5998 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
5999 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6004 TAILQ_FOREACH(re, &refs, entry)
6005 list_branch(repo, worktree, re->ref);
6007 got_ref_list_free(&refs);
6012 static const struct got_error *
6013 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6014 const char *branch_name)
6016 const struct got_error *err = NULL;
6017 struct got_reference *ref = NULL;
6018 char *refname, *remote_refname = NULL;
6020 if (strncmp(branch_name, "refs/", 5) == 0)
6022 if (strncmp(branch_name, "heads/", 6) == 0)
6024 else if (strncmp(branch_name, "remotes/", 8) == 0)
6027 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6028 return got_error_from_errno("asprintf");
6030 if (asprintf(&remote_refname, "refs/remotes/%s",
6031 branch_name) == -1) {
6032 err = got_error_from_errno("asprintf");
6036 err = got_ref_open(&ref, repo, refname, 0);
6038 const struct got_error *err2;
6039 if (err->code != GOT_ERR_NOT_REF)
6042 * Keep 'err' intact such that if neither branch exists
6043 * we report "refs/heads" rather than "refs/remotes" in
6044 * our error message.
6046 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6053 strcmp(got_worktree_get_head_ref_name(worktree),
6054 got_ref_get_name(ref)) == 0) {
6055 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6056 "will not delete this work tree's current branch");
6060 err = delete_ref(repo, ref);
6065 free(remote_refname);
6069 static const struct got_error *
6070 add_branch(struct got_repository *repo, const char *branch_name,
6071 struct got_object_id *base_commit_id)
6073 const struct got_error *err = NULL;
6074 struct got_reference *ref = NULL;
6075 char *base_refname = NULL, *refname = NULL;
6078 * Don't let the user create a branch name with a leading '-'.
6079 * While technically a valid reference name, this case is usually
6080 * an unintended typo.
6082 if (branch_name[0] == '-')
6083 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6085 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6088 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6089 err = got_error_from_errno("asprintf");
6093 err = got_ref_open(&ref, repo, refname, 0);
6095 err = got_error(GOT_ERR_BRANCH_EXISTS);
6097 } else if (err->code != GOT_ERR_NOT_REF)
6100 err = got_ref_alloc(&ref, refname, base_commit_id);
6104 err = got_ref_write(ref, repo);
6113 static const struct got_error *
6114 cmd_branch(int argc, char *argv[])
6116 const struct got_error *error = NULL;
6117 struct got_repository *repo = NULL;
6118 struct got_worktree *worktree = NULL;
6119 char *cwd = NULL, *repo_path = NULL;
6120 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6121 const char *delref = NULL, *commit_id_arg = NULL;
6122 struct got_reference *ref = NULL;
6123 struct got_pathlist_head paths;
6124 struct got_pathlist_entry *pe;
6125 struct got_object_id *commit_id = NULL;
6126 char *commit_id_str = NULL;
6130 while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6133 commit_id_arg = optarg;
6139 repo_path = realpath(optarg, NULL);
6140 if (repo_path == NULL)
6141 return got_error_from_errno2("realpath",
6143 got_path_strip_trailing_slashes(repo_path);
6160 if (do_list && delref)
6161 option_conflict('l', 'd');
6162 if (sort_by_time && !do_list)
6163 errx(1, "-t option requires -l option");
6168 if (!do_list && !delref && argc == 0)
6171 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6172 errx(1, "-c option can only be used when creating a branch");
6174 if (do_list || delref) {
6177 } else if (!do_show && argc != 1)
6181 if (do_list || do_show) {
6182 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6186 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6187 "sendfd unveil", NULL) == -1)
6191 cwd = getcwd(NULL, 0);
6193 error = got_error_from_errno("getcwd");
6197 if (repo_path == NULL) {
6198 error = got_worktree_open(&worktree, cwd);
6199 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6205 strdup(got_worktree_get_repo_path(worktree));
6206 if (repo_path == NULL)
6207 error = got_error_from_errno("strdup");
6211 repo_path = strdup(cwd);
6212 if (repo_path == NULL) {
6213 error = got_error_from_errno("strdup");
6219 error = got_repo_open(&repo, repo_path, NULL);
6223 error = apply_unveil(got_repo_get_path(repo), do_list,
6224 worktree ? got_worktree_get_root_path(worktree) : NULL);
6229 error = show_current_branch(repo, worktree);
6231 error = list_branches(repo, worktree, sort_by_time);
6233 error = delete_branch(repo, worktree, delref);
6235 struct got_reflist_head refs;
6237 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6241 if (commit_id_arg == NULL)
6242 commit_id_arg = worktree ?
6243 got_worktree_get_head_ref_name(worktree) :
6245 error = got_repo_match_object_id(&commit_id, NULL,
6246 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6247 got_ref_list_free(&refs);
6250 error = add_branch(repo, argv[0], commit_id);
6253 if (worktree && do_update) {
6254 struct got_update_progress_arg upa;
6255 char *branch_refname = NULL;
6257 error = got_object_id_str(&commit_id_str, commit_id);
6260 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6264 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6266 error = got_error_from_errno("asprintf");
6269 error = got_ref_open(&ref, repo, branch_refname, 0);
6270 free(branch_refname);
6273 error = switch_head_ref(ref, commit_id, worktree,
6277 error = got_worktree_set_base_commit_id(worktree, repo,
6281 memset(&upa, 0, sizeof(upa));
6282 error = got_worktree_checkout_files(worktree, &paths,
6283 repo, update_progress, &upa, check_cancelled,
6287 if (upa.did_something) {
6288 printf("Updated to %s: %s\n",
6289 got_worktree_get_head_ref_name(worktree),
6292 print_update_progress_stats(&upa);
6299 const struct got_error *close_err = got_repo_close(repo);
6304 got_worktree_close(worktree);
6308 free(commit_id_str);
6309 TAILQ_FOREACH(pe, &paths, entry)
6310 free((char *)pe->path);
6311 got_pathlist_free(&paths);
6320 "usage: %s tag [-c commit] [-r repository] [-l] "
6321 "[-m message] name\n", getprogname());
6326 static const struct got_error *
6327 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6329 const struct got_error *err = NULL;
6330 struct got_reflist_entry *re, *se, *new;
6331 struct got_object_id *re_id, *se_id;
6332 struct got_tag_object *re_tag, *se_tag;
6333 time_t re_time, se_time;
6335 STAILQ_FOREACH(re, tags, entry) {
6336 se = STAILQ_FIRST(sorted);
6338 err = got_reflist_entry_dup(&new, re);
6341 STAILQ_INSERT_HEAD(sorted, new, entry);
6344 err = got_ref_resolve(&re_id, repo, re->ref);
6347 err = got_object_open_as_tag(&re_tag, repo, re_id);
6351 re_time = got_object_tag_get_tagger_time(re_tag);
6352 got_object_tag_close(re_tag);
6356 err = got_ref_resolve(&se_id, repo, re->ref);
6359 err = got_object_open_as_tag(&se_tag, repo, se_id);
6363 se_time = got_object_tag_get_tagger_time(se_tag);
6364 got_object_tag_close(se_tag);
6366 if (se_time > re_time) {
6367 err = got_reflist_entry_dup(&new, re);
6370 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6373 se = STAILQ_NEXT(se, entry);
6382 static const struct got_error *
6383 list_tags(struct got_repository *repo, struct got_worktree *worktree)
6385 static const struct got_error *err = NULL;
6386 struct got_reflist_head refs;
6387 struct got_reflist_entry *re;
6391 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6395 TAILQ_FOREACH(re, &refs, entry) {
6396 const char *refname;
6397 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6401 struct got_object_id *id;
6402 struct got_tag_object *tag;
6403 struct got_commit_object *commit = NULL;
6405 refname = got_ref_get_name(re->ref);
6406 if (strncmp(refname, "refs/tags/", 10) != 0)
6409 refstr = got_ref_to_str(re->ref);
6410 if (refstr == NULL) {
6411 err = got_error_from_errno("got_ref_to_str");
6414 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6417 err = got_ref_resolve(&id, repo, re->ref);
6420 err = got_object_open_as_tag(&tag, repo, id);
6422 if (err->code != GOT_ERR_OBJ_TYPE) {
6426 /* "lightweight" tag */
6427 err = got_object_open_as_commit(&commit, repo, id);
6432 tagger = got_object_commit_get_committer(commit);
6434 got_object_commit_get_committer_time(commit);
6435 err = got_object_id_str(&id_str, id);
6441 tagger = got_object_tag_get_tagger(tag);
6442 tagger_time = got_object_tag_get_tagger_time(tag);
6443 err = got_object_id_str(&id_str,
6444 got_object_tag_get_object_id(tag));
6448 printf("from: %s\n", tagger);
6449 datestr = get_datestr(&tagger_time, datebuf);
6451 printf("date: %s UTC\n", datestr);
6453 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6455 switch (got_object_tag_get_object_type(tag)) {
6456 case GOT_OBJ_TYPE_BLOB:
6457 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6460 case GOT_OBJ_TYPE_TREE:
6461 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6464 case GOT_OBJ_TYPE_COMMIT:
6465 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6468 case GOT_OBJ_TYPE_TAG:
6469 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6478 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6481 got_object_commit_close(commit);
6483 tagmsg0 = strdup(got_object_tag_get_message(tag));
6484 got_object_tag_close(tag);
6485 if (tagmsg0 == NULL) {
6486 err = got_error_from_errno("strdup");
6493 line = strsep(&tagmsg, "\n");
6495 printf(" %s\n", line);
6500 got_ref_list_free(&refs);
6504 static const struct got_error *
6505 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6506 const char *tag_name, const char *repo_path)
6508 const struct got_error *err = NULL;
6509 char *template = NULL, *initial_content = NULL;
6510 char *editor = NULL;
6511 int initial_content_len;
6514 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6515 err = got_error_from_errno("asprintf");
6519 initial_content_len = asprintf(&initial_content,
6520 "\n# tagging commit %s as %s\n",
6521 commit_id_str, tag_name);
6522 if (initial_content_len == -1) {
6523 err = got_error_from_errno("asprintf");
6527 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6531 if (write(fd, initial_content, initial_content_len) == -1) {
6532 err = got_error_from_errno2("write", *tagmsg_path);
6536 err = get_editor(&editor);
6539 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6540 initial_content_len, 1);
6542 free(initial_content);
6546 if (fd != -1 && close(fd) == -1 && err == NULL)
6547 err = got_error_from_errno2("close", *tagmsg_path);
6549 /* Editor is done; we can now apply unveil(2) */
6551 err = apply_unveil(repo_path, 0, NULL);
6559 static const struct got_error *
6560 add_tag(struct got_repository *repo, struct got_worktree *worktree,
6561 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6563 const struct got_error *err = NULL;
6564 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6565 char *label = NULL, *commit_id_str = NULL;
6566 struct got_reference *ref = NULL;
6567 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6568 char *tagmsg_path = NULL, *tag_id_str = NULL;
6569 int preserve_tagmsg = 0;
6570 struct got_reflist_head refs;
6575 * Don't let the user create a tag name with a leading '-'.
6576 * While technically a valid reference name, this case is usually
6577 * an unintended typo.
6579 if (tag_name[0] == '-')
6580 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6582 err = get_author(&tagger, repo, worktree);
6586 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6590 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6591 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6595 err = got_object_id_str(&commit_id_str, commit_id);
6599 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6600 refname = strdup(tag_name);
6601 if (refname == NULL) {
6602 err = got_error_from_errno("strdup");
6606 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6607 err = got_error_from_errno("asprintf");
6611 err = got_ref_open(&ref, repo, refname, 0);
6613 err = got_error(GOT_ERR_TAG_EXISTS);
6615 } else if (err->code != GOT_ERR_NOT_REF)
6618 if (tagmsg_arg == NULL) {
6619 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6620 tag_name, got_repo_get_path(repo));
6622 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6623 tagmsg_path != NULL)
6624 preserve_tagmsg = 1;
6629 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6630 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6633 preserve_tagmsg = 1;
6637 err = got_ref_alloc(&ref, refname, tag_id);
6640 preserve_tagmsg = 1;
6644 err = got_ref_write(ref, repo);
6647 preserve_tagmsg = 1;
6651 err = got_object_id_str(&tag_id_str, tag_id);
6654 preserve_tagmsg = 1;
6657 printf("Created tag %s\n", tag_id_str);
6659 if (preserve_tagmsg) {
6660 fprintf(stderr, "%s: tag message preserved in %s\n",
6661 getprogname(), tagmsg_path);
6662 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6663 err = got_error_from_errno2("unlink", tagmsg_path);
6668 free(commit_id_str);
6673 got_ref_list_free(&refs);
6677 static const struct got_error *
6678 cmd_tag(int argc, char *argv[])
6680 const struct got_error *error = NULL;
6681 struct got_repository *repo = NULL;
6682 struct got_worktree *worktree = NULL;
6683 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6684 char *gitconfig_path = NULL;
6685 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6686 int ch, do_list = 0;
6688 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6691 commit_id_arg = optarg;
6697 repo_path = realpath(optarg, NULL);
6698 if (repo_path == NULL)
6699 return got_error_from_errno2("realpath",
6701 got_path_strip_trailing_slashes(repo_path);
6716 if (commit_id_arg != NULL)
6718 "-c option can only be used when creating a tag");
6720 option_conflict('l', 'm');
6723 } else if (argc != 1)
6730 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6734 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6735 "sendfd unveil", NULL) == -1)
6739 cwd = getcwd(NULL, 0);
6741 error = got_error_from_errno("getcwd");
6745 if (repo_path == NULL) {
6746 error = got_worktree_open(&worktree, cwd);
6747 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6753 strdup(got_worktree_get_repo_path(worktree));
6754 if (repo_path == NULL)
6755 error = got_error_from_errno("strdup");
6759 repo_path = strdup(cwd);
6760 if (repo_path == NULL) {
6761 error = got_error_from_errno("strdup");
6768 error = got_repo_open(&repo, repo_path, NULL);
6771 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6774 error = list_tags(repo, worktree);
6776 error = get_gitconfig_path(&gitconfig_path);
6779 error = got_repo_open(&repo, repo_path, gitconfig_path);
6784 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6789 if (commit_id_arg == NULL) {
6790 struct got_reference *head_ref;
6791 struct got_object_id *commit_id;
6792 error = got_ref_open(&head_ref, repo,
6793 worktree ? got_worktree_get_head_ref_name(worktree)
6797 error = got_ref_resolve(&commit_id, repo, head_ref);
6798 got_ref_close(head_ref);
6801 error = got_object_id_str(&commit_id_str, commit_id);
6807 error = add_tag(repo, worktree, tag_name,
6808 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6812 const struct got_error *close_err = got_repo_close(repo);
6817 got_worktree_close(worktree);
6820 free(gitconfig_path);
6821 free(commit_id_str);
6828 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6833 static const struct got_error *
6834 add_progress(void *arg, unsigned char status, const char *path)
6836 while (path[0] == '/')
6838 printf("%c %s\n", status, path);
6842 static const struct got_error *
6843 cmd_add(int argc, char *argv[])
6845 const struct got_error *error = NULL;
6846 struct got_repository *repo = NULL;
6847 struct got_worktree *worktree = NULL;
6849 struct got_pathlist_head paths;
6850 struct got_pathlist_entry *pe;
6851 int ch, can_recurse = 0, no_ignores = 0;
6855 while ((ch = getopt(argc, argv, "IR")) != -1) {
6873 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6880 cwd = getcwd(NULL, 0);
6882 error = got_error_from_errno("getcwd");
6886 error = got_worktree_open(&worktree, cwd);
6888 if (error->code == GOT_ERR_NOT_WORKTREE)
6889 error = wrap_not_worktree_error(error, "add", cwd);
6893 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6898 error = apply_unveil(got_repo_get_path(repo), 1,
6899 got_worktree_get_root_path(worktree));
6903 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6910 TAILQ_FOREACH(pe, &paths, entry) {
6911 if (asprintf(&ondisk_path, "%s/%s",
6912 got_worktree_get_root_path(worktree),
6914 error = got_error_from_errno("asprintf");
6917 if (lstat(ondisk_path, &sb) == -1) {
6918 if (errno == ENOENT) {
6922 error = got_error_from_errno2("lstat",
6928 if (S_ISDIR(sb.st_mode)) {
6929 error = got_error_msg(GOT_ERR_BAD_PATH,
6930 "adding directories requires -R option");
6936 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6937 NULL, repo, no_ignores);
6940 const struct got_error *close_err = got_repo_close(repo);
6945 got_worktree_close(worktree);
6946 TAILQ_FOREACH(pe, &paths, entry)
6947 free((char *)pe->path);
6948 got_pathlist_free(&paths);
6956 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6957 "path ...\n", getprogname());
6961 static const struct got_error *
6962 print_remove_status(void *arg, unsigned char status,
6963 unsigned char staged_status, const char *path)
6965 while (path[0] == '/')
6967 if (status == GOT_STATUS_NONEXISTENT)
6969 if (status == staged_status && (status == GOT_STATUS_DELETE))
6970 status = GOT_STATUS_NO_CHANGE;
6971 printf("%c%c %s\n", status, staged_status, path);
6975 static const struct got_error *
6976 cmd_remove(int argc, char *argv[])
6978 const struct got_error *error = NULL;
6979 struct got_worktree *worktree = NULL;
6980 struct got_repository *repo = NULL;
6981 const char *status_codes = NULL;
6983 struct got_pathlist_head paths;
6984 struct got_pathlist_entry *pe;
6985 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6986 int ignore_missing_paths = 0;
6990 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6993 delete_local_mods = 1;
6994 ignore_missing_paths = 1;
7003 for (i = 0; i < strlen(optarg); i++) {
7004 switch (optarg[i]) {
7005 case GOT_STATUS_MODIFY:
7006 delete_local_mods = 1;
7008 case GOT_STATUS_MISSING:
7009 ignore_missing_paths = 1;
7012 errx(1, "invalid status code '%c'",
7016 status_codes = optarg;
7028 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7035 cwd = getcwd(NULL, 0);
7037 error = got_error_from_errno("getcwd");
7040 error = got_worktree_open(&worktree, cwd);
7042 if (error->code == GOT_ERR_NOT_WORKTREE)
7043 error = wrap_not_worktree_error(error, "remove", cwd);
7047 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7052 error = apply_unveil(got_repo_get_path(repo), 1,
7053 got_worktree_get_root_path(worktree));
7057 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7064 TAILQ_FOREACH(pe, &paths, entry) {
7065 if (asprintf(&ondisk_path, "%s/%s",
7066 got_worktree_get_root_path(worktree),
7068 error = got_error_from_errno("asprintf");
7071 if (lstat(ondisk_path, &sb) == -1) {
7072 if (errno == ENOENT) {
7076 error = got_error_from_errno2("lstat",
7082 if (S_ISDIR(sb.st_mode)) {
7083 error = got_error_msg(GOT_ERR_BAD_PATH,
7084 "removing directories requires -R option");
7090 error = got_worktree_schedule_delete(worktree, &paths,
7091 delete_local_mods, status_codes, print_remove_status, NULL,
7092 repo, keep_on_disk, ignore_missing_paths);
7095 const struct got_error *close_err = got_repo_close(repo);
7100 got_worktree_close(worktree);
7101 TAILQ_FOREACH(pe, &paths, entry)
7102 free((char *)pe->path);
7103 got_pathlist_free(&paths);
7111 fprintf(stderr, "usage: %s patch [patchfile]\n",
7116 static const struct got_error *
7117 patch_from_stdin(int *patchfd)
7119 const struct got_error *err = NULL;
7121 char *path, buf[BUFSIZ];
7122 sig_t sighup, sigint, sigquit;
7124 err = got_opentemp_named_fd(&path, patchfd,
7125 GOT_TMPDIR_STR "/got-patch");
7131 sighup = signal(SIGHUP, SIG_DFL);
7132 sigint = signal(SIGINT, SIG_DFL);
7133 sigquit = signal(SIGQUIT, SIG_DFL);
7136 r = read(0, buf, sizeof(buf));
7138 err = got_error_from_errno("read");
7143 if (write(*patchfd, buf, r) == -1) {
7144 err = got_error_from_errno("write");
7149 signal(SIGHUP, sighup);
7150 signal(SIGINT, sigint);
7151 signal(SIGQUIT, sigquit);
7158 static const struct got_error *
7159 cmd_patch(int argc, char *argv[])
7161 const struct got_error *error = NULL, *close_error = NULL;
7162 struct got_worktree *worktree = NULL;
7163 struct got_repository *repo = NULL;
7168 while ((ch = getopt(argc, argv, "")) != -1) {
7180 error = patch_from_stdin(&patchfd);
7183 } else if (argc == 1) {
7184 patchfd = open(argv[0], O_RDONLY);
7185 if (patchfd == -1) {
7186 error = got_error_from_errno2("open", argv[0]);
7192 if ((cwd = getcwd(NULL, 0)) == NULL) {
7193 error = got_error_from_errno("getcwd");
7197 error = got_worktree_open(&worktree, cwd);
7201 const char *repo_path = got_worktree_get_repo_path(worktree);
7202 error = got_repo_open(&repo, repo_path, NULL);
7206 error = apply_unveil(got_repo_get_path(repo), 0,
7207 worktree ? got_worktree_get_root_path(worktree) : NULL);
7212 if (pledge("stdio rpath wpath cpath proc exec sendfd flock",
7217 error = got_patch(patchfd, worktree, repo, &print_remove_status,
7218 NULL, &add_progress, NULL);
7222 close_error = got_repo_close(repo);
7224 error = close_error;
7226 if (worktree != NULL) {
7227 close_error = got_worktree_close(worktree);
7229 error = close_error;
7238 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7239 "path ...\n", getprogname());
7243 static const struct got_error *
7244 revert_progress(void *arg, unsigned char status, const char *path)
7246 if (status == GOT_STATUS_UNVERSIONED)
7249 while (path[0] == '/')
7251 printf("%c %s\n", status, path);
7255 struct choose_patch_arg {
7256 FILE *patch_script_file;
7260 static const struct got_error *
7261 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7262 int nchanges, const char *action)
7265 size_t linesize = 0;
7269 case GOT_STATUS_ADD:
7270 printf("A %s\n%s this addition? [y/n] ", path, action);
7272 case GOT_STATUS_DELETE:
7273 printf("D %s\n%s this deletion? [y/n] ", path, action);
7275 case GOT_STATUS_MODIFY:
7276 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7277 return got_error_from_errno("fseek");
7278 printf(GOT_COMMIT_SEP_STR);
7279 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7281 if (ferror(patch_file))
7282 return got_error_from_errno("getline");
7283 printf(GOT_COMMIT_SEP_STR);
7284 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7285 path, n, nchanges, action);
7288 return got_error_path(path, GOT_ERR_FILE_STATUS);
7294 static const struct got_error *
7295 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7296 FILE *patch_file, int n, int nchanges)
7298 const struct got_error *err = NULL;
7300 size_t linesize = 0;
7303 struct choose_patch_arg *a = arg;
7305 *choice = GOT_PATCH_CHOICE_NONE;
7307 if (a->patch_script_file) {
7309 err = show_change(status, path, patch_file, n, nchanges,
7313 linelen = getline(&line, &linesize, a->patch_script_file);
7314 if (linelen == -1) {
7315 if (ferror(a->patch_script_file))
7316 return got_error_from_errno("getline");
7319 nl = strchr(line, '\n');
7322 if (strcmp(line, "y") == 0) {
7323 *choice = GOT_PATCH_CHOICE_YES;
7325 } else if (strcmp(line, "n") == 0) {
7326 *choice = GOT_PATCH_CHOICE_NO;
7328 } else if (strcmp(line, "q") == 0 &&
7329 status == GOT_STATUS_MODIFY) {
7330 *choice = GOT_PATCH_CHOICE_QUIT;
7333 printf("invalid response '%s'\n", line);
7338 while (resp != 'y' && resp != 'n' && resp != 'q') {
7339 err = show_change(status, path, patch_file, n, nchanges,
7346 if (status == GOT_STATUS_MODIFY) {
7347 if (resp != 'y' && resp != 'n' && resp != 'q') {
7348 printf("invalid response '%c'\n", resp);
7351 } else if (resp != 'y' && resp != 'n') {
7352 printf("invalid response '%c'\n", resp);
7358 *choice = GOT_PATCH_CHOICE_YES;
7359 else if (resp == 'n')
7360 *choice = GOT_PATCH_CHOICE_NO;
7361 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7362 *choice = GOT_PATCH_CHOICE_QUIT;
7367 static const struct got_error *
7368 cmd_revert(int argc, char *argv[])
7370 const struct got_error *error = NULL;
7371 struct got_worktree *worktree = NULL;
7372 struct got_repository *repo = NULL;
7373 char *cwd = NULL, *path = NULL;
7374 struct got_pathlist_head paths;
7375 struct got_pathlist_entry *pe;
7376 int ch, can_recurse = 0, pflag = 0;
7377 FILE *patch_script_file = NULL;
7378 const char *patch_script_path = NULL;
7379 struct choose_patch_arg cpa;
7383 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7389 patch_script_path = optarg;
7404 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7405 "unveil", NULL) == -1)
7410 if (patch_script_path && !pflag)
7411 errx(1, "-F option can only be used together with -p option");
7413 cwd = getcwd(NULL, 0);
7415 error = got_error_from_errno("getcwd");
7418 error = got_worktree_open(&worktree, cwd);
7420 if (error->code == GOT_ERR_NOT_WORKTREE)
7421 error = wrap_not_worktree_error(error, "revert", cwd);
7425 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7430 if (patch_script_path) {
7431 patch_script_file = fopen(patch_script_path, "re");
7432 if (patch_script_file == NULL) {
7433 error = got_error_from_errno2("fopen",
7438 error = apply_unveil(got_repo_get_path(repo), 1,
7439 got_worktree_get_root_path(worktree));
7443 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7450 TAILQ_FOREACH(pe, &paths, entry) {
7451 if (asprintf(&ondisk_path, "%s/%s",
7452 got_worktree_get_root_path(worktree),
7454 error = got_error_from_errno("asprintf");
7457 if (lstat(ondisk_path, &sb) == -1) {
7458 if (errno == ENOENT) {
7462 error = got_error_from_errno2("lstat",
7468 if (S_ISDIR(sb.st_mode)) {
7469 error = got_error_msg(GOT_ERR_BAD_PATH,
7470 "reverting directories requires -R option");
7476 cpa.patch_script_file = patch_script_file;
7477 cpa.action = "revert";
7478 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7479 pflag ? choose_patch : NULL, &cpa, repo);
7481 if (patch_script_file && fclose(patch_script_file) == EOF &&
7483 error = got_error_from_errno2("fclose", patch_script_path);
7485 const struct got_error *close_err = got_repo_close(repo);
7490 got_worktree_close(worktree);
7499 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
7500 "[path ...]\n", getprogname());
7504 struct collect_commit_logmsg_arg {
7505 const char *cmdline_log;
7506 const char *prepared_log;
7507 int non_interactive;
7509 const char *worktree_path;
7510 const char *branch_name;
7511 const char *repo_path;
7516 static const struct got_error *
7517 read_prepared_logmsg(char **logmsg, const char *path)
7519 const struct got_error *err = NULL;
7525 memset(&sb, 0, sizeof(sb));
7527 f = fopen(path, "re");
7529 return got_error_from_errno2("fopen", path);
7531 if (fstat(fileno(f), &sb) == -1) {
7532 err = got_error_from_errno2("fstat", path);
7535 if (sb.st_size == 0) {
7536 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7540 *logmsg = malloc(sb.st_size + 1);
7541 if (*logmsg == NULL) {
7542 err = got_error_from_errno("malloc");
7546 r = fread(*logmsg, 1, sb.st_size, f);
7547 if (r != sb.st_size) {
7549 err = got_error_from_errno2("fread", path);
7551 err = got_error(GOT_ERR_IO);
7554 (*logmsg)[sb.st_size] = '\0';
7556 if (fclose(f) == EOF && err == NULL)
7557 err = got_error_from_errno2("fclose", path);
7566 static const struct got_error *
7567 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7570 char *initial_content = NULL;
7571 struct got_pathlist_entry *pe;
7572 const struct got_error *err = NULL;
7573 char *template = NULL;
7574 struct collect_commit_logmsg_arg *a = arg;
7575 int initial_content_len;
7579 /* if a message was specified on the command line, just use it */
7580 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7581 len = strlen(a->cmdline_log) + 1;
7582 *logmsg = malloc(len + 1);
7583 if (*logmsg == NULL)
7584 return got_error_from_errno("malloc");
7585 strlcpy(*logmsg, a->cmdline_log, len);
7587 } else if (a->prepared_log != NULL && a->non_interactive)
7588 return read_prepared_logmsg(logmsg, a->prepared_log);
7590 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7591 return got_error_from_errno("asprintf");
7593 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7597 if (a->prepared_log) {
7599 err = read_prepared_logmsg(&msg, a->prepared_log);
7602 if (write(fd, msg, strlen(msg)) == -1) {
7603 err = got_error_from_errno2("write", a->logmsg_path);
7610 initial_content_len = asprintf(&initial_content,
7611 "\n# changes to be committed on branch %s:\n",
7613 if (initial_content_len == -1) {
7614 err = got_error_from_errno("asprintf");
7618 if (write(fd, initial_content, initial_content_len) == -1) {
7619 err = got_error_from_errno2("write", a->logmsg_path);
7623 TAILQ_FOREACH(pe, commitable_paths, entry) {
7624 struct got_commitable *ct = pe->data;
7625 dprintf(fd, "# %c %s\n",
7626 got_commitable_get_status(ct),
7627 got_commitable_get_path(ct));
7630 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7631 initial_content_len, a->prepared_log ? 0 : 1);
7633 free(initial_content);
7636 if (fd != -1 && close(fd) == -1 && err == NULL)
7637 err = got_error_from_errno2("close", a->logmsg_path);
7639 /* Editor is done; we can now apply unveil(2) */
7641 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7649 static const struct got_error *
7650 cmd_commit(int argc, char *argv[])
7652 const struct got_error *error = NULL;
7653 struct got_worktree *worktree = NULL;
7654 struct got_repository *repo = NULL;
7655 char *cwd = NULL, *id_str = NULL;
7656 struct got_object_id *id = NULL;
7657 const char *logmsg = NULL;
7658 char *prepared_logmsg = NULL;
7659 struct collect_commit_logmsg_arg cl_arg;
7660 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7661 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7662 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7663 struct got_pathlist_head paths;
7666 cl_arg.logmsg_path = NULL;
7668 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7672 option_conflict('F', 'm');
7673 prepared_logmsg = realpath(optarg, NULL);
7674 if (prepared_logmsg == NULL)
7675 return got_error_from_errno2("realpath",
7679 if (prepared_logmsg)
7680 option_conflict('m', 'F');
7684 non_interactive = 1;
7687 allow_bad_symlinks = 1;
7699 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7700 "unveil", NULL) == -1)
7703 cwd = getcwd(NULL, 0);
7705 error = got_error_from_errno("getcwd");
7708 error = got_worktree_open(&worktree, cwd);
7710 if (error->code == GOT_ERR_NOT_WORKTREE)
7711 error = wrap_not_worktree_error(error, "commit", cwd);
7715 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7718 if (rebase_in_progress) {
7719 error = got_error(GOT_ERR_REBASING);
7723 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7728 error = get_gitconfig_path(&gitconfig_path);
7731 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7736 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7739 if (merge_in_progress) {
7740 error = got_error(GOT_ERR_MERGE_BUSY);
7744 error = get_author(&author, repo, worktree);
7749 * unveil(2) traverses exec(2); if an editor is used we have
7750 * to apply unveil after the log message has been written.
7752 if (logmsg == NULL || strlen(logmsg) == 0)
7753 error = get_editor(&editor);
7755 error = apply_unveil(got_repo_get_path(repo), 0,
7756 got_worktree_get_root_path(worktree));
7760 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7764 cl_arg.editor = editor;
7765 cl_arg.cmdline_log = logmsg;
7766 cl_arg.prepared_log = prepared_logmsg;
7767 cl_arg.non_interactive = non_interactive;
7768 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7769 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7770 if (!histedit_in_progress) {
7771 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7772 error = got_error(GOT_ERR_COMMIT_BRANCH);
7775 cl_arg.branch_name += 11;
7777 cl_arg.repo_path = got_repo_get_path(repo);
7778 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7779 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7780 print_status, NULL, repo);
7782 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7783 cl_arg.logmsg_path != NULL)
7784 preserve_logmsg = 1;
7788 error = got_object_id_str(&id_str, id);
7791 printf("Created commit %s\n", id_str);
7793 if (preserve_logmsg) {
7794 fprintf(stderr, "%s: log message preserved in %s\n",
7795 getprogname(), cl_arg.logmsg_path);
7796 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7798 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7799 free(cl_arg.logmsg_path);
7801 const struct got_error *close_err = got_repo_close(repo);
7806 got_worktree_close(worktree);
7809 free(gitconfig_path);
7812 free(prepared_logmsg);
7819 fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
7820 "[-r repository-path] [-t tag] [-T] [-q] [-v] "
7821 "[remote-repository]\n", getprogname());
7825 struct got_send_progress_arg {
7826 char last_scaled_packsize[FMT_SCALED_STRSIZE];
7829 int last_nobj_total;
7833 int printed_something;
7835 struct got_pathlist_head *delete_branches;
7838 static const struct got_error *
7839 send_progress(void *arg, off_t packfile_size, int ncommits, int nobj_total,
7840 int nobj_deltify, int nobj_written, off_t bytes_sent, const char *refname,
7843 struct got_send_progress_arg *a = arg;
7844 char scaled_packsize[FMT_SCALED_STRSIZE];
7845 char scaled_sent[FMT_SCALED_STRSIZE];
7846 int p_deltify = 0, p_written = 0, p_sent = 0;
7847 int print_searching = 0, print_total = 0;
7848 int print_deltify = 0, print_written = 0, print_sent = 0;
7850 if (a->verbosity < 0)
7854 const char *status = success ? "accepted" : "rejected";
7857 struct got_pathlist_entry *pe;
7858 TAILQ_FOREACH(pe, a->delete_branches, entry) {
7859 const char *branchname = pe->path;
7860 if (got_path_cmp(branchname, refname,
7861 strlen(branchname), strlen(refname)) == 0) {
7863 a->sent_something = 1;
7869 if (a->printed_something)
7871 printf("Server has %s %s", status, refname);
7872 a->printed_something = 1;
7876 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
7877 return got_error_from_errno("fmt_scaled");
7878 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
7879 return got_error_from_errno("fmt_scaled");
7881 if (a->last_ncommits != ncommits) {
7882 print_searching = 1;
7883 a->last_ncommits = ncommits;
7886 if (a->last_nobj_total != nobj_total) {
7887 print_searching = 1;
7889 a->last_nobj_total = nobj_total;
7892 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
7893 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
7894 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
7895 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
7896 return got_error(GOT_ERR_NO_SPACE);
7899 if (nobj_deltify > 0 || nobj_written > 0) {
7900 if (nobj_deltify > 0) {
7901 p_deltify = (nobj_deltify * 100) / nobj_total;
7902 if (p_deltify != a->last_p_deltify) {
7903 a->last_p_deltify = p_deltify;
7904 print_searching = 1;
7909 if (nobj_written > 0) {
7910 p_written = (nobj_written * 100) / nobj_total;
7911 if (p_written != a->last_p_written) {
7912 a->last_p_written = p_written;
7913 print_searching = 1;
7921 if (bytes_sent > 0) {
7922 p_sent = (bytes_sent * 100) / packfile_size;
7923 if (p_sent != a->last_p_sent) {
7924 a->last_p_sent = p_sent;
7925 print_searching = 1;
7931 a->sent_something = 1;
7934 if (print_searching || print_total || print_deltify || print_written ||
7937 if (print_searching)
7938 printf("packing %d reference%s", ncommits,
7939 ncommits == 1 ? "" : "s");
7941 printf("; %d object%s", nobj_total,
7942 nobj_total == 1 ? "" : "s");
7944 printf("; deltify: %d%%", p_deltify);
7946 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
7947 scaled_packsize, p_sent);
7948 else if (print_written)
7949 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
7950 scaled_packsize, p_written);
7951 if (print_searching || print_total || print_deltify ||
7952 print_written || print_sent) {
7953 a->printed_something = 1;
7959 static const struct got_error *
7960 cmd_send(int argc, char *argv[])
7962 const struct got_error *error = NULL;
7963 char *cwd = NULL, *repo_path = NULL;
7964 const char *remote_name;
7965 char *proto = NULL, *host = NULL, *port = NULL;
7966 char *repo_name = NULL, *server_path = NULL;
7967 const struct got_remote_repo *remotes, *remote = NULL;
7968 int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
7969 struct got_repository *repo = NULL;
7970 struct got_worktree *worktree = NULL;
7971 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
7972 struct got_pathlist_head branches;
7973 struct got_pathlist_head tags;
7974 struct got_reflist_head all_branches;
7975 struct got_reflist_head all_tags;
7976 struct got_pathlist_head delete_args;
7977 struct got_pathlist_head delete_branches;
7978 struct got_reflist_entry *re;
7979 struct got_pathlist_entry *pe;
7980 int i, ch, sendfd = -1, sendstatus;
7982 struct got_send_progress_arg spa;
7983 int verbosity = 0, overwrite_refs = 0;
7984 int send_all_branches = 0, send_all_tags = 0;
7985 struct got_reference *ref = NULL;
7987 TAILQ_INIT(&branches);
7989 TAILQ_INIT(&all_branches);
7990 TAILQ_INIT(&all_tags);
7991 TAILQ_INIT(&delete_args);
7992 TAILQ_INIT(&delete_branches);
7994 while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
7997 send_all_branches = 1;
8000 error = got_pathlist_append(&branches, optarg, NULL);
8006 error = got_pathlist_append(&delete_args, optarg, NULL);
8014 repo_path = realpath(optarg, NULL);
8015 if (repo_path == NULL)
8016 return got_error_from_errno2("realpath",
8018 got_path_strip_trailing_slashes(repo_path);
8021 error = got_pathlist_append(&tags, optarg, NULL);
8032 else if (verbosity < 3)
8046 if (send_all_branches && !TAILQ_EMPTY(&branches))
8047 option_conflict('a', 'b');
8048 if (send_all_tags && !TAILQ_EMPTY(&tags))
8049 option_conflict('T', 't');
8053 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8055 remote_name = argv[0];
8059 cwd = getcwd(NULL, 0);
8061 error = got_error_from_errno("getcwd");
8065 if (repo_path == NULL) {
8066 error = got_worktree_open(&worktree, cwd);
8067 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8073 strdup(got_worktree_get_repo_path(worktree));
8074 if (repo_path == NULL)
8075 error = got_error_from_errno("strdup");
8079 repo_path = strdup(cwd);
8080 if (repo_path == NULL) {
8081 error = got_error_from_errno("strdup");
8087 error = got_repo_open(&repo, repo_path, NULL);
8092 worktree_conf = got_worktree_get_gotconfig(worktree);
8093 if (worktree_conf) {
8094 got_gotconfig_get_remotes(&nremotes, &remotes,
8096 for (i = 0; i < nremotes; i++) {
8097 if (strcmp(remotes[i].name, remote_name) == 0) {
8098 remote = &remotes[i];
8104 if (remote == NULL) {
8105 repo_conf = got_repo_get_gotconfig(repo);
8107 got_gotconfig_get_remotes(&nremotes, &remotes,
8109 for (i = 0; i < nremotes; i++) {
8110 if (strcmp(remotes[i].name, remote_name) == 0) {
8111 remote = &remotes[i];
8117 if (remote == NULL) {
8118 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8119 for (i = 0; i < nremotes; i++) {
8120 if (strcmp(remotes[i].name, remote_name) == 0) {
8121 remote = &remotes[i];
8126 if (remote == NULL) {
8127 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8131 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8132 &repo_name, remote->send_url);
8136 if (strcmp(proto, "git") == 0) {
8138 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8139 "sendfd dns inet unveil", NULL) == -1)
8142 } else if (strcmp(proto, "git+ssh") == 0 ||
8143 strcmp(proto, "ssh") == 0) {
8145 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8146 "sendfd unveil", NULL) == -1)
8149 } else if (strcmp(proto, "http") == 0 ||
8150 strcmp(proto, "git+http") == 0) {
8151 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8154 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8158 error = got_dial_apply_unveil(proto);
8162 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8166 if (send_all_branches) {
8167 error = got_ref_list(&all_branches, repo, "refs/heads",
8168 got_ref_cmp_by_name, NULL);
8171 TAILQ_FOREACH(re, &all_branches, entry) {
8172 const char *branchname = got_ref_get_name(re->ref);
8173 error = got_pathlist_append(&branches,
8179 } else if (nbranches == 0) {
8180 for (i = 0; i < remote->nsend_branches; i++) {
8181 got_pathlist_append(&branches,
8182 remote->send_branches[i], NULL);
8186 if (send_all_tags) {
8187 error = got_ref_list(&all_tags, repo, "refs/tags",
8188 got_ref_cmp_by_name, NULL);
8191 TAILQ_FOREACH(re, &all_tags, entry) {
8192 const char *tagname = got_ref_get_name(re->ref);
8193 error = got_pathlist_append(&tags,
8202 * To prevent accidents only branches in refs/heads/ can be deleted
8203 * with 'got send -d'.
8204 * Deleting anything else requires local repository access or Git.
8206 TAILQ_FOREACH(pe, &delete_args, entry) {
8207 const char *branchname = pe->path;
8209 struct got_pathlist_entry *new;
8210 if (strncmp(branchname, "refs/heads/", 11) == 0) {
8211 s = strdup(branchname);
8213 error = got_error_from_errno("strdup");
8217 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8218 error = got_error_from_errno("asprintf");
8222 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8223 if (error || new == NULL /* duplicate */)
8230 if (nbranches == 0 && ndelete_branches == 0) {
8231 struct got_reference *head_ref;
8233 error = got_ref_open(&head_ref, repo,
8234 got_worktree_get_head_ref_name(worktree), 0);
8236 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8239 if (got_ref_is_symbolic(head_ref)) {
8240 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8241 got_ref_close(head_ref);
8246 error = got_pathlist_append(&branches, got_ref_get_name(ref),
8254 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8255 port ? ":" : "", port ? port : "");
8257 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8258 server_path, verbosity);
8262 memset(&spa, 0, sizeof(spa));
8263 spa.last_scaled_packsize[0] = '\0';
8264 spa.last_p_deltify = -1;
8265 spa.last_p_written = -1;
8266 spa.verbosity = verbosity;
8267 spa.delete_branches = &delete_branches;
8268 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8269 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8270 check_cancelled, NULL);
8271 if (spa.printed_something)
8275 if (!spa.sent_something && verbosity >= 0)
8276 printf("Already up-to-date\n");
8279 if (kill(sendpid, SIGTERM) == -1)
8280 error = got_error_from_errno("kill");
8281 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8282 error = got_error_from_errno("waitpid");
8284 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8285 error = got_error_from_errno("close");
8287 const struct got_error *close_err = got_repo_close(repo);
8292 got_worktree_close(worktree);
8295 got_pathlist_free(&branches);
8296 got_pathlist_free(&tags);
8297 got_ref_list_free(&all_branches);
8298 got_ref_list_free(&all_tags);
8299 got_pathlist_free(&delete_args);
8300 TAILQ_FOREACH(pe, &delete_branches, entry)
8301 free((char *)pe->path);
8302 got_pathlist_free(&delete_branches);
8314 usage_cherrypick(void)
8316 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8320 static const struct got_error *
8321 cmd_cherrypick(int argc, char *argv[])
8323 const struct got_error *error = NULL;
8324 struct got_worktree *worktree = NULL;
8325 struct got_repository *repo = NULL;
8326 char *cwd = NULL, *commit_id_str = NULL;
8327 struct got_object_id *commit_id = NULL;
8328 struct got_commit_object *commit = NULL;
8329 struct got_object_qid *pid;
8331 struct got_update_progress_arg upa;
8333 while ((ch = getopt(argc, argv, "")) != -1) {
8345 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8346 "unveil", NULL) == -1)
8352 cwd = getcwd(NULL, 0);
8354 error = got_error_from_errno("getcwd");
8357 error = got_worktree_open(&worktree, cwd);
8359 if (error->code == GOT_ERR_NOT_WORKTREE)
8360 error = wrap_not_worktree_error(error, "cherrypick",
8365 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8370 error = apply_unveil(got_repo_get_path(repo), 0,
8371 got_worktree_get_root_path(worktree));
8375 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
8376 GOT_OBJ_TYPE_COMMIT, repo);
8377 if (error != NULL) {
8378 struct got_reference *ref;
8379 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
8381 error = got_ref_open(&ref, repo, argv[0], 0);
8384 error = got_ref_resolve(&commit_id, repo, ref);
8389 error = got_object_id_str(&commit_id_str, commit_id);
8393 error = got_object_open_as_commit(&commit, repo, commit_id);
8396 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8397 memset(&upa, 0, sizeof(upa));
8398 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
8399 commit_id, repo, update_progress, &upa, check_cancelled,
8404 if (upa.did_something)
8405 printf("Merged commit %s\n", commit_id_str);
8406 print_merge_progress_stats(&upa);
8409 got_object_commit_close(commit);
8410 free(commit_id_str);
8412 got_worktree_close(worktree);
8414 const struct got_error *close_err = got_repo_close(repo);
8424 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
8428 static const struct got_error *
8429 cmd_backout(int argc, char *argv[])
8431 const struct got_error *error = NULL;
8432 struct got_worktree *worktree = NULL;
8433 struct got_repository *repo = NULL;
8434 char *cwd = NULL, *commit_id_str = NULL;
8435 struct got_object_id *commit_id = NULL;
8436 struct got_commit_object *commit = NULL;
8437 struct got_object_qid *pid;
8439 struct got_update_progress_arg upa;
8441 while ((ch = getopt(argc, argv, "")) != -1) {
8453 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8454 "unveil", NULL) == -1)
8460 cwd = getcwd(NULL, 0);
8462 error = got_error_from_errno("getcwd");
8465 error = got_worktree_open(&worktree, cwd);
8467 if (error->code == GOT_ERR_NOT_WORKTREE)
8468 error = wrap_not_worktree_error(error, "backout", cwd);
8472 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8477 error = apply_unveil(got_repo_get_path(repo), 0,
8478 got_worktree_get_root_path(worktree));
8482 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
8483 GOT_OBJ_TYPE_COMMIT, repo);
8484 if (error != NULL) {
8485 struct got_reference *ref;
8486 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
8488 error = got_ref_open(&ref, repo, argv[0], 0);
8491 error = got_ref_resolve(&commit_id, repo, ref);
8496 error = got_object_id_str(&commit_id_str, commit_id);
8500 error = got_object_open_as_commit(&commit, repo, commit_id);
8503 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8505 error = got_error(GOT_ERR_ROOT_COMMIT);
8509 memset(&upa, 0, sizeof(upa));
8510 error = got_worktree_merge_files(worktree, commit_id, pid->id,
8511 repo, update_progress, &upa, check_cancelled, NULL);
8515 if (upa.did_something)
8516 printf("Backed out commit %s\n", commit_id_str);
8517 print_merge_progress_stats(&upa);
8520 got_object_commit_close(commit);
8521 free(commit_id_str);
8523 got_worktree_close(worktree);
8525 const struct got_error *close_err = got_repo_close(repo);
8535 fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
8541 trim_logmsg(char *logmsg, int limit)
8546 len = strlen(logmsg);
8550 nl = strchr(logmsg, '\n');
8555 static const struct got_error *
8556 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
8558 const struct got_error *err;
8559 char *logmsg0 = NULL;
8562 err = got_object_commit_get_logmsg(&logmsg0, commit);
8567 while (isspace((unsigned char)s[0]))
8570 *logmsg = strdup(s);
8571 if (*logmsg == NULL) {
8572 err = got_error_from_errno("strdup");
8576 trim_logmsg(*logmsg, limit);
8582 static const struct got_error *
8583 show_rebase_merge_conflict(struct got_object_id *id,
8584 struct got_repository *repo)
8586 const struct got_error *err;
8587 struct got_commit_object *commit = NULL;
8588 char *id_str = NULL, *logmsg = NULL;
8590 err = got_object_open_as_commit(&commit, repo, id);
8594 err = got_object_id_str(&id_str, id);
8600 err = get_short_logmsg(&logmsg, 42, commit);
8604 printf("%s -> merge conflict: %s\n", id_str, logmsg);
8607 got_object_commit_close(commit);
8612 static const struct got_error *
8613 show_rebase_progress(struct got_commit_object *commit,
8614 struct got_object_id *old_id, struct got_object_id *new_id)
8616 const struct got_error *err;
8617 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8619 err = got_object_id_str(&old_id_str, old_id);
8624 err = got_object_id_str(&new_id_str, new_id);
8629 old_id_str[12] = '\0';
8631 new_id_str[12] = '\0';
8633 err = get_short_logmsg(&logmsg, 42, commit);
8637 printf("%s -> %s: %s\n", old_id_str,
8638 new_id_str ? new_id_str : "no-op change", logmsg);
8646 static const struct got_error *
8647 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
8648 struct got_reference *branch, struct got_reference *new_base_branch,
8649 struct got_reference *tmp_branch, struct got_repository *repo,
8652 printf("Switching work tree to %s\n", got_ref_get_name(branch));
8653 return got_worktree_rebase_complete(worktree, fileindex,
8654 new_base_branch, tmp_branch, branch, repo, create_backup);
8657 static const struct got_error *
8658 rebase_commit(struct got_pathlist_head *merged_paths,
8659 struct got_worktree *worktree, struct got_fileindex *fileindex,
8660 struct got_reference *tmp_branch,
8661 struct got_object_id *commit_id, struct got_repository *repo)
8663 const struct got_error *error;
8664 struct got_commit_object *commit;
8665 struct got_object_id *new_commit_id;
8667 error = got_object_open_as_commit(&commit, repo, commit_id);
8671 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
8672 worktree, fileindex, tmp_branch, commit, commit_id, repo);
8674 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
8676 error = show_rebase_progress(commit, commit_id, NULL);
8678 error = show_rebase_progress(commit, commit_id, new_commit_id);
8679 free(new_commit_id);
8682 got_object_commit_close(commit);
8686 struct check_path_prefix_arg {
8687 const char *path_prefix;
8692 static const struct got_error *
8693 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
8694 struct got_blob_object *blob2, struct got_object_id *id1,
8695 struct got_object_id *id2, const char *path1, const char *path2,
8696 mode_t mode1, mode_t mode2, struct got_repository *repo)
8698 struct check_path_prefix_arg *a = arg;
8700 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
8701 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
8702 return got_error(a->errcode);
8707 static const struct got_error *
8708 check_path_prefix(struct got_object_id *parent_id,
8709 struct got_object_id *commit_id, const char *path_prefix,
8710 int errcode, struct got_repository *repo)
8712 const struct got_error *err;
8713 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
8714 struct got_commit_object *commit = NULL, *parent_commit = NULL;
8715 struct check_path_prefix_arg cpp_arg;
8717 if (got_path_is_root_dir(path_prefix))
8720 err = got_object_open_as_commit(&commit, repo, commit_id);
8724 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
8728 err = got_object_open_as_tree(&tree1, repo,
8729 got_object_commit_get_tree_id(parent_commit));
8733 err = got_object_open_as_tree(&tree2, repo,
8734 got_object_commit_get_tree_id(commit));
8738 cpp_arg.path_prefix = path_prefix;
8739 while (cpp_arg.path_prefix[0] == '/')
8740 cpp_arg.path_prefix++;
8741 cpp_arg.len = strlen(cpp_arg.path_prefix);
8742 cpp_arg.errcode = errcode;
8743 err = got_diff_tree(tree1, tree2, "", "", repo,
8744 check_path_prefix_in_diff, &cpp_arg, 0);
8747 got_object_tree_close(tree1);
8749 got_object_tree_close(tree2);
8751 got_object_commit_close(commit);
8753 got_object_commit_close(parent_commit);
8757 static const struct got_error *
8758 collect_commits(struct got_object_id_queue *commits,
8759 struct got_object_id *initial_commit_id,
8760 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
8761 const char *path_prefix, int path_prefix_errcode,
8762 struct got_repository *repo)
8764 const struct got_error *err = NULL;
8765 struct got_commit_graph *graph = NULL;
8766 struct got_object_id *parent_id = NULL;
8767 struct got_object_qid *qid;
8768 struct got_object_id *commit_id = initial_commit_id;
8770 err = got_commit_graph_open(&graph, "/", 1);
8774 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
8775 check_cancelled, NULL);
8778 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
8779 err = got_commit_graph_iter_next(&parent_id, graph, repo,
8780 check_cancelled, NULL);
8782 if (err->code == GOT_ERR_ITER_COMPLETED) {
8783 err = got_error_msg(GOT_ERR_ANCESTRY,
8784 "ran out of commits to rebase before "
8785 "youngest common ancestor commit has "
8790 err = check_path_prefix(parent_id, commit_id,
8791 path_prefix, path_prefix_errcode, repo);
8795 err = got_object_qid_alloc(&qid, commit_id);
8798 STAILQ_INSERT_HEAD(commits, qid, entry);
8799 commit_id = parent_id;
8803 got_commit_graph_close(graph);
8807 static const struct got_error *
8808 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
8810 const struct got_error *err = NULL;
8811 time_t committer_time;
8813 char datebuf[11]; /* YYYY-MM-DD + NUL */
8814 char *author0 = NULL, *author, *smallerthan;
8815 char *logmsg0 = NULL, *logmsg, *newline;
8817 committer_time = got_object_commit_get_committer_time(commit);
8818 if (gmtime_r(&committer_time, &tm) == NULL)
8819 return got_error_from_errno("gmtime_r");
8820 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
8821 return got_error(GOT_ERR_NO_SPACE);
8823 author0 = strdup(got_object_commit_get_author(commit));
8824 if (author0 == NULL)
8825 return got_error_from_errno("strdup");
8827 smallerthan = strchr(author, '<');
8828 if (smallerthan && smallerthan[1] != '\0')
8829 author = smallerthan + 1;
8830 author[strcspn(author, "@>")] = '\0';
8832 err = got_object_commit_get_logmsg(&logmsg0, commit);
8836 while (*logmsg == '\n')
8838 newline = strchr(logmsg, '\n');
8842 if (asprintf(brief_str, "%s %s %s",
8843 datebuf, author, logmsg) == -1)
8844 err = got_error_from_errno("asprintf");
8851 static const struct got_error *
8852 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
8853 struct got_repository *repo)
8855 const struct got_error *err;
8858 err = got_object_id_str(&id_str, id);
8862 err = got_ref_delete(ref, repo);
8866 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
8872 static const struct got_error *
8873 print_backup_ref(const char *branch_name, const char *new_id_str,
8874 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
8875 struct got_reflist_object_id_map *refs_idmap,
8876 struct got_repository *repo)
8878 const struct got_error *err = NULL;
8879 struct got_reflist_head *refs;
8880 char *refs_str = NULL;
8881 struct got_object_id *new_commit_id = NULL;
8882 struct got_commit_object *new_commit = NULL;
8883 char *new_commit_brief_str = NULL;
8884 struct got_object_id *yca_id = NULL;
8885 struct got_commit_object *yca_commit = NULL;
8886 char *yca_id_str = NULL, *yca_brief_str = NULL;
8887 char *custom_refs_str;
8889 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
8890 return got_error_from_errno("asprintf");
8892 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
8893 0, 0, refs_idmap, custom_refs_str);
8897 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
8901 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
8903 err = build_refs_str(&refs_str, refs, new_commit_id, repo);
8908 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
8912 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
8916 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
8917 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
8921 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
8922 refs_str ? " (" : "", refs_str ? refs_str : "",
8923 refs_str ? ")" : "", new_commit_brief_str);
8924 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
8925 got_object_id_cmp(yca_id, old_commit_id) != 0) {
8929 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
8933 err = get_commit_brief_str(&yca_brief_str, yca_commit);
8937 err = got_object_id_str(&yca_id_str, yca_id);
8941 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
8943 err = build_refs_str(&refs_str, refs, yca_id, repo);
8947 printf("history forked at %s%s%s%s\n %s\n",
8949 refs_str ? " (" : "", refs_str ? refs_str : "",
8950 refs_str ? ")" : "", yca_brief_str);
8953 free(custom_refs_str);
8954 free(new_commit_id);
8958 free(yca_brief_str);
8960 got_object_commit_close(new_commit);
8962 got_object_commit_close(yca_commit);
8967 static const struct got_error *
8968 process_backup_refs(const char *backup_ref_prefix,
8969 const char *wanted_branch_name,
8970 int delete, struct got_repository *repo)
8972 const struct got_error *err;
8973 struct got_reflist_head refs, backup_refs;
8974 struct got_reflist_entry *re;
8975 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
8976 struct got_object_id *old_commit_id = NULL;
8977 char *branch_name = NULL;
8978 struct got_commit_object *old_commit = NULL;
8979 struct got_reflist_object_id_map *refs_idmap = NULL;
8980 int wanted_branch_found = 0;
8983 TAILQ_INIT(&backup_refs);
8985 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8989 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
8993 if (wanted_branch_name) {
8994 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
8995 wanted_branch_name += 11;
8998 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
8999 got_ref_cmp_by_commit_timestamp_descending, repo);
9003 TAILQ_FOREACH(re, &backup_refs, entry) {
9004 const char *refname = got_ref_get_name(re->ref);
9007 err = check_cancelled(NULL);
9011 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9015 err = got_object_open_as_commit(&old_commit, repo,
9020 if (strncmp(backup_ref_prefix, refname,
9021 backup_ref_prefix_len) == 0)
9022 refname += backup_ref_prefix_len;
9024 while (refname[0] == '/')
9027 branch_name = strdup(refname);
9028 if (branch_name == NULL) {
9029 err = got_error_from_errno("strdup");
9032 slash = strrchr(branch_name, '/');
9035 refname += strlen(branch_name) + 1;
9038 if (wanted_branch_name == NULL ||
9039 strcmp(wanted_branch_name, branch_name) == 0) {
9040 wanted_branch_found = 1;
9042 err = delete_backup_ref(re->ref,
9043 old_commit_id, repo);
9045 err = print_backup_ref(branch_name, refname,
9046 old_commit_id, old_commit, refs_idmap,
9053 free(old_commit_id);
9054 old_commit_id = NULL;
9057 got_object_commit_close(old_commit);
9061 if (wanted_branch_name && !wanted_branch_found) {
9062 err = got_error_fmt(GOT_ERR_NOT_REF,
9063 "%s/%s/", backup_ref_prefix, wanted_branch_name);
9067 got_reflist_object_id_map_free(refs_idmap);
9068 got_ref_list_free(&refs);
9069 got_ref_list_free(&backup_refs);
9070 free(old_commit_id);
9073 got_object_commit_close(old_commit);
9077 static const struct got_error *
9078 abort_progress(void *arg, unsigned char status, const char *path)
9081 * Unversioned files should not clutter progress output when
9082 * an operation is aborted.
9084 if (status == GOT_STATUS_UNVERSIONED)
9087 return update_progress(arg, status, path);
9090 static const struct got_error *
9091 cmd_rebase(int argc, char *argv[])
9093 const struct got_error *error = NULL;
9094 struct got_worktree *worktree = NULL;
9095 struct got_repository *repo = NULL;
9096 struct got_fileindex *fileindex = NULL;
9098 struct got_reference *branch = NULL;
9099 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9100 struct got_object_id *commit_id = NULL, *parent_id = NULL;
9101 struct got_object_id *resume_commit_id = NULL;
9102 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9103 struct got_commit_object *commit = NULL;
9104 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9105 int histedit_in_progress = 0, merge_in_progress = 0;
9106 int create_backup = 1, list_backups = 0, delete_backups = 0;
9107 struct got_object_id_queue commits;
9108 struct got_pathlist_head merged_paths;
9109 const struct got_object_id_queue *parent_ids;
9110 struct got_object_qid *qid, *pid;
9111 struct got_update_progress_arg upa;
9113 STAILQ_INIT(&commits);
9114 TAILQ_INIT(&merged_paths);
9115 memset(&upa, 0, sizeof(upa));
9117 while ((ch = getopt(argc, argv, "aclX")) != -1) {
9123 continue_rebase = 1;
9141 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9142 "unveil", NULL) == -1)
9147 option_conflict('l', 'a');
9148 if (continue_rebase)
9149 option_conflict('l', 'c');
9151 option_conflict('l', 'X');
9152 if (argc != 0 && argc != 1)
9154 } else if (delete_backups) {
9156 option_conflict('X', 'a');
9157 if (continue_rebase)
9158 option_conflict('X', 'c');
9160 option_conflict('l', 'X');
9161 if (argc != 0 && argc != 1)
9164 if (abort_rebase && continue_rebase)
9166 else if (abort_rebase || continue_rebase) {
9169 } else if (argc != 1)
9173 cwd = getcwd(NULL, 0);
9175 error = got_error_from_errno("getcwd");
9178 error = got_worktree_open(&worktree, cwd);
9180 if (list_backups || delete_backups) {
9181 if (error->code != GOT_ERR_NOT_WORKTREE)
9184 if (error->code == GOT_ERR_NOT_WORKTREE)
9185 error = wrap_not_worktree_error(error,
9191 error = got_repo_open(&repo,
9192 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
9196 error = apply_unveil(got_repo_get_path(repo), 0,
9197 worktree ? got_worktree_get_root_path(worktree) : NULL);
9201 if (list_backups || delete_backups) {
9202 error = process_backup_refs(
9203 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9204 argc == 1 ? argv[0] : NULL, delete_backups, repo);
9205 goto done; /* nothing else to do */
9208 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9212 if (histedit_in_progress) {
9213 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9217 error = got_worktree_merge_in_progress(&merge_in_progress,
9221 if (merge_in_progress) {
9222 error = got_error(GOT_ERR_MERGE_BUSY);
9226 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9231 if (!rebase_in_progress) {
9232 error = got_error(GOT_ERR_NOT_REBASING);
9235 error = got_worktree_rebase_continue(&resume_commit_id,
9236 &new_base_branch, &tmp_branch, &branch, &fileindex,
9240 printf("Switching work tree to %s\n",
9241 got_ref_get_symref_target(new_base_branch));
9242 error = got_worktree_rebase_abort(worktree, fileindex, repo,
9243 new_base_branch, abort_progress, &upa);
9246 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9247 print_merge_progress_stats(&upa);
9248 goto done; /* nothing else to do */
9251 if (continue_rebase) {
9252 if (!rebase_in_progress) {
9253 error = got_error(GOT_ERR_NOT_REBASING);
9256 error = got_worktree_rebase_continue(&resume_commit_id,
9257 &new_base_branch, &tmp_branch, &branch, &fileindex,
9262 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9263 resume_commit_id, repo);
9267 yca_id = got_object_id_dup(resume_commit_id);
9268 if (yca_id == NULL) {
9269 error = got_error_from_errno("got_object_id_dup");
9273 error = got_ref_open(&branch, repo, argv[0], 0);
9278 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9282 if (!continue_rebase) {
9283 struct got_object_id *base_commit_id;
9285 base_commit_id = got_worktree_get_base_commit_id(worktree);
9286 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9287 base_commit_id, branch_head_commit_id, 1, repo,
9288 check_cancelled, NULL);
9291 if (yca_id == NULL) {
9292 error = got_error_msg(GOT_ERR_ANCESTRY,
9293 "specified branch shares no common ancestry "
9294 "with work tree's branch");
9298 error = check_same_branch(base_commit_id, branch, yca_id, repo);
9300 if (error->code != GOT_ERR_ANCESTRY)
9304 struct got_pathlist_head paths;
9305 printf("%s is already based on %s\n",
9306 got_ref_get_name(branch),
9307 got_worktree_get_head_ref_name(worktree));
9308 error = switch_head_ref(branch, branch_head_commit_id,
9312 error = got_worktree_set_base_commit_id(worktree, repo,
9313 branch_head_commit_id);
9317 error = got_pathlist_append(&paths, "", NULL);
9320 error = got_worktree_checkout_files(worktree,
9321 &paths, repo, update_progress, &upa,
9322 check_cancelled, NULL);
9323 got_pathlist_free(&paths);
9326 if (upa.did_something) {
9328 error = got_object_id_str(&id_str,
9329 branch_head_commit_id);
9332 printf("Updated to %s: %s\n",
9333 got_worktree_get_head_ref_name(worktree),
9337 printf("Already up-to-date\n");
9338 print_update_progress_stats(&upa);
9341 error = got_worktree_rebase_prepare(&new_base_branch,
9342 &tmp_branch, &fileindex, worktree, branch, repo);
9347 commit_id = branch_head_commit_id;
9348 error = got_object_open_as_commit(&commit, repo, commit_id);
9352 parent_ids = got_object_commit_get_parent_ids(commit);
9353 pid = STAILQ_FIRST(parent_ids);
9355 if (!continue_rebase) {
9356 error = got_worktree_rebase_abort(worktree, fileindex,
9357 repo, new_base_branch, abort_progress, &upa);
9360 printf("Rebase of %s aborted\n",
9361 got_ref_get_name(branch));
9362 print_merge_progress_stats(&upa);
9365 error = got_error(GOT_ERR_EMPTY_REBASE);
9368 error = collect_commits(&commits, commit_id, pid->id,
9369 yca_id, got_worktree_get_path_prefix(worktree),
9370 GOT_ERR_REBASE_PATH, repo);
9371 got_object_commit_close(commit);
9376 if (STAILQ_EMPTY(&commits)) {
9377 if (continue_rebase) {
9378 error = rebase_complete(worktree, fileindex,
9379 branch, new_base_branch, tmp_branch, repo,
9383 /* Fast-forward the reference of the branch. */
9384 struct got_object_id *new_head_commit_id;
9386 error = got_ref_resolve(&new_head_commit_id, repo,
9390 error = got_object_id_str(&id_str, new_head_commit_id);
9391 printf("Forwarding %s to commit %s\n",
9392 got_ref_get_name(branch), id_str);
9394 error = got_ref_change_ref(branch,
9395 new_head_commit_id);
9398 /* No backup needed since objects did not change. */
9404 STAILQ_FOREACH(qid, &commits, entry) {
9406 commit_id = qid->id;
9407 parent_id = pid ? pid->id : yca_id;
9410 memset(&upa, 0, sizeof(upa));
9411 error = got_worktree_rebase_merge_files(&merged_paths,
9412 worktree, fileindex, parent_id, commit_id, repo,
9413 update_progress, &upa, check_cancelled, NULL);
9417 print_merge_progress_stats(&upa);
9418 if (upa.conflicts > 0 || upa.missing > 0 ||
9419 upa.not_deleted > 0 || upa.unversioned > 0) {
9420 if (upa.conflicts > 0) {
9421 error = show_rebase_merge_conflict(qid->id,
9426 got_worktree_rebase_pathlist_free(&merged_paths);
9430 error = rebase_commit(&merged_paths, worktree, fileindex,
9431 tmp_branch, commit_id, repo);
9432 got_worktree_rebase_pathlist_free(&merged_paths);
9437 if (upa.conflicts > 0 || upa.missing > 0 ||
9438 upa.not_deleted > 0 || upa.unversioned > 0) {
9439 error = got_worktree_rebase_postpone(worktree, fileindex);
9442 if (upa.conflicts > 0 && upa.missing == 0 &&
9443 upa.not_deleted == 0 && upa.unversioned == 0) {
9444 error = got_error_msg(GOT_ERR_CONFLICTS,
9445 "conflicts must be resolved before rebasing "
9447 } else if (upa.conflicts > 0) {
9448 error = got_error_msg(GOT_ERR_CONFLICTS,
9449 "conflicts must be resolved before rebasing "
9450 "can continue; changes destined for some "
9451 "files were not yet merged and should be "
9452 "merged manually if required before the "
9453 "rebase operation is continued");
9455 error = got_error_msg(GOT_ERR_CONFLICTS,
9456 "changes destined for some files were not "
9457 "yet merged and should be merged manually "
9458 "if required before the rebase operation "
9462 error = rebase_complete(worktree, fileindex, branch,
9463 new_base_branch, tmp_branch, repo, create_backup);
9465 got_object_id_queue_free(&commits);
9466 free(branch_head_commit_id);
9467 free(resume_commit_id);
9470 got_object_commit_close(commit);
9472 got_ref_close(branch);
9473 if (new_base_branch)
9474 got_ref_close(new_base_branch);
9476 got_ref_close(tmp_branch);
9478 got_worktree_close(worktree);
9480 const struct got_error *close_err = got_repo_close(repo);
9488 usage_histedit(void)
9490 fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
9491 "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
9496 #define GOT_HISTEDIT_PICK 'p'
9497 #define GOT_HISTEDIT_EDIT 'e'
9498 #define GOT_HISTEDIT_FOLD 'f'
9499 #define GOT_HISTEDIT_DROP 'd'
9500 #define GOT_HISTEDIT_MESG 'm'
9502 static const struct got_histedit_cmd {
9506 } got_histedit_cmds[] = {
9507 { GOT_HISTEDIT_PICK, "pick", "use commit" },
9508 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
9509 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
9511 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
9512 { GOT_HISTEDIT_MESG, "mesg",
9513 "single-line log message for commit above (open editor if empty)" },
9516 struct got_histedit_list_entry {
9517 TAILQ_ENTRY(got_histedit_list_entry) entry;
9518 struct got_object_id *commit_id;
9519 const struct got_histedit_cmd *cmd;
9522 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
9524 static const struct got_error *
9525 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
9526 FILE *f, struct got_repository *repo)
9528 const struct got_error *err = NULL;
9529 char *logmsg = NULL, *id_str = NULL;
9530 struct got_commit_object *commit = NULL;
9533 err = got_object_open_as_commit(&commit, repo, commit_id);
9537 err = get_short_logmsg(&logmsg, 34, commit);
9541 err = got_object_id_str(&id_str, commit_id);
9545 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
9547 err = got_ferror(f, GOT_ERR_IO);
9550 got_object_commit_close(commit);
9556 static const struct got_error *
9557 histedit_write_commit_list(struct got_object_id_queue *commits,
9558 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
9559 struct got_repository *repo)
9561 const struct got_error *err = NULL;
9562 struct got_object_qid *qid;
9563 const char *histedit_cmd = NULL;
9565 if (STAILQ_EMPTY(commits))
9566 return got_error(GOT_ERR_EMPTY_HISTEDIT);
9568 STAILQ_FOREACH(qid, commits, entry) {
9569 histedit_cmd = got_histedit_cmds[0].name;
9571 histedit_cmd = "edit";
9572 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
9573 histedit_cmd = "fold";
9574 err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
9577 if (edit_logmsg_only) {
9578 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
9580 err = got_ferror(f, GOT_ERR_IO);
9589 static const struct got_error *
9590 write_cmd_list(FILE *f, const char *branch_name,
9591 struct got_object_id_queue *commits)
9593 const struct got_error *err = NULL;
9597 struct got_object_qid *qid;
9599 qid = STAILQ_FIRST(commits);
9600 err = got_object_id_str(&id_str, qid->id);
9605 "# Editing the history of branch '%s' starting at\n"
9607 "# Commits will be processed in order from top to "
9608 "bottom of this file.\n", branch_name, id_str);
9610 err = got_ferror(f, GOT_ERR_IO);
9614 n = fprintf(f, "# Available histedit commands:\n");
9616 err = got_ferror(f, GOT_ERR_IO);
9620 for (i = 0; i < nitems(got_histedit_cmds); i++) {
9621 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
9622 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
9625 err = got_ferror(f, GOT_ERR_IO);
9634 static const struct got_error *
9635 histedit_syntax_error(int lineno)
9637 static char msg[42];
9640 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
9642 if (ret == -1 || ret >= sizeof(msg))
9643 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
9645 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
9648 static const struct got_error *
9649 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
9650 char *logmsg, struct got_repository *repo)
9652 const struct got_error *err;
9653 struct got_commit_object *folded_commit = NULL;
9654 char *id_str, *folded_logmsg = NULL;
9656 err = got_object_id_str(&id_str, hle->commit_id);
9660 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
9664 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
9667 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
9668 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
9669 folded_logmsg) == -1) {
9670 err = got_error_from_errno("asprintf");
9674 got_object_commit_close(folded_commit);
9676 free(folded_logmsg);
9680 static struct got_histedit_list_entry *
9681 get_folded_commits(struct got_histedit_list_entry *hle)
9683 struct got_histedit_list_entry *prev, *folded = NULL;
9685 prev = TAILQ_PREV(hle, got_histedit_list, entry);
9686 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
9687 prev->cmd->code == GOT_HISTEDIT_DROP)) {
9688 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
9690 prev = TAILQ_PREV(prev, got_histedit_list, entry);
9696 static const struct got_error *
9697 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
9698 struct got_repository *repo)
9700 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
9701 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
9702 const struct got_error *err = NULL;
9703 struct got_commit_object *commit = NULL;
9706 struct got_histedit_list_entry *folded = NULL;
9708 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9712 folded = get_folded_commits(hle);
9714 while (folded != hle) {
9715 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
9716 folded = TAILQ_NEXT(folded, entry);
9719 err = append_folded_commit_msg(&new_msg, folded,
9725 folded = TAILQ_NEXT(folded, entry);
9729 err = got_object_id_str(&id_str, hle->commit_id);
9732 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
9735 logmsg_len = asprintf(&new_msg,
9736 "%s\n# original log message of commit %s: %s",
9737 logmsg ? logmsg : "", id_str, orig_logmsg);
9738 if (logmsg_len == -1) {
9739 err = got_error_from_errno("asprintf");
9745 err = got_object_id_str(&id_str, hle->commit_id);
9749 err = got_opentemp_named_fd(&logmsg_path, &fd,
9750 GOT_TMPDIR_STR "/got-logmsg");
9754 write(fd, logmsg, logmsg_len);
9757 err = get_editor(&editor);
9761 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
9764 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
9767 hle->logmsg = strdup(new_msg);
9768 if (hle->logmsg == NULL)
9769 err = got_error_from_errno("strdup");
9772 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
9773 err = got_error_from_errno2("unlink", logmsg_path);
9779 got_object_commit_close(commit);
9783 static const struct got_error *
9784 histedit_parse_list(struct got_histedit_list *histedit_cmds,
9785 FILE *f, struct got_repository *repo)
9787 const struct got_error *err = NULL;
9788 char *line = NULL, *p, *end;
9792 const struct got_histedit_cmd *cmd;
9793 struct got_object_id *commit_id = NULL;
9794 struct got_histedit_list_entry *hle = NULL;
9797 len = getline(&line, &size, f);
9799 const struct got_error *getline_err;
9802 getline_err = got_error_from_errno("getline");
9803 err = got_ferror(f, getline_err->code);
9808 while (isspace((unsigned char)p[0]))
9810 if (p[0] == '#' || p[0] == '\0') {
9816 for (i = 0; i < nitems(got_histedit_cmds); i++) {
9817 cmd = &got_histedit_cmds[i];
9818 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
9819 isspace((unsigned char)p[strlen(cmd->name)])) {
9820 p += strlen(cmd->name);
9823 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
9828 if (i == nitems(got_histedit_cmds)) {
9829 err = histedit_syntax_error(lineno);
9832 while (isspace((unsigned char)p[0]))
9834 if (cmd->code == GOT_HISTEDIT_MESG) {
9835 if (hle == NULL || hle->logmsg != NULL) {
9836 err = got_error(GOT_ERR_HISTEDIT_CMD);
9840 err = histedit_edit_logmsg(hle, repo);
9844 hle->logmsg = strdup(p);
9845 if (hle->logmsg == NULL) {
9846 err = got_error_from_errno("strdup");
9855 while (end[0] && !isspace((unsigned char)end[0]))
9859 err = got_object_resolve_id_str(&commit_id, repo, p);
9861 /* override error code */
9862 err = histedit_syntax_error(lineno);
9866 hle = malloc(sizeof(*hle));
9868 err = got_error_from_errno("malloc");
9872 hle->commit_id = commit_id;
9877 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
9885 static const struct got_error *
9886 histedit_check_script(struct got_histedit_list *histedit_cmds,
9887 struct got_object_id_queue *commits, struct got_repository *repo)
9889 const struct got_error *err = NULL;
9890 struct got_object_qid *qid;
9891 struct got_histedit_list_entry *hle;
9892 static char msg[92];
9895 if (TAILQ_EMPTY(histedit_cmds))
9896 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
9897 "histedit script contains no commands");
9898 if (STAILQ_EMPTY(commits))
9899 return got_error(GOT_ERR_EMPTY_HISTEDIT);
9901 TAILQ_FOREACH(hle, histedit_cmds, entry) {
9902 struct got_histedit_list_entry *hle2;
9903 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
9906 if (got_object_id_cmp(hle->commit_id,
9907 hle2->commit_id) != 0)
9909 err = got_object_id_str(&id_str, hle->commit_id);
9912 snprintf(msg, sizeof(msg), "commit %s is listed "
9913 "more than once in histedit script", id_str);
9915 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
9919 STAILQ_FOREACH(qid, commits, entry) {
9920 TAILQ_FOREACH(hle, histedit_cmds, entry) {
9921 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
9925 err = got_object_id_str(&id_str, qid->id);
9928 snprintf(msg, sizeof(msg),
9929 "commit %s missing from histedit script", id_str);
9931 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
9935 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
9936 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
9937 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
9938 "last commit in histedit script cannot be folded");
9943 static const struct got_error *
9944 histedit_run_editor(struct got_histedit_list *histedit_cmds,
9945 const char *path, struct got_object_id_queue *commits,
9946 struct got_repository *repo)
9948 const struct got_error *err = NULL;
9952 err = get_editor(&editor);
9956 if (spawn_editor(editor, path) == -1) {
9957 err = got_error_from_errno("failed spawning editor");
9961 f = fopen(path, "re");
9963 err = got_error_from_errno("fopen");
9966 err = histedit_parse_list(histedit_cmds, f, repo);
9970 err = histedit_check_script(histedit_cmds, commits, repo);
9972 if (f && fclose(f) == EOF && err == NULL)
9973 err = got_error_from_errno("fclose");
9978 static const struct got_error *
9979 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
9980 struct got_object_id_queue *, const char *, const char *,
9981 struct got_repository *);
9983 static const struct got_error *
9984 histedit_edit_script(struct got_histedit_list *histedit_cmds,
9985 struct got_object_id_queue *commits, const char *branch_name,
9986 int edit_logmsg_only, int fold_only, int edit_only,
9987 struct got_repository *repo)
9989 const struct got_error *err;
9993 err = got_opentemp_named(&path, &f, "got-histedit");
9997 err = write_cmd_list(f, branch_name, commits);
10001 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10002 fold_only, edit_only, repo);
10006 if (edit_logmsg_only || fold_only || edit_only) {
10008 err = histedit_parse_list(histedit_cmds, f, repo);
10010 if (fclose(f) == EOF) {
10011 err = got_error_from_errno("fclose");
10015 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10017 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10018 err->code != GOT_ERR_HISTEDIT_CMD)
10020 err = histedit_edit_list_retry(histedit_cmds, err,
10021 commits, path, branch_name, repo);
10025 if (f && fclose(f) == EOF && err == NULL)
10026 err = got_error_from_errno("fclose");
10027 if (path && unlink(path) != 0 && err == NULL)
10028 err = got_error_from_errno2("unlink", path);
10033 static const struct got_error *
10034 histedit_save_list(struct got_histedit_list *histedit_cmds,
10035 struct got_worktree *worktree, struct got_repository *repo)
10037 const struct got_error *err = NULL;
10040 struct got_histedit_list_entry *hle;
10041 struct got_commit_object *commit = NULL;
10043 err = got_worktree_get_histedit_script_path(&path, worktree);
10047 f = fopen(path, "we");
10049 err = got_error_from_errno2("fopen", path);
10052 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10053 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10059 int n = fprintf(f, "%c %s\n",
10060 GOT_HISTEDIT_MESG, hle->logmsg);
10062 err = got_ferror(f, GOT_ERR_IO);
10068 if (f && fclose(f) == EOF && err == NULL)
10069 err = got_error_from_errno("fclose");
10072 got_object_commit_close(commit);
10077 histedit_free_list(struct got_histedit_list *histedit_cmds)
10079 struct got_histedit_list_entry *hle;
10081 while ((hle = TAILQ_FIRST(histedit_cmds))) {
10082 TAILQ_REMOVE(histedit_cmds, hle, entry);
10087 static const struct got_error *
10088 histedit_load_list(struct got_histedit_list *histedit_cmds,
10089 const char *path, struct got_repository *repo)
10091 const struct got_error *err = NULL;
10094 f = fopen(path, "re");
10096 err = got_error_from_errno2("fopen", path);
10100 err = histedit_parse_list(histedit_cmds, f, repo);
10102 if (f && fclose(f) == EOF && err == NULL)
10103 err = got_error_from_errno("fclose");
10107 static const struct got_error *
10108 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10109 const struct got_error *edit_err, struct got_object_id_queue *commits,
10110 const char *path, const char *branch_name, struct got_repository *repo)
10112 const struct got_error *err = NULL, *prev_err = edit_err;
10115 while (resp != 'c' && resp != 'r' && resp != 'a') {
10116 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10117 "or (a)bort: ", getprogname(), prev_err->msg);
10122 histedit_free_list(histedit_cmds);
10123 err = histedit_run_editor(histedit_cmds, path, commits,
10126 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10127 err->code != GOT_ERR_HISTEDIT_CMD)
10134 } else if (resp == 'r') {
10135 histedit_free_list(histedit_cmds);
10136 err = histedit_edit_script(histedit_cmds,
10137 commits, branch_name, 0, 0, 0, repo);
10139 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10140 err->code != GOT_ERR_HISTEDIT_CMD)
10147 } else if (resp == 'a') {
10148 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10151 printf("invalid response '%c'\n", resp);
10157 static const struct got_error *
10158 histedit_complete(struct got_worktree *worktree,
10159 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10160 struct got_reference *branch, struct got_repository *repo)
10162 printf("Switching work tree to %s\n",
10163 got_ref_get_symref_target(branch));
10164 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10168 static const struct got_error *
10169 show_histedit_progress(struct got_commit_object *commit,
10170 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10172 const struct got_error *err;
10173 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10175 err = got_object_id_str(&old_id_str, hle->commit_id);
10180 err = got_object_id_str(&new_id_str, new_id);
10185 old_id_str[12] = '\0';
10187 new_id_str[12] = '\0';
10190 logmsg = strdup(hle->logmsg);
10191 if (logmsg == NULL) {
10192 err = got_error_from_errno("strdup");
10195 trim_logmsg(logmsg, 42);
10197 err = get_short_logmsg(&logmsg, 42, commit);
10202 switch (hle->cmd->code) {
10203 case GOT_HISTEDIT_PICK:
10204 case GOT_HISTEDIT_EDIT:
10205 printf("%s -> %s: %s\n", old_id_str,
10206 new_id_str ? new_id_str : "no-op change", logmsg);
10208 case GOT_HISTEDIT_DROP:
10209 case GOT_HISTEDIT_FOLD:
10210 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
10222 static const struct got_error *
10223 histedit_commit(struct got_pathlist_head *merged_paths,
10224 struct got_worktree *worktree, struct got_fileindex *fileindex,
10225 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10226 struct got_repository *repo)
10228 const struct got_error *err;
10229 struct got_commit_object *commit;
10230 struct got_object_id *new_commit_id;
10232 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10233 && hle->logmsg == NULL) {
10234 err = histedit_edit_logmsg(hle, repo);
10239 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10243 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10244 worktree, fileindex, tmp_branch, commit, hle->commit_id,
10245 hle->logmsg, repo);
10247 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10249 err = show_histedit_progress(commit, hle, NULL);
10251 err = show_histedit_progress(commit, hle, new_commit_id);
10252 free(new_commit_id);
10255 got_object_commit_close(commit);
10259 static const struct got_error *
10260 histedit_skip_commit(struct got_histedit_list_entry *hle,
10261 struct got_worktree *worktree, struct got_repository *repo)
10263 const struct got_error *error;
10264 struct got_commit_object *commit;
10266 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10271 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10275 error = show_histedit_progress(commit, hle, NULL);
10276 got_object_commit_close(commit);
10280 static const struct got_error *
10281 check_local_changes(void *arg, unsigned char status,
10282 unsigned char staged_status, const char *path,
10283 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10284 struct got_object_id *commit_id, int dirfd, const char *de_name)
10286 int *have_local_changes = arg;
10289 case GOT_STATUS_ADD:
10290 case GOT_STATUS_DELETE:
10291 case GOT_STATUS_MODIFY:
10292 case GOT_STATUS_CONFLICT:
10293 *have_local_changes = 1;
10294 return got_error(GOT_ERR_CANCELLED);
10299 switch (staged_status) {
10300 case GOT_STATUS_ADD:
10301 case GOT_STATUS_DELETE:
10302 case GOT_STATUS_MODIFY:
10303 *have_local_changes = 1;
10304 return got_error(GOT_ERR_CANCELLED);
10312 static const struct got_error *
10313 cmd_histedit(int argc, char *argv[])
10315 const struct got_error *error = NULL;
10316 struct got_worktree *worktree = NULL;
10317 struct got_fileindex *fileindex = NULL;
10318 struct got_repository *repo = NULL;
10320 struct got_reference *branch = NULL;
10321 struct got_reference *tmp_branch = NULL;
10322 struct got_object_id *resume_commit_id = NULL;
10323 struct got_object_id *base_commit_id = NULL;
10324 struct got_object_id *head_commit_id = NULL;
10325 struct got_commit_object *commit = NULL;
10326 int ch, rebase_in_progress = 0, merge_in_progress = 0;
10327 struct got_update_progress_arg upa;
10328 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10329 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10330 int list_backups = 0, delete_backups = 0;
10331 const char *edit_script_path = NULL;
10332 struct got_object_id_queue commits;
10333 struct got_pathlist_head merged_paths;
10334 const struct got_object_id_queue *parent_ids;
10335 struct got_object_qid *pid;
10336 struct got_histedit_list histedit_cmds;
10337 struct got_histedit_list_entry *hle;
10339 STAILQ_INIT(&commits);
10340 TAILQ_INIT(&histedit_cmds);
10341 TAILQ_INIT(&merged_paths);
10342 memset(&upa, 0, sizeof(upa));
10344 while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10359 edit_script_path = optarg;
10362 edit_logmsg_only = 1;
10368 delete_backups = 1;
10380 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10381 "unveil", NULL) == -1)
10384 if (abort_edit && continue_edit)
10385 option_conflict('a', 'c');
10386 if (edit_script_path && edit_logmsg_only)
10387 option_conflict('F', 'm');
10388 if (abort_edit && edit_logmsg_only)
10389 option_conflict('a', 'm');
10390 if (continue_edit && edit_logmsg_only)
10391 option_conflict('c', 'm');
10392 if (abort_edit && fold_only)
10393 option_conflict('a', 'f');
10394 if (continue_edit && fold_only)
10395 option_conflict('c', 'f');
10396 if (fold_only && edit_logmsg_only)
10397 option_conflict('f', 'm');
10398 if (edit_script_path && fold_only)
10399 option_conflict('F', 'f');
10400 if (abort_edit && edit_only)
10401 option_conflict('a', 'e');
10402 if (continue_edit && edit_only)
10403 option_conflict('c', 'e');
10404 if (edit_only && edit_logmsg_only)
10405 option_conflict('e', 'm');
10406 if (edit_script_path && edit_only)
10407 option_conflict('F', 'e');
10408 if (list_backups) {
10410 option_conflict('l', 'a');
10412 option_conflict('l', 'c');
10413 if (edit_script_path)
10414 option_conflict('l', 'F');
10415 if (edit_logmsg_only)
10416 option_conflict('l', 'm');
10418 option_conflict('l', 'f');
10420 option_conflict('l', 'e');
10421 if (delete_backups)
10422 option_conflict('l', 'X');
10423 if (argc != 0 && argc != 1)
10425 } else if (delete_backups) {
10427 option_conflict('X', 'a');
10429 option_conflict('X', 'c');
10430 if (edit_script_path)
10431 option_conflict('X', 'F');
10432 if (edit_logmsg_only)
10433 option_conflict('X', 'm');
10435 option_conflict('X', 'f');
10437 option_conflict('X', 'e');
10439 option_conflict('X', 'l');
10440 if (argc != 0 && argc != 1)
10442 } else if (argc != 0)
10446 * This command cannot apply unveil(2) in all cases because the
10447 * user may choose to run an editor to edit the histedit script
10448 * and to edit individual commit log messages.
10449 * unveil(2) traverses exec(2); if an editor is used we have to
10450 * apply unveil after edit script and log messages have been written.
10451 * XXX TODO: Make use of unveil(2) where possible.
10454 cwd = getcwd(NULL, 0);
10456 error = got_error_from_errno("getcwd");
10459 error = got_worktree_open(&worktree, cwd);
10461 if (list_backups || delete_backups) {
10462 if (error->code != GOT_ERR_NOT_WORKTREE)
10465 if (error->code == GOT_ERR_NOT_WORKTREE)
10466 error = wrap_not_worktree_error(error,
10472 if (list_backups || delete_backups) {
10473 error = got_repo_open(&repo,
10474 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10478 error = apply_unveil(got_repo_get_path(repo), 0,
10479 worktree ? got_worktree_get_root_path(worktree) : NULL);
10482 error = process_backup_refs(
10483 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
10484 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10485 goto done; /* nothing else to do */
10488 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10493 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10496 if (rebase_in_progress) {
10497 error = got_error(GOT_ERR_REBASING);
10501 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10505 if (merge_in_progress) {
10506 error = got_error(GOT_ERR_MERGE_BUSY);
10510 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
10514 if (edit_in_progress && edit_logmsg_only) {
10515 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10516 "histedit operation is in progress in this "
10517 "work tree and must be continued or aborted "
10518 "before the -m option can be used");
10521 if (edit_in_progress && fold_only) {
10522 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10523 "histedit operation is in progress in this "
10524 "work tree and must be continued or aborted "
10525 "before the -f option can be used");
10528 if (edit_in_progress && edit_only) {
10529 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10530 "histedit operation is in progress in this "
10531 "work tree and must be continued or aborted "
10532 "before the -e option can be used");
10536 if (edit_in_progress && abort_edit) {
10537 error = got_worktree_histedit_continue(&resume_commit_id,
10538 &tmp_branch, &branch, &base_commit_id, &fileindex,
10542 printf("Switching work tree to %s\n",
10543 got_ref_get_symref_target(branch));
10544 error = got_worktree_histedit_abort(worktree, fileindex, repo,
10545 branch, base_commit_id, abort_progress, &upa);
10548 printf("Histedit of %s aborted\n",
10549 got_ref_get_symref_target(branch));
10550 print_merge_progress_stats(&upa);
10551 goto done; /* nothing else to do */
10552 } else if (abort_edit) {
10553 error = got_error(GOT_ERR_NOT_HISTEDIT);
10557 if (continue_edit) {
10560 if (!edit_in_progress) {
10561 error = got_error(GOT_ERR_NOT_HISTEDIT);
10565 error = got_worktree_get_histedit_script_path(&path, worktree);
10569 error = histedit_load_list(&histedit_cmds, path, repo);
10574 error = got_worktree_histedit_continue(&resume_commit_id,
10575 &tmp_branch, &branch, &base_commit_id, &fileindex,
10580 error = got_ref_resolve(&head_commit_id, repo, branch);
10584 error = got_object_open_as_commit(&commit, repo,
10588 parent_ids = got_object_commit_get_parent_ids(commit);
10589 pid = STAILQ_FIRST(parent_ids);
10591 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10594 error = collect_commits(&commits, head_commit_id, pid->id,
10595 base_commit_id, got_worktree_get_path_prefix(worktree),
10596 GOT_ERR_HISTEDIT_PATH, repo);
10597 got_object_commit_close(commit);
10602 if (edit_in_progress) {
10603 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10607 error = got_ref_open(&branch, repo,
10608 got_worktree_get_head_ref_name(worktree), 0);
10612 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10613 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10614 "will not edit commit history of a branch outside "
10615 "the \"refs/heads/\" reference namespace");
10619 error = got_ref_resolve(&head_commit_id, repo, branch);
10620 got_ref_close(branch);
10625 error = got_object_open_as_commit(&commit, repo,
10629 parent_ids = got_object_commit_get_parent_ids(commit);
10630 pid = STAILQ_FIRST(parent_ids);
10632 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10635 error = collect_commits(&commits, head_commit_id, pid->id,
10636 got_worktree_get_base_commit_id(worktree),
10637 got_worktree_get_path_prefix(worktree),
10638 GOT_ERR_HISTEDIT_PATH, repo);
10639 got_object_commit_close(commit);
10644 if (STAILQ_EMPTY(&commits)) {
10645 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10649 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
10650 &base_commit_id, &fileindex, worktree, repo);
10654 if (edit_script_path) {
10655 error = histedit_load_list(&histedit_cmds,
10656 edit_script_path, repo);
10658 got_worktree_histedit_abort(worktree, fileindex,
10659 repo, branch, base_commit_id,
10660 abort_progress, &upa);
10661 print_merge_progress_stats(&upa);
10665 const char *branch_name;
10666 branch_name = got_ref_get_symref_target(branch);
10667 if (strncmp(branch_name, "refs/heads/", 11) == 0)
10669 error = histedit_edit_script(&histedit_cmds, &commits,
10670 branch_name, edit_logmsg_only, fold_only,
10673 got_worktree_histedit_abort(worktree, fileindex,
10674 repo, branch, base_commit_id,
10675 abort_progress, &upa);
10676 print_merge_progress_stats(&upa);
10682 error = histedit_save_list(&histedit_cmds, worktree,
10685 got_worktree_histedit_abort(worktree, fileindex,
10686 repo, branch, base_commit_id,
10687 abort_progress, &upa);
10688 print_merge_progress_stats(&upa);
10694 error = histedit_check_script(&histedit_cmds, &commits, repo);
10698 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
10699 if (resume_commit_id) {
10700 if (got_object_id_cmp(hle->commit_id,
10701 resume_commit_id) != 0)
10704 resume_commit_id = NULL;
10705 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
10706 hle->cmd->code == GOT_HISTEDIT_FOLD) {
10707 error = histedit_skip_commit(hle, worktree,
10712 struct got_pathlist_head paths;
10713 int have_changes = 0;
10715 TAILQ_INIT(&paths);
10716 error = got_pathlist_append(&paths, "", NULL);
10719 error = got_worktree_status(worktree, &paths,
10720 repo, 0, check_local_changes, &have_changes,
10721 check_cancelled, NULL);
10722 got_pathlist_free(&paths);
10724 if (error->code != GOT_ERR_CANCELLED)
10726 if (sigint_received || sigpipe_received)
10729 if (have_changes) {
10730 error = histedit_commit(NULL, worktree,
10731 fileindex, tmp_branch, hle, repo);
10735 error = got_object_open_as_commit(
10736 &commit, repo, hle->commit_id);
10739 error = show_histedit_progress(commit,
10741 got_object_commit_close(commit);
10750 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
10751 error = histedit_skip_commit(hle, worktree, repo);
10757 error = got_object_open_as_commit(&commit, repo,
10761 parent_ids = got_object_commit_get_parent_ids(commit);
10762 pid = STAILQ_FIRST(parent_ids);
10764 error = got_worktree_histedit_merge_files(&merged_paths,
10765 worktree, fileindex, pid->id, hle->commit_id, repo,
10766 update_progress, &upa, check_cancelled, NULL);
10769 got_object_commit_close(commit);
10772 print_merge_progress_stats(&upa);
10773 if (upa.conflicts > 0 || upa.missing > 0 ||
10774 upa.not_deleted > 0 || upa.unversioned > 0) {
10775 if (upa.conflicts > 0) {
10776 error = show_rebase_merge_conflict(
10777 hle->commit_id, repo);
10781 got_worktree_rebase_pathlist_free(&merged_paths);
10785 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
10787 error = got_object_id_str(&id_str, hle->commit_id);
10790 printf("Stopping histedit for amending commit %s\n",
10793 got_worktree_rebase_pathlist_free(&merged_paths);
10794 error = got_worktree_histedit_postpone(worktree,
10799 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
10800 error = histedit_skip_commit(hle, worktree, repo);
10806 error = histedit_commit(&merged_paths, worktree, fileindex,
10807 tmp_branch, hle, repo);
10808 got_worktree_rebase_pathlist_free(&merged_paths);
10813 if (upa.conflicts > 0 || upa.missing > 0 ||
10814 upa.not_deleted > 0 || upa.unversioned > 0) {
10815 error = got_worktree_histedit_postpone(worktree, fileindex);
10818 if (upa.conflicts > 0 && upa.missing == 0 &&
10819 upa.not_deleted == 0 && upa.unversioned == 0) {
10820 error = got_error_msg(GOT_ERR_CONFLICTS,
10821 "conflicts must be resolved before histedit "
10823 } else if (upa.conflicts > 0) {
10824 error = got_error_msg(GOT_ERR_CONFLICTS,
10825 "conflicts must be resolved before histedit "
10826 "can continue; changes destined for some "
10827 "files were not yet merged and should be "
10828 "merged manually if required before the "
10829 "histedit operation is continued");
10831 error = got_error_msg(GOT_ERR_CONFLICTS,
10832 "changes destined for some files were not "
10833 "yet merged and should be merged manually "
10834 "if required before the histedit operation "
10838 error = histedit_complete(worktree, fileindex, tmp_branch,
10841 got_object_id_queue_free(&commits);
10842 histedit_free_list(&histedit_cmds);
10843 free(head_commit_id);
10844 free(base_commit_id);
10845 free(resume_commit_id);
10847 got_object_commit_close(commit);
10849 got_ref_close(branch);
10851 got_ref_close(tmp_branch);
10853 got_worktree_close(worktree);
10855 const struct got_error *close_err = got_repo_close(repo);
10863 usage_integrate(void)
10865 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
10869 static const struct got_error *
10870 cmd_integrate(int argc, char *argv[])
10872 const struct got_error *error = NULL;
10873 struct got_repository *repo = NULL;
10874 struct got_worktree *worktree = NULL;
10875 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
10876 const char *branch_arg = NULL;
10877 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
10878 struct got_fileindex *fileindex = NULL;
10879 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
10881 struct got_update_progress_arg upa;
10883 while ((ch = getopt(argc, argv, "")) != -1) {
10896 branch_arg = argv[0];
10898 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10899 "unveil", NULL) == -1)
10902 cwd = getcwd(NULL, 0);
10904 error = got_error_from_errno("getcwd");
10908 error = got_worktree_open(&worktree, cwd);
10910 if (error->code == GOT_ERR_NOT_WORKTREE)
10911 error = wrap_not_worktree_error(error, "integrate",
10916 error = check_rebase_or_histedit_in_progress(worktree);
10920 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10925 error = apply_unveil(got_repo_get_path(repo), 0,
10926 got_worktree_get_root_path(worktree));
10930 error = check_merge_in_progress(worktree, repo);
10934 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
10935 error = got_error_from_errno("asprintf");
10939 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
10940 &base_branch_ref, worktree, refname, repo);
10944 refname = strdup(got_ref_get_name(branch_ref));
10945 if (refname == NULL) {
10946 error = got_error_from_errno("strdup");
10947 got_worktree_integrate_abort(worktree, fileindex, repo,
10948 branch_ref, base_branch_ref);
10951 base_refname = strdup(got_ref_get_name(base_branch_ref));
10952 if (base_refname == NULL) {
10953 error = got_error_from_errno("strdup");
10954 got_worktree_integrate_abort(worktree, fileindex, repo,
10955 branch_ref, base_branch_ref);
10959 error = got_ref_resolve(&commit_id, repo, branch_ref);
10963 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
10967 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
10968 error = got_error_msg(GOT_ERR_SAME_BRANCH,
10969 "specified branch has already been integrated");
10970 got_worktree_integrate_abort(worktree, fileindex, repo,
10971 branch_ref, base_branch_ref);
10975 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
10977 if (error->code == GOT_ERR_ANCESTRY)
10978 error = got_error(GOT_ERR_REBASE_REQUIRED);
10979 got_worktree_integrate_abort(worktree, fileindex, repo,
10980 branch_ref, base_branch_ref);
10984 memset(&upa, 0, sizeof(upa));
10985 error = got_worktree_integrate_continue(worktree, fileindex, repo,
10986 branch_ref, base_branch_ref, update_progress, &upa,
10987 check_cancelled, NULL);
10991 printf("Integrated %s into %s\n", refname, base_refname);
10992 print_update_progress_stats(&upa);
10995 const struct got_error *close_err = got_repo_close(repo);
11000 got_worktree_close(worktree);
11002 free(base_commit_id);
11005 free(base_refname);
11012 fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11017 static const struct got_error *
11018 cmd_merge(int argc, char *argv[])
11020 const struct got_error *error = NULL;
11021 struct got_worktree *worktree = NULL;
11022 struct got_repository *repo = NULL;
11023 struct got_fileindex *fileindex = NULL;
11024 char *cwd = NULL, *id_str = NULL, *author = NULL;
11025 struct got_reference *branch = NULL, *wt_branch = NULL;
11026 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11027 struct got_object_id *wt_branch_tip = NULL;
11028 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11029 int interrupt_merge = 0;
11030 struct got_update_progress_arg upa;
11031 struct got_object_id *merge_commit_id = NULL;
11032 char *branch_name = NULL;
11034 memset(&upa, 0, sizeof(upa));
11036 while ((ch = getopt(argc, argv, "acn")) != -1) {
11042 continue_merge = 1;
11045 interrupt_merge = 1;
11057 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11058 "unveil", NULL) == -1)
11062 if (abort_merge && continue_merge)
11063 option_conflict('a', 'c');
11064 if (abort_merge || continue_merge) {
11067 } else if (argc != 1)
11070 cwd = getcwd(NULL, 0);
11072 error = got_error_from_errno("getcwd");
11076 error = got_worktree_open(&worktree, cwd);
11078 if (error->code == GOT_ERR_NOT_WORKTREE)
11079 error = wrap_not_worktree_error(error,
11084 error = got_repo_open(&repo,
11085 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
11089 error = apply_unveil(got_repo_get_path(repo), 0,
11090 worktree ? got_worktree_get_root_path(worktree) : NULL);
11094 error = check_rebase_or_histedit_in_progress(worktree);
11098 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11104 if (!merge_in_progress) {
11105 error = got_error(GOT_ERR_NOT_MERGING);
11108 error = got_worktree_merge_continue(&branch_name,
11109 &branch_tip, &fileindex, worktree, repo);
11112 error = got_worktree_merge_abort(worktree, fileindex, repo,
11113 abort_progress, &upa);
11116 printf("Merge of %s aborted\n", branch_name);
11117 goto done; /* nothing else to do */
11120 error = get_author(&author, repo, worktree);
11124 if (continue_merge) {
11125 if (!merge_in_progress) {
11126 error = got_error(GOT_ERR_NOT_MERGING);
11129 error = got_worktree_merge_continue(&branch_name,
11130 &branch_tip, &fileindex, worktree, repo);
11134 error = got_ref_open(&branch, repo, argv[0], 0);
11137 branch_name = strdup(got_ref_get_name(branch));
11138 if (branch_name == NULL) {
11139 error = got_error_from_errno("strdup");
11142 error = got_ref_resolve(&branch_tip, repo, branch);
11147 error = got_ref_open(&wt_branch, repo,
11148 got_worktree_get_head_ref_name(worktree), 0);
11151 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11154 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11155 wt_branch_tip, branch_tip, 0, repo,
11156 check_cancelled, NULL);
11157 if (error && error->code != GOT_ERR_ANCESTRY)
11160 if (!continue_merge) {
11161 error = check_path_prefix(wt_branch_tip, branch_tip,
11162 got_worktree_get_path_prefix(worktree),
11163 GOT_ERR_MERGE_PATH, repo);
11167 error = check_same_branch(wt_branch_tip, branch,
11170 if (error->code != GOT_ERR_ANCESTRY)
11174 static char msg[512];
11175 snprintf(msg, sizeof(msg),
11176 "cannot create a merge commit because "
11177 "%s is based on %s; %s can be integrated "
11178 "with 'got integrate' instead", branch_name,
11179 got_worktree_get_head_ref_name(worktree),
11181 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11185 error = got_worktree_merge_prepare(&fileindex, worktree,
11190 error = got_worktree_merge_branch(worktree, fileindex,
11191 yca_id, branch_tip, repo, update_progress, &upa,
11192 check_cancelled, NULL);
11195 print_merge_progress_stats(&upa);
11196 if (!upa.did_something) {
11197 error = got_worktree_merge_abort(worktree, fileindex,
11198 repo, abort_progress, &upa);
11201 printf("Already up-to-date\n");
11206 if (interrupt_merge) {
11207 error = got_worktree_merge_postpone(worktree, fileindex);
11210 printf("Merge of %s interrupted on request\n", branch_name);
11211 } else if (upa.conflicts > 0 || upa.missing > 0 ||
11212 upa.not_deleted > 0 || upa.unversioned > 0) {
11213 error = got_worktree_merge_postpone(worktree, fileindex);
11216 if (upa.conflicts > 0 && upa.missing == 0 &&
11217 upa.not_deleted == 0 && upa.unversioned == 0) {
11218 error = got_error_msg(GOT_ERR_CONFLICTS,
11219 "conflicts must be resolved before merging "
11221 } else if (upa.conflicts > 0) {
11222 error = got_error_msg(GOT_ERR_CONFLICTS,
11223 "conflicts must be resolved before merging "
11224 "can continue; changes destined for some "
11225 "files were not yet merged and "
11226 "should be merged manually if required before the "
11227 "merge operation is continued");
11229 error = got_error_msg(GOT_ERR_CONFLICTS,
11230 "changes destined for some "
11231 "files were not yet merged and should be "
11232 "merged manually if required before the "
11233 "merge operation is continued");
11237 error = got_worktree_merge_commit(&merge_commit_id, worktree,
11238 fileindex, author, NULL, 1, branch_tip, branch_name,
11239 repo, continue_merge ? print_status : NULL, NULL);
11242 error = got_worktree_merge_complete(worktree, fileindex, repo);
11245 error = got_object_id_str(&id_str, merge_commit_id);
11248 printf("Merged %s into %s: %s\n", branch_name,
11249 got_worktree_get_head_ref_name(worktree),
11255 free(merge_commit_id);
11261 got_ref_close(branch);
11263 got_ref_close(wt_branch);
11265 got_worktree_close(worktree);
11267 const struct got_error *close_err = got_repo_close(repo);
11277 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11278 "[-S] [file-path ...]\n",
11283 static const struct got_error *
11284 print_stage(void *arg, unsigned char status, unsigned char staged_status,
11285 const char *path, struct got_object_id *blob_id,
11286 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11287 int dirfd, const char *de_name)
11289 const struct got_error *err = NULL;
11290 char *id_str = NULL;
11292 if (staged_status != GOT_STATUS_ADD &&
11293 staged_status != GOT_STATUS_MODIFY &&
11294 staged_status != GOT_STATUS_DELETE)
11297 if (staged_status == GOT_STATUS_ADD ||
11298 staged_status == GOT_STATUS_MODIFY)
11299 err = got_object_id_str(&id_str, staged_blob_id);
11301 err = got_object_id_str(&id_str, blob_id);
11305 printf("%s %c %s\n", id_str, staged_status, path);
11310 static const struct got_error *
11311 cmd_stage(int argc, char *argv[])
11313 const struct got_error *error = NULL;
11314 struct got_repository *repo = NULL;
11315 struct got_worktree *worktree = NULL;
11317 struct got_pathlist_head paths;
11318 struct got_pathlist_entry *pe;
11319 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11320 FILE *patch_script_file = NULL;
11321 const char *patch_script_path = NULL;
11322 struct choose_patch_arg cpa;
11324 TAILQ_INIT(&paths);
11326 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11335 patch_script_path = optarg;
11338 allow_bad_symlinks = 1;
11350 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11351 "unveil", NULL) == -1)
11354 if (list_stage && (pflag || patch_script_path))
11355 errx(1, "-l option cannot be used with other options");
11356 if (patch_script_path && !pflag)
11357 errx(1, "-F option can only be used together with -p option");
11359 cwd = getcwd(NULL, 0);
11361 error = got_error_from_errno("getcwd");
11365 error = got_worktree_open(&worktree, cwd);
11367 if (error->code == GOT_ERR_NOT_WORKTREE)
11368 error = wrap_not_worktree_error(error, "stage", cwd);
11372 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11377 if (patch_script_path) {
11378 patch_script_file = fopen(patch_script_path, "re");
11379 if (patch_script_file == NULL) {
11380 error = got_error_from_errno2("fopen",
11381 patch_script_path);
11385 error = apply_unveil(got_repo_get_path(repo), 0,
11386 got_worktree_get_root_path(worktree));
11390 error = check_merge_in_progress(worktree, repo);
11394 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11399 error = got_worktree_status(worktree, &paths, repo, 0,
11400 print_stage, NULL, check_cancelled, NULL);
11402 cpa.patch_script_file = patch_script_file;
11403 cpa.action = "stage";
11404 error = got_worktree_stage(worktree, &paths,
11405 pflag ? NULL : print_status, NULL,
11406 pflag ? choose_patch : NULL, &cpa,
11407 allow_bad_symlinks, repo);
11410 if (patch_script_file && fclose(patch_script_file) == EOF &&
11412 error = got_error_from_errno2("fclose", patch_script_path);
11414 const struct got_error *close_err = got_repo_close(repo);
11419 got_worktree_close(worktree);
11420 TAILQ_FOREACH(pe, &paths, entry)
11421 free((char *)pe->path);
11422 got_pathlist_free(&paths);
11428 usage_unstage(void)
11430 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
11431 "[file-path ...]\n",
11437 static const struct got_error *
11438 cmd_unstage(int argc, char *argv[])
11440 const struct got_error *error = NULL;
11441 struct got_repository *repo = NULL;
11442 struct got_worktree *worktree = NULL;
11444 struct got_pathlist_head paths;
11445 struct got_pathlist_entry *pe;
11447 struct got_update_progress_arg upa;
11448 FILE *patch_script_file = NULL;
11449 const char *patch_script_path = NULL;
11450 struct choose_patch_arg cpa;
11452 TAILQ_INIT(&paths);
11454 while ((ch = getopt(argc, argv, "pF:")) != -1) {
11460 patch_script_path = optarg;
11472 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11473 "unveil", NULL) == -1)
11476 if (patch_script_path && !pflag)
11477 errx(1, "-F option can only be used together with -p option");
11479 cwd = getcwd(NULL, 0);
11481 error = got_error_from_errno("getcwd");
11485 error = got_worktree_open(&worktree, cwd);
11487 if (error->code == GOT_ERR_NOT_WORKTREE)
11488 error = wrap_not_worktree_error(error, "unstage", cwd);
11492 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11497 if (patch_script_path) {
11498 patch_script_file = fopen(patch_script_path, "re");
11499 if (patch_script_file == NULL) {
11500 error = got_error_from_errno2("fopen",
11501 patch_script_path);
11506 error = apply_unveil(got_repo_get_path(repo), 0,
11507 got_worktree_get_root_path(worktree));
11511 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11515 cpa.patch_script_file = patch_script_file;
11516 cpa.action = "unstage";
11517 memset(&upa, 0, sizeof(upa));
11518 error = got_worktree_unstage(worktree, &paths, update_progress,
11519 &upa, pflag ? choose_patch : NULL, &cpa, repo);
11521 print_merge_progress_stats(&upa);
11523 if (patch_script_file && fclose(patch_script_file) == EOF &&
11525 error = got_error_from_errno2("fclose", patch_script_path);
11527 const struct got_error *close_err = got_repo_close(repo);
11532 got_worktree_close(worktree);
11533 TAILQ_FOREACH(pe, &paths, entry)
11534 free((char *)pe->path);
11535 got_pathlist_free(&paths);
11543 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
11544 "arg1 [arg2 ...]\n", getprogname());
11548 static const struct got_error *
11549 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11551 const struct got_error *err;
11552 struct got_blob_object *blob;
11554 err = got_object_open_as_blob(&blob, repo, id, 8192);
11558 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
11559 got_object_blob_close(blob);
11563 static const struct got_error *
11564 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11566 const struct got_error *err;
11567 struct got_tree_object *tree;
11570 err = got_object_open_as_tree(&tree, repo, id);
11574 nentries = got_object_tree_get_nentries(tree);
11575 for (i = 0; i < nentries; i++) {
11576 struct got_tree_entry *te;
11578 if (sigint_received || sigpipe_received)
11580 te = got_object_tree_get_entry(tree, i);
11581 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
11584 fprintf(outfile, "%s %.7o %s\n", id_str,
11585 got_tree_entry_get_mode(te),
11586 got_tree_entry_get_name(te));
11590 got_object_tree_close(tree);
11595 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
11605 h = (long long)gmtoff / 3600;
11606 m = ((long long)gmtoff - h*3600) / 60;
11607 snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
11610 static const struct got_error *
11611 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11613 const struct got_error *err;
11614 struct got_commit_object *commit;
11615 const struct got_object_id_queue *parent_ids;
11616 struct got_object_qid *pid;
11617 char *id_str = NULL;
11618 const char *logmsg = NULL;
11621 err = got_object_open_as_commit(&commit, repo, id);
11625 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
11629 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
11630 parent_ids = got_object_commit_get_parent_ids(commit);
11631 fprintf(outfile, "numparents %d\n",
11632 got_object_commit_get_nparents(commit));
11633 STAILQ_FOREACH(pid, parent_ids, entry) {
11635 err = got_object_id_str(&pid_str, pid->id);
11638 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
11641 format_gmtoff(gmtoff, sizeof(gmtoff),
11642 got_object_commit_get_author_gmtoff(commit));
11643 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
11644 got_object_commit_get_author(commit),
11645 (long long)got_object_commit_get_author_time(commit),
11648 format_gmtoff(gmtoff, sizeof(gmtoff),
11649 got_object_commit_get_committer_gmtoff(commit));
11650 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
11651 got_object_commit_get_author(commit),
11652 (long long)got_object_commit_get_committer_time(commit),
11655 logmsg = got_object_commit_get_logmsg_raw(commit);
11656 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
11657 fprintf(outfile, "%s", logmsg);
11660 got_object_commit_close(commit);
11664 static const struct got_error *
11665 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11667 const struct got_error *err;
11668 struct got_tag_object *tag;
11669 char *id_str = NULL;
11670 const char *tagmsg = NULL;
11673 err = got_object_open_as_tag(&tag, repo, id);
11677 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
11681 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
11683 switch (got_object_tag_get_object_type(tag)) {
11684 case GOT_OBJ_TYPE_BLOB:
11685 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11686 GOT_OBJ_LABEL_BLOB);
11688 case GOT_OBJ_TYPE_TREE:
11689 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11690 GOT_OBJ_LABEL_TREE);
11692 case GOT_OBJ_TYPE_COMMIT:
11693 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11694 GOT_OBJ_LABEL_COMMIT);
11696 case GOT_OBJ_TYPE_TAG:
11697 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11698 GOT_OBJ_LABEL_TAG);
11704 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
11705 got_object_tag_get_name(tag));
11707 format_gmtoff(gmtoff, sizeof(gmtoff),
11708 got_object_tag_get_tagger_gmtoff(tag));
11709 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
11710 got_object_tag_get_tagger(tag),
11711 (long long)got_object_tag_get_tagger_time(tag),
11714 tagmsg = got_object_tag_get_message(tag);
11715 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
11716 fprintf(outfile, "%s", tagmsg);
11719 got_object_tag_close(tag);
11723 static const struct got_error *
11724 cmd_cat(int argc, char *argv[])
11726 const struct got_error *error;
11727 struct got_repository *repo = NULL;
11728 struct got_worktree *worktree = NULL;
11729 char *cwd = NULL, *repo_path = NULL, *label = NULL;
11730 const char *commit_id_str = NULL;
11731 struct got_object_id *id = NULL, *commit_id = NULL;
11732 int ch, obj_type, i, force_path = 0;
11733 struct got_reflist_head refs;
11738 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
11743 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
11746 commit_id_str = optarg;
11749 repo_path = realpath(optarg, NULL);
11750 if (repo_path == NULL)
11751 return got_error_from_errno2("realpath",
11753 got_path_strip_trailing_slashes(repo_path);
11767 cwd = getcwd(NULL, 0);
11769 error = got_error_from_errno("getcwd");
11772 error = got_worktree_open(&worktree, cwd);
11773 if (error && error->code != GOT_ERR_NOT_WORKTREE)
11776 if (repo_path == NULL) {
11777 repo_path = strdup(
11778 got_worktree_get_repo_path(worktree));
11779 if (repo_path == NULL) {
11780 error = got_error_from_errno("strdup");
11786 if (repo_path == NULL) {
11787 repo_path = getcwd(NULL, 0);
11788 if (repo_path == NULL)
11789 return got_error_from_errno("getcwd");
11792 error = got_repo_open(&repo, repo_path, NULL);
11797 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
11801 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11805 if (commit_id_str == NULL)
11806 commit_id_str = GOT_REF_HEAD;
11807 error = got_repo_match_object_id(&commit_id, NULL,
11808 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
11812 for (i = 0; i < argc; i++) {
11814 error = got_object_id_by_path(&id, repo, commit_id,
11819 error = got_repo_match_object_id(&id, &label, argv[i],
11820 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
11823 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
11824 error->code != GOT_ERR_NOT_REF)
11826 error = got_object_id_by_path(&id, repo,
11827 commit_id, argv[i]);
11833 error = got_object_get_type(&obj_type, repo, id);
11837 switch (obj_type) {
11838 case GOT_OBJ_TYPE_BLOB:
11839 error = cat_blob(id, repo, stdout);
11841 case GOT_OBJ_TYPE_TREE:
11842 error = cat_tree(id, repo, stdout);
11844 case GOT_OBJ_TYPE_COMMIT:
11845 error = cat_commit(id, repo, stdout);
11847 case GOT_OBJ_TYPE_TAG:
11848 error = cat_tag(id, repo, stdout);
11851 error = got_error(GOT_ERR_OBJ_TYPE);
11866 got_worktree_close(worktree);
11868 const struct got_error *close_err = got_repo_close(repo);
11872 got_ref_list_free(&refs);
11879 fprintf(stderr, "usage: %s info [path ...]\n",
11884 static const struct got_error *
11885 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
11886 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
11887 struct got_object_id *commit_id)
11889 const struct got_error *err = NULL;
11890 char *id_str = NULL;
11892 struct tm mytm, *tm;
11893 struct got_pathlist_head *paths = arg;
11894 struct got_pathlist_entry *pe;
11897 * Clear error indication from any of the path arguments which
11898 * would cause this file index entry to be displayed.
11900 TAILQ_FOREACH(pe, paths, entry) {
11901 if (got_path_cmp(path, pe->path, strlen(path),
11902 pe->path_len) == 0 ||
11903 got_path_is_child(path, pe->path, pe->path_len))
11904 pe->data = NULL; /* no error */
11907 printf(GOT_COMMIT_SEP_STR);
11909 printf("symlink: %s\n", path);
11910 else if (S_ISREG(mode)) {
11911 printf("file: %s\n", path);
11912 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
11913 } else if (S_ISDIR(mode))
11914 printf("directory: %s\n", path);
11916 printf("something: %s\n", path);
11918 tm = localtime_r(&mtime, &mytm);
11921 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
11922 return got_error(GOT_ERR_NO_SPACE);
11923 printf("timestamp: %s\n", datebuf);
11926 err = got_object_id_str(&id_str, blob_id);
11929 printf("based on blob: %s\n", id_str);
11933 if (staged_blob_id) {
11934 err = got_object_id_str(&id_str, staged_blob_id);
11937 printf("based on staged blob: %s\n", id_str);
11942 err = got_object_id_str(&id_str, commit_id);
11945 printf("based on commit: %s\n", id_str);
11952 static const struct got_error *
11953 cmd_info(int argc, char *argv[])
11955 const struct got_error *error = NULL;
11956 struct got_worktree *worktree = NULL;
11957 char *cwd = NULL, *id_str = NULL;
11958 struct got_pathlist_head paths;
11959 struct got_pathlist_entry *pe;
11960 char *uuidstr = NULL;
11961 int ch, show_files = 0;
11963 TAILQ_INIT(&paths);
11965 while ((ch = getopt(argc, argv, "")) != -1) {
11977 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
11981 cwd = getcwd(NULL, 0);
11983 error = got_error_from_errno("getcwd");
11987 error = got_worktree_open(&worktree, cwd);
11989 if (error->code == GOT_ERR_NOT_WORKTREE)
11990 error = wrap_not_worktree_error(error, "info", cwd);
11994 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
11999 error = get_worktree_paths_from_argv(&paths, argc, argv,
12006 error = got_object_id_str(&id_str,
12007 got_worktree_get_base_commit_id(worktree));
12011 error = got_worktree_get_uuid(&uuidstr, worktree);
12015 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12016 printf("work tree base commit: %s\n", id_str);
12017 printf("work tree path prefix: %s\n",
12018 got_worktree_get_path_prefix(worktree));
12019 printf("work tree branch reference: %s\n",
12020 got_worktree_get_head_ref_name(worktree));
12021 printf("work tree UUID: %s\n", uuidstr);
12022 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12025 struct got_pathlist_entry *pe;
12026 TAILQ_FOREACH(pe, &paths, entry) {
12027 if (pe->path_len == 0)
12030 * Assume this path will fail. This will be corrected
12031 * in print_path_info() in case the path does suceeed.
12033 pe->data = (void *)got_error_path(pe->path,
12036 error = got_worktree_path_info(worktree, &paths,
12037 print_path_info, &paths, check_cancelled, NULL);
12040 TAILQ_FOREACH(pe, &paths, entry) {
12041 if (pe->data != NULL) {
12042 error = pe->data; /* bad path */
12048 TAILQ_FOREACH(pe, &paths, entry)
12049 free((char *)pe->path);
12050 got_pathlist_free(&paths);