2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/types.h>
40 #include "got_compat.h"
42 #include "got_version.h"
43 #include "got_error.h"
44 #include "got_object.h"
45 #include "got_reference.h"
46 #include "got_repository.h"
48 #include "got_cancel.h"
49 #include "got_worktree.h"
51 #include "got_commit_graph.h"
52 #include "got_fetch.h"
54 #include "got_blame.h"
55 #include "got_privsep.h"
56 #include "got_opentemp.h"
57 #include "got_gotconfig.h"
59 #include "got_patch.h"
62 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
65 static volatile sig_atomic_t sigint_received;
66 static volatile sig_atomic_t sigpipe_received;
69 catch_sigint(int signo)
75 catch_sigpipe(int signo)
83 const struct got_error *(*cmd_main)(int, char *[]);
84 void (*cmd_usage)(void);
85 const char *cmd_alias;
88 __dead static void usage(int, int);
89 __dead static void usage_init(void);
90 __dead static void usage_import(void);
91 __dead static void usage_clone(void);
92 __dead static void usage_fetch(void);
93 __dead static void usage_checkout(void);
94 __dead static void usage_update(void);
95 __dead static void usage_log(void);
96 __dead static void usage_diff(void);
97 __dead static void usage_blame(void);
98 __dead static void usage_tree(void);
99 __dead static void usage_status(void);
100 __dead static void usage_ref(void);
101 __dead static void usage_branch(void);
102 __dead static void usage_tag(void);
103 __dead static void usage_add(void);
104 __dead static void usage_remove(void);
105 __dead static void usage_patch(void);
106 __dead static void usage_revert(void);
107 __dead static void usage_commit(void);
108 __dead static void usage_send(void);
109 __dead static void usage_cherrypick(void);
110 __dead static void usage_backout(void);
111 __dead static void usage_rebase(void);
112 __dead static void usage_histedit(void);
113 __dead static void usage_integrate(void);
114 __dead static void usage_merge(void);
115 __dead static void usage_stage(void);
116 __dead static void usage_unstage(void);
117 __dead static void usage_cat(void);
118 __dead static void usage_info(void);
120 static const struct got_error* cmd_init(int, char *[]);
121 static const struct got_error* cmd_import(int, char *[]);
122 static const struct got_error* cmd_clone(int, char *[]);
123 static const struct got_error* cmd_fetch(int, char *[]);
124 static const struct got_error* cmd_checkout(int, char *[]);
125 static const struct got_error* cmd_update(int, char *[]);
126 static const struct got_error* cmd_log(int, char *[]);
127 static const struct got_error* cmd_diff(int, char *[]);
128 static const struct got_error* cmd_blame(int, char *[]);
129 static const struct got_error* cmd_tree(int, char *[]);
130 static const struct got_error* cmd_status(int, char *[]);
131 static const struct got_error* cmd_ref(int, char *[]);
132 static const struct got_error* cmd_branch(int, char *[]);
133 static const struct got_error* cmd_tag(int, char *[]);
134 static const struct got_error* cmd_add(int, char *[]);
135 static const struct got_error* cmd_remove(int, char *[]);
136 static const struct got_error* cmd_patch(int, char *[]);
137 static const struct got_error* cmd_revert(int, char *[]);
138 static const struct got_error* cmd_commit(int, char *[]);
139 static const struct got_error* cmd_send(int, char *[]);
140 static const struct got_error* cmd_cherrypick(int, char *[]);
141 static const struct got_error* cmd_backout(int, char *[]);
142 static const struct got_error* cmd_rebase(int, char *[]);
143 static const struct got_error* cmd_histedit(int, char *[]);
144 static const struct got_error* cmd_integrate(int, char *[]);
145 static const struct got_error* cmd_merge(int, char *[]);
146 static const struct got_error* cmd_stage(int, char *[]);
147 static const struct got_error* cmd_unstage(int, char *[]);
148 static const struct got_error* cmd_cat(int, char *[]);
149 static const struct got_error* cmd_info(int, char *[]);
151 static const struct got_cmd got_commands[] = {
152 { "init", cmd_init, usage_init, "" },
153 { "import", cmd_import, usage_import, "im" },
154 { "clone", cmd_clone, usage_clone, "cl" },
155 { "fetch", cmd_fetch, usage_fetch, "fe" },
156 { "checkout", cmd_checkout, usage_checkout, "co" },
157 { "update", cmd_update, usage_update, "up" },
158 { "log", cmd_log, usage_log, "" },
159 { "diff", cmd_diff, usage_diff, "di" },
160 { "blame", cmd_blame, usage_blame, "bl" },
161 { "tree", cmd_tree, usage_tree, "tr" },
162 { "status", cmd_status, usage_status, "st" },
163 { "ref", cmd_ref, usage_ref, "" },
164 { "branch", cmd_branch, usage_branch, "br" },
165 { "tag", cmd_tag, usage_tag, "" },
166 { "add", cmd_add, usage_add, "" },
167 { "remove", cmd_remove, usage_remove, "rm" },
168 { "patch", cmd_patch, usage_patch, "pa" },
169 { "revert", cmd_revert, usage_revert, "rv" },
170 { "commit", cmd_commit, usage_commit, "ci" },
171 { "send", cmd_send, usage_send, "se" },
172 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
173 { "backout", cmd_backout, usage_backout, "bo" },
174 { "rebase", cmd_rebase, usage_rebase, "rb" },
175 { "histedit", cmd_histedit, usage_histedit, "he" },
176 { "integrate", cmd_integrate, usage_integrate,"ig" },
177 { "merge", cmd_merge, usage_merge, "mg" },
178 { "stage", cmd_stage, usage_stage, "sg" },
179 { "unstage", cmd_unstage, usage_unstage, "ug" },
180 { "cat", cmd_cat, usage_cat, "" },
181 { "info", cmd_info, usage_info, "" },
185 list_commands(FILE *fp)
189 fprintf(fp, "commands:");
190 for (i = 0; i < nitems(got_commands); i++) {
191 const struct got_cmd *cmd = &got_commands[i];
192 fprintf(fp, " %s", cmd->cmd_name);
198 option_conflict(char a, char b)
200 errx(1, "-%c and -%c options are mutually exclusive", a, b);
204 main(int argc, char *argv[])
206 const struct got_cmd *cmd;
209 int hflag = 0, Vflag = 0;
210 static const struct option longopts[] = {
211 { "version", no_argument, NULL, 'V' },
215 setlocale(LC_CTYPE, "");
217 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
237 got_version_print_str();
242 usage(hflag, hflag ? 0 : 1);
244 signal(SIGINT, catch_sigint);
245 signal(SIGPIPE, catch_sigpipe);
247 for (i = 0; i < nitems(got_commands); i++) {
248 const struct got_error *error;
250 cmd = &got_commands[i];
252 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
253 strcmp(cmd->cmd_alias, argv[0]) != 0)
259 error = cmd->cmd_main(argc, argv);
260 if (error && error->code != GOT_ERR_CANCELLED &&
261 error->code != GOT_ERR_PRIVSEP_EXIT &&
262 !(sigpipe_received &&
263 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
265 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
266 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
273 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
274 list_commands(stderr);
279 usage(int hflag, int status)
281 FILE *fp = (status == 0) ? stdout : stderr;
283 fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
290 static const struct got_error *
291 get_editor(char **abspath)
293 const struct got_error *err = NULL;
298 editor = getenv("VISUAL");
300 editor = getenv("EDITOR");
303 err = got_path_find_prog(abspath, editor);
308 if (*abspath == NULL) {
309 *abspath = strdup("/bin/ed");
310 if (*abspath == NULL)
311 return got_error_from_errno("strdup");
317 static const struct got_error *
318 apply_unveil(const char *repo_path, int repo_read_only,
319 const char *worktree_path)
321 const struct got_error *err;
324 if (unveil("gmon.out", "rwc") != 0)
325 return got_error_from_errno2("unveil", "gmon.out");
327 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
328 return got_error_from_errno2("unveil", repo_path);
330 if (worktree_path && unveil(worktree_path, "rwc") != 0)
331 return got_error_from_errno2("unveil", worktree_path);
333 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
334 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
336 err = got_privsep_unveil_exec_helpers();
340 if (unveil(NULL, NULL) != 0)
341 return got_error_from_errno("unveil");
349 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
353 static const struct got_error *
354 cmd_init(int argc, char *argv[])
356 const struct got_error *error = NULL;
357 char *repo_path = NULL;
360 while ((ch = getopt(argc, argv, "")) != -1) {
372 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
378 repo_path = strdup(argv[0]);
379 if (repo_path == NULL)
380 return got_error_from_errno("strdup");
382 got_path_strip_trailing_slashes(repo_path);
384 error = got_path_mkdir(repo_path);
386 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
389 error = apply_unveil(repo_path, 0, NULL);
393 error = got_repo_init(repo_path);
402 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
403 "[-r repository-path] [-I pattern] path\n", getprogname());
408 spawn_editor(const char *editor, const char *file)
411 sig_t sighup, sigint, sigquit;
414 sighup = signal(SIGHUP, SIG_IGN);
415 sigint = signal(SIGINT, SIG_IGN);
416 sigquit = signal(SIGQUIT, SIG_IGN);
418 switch (pid = fork()) {
422 execl(editor, editor, file, (char *)NULL);
426 while (waitpid(pid, &st, 0) == -1)
431 (void)signal(SIGHUP, sighup);
432 (void)signal(SIGINT, sigint);
433 (void)signal(SIGQUIT, sigquit);
435 if (!WIFEXITED(st)) {
440 return WEXITSTATUS(st);
443 static const struct got_error *
444 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
445 const char *initial_content, size_t initial_content_len,
446 int require_modification)
448 const struct got_error *err = NULL;
454 size_t len, logmsg_len;
455 char *initial_content_stripped = NULL, *buf = NULL, *s;
459 if (stat(logmsg_path, &st) == -1)
460 return got_error_from_errno2("stat", logmsg_path);
462 if (spawn_editor(editor, logmsg_path) == -1)
463 return got_error_from_errno("failed spawning editor");
465 if (stat(logmsg_path, &st2) == -1)
466 return got_error_from_errno("stat");
468 if (require_modification &&
469 st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
470 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
471 "no changes made to commit message, aborting");
474 * Set up a stripped version of the initial content without comments
475 * and blank lines. We need this in order to check if the message
476 * has in fact been edited.
478 initial_content_stripped = malloc(initial_content_len + 1);
479 if (initial_content_stripped == NULL)
480 return got_error_from_errno("malloc");
481 initial_content_stripped[0] = '\0';
483 buf = strdup(initial_content);
485 err = got_error_from_errno("strdup");
490 while ((line = strsep(&s, "\n")) != NULL) {
491 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
492 continue; /* remove comments and leading empty lines */
493 len = strlcat(initial_content_stripped, line,
494 initial_content_len + 1);
495 if (len >= initial_content_len + 1) {
496 err = got_error(GOT_ERR_NO_SPACE);
500 while (len > 0 && initial_content_stripped[len - 1] == '\n') {
501 initial_content_stripped[len - 1] = '\0';
505 logmsg_len = st2.st_size;
506 *logmsg = malloc(logmsg_len + 1);
508 return got_error_from_errno("malloc");
511 fp = fopen(logmsg_path, "re");
513 err = got_error_from_errno("fopen");
518 while ((linelen = getline(&line, &linesize, fp)) != -1) {
519 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
520 continue; /* remove comments and leading empty lines */
521 len = strlcat(*logmsg, line, logmsg_len + 1);
522 if (len >= logmsg_len + 1) {
523 err = got_error(GOT_ERR_NO_SPACE);
529 err = got_ferror(fp, GOT_ERR_IO);
532 while (len > 0 && (*logmsg)[len - 1] == '\n') {
533 (*logmsg)[len - 1] = '\0';
538 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
539 "commit message cannot be empty, aborting");
542 if (require_modification &&
543 strcmp(*logmsg, initial_content_stripped) == 0)
544 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
545 "no changes made to commit message, aborting");
547 free(initial_content_stripped);
549 if (fp && fclose(fp) == EOF && err == NULL)
550 err = got_error_from_errno("fclose");
558 static const struct got_error *
559 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
560 const char *path_dir, const char *branch_name)
562 char *initial_content = NULL;
563 const struct got_error *err = NULL;
564 int initial_content_len;
567 initial_content_len = asprintf(&initial_content,
568 "\n# %s to be imported to branch %s\n", path_dir,
570 if (initial_content_len == -1)
571 return got_error_from_errno("asprintf");
573 err = got_opentemp_named_fd(logmsg_path, &fd,
574 GOT_TMPDIR_STR "/got-importmsg");
578 if (write(fd, initial_content, initial_content_len) == -1) {
579 err = got_error_from_errno2("write", *logmsg_path);
583 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
584 initial_content_len, 1);
586 if (fd != -1 && close(fd) == -1 && err == NULL)
587 err = got_error_from_errno2("close", *logmsg_path);
588 free(initial_content);
596 static const struct got_error *
597 import_progress(void *arg, const char *path)
599 printf("A %s\n", path);
604 valid_author(const char *author)
607 * Really dumb email address check; we're only doing this to
608 * avoid git's object parser breaking on commits we create.
610 while (*author && *author != '<')
614 while (*author && *author != '@')
618 while (*author && *author != '>')
620 return *author == '>';
623 static const struct got_error *
624 get_author(char **author, struct got_repository *repo,
625 struct got_worktree *worktree)
627 const struct got_error *err = NULL;
628 const char *got_author = NULL, *name, *email;
629 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
634 worktree_conf = got_worktree_get_gotconfig(worktree);
635 repo_conf = got_repo_get_gotconfig(repo);
638 * Priority of potential author information sources, from most
639 * significant to least significant:
640 * 1) work tree's .got/got.conf file
641 * 2) repository's got.conf file
642 * 3) repository's git config file
643 * 4) environment variables
644 * 5) global git config files (in user's home directory or /etc)
648 got_author = got_gotconfig_get_author(worktree_conf);
649 if (got_author == NULL)
650 got_author = got_gotconfig_get_author(repo_conf);
651 if (got_author == NULL) {
652 name = got_repo_get_gitconfig_author_name(repo);
653 email = got_repo_get_gitconfig_author_email(repo);
655 if (asprintf(author, "%s <%s>", name, email) == -1)
656 return got_error_from_errno("asprintf");
660 got_author = getenv("GOT_AUTHOR");
661 if (got_author == NULL) {
662 name = got_repo_get_global_gitconfig_author_name(repo);
663 email = got_repo_get_global_gitconfig_author_email(
666 if (asprintf(author, "%s <%s>", name, email)
668 return got_error_from_errno("asprintf");
671 /* TODO: Look up user in password database? */
672 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
676 *author = strdup(got_author);
678 return got_error_from_errno("strdup");
680 if (!valid_author(*author)) {
681 err = got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", *author);
688 static const struct got_error *
689 get_gitconfig_path(char **gitconfig_path)
691 const char *homedir = getenv("HOME");
693 *gitconfig_path = NULL;
695 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
696 return got_error_from_errno("asprintf");
702 static const struct got_error *
703 cmd_import(int argc, char *argv[])
705 const struct got_error *error = NULL;
706 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
707 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
708 const char *branch_name = "main";
709 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
710 struct got_repository *repo = NULL;
711 struct got_reference *branch_ref = NULL, *head_ref = NULL;
712 struct got_object_id *new_commit_id = NULL;
714 struct got_pathlist_head ignores;
715 struct got_pathlist_entry *pe;
716 int preserve_logmsg = 0;
717 int *pack_fds = NULL;
719 TAILQ_INIT(&ignores);
721 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
724 branch_name = optarg;
727 logmsg = strdup(optarg);
728 if (logmsg == NULL) {
729 error = got_error_from_errno("strdup");
734 repo_path = realpath(optarg, NULL);
735 if (repo_path == NULL) {
736 error = got_error_from_errno2("realpath",
742 if (optarg[0] == '\0')
744 error = got_pathlist_insert(&pe, &ignores, optarg,
759 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
767 if (repo_path == NULL) {
768 repo_path = getcwd(NULL, 0);
769 if (repo_path == NULL)
770 return got_error_from_errno("getcwd");
772 got_path_strip_trailing_slashes(repo_path);
773 error = get_gitconfig_path(&gitconfig_path);
776 error = got_repo_pack_fds_open(&pack_fds);
779 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
783 error = get_author(&author, repo, NULL);
788 * Don't let the user create a branch name with a leading '-'.
789 * While technically a valid reference name, this case is usually
790 * an unintended typo.
792 if (branch_name[0] == '-')
793 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
795 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
796 error = got_error_from_errno("asprintf");
800 error = got_ref_open(&branch_ref, repo, refname, 0);
802 if (error->code != GOT_ERR_NOT_REF)
805 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
806 "import target branch already exists");
810 path_dir = realpath(argv[0], NULL);
811 if (path_dir == NULL) {
812 error = got_error_from_errno2("realpath", argv[0]);
815 got_path_strip_trailing_slashes(path_dir);
818 * unveil(2) traverses exec(2); if an editor is used we have
819 * to apply unveil after the log message has been written.
821 if (logmsg == NULL || strlen(logmsg) == 0) {
822 error = get_editor(&editor);
826 error = collect_import_msg(&logmsg, &logmsg_path, editor,
829 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
836 if (unveil(path_dir, "r") != 0) {
837 error = got_error_from_errno2("unveil", path_dir);
843 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
850 error = got_repo_import(&new_commit_id, path_dir, logmsg,
851 author, &ignores, repo, import_progress, NULL);
858 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
865 error = got_ref_write(branch_ref, repo);
872 error = got_object_id_str(&id_str, new_commit_id);
879 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
881 if (error->code != GOT_ERR_NOT_REF) {
887 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
895 error = got_ref_write(head_ref, repo);
903 printf("Created branch %s with commit %s\n",
904 got_ref_get_name(branch_ref), id_str);
907 const struct got_error *pack_err =
908 got_repo_pack_fds_close(pack_fds);
912 if (preserve_logmsg) {
913 fprintf(stderr, "%s: log message preserved in %s\n",
914 getprogname(), logmsg_path);
915 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
916 error = got_error_from_errno2("unlink", logmsg_path);
925 free(gitconfig_path);
927 got_ref_close(branch_ref);
929 got_ref_close(head_ref);
936 fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
937 "[-R reference] repository-url [directory]\n", getprogname());
941 struct got_fetch_progress_arg {
942 char last_scaled_size[FMT_SCALED_STRSIZE];
947 struct got_repository *repo;
952 struct got_pathlist_head *symrefs;
953 struct got_pathlist_head *wanted_branches;
954 struct got_pathlist_head *wanted_refs;
958 const char *remote_repo_path;
960 int fetch_all_branches;
961 int mirror_references;
965 /* XXX forward declaration */
966 static const struct got_error *
967 create_config_files(const char *proto, const char *host, const char *port,
968 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
969 int mirror_references, struct got_pathlist_head *symrefs,
970 struct got_pathlist_head *wanted_branches,
971 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
973 static const struct got_error *
974 fetch_progress(void *arg, const char *message, off_t packfile_size,
975 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
977 const struct got_error *err = NULL;
978 struct got_fetch_progress_arg *a = arg;
979 char scaled_size[FMT_SCALED_STRSIZE];
980 int p_indexed, p_resolved;
981 int print_size = 0, print_indexed = 0, print_resolved = 0;
984 * In order to allow a failed clone to be resumed with 'got fetch'
985 * we try to create configuration files as soon as possible.
986 * Once the server has sent information about its default branch
987 * we have all required information.
989 if (a->create_configs && !a->configs_created &&
990 !TAILQ_EMPTY(a->config_info.symrefs)) {
991 err = create_config_files(a->config_info.proto,
992 a->config_info.host, a->config_info.port,
993 a->config_info.remote_repo_path,
994 a->config_info.git_url,
995 a->config_info.fetch_all_branches,
996 a->config_info.mirror_references,
997 a->config_info.symrefs,
998 a->config_info.wanted_branches,
999 a->config_info.wanted_refs, a->repo);
1002 a->configs_created = 1;
1005 if (a->verbosity < 0)
1008 if (message && message[0] != '\0') {
1009 printf("\rserver: %s", message);
1014 if (packfile_size > 0 || nobj_indexed > 0) {
1015 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1016 (a->last_scaled_size[0] == '\0' ||
1017 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1019 if (strlcpy(a->last_scaled_size, scaled_size,
1020 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1021 return got_error(GOT_ERR_NO_SPACE);
1023 if (nobj_indexed > 0) {
1024 p_indexed = (nobj_indexed * 100) / nobj_total;
1025 if (p_indexed != a->last_p_indexed) {
1026 a->last_p_indexed = p_indexed;
1031 if (nobj_resolved > 0) {
1032 p_resolved = (nobj_resolved * 100) /
1033 (nobj_total - nobj_loose);
1034 if (p_resolved != a->last_p_resolved) {
1035 a->last_p_resolved = p_resolved;
1043 if (print_size || print_indexed || print_resolved)
1046 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1048 printf("; indexing %d%%", p_indexed);
1050 printf("; resolving deltas %d%%", p_resolved);
1051 if (print_size || print_indexed || print_resolved)
1057 static const struct got_error *
1058 create_symref(const char *refname, struct got_reference *target_ref,
1059 int verbosity, struct got_repository *repo)
1061 const struct got_error *err;
1062 struct got_reference *head_symref;
1064 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1068 err = got_ref_write(head_symref, repo);
1069 if (err == NULL && verbosity > 0) {
1070 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1071 got_ref_get_name(target_ref));
1073 got_ref_close(head_symref);
1077 static const struct got_error *
1078 list_remote_refs(struct got_pathlist_head *symrefs,
1079 struct got_pathlist_head *refs)
1081 const struct got_error *err;
1082 struct got_pathlist_entry *pe;
1084 TAILQ_FOREACH(pe, symrefs, entry) {
1085 const char *refname = pe->path;
1086 const char *targetref = pe->data;
1088 printf("%s: %s\n", refname, targetref);
1091 TAILQ_FOREACH(pe, refs, entry) {
1092 const char *refname = pe->path;
1093 struct got_object_id *id = pe->data;
1096 err = got_object_id_str(&id_str, id);
1099 printf("%s: %s\n", refname, id_str);
1106 static const struct got_error *
1107 create_ref(const char *refname, struct got_object_id *id,
1108 int verbosity, struct got_repository *repo)
1110 const struct got_error *err = NULL;
1111 struct got_reference *ref;
1114 err = got_object_id_str(&id_str, id);
1118 err = got_ref_alloc(&ref, refname, id);
1122 err = got_ref_write(ref, repo);
1125 if (err == NULL && verbosity >= 0)
1126 printf("Created reference %s: %s\n", refname, id_str);
1133 match_wanted_ref(const char *refname, const char *wanted_ref)
1135 if (strncmp(refname, "refs/", 5) != 0)
1140 * Prevent fetching of references that won't make any
1141 * sense outside of the remote repository's context.
1143 if (strncmp(refname, "got/", 4) == 0)
1145 if (strncmp(refname, "remotes/", 8) == 0)
1148 if (strncmp(wanted_ref, "refs/", 5) == 0)
1151 /* Allow prefix match. */
1152 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1155 /* Allow exact match. */
1156 return (strcmp(refname, wanted_ref) == 0);
1160 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1162 struct got_pathlist_entry *pe;
1164 TAILQ_FOREACH(pe, wanted_refs, entry) {
1165 if (match_wanted_ref(refname, pe->path))
1172 static const struct got_error *
1173 create_wanted_ref(const char *refname, struct got_object_id *id,
1174 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1176 const struct got_error *err;
1177 char *remote_refname;
1179 if (strncmp("refs/", refname, 5) == 0)
1182 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1183 remote_repo_name, refname) == -1)
1184 return got_error_from_errno("asprintf");
1186 err = create_ref(remote_refname, id, verbosity, repo);
1187 free(remote_refname);
1191 static const struct got_error *
1192 create_gotconfig(const char *proto, const char *host, const char *port,
1193 const char *remote_repo_path, const char *default_branch,
1194 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1195 struct got_pathlist_head *wanted_refs, int mirror_references,
1196 struct got_repository *repo)
1198 const struct got_error *err = NULL;
1199 char *gotconfig_path = NULL;
1200 char *gotconfig = NULL;
1201 FILE *gotconfig_file = NULL;
1202 const char *branchname = NULL;
1203 char *branches = NULL, *refs = NULL;
1206 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1207 struct got_pathlist_entry *pe;
1208 TAILQ_FOREACH(pe, wanted_branches, entry) {
1210 branchname = pe->path;
1211 if (strncmp(branchname, "refs/heads/", 11) == 0)
1213 if (asprintf(&s, "%s\"%s\" ",
1214 branches ? branches : "", branchname) == -1) {
1215 err = got_error_from_errno("asprintf");
1221 } else if (!fetch_all_branches && default_branch) {
1222 branchname = default_branch;
1223 if (strncmp(branchname, "refs/heads/", 11) == 0)
1225 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1226 err = got_error_from_errno("asprintf");
1230 if (!TAILQ_EMPTY(wanted_refs)) {
1231 struct got_pathlist_entry *pe;
1232 TAILQ_FOREACH(pe, wanted_refs, entry) {
1234 const char *refname = pe->path;
1235 if (strncmp(refname, "refs/", 5) == 0)
1237 if (asprintf(&s, "%s\"%s\" ",
1238 refs ? refs : "", refname) == -1) {
1239 err = got_error_from_errno("asprintf");
1247 /* Create got.conf(5). */
1248 gotconfig_path = got_repo_get_path_gotconfig(repo);
1249 if (gotconfig_path == NULL) {
1250 err = got_error_from_errno("got_repo_get_path_gotconfig");
1253 gotconfig_file = fopen(gotconfig_path, "ae");
1254 if (gotconfig_file == NULL) {
1255 err = got_error_from_errno2("fopen", gotconfig_path);
1258 if (asprintf(&gotconfig,
1263 "\trepository \"%s\"\n"
1269 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1270 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1271 remote_repo_path, branches ? "\tbranch { " : "",
1272 branches ? branches : "", branches ? "}\n" : "",
1273 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1274 mirror_references ? "\tmirror-references yes\n" : "",
1275 fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1276 err = got_error_from_errno("asprintf");
1279 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1280 if (n != strlen(gotconfig)) {
1281 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1286 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1287 err = got_error_from_errno2("fclose", gotconfig_path);
1288 free(gotconfig_path);
1293 static const struct got_error *
1294 create_gitconfig(const char *git_url, const char *default_branch,
1295 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1296 struct got_pathlist_head *wanted_refs, int mirror_references,
1297 struct got_repository *repo)
1299 const struct got_error *err = NULL;
1300 char *gitconfig_path = NULL;
1301 char *gitconfig = NULL;
1302 FILE *gitconfig_file = NULL;
1303 char *branches = NULL, *refs = NULL;
1304 const char *branchname;
1307 /* Create a config file Git can understand. */
1308 gitconfig_path = got_repo_get_path_gitconfig(repo);
1309 if (gitconfig_path == NULL) {
1310 err = got_error_from_errno("got_repo_get_path_gitconfig");
1313 gitconfig_file = fopen(gitconfig_path, "ae");
1314 if (gitconfig_file == NULL) {
1315 err = got_error_from_errno2("fopen", gitconfig_path);
1318 if (fetch_all_branches) {
1319 if (mirror_references) {
1320 if (asprintf(&branches,
1321 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1322 err = got_error_from_errno("asprintf");
1325 } else if (asprintf(&branches,
1326 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1327 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1328 err = got_error_from_errno("asprintf");
1331 } else if (!TAILQ_EMPTY(wanted_branches)) {
1332 struct got_pathlist_entry *pe;
1333 TAILQ_FOREACH(pe, wanted_branches, entry) {
1335 branchname = pe->path;
1336 if (strncmp(branchname, "refs/heads/", 11) == 0)
1338 if (mirror_references) {
1340 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1341 branches ? branches : "",
1342 branchname, branchname) == -1) {
1343 err = got_error_from_errno("asprintf");
1346 } else if (asprintf(&s,
1347 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1348 branches ? branches : "",
1349 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1350 branchname) == -1) {
1351 err = got_error_from_errno("asprintf");
1359 * If the server specified a default branch, use just that one.
1360 * Otherwise fall back to fetching all branches on next fetch.
1362 if (default_branch) {
1363 branchname = default_branch;
1364 if (strncmp(branchname, "refs/heads/", 11) == 0)
1367 branchname = "*"; /* fall back to all branches */
1368 if (mirror_references) {
1369 if (asprintf(&branches,
1370 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1371 branchname, branchname) == -1) {
1372 err = got_error_from_errno("asprintf");
1375 } else if (asprintf(&branches,
1376 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1377 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1378 branchname) == -1) {
1379 err = got_error_from_errno("asprintf");
1383 if (!TAILQ_EMPTY(wanted_refs)) {
1384 struct got_pathlist_entry *pe;
1385 TAILQ_FOREACH(pe, wanted_refs, entry) {
1387 const char *refname = pe->path;
1388 if (strncmp(refname, "refs/", 5) == 0)
1390 if (mirror_references) {
1392 "%s\tfetch = refs/%s:refs/%s\n",
1393 refs ? refs : "", refname, refname) == -1) {
1394 err = got_error_from_errno("asprintf");
1397 } else if (asprintf(&s,
1398 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1400 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1402 err = got_error_from_errno("asprintf");
1410 if (asprintf(&gitconfig,
1415 "\tfetch = refs/tags/*:refs/tags/*\n",
1416 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1417 refs ? refs : "") == -1) {
1418 err = got_error_from_errno("asprintf");
1421 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1422 if (n != strlen(gitconfig)) {
1423 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1427 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1428 err = got_error_from_errno2("fclose", gitconfig_path);
1429 free(gitconfig_path);
1434 static const struct got_error *
1435 create_config_files(const char *proto, const char *host, const char *port,
1436 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1437 int mirror_references, struct got_pathlist_head *symrefs,
1438 struct got_pathlist_head *wanted_branches,
1439 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1441 const struct got_error *err = NULL;
1442 const char *default_branch = NULL;
1443 struct got_pathlist_entry *pe;
1446 * If we asked for a set of wanted branches then use the first
1449 if (!TAILQ_EMPTY(wanted_branches)) {
1450 pe = TAILQ_FIRST(wanted_branches);
1451 default_branch = pe->path;
1453 /* First HEAD ref listed by server is the default branch. */
1454 TAILQ_FOREACH(pe, symrefs, entry) {
1455 const char *refname = pe->path;
1456 const char *target = pe->data;
1458 if (strcmp(refname, GOT_REF_HEAD) != 0)
1461 default_branch = target;
1466 /* Create got.conf(5). */
1467 err = create_gotconfig(proto, host, port, remote_repo_path,
1468 default_branch, fetch_all_branches, wanted_branches,
1469 wanted_refs, mirror_references, repo);
1473 /* Create a config file Git can understand. */
1474 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1475 wanted_branches, wanted_refs, mirror_references, repo);
1478 static const struct got_error *
1479 cmd_clone(int argc, char *argv[])
1481 const struct got_error *error = NULL;
1482 const char *uri, *dirname;
1483 char *proto, *host, *port, *repo_name, *server_path;
1484 char *default_destdir = NULL, *id_str = NULL;
1485 const char *repo_path;
1486 struct got_repository *repo = NULL;
1487 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1488 struct got_pathlist_entry *pe;
1489 struct got_object_id *pack_hash = NULL;
1490 int ch, fetchfd = -1, fetchstatus;
1491 pid_t fetchpid = -1;
1492 struct got_fetch_progress_arg fpa;
1493 char *git_url = NULL;
1494 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1495 int list_refs_only = 0;
1496 int *pack_fds = NULL;
1499 TAILQ_INIT(&symrefs);
1500 TAILQ_INIT(&wanted_branches);
1501 TAILQ_INIT(&wanted_refs);
1503 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1506 fetch_all_branches = 1;
1509 error = got_pathlist_append(&wanted_branches,
1518 mirror_references = 1;
1523 else if (verbosity < 3)
1530 error = got_pathlist_append(&wanted_refs,
1543 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1544 option_conflict('a', 'b');
1545 if (list_refs_only) {
1546 if (!TAILQ_EMPTY(&wanted_branches))
1547 option_conflict('l', 'b');
1548 if (fetch_all_branches)
1549 option_conflict('l', 'a');
1550 if (mirror_references)
1551 option_conflict('l', 'm');
1552 if (!TAILQ_EMPTY(&wanted_refs))
1553 option_conflict('l', 'R');
1565 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1570 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1571 host, port ? ":" : "", port ? port : "",
1572 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1573 error = got_error_from_errno("asprintf");
1577 if (strcmp(proto, "git") == 0) {
1579 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1580 "sendfd dns inet unveil", NULL) == -1)
1583 } else if (strcmp(proto, "git+ssh") == 0 ||
1584 strcmp(proto, "ssh") == 0) {
1586 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1587 "sendfd unveil", NULL) == -1)
1590 } else if (strcmp(proto, "http") == 0 ||
1591 strcmp(proto, "git+http") == 0) {
1592 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1595 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1598 if (dirname == NULL) {
1599 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1600 error = got_error_from_errno("asprintf");
1603 repo_path = default_destdir;
1605 repo_path = dirname;
1607 if (!list_refs_only) {
1608 error = got_path_mkdir(repo_path);
1610 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1611 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1613 if (!got_path_dir_is_empty(repo_path)) {
1614 error = got_error_path(repo_path,
1615 GOT_ERR_DIR_NOT_EMPTY);
1620 error = got_dial_apply_unveil(proto);
1624 error = apply_unveil(repo_path, 0, NULL);
1629 printf("Connecting to %s%s%s\n", host,
1630 port ? ":" : "", port ? port : "");
1632 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1633 server_path, verbosity);
1637 if (!list_refs_only) {
1638 error = got_repo_init(repo_path);
1641 error = got_repo_pack_fds_open(&pack_fds);
1644 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1649 fpa.last_scaled_size[0] = '\0';
1650 fpa.last_p_indexed = -1;
1651 fpa.last_p_resolved = -1;
1652 fpa.verbosity = verbosity;
1653 fpa.create_configs = 1;
1654 fpa.configs_created = 0;
1656 fpa.config_info.symrefs = &symrefs;
1657 fpa.config_info.wanted_branches = &wanted_branches;
1658 fpa.config_info.wanted_refs = &wanted_refs;
1659 fpa.config_info.proto = proto;
1660 fpa.config_info.host = host;
1661 fpa.config_info.port = port;
1662 fpa.config_info.remote_repo_path = server_path;
1663 fpa.config_info.git_url = git_url;
1664 fpa.config_info.fetch_all_branches = fetch_all_branches;
1665 fpa.config_info.mirror_references = mirror_references;
1666 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1667 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1668 fetch_all_branches, &wanted_branches, &wanted_refs,
1669 list_refs_only, verbosity, fetchfd, repo,
1670 fetch_progress, &fpa);
1674 if (list_refs_only) {
1675 error = list_remote_refs(&symrefs, &refs);
1679 if (pack_hash == NULL) {
1680 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1681 "server sent an empty pack file");
1684 error = got_object_id_str(&id_str, pack_hash);
1688 printf("\nFetched %s.pack\n", id_str);
1691 /* Set up references provided with the pack file. */
1692 TAILQ_FOREACH(pe, &refs, entry) {
1693 const char *refname = pe->path;
1694 struct got_object_id *id = pe->data;
1695 char *remote_refname;
1697 if (is_wanted_ref(&wanted_refs, refname) &&
1698 !mirror_references) {
1699 error = create_wanted_ref(refname, id,
1700 GOT_FETCH_DEFAULT_REMOTE_NAME,
1701 verbosity - 1, repo);
1707 error = create_ref(refname, id, verbosity - 1, repo);
1711 if (mirror_references)
1714 if (strncmp("refs/heads/", refname, 11) != 0)
1717 if (asprintf(&remote_refname,
1718 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1719 refname + 11) == -1) {
1720 error = got_error_from_errno("asprintf");
1723 error = create_ref(remote_refname, id, verbosity - 1, repo);
1724 free(remote_refname);
1729 /* Set the HEAD reference if the server provided one. */
1730 TAILQ_FOREACH(pe, &symrefs, entry) {
1731 struct got_reference *target_ref;
1732 const char *refname = pe->path;
1733 const char *target = pe->data;
1734 char *remote_refname = NULL, *remote_target = NULL;
1736 if (strcmp(refname, GOT_REF_HEAD) != 0)
1739 error = got_ref_open(&target_ref, repo, target, 0);
1741 if (error->code == GOT_ERR_NOT_REF) {
1748 error = create_symref(refname, target_ref, verbosity, repo);
1749 got_ref_close(target_ref);
1753 if (mirror_references)
1756 if (strncmp("refs/heads/", target, 11) != 0)
1759 if (asprintf(&remote_refname,
1760 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1762 error = got_error_from_errno("asprintf");
1765 if (asprintf(&remote_target,
1766 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1767 target + 11) == -1) {
1768 error = got_error_from_errno("asprintf");
1769 free(remote_refname);
1772 error = got_ref_open(&target_ref, repo, remote_target, 0);
1774 free(remote_refname);
1775 free(remote_target);
1776 if (error->code == GOT_ERR_NOT_REF) {
1782 error = create_symref(remote_refname, target_ref,
1783 verbosity - 1, repo);
1784 free(remote_refname);
1785 free(remote_target);
1786 got_ref_close(target_ref);
1792 * We failed to set the HEAD reference. If we asked for
1793 * a set of wanted branches use the first of one of those
1794 * which could be fetched instead.
1796 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1797 const char *target = pe->path;
1798 struct got_reference *target_ref;
1800 error = got_ref_open(&target_ref, repo, target, 0);
1802 if (error->code == GOT_ERR_NOT_REF) {
1809 error = create_symref(GOT_REF_HEAD, target_ref,
1811 got_ref_close(target_ref);
1819 printf("Created %s repository '%s'\n",
1820 mirror_references ? "mirrored" : "cloned", repo_path);
1823 const struct got_error *pack_err =
1824 got_repo_pack_fds_close(pack_fds);
1829 if (kill(fetchpid, SIGTERM) == -1)
1830 error = got_error_from_errno("kill");
1831 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1832 error = got_error_from_errno("waitpid");
1834 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1835 error = got_error_from_errno("close");
1837 const struct got_error *close_err = got_repo_close(repo);
1841 TAILQ_FOREACH(pe, &refs, entry) {
1842 free((void *)pe->path);
1845 got_pathlist_free(&refs);
1846 TAILQ_FOREACH(pe, &symrefs, entry) {
1847 free((void *)pe->path);
1850 got_pathlist_free(&symrefs);
1851 got_pathlist_free(&wanted_branches);
1852 got_pathlist_free(&wanted_refs);
1859 free(default_destdir);
1864 static const struct got_error *
1865 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1866 int replace_tags, int verbosity, struct got_repository *repo)
1868 const struct got_error *err = NULL;
1869 char *new_id_str = NULL;
1870 struct got_object_id *old_id = NULL;
1872 err = got_object_id_str(&new_id_str, new_id);
1876 if (!replace_tags &&
1877 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1878 err = got_ref_resolve(&old_id, repo, ref);
1881 if (got_object_id_cmp(old_id, new_id) == 0)
1883 if (verbosity >= 0) {
1884 printf("Rejecting update of existing tag %s: %s\n",
1885 got_ref_get_name(ref), new_id_str);
1890 if (got_ref_is_symbolic(ref)) {
1891 if (verbosity >= 0) {
1892 printf("Replacing reference %s: %s\n",
1893 got_ref_get_name(ref),
1894 got_ref_get_symref_target(ref));
1896 err = got_ref_change_symref_to_ref(ref, new_id);
1899 err = got_ref_write(ref, repo);
1903 err = got_ref_resolve(&old_id, repo, ref);
1906 if (got_object_id_cmp(old_id, new_id) == 0)
1909 err = got_ref_change_ref(ref, new_id);
1912 err = got_ref_write(ref, repo);
1918 printf("Updated %s: %s\n", got_ref_get_name(ref),
1926 static const struct got_error *
1927 update_symref(const char *refname, struct got_reference *target_ref,
1928 int verbosity, struct got_repository *repo)
1930 const struct got_error *err = NULL, *unlock_err;
1931 struct got_reference *symref;
1932 int symref_is_locked = 0;
1934 err = got_ref_open(&symref, repo, refname, 1);
1936 if (err->code != GOT_ERR_NOT_REF)
1938 err = got_ref_alloc_symref(&symref, refname, target_ref);
1942 err = got_ref_write(symref, repo);
1947 printf("Created reference %s: %s\n",
1948 got_ref_get_name(symref),
1949 got_ref_get_symref_target(symref));
1951 symref_is_locked = 1;
1953 if (strcmp(got_ref_get_symref_target(symref),
1954 got_ref_get_name(target_ref)) == 0)
1957 err = got_ref_change_symref(symref,
1958 got_ref_get_name(target_ref));
1962 err = got_ref_write(symref, repo);
1967 printf("Updated %s: %s\n", got_ref_get_name(symref),
1968 got_ref_get_symref_target(symref));
1972 if (symref_is_locked) {
1973 unlock_err = got_ref_unlock(symref);
1974 if (unlock_err && err == NULL)
1977 got_ref_close(symref);
1984 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1985 "[-r repository-path] [-t] [-q] [-v] [-R reference] [-X] "
1986 "[remote-repository-name]\n",
1991 static const struct got_error *
1992 delete_missing_ref(struct got_reference *ref,
1993 int verbosity, struct got_repository *repo)
1995 const struct got_error *err = NULL;
1996 struct got_object_id *id = NULL;
1997 char *id_str = NULL;
1999 if (got_ref_is_symbolic(ref)) {
2000 err = got_ref_delete(ref, repo);
2003 if (verbosity >= 0) {
2004 printf("Deleted %s: %s\n",
2005 got_ref_get_name(ref),
2006 got_ref_get_symref_target(ref));
2009 err = got_ref_resolve(&id, repo, ref);
2012 err = got_object_id_str(&id_str, id);
2016 err = got_ref_delete(ref, repo);
2019 if (verbosity >= 0) {
2020 printf("Deleted %s: %s\n",
2021 got_ref_get_name(ref), id_str);
2030 static const struct got_error *
2031 delete_missing_refs(struct got_pathlist_head *their_refs,
2032 struct got_pathlist_head *their_symrefs,
2033 const struct got_remote_repo *remote,
2034 int verbosity, struct got_repository *repo)
2036 const struct got_error *err = NULL, *unlock_err;
2037 struct got_reflist_head my_refs;
2038 struct got_reflist_entry *re;
2039 struct got_pathlist_entry *pe;
2040 char *remote_namespace = NULL;
2041 char *local_refname = NULL;
2043 TAILQ_INIT(&my_refs);
2045 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2047 return got_error_from_errno("asprintf");
2049 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2053 TAILQ_FOREACH(re, &my_refs, entry) {
2054 const char *refname = got_ref_get_name(re->ref);
2055 const char *their_refname;
2057 if (remote->mirror_references) {
2058 their_refname = refname;
2060 if (strncmp(refname, remote_namespace,
2061 strlen(remote_namespace)) == 0) {
2062 if (strcmp(refname + strlen(remote_namespace),
2065 if (asprintf(&local_refname, "refs/heads/%s",
2066 refname + strlen(remote_namespace)) == -1) {
2067 err = got_error_from_errno("asprintf");
2070 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2073 their_refname = local_refname;
2076 TAILQ_FOREACH(pe, their_refs, entry) {
2077 if (strcmp(their_refname, pe->path) == 0)
2083 TAILQ_FOREACH(pe, their_symrefs, entry) {
2084 if (strcmp(their_refname, pe->path) == 0)
2090 err = delete_missing_ref(re->ref, verbosity, repo);
2094 if (local_refname) {
2095 struct got_reference *ref;
2096 err = got_ref_open(&ref, repo, local_refname, 1);
2098 if (err->code != GOT_ERR_NOT_REF)
2100 free(local_refname);
2101 local_refname = NULL;
2104 err = delete_missing_ref(ref, verbosity, repo);
2107 unlock_err = got_ref_unlock(ref);
2109 if (unlock_err && err == NULL) {
2114 free(local_refname);
2115 local_refname = NULL;
2119 free(remote_namespace);
2120 free(local_refname);
2124 static const struct got_error *
2125 update_wanted_ref(const char *refname, struct got_object_id *id,
2126 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2128 const struct got_error *err, *unlock_err;
2129 char *remote_refname;
2130 struct got_reference *ref;
2132 if (strncmp("refs/", refname, 5) == 0)
2135 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2136 remote_repo_name, refname) == -1)
2137 return got_error_from_errno("asprintf");
2139 err = got_ref_open(&ref, repo, remote_refname, 1);
2141 if (err->code != GOT_ERR_NOT_REF)
2143 err = create_ref(remote_refname, id, verbosity, repo);
2145 err = update_ref(ref, id, 0, verbosity, repo);
2146 unlock_err = got_ref_unlock(ref);
2147 if (unlock_err && err == NULL)
2152 free(remote_refname);
2156 static const struct got_error *
2157 delete_ref(struct got_repository *repo, struct got_reference *ref)
2159 const struct got_error *err = NULL;
2160 struct got_object_id *id = NULL;
2161 char *id_str = NULL;
2164 if (got_ref_is_symbolic(ref)) {
2165 target = got_ref_get_symref_target(ref);
2167 err = got_ref_resolve(&id, repo, ref);
2170 err = got_object_id_str(&id_str, id);
2176 err = got_ref_delete(ref, repo);
2180 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2187 static const struct got_error *
2188 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2190 const struct got_error *err = NULL;
2191 struct got_reflist_head refs;
2192 struct got_reflist_entry *re;
2197 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2198 err = got_error_from_errno("asprintf");
2201 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2205 TAILQ_FOREACH(re, &refs, entry)
2206 delete_ref(repo, re->ref);
2208 got_ref_list_free(&refs);
2212 static const struct got_error *
2213 cmd_fetch(int argc, char *argv[])
2215 const struct got_error *error = NULL, *unlock_err;
2216 char *cwd = NULL, *repo_path = NULL;
2217 const char *remote_name;
2218 char *proto = NULL, *host = NULL, *port = NULL;
2219 char *repo_name = NULL, *server_path = NULL;
2220 const struct got_remote_repo *remotes, *remote = NULL;
2222 char *id_str = NULL;
2223 struct got_repository *repo = NULL;
2224 struct got_worktree *worktree = NULL;
2225 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2226 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2227 struct got_pathlist_entry *pe;
2228 struct got_object_id *pack_hash = NULL;
2229 int i, ch, fetchfd = -1, fetchstatus;
2230 pid_t fetchpid = -1;
2231 struct got_fetch_progress_arg fpa;
2232 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2233 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2234 int *pack_fds = NULL;
2237 TAILQ_INIT(&symrefs);
2238 TAILQ_INIT(&wanted_branches);
2239 TAILQ_INIT(&wanted_refs);
2241 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:X")) != -1) {
2244 fetch_all_branches = 1;
2247 error = got_pathlist_append(&wanted_branches,
2259 repo_path = realpath(optarg, NULL);
2260 if (repo_path == NULL)
2261 return got_error_from_errno2("realpath",
2263 got_path_strip_trailing_slashes(repo_path);
2271 else if (verbosity < 3)
2278 error = got_pathlist_append(&wanted_refs,
2294 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2295 option_conflict('a', 'b');
2296 if (list_refs_only) {
2297 if (!TAILQ_EMPTY(&wanted_branches))
2298 option_conflict('l', 'b');
2299 if (fetch_all_branches)
2300 option_conflict('l', 'a');
2302 option_conflict('l', 'd');
2304 option_conflict('l', 'X');
2306 if (delete_remote) {
2307 if (fetch_all_branches)
2308 option_conflict('X', 'a');
2309 if (!TAILQ_EMPTY(&wanted_branches))
2310 option_conflict('X', 'b');
2312 option_conflict('X', 'd');
2314 option_conflict('X', 't');
2315 if (!TAILQ_EMPTY(&wanted_refs))
2316 option_conflict('X', 'R');
2321 errx(1, "-X option requires a remote name");
2322 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2323 } else if (argc == 1)
2324 remote_name = argv[0];
2328 cwd = getcwd(NULL, 0);
2330 error = got_error_from_errno("getcwd");
2334 error = got_repo_pack_fds_open(&pack_fds);
2338 if (repo_path == NULL) {
2339 error = got_worktree_open(&worktree, cwd);
2340 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2346 strdup(got_worktree_get_repo_path(worktree));
2347 if (repo_path == NULL)
2348 error = got_error_from_errno("strdup");
2352 repo_path = strdup(cwd);
2353 if (repo_path == NULL) {
2354 error = got_error_from_errno("strdup");
2360 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2364 if (delete_remote) {
2365 error = delete_refs_for_remote(repo, remote_name);
2366 goto done; /* nothing else to do */
2370 worktree_conf = got_worktree_get_gotconfig(worktree);
2371 if (worktree_conf) {
2372 got_gotconfig_get_remotes(&nremotes, &remotes,
2374 for (i = 0; i < nremotes; i++) {
2375 if (strcmp(remotes[i].name, remote_name) == 0) {
2376 remote = &remotes[i];
2382 if (remote == NULL) {
2383 repo_conf = got_repo_get_gotconfig(repo);
2385 got_gotconfig_get_remotes(&nremotes, &remotes,
2387 for (i = 0; i < nremotes; i++) {
2388 if (strcmp(remotes[i].name, remote_name) == 0) {
2389 remote = &remotes[i];
2395 if (remote == NULL) {
2396 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2397 for (i = 0; i < nremotes; i++) {
2398 if (strcmp(remotes[i].name, remote_name) == 0) {
2399 remote = &remotes[i];
2404 if (remote == NULL) {
2405 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2409 if (TAILQ_EMPTY(&wanted_branches)) {
2410 if (!fetch_all_branches)
2411 fetch_all_branches = remote->fetch_all_branches;
2412 for (i = 0; i < remote->nfetch_branches; i++) {
2413 got_pathlist_append(&wanted_branches,
2414 remote->fetch_branches[i], NULL);
2417 if (TAILQ_EMPTY(&wanted_refs)) {
2418 for (i = 0; i < remote->nfetch_refs; i++) {
2419 got_pathlist_append(&wanted_refs,
2420 remote->fetch_refs[i], NULL);
2424 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2425 &repo_name, remote->fetch_url);
2429 if (strcmp(proto, "git") == 0) {
2431 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2432 "sendfd dns inet unveil", NULL) == -1)
2435 } else if (strcmp(proto, "git+ssh") == 0 ||
2436 strcmp(proto, "ssh") == 0) {
2438 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2439 "sendfd unveil", NULL) == -1)
2442 } else if (strcmp(proto, "http") == 0 ||
2443 strcmp(proto, "git+http") == 0) {
2444 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2447 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2451 error = got_dial_apply_unveil(proto);
2455 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2460 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2461 port ? ":" : "", port ? port : "");
2463 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2464 server_path, verbosity);
2468 fpa.last_scaled_size[0] = '\0';
2469 fpa.last_p_indexed = -1;
2470 fpa.last_p_resolved = -1;
2471 fpa.verbosity = verbosity;
2473 fpa.create_configs = 0;
2474 fpa.configs_created = 0;
2475 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2476 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2477 remote->mirror_references, fetch_all_branches, &wanted_branches,
2478 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2479 fetch_progress, &fpa);
2483 if (list_refs_only) {
2484 error = list_remote_refs(&symrefs, &refs);
2488 if (pack_hash == NULL) {
2490 printf("Already up-to-date\n");
2491 } else if (verbosity >= 0) {
2492 error = got_object_id_str(&id_str, pack_hash);
2495 printf("\nFetched %s.pack\n", id_str);
2500 /* Update references provided with the pack file. */
2501 TAILQ_FOREACH(pe, &refs, entry) {
2502 const char *refname = pe->path;
2503 struct got_object_id *id = pe->data;
2504 struct got_reference *ref;
2505 char *remote_refname;
2507 if (is_wanted_ref(&wanted_refs, refname) &&
2508 !remote->mirror_references) {
2509 error = update_wanted_ref(refname, id,
2510 remote->name, verbosity, repo);
2516 if (remote->mirror_references ||
2517 strncmp("refs/tags/", refname, 10) == 0) {
2518 error = got_ref_open(&ref, repo, refname, 1);
2520 if (error->code != GOT_ERR_NOT_REF)
2522 error = create_ref(refname, id, verbosity,
2527 error = update_ref(ref, id, replace_tags,
2529 unlock_err = got_ref_unlock(ref);
2530 if (unlock_err && error == NULL)
2536 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2537 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2538 remote_name, refname + 11) == -1) {
2539 error = got_error_from_errno("asprintf");
2543 error = got_ref_open(&ref, repo, remote_refname, 1);
2545 if (error->code != GOT_ERR_NOT_REF)
2547 error = create_ref(remote_refname, id,
2552 error = update_ref(ref, id, replace_tags,
2554 unlock_err = got_ref_unlock(ref);
2555 if (unlock_err && error == NULL)
2562 /* Also create a local branch if none exists yet. */
2563 error = got_ref_open(&ref, repo, refname, 1);
2565 if (error->code != GOT_ERR_NOT_REF)
2567 error = create_ref(refname, id, verbosity,
2572 unlock_err = got_ref_unlock(ref);
2573 if (unlock_err && error == NULL)
2580 error = delete_missing_refs(&refs, &symrefs, remote,
2586 if (!remote->mirror_references) {
2587 /* Update remote HEAD reference if the server provided one. */
2588 TAILQ_FOREACH(pe, &symrefs, entry) {
2589 struct got_reference *target_ref;
2590 const char *refname = pe->path;
2591 const char *target = pe->data;
2592 char *remote_refname = NULL, *remote_target = NULL;
2594 if (strcmp(refname, GOT_REF_HEAD) != 0)
2597 if (strncmp("refs/heads/", target, 11) != 0)
2600 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2601 remote->name, refname) == -1) {
2602 error = got_error_from_errno("asprintf");
2605 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2606 remote->name, target + 11) == -1) {
2607 error = got_error_from_errno("asprintf");
2608 free(remote_refname);
2612 error = got_ref_open(&target_ref, repo, remote_target,
2615 free(remote_refname);
2616 free(remote_target);
2617 if (error->code == GOT_ERR_NOT_REF) {
2623 error = update_symref(remote_refname, target_ref,
2625 free(remote_refname);
2626 free(remote_target);
2627 got_ref_close(target_ref);
2634 if (kill(fetchpid, SIGTERM) == -1)
2635 error = got_error_from_errno("kill");
2636 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2637 error = got_error_from_errno("waitpid");
2639 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2640 error = got_error_from_errno("close");
2642 const struct got_error *close_err = got_repo_close(repo);
2647 got_worktree_close(worktree);
2649 const struct got_error *pack_err =
2650 got_repo_pack_fds_close(pack_fds);
2654 TAILQ_FOREACH(pe, &refs, entry) {
2655 free((void *)pe->path);
2658 got_pathlist_free(&refs);
2659 TAILQ_FOREACH(pe, &symrefs, entry) {
2660 free((void *)pe->path);
2663 got_pathlist_free(&symrefs);
2664 got_pathlist_free(&wanted_branches);
2665 got_pathlist_free(&wanted_refs);
2680 usage_checkout(void)
2682 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2683 "[-p prefix] [-q] repository-path [worktree-path]\n",
2689 show_worktree_base_ref_warning(void)
2691 fprintf(stderr, "%s: warning: could not create a reference "
2692 "to the work tree's base commit; the commit could be "
2693 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2694 "repository writable and running 'got update' will prevent this\n",
2698 struct got_checkout_progress_arg {
2699 const char *worktree_path;
2700 int had_base_commit_ref_error;
2704 static const struct got_error *
2705 checkout_progress(void *arg, unsigned char status, const char *path)
2707 struct got_checkout_progress_arg *a = arg;
2709 /* Base commit bump happens silently. */
2710 if (status == GOT_STATUS_BUMP_BASE)
2713 if (status == GOT_STATUS_BASE_REF_ERR) {
2714 a->had_base_commit_ref_error = 1;
2718 while (path[0] == '/')
2721 if (a->verbosity >= 0)
2722 printf("%c %s/%s\n", status, a->worktree_path, path);
2727 static const struct got_error *
2728 check_cancelled(void *arg)
2730 if (sigint_received || sigpipe_received)
2731 return got_error(GOT_ERR_CANCELLED);
2735 static const struct got_error *
2736 check_linear_ancestry(struct got_object_id *commit_id,
2737 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2738 struct got_repository *repo)
2740 const struct got_error *err = NULL;
2741 struct got_object_id *yca_id;
2743 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2744 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2749 return got_error(GOT_ERR_ANCESTRY);
2752 * Require a straight line of history between the target commit
2753 * and the work tree's base commit.
2755 * Non-linear situations such as this require a rebase:
2757 * (commit) D F (base_commit)
2765 * 'got update' only handles linear cases:
2766 * Update forwards in time: A (base/yca) - B - C - D (commit)
2767 * Update backwards in time: D (base) - C - B - A (commit/yca)
2769 if (allow_forwards_in_time_only) {
2770 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2771 return got_error(GOT_ERR_ANCESTRY);
2772 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2773 got_object_id_cmp(base_commit_id, yca_id) != 0)
2774 return got_error(GOT_ERR_ANCESTRY);
2780 static const struct got_error *
2781 check_same_branch(struct got_object_id *commit_id,
2782 struct got_reference *head_ref, struct got_object_id *yca_id,
2783 struct got_repository *repo)
2785 const struct got_error *err = NULL;
2786 struct got_commit_graph *graph = NULL;
2787 struct got_object_id *head_commit_id = NULL;
2788 int is_same_branch = 0;
2790 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2794 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2798 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2803 err = got_commit_graph_open(&graph, "/", 1);
2807 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2808 check_cancelled, NULL);
2813 struct got_object_id *id;
2814 err = got_commit_graph_iter_next(&id, graph, repo,
2815 check_cancelled, NULL);
2817 if (err->code == GOT_ERR_ITER_COMPLETED)
2823 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2825 if (got_object_id_cmp(id, commit_id) == 0) {
2833 got_commit_graph_close(graph);
2834 free(head_commit_id);
2835 if (!err && !is_same_branch)
2836 err = got_error(GOT_ERR_ANCESTRY);
2840 static const struct got_error *
2841 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2843 static char msg[512];
2844 const char *branch_name;
2846 if (got_ref_is_symbolic(ref))
2847 branch_name = got_ref_get_symref_target(ref);
2849 branch_name = got_ref_get_name(ref);
2851 if (strncmp("refs/heads/", branch_name, 11) == 0)
2854 snprintf(msg, sizeof(msg),
2855 "target commit is not contained in branch '%s'; "
2856 "the branch to use must be specified with -b; "
2857 "if necessary a new branch can be created for "
2858 "this commit with 'got branch -c %s BRANCH_NAME'",
2859 branch_name, commit_id_str);
2861 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2864 static const struct got_error *
2865 cmd_checkout(int argc, char *argv[])
2867 const struct got_error *error = NULL;
2868 struct got_repository *repo = NULL;
2869 struct got_reference *head_ref = NULL, *ref = NULL;
2870 struct got_worktree *worktree = NULL;
2871 char *repo_path = NULL;
2872 char *worktree_path = NULL;
2873 const char *path_prefix = "";
2874 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2875 char *commit_id_str = NULL;
2876 struct got_object_id *commit_id = NULL;
2878 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2879 struct got_pathlist_head paths;
2880 struct got_checkout_progress_arg cpa;
2881 int *pack_fds = NULL;
2885 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2888 branch_name = optarg;
2891 commit_id_str = strdup(optarg);
2892 if (commit_id_str == NULL)
2893 return got_error_from_errno("strdup");
2899 path_prefix = optarg;
2914 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2915 "unveil", NULL) == -1)
2919 char *base, *dotgit;
2921 repo_path = realpath(argv[0], NULL);
2922 if (repo_path == NULL)
2923 return got_error_from_errno2("realpath", argv[0]);
2924 cwd = getcwd(NULL, 0);
2926 error = got_error_from_errno("getcwd");
2933 error = got_path_basename(&base, path);
2936 dotgit = strstr(base, ".git");
2939 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2940 error = got_error_from_errno("asprintf");
2945 } else if (argc == 2) {
2946 repo_path = realpath(argv[0], NULL);
2947 if (repo_path == NULL) {
2948 error = got_error_from_errno2("realpath", argv[0]);
2951 worktree_path = realpath(argv[1], NULL);
2952 if (worktree_path == NULL) {
2953 if (errno != ENOENT) {
2954 error = got_error_from_errno2("realpath",
2958 worktree_path = strdup(argv[1]);
2959 if (worktree_path == NULL) {
2960 error = got_error_from_errno("strdup");
2967 got_path_strip_trailing_slashes(repo_path);
2968 got_path_strip_trailing_slashes(worktree_path);
2970 error = got_repo_pack_fds_open(&pack_fds);
2974 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2978 /* Pre-create work tree path for unveil(2) */
2979 error = got_path_mkdir(worktree_path);
2981 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2982 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2984 if (!allow_nonempty &&
2985 !got_path_dir_is_empty(worktree_path)) {
2986 error = got_error_path(worktree_path,
2987 GOT_ERR_DIR_NOT_EMPTY);
2992 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2996 error = got_ref_open(&head_ref, repo, branch_name, 0);
3000 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
3001 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3004 error = got_worktree_open(&worktree, worktree_path);
3008 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3012 if (!same_path_prefix) {
3013 error = got_error(GOT_ERR_PATH_PREFIX);
3017 if (commit_id_str) {
3018 struct got_reflist_head refs;
3020 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3024 error = got_repo_match_object_id(&commit_id, NULL,
3025 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3026 got_ref_list_free(&refs);
3029 error = check_linear_ancestry(commit_id,
3030 got_worktree_get_base_commit_id(worktree), 0, repo);
3031 if (error != NULL) {
3032 if (error->code == GOT_ERR_ANCESTRY) {
3033 error = checkout_ancestry_error(
3034 head_ref, commit_id_str);
3038 error = check_same_branch(commit_id, head_ref, NULL, repo);
3040 if (error->code == GOT_ERR_ANCESTRY) {
3041 error = checkout_ancestry_error(
3042 head_ref, commit_id_str);
3046 error = got_worktree_set_base_commit_id(worktree, repo,
3050 /* Expand potentially abbreviated commit ID string. */
3051 free(commit_id_str);
3052 error = got_object_id_str(&commit_id_str, commit_id);
3056 commit_id = got_object_id_dup(
3057 got_worktree_get_base_commit_id(worktree));
3058 if (commit_id == NULL) {
3059 error = got_error_from_errno("got_object_id_dup");
3062 error = got_object_id_str(&commit_id_str, commit_id);
3067 error = got_pathlist_append(&paths, "", NULL);
3070 cpa.worktree_path = worktree_path;
3071 cpa.had_base_commit_ref_error = 0;
3072 cpa.verbosity = verbosity;
3073 error = got_worktree_checkout_files(worktree, &paths, repo,
3074 checkout_progress, &cpa, check_cancelled, NULL);
3078 if (got_ref_is_symbolic(head_ref)) {
3079 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3082 refname = got_ref_get_name(ref);
3084 refname = got_ref_get_name(head_ref);
3085 printf("Checked out %s: %s\n", refname, commit_id_str);
3086 printf("Now shut up and hack\n");
3087 if (cpa.had_base_commit_ref_error)
3088 show_worktree_base_ref_warning();
3091 const struct got_error *pack_err =
3092 got_repo_pack_fds_close(pack_fds);
3097 got_ref_close(head_ref);
3100 got_pathlist_free(&paths);
3101 free(commit_id_str);
3104 free(worktree_path);
3109 struct got_update_progress_arg {
3121 print_update_progress_stats(struct got_update_progress_arg *upa)
3123 if (!upa->did_something)
3126 if (upa->conflicts > 0)
3127 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3128 if (upa->obstructed > 0)
3129 printf("File paths obstructed by a non-regular file: %d\n",
3131 if (upa->not_updated > 0)
3132 printf("Files not updated because of existing merge "
3133 "conflicts: %d\n", upa->not_updated);
3137 * The meaning of some status codes differs between merge-style operations and
3138 * update operations. For example, the ! status code means "file was missing"
3139 * if changes were merged into the work tree, and "missing file was restored"
3140 * if the work tree was updated. This function should be used by any operation
3141 * which merges changes into the work tree without updating the work tree.
3144 print_merge_progress_stats(struct got_update_progress_arg *upa)
3146 if (!upa->did_something)
3149 if (upa->conflicts > 0)
3150 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3151 if (upa->obstructed > 0)
3152 printf("File paths obstructed by a non-regular file: %d\n",
3154 if (upa->missing > 0)
3155 printf("Files which had incoming changes but could not be "
3156 "found in the work tree: %d\n", upa->missing);
3157 if (upa->not_deleted > 0)
3158 printf("Files not deleted due to differences in deleted "
3159 "content: %d\n", upa->not_deleted);
3160 if (upa->unversioned > 0)
3161 printf("Files not merged because an unversioned file was "
3162 "found in the work tree: %d\n", upa->unversioned);
3168 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [-q] "
3174 static const struct got_error *
3175 update_progress(void *arg, unsigned char status, const char *path)
3177 struct got_update_progress_arg *upa = arg;
3179 if (status == GOT_STATUS_EXISTS ||
3180 status == GOT_STATUS_BASE_REF_ERR)
3183 upa->did_something = 1;
3185 /* Base commit bump happens silently. */
3186 if (status == GOT_STATUS_BUMP_BASE)
3189 if (status == GOT_STATUS_CONFLICT)
3191 if (status == GOT_STATUS_OBSTRUCTED)
3193 if (status == GOT_STATUS_CANNOT_UPDATE)
3195 if (status == GOT_STATUS_MISSING)
3197 if (status == GOT_STATUS_CANNOT_DELETE)
3199 if (status == GOT_STATUS_UNVERSIONED)
3202 while (path[0] == '/')
3204 if (upa->verbosity >= 0)
3205 printf("%c %s\n", status, path);
3210 static const struct got_error *
3211 switch_head_ref(struct got_reference *head_ref,
3212 struct got_object_id *commit_id, struct got_worktree *worktree,
3213 struct got_repository *repo)
3215 const struct got_error *err = NULL;
3217 int ref_has_moved = 0;
3219 /* Trivial case: switching between two different references. */
3220 if (strcmp(got_ref_get_name(head_ref),
3221 got_worktree_get_head_ref_name(worktree)) != 0) {
3222 printf("Switching work tree from %s to %s\n",
3223 got_worktree_get_head_ref_name(worktree),
3224 got_ref_get_name(head_ref));
3225 return got_worktree_set_head_ref(worktree, head_ref);
3228 err = check_linear_ancestry(commit_id,
3229 got_worktree_get_base_commit_id(worktree), 0, repo);
3231 if (err->code != GOT_ERR_ANCESTRY)
3238 /* Switching to a rebased branch with the same reference name. */
3239 err = got_object_id_str(&base_id_str,
3240 got_worktree_get_base_commit_id(worktree));
3243 printf("Reference %s now points at a different branch\n",
3244 got_worktree_get_head_ref_name(worktree));
3245 printf("Switching work tree from %s to %s\n", base_id_str,
3246 got_worktree_get_head_ref_name(worktree));
3250 static const struct got_error *
3251 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3253 const struct got_error *err;
3256 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3260 return got_error(GOT_ERR_REBASING);
3262 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3266 return got_error(GOT_ERR_HISTEDIT_BUSY);
3271 static const struct got_error *
3272 check_merge_in_progress(struct got_worktree *worktree,
3273 struct got_repository *repo)
3275 const struct got_error *err;
3278 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3282 return got_error(GOT_ERR_MERGE_BUSY);
3287 static const struct got_error *
3288 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3289 char *argv[], struct got_worktree *worktree)
3291 const struct got_error *err = NULL;
3293 struct got_pathlist_entry *new;
3299 return got_error_from_errno("strdup");
3300 return got_pathlist_append(paths, path, NULL);
3303 for (i = 0; i < argc; i++) {
3304 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3307 err = got_pathlist_insert(&new, paths, path, NULL);
3308 if (err || new == NULL /* duplicate */) {
3318 static const struct got_error *
3319 wrap_not_worktree_error(const struct got_error *orig_err,
3320 const char *cmdname, const char *path)
3322 const struct got_error *err;
3323 struct got_repository *repo;
3324 static char msg[512];
3325 int *pack_fds = NULL;
3327 err = got_repo_pack_fds_open(&pack_fds);
3331 err = got_repo_open(&repo, path, NULL, pack_fds);
3335 snprintf(msg, sizeof(msg),
3336 "'got %s' needs a work tree in addition to a git repository\n"
3337 "Work trees can be checked out from this Git repository with "
3339 "The got(1) manual page contains more information.", cmdname);
3340 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3341 got_repo_close(repo);
3343 const struct got_error *pack_err =
3344 got_repo_pack_fds_close(pack_fds);
3351 static const struct got_error *
3352 cmd_update(int argc, char *argv[])
3354 const struct got_error *error = NULL;
3355 struct got_repository *repo = NULL;
3356 struct got_worktree *worktree = NULL;
3357 char *worktree_path = NULL;
3358 struct got_object_id *commit_id = NULL;
3359 char *commit_id_str = NULL;
3360 const char *branch_name = NULL;
3361 struct got_reference *head_ref = NULL;
3362 struct got_pathlist_head paths;
3363 struct got_pathlist_entry *pe;
3364 int ch, verbosity = 0;
3365 struct got_update_progress_arg upa;
3366 int *pack_fds = NULL;
3370 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3373 branch_name = optarg;
3376 commit_id_str = strdup(optarg);
3377 if (commit_id_str == NULL)
3378 return got_error_from_errno("strdup");
3393 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3394 "unveil", NULL) == -1)
3397 worktree_path = getcwd(NULL, 0);
3398 if (worktree_path == NULL) {
3399 error = got_error_from_errno("getcwd");
3403 error = got_repo_pack_fds_open(&pack_fds);
3407 error = got_worktree_open(&worktree, worktree_path);
3409 if (error->code == GOT_ERR_NOT_WORKTREE)
3410 error = wrap_not_worktree_error(error, "update",
3415 error = check_rebase_or_histedit_in_progress(worktree);
3419 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3424 error = apply_unveil(got_repo_get_path(repo), 0,
3425 got_worktree_get_root_path(worktree));
3429 error = check_merge_in_progress(worktree, repo);
3433 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3437 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3438 got_worktree_get_head_ref_name(worktree), 0);
3441 if (commit_id_str == NULL) {
3442 error = got_ref_resolve(&commit_id, repo, head_ref);
3445 error = got_object_id_str(&commit_id_str, commit_id);
3449 struct got_reflist_head refs;
3451 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3455 error = got_repo_match_object_id(&commit_id, NULL,
3456 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3457 got_ref_list_free(&refs);
3458 free(commit_id_str);
3459 commit_id_str = NULL;
3462 error = got_object_id_str(&commit_id_str, commit_id);
3468 struct got_object_id *head_commit_id;
3469 TAILQ_FOREACH(pe, &paths, entry) {
3470 if (pe->path_len == 0)
3472 error = got_error_msg(GOT_ERR_BAD_PATH,
3473 "switching between branches requires that "
3474 "the entire work tree gets updated");
3477 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3480 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3482 free(head_commit_id);
3485 error = check_same_branch(commit_id, head_ref, NULL, repo);
3488 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3492 error = check_linear_ancestry(commit_id,
3493 got_worktree_get_base_commit_id(worktree), 0, repo);
3494 if (error != NULL) {
3495 if (error->code == GOT_ERR_ANCESTRY)
3496 error = got_error(GOT_ERR_BRANCH_MOVED);
3499 error = check_same_branch(commit_id, head_ref, NULL, repo);
3504 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3506 error = got_worktree_set_base_commit_id(worktree, repo,
3512 memset(&upa, 0, sizeof(upa));
3513 upa.verbosity = verbosity;
3514 error = got_worktree_checkout_files(worktree, &paths, repo,
3515 update_progress, &upa, check_cancelled, NULL);
3519 if (upa.did_something) {
3520 printf("Updated to %s: %s\n",
3521 got_worktree_get_head_ref_name(worktree), commit_id_str);
3523 printf("Already up-to-date\n");
3525 print_update_progress_stats(&upa);
3528 const struct got_error *pack_err =
3529 got_repo_pack_fds_close(pack_fds);
3533 free(worktree_path);
3534 TAILQ_FOREACH(pe, &paths, entry)
3535 free((char *)pe->path);
3536 got_pathlist_free(&paths);
3538 free(commit_id_str);
3542 static const struct got_error *
3543 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3544 const char *path, int diff_context, int ignore_whitespace,
3545 int force_text_diff, struct got_repository *repo, FILE *outfile)
3547 const struct got_error *err = NULL;
3548 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3549 FILE *f1 = NULL, *f2 = NULL;
3552 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3555 f1 = got_opentemp();
3557 err = got_error_from_errno("got_opentemp");
3562 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3566 f2 = got_opentemp();
3568 err = got_error_from_errno("got_opentemp");
3572 while (path[0] == '/')
3574 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3575 diff_context, ignore_whitespace, force_text_diff, outfile);
3578 got_object_blob_close(blob1);
3579 got_object_blob_close(blob2);
3580 if (f1 && fclose(f1) == EOF && err == NULL)
3581 err = got_error_from_errno("fclose");
3582 if (f2 && fclose(f2) == EOF && err == NULL)
3583 err = got_error_from_errno("fclose");
3587 static const struct got_error *
3588 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3589 const char *path, int diff_context, int ignore_whitespace,
3590 int force_text_diff, struct got_repository *repo, FILE *outfile)
3592 const struct got_error *err = NULL;
3593 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3594 struct got_diff_blob_output_unidiff_arg arg;
3595 FILE *f1 = NULL, *f2 = NULL;
3598 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3601 f1 = got_opentemp();
3603 err = got_error_from_errno("got_opentemp");
3608 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3612 f2 = got_opentemp();
3614 err = got_error_from_errno("got_opentemp");
3618 arg.diff_context = diff_context;
3619 arg.ignore_whitespace = ignore_whitespace;
3620 arg.force_text_diff = force_text_diff;
3621 arg.outfile = outfile;
3622 arg.line_offsets = NULL;
3624 while (path[0] == '/')
3626 err = got_diff_tree(tree1, tree2, f1, f2, path, path, repo,
3627 got_diff_blob_output_unidiff, &arg, 1);
3630 got_object_tree_close(tree1);
3632 got_object_tree_close(tree2);
3633 if (f1 && fclose(f1) == EOF && err == NULL)
3634 err = got_error_from_errno("fclose");
3635 if (f2 && fclose(f2) == EOF && err == NULL)
3636 err = got_error_from_errno("fclose");
3640 static const struct got_error *
3641 get_changed_paths(struct got_pathlist_head *paths,
3642 struct got_commit_object *commit, struct got_repository *repo)
3644 const struct got_error *err = NULL;
3645 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3646 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3647 struct got_object_qid *qid;
3649 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3651 struct got_commit_object *pcommit;
3652 err = got_object_open_as_commit(&pcommit, repo,
3657 tree_id1 = got_object_id_dup(
3658 got_object_commit_get_tree_id(pcommit));
3659 if (tree_id1 == NULL) {
3660 got_object_commit_close(pcommit);
3661 return got_error_from_errno("got_object_id_dup");
3663 got_object_commit_close(pcommit);
3668 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3673 tree_id2 = got_object_commit_get_tree_id(commit);
3674 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3678 err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
3679 got_diff_tree_collect_changed_paths, paths, 0);
3682 got_object_tree_close(tree1);
3684 got_object_tree_close(tree2);
3689 static const struct got_error *
3690 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3691 const char *path, int diff_context, struct got_repository *repo,
3694 const struct got_error *err = NULL;
3695 struct got_commit_object *pcommit = NULL;
3696 char *id_str1 = NULL, *id_str2 = NULL;
3697 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3698 struct got_object_qid *qid;
3700 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3702 err = got_object_open_as_commit(&pcommit, repo,
3706 err = got_object_id_str(&id_str1, &qid->id);
3711 err = got_object_id_str(&id_str2, id);
3715 if (path && path[0] != '\0') {
3717 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3721 err = got_object_id_by_path(&obj_id1, repo,
3724 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3730 err = got_object_get_type(&obj_type, repo, obj_id2);
3736 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3737 fprintf(outfile, "commit - %s\n",
3738 id_str1 ? id_str1 : "/dev/null");
3739 fprintf(outfile, "commit + %s\n", id_str2);
3741 case GOT_OBJ_TYPE_BLOB:
3742 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3743 0, 0, repo, outfile);
3745 case GOT_OBJ_TYPE_TREE:
3746 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3747 0, 0, repo, outfile);
3750 err = got_error(GOT_ERR_OBJ_TYPE);
3756 obj_id2 = got_object_commit_get_tree_id(commit);
3758 obj_id1 = got_object_commit_get_tree_id(pcommit);
3760 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3761 fprintf(outfile, "commit - %s\n",
3762 id_str1 ? id_str1 : "/dev/null");
3763 fprintf(outfile, "commit + %s\n", id_str2);
3764 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3771 got_object_commit_close(pcommit);
3776 get_datestr(time_t *time, char *datebuf)
3778 struct tm mytm, *tm;
3781 tm = gmtime_r(time, &mytm);
3784 s = asctime_r(tm, datebuf);
3787 p = strchr(s, '\n');
3793 static const struct got_error *
3794 match_commit(int *have_match, struct got_object_id *id,
3795 struct got_commit_object *commit, regex_t *regex)
3797 const struct got_error *err = NULL;
3798 regmatch_t regmatch;
3799 char *id_str = NULL, *logmsg = NULL;
3803 err = got_object_id_str(&id_str, id);
3807 err = got_object_commit_get_logmsg(&logmsg, commit);
3811 if (regexec(regex, got_object_commit_get_author(commit), 1,
3812 ®match, 0) == 0 ||
3813 regexec(regex, got_object_commit_get_committer(commit), 1,
3814 ®match, 0) == 0 ||
3815 regexec(regex, id_str, 1, ®match, 0) == 0 ||
3816 regexec(regex, logmsg, 1, ®match, 0) == 0)
3825 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3828 regmatch_t regmatch;
3829 struct got_pathlist_entry *pe;
3833 TAILQ_FOREACH(pe, changed_paths, entry) {
3834 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3841 static const struct got_error *
3842 match_patch(int *have_match, struct got_commit_object *commit,
3843 struct got_object_id *id, const char *path, int diff_context,
3844 struct got_repository *repo, regex_t *regex, FILE *f)
3846 const struct got_error *err = NULL;
3848 size_t linesize = 0;
3850 regmatch_t regmatch;
3854 err = got_opentemp_truncate(f);
3858 err = print_patch(commit, id, path, diff_context, repo, f);
3862 if (fseeko(f, 0L, SEEK_SET) == -1) {
3863 err = got_error_from_errno("fseeko");
3867 while ((linelen = getline(&line, &linesize, f)) != -1) {
3868 if (regexec(regex, line, 1, ®match, 0) == 0) {
3878 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3880 static const struct got_error*
3881 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3882 struct got_object_id *id, struct got_repository *repo,
3885 static const struct got_error *err = NULL;
3886 struct got_reflist_entry *re;
3892 TAILQ_FOREACH(re, refs, entry) {
3893 struct got_tag_object *tag = NULL;
3894 struct got_object_id *ref_id;
3897 name = got_ref_get_name(re->ref);
3898 if (strcmp(name, GOT_REF_HEAD) == 0)
3900 if (strncmp(name, "refs/", 5) == 0)
3902 if (strncmp(name, "got/", 4) == 0)
3904 if (strncmp(name, "heads/", 6) == 0)
3906 if (strncmp(name, "remotes/", 8) == 0) {
3910 s = strstr(name, "/" GOT_REF_HEAD);
3911 if (s != NULL && s[strlen(s)] == '\0')
3914 err = got_ref_resolve(&ref_id, repo, re->ref);
3917 if (strncmp(name, "tags/", 5) == 0) {
3918 err = got_object_open_as_tag(&tag, repo, ref_id);
3920 if (err->code != GOT_ERR_OBJ_TYPE) {
3924 /* Ref points at something other than a tag. */
3929 cmp = got_object_id_cmp(tag ?
3930 got_object_tag_get_object_id(tag) : ref_id, id);
3933 got_object_tag_close(tag);
3937 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3938 s ? ", " : "", name) == -1) {
3939 err = got_error_from_errno("asprintf");
3950 static const struct got_error *
3951 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3952 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3954 const struct got_error *err = NULL;
3955 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3956 char *comma, *s, *nl;
3957 struct got_reflist_head *refs;
3958 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3960 time_t committer_time;
3962 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3964 err = build_refs_str(&ref_str, refs, id, repo, 1);
3968 /* Display the first matching ref only. */
3969 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3973 if (ref_str == NULL) {
3974 err = got_object_id_str(&id_str, id);
3979 committer_time = got_object_commit_get_committer_time(commit);
3980 if (gmtime_r(&committer_time, &tm) == NULL) {
3981 err = got_error_from_errno("gmtime_r");
3984 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3985 err = got_error(GOT_ERR_NO_SPACE);
3989 err = got_object_commit_get_logmsg(&logmsg0, commit);
3994 while (isspace((unsigned char)s[0]))
3997 nl = strchr(s, '\n');
4003 printf("%s%-7s %s\n", datebuf, ref_str, s);
4005 printf("%s%.7s %s\n", datebuf, id_str, s);
4007 if (fflush(stdout) != 0 && err == NULL)
4008 err = got_error_from_errno("fflush");
4016 static const struct got_error *
4017 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4018 struct got_repository *repo, const char *path,
4019 struct got_pathlist_head *changed_paths, int show_patch,
4020 int diff_context, struct got_reflist_object_id_map *refs_idmap,
4021 const char *custom_refs_str)
4023 const struct got_error *err = NULL;
4024 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4026 time_t committer_time;
4027 const char *author, *committer;
4028 char *refs_str = NULL;
4030 err = got_object_id_str(&id_str, id);
4034 if (custom_refs_str == NULL) {
4035 struct got_reflist_head *refs;
4036 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4038 err = build_refs_str(&refs_str, refs, id, repo, 0);
4044 printf(GOT_COMMIT_SEP_STR);
4045 if (custom_refs_str)
4046 printf("commit %s (%s)\n", id_str, custom_refs_str);
4048 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4049 refs_str ? refs_str : "", refs_str ? ")" : "");
4054 printf("from: %s\n", got_object_commit_get_author(commit));
4055 committer_time = got_object_commit_get_committer_time(commit);
4056 datestr = get_datestr(&committer_time, datebuf);
4058 printf("date: %s UTC\n", datestr);
4059 author = got_object_commit_get_author(commit);
4060 committer = got_object_commit_get_committer(commit);
4061 if (strcmp(author, committer) != 0)
4062 printf("via: %s\n", committer);
4063 if (got_object_commit_get_nparents(commit) > 1) {
4064 const struct got_object_id_queue *parent_ids;
4065 struct got_object_qid *qid;
4067 parent_ids = got_object_commit_get_parent_ids(commit);
4068 STAILQ_FOREACH(qid, parent_ids, entry) {
4069 err = got_object_id_str(&id_str, &qid->id);
4072 printf("parent %d: %s\n", n++, id_str);
4078 err = got_object_commit_get_logmsg(&logmsg0, commit);
4084 line = strsep(&logmsg, "\n");
4086 printf(" %s\n", line);
4090 if (changed_paths) {
4091 struct got_pathlist_entry *pe;
4092 TAILQ_FOREACH(pe, changed_paths, entry) {
4093 struct got_diff_changed_path *cp = pe->data;
4094 printf(" %c %s\n", cp->status, pe->path);
4099 err = print_patch(commit, id, path, diff_context, repo, stdout);
4104 if (fflush(stdout) != 0 && err == NULL)
4105 err = got_error_from_errno("fflush");
4112 static const struct got_error *
4113 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4114 struct got_repository *repo, const char *path, int show_changed_paths,
4115 int show_patch, const char *search_pattern, int diff_context, int limit,
4116 int log_branches, int reverse_display_order,
4117 struct got_reflist_object_id_map *refs_idmap, int one_line,
4120 const struct got_error *err;
4121 struct got_commit_graph *graph;
4124 struct got_object_id_queue reversed_commits;
4125 struct got_object_qid *qid;
4126 struct got_commit_object *commit;
4127 struct got_pathlist_head changed_paths;
4128 struct got_pathlist_entry *pe;
4130 STAILQ_INIT(&reversed_commits);
4131 TAILQ_INIT(&changed_paths);
4133 if (search_pattern && regcomp(®ex, search_pattern,
4134 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4135 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4137 err = got_commit_graph_open(&graph, path, !log_branches);
4140 err = got_commit_graph_iter_start(graph, root_id, repo,
4141 check_cancelled, NULL);
4145 struct got_object_id *id;
4147 if (sigint_received || sigpipe_received)
4150 err = got_commit_graph_iter_next(&id, graph, repo,
4151 check_cancelled, NULL);
4153 if (err->code == GOT_ERR_ITER_COMPLETED)
4160 err = got_object_open_as_commit(&commit, repo, id);
4164 if (show_changed_paths && !reverse_display_order) {
4165 err = get_changed_paths(&changed_paths, commit, repo);
4170 if (search_pattern) {
4171 err = match_commit(&have_match, id, commit, ®ex);
4173 got_object_commit_close(commit);
4176 if (have_match == 0 && show_changed_paths)
4177 match_changed_paths(&have_match,
4178 &changed_paths, ®ex);
4179 if (have_match == 0 && show_patch) {
4180 err = match_patch(&have_match, commit, id,
4181 path, diff_context, repo, ®ex,
4186 if (have_match == 0) {
4187 got_object_commit_close(commit);
4188 TAILQ_FOREACH(pe, &changed_paths, entry) {
4189 free((char *)pe->path);
4192 got_pathlist_free(&changed_paths);
4197 if (reverse_display_order) {
4198 err = got_object_qid_alloc(&qid, id);
4201 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4202 got_object_commit_close(commit);
4205 err = print_commit_oneline(commit, id,
4208 err = print_commit(commit, id, repo, path,
4209 show_changed_paths ? &changed_paths : NULL,
4210 show_patch, diff_context, refs_idmap, NULL);
4211 got_object_commit_close(commit);
4215 if ((limit && --limit == 0) ||
4216 (end_id && got_object_id_cmp(id, end_id) == 0))
4219 TAILQ_FOREACH(pe, &changed_paths, entry) {
4220 free((char *)pe->path);
4223 got_pathlist_free(&changed_paths);
4225 if (reverse_display_order) {
4226 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4227 err = got_object_open_as_commit(&commit, repo,
4231 if (show_changed_paths) {
4232 err = get_changed_paths(&changed_paths,
4238 err = print_commit_oneline(commit, &qid->id,
4241 err = print_commit(commit, &qid->id, repo, path,
4242 show_changed_paths ? &changed_paths : NULL,
4243 show_patch, diff_context, refs_idmap, NULL);
4244 got_object_commit_close(commit);
4247 TAILQ_FOREACH(pe, &changed_paths, entry) {
4248 free((char *)pe->path);
4251 got_pathlist_free(&changed_paths);
4255 while (!STAILQ_EMPTY(&reversed_commits)) {
4256 qid = STAILQ_FIRST(&reversed_commits);
4257 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4258 got_object_qid_free(qid);
4260 TAILQ_FOREACH(pe, &changed_paths, entry) {
4261 free((char *)pe->path);
4264 got_pathlist_free(&changed_paths);
4267 got_commit_graph_close(graph);
4274 fprintf(stderr, "usage: %s log [-b] [-p] [-P] [-s] [-c commit] "
4275 "[-C number] [ -l N ] [-x commit] [-S search-pattern] "
4276 "[-r repository-path] [-R] [path]\n", getprogname());
4281 get_default_log_limit(void)
4283 const char *got_default_log_limit;
4287 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4288 if (got_default_log_limit == NULL)
4290 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4296 static const struct got_error *
4297 cmd_log(int argc, char *argv[])
4299 const struct got_error *error;
4300 struct got_repository *repo = NULL;
4301 struct got_worktree *worktree = NULL;
4302 struct got_object_id *start_id = NULL, *end_id = NULL;
4303 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4304 const char *start_commit = NULL, *end_commit = NULL;
4305 const char *search_pattern = NULL;
4306 int diff_context = -1, ch;
4307 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4308 int reverse_display_order = 0, one_line = 0;
4310 struct got_reflist_head refs;
4311 struct got_reflist_object_id_map *refs_idmap = NULL;
4312 FILE *tmpfile = NULL;
4313 int *pack_fds = NULL;
4318 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4324 limit = get_default_log_limit();
4326 while ((ch = getopt(argc, argv, "bpPc:C:l:r:RsS:x:")) != -1) {
4332 show_changed_paths = 1;
4335 start_commit = optarg;
4338 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4341 errx(1, "number of context lines is %s: %s",
4345 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4347 errx(1, "number of commits is %s: %s",
4354 repo_path = realpath(optarg, NULL);
4355 if (repo_path == NULL)
4356 return got_error_from_errno2("realpath",
4358 got_path_strip_trailing_slashes(repo_path);
4361 reverse_display_order = 1;
4367 search_pattern = optarg;
4370 end_commit = optarg;
4381 if (diff_context == -1)
4383 else if (!show_patch)
4384 errx(1, "-C requires -p");
4386 if (one_line && (show_patch || show_changed_paths))
4387 errx(1, "cannot use -s with -p or -P");
4389 cwd = getcwd(NULL, 0);
4391 error = got_error_from_errno("getcwd");
4395 error = got_repo_pack_fds_open(&pack_fds);
4399 if (repo_path == NULL) {
4400 error = got_worktree_open(&worktree, cwd);
4401 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4408 error = got_worktree_resolve_path(&path, worktree,
4413 path = strdup(argv[0]);
4415 error = got_error_from_errno("strdup");
4419 } else if (argc != 0)
4422 if (repo_path == NULL) {
4423 repo_path = worktree ?
4424 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4426 if (repo_path == NULL) {
4427 error = got_error_from_errno("strdup");
4431 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4435 error = apply_unveil(got_repo_get_path(repo), 1,
4436 worktree ? got_worktree_get_root_path(worktree) : NULL);
4440 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4444 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4448 if (start_commit == NULL) {
4449 struct got_reference *head_ref;
4450 struct got_commit_object *commit = NULL;
4451 error = got_ref_open(&head_ref, repo,
4452 worktree ? got_worktree_get_head_ref_name(worktree)
4456 error = got_ref_resolve(&start_id, repo, head_ref);
4457 got_ref_close(head_ref);
4460 error = got_object_open_as_commit(&commit, repo,
4464 got_object_commit_close(commit);
4466 error = got_repo_match_object_id(&start_id, NULL,
4467 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4471 if (end_commit != NULL) {
4472 error = got_repo_match_object_id(&end_id, NULL,
4473 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4480 * If a path was specified on the command line it was resolved
4481 * to a path in the work tree above. Prepend the work tree's
4482 * path prefix to obtain the corresponding in-repository path.
4486 prefix = got_worktree_get_path_prefix(worktree);
4487 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4488 (path[0] != '\0') ? "/" : "", path) == -1) {
4489 error = got_error_from_errno("asprintf");
4494 error = got_repo_map_path(&in_repo_path, repo,
4500 path = in_repo_path;
4504 /* Release work tree lock. */
4505 got_worktree_close(worktree);
4509 if (search_pattern && show_patch) {
4510 tmpfile = got_opentemp();
4511 if (tmpfile == NULL) {
4512 error = got_error_from_errno("got_opentemp");
4517 error = print_commits(start_id, end_id, repo, path ? path : "",
4518 show_changed_paths, show_patch, search_pattern, diff_context,
4519 limit, log_branches, reverse_display_order, refs_idmap, one_line,
4526 got_worktree_close(worktree);
4528 const struct got_error *close_err = got_repo_close(repo);
4533 const struct got_error *pack_err =
4534 got_repo_pack_fds_close(pack_fds);
4539 got_reflist_object_id_map_free(refs_idmap);
4540 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4541 error = got_error_from_errno("fclose");
4542 got_ref_list_free(&refs);
4549 fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4550 "[-r repository-path] [-s] [-w] [-P] "
4551 "[object1 object2 | path ...]\n", getprogname());
4555 struct print_diff_arg {
4556 struct got_repository *repo;
4557 struct got_worktree *worktree;
4562 int ignore_whitespace;
4563 int force_text_diff;
4567 * Create a file which contains the target path of a symlink so we can feed
4568 * it as content to the diff engine.
4570 static const struct got_error *
4571 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4572 const char *abspath)
4574 const struct got_error *err = NULL;
4575 char target_path[PATH_MAX];
4576 ssize_t target_len, outlen;
4581 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4582 if (target_len == -1)
4583 return got_error_from_errno2("readlinkat", abspath);
4585 target_len = readlink(abspath, target_path, PATH_MAX);
4586 if (target_len == -1)
4587 return got_error_from_errno2("readlink", abspath);
4590 *fd = got_opentempfd();
4592 return got_error_from_errno("got_opentempfd");
4594 outlen = write(*fd, target_path, target_len);
4596 err = got_error_from_errno("got_opentempfd");
4600 if (lseek(*fd, 0, SEEK_SET) == -1) {
4601 err = got_error_from_errno2("lseek", abspath);
4612 static const struct got_error *
4613 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4614 const char *path, struct got_object_id *blob_id,
4615 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4616 int dirfd, const char *de_name)
4618 struct print_diff_arg *a = arg;
4619 const struct got_error *err = NULL;
4620 struct got_blob_object *blob1 = NULL;
4622 FILE *f1 = NULL, *f2 = NULL;
4623 char *abspath = NULL, *label1 = NULL;
4627 if (a->diff_staged) {
4628 if (staged_status != GOT_STATUS_MODIFY &&
4629 staged_status != GOT_STATUS_ADD &&
4630 staged_status != GOT_STATUS_DELETE)
4633 if (staged_status == GOT_STATUS_DELETE)
4635 if (status == GOT_STATUS_NONEXISTENT)
4636 return got_error_set_errno(ENOENT, path);
4637 if (status != GOT_STATUS_MODIFY &&
4638 status != GOT_STATUS_ADD &&
4639 status != GOT_STATUS_DELETE &&
4640 status != GOT_STATUS_CONFLICT)
4644 if (!a->header_shown) {
4645 printf("diff %s%s\n", a->diff_staged ? "-s " : "",
4646 got_worktree_get_root_path(a->worktree));
4647 printf("commit - %s\n", a->id_str);
4648 printf("path + %s%s\n",
4649 got_worktree_get_root_path(a->worktree),
4650 a->diff_staged ? " (staged changes)" : "");
4651 a->header_shown = 1;
4654 if (a->diff_staged) {
4655 const char *label1 = NULL, *label2 = NULL;
4656 switch (staged_status) {
4657 case GOT_STATUS_MODIFY:
4661 case GOT_STATUS_ADD:
4664 case GOT_STATUS_DELETE:
4668 return got_error(GOT_ERR_FILE_STATUS);
4670 f1 = got_opentemp();
4672 err = got_error_from_errno("got_opentemp");
4675 f2 = got_opentemp();
4677 err = got_error_from_errno("got_opentemp");
4680 err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4681 blob_id, staged_blob_id, label1, label2, a->diff_context,
4682 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4686 if (staged_status == GOT_STATUS_ADD ||
4687 staged_status == GOT_STATUS_MODIFY) {
4689 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4693 err = got_object_id_str(&id_str, staged_blob_id);
4696 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4697 err = got_error_from_errno("asprintf");
4702 } else if (status != GOT_STATUS_ADD) {
4703 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4708 if (status != GOT_STATUS_DELETE) {
4709 if (asprintf(&abspath, "%s/%s",
4710 got_worktree_get_root_path(a->worktree), path) == -1) {
4711 err = got_error_from_errno("asprintf");
4716 fd = openat(dirfd, de_name,
4717 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4719 if (!got_err_open_nofollow_on_symlink()) {
4720 err = got_error_from_errno2("openat",
4724 err = get_symlink_target_file(&fd, dirfd,
4730 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4732 if (!got_err_open_nofollow_on_symlink()) {
4733 err = got_error_from_errno2("open",
4737 err = get_symlink_target_file(&fd, dirfd,
4743 if (fstat(fd, &sb) == -1) {
4744 err = got_error_from_errno2("fstat", abspath);
4747 f2 = fdopen(fd, "r");
4749 err = got_error_from_errno2("fdopen", abspath);
4757 f1 = got_opentemp();
4759 err = got_error_from_errno("got_opentemp");
4762 err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
4768 err = got_diff_blob_file(blob1, f1, size1, label1, f2, sb.st_size,
4769 path, a->diff_context, a->ignore_whitespace, a->force_text_diff,
4773 got_object_blob_close(blob1);
4774 if (f1 && fclose(f1) == EOF && err == NULL)
4775 err = got_error_from_errno("fclose");
4776 if (f2 && fclose(f2) == EOF && err == NULL)
4777 err = got_error_from_errno("fclose");
4778 if (fd != -1 && close(fd) == -1 && err == NULL)
4779 err = got_error_from_errno("close");
4784 static const struct got_error *
4785 cmd_diff(int argc, char *argv[])
4787 const struct got_error *error;
4788 struct got_repository *repo = NULL;
4789 struct got_worktree *worktree = NULL;
4790 char *cwd = NULL, *repo_path = NULL;
4791 const char *commit_args[2] = { NULL, NULL };
4792 int ncommit_args = 0;
4793 struct got_object_id *ids[2] = { NULL, NULL };
4794 char *labels[2] = { NULL, NULL };
4795 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4796 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4797 int force_text_diff = 0, force_path = 0, rflag = 0;
4799 struct got_reflist_head refs;
4800 struct got_pathlist_head paths;
4801 struct got_pathlist_entry *pe;
4802 FILE *f1 = NULL, *f2 = NULL;
4803 int *pack_fds = NULL;
4809 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4814 while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4817 force_text_diff = 1;
4820 if (ncommit_args >= 2)
4821 errx(1, "too many -c options used");
4822 commit_args[ncommit_args++] = optarg;
4825 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4828 errx(1, "number of context lines is %s: %s",
4832 repo_path = realpath(optarg, NULL);
4833 if (repo_path == NULL)
4834 return got_error_from_errno2("realpath",
4836 got_path_strip_trailing_slashes(repo_path);
4843 ignore_whitespace = 1;
4857 cwd = getcwd(NULL, 0);
4859 error = got_error_from_errno("getcwd");
4863 error = got_repo_pack_fds_open(&pack_fds);
4867 if (repo_path == NULL) {
4868 error = got_worktree_open(&worktree, cwd);
4869 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4875 strdup(got_worktree_get_repo_path(worktree));
4876 if (repo_path == NULL) {
4877 error = got_error_from_errno("strdup");
4881 repo_path = strdup(cwd);
4882 if (repo_path == NULL) {
4883 error = got_error_from_errno("strdup");
4889 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4894 if (rflag || worktree == NULL || ncommit_args > 0) {
4896 error = got_error_msg(GOT_ERR_NOT_IMPL,
4897 "-P option can only be used when diffing "
4902 error = got_error_msg(GOT_ERR_NOT_IMPL,
4903 "-s option can only be used when diffing "
4909 error = apply_unveil(got_repo_get_path(repo), 1,
4910 worktree ? got_worktree_get_root_path(worktree) : NULL);
4914 if ((!force_path && argc == 2) || ncommit_args > 0) {
4915 int obj_type = (ncommit_args > 0 ?
4916 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4917 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4921 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4923 if (ncommit_args > 0)
4924 arg = commit_args[i];
4927 error = got_repo_match_object_id(&ids[i], &labels[i],
4928 arg, obj_type, &refs, repo);
4930 if (error->code != GOT_ERR_NOT_REF &&
4931 error->code != GOT_ERR_NO_OBJ)
4933 if (ncommit_args > 0)
4941 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4942 struct print_diff_arg arg;
4945 if (worktree == NULL) {
4946 if (argc == 2 && ids[0] == NULL) {
4947 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4949 } else if (argc == 2 && ids[1] == NULL) {
4950 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4952 } else if (argc > 0) {
4953 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4954 "%s", "specified paths cannot be resolved");
4957 error = got_error(GOT_ERR_NOT_WORKTREE);
4962 error = get_worktree_paths_from_argv(&paths, argc, argv,
4967 error = got_object_id_str(&id_str,
4968 got_worktree_get_base_commit_id(worktree));
4972 arg.worktree = worktree;
4973 arg.diff_context = diff_context;
4974 arg.id_str = id_str;
4975 arg.header_shown = 0;
4976 arg.diff_staged = diff_staged;
4977 arg.ignore_whitespace = ignore_whitespace;
4978 arg.force_text_diff = force_text_diff;
4980 error = got_worktree_status(worktree, &paths, repo, 0,
4981 print_diff, &arg, check_cancelled, NULL);
4986 if (ncommit_args == 1) {
4987 struct got_commit_object *commit;
4988 error = got_object_open_as_commit(&commit, repo, ids[0]);
4992 labels[1] = labels[0];
4994 if (got_object_commit_get_nparents(commit) > 0) {
4995 const struct got_object_id_queue *pids;
4996 struct got_object_qid *pid;
4997 pids = got_object_commit_get_parent_ids(commit);
4998 pid = STAILQ_FIRST(pids);
4999 ids[0] = got_object_id_dup(&pid->id);
5000 if (ids[0] == NULL) {
5001 error = got_error_from_errno(
5002 "got_object_id_dup");
5003 got_object_commit_close(commit);
5006 error = got_object_id_str(&labels[0], ids[0]);
5008 got_object_commit_close(commit);
5013 labels[0] = strdup("/dev/null");
5014 if (labels[0] == NULL) {
5015 error = got_error_from_errno("strdup");
5016 got_object_commit_close(commit);
5021 got_object_commit_close(commit);
5024 if (ncommit_args == 0 && argc > 2) {
5025 error = got_error_msg(GOT_ERR_BAD_PATH,
5026 "path arguments cannot be used when diffing two objects");
5031 error = got_object_get_type(&type1, repo, ids[0]);
5036 error = got_object_get_type(&type2, repo, ids[1]);
5039 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5040 error = got_error(GOT_ERR_OBJ_TYPE);
5043 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
5044 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5045 "path arguments cannot be used when diffing blobs");
5049 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5051 struct got_pathlist_entry *new;
5055 error = got_worktree_resolve_path(&p, worktree,
5059 prefix = got_worktree_get_path_prefix(worktree);
5060 while (prefix[0] == '/')
5062 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5063 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5065 error = got_error_from_errno("asprintf");
5071 char *mapped_path, *s;
5072 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5078 in_repo_path = strdup(s);
5079 if (in_repo_path == NULL) {
5080 error = got_error_from_errno("asprintf");
5087 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5088 if (error || new == NULL /* duplicate */)
5095 /* Release work tree lock. */
5096 got_worktree_close(worktree);
5100 f1 = got_opentemp();
5102 error = got_error_from_errno("got_opentemp");
5106 f2 = got_opentemp();
5108 error = got_error_from_errno("got_opentemp");
5112 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5113 case GOT_OBJ_TYPE_BLOB:
5114 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5115 ids[0], ids[1], NULL, NULL, diff_context,
5116 ignore_whitespace, force_text_diff, repo, stdout);
5118 case GOT_OBJ_TYPE_TREE:
5119 error = got_diff_objects_as_trees(NULL, NULL, f1, f2,
5120 ids[0], ids[1], &paths, "", "", diff_context,
5121 ignore_whitespace, force_text_diff, repo, stdout);
5123 case GOT_OBJ_TYPE_COMMIT:
5124 printf("diff %s %s\n", labels[0], labels[1]);
5125 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5126 ids[0], ids[1], &paths, diff_context, ignore_whitespace,
5127 force_text_diff, repo, stdout);
5130 error = got_error(GOT_ERR_OBJ_TYPE);
5138 got_worktree_close(worktree);
5140 const struct got_error *close_err = got_repo_close(repo);
5145 const struct got_error *pack_err =
5146 got_repo_pack_fds_close(pack_fds);
5150 TAILQ_FOREACH(pe, &paths, entry)
5151 free((char *)pe->path);
5152 got_pathlist_free(&paths);
5153 got_ref_list_free(&refs);
5154 if (f1 && fclose(f1) == EOF && error == NULL)
5155 error = got_error_from_errno("fclose");
5156 if (f2 && fclose(f2) == EOF && error == NULL)
5157 error = got_error_from_errno("fclose");
5165 "usage: %s blame [-c commit] [-r repository-path] path\n",
5174 char datebuf[11]; /* YYYY-MM-DD + NUL */
5177 struct blame_cb_args {
5178 struct blame_line *lines;
5182 off_t *line_offsets;
5184 struct got_repository *repo;
5187 static const struct got_error *
5188 blame_cb(void *arg, int nlines, int lineno,
5189 struct got_commit_object *commit, struct got_object_id *id)
5191 const struct got_error *err = NULL;
5192 struct blame_cb_args *a = arg;
5193 struct blame_line *bline;
5195 size_t linesize = 0;
5198 time_t committer_time;
5200 if (nlines != a->nlines ||
5201 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5202 return got_error(GOT_ERR_RANGE);
5204 if (sigint_received)
5205 return got_error(GOT_ERR_ITER_COMPLETED);
5208 return NULL; /* no change in this commit */
5210 /* Annotate this line. */
5211 bline = &a->lines[lineno - 1];
5212 if (bline->annotated)
5214 err = got_object_id_str(&bline->id_str, id);
5218 bline->committer = strdup(got_object_commit_get_committer(commit));
5219 if (bline->committer == NULL) {
5220 err = got_error_from_errno("strdup");
5224 committer_time = got_object_commit_get_committer_time(commit);
5225 if (gmtime_r(&committer_time, &tm) == NULL)
5226 return got_error_from_errno("gmtime_r");
5227 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5229 err = got_error(GOT_ERR_NO_SPACE);
5232 bline->annotated = 1;
5234 /* Print lines annotated so far. */
5235 bline = &a->lines[a->lineno_cur - 1];
5236 if (!bline->annotated)
5239 offset = a->line_offsets[a->lineno_cur - 1];
5240 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5241 err = got_error_from_errno("fseeko");
5245 while (bline->annotated) {
5246 char *smallerthan, *at, *nl, *committer;
5249 if (getline(&line, &linesize, a->f) == -1) {
5251 err = got_error_from_errno("getline");
5255 committer = bline->committer;
5256 smallerthan = strchr(committer, '<');
5257 if (smallerthan && smallerthan[1] != '\0')
5258 committer = smallerthan + 1;
5259 at = strchr(committer, '@');
5262 len = strlen(committer);
5264 committer[8] = '\0';
5266 nl = strchr(line, '\n');
5269 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5270 bline->id_str, bline->datebuf, committer, line);
5273 bline = &a->lines[a->lineno_cur - 1];
5280 static const struct got_error *
5281 cmd_blame(int argc, char *argv[])
5283 const struct got_error *error;
5284 struct got_repository *repo = NULL;
5285 struct got_worktree *worktree = NULL;
5286 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5287 char *link_target = NULL;
5288 struct got_object_id *obj_id = NULL;
5289 struct got_object_id *commit_id = NULL;
5290 struct got_commit_object *commit = NULL;
5291 struct got_blob_object *blob = NULL;
5292 char *commit_id_str = NULL;
5293 struct blame_cb_args bca;
5294 int ch, obj_type, i;
5296 int *pack_fds = NULL;
5298 memset(&bca, 0, sizeof(bca));
5301 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5306 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5309 commit_id_str = optarg;
5312 repo_path = realpath(optarg, NULL);
5313 if (repo_path == NULL)
5314 return got_error_from_errno2("realpath",
5316 got_path_strip_trailing_slashes(repo_path);
5332 cwd = getcwd(NULL, 0);
5334 error = got_error_from_errno("getcwd");
5338 error = got_repo_pack_fds_open(&pack_fds);
5342 if (repo_path == NULL) {
5343 error = got_worktree_open(&worktree, cwd);
5344 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5350 strdup(got_worktree_get_repo_path(worktree));
5351 if (repo_path == NULL) {
5352 error = got_error_from_errno("strdup");
5357 repo_path = strdup(cwd);
5358 if (repo_path == NULL) {
5359 error = got_error_from_errno("strdup");
5365 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5370 const char *prefix = got_worktree_get_path_prefix(worktree);
5373 error = got_worktree_resolve_path(&p, worktree, path);
5376 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5377 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5379 error = got_error_from_errno("asprintf");
5384 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5386 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5389 error = got_repo_map_path(&in_repo_path, repo, path);
5394 if (commit_id_str == NULL) {
5395 struct got_reference *head_ref;
5396 error = got_ref_open(&head_ref, repo, worktree ?
5397 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5400 error = got_ref_resolve(&commit_id, repo, head_ref);
5401 got_ref_close(head_ref);
5405 struct got_reflist_head refs;
5407 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5411 error = got_repo_match_object_id(&commit_id, NULL,
5412 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5413 got_ref_list_free(&refs);
5419 /* Release work tree lock. */
5420 got_worktree_close(worktree);
5424 error = got_object_open_as_commit(&commit, repo, commit_id);
5428 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5433 error = got_object_id_by_path(&obj_id, repo, commit,
5434 link_target ? link_target : in_repo_path);
5438 error = got_object_get_type(&obj_type, repo, obj_id);
5442 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5443 error = got_error_path(link_target ? link_target : in_repo_path,
5448 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5451 bca.f = got_opentemp();
5452 if (bca.f == NULL) {
5453 error = got_error_from_errno("got_opentemp");
5456 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5457 &bca.line_offsets, bca.f, blob);
5458 if (error || bca.nlines == 0)
5461 /* Don't include \n at EOF in the blame line count. */
5462 if (bca.line_offsets[bca.nlines - 1] == filesize)
5465 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5466 if (bca.lines == NULL) {
5467 error = got_error_from_errno("calloc");
5471 bca.nlines_prec = 0;
5479 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5480 repo, blame_cb, &bca, check_cancelled, NULL);
5489 got_object_commit_close(commit);
5491 got_object_blob_close(blob);
5493 got_worktree_close(worktree);
5495 const struct got_error *close_err = got_repo_close(repo);
5500 const struct got_error *pack_err =
5501 got_repo_pack_fds_close(pack_fds);
5506 for (i = 0; i < bca.nlines; i++) {
5507 struct blame_line *bline = &bca.lines[i];
5508 free(bline->id_str);
5509 free(bline->committer);
5513 free(bca.line_offsets);
5514 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5515 error = got_error_from_errno("fclose");
5523 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5528 static const struct got_error *
5529 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5530 const char *root_path, struct got_repository *repo)
5532 const struct got_error *err = NULL;
5533 int is_root_path = (strcmp(path, root_path) == 0);
5534 const char *modestr = "";
5535 mode_t mode = got_tree_entry_get_mode(te);
5536 char *link_target = NULL;
5538 path += strlen(root_path);
5539 while (path[0] == '/')
5542 if (got_object_tree_entry_is_submodule(te))
5544 else if (S_ISLNK(mode)) {
5547 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5550 for (i = 0; i < strlen(link_target); i++) {
5551 if (!isprint((unsigned char)link_target[i]))
5552 link_target[i] = '?';
5557 else if (S_ISDIR(mode))
5559 else if (mode & S_IXUSR)
5562 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5563 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5564 link_target ? " -> ": "", link_target ? link_target : "");
5570 static const struct got_error *
5571 print_tree(const char *path, struct got_commit_object *commit,
5572 int show_ids, int recurse, const char *root_path,
5573 struct got_repository *repo)
5575 const struct got_error *err = NULL;
5576 struct got_object_id *tree_id = NULL;
5577 struct got_tree_object *tree = NULL;
5580 err = got_object_id_by_path(&tree_id, repo, commit, path);
5584 err = got_object_open_as_tree(&tree, repo, tree_id);
5587 nentries = got_object_tree_get_nentries(tree);
5588 for (i = 0; i < nentries; i++) {
5589 struct got_tree_entry *te;
5592 if (sigint_received || sigpipe_received)
5595 te = got_object_tree_get_entry(tree, i);
5598 err = got_object_id_str(&id_str,
5599 got_tree_entry_get_id(te));
5602 if (asprintf(&id, "%s ", id_str) == -1) {
5603 err = got_error_from_errno("asprintf");
5609 err = print_entry(te, id, path, root_path, repo);
5614 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5616 if (asprintf(&child_path, "%s%s%s", path,
5617 path[0] == '/' && path[1] == '\0' ? "" : "/",
5618 got_tree_entry_get_name(te)) == -1) {
5619 err = got_error_from_errno("asprintf");
5622 err = print_tree(child_path, commit, show_ids, 1,
5631 got_object_tree_close(tree);
5636 static const struct got_error *
5637 cmd_tree(int argc, char *argv[])
5639 const struct got_error *error;
5640 struct got_repository *repo = NULL;
5641 struct got_worktree *worktree = NULL;
5642 const char *path, *refname = NULL;
5643 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5644 struct got_object_id *commit_id = NULL;
5645 struct got_commit_object *commit = NULL;
5646 char *commit_id_str = NULL;
5647 int show_ids = 0, recurse = 0;
5649 int *pack_fds = NULL;
5652 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5657 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5660 commit_id_str = optarg;
5663 repo_path = realpath(optarg, NULL);
5664 if (repo_path == NULL)
5665 return got_error_from_errno2("realpath",
5667 got_path_strip_trailing_slashes(repo_path);
5691 cwd = getcwd(NULL, 0);
5693 error = got_error_from_errno("getcwd");
5697 error = got_repo_pack_fds_open(&pack_fds);
5701 if (repo_path == NULL) {
5702 error = got_worktree_open(&worktree, cwd);
5703 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5709 strdup(got_worktree_get_repo_path(worktree));
5710 if (repo_path == NULL)
5711 error = got_error_from_errno("strdup");
5715 repo_path = strdup(cwd);
5716 if (repo_path == NULL) {
5717 error = got_error_from_errno("strdup");
5723 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5728 const char *prefix = got_worktree_get_path_prefix(worktree);
5733 error = got_worktree_resolve_path(&p, worktree, path);
5736 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5737 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5739 error = got_error_from_errno("asprintf");
5744 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5748 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5753 error = got_repo_map_path(&in_repo_path, repo, path);
5758 if (commit_id_str == NULL) {
5759 struct got_reference *head_ref;
5761 refname = got_worktree_get_head_ref_name(worktree);
5763 refname = GOT_REF_HEAD;
5764 error = got_ref_open(&head_ref, repo, refname, 0);
5767 error = got_ref_resolve(&commit_id, repo, head_ref);
5768 got_ref_close(head_ref);
5772 struct got_reflist_head refs;
5774 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5778 error = got_repo_match_object_id(&commit_id, NULL,
5779 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5780 got_ref_list_free(&refs);
5786 /* Release work tree lock. */
5787 got_worktree_close(worktree);
5791 error = got_object_open_as_commit(&commit, repo, commit_id);
5795 error = print_tree(in_repo_path, commit, show_ids, recurse,
5796 in_repo_path, repo);
5803 got_object_commit_close(commit);
5805 got_worktree_close(worktree);
5807 const struct got_error *close_err = got_repo_close(repo);
5812 const struct got_error *pack_err =
5813 got_repo_pack_fds_close(pack_fds);
5823 fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5824 "[-S status-codes] [path ...]\n", getprogname());
5828 struct got_status_arg {
5833 static const struct got_error *
5834 print_status(void *arg, unsigned char status, unsigned char staged_status,
5835 const char *path, struct got_object_id *blob_id,
5836 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5837 int dirfd, const char *de_name)
5839 struct got_status_arg *st = arg;
5841 if (status == staged_status && (status == GOT_STATUS_DELETE))
5842 status = GOT_STATUS_NO_CHANGE;
5843 if (st != NULL && st->status_codes) {
5844 size_t ncodes = strlen(st->status_codes);
5847 for (i = 0; i < ncodes ; i++) {
5849 if (status == st->status_codes[i] ||
5850 staged_status == st->status_codes[i]) {
5855 if (status == st->status_codes[i] ||
5856 staged_status == st->status_codes[i])
5861 if (st->suppress && j == 0)
5868 printf("%c%c %s\n", status, staged_status, path);
5872 static const struct got_error *
5873 cmd_status(int argc, char *argv[])
5875 const struct got_error *error = NULL;
5876 struct got_repository *repo = NULL;
5877 struct got_worktree *worktree = NULL;
5878 struct got_status_arg st;
5880 struct got_pathlist_head paths;
5881 struct got_pathlist_entry *pe;
5882 int ch, i, no_ignores = 0;
5883 int *pack_fds = NULL;
5887 memset(&st, 0, sizeof(st));
5888 st.status_codes = NULL;
5891 while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5897 if (st.status_codes != NULL && st.suppress == 0)
5898 option_conflict('S', 's');
5902 for (i = 0; i < strlen(optarg); i++) {
5903 switch (optarg[i]) {
5904 case GOT_STATUS_MODIFY:
5905 case GOT_STATUS_ADD:
5906 case GOT_STATUS_DELETE:
5907 case GOT_STATUS_CONFLICT:
5908 case GOT_STATUS_MISSING:
5909 case GOT_STATUS_OBSTRUCTED:
5910 case GOT_STATUS_UNVERSIONED:
5911 case GOT_STATUS_MODE_CHANGE:
5912 case GOT_STATUS_NONEXISTENT:
5915 errx(1, "invalid status code '%c'",
5919 if (ch == 's' && st.suppress)
5920 option_conflict('s', 'S');
5921 st.status_codes = optarg;
5933 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5937 cwd = getcwd(NULL, 0);
5939 error = got_error_from_errno("getcwd");
5943 error = got_repo_pack_fds_open(&pack_fds);
5947 error = got_worktree_open(&worktree, cwd);
5949 if (error->code == GOT_ERR_NOT_WORKTREE)
5950 error = wrap_not_worktree_error(error, "status", cwd);
5954 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5959 error = apply_unveil(got_repo_get_path(repo), 1,
5960 got_worktree_get_root_path(worktree));
5964 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5968 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5969 print_status, &st, check_cancelled, NULL);
5972 const struct got_error *pack_err =
5973 got_repo_pack_fds_close(pack_fds);
5978 TAILQ_FOREACH(pe, &paths, entry)
5979 free((char *)pe->path);
5980 got_pathlist_free(&paths);
5989 "usage: %s ref [-r repository] [-l] [-t] [-c object] "
5990 "[-s reference] [-d] [name]\n",
5995 static const struct got_error *
5996 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
5998 static const struct got_error *err = NULL;
5999 struct got_reflist_head refs;
6000 struct got_reflist_entry *re;
6003 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6004 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6009 TAILQ_FOREACH(re, &refs, entry) {
6011 refstr = got_ref_to_str(re->ref);
6012 if (refstr == NULL) {
6013 err = got_error_from_errno("got_ref_to_str");
6016 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6020 got_ref_list_free(&refs);
6024 static const struct got_error *
6025 delete_ref_by_name(struct got_repository *repo, const char *refname)
6027 const struct got_error *err;
6028 struct got_reference *ref;
6030 err = got_ref_open(&ref, repo, refname, 0);
6034 err = delete_ref(repo, ref);
6039 static const struct got_error *
6040 add_ref(struct got_repository *repo, const char *refname, const char *target)
6042 const struct got_error *err = NULL;
6043 struct got_object_id *id = NULL;
6044 struct got_reference *ref = NULL;
6045 struct got_reflist_head refs;
6048 * Don't let the user create a reference name with a leading '-'.
6049 * While technically a valid reference name, this case is usually
6050 * an unintended typo.
6052 if (refname[0] == '-')
6053 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6056 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6059 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6061 got_ref_list_free(&refs);
6065 err = got_ref_alloc(&ref, refname, id);
6069 err = got_ref_write(ref, repo);
6077 static const struct got_error *
6078 add_symref(struct got_repository *repo, const char *refname, const char *target)
6080 const struct got_error *err = NULL;
6081 struct got_reference *ref = NULL;
6082 struct got_reference *target_ref = NULL;
6085 * Don't let the user create a reference name with a leading '-'.
6086 * While technically a valid reference name, this case is usually
6087 * an unintended typo.
6089 if (refname[0] == '-')
6090 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6092 err = got_ref_open(&target_ref, repo, target, 0);
6096 err = got_ref_alloc_symref(&ref, refname, target_ref);
6100 err = got_ref_write(ref, repo);
6103 got_ref_close(target_ref);
6109 static const struct got_error *
6110 cmd_ref(int argc, char *argv[])
6112 const struct got_error *error = NULL;
6113 struct got_repository *repo = NULL;
6114 struct got_worktree *worktree = NULL;
6115 char *cwd = NULL, *repo_path = NULL;
6116 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6117 const char *obj_arg = NULL, *symref_target= NULL;
6118 char *refname = NULL;
6119 int *pack_fds = NULL;
6121 while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
6130 repo_path = realpath(optarg, NULL);
6131 if (repo_path == NULL)
6132 return got_error_from_errno2("realpath",
6134 got_path_strip_trailing_slashes(repo_path);
6140 symref_target = optarg;
6151 if (obj_arg && do_list)
6152 option_conflict('c', 'l');
6153 if (obj_arg && do_delete)
6154 option_conflict('c', 'd');
6155 if (obj_arg && symref_target)
6156 option_conflict('c', 's');
6157 if (symref_target && do_delete)
6158 option_conflict('s', 'd');
6159 if (symref_target && do_list)
6160 option_conflict('s', 'l');
6161 if (do_delete && do_list)
6162 option_conflict('d', 'l');
6163 if (sort_by_time && !do_list)
6164 errx(1, "-t option requires -l option");
6170 if (argc != 0 && argc != 1)
6173 refname = strdup(argv[0]);
6174 if (refname == NULL) {
6175 error = got_error_from_errno("strdup");
6182 refname = strdup(argv[0]);
6183 if (refname == NULL) {
6184 error = got_error_from_errno("strdup");
6190 got_path_strip_trailing_slashes(refname);
6193 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6194 "sendfd unveil", NULL) == -1)
6197 cwd = getcwd(NULL, 0);
6199 error = got_error_from_errno("getcwd");
6203 error = got_repo_pack_fds_open(&pack_fds);
6207 if (repo_path == NULL) {
6208 error = got_worktree_open(&worktree, cwd);
6209 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6215 strdup(got_worktree_get_repo_path(worktree));
6216 if (repo_path == NULL)
6217 error = got_error_from_errno("strdup");
6221 repo_path = strdup(cwd);
6222 if (repo_path == NULL) {
6223 error = got_error_from_errno("strdup");
6229 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6235 /* Remove "cpath" promise. */
6236 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6242 error = apply_unveil(got_repo_get_path(repo), do_list,
6243 worktree ? got_worktree_get_root_path(worktree) : NULL);
6248 error = list_refs(repo, refname, sort_by_time);
6250 error = delete_ref_by_name(repo, refname);
6251 else if (symref_target)
6252 error = add_symref(repo, refname, symref_target);
6254 if (obj_arg == NULL)
6256 error = add_ref(repo, refname, obj_arg);
6261 const struct got_error *close_err = got_repo_close(repo);
6266 got_worktree_close(worktree);
6268 const struct got_error *pack_err =
6269 got_repo_pack_fds_close(pack_fds);
6282 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
6283 "[-n] [name]\n", getprogname());
6287 static const struct got_error *
6288 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6289 struct got_reference *ref)
6291 const struct got_error *err = NULL;
6292 const char *refname, *marker = " ";
6295 refname = got_ref_get_name(ref);
6296 if (worktree && strcmp(refname,
6297 got_worktree_get_head_ref_name(worktree)) == 0) {
6298 struct got_object_id *id = NULL;
6300 err = got_ref_resolve(&id, repo, ref);
6303 if (got_object_id_cmp(id,
6304 got_worktree_get_base_commit_id(worktree)) == 0)
6311 if (strncmp(refname, "refs/heads/", 11) == 0)
6313 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6315 if (strncmp(refname, "refs/remotes/", 13) == 0)
6318 refstr = got_ref_to_str(ref);
6320 return got_error_from_errno("got_ref_to_str");
6322 printf("%s%s: %s\n", marker, refname, refstr);
6327 static const struct got_error *
6328 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6330 const char *refname;
6332 if (worktree == NULL)
6333 return got_error(GOT_ERR_NOT_WORKTREE);
6335 refname = got_worktree_get_head_ref_name(worktree);
6337 if (strncmp(refname, "refs/heads/", 11) == 0)
6339 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6342 printf("%s\n", refname);
6347 static const struct got_error *
6348 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6351 static const struct got_error *err = NULL;
6352 struct got_reflist_head refs;
6353 struct got_reflist_entry *re;
6354 struct got_reference *temp_ref = NULL;
6355 int rebase_in_progress, histedit_in_progress;
6360 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6365 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6370 if (rebase_in_progress || histedit_in_progress) {
6371 err = got_ref_open(&temp_ref, repo,
6372 got_worktree_get_head_ref_name(worktree), 0);
6375 list_branch(repo, worktree, temp_ref);
6376 got_ref_close(temp_ref);
6380 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6381 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6386 TAILQ_FOREACH(re, &refs, entry)
6387 list_branch(repo, worktree, re->ref);
6389 got_ref_list_free(&refs);
6391 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6392 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6397 TAILQ_FOREACH(re, &refs, entry)
6398 list_branch(repo, worktree, re->ref);
6400 got_ref_list_free(&refs);
6405 static const struct got_error *
6406 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6407 const char *branch_name)
6409 const struct got_error *err = NULL;
6410 struct got_reference *ref = NULL;
6411 char *refname, *remote_refname = NULL;
6413 if (strncmp(branch_name, "refs/", 5) == 0)
6415 if (strncmp(branch_name, "heads/", 6) == 0)
6417 else if (strncmp(branch_name, "remotes/", 8) == 0)
6420 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6421 return got_error_from_errno("asprintf");
6423 if (asprintf(&remote_refname, "refs/remotes/%s",
6424 branch_name) == -1) {
6425 err = got_error_from_errno("asprintf");
6429 err = got_ref_open(&ref, repo, refname, 0);
6431 const struct got_error *err2;
6432 if (err->code != GOT_ERR_NOT_REF)
6435 * Keep 'err' intact such that if neither branch exists
6436 * we report "refs/heads" rather than "refs/remotes" in
6437 * our error message.
6439 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6446 strcmp(got_worktree_get_head_ref_name(worktree),
6447 got_ref_get_name(ref)) == 0) {
6448 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6449 "will not delete this work tree's current branch");
6453 err = delete_ref(repo, ref);
6458 free(remote_refname);
6462 static const struct got_error *
6463 add_branch(struct got_repository *repo, const char *branch_name,
6464 struct got_object_id *base_commit_id)
6466 const struct got_error *err = NULL;
6467 struct got_reference *ref = NULL;
6468 char *base_refname = NULL, *refname = NULL;
6471 * Don't let the user create a branch name with a leading '-'.
6472 * While technically a valid reference name, this case is usually
6473 * an unintended typo.
6475 if (branch_name[0] == '-')
6476 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6478 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6481 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6482 err = got_error_from_errno("asprintf");
6486 err = got_ref_open(&ref, repo, refname, 0);
6488 err = got_error(GOT_ERR_BRANCH_EXISTS);
6490 } else if (err->code != GOT_ERR_NOT_REF)
6493 err = got_ref_alloc(&ref, refname, base_commit_id);
6497 err = got_ref_write(ref, repo);
6506 static const struct got_error *
6507 cmd_branch(int argc, char *argv[])
6509 const struct got_error *error = NULL;
6510 struct got_repository *repo = NULL;
6511 struct got_worktree *worktree = NULL;
6512 char *cwd = NULL, *repo_path = NULL;
6513 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6514 const char *delref = NULL, *commit_id_arg = NULL;
6515 struct got_reference *ref = NULL;
6516 struct got_pathlist_head paths;
6517 struct got_pathlist_entry *pe;
6518 struct got_object_id *commit_id = NULL;
6519 char *commit_id_str = NULL;
6520 int *pack_fds = NULL;
6524 while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6527 commit_id_arg = optarg;
6533 repo_path = realpath(optarg, NULL);
6534 if (repo_path == NULL)
6535 return got_error_from_errno2("realpath",
6537 got_path_strip_trailing_slashes(repo_path);
6554 if (do_list && delref)
6555 option_conflict('l', 'd');
6556 if (sort_by_time && !do_list)
6557 errx(1, "-t option requires -l option");
6562 if (!do_list && !delref && argc == 0)
6565 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6566 errx(1, "-c option can only be used when creating a branch");
6568 if (do_list || delref) {
6571 } else if (!do_show && argc != 1)
6575 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6576 "sendfd unveil", NULL) == -1)
6579 cwd = getcwd(NULL, 0);
6581 error = got_error_from_errno("getcwd");
6585 error = got_repo_pack_fds_open(&pack_fds);
6589 if (repo_path == NULL) {
6590 error = got_worktree_open(&worktree, cwd);
6591 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6597 strdup(got_worktree_get_repo_path(worktree));
6598 if (repo_path == NULL)
6599 error = got_error_from_errno("strdup");
6603 repo_path = strdup(cwd);
6604 if (repo_path == NULL) {
6605 error = got_error_from_errno("strdup");
6611 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6616 if (do_list || do_show) {
6617 /* Remove "cpath" promise. */
6618 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6624 error = apply_unveil(got_repo_get_path(repo), do_list,
6625 worktree ? got_worktree_get_root_path(worktree) : NULL);
6630 error = show_current_branch(repo, worktree);
6632 error = list_branches(repo, worktree, sort_by_time);
6634 error = delete_branch(repo, worktree, delref);
6636 struct got_reflist_head refs;
6638 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6642 if (commit_id_arg == NULL)
6643 commit_id_arg = worktree ?
6644 got_worktree_get_head_ref_name(worktree) :
6646 error = got_repo_match_object_id(&commit_id, NULL,
6647 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6648 got_ref_list_free(&refs);
6651 error = add_branch(repo, argv[0], commit_id);
6654 if (worktree && do_update) {
6655 struct got_update_progress_arg upa;
6656 char *branch_refname = NULL;
6658 error = got_object_id_str(&commit_id_str, commit_id);
6661 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6665 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6667 error = got_error_from_errno("asprintf");
6670 error = got_ref_open(&ref, repo, branch_refname, 0);
6671 free(branch_refname);
6674 error = switch_head_ref(ref, commit_id, worktree,
6678 error = got_worktree_set_base_commit_id(worktree, repo,
6682 memset(&upa, 0, sizeof(upa));
6683 error = got_worktree_checkout_files(worktree, &paths,
6684 repo, update_progress, &upa, check_cancelled,
6688 if (upa.did_something) {
6689 printf("Updated to %s: %s\n",
6690 got_worktree_get_head_ref_name(worktree),
6693 print_update_progress_stats(&upa);
6700 const struct got_error *close_err = got_repo_close(repo);
6705 got_worktree_close(worktree);
6707 const struct got_error *pack_err =
6708 got_repo_pack_fds_close(pack_fds);
6715 free(commit_id_str);
6716 TAILQ_FOREACH(pe, &paths, entry)
6717 free((char *)pe->path);
6718 got_pathlist_free(&paths);
6727 "usage: %s tag [-c commit] [-r repository] [-l] "
6728 "[-m message] name\n", getprogname());
6733 static const struct got_error *
6734 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6736 const struct got_error *err = NULL;
6737 struct got_reflist_entry *re, *se, *new;
6738 struct got_object_id *re_id, *se_id;
6739 struct got_tag_object *re_tag, *se_tag;
6740 time_t re_time, se_time;
6742 STAILQ_FOREACH(re, tags, entry) {
6743 se = STAILQ_FIRST(sorted);
6745 err = got_reflist_entry_dup(&new, re);
6748 STAILQ_INSERT_HEAD(sorted, new, entry);
6751 err = got_ref_resolve(&re_id, repo, re->ref);
6754 err = got_object_open_as_tag(&re_tag, repo, re_id);
6758 re_time = got_object_tag_get_tagger_time(re_tag);
6759 got_object_tag_close(re_tag);
6763 err = got_ref_resolve(&se_id, repo, re->ref);
6766 err = got_object_open_as_tag(&se_tag, repo, se_id);
6770 se_time = got_object_tag_get_tagger_time(se_tag);
6771 got_object_tag_close(se_tag);
6773 if (se_time > re_time) {
6774 err = got_reflist_entry_dup(&new, re);
6777 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6780 se = STAILQ_NEXT(se, entry);
6789 static const struct got_error *
6790 list_tags(struct got_repository *repo)
6792 static const struct got_error *err = NULL;
6793 struct got_reflist_head refs;
6794 struct got_reflist_entry *re;
6798 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6802 TAILQ_FOREACH(re, &refs, entry) {
6803 const char *refname;
6804 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6808 struct got_object_id *id;
6809 struct got_tag_object *tag;
6810 struct got_commit_object *commit = NULL;
6812 refname = got_ref_get_name(re->ref);
6813 if (strncmp(refname, "refs/tags/", 10) != 0)
6816 refstr = got_ref_to_str(re->ref);
6817 if (refstr == NULL) {
6818 err = got_error_from_errno("got_ref_to_str");
6821 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6824 err = got_ref_resolve(&id, repo, re->ref);
6827 err = got_object_open_as_tag(&tag, repo, id);
6829 if (err->code != GOT_ERR_OBJ_TYPE) {
6833 /* "lightweight" tag */
6834 err = got_object_open_as_commit(&commit, repo, id);
6839 tagger = got_object_commit_get_committer(commit);
6841 got_object_commit_get_committer_time(commit);
6842 err = got_object_id_str(&id_str, id);
6848 tagger = got_object_tag_get_tagger(tag);
6849 tagger_time = got_object_tag_get_tagger_time(tag);
6850 err = got_object_id_str(&id_str,
6851 got_object_tag_get_object_id(tag));
6855 printf("from: %s\n", tagger);
6856 datestr = get_datestr(&tagger_time, datebuf);
6858 printf("date: %s UTC\n", datestr);
6860 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6862 switch (got_object_tag_get_object_type(tag)) {
6863 case GOT_OBJ_TYPE_BLOB:
6864 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6867 case GOT_OBJ_TYPE_TREE:
6868 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6871 case GOT_OBJ_TYPE_COMMIT:
6872 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6875 case GOT_OBJ_TYPE_TAG:
6876 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6885 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6888 got_object_commit_close(commit);
6890 tagmsg0 = strdup(got_object_tag_get_message(tag));
6891 got_object_tag_close(tag);
6892 if (tagmsg0 == NULL) {
6893 err = got_error_from_errno("strdup");
6900 line = strsep(&tagmsg, "\n");
6902 printf(" %s\n", line);
6907 got_ref_list_free(&refs);
6911 static const struct got_error *
6912 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6913 const char *tag_name, const char *repo_path)
6915 const struct got_error *err = NULL;
6916 char *template = NULL, *initial_content = NULL;
6917 char *editor = NULL;
6918 int initial_content_len;
6921 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6922 err = got_error_from_errno("asprintf");
6926 initial_content_len = asprintf(&initial_content,
6927 "\n# tagging commit %s as %s\n",
6928 commit_id_str, tag_name);
6929 if (initial_content_len == -1) {
6930 err = got_error_from_errno("asprintf");
6934 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6938 if (write(fd, initial_content, initial_content_len) == -1) {
6939 err = got_error_from_errno2("write", *tagmsg_path);
6943 err = get_editor(&editor);
6946 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6947 initial_content_len, 1);
6949 free(initial_content);
6953 if (fd != -1 && close(fd) == -1 && err == NULL)
6954 err = got_error_from_errno2("close", *tagmsg_path);
6956 /* Editor is done; we can now apply unveil(2) */
6958 err = apply_unveil(repo_path, 0, NULL);
6966 static const struct got_error *
6967 add_tag(struct got_repository *repo, const char *tagger,
6968 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6970 const struct got_error *err = NULL;
6971 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6972 char *label = NULL, *commit_id_str = NULL;
6973 struct got_reference *ref = NULL;
6974 char *refname = NULL, *tagmsg = NULL;
6975 char *tagmsg_path = NULL, *tag_id_str = NULL;
6976 int preserve_tagmsg = 0;
6977 struct got_reflist_head refs;
6982 * Don't let the user create a tag name with a leading '-'.
6983 * While technically a valid reference name, this case is usually
6984 * an unintended typo.
6986 if (tag_name[0] == '-')
6987 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6989 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6993 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6994 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6998 err = got_object_id_str(&commit_id_str, commit_id);
7002 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7003 refname = strdup(tag_name);
7004 if (refname == NULL) {
7005 err = got_error_from_errno("strdup");
7009 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
7010 err = got_error_from_errno("asprintf");
7014 err = got_ref_open(&ref, repo, refname, 0);
7016 err = got_error(GOT_ERR_TAG_EXISTS);
7018 } else if (err->code != GOT_ERR_NOT_REF)
7021 if (tagmsg_arg == NULL) {
7022 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7023 tag_name, got_repo_get_path(repo));
7025 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7026 tagmsg_path != NULL)
7027 preserve_tagmsg = 1;
7032 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7033 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
7036 preserve_tagmsg = 1;
7040 err = got_ref_alloc(&ref, refname, tag_id);
7043 preserve_tagmsg = 1;
7047 err = got_ref_write(ref, repo);
7050 preserve_tagmsg = 1;
7054 err = got_object_id_str(&tag_id_str, tag_id);
7057 preserve_tagmsg = 1;
7060 printf("Created tag %s\n", tag_id_str);
7062 if (preserve_tagmsg) {
7063 fprintf(stderr, "%s: tag message preserved in %s\n",
7064 getprogname(), tagmsg_path);
7065 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7066 err = got_error_from_errno2("unlink", tagmsg_path);
7071 free(commit_id_str);
7075 got_ref_list_free(&refs);
7079 static const struct got_error *
7080 cmd_tag(int argc, char *argv[])
7082 const struct got_error *error = NULL;
7083 struct got_repository *repo = NULL;
7084 struct got_worktree *worktree = NULL;
7085 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7086 char *gitconfig_path = NULL, *tagger = NULL;
7087 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
7088 int ch, do_list = 0;
7089 int *pack_fds = NULL;
7091 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
7094 commit_id_arg = optarg;
7100 repo_path = realpath(optarg, NULL);
7101 if (repo_path == NULL)
7102 return got_error_from_errno2("realpath",
7104 got_path_strip_trailing_slashes(repo_path);
7119 if (commit_id_arg != NULL)
7121 "-c option can only be used when creating a tag");
7123 option_conflict('l', 'm');
7126 } else if (argc != 1)
7132 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7133 "sendfd unveil", NULL) == -1)
7136 cwd = getcwd(NULL, 0);
7138 error = got_error_from_errno("getcwd");
7142 error = got_repo_pack_fds_open(&pack_fds);
7146 if (repo_path == NULL) {
7147 error = got_worktree_open(&worktree, cwd);
7148 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7154 strdup(got_worktree_get_repo_path(worktree));
7155 if (repo_path == NULL)
7156 error = got_error_from_errno("strdup");
7160 repo_path = strdup(cwd);
7161 if (repo_path == NULL) {
7162 error = got_error_from_errno("strdup");
7170 /* Release work tree lock. */
7171 got_worktree_close(worktree);
7174 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7179 /* Remove "cpath" promise. */
7180 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7184 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7187 error = list_tags(repo);
7189 error = get_gitconfig_path(&gitconfig_path);
7192 error = got_repo_open(&repo, repo_path, gitconfig_path,
7197 error = get_author(&tagger, repo, worktree);
7201 /* Release work tree lock. */
7202 got_worktree_close(worktree);
7207 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7212 if (commit_id_arg == NULL) {
7213 struct got_reference *head_ref;
7214 struct got_object_id *commit_id;
7215 error = got_ref_open(&head_ref, repo,
7216 worktree ? got_worktree_get_head_ref_name(worktree)
7220 error = got_ref_resolve(&commit_id, repo, head_ref);
7221 got_ref_close(head_ref);
7224 error = got_object_id_str(&commit_id_str, commit_id);
7230 error = add_tag(repo, tagger, tag_name,
7231 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
7235 const struct got_error *close_err = got_repo_close(repo);
7240 got_worktree_close(worktree);
7242 const struct got_error *pack_err =
7243 got_repo_pack_fds_close(pack_fds);
7249 free(gitconfig_path);
7250 free(commit_id_str);
7258 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
7263 static const struct got_error *
7264 add_progress(void *arg, unsigned char status, const char *path)
7266 while (path[0] == '/')
7268 printf("%c %s\n", status, path);
7272 static const struct got_error *
7273 cmd_add(int argc, char *argv[])
7275 const struct got_error *error = NULL;
7276 struct got_repository *repo = NULL;
7277 struct got_worktree *worktree = NULL;
7279 struct got_pathlist_head paths;
7280 struct got_pathlist_entry *pe;
7281 int ch, can_recurse = 0, no_ignores = 0;
7282 int *pack_fds = NULL;
7286 while ((ch = getopt(argc, argv, "IR")) != -1) {
7304 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7311 cwd = getcwd(NULL, 0);
7313 error = got_error_from_errno("getcwd");
7317 error = got_repo_pack_fds_open(&pack_fds);
7321 error = got_worktree_open(&worktree, cwd);
7323 if (error->code == GOT_ERR_NOT_WORKTREE)
7324 error = wrap_not_worktree_error(error, "add", cwd);
7328 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7333 error = apply_unveil(got_repo_get_path(repo), 1,
7334 got_worktree_get_root_path(worktree));
7338 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7345 TAILQ_FOREACH(pe, &paths, entry) {
7346 if (asprintf(&ondisk_path, "%s/%s",
7347 got_worktree_get_root_path(worktree),
7349 error = got_error_from_errno("asprintf");
7352 if (lstat(ondisk_path, &sb) == -1) {
7353 if (errno == ENOENT) {
7357 error = got_error_from_errno2("lstat",
7363 if (S_ISDIR(sb.st_mode)) {
7364 error = got_error_msg(GOT_ERR_BAD_PATH,
7365 "adding directories requires -R option");
7371 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7372 NULL, repo, no_ignores);
7375 const struct got_error *close_err = got_repo_close(repo);
7380 got_worktree_close(worktree);
7382 const struct got_error *pack_err =
7383 got_repo_pack_fds_close(pack_fds);
7387 TAILQ_FOREACH(pe, &paths, entry)
7388 free((char *)pe->path);
7389 got_pathlist_free(&paths);
7397 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
7398 "path ...\n", getprogname());
7402 static const struct got_error *
7403 print_remove_status(void *arg, unsigned char status,
7404 unsigned char staged_status, const char *path)
7406 while (path[0] == '/')
7408 if (status == GOT_STATUS_NONEXISTENT)
7410 if (status == staged_status && (status == GOT_STATUS_DELETE))
7411 status = GOT_STATUS_NO_CHANGE;
7412 printf("%c%c %s\n", status, staged_status, path);
7416 static const struct got_error *
7417 cmd_remove(int argc, char *argv[])
7419 const struct got_error *error = NULL;
7420 struct got_worktree *worktree = NULL;
7421 struct got_repository *repo = NULL;
7422 const char *status_codes = NULL;
7424 struct got_pathlist_head paths;
7425 struct got_pathlist_entry *pe;
7426 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7427 int ignore_missing_paths = 0;
7428 int *pack_fds = NULL;
7432 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7435 delete_local_mods = 1;
7436 ignore_missing_paths = 1;
7445 for (i = 0; i < strlen(optarg); i++) {
7446 switch (optarg[i]) {
7447 case GOT_STATUS_MODIFY:
7448 delete_local_mods = 1;
7450 case GOT_STATUS_MISSING:
7451 ignore_missing_paths = 1;
7454 errx(1, "invalid status code '%c'",
7458 status_codes = optarg;
7470 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7477 cwd = getcwd(NULL, 0);
7479 error = got_error_from_errno("getcwd");
7483 error = got_repo_pack_fds_open(&pack_fds);
7487 error = got_worktree_open(&worktree, cwd);
7489 if (error->code == GOT_ERR_NOT_WORKTREE)
7490 error = wrap_not_worktree_error(error, "remove", cwd);
7494 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7499 error = apply_unveil(got_repo_get_path(repo), 1,
7500 got_worktree_get_root_path(worktree));
7504 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7511 TAILQ_FOREACH(pe, &paths, entry) {
7512 if (asprintf(&ondisk_path, "%s/%s",
7513 got_worktree_get_root_path(worktree),
7515 error = got_error_from_errno("asprintf");
7518 if (lstat(ondisk_path, &sb) == -1) {
7519 if (errno == ENOENT) {
7523 error = got_error_from_errno2("lstat",
7529 if (S_ISDIR(sb.st_mode)) {
7530 error = got_error_msg(GOT_ERR_BAD_PATH,
7531 "removing directories requires -R option");
7537 error = got_worktree_schedule_delete(worktree, &paths,
7538 delete_local_mods, status_codes, print_remove_status, NULL,
7539 repo, keep_on_disk, ignore_missing_paths);
7542 const struct got_error *close_err = got_repo_close(repo);
7547 got_worktree_close(worktree);
7549 const struct got_error *pack_err =
7550 got_repo_pack_fds_close(pack_fds);
7554 TAILQ_FOREACH(pe, &paths, entry)
7555 free((char *)pe->path);
7556 got_pathlist_free(&paths);
7564 fprintf(stderr, "usage: %s patch [-n] [-p strip-count] "
7565 "[-R] [patchfile]\n", getprogname());
7569 static const struct got_error *
7570 patch_from_stdin(int *patchfd)
7572 const struct got_error *err = NULL;
7574 char *path, buf[BUFSIZ];
7575 sig_t sighup, sigint, sigquit;
7577 err = got_opentemp_named_fd(&path, patchfd,
7578 GOT_TMPDIR_STR "/got-patch");
7584 sighup = signal(SIGHUP, SIG_DFL);
7585 sigint = signal(SIGINT, SIG_DFL);
7586 sigquit = signal(SIGQUIT, SIG_DFL);
7589 r = read(0, buf, sizeof(buf));
7591 err = got_error_from_errno("read");
7596 if (write(*patchfd, buf, r) == -1) {
7597 err = got_error_from_errno("write");
7602 signal(SIGHUP, sighup);
7603 signal(SIGINT, sigint);
7604 signal(SIGQUIT, sigquit);
7606 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7607 err = got_error_from_errno("lseek");
7617 static const struct got_error *
7618 patch_progress(void *arg, const char *old, const char *new,
7619 unsigned char status, const struct got_error *error, long old_from,
7620 long old_lines, long new_from, long new_lines, long offset,
7621 const struct got_error *hunk_err)
7623 const char *path = new == NULL ? old : new;
7625 while (*path == '/')
7629 printf("%c %s\n", status, path);
7632 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7634 if (offset != 0 || hunk_err != NULL) {
7635 printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
7636 old_lines, new_from, new_lines);
7637 if (hunk_err != NULL)
7638 printf("%s\n", hunk_err->msg);
7640 printf("applied with offset %ld\n", offset);
7646 static const struct got_error *
7647 cmd_patch(int argc, char *argv[])
7649 const struct got_error *error = NULL, *close_error = NULL;
7650 struct got_worktree *worktree = NULL;
7651 struct got_repository *repo = NULL;
7654 int ch, nop = 0, strip = -1, reverse = 0;
7656 int *pack_fds = NULL;
7658 while ((ch = getopt(argc, argv, "np:R")) != -1) {
7664 strip = strtonum(optarg, 0, INT_MAX, &errstr);
7666 errx(1, "pathname strip count is %s: %s",
7682 error = patch_from_stdin(&patchfd);
7685 } else if (argc == 1) {
7686 patchfd = open(argv[0], O_RDONLY);
7687 if (patchfd == -1) {
7688 error = got_error_from_errno2("open", argv[0]);
7694 if ((cwd = getcwd(NULL, 0)) == NULL) {
7695 error = got_error_from_errno("getcwd");
7699 error = got_repo_pack_fds_open(&pack_fds);
7703 error = got_worktree_open(&worktree, cwd);
7707 const char *repo_path = got_worktree_get_repo_path(worktree);
7708 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7712 error = apply_unveil(got_repo_get_path(repo), 0,
7713 got_worktree_get_root_path(worktree));
7718 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock",
7723 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
7724 &patch_progress, NULL, check_cancelled, NULL);
7728 close_error = got_repo_close(repo);
7730 error = close_error;
7732 if (worktree != NULL) {
7733 close_error = got_worktree_close(worktree);
7735 error = close_error;
7738 const struct got_error *pack_err =
7739 got_repo_pack_fds_close(pack_fds);
7750 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7751 "path ...\n", getprogname());
7755 static const struct got_error *
7756 revert_progress(void *arg, unsigned char status, const char *path)
7758 if (status == GOT_STATUS_UNVERSIONED)
7761 while (path[0] == '/')
7763 printf("%c %s\n", status, path);
7767 struct choose_patch_arg {
7768 FILE *patch_script_file;
7772 static const struct got_error *
7773 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7774 int nchanges, const char *action)
7776 const struct got_error *err;
7778 size_t linesize = 0;
7782 case GOT_STATUS_ADD:
7783 printf("A %s\n%s this addition? [y/n] ", path, action);
7785 case GOT_STATUS_DELETE:
7786 printf("D %s\n%s this deletion? [y/n] ", path, action);
7788 case GOT_STATUS_MODIFY:
7789 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7790 return got_error_from_errno("fseek");
7791 printf(GOT_COMMIT_SEP_STR);
7792 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7794 if (linelen == -1 && ferror(patch_file)) {
7795 err = got_error_from_errno("getline");
7800 printf(GOT_COMMIT_SEP_STR);
7801 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7802 path, n, nchanges, action);
7805 return got_error_path(path, GOT_ERR_FILE_STATUS);
7811 static const struct got_error *
7812 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7813 FILE *patch_file, int n, int nchanges)
7815 const struct got_error *err = NULL;
7817 size_t linesize = 0;
7820 struct choose_patch_arg *a = arg;
7822 *choice = GOT_PATCH_CHOICE_NONE;
7824 if (a->patch_script_file) {
7826 err = show_change(status, path, patch_file, n, nchanges,
7830 linelen = getline(&line, &linesize, a->patch_script_file);
7831 if (linelen == -1) {
7832 if (ferror(a->patch_script_file))
7833 return got_error_from_errno("getline");
7836 nl = strchr(line, '\n');
7839 if (strcmp(line, "y") == 0) {
7840 *choice = GOT_PATCH_CHOICE_YES;
7842 } else if (strcmp(line, "n") == 0) {
7843 *choice = GOT_PATCH_CHOICE_NO;
7845 } else if (strcmp(line, "q") == 0 &&
7846 status == GOT_STATUS_MODIFY) {
7847 *choice = GOT_PATCH_CHOICE_QUIT;
7850 printf("invalid response '%s'\n", line);
7855 while (resp != 'y' && resp != 'n' && resp != 'q') {
7856 err = show_change(status, path, patch_file, n, nchanges,
7863 if (status == GOT_STATUS_MODIFY) {
7864 if (resp != 'y' && resp != 'n' && resp != 'q') {
7865 printf("invalid response '%c'\n", resp);
7868 } else if (resp != 'y' && resp != 'n') {
7869 printf("invalid response '%c'\n", resp);
7875 *choice = GOT_PATCH_CHOICE_YES;
7876 else if (resp == 'n')
7877 *choice = GOT_PATCH_CHOICE_NO;
7878 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7879 *choice = GOT_PATCH_CHOICE_QUIT;
7884 static const struct got_error *
7885 cmd_revert(int argc, char *argv[])
7887 const struct got_error *error = NULL;
7888 struct got_worktree *worktree = NULL;
7889 struct got_repository *repo = NULL;
7890 char *cwd = NULL, *path = NULL;
7891 struct got_pathlist_head paths;
7892 struct got_pathlist_entry *pe;
7893 int ch, can_recurse = 0, pflag = 0;
7894 FILE *patch_script_file = NULL;
7895 const char *patch_script_path = NULL;
7896 struct choose_patch_arg cpa;
7897 int *pack_fds = NULL;
7901 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7907 patch_script_path = optarg;
7922 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7923 "unveil", NULL) == -1)
7928 if (patch_script_path && !pflag)
7929 errx(1, "-F option can only be used together with -p option");
7931 cwd = getcwd(NULL, 0);
7933 error = got_error_from_errno("getcwd");
7937 error = got_repo_pack_fds_open(&pack_fds);
7941 error = got_worktree_open(&worktree, cwd);
7943 if (error->code == GOT_ERR_NOT_WORKTREE)
7944 error = wrap_not_worktree_error(error, "revert", cwd);
7948 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7953 if (patch_script_path) {
7954 patch_script_file = fopen(patch_script_path, "re");
7955 if (patch_script_file == NULL) {
7956 error = got_error_from_errno2("fopen",
7961 error = apply_unveil(got_repo_get_path(repo), 1,
7962 got_worktree_get_root_path(worktree));
7966 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7973 TAILQ_FOREACH(pe, &paths, entry) {
7974 if (asprintf(&ondisk_path, "%s/%s",
7975 got_worktree_get_root_path(worktree),
7977 error = got_error_from_errno("asprintf");
7980 if (lstat(ondisk_path, &sb) == -1) {
7981 if (errno == ENOENT) {
7985 error = got_error_from_errno2("lstat",
7991 if (S_ISDIR(sb.st_mode)) {
7992 error = got_error_msg(GOT_ERR_BAD_PATH,
7993 "reverting directories requires -R option");
7999 cpa.patch_script_file = patch_script_file;
8000 cpa.action = "revert";
8001 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8002 pflag ? choose_patch : NULL, &cpa, repo);
8004 if (patch_script_file && fclose(patch_script_file) == EOF &&
8006 error = got_error_from_errno2("fclose", patch_script_path);
8008 const struct got_error *close_err = got_repo_close(repo);
8013 got_worktree_close(worktree);
8015 const struct got_error *pack_err =
8016 got_repo_pack_fds_close(pack_fds);
8028 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
8029 "[path ...]\n", getprogname());
8033 struct collect_commit_logmsg_arg {
8034 const char *cmdline_log;
8035 const char *prepared_log;
8036 int non_interactive;
8038 const char *worktree_path;
8039 const char *branch_name;
8040 const char *repo_path;
8045 static const struct got_error *
8046 read_prepared_logmsg(char **logmsg, const char *path)
8048 const struct got_error *err = NULL;
8054 memset(&sb, 0, sizeof(sb));
8056 f = fopen(path, "re");
8058 return got_error_from_errno2("fopen", path);
8060 if (fstat(fileno(f), &sb) == -1) {
8061 err = got_error_from_errno2("fstat", path);
8064 if (sb.st_size == 0) {
8065 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8069 *logmsg = malloc(sb.st_size + 1);
8070 if (*logmsg == NULL) {
8071 err = got_error_from_errno("malloc");
8075 r = fread(*logmsg, 1, sb.st_size, f);
8076 if (r != sb.st_size) {
8078 err = got_error_from_errno2("fread", path);
8080 err = got_error(GOT_ERR_IO);
8083 (*logmsg)[sb.st_size] = '\0';
8085 if (fclose(f) == EOF && err == NULL)
8086 err = got_error_from_errno2("fclose", path);
8095 static const struct got_error *
8096 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
8099 char *initial_content = NULL;
8100 struct got_pathlist_entry *pe;
8101 const struct got_error *err = NULL;
8102 char *template = NULL;
8103 struct collect_commit_logmsg_arg *a = arg;
8104 int initial_content_len;
8108 /* if a message was specified on the command line, just use it */
8109 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
8110 len = strlen(a->cmdline_log) + 1;
8111 *logmsg = malloc(len + 1);
8112 if (*logmsg == NULL)
8113 return got_error_from_errno("malloc");
8114 strlcpy(*logmsg, a->cmdline_log, len);
8116 } else if (a->prepared_log != NULL && a->non_interactive)
8117 return read_prepared_logmsg(logmsg, a->prepared_log);
8119 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
8120 return got_error_from_errno("asprintf");
8122 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
8126 if (a->prepared_log) {
8128 err = read_prepared_logmsg(&msg, a->prepared_log);
8131 if (write(fd, msg, strlen(msg)) == -1) {
8132 err = got_error_from_errno2("write", a->logmsg_path);
8139 initial_content_len = asprintf(&initial_content,
8140 "\n# changes to be committed on branch %s:\n",
8142 if (initial_content_len == -1) {
8143 err = got_error_from_errno("asprintf");
8147 if (write(fd, initial_content, initial_content_len) == -1) {
8148 err = got_error_from_errno2("write", a->logmsg_path);
8152 TAILQ_FOREACH(pe, commitable_paths, entry) {
8153 struct got_commitable *ct = pe->data;
8154 dprintf(fd, "# %c %s\n",
8155 got_commitable_get_status(ct),
8156 got_commitable_get_path(ct));
8159 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
8160 initial_content_len, a->prepared_log ? 0 : 1);
8162 free(initial_content);
8165 if (fd != -1 && close(fd) == -1 && err == NULL)
8166 err = got_error_from_errno2("close", a->logmsg_path);
8168 /* Editor is done; we can now apply unveil(2) */
8170 err = apply_unveil(a->repo_path, 0, a->worktree_path);
8178 static const struct got_error *
8179 cmd_commit(int argc, char *argv[])
8181 const struct got_error *error = NULL;
8182 struct got_worktree *worktree = NULL;
8183 struct got_repository *repo = NULL;
8184 char *cwd = NULL, *id_str = NULL;
8185 struct got_object_id *id = NULL;
8186 const char *logmsg = NULL;
8187 char *prepared_logmsg = NULL;
8188 struct collect_commit_logmsg_arg cl_arg;
8189 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
8190 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8191 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8192 struct got_pathlist_head paths;
8193 int *pack_fds = NULL;
8196 cl_arg.logmsg_path = NULL;
8198 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
8202 option_conflict('F', 'm');
8203 prepared_logmsg = realpath(optarg, NULL);
8204 if (prepared_logmsg == NULL)
8205 return got_error_from_errno2("realpath",
8209 if (prepared_logmsg)
8210 option_conflict('m', 'F');
8214 non_interactive = 1;
8217 allow_bad_symlinks = 1;
8229 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8230 "unveil", NULL) == -1)
8233 cwd = getcwd(NULL, 0);
8235 error = got_error_from_errno("getcwd");
8239 error = got_repo_pack_fds_open(&pack_fds);
8243 error = got_worktree_open(&worktree, cwd);
8245 if (error->code == GOT_ERR_NOT_WORKTREE)
8246 error = wrap_not_worktree_error(error, "commit", cwd);
8250 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8253 if (rebase_in_progress) {
8254 error = got_error(GOT_ERR_REBASING);
8258 error = got_worktree_histedit_in_progress(&histedit_in_progress,
8263 error = get_gitconfig_path(&gitconfig_path);
8266 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8267 gitconfig_path, pack_fds);
8271 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8274 if (merge_in_progress) {
8275 error = got_error(GOT_ERR_MERGE_BUSY);
8279 error = get_author(&author, repo, worktree);
8284 * unveil(2) traverses exec(2); if an editor is used we have
8285 * to apply unveil after the log message has been written.
8287 if (logmsg == NULL || strlen(logmsg) == 0)
8288 error = get_editor(&editor);
8290 error = apply_unveil(got_repo_get_path(repo), 0,
8291 got_worktree_get_root_path(worktree));
8295 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8299 cl_arg.editor = editor;
8300 cl_arg.cmdline_log = logmsg;
8301 cl_arg.prepared_log = prepared_logmsg;
8302 cl_arg.non_interactive = non_interactive;
8303 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8304 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
8305 if (!histedit_in_progress) {
8306 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
8307 error = got_error(GOT_ERR_COMMIT_BRANCH);
8310 cl_arg.branch_name += 11;
8312 cl_arg.repo_path = got_repo_get_path(repo);
8313 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
8314 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
8315 print_status, NULL, repo);
8317 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8318 cl_arg.logmsg_path != NULL)
8319 preserve_logmsg = 1;
8323 error = got_object_id_str(&id_str, id);
8326 printf("Created commit %s\n", id_str);
8328 if (preserve_logmsg) {
8329 fprintf(stderr, "%s: log message preserved in %s\n",
8330 getprogname(), cl_arg.logmsg_path);
8331 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8333 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8334 free(cl_arg.logmsg_path);
8336 const struct got_error *close_err = got_repo_close(repo);
8341 got_worktree_close(worktree);
8343 const struct got_error *pack_err =
8344 got_repo_pack_fds_close(pack_fds);
8350 free(gitconfig_path);
8353 free(prepared_logmsg);
8360 fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
8361 "[-r repository-path] [-t tag] [-T] [-q] [-v] "
8362 "[remote-repository]\n", getprogname());
8367 print_load_info(int print_colored, int print_found, int print_trees,
8368 int ncolored, int nfound, int ntrees)
8370 if (print_colored) {
8371 printf("%d commit%s colored", ncolored,
8372 ncolored == 1 ? "" : "s");
8375 printf("%s%d object%s found",
8376 ncolored > 0 ? "; " : "",
8377 nfound, nfound == 1 ? "" : "s");
8380 printf("; %d tree%s scanned", ntrees,
8381 ntrees == 1 ? "" : "s");
8385 struct got_send_progress_arg {
8386 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8393 int last_nobj_total;
8397 int printed_something;
8399 struct got_pathlist_head *delete_branches;
8402 static const struct got_error *
8403 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8404 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8405 int nobj_written, off_t bytes_sent, const char *refname, int success)
8407 struct got_send_progress_arg *a = arg;
8408 char scaled_packsize[FMT_SCALED_STRSIZE];
8409 char scaled_sent[FMT_SCALED_STRSIZE];
8410 int p_deltify = 0, p_written = 0, p_sent = 0;
8411 int print_colored = 0, print_found = 0, print_trees = 0;
8412 int print_searching = 0, print_total = 0;
8413 int print_deltify = 0, print_written = 0, print_sent = 0;
8415 if (a->verbosity < 0)
8419 const char *status = success ? "accepted" : "rejected";
8422 struct got_pathlist_entry *pe;
8423 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8424 const char *branchname = pe->path;
8425 if (got_path_cmp(branchname, refname,
8426 strlen(branchname), strlen(refname)) == 0) {
8428 a->sent_something = 1;
8434 if (a->printed_something)
8436 printf("Server has %s %s", status, refname);
8437 a->printed_something = 1;
8441 if (a->last_ncolored != ncolored) {
8443 a->last_ncolored = ncolored;
8446 if (a->last_nfound != nfound) {
8449 a->last_nfound = nfound;
8452 if (a->last_ntrees != ntrees) {
8456 a->last_ntrees = ntrees;
8459 if ((print_colored || print_found || print_trees) &&
8462 print_load_info(print_colored, print_found, print_trees,
8463 ncolored, nfound, ntrees);
8464 a->printed_something = 1;
8467 } else if (!a->loading_done) {
8469 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8471 a->loading_done = 1;
8474 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8475 return got_error_from_errno("fmt_scaled");
8476 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8477 return got_error_from_errno("fmt_scaled");
8479 if (a->last_ncommits != ncommits) {
8480 print_searching = 1;
8481 a->last_ncommits = ncommits;
8484 if (a->last_nobj_total != nobj_total) {
8485 print_searching = 1;
8487 a->last_nobj_total = nobj_total;
8490 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8491 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8492 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8493 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8494 return got_error(GOT_ERR_NO_SPACE);
8497 if (nobj_deltify > 0 || nobj_written > 0) {
8498 if (nobj_deltify > 0) {
8499 p_deltify = (nobj_deltify * 100) / nobj_total;
8500 if (p_deltify != a->last_p_deltify) {
8501 a->last_p_deltify = p_deltify;
8502 print_searching = 1;
8507 if (nobj_written > 0) {
8508 p_written = (nobj_written * 100) / nobj_total;
8509 if (p_written != a->last_p_written) {
8510 a->last_p_written = p_written;
8511 print_searching = 1;
8519 if (bytes_sent > 0) {
8520 p_sent = (bytes_sent * 100) / packfile_size;
8521 if (p_sent != a->last_p_sent) {
8522 a->last_p_sent = p_sent;
8523 print_searching = 1;
8529 a->sent_something = 1;
8532 if (print_searching || print_total || print_deltify || print_written ||
8535 if (print_searching)
8536 printf("packing %d reference%s", ncommits,
8537 ncommits == 1 ? "" : "s");
8539 printf("; %d object%s", nobj_total,
8540 nobj_total == 1 ? "" : "s");
8542 printf("; deltify: %d%%", p_deltify);
8544 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8545 scaled_packsize, p_sent);
8546 else if (print_written)
8547 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8548 scaled_packsize, p_written);
8549 if (print_searching || print_total || print_deltify ||
8550 print_written || print_sent) {
8551 a->printed_something = 1;
8557 static const struct got_error *
8558 cmd_send(int argc, char *argv[])
8560 const struct got_error *error = NULL;
8561 char *cwd = NULL, *repo_path = NULL;
8562 const char *remote_name;
8563 char *proto = NULL, *host = NULL, *port = NULL;
8564 char *repo_name = NULL, *server_path = NULL;
8565 const struct got_remote_repo *remotes, *remote = NULL;
8566 int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
8567 struct got_repository *repo = NULL;
8568 struct got_worktree *worktree = NULL;
8569 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8570 struct got_pathlist_head branches;
8571 struct got_pathlist_head tags;
8572 struct got_reflist_head all_branches;
8573 struct got_reflist_head all_tags;
8574 struct got_pathlist_head delete_args;
8575 struct got_pathlist_head delete_branches;
8576 struct got_reflist_entry *re;
8577 struct got_pathlist_entry *pe;
8578 int i, ch, sendfd = -1, sendstatus;
8580 struct got_send_progress_arg spa;
8581 int verbosity = 0, overwrite_refs = 0;
8582 int send_all_branches = 0, send_all_tags = 0;
8583 struct got_reference *ref = NULL;
8584 int *pack_fds = NULL;
8586 TAILQ_INIT(&branches);
8588 TAILQ_INIT(&all_branches);
8589 TAILQ_INIT(&all_tags);
8590 TAILQ_INIT(&delete_args);
8591 TAILQ_INIT(&delete_branches);
8593 while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8596 send_all_branches = 1;
8599 error = got_pathlist_append(&branches, optarg, NULL);
8605 error = got_pathlist_append(&delete_args, optarg, NULL);
8613 repo_path = realpath(optarg, NULL);
8614 if (repo_path == NULL)
8615 return got_error_from_errno2("realpath",
8617 got_path_strip_trailing_slashes(repo_path);
8620 error = got_pathlist_append(&tags, optarg, NULL);
8631 else if (verbosity < 3)
8645 if (send_all_branches && !TAILQ_EMPTY(&branches))
8646 option_conflict('a', 'b');
8647 if (send_all_tags && !TAILQ_EMPTY(&tags))
8648 option_conflict('T', 't');
8652 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8654 remote_name = argv[0];
8658 cwd = getcwd(NULL, 0);
8660 error = got_error_from_errno("getcwd");
8664 error = got_repo_pack_fds_open(&pack_fds);
8668 if (repo_path == NULL) {
8669 error = got_worktree_open(&worktree, cwd);
8670 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8676 strdup(got_worktree_get_repo_path(worktree));
8677 if (repo_path == NULL)
8678 error = got_error_from_errno("strdup");
8682 repo_path = strdup(cwd);
8683 if (repo_path == NULL) {
8684 error = got_error_from_errno("strdup");
8690 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8695 worktree_conf = got_worktree_get_gotconfig(worktree);
8696 if (worktree_conf) {
8697 got_gotconfig_get_remotes(&nremotes, &remotes,
8699 for (i = 0; i < nremotes; i++) {
8700 if (strcmp(remotes[i].name, remote_name) == 0) {
8701 remote = &remotes[i];
8707 if (remote == NULL) {
8708 repo_conf = got_repo_get_gotconfig(repo);
8710 got_gotconfig_get_remotes(&nremotes, &remotes,
8712 for (i = 0; i < nremotes; i++) {
8713 if (strcmp(remotes[i].name, remote_name) == 0) {
8714 remote = &remotes[i];
8720 if (remote == NULL) {
8721 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8722 for (i = 0; i < nremotes; i++) {
8723 if (strcmp(remotes[i].name, remote_name) == 0) {
8724 remote = &remotes[i];
8729 if (remote == NULL) {
8730 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8734 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8735 &repo_name, remote->send_url);
8739 if (strcmp(proto, "git") == 0) {
8741 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8742 "sendfd dns inet unveil", NULL) == -1)
8745 } else if (strcmp(proto, "git+ssh") == 0 ||
8746 strcmp(proto, "ssh") == 0) {
8748 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8749 "sendfd unveil", NULL) == -1)
8752 } else if (strcmp(proto, "http") == 0 ||
8753 strcmp(proto, "git+http") == 0) {
8754 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8757 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8761 error = got_dial_apply_unveil(proto);
8765 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8769 if (send_all_branches) {
8770 error = got_ref_list(&all_branches, repo, "refs/heads",
8771 got_ref_cmp_by_name, NULL);
8774 TAILQ_FOREACH(re, &all_branches, entry) {
8775 const char *branchname = got_ref_get_name(re->ref);
8776 error = got_pathlist_append(&branches,
8782 } else if (nbranches == 0) {
8783 for (i = 0; i < remote->nsend_branches; i++) {
8784 got_pathlist_append(&branches,
8785 remote->send_branches[i], NULL);
8789 if (send_all_tags) {
8790 error = got_ref_list(&all_tags, repo, "refs/tags",
8791 got_ref_cmp_by_name, NULL);
8794 TAILQ_FOREACH(re, &all_tags, entry) {
8795 const char *tagname = got_ref_get_name(re->ref);
8796 error = got_pathlist_append(&tags,
8805 * To prevent accidents only branches in refs/heads/ can be deleted
8806 * with 'got send -d'.
8807 * Deleting anything else requires local repository access or Git.
8809 TAILQ_FOREACH(pe, &delete_args, entry) {
8810 const char *branchname = pe->path;
8812 struct got_pathlist_entry *new;
8813 if (strncmp(branchname, "refs/heads/", 11) == 0) {
8814 s = strdup(branchname);
8816 error = got_error_from_errno("strdup");
8820 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8821 error = got_error_from_errno("asprintf");
8825 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8826 if (error || new == NULL /* duplicate */)
8833 if (nbranches == 0 && ndelete_branches == 0) {
8834 struct got_reference *head_ref;
8836 error = got_ref_open(&head_ref, repo,
8837 got_worktree_get_head_ref_name(worktree), 0);
8839 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8842 if (got_ref_is_symbolic(head_ref)) {
8843 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8844 got_ref_close(head_ref);
8849 error = got_pathlist_append(&branches, got_ref_get_name(ref),
8857 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8858 port ? ":" : "", port ? port : "");
8860 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8861 server_path, verbosity);
8865 memset(&spa, 0, sizeof(spa));
8866 spa.last_scaled_packsize[0] = '\0';
8867 spa.last_p_deltify = -1;
8868 spa.last_p_written = -1;
8869 spa.verbosity = verbosity;
8870 spa.delete_branches = &delete_branches;
8871 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8872 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8873 check_cancelled, NULL);
8874 if (spa.printed_something)
8878 if (!spa.sent_something && verbosity >= 0)
8879 printf("Already up-to-date\n");
8882 if (kill(sendpid, SIGTERM) == -1)
8883 error = got_error_from_errno("kill");
8884 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8885 error = got_error_from_errno("waitpid");
8887 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8888 error = got_error_from_errno("close");
8890 const struct got_error *close_err = got_repo_close(repo);
8895 got_worktree_close(worktree);
8897 const struct got_error *pack_err =
8898 got_repo_pack_fds_close(pack_fds);
8904 got_pathlist_free(&branches);
8905 got_pathlist_free(&tags);
8906 got_ref_list_free(&all_branches);
8907 got_ref_list_free(&all_tags);
8908 got_pathlist_free(&delete_args);
8909 TAILQ_FOREACH(pe, &delete_branches, entry)
8910 free((char *)pe->path);
8911 got_pathlist_free(&delete_branches);
8923 usage_cherrypick(void)
8925 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8929 static const struct got_error *
8930 cmd_cherrypick(int argc, char *argv[])
8932 const struct got_error *error = NULL;
8933 struct got_worktree *worktree = NULL;
8934 struct got_repository *repo = NULL;
8935 char *cwd = NULL, *commit_id_str = NULL;
8936 struct got_object_id *commit_id = NULL;
8937 struct got_commit_object *commit = NULL;
8938 struct got_object_qid *pid;
8940 struct got_update_progress_arg upa;
8941 int *pack_fds = NULL;
8943 while ((ch = getopt(argc, argv, "")) != -1) {
8955 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8956 "unveil", NULL) == -1)
8962 cwd = getcwd(NULL, 0);
8964 error = got_error_from_errno("getcwd");
8968 error = got_repo_pack_fds_open(&pack_fds);
8972 error = got_worktree_open(&worktree, cwd);
8974 if (error->code == GOT_ERR_NOT_WORKTREE)
8975 error = wrap_not_worktree_error(error, "cherrypick",
8980 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8985 error = apply_unveil(got_repo_get_path(repo), 0,
8986 got_worktree_get_root_path(worktree));
8990 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8991 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8994 error = got_object_id_str(&commit_id_str, commit_id);
8998 error = got_object_open_as_commit(&commit, repo, commit_id);
9001 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9002 memset(&upa, 0, sizeof(upa));
9003 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
9004 commit_id, repo, update_progress, &upa, check_cancelled,
9009 if (upa.did_something)
9010 printf("Merged commit %s\n", commit_id_str);
9011 print_merge_progress_stats(&upa);
9014 got_object_commit_close(commit);
9015 free(commit_id_str);
9017 got_worktree_close(worktree);
9019 const struct got_error *close_err = got_repo_close(repo);
9024 const struct got_error *pack_err =
9025 got_repo_pack_fds_close(pack_fds);
9036 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
9040 static const struct got_error *
9041 cmd_backout(int argc, char *argv[])
9043 const struct got_error *error = NULL;
9044 struct got_worktree *worktree = NULL;
9045 struct got_repository *repo = NULL;
9046 char *cwd = NULL, *commit_id_str = NULL;
9047 struct got_object_id *commit_id = NULL;
9048 struct got_commit_object *commit = NULL;
9049 struct got_object_qid *pid;
9051 struct got_update_progress_arg upa;
9052 int *pack_fds = NULL;
9054 while ((ch = getopt(argc, argv, "")) != -1) {
9066 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9067 "unveil", NULL) == -1)
9073 cwd = getcwd(NULL, 0);
9075 error = got_error_from_errno("getcwd");
9079 error = got_repo_pack_fds_open(&pack_fds);
9083 error = got_worktree_open(&worktree, cwd);
9085 if (error->code == GOT_ERR_NOT_WORKTREE)
9086 error = wrap_not_worktree_error(error, "backout", cwd);
9090 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9095 error = apply_unveil(got_repo_get_path(repo), 0,
9096 got_worktree_get_root_path(worktree));
9100 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9101 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9104 error = got_object_id_str(&commit_id_str, commit_id);
9108 error = got_object_open_as_commit(&commit, repo, commit_id);
9111 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9113 error = got_error(GOT_ERR_ROOT_COMMIT);
9117 memset(&upa, 0, sizeof(upa));
9118 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
9119 repo, update_progress, &upa, check_cancelled, NULL);
9123 if (upa.did_something)
9124 printf("Backed out commit %s\n", commit_id_str);
9125 print_merge_progress_stats(&upa);
9128 got_object_commit_close(commit);
9129 free(commit_id_str);
9131 got_worktree_close(worktree);
9133 const struct got_error *close_err = got_repo_close(repo);
9138 const struct got_error *pack_err =
9139 got_repo_pack_fds_close(pack_fds);
9149 fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
9155 trim_logmsg(char *logmsg, int limit)
9160 len = strlen(logmsg);
9164 nl = strchr(logmsg, '\n');
9169 static const struct got_error *
9170 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
9172 const struct got_error *err;
9173 char *logmsg0 = NULL;
9176 err = got_object_commit_get_logmsg(&logmsg0, commit);
9181 while (isspace((unsigned char)s[0]))
9184 *logmsg = strdup(s);
9185 if (*logmsg == NULL) {
9186 err = got_error_from_errno("strdup");
9190 trim_logmsg(*logmsg, limit);
9196 static const struct got_error *
9197 show_rebase_merge_conflict(struct got_object_id *id,
9198 struct got_repository *repo)
9200 const struct got_error *err;
9201 struct got_commit_object *commit = NULL;
9202 char *id_str = NULL, *logmsg = NULL;
9204 err = got_object_open_as_commit(&commit, repo, id);
9208 err = got_object_id_str(&id_str, id);
9214 err = get_short_logmsg(&logmsg, 42, commit);
9218 printf("%s -> merge conflict: %s\n", id_str, logmsg);
9221 got_object_commit_close(commit);
9226 static const struct got_error *
9227 show_rebase_progress(struct got_commit_object *commit,
9228 struct got_object_id *old_id, struct got_object_id *new_id)
9230 const struct got_error *err;
9231 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9233 err = got_object_id_str(&old_id_str, old_id);
9238 err = got_object_id_str(&new_id_str, new_id);
9243 old_id_str[12] = '\0';
9245 new_id_str[12] = '\0';
9247 err = get_short_logmsg(&logmsg, 42, commit);
9251 printf("%s -> %s: %s\n", old_id_str,
9252 new_id_str ? new_id_str : "no-op change", logmsg);
9260 static const struct got_error *
9261 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
9262 struct got_reference *branch, struct got_reference *new_base_branch,
9263 struct got_reference *tmp_branch, struct got_repository *repo,
9266 printf("Switching work tree to %s\n", got_ref_get_name(branch));
9267 return got_worktree_rebase_complete(worktree, fileindex,
9268 new_base_branch, tmp_branch, branch, repo, create_backup);
9271 static const struct got_error *
9272 rebase_commit(struct got_pathlist_head *merged_paths,
9273 struct got_worktree *worktree, struct got_fileindex *fileindex,
9274 struct got_reference *tmp_branch,
9275 struct got_object_id *commit_id, struct got_repository *repo)
9277 const struct got_error *error;
9278 struct got_commit_object *commit;
9279 struct got_object_id *new_commit_id;
9281 error = got_object_open_as_commit(&commit, repo, commit_id);
9285 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
9286 worktree, fileindex, tmp_branch, commit, commit_id, repo);
9288 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
9290 error = show_rebase_progress(commit, commit_id, NULL);
9292 error = show_rebase_progress(commit, commit_id, new_commit_id);
9293 free(new_commit_id);
9296 got_object_commit_close(commit);
9300 struct check_path_prefix_arg {
9301 const char *path_prefix;
9306 static const struct got_error *
9307 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
9308 struct got_blob_object *blob2, FILE *f1, FILE *f2,
9309 struct got_object_id *id1, struct got_object_id *id2,
9310 const char *path1, const char *path2,
9311 mode_t mode1, mode_t mode2, struct got_repository *repo)
9313 struct check_path_prefix_arg *a = arg;
9315 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
9316 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
9317 return got_error(a->errcode);
9322 static const struct got_error *
9323 check_path_prefix(struct got_object_id *parent_id,
9324 struct got_object_id *commit_id, const char *path_prefix,
9325 int errcode, struct got_repository *repo)
9327 const struct got_error *err;
9328 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
9329 struct got_commit_object *commit = NULL, *parent_commit = NULL;
9330 struct check_path_prefix_arg cpp_arg;
9332 if (got_path_is_root_dir(path_prefix))
9335 err = got_object_open_as_commit(&commit, repo, commit_id);
9339 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
9343 err = got_object_open_as_tree(&tree1, repo,
9344 got_object_commit_get_tree_id(parent_commit));
9348 err = got_object_open_as_tree(&tree2, repo,
9349 got_object_commit_get_tree_id(commit));
9353 cpp_arg.path_prefix = path_prefix;
9354 while (cpp_arg.path_prefix[0] == '/')
9355 cpp_arg.path_prefix++;
9356 cpp_arg.len = strlen(cpp_arg.path_prefix);
9357 cpp_arg.errcode = errcode;
9358 err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
9359 check_path_prefix_in_diff, &cpp_arg, 0);
9362 got_object_tree_close(tree1);
9364 got_object_tree_close(tree2);
9366 got_object_commit_close(commit);
9368 got_object_commit_close(parent_commit);
9372 static const struct got_error *
9373 collect_commits(struct got_object_id_queue *commits,
9374 struct got_object_id *initial_commit_id,
9375 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
9376 const char *path_prefix, int path_prefix_errcode,
9377 struct got_repository *repo)
9379 const struct got_error *err = NULL;
9380 struct got_commit_graph *graph = NULL;
9381 struct got_object_id *parent_id = NULL;
9382 struct got_object_qid *qid;
9383 struct got_object_id *commit_id = initial_commit_id;
9385 err = got_commit_graph_open(&graph, "/", 1);
9389 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
9390 check_cancelled, NULL);
9393 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
9394 err = got_commit_graph_iter_next(&parent_id, graph, repo,
9395 check_cancelled, NULL);
9397 if (err->code == GOT_ERR_ITER_COMPLETED) {
9398 err = got_error_msg(GOT_ERR_ANCESTRY,
9399 "ran out of commits to rebase before "
9400 "youngest common ancestor commit has "
9405 err = check_path_prefix(parent_id, commit_id,
9406 path_prefix, path_prefix_errcode, repo);
9410 err = got_object_qid_alloc(&qid, commit_id);
9413 STAILQ_INSERT_HEAD(commits, qid, entry);
9414 commit_id = parent_id;
9418 got_commit_graph_close(graph);
9422 static const struct got_error *
9423 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9425 const struct got_error *err = NULL;
9426 time_t committer_time;
9428 char datebuf[11]; /* YYYY-MM-DD + NUL */
9429 char *author0 = NULL, *author, *smallerthan;
9430 char *logmsg0 = NULL, *logmsg, *newline;
9432 committer_time = got_object_commit_get_committer_time(commit);
9433 if (gmtime_r(&committer_time, &tm) == NULL)
9434 return got_error_from_errno("gmtime_r");
9435 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9436 return got_error(GOT_ERR_NO_SPACE);
9438 author0 = strdup(got_object_commit_get_author(commit));
9439 if (author0 == NULL)
9440 return got_error_from_errno("strdup");
9442 smallerthan = strchr(author, '<');
9443 if (smallerthan && smallerthan[1] != '\0')
9444 author = smallerthan + 1;
9445 author[strcspn(author, "@>")] = '\0';
9447 err = got_object_commit_get_logmsg(&logmsg0, commit);
9451 while (*logmsg == '\n')
9453 newline = strchr(logmsg, '\n');
9457 if (asprintf(brief_str, "%s %s %s",
9458 datebuf, author, logmsg) == -1)
9459 err = got_error_from_errno("asprintf");
9466 static const struct got_error *
9467 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9468 struct got_repository *repo)
9470 const struct got_error *err;
9473 err = got_object_id_str(&id_str, id);
9477 err = got_ref_delete(ref, repo);
9481 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
9487 static const struct got_error *
9488 print_backup_ref(const char *branch_name, const char *new_id_str,
9489 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
9490 struct got_reflist_object_id_map *refs_idmap,
9491 struct got_repository *repo)
9493 const struct got_error *err = NULL;
9494 struct got_reflist_head *refs;
9495 char *refs_str = NULL;
9496 struct got_object_id *new_commit_id = NULL;
9497 struct got_commit_object *new_commit = NULL;
9498 char *new_commit_brief_str = NULL;
9499 struct got_object_id *yca_id = NULL;
9500 struct got_commit_object *yca_commit = NULL;
9501 char *yca_id_str = NULL, *yca_brief_str = NULL;
9502 char *custom_refs_str;
9504 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9505 return got_error_from_errno("asprintf");
9507 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9508 0, 0, refs_idmap, custom_refs_str);
9512 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9516 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9518 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
9523 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9527 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9531 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9532 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9536 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9537 refs_str ? " (" : "", refs_str ? refs_str : "",
9538 refs_str ? ")" : "", new_commit_brief_str);
9539 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9540 got_object_id_cmp(yca_id, old_commit_id) != 0) {
9544 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9548 err = get_commit_brief_str(&yca_brief_str, yca_commit);
9552 err = got_object_id_str(&yca_id_str, yca_id);
9556 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9558 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
9562 printf("history forked at %s%s%s%s\n %s\n",
9564 refs_str ? " (" : "", refs_str ? refs_str : "",
9565 refs_str ? ")" : "", yca_brief_str);
9568 free(custom_refs_str);
9569 free(new_commit_id);
9573 free(yca_brief_str);
9575 got_object_commit_close(new_commit);
9577 got_object_commit_close(yca_commit);
9582 static const struct got_error *
9583 process_backup_refs(const char *backup_ref_prefix,
9584 const char *wanted_branch_name,
9585 int delete, struct got_repository *repo)
9587 const struct got_error *err;
9588 struct got_reflist_head refs, backup_refs;
9589 struct got_reflist_entry *re;
9590 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9591 struct got_object_id *old_commit_id = NULL;
9592 char *branch_name = NULL;
9593 struct got_commit_object *old_commit = NULL;
9594 struct got_reflist_object_id_map *refs_idmap = NULL;
9595 int wanted_branch_found = 0;
9598 TAILQ_INIT(&backup_refs);
9600 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9604 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9608 if (wanted_branch_name) {
9609 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9610 wanted_branch_name += 11;
9613 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9614 got_ref_cmp_by_commit_timestamp_descending, repo);
9618 TAILQ_FOREACH(re, &backup_refs, entry) {
9619 const char *refname = got_ref_get_name(re->ref);
9622 err = check_cancelled(NULL);
9626 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9630 err = got_object_open_as_commit(&old_commit, repo,
9635 if (strncmp(backup_ref_prefix, refname,
9636 backup_ref_prefix_len) == 0)
9637 refname += backup_ref_prefix_len;
9639 while (refname[0] == '/')
9642 branch_name = strdup(refname);
9643 if (branch_name == NULL) {
9644 err = got_error_from_errno("strdup");
9647 slash = strrchr(branch_name, '/');
9650 refname += strlen(branch_name) + 1;
9653 if (wanted_branch_name == NULL ||
9654 strcmp(wanted_branch_name, branch_name) == 0) {
9655 wanted_branch_found = 1;
9657 err = delete_backup_ref(re->ref,
9658 old_commit_id, repo);
9660 err = print_backup_ref(branch_name, refname,
9661 old_commit_id, old_commit, refs_idmap,
9668 free(old_commit_id);
9669 old_commit_id = NULL;
9672 got_object_commit_close(old_commit);
9676 if (wanted_branch_name && !wanted_branch_found) {
9677 err = got_error_fmt(GOT_ERR_NOT_REF,
9678 "%s/%s/", backup_ref_prefix, wanted_branch_name);
9682 got_reflist_object_id_map_free(refs_idmap);
9683 got_ref_list_free(&refs);
9684 got_ref_list_free(&backup_refs);
9685 free(old_commit_id);
9688 got_object_commit_close(old_commit);
9692 static const struct got_error *
9693 abort_progress(void *arg, unsigned char status, const char *path)
9696 * Unversioned files should not clutter progress output when
9697 * an operation is aborted.
9699 if (status == GOT_STATUS_UNVERSIONED)
9702 return update_progress(arg, status, path);
9705 static const struct got_error *
9706 cmd_rebase(int argc, char *argv[])
9708 const struct got_error *error = NULL;
9709 struct got_worktree *worktree = NULL;
9710 struct got_repository *repo = NULL;
9711 struct got_fileindex *fileindex = NULL;
9713 struct got_reference *branch = NULL;
9714 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9715 struct got_object_id *commit_id = NULL, *parent_id = NULL;
9716 struct got_object_id *resume_commit_id = NULL;
9717 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9718 struct got_commit_object *commit = NULL;
9719 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9720 int histedit_in_progress = 0, merge_in_progress = 0;
9721 int create_backup = 1, list_backups = 0, delete_backups = 0;
9722 struct got_object_id_queue commits;
9723 struct got_pathlist_head merged_paths;
9724 const struct got_object_id_queue *parent_ids;
9725 struct got_object_qid *qid, *pid;
9726 struct got_update_progress_arg upa;
9727 int *pack_fds = NULL;
9729 STAILQ_INIT(&commits);
9730 TAILQ_INIT(&merged_paths);
9731 memset(&upa, 0, sizeof(upa));
9733 while ((ch = getopt(argc, argv, "aclX")) != -1) {
9739 continue_rebase = 1;
9757 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9758 "unveil", NULL) == -1)
9763 option_conflict('l', 'a');
9764 if (continue_rebase)
9765 option_conflict('l', 'c');
9767 option_conflict('l', 'X');
9768 if (argc != 0 && argc != 1)
9770 } else if (delete_backups) {
9772 option_conflict('X', 'a');
9773 if (continue_rebase)
9774 option_conflict('X', 'c');
9776 option_conflict('l', 'X');
9777 if (argc != 0 && argc != 1)
9780 if (abort_rebase && continue_rebase)
9782 else if (abort_rebase || continue_rebase) {
9785 } else if (argc != 1)
9789 cwd = getcwd(NULL, 0);
9791 error = got_error_from_errno("getcwd");
9795 error = got_repo_pack_fds_open(&pack_fds);
9799 error = got_worktree_open(&worktree, cwd);
9801 if (list_backups || delete_backups) {
9802 if (error->code != GOT_ERR_NOT_WORKTREE)
9805 if (error->code == GOT_ERR_NOT_WORKTREE)
9806 error = wrap_not_worktree_error(error,
9812 error = got_repo_open(&repo,
9813 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
9818 error = apply_unveil(got_repo_get_path(repo), 0,
9819 worktree ? got_worktree_get_root_path(worktree) : NULL);
9823 if (list_backups || delete_backups) {
9824 error = process_backup_refs(
9825 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9826 argc == 1 ? argv[0] : NULL, delete_backups, repo);
9827 goto done; /* nothing else to do */
9830 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9834 if (histedit_in_progress) {
9835 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9839 error = got_worktree_merge_in_progress(&merge_in_progress,
9843 if (merge_in_progress) {
9844 error = got_error(GOT_ERR_MERGE_BUSY);
9848 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9853 if (!rebase_in_progress) {
9854 error = got_error(GOT_ERR_NOT_REBASING);
9857 error = got_worktree_rebase_continue(&resume_commit_id,
9858 &new_base_branch, &tmp_branch, &branch, &fileindex,
9862 printf("Switching work tree to %s\n",
9863 got_ref_get_symref_target(new_base_branch));
9864 error = got_worktree_rebase_abort(worktree, fileindex, repo,
9865 new_base_branch, abort_progress, &upa);
9868 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9869 print_merge_progress_stats(&upa);
9870 goto done; /* nothing else to do */
9873 if (continue_rebase) {
9874 if (!rebase_in_progress) {
9875 error = got_error(GOT_ERR_NOT_REBASING);
9878 error = got_worktree_rebase_continue(&resume_commit_id,
9879 &new_base_branch, &tmp_branch, &branch, &fileindex,
9884 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9885 resume_commit_id, repo);
9889 yca_id = got_object_id_dup(resume_commit_id);
9890 if (yca_id == NULL) {
9891 error = got_error_from_errno("got_object_id_dup");
9895 error = got_ref_open(&branch, repo, argv[0], 0);
9900 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9904 if (!continue_rebase) {
9905 struct got_object_id *base_commit_id;
9907 base_commit_id = got_worktree_get_base_commit_id(worktree);
9908 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9909 base_commit_id, branch_head_commit_id, 1, repo,
9910 check_cancelled, NULL);
9913 if (yca_id == NULL) {
9914 error = got_error_msg(GOT_ERR_ANCESTRY,
9915 "specified branch shares no common ancestry "
9916 "with work tree's branch");
9920 error = check_same_branch(base_commit_id, branch, yca_id, repo);
9922 if (error->code != GOT_ERR_ANCESTRY)
9926 struct got_pathlist_head paths;
9927 printf("%s is already based on %s\n",
9928 got_ref_get_name(branch),
9929 got_worktree_get_head_ref_name(worktree));
9930 error = switch_head_ref(branch, branch_head_commit_id,
9934 error = got_worktree_set_base_commit_id(worktree, repo,
9935 branch_head_commit_id);
9939 error = got_pathlist_append(&paths, "", NULL);
9942 error = got_worktree_checkout_files(worktree,
9943 &paths, repo, update_progress, &upa,
9944 check_cancelled, NULL);
9945 got_pathlist_free(&paths);
9948 if (upa.did_something) {
9950 error = got_object_id_str(&id_str,
9951 branch_head_commit_id);
9954 printf("Updated to %s: %s\n",
9955 got_worktree_get_head_ref_name(worktree),
9959 printf("Already up-to-date\n");
9960 print_update_progress_stats(&upa);
9965 commit_id = branch_head_commit_id;
9966 error = got_object_open_as_commit(&commit, repo, commit_id);
9970 parent_ids = got_object_commit_get_parent_ids(commit);
9971 pid = STAILQ_FIRST(parent_ids);
9973 error = got_error(GOT_ERR_EMPTY_REBASE);
9976 error = collect_commits(&commits, commit_id, &pid->id,
9977 yca_id, got_worktree_get_path_prefix(worktree),
9978 GOT_ERR_REBASE_PATH, repo);
9979 got_object_commit_close(commit);
9984 if (!continue_rebase) {
9985 error = got_worktree_rebase_prepare(&new_base_branch,
9986 &tmp_branch, &fileindex, worktree, branch, repo);
9991 if (STAILQ_EMPTY(&commits)) {
9992 if (continue_rebase) {
9993 error = rebase_complete(worktree, fileindex,
9994 branch, new_base_branch, tmp_branch, repo,
9998 /* Fast-forward the reference of the branch. */
9999 struct got_object_id *new_head_commit_id;
10001 error = got_ref_resolve(&new_head_commit_id, repo,
10005 error = got_object_id_str(&id_str, new_head_commit_id);
10006 printf("Forwarding %s to commit %s\n",
10007 got_ref_get_name(branch), id_str);
10009 error = got_ref_change_ref(branch,
10010 new_head_commit_id);
10013 /* No backup needed since objects did not change. */
10019 STAILQ_FOREACH(qid, &commits, entry) {
10021 commit_id = &qid->id;
10022 parent_id = pid ? &pid->id : yca_id;
10025 memset(&upa, 0, sizeof(upa));
10026 error = got_worktree_rebase_merge_files(&merged_paths,
10027 worktree, fileindex, parent_id, commit_id, repo,
10028 update_progress, &upa, check_cancelled, NULL);
10032 print_merge_progress_stats(&upa);
10033 if (upa.conflicts > 0 || upa.missing > 0 ||
10034 upa.not_deleted > 0 || upa.unversioned > 0) {
10035 if (upa.conflicts > 0) {
10036 error = show_rebase_merge_conflict(&qid->id,
10041 got_worktree_rebase_pathlist_free(&merged_paths);
10045 error = rebase_commit(&merged_paths, worktree, fileindex,
10046 tmp_branch, commit_id, repo);
10047 got_worktree_rebase_pathlist_free(&merged_paths);
10052 if (upa.conflicts > 0 || upa.missing > 0 ||
10053 upa.not_deleted > 0 || upa.unversioned > 0) {
10054 error = got_worktree_rebase_postpone(worktree, fileindex);
10057 if (upa.conflicts > 0 && upa.missing == 0 &&
10058 upa.not_deleted == 0 && upa.unversioned == 0) {
10059 error = got_error_msg(GOT_ERR_CONFLICTS,
10060 "conflicts must be resolved before rebasing "
10062 } else if (upa.conflicts > 0) {
10063 error = got_error_msg(GOT_ERR_CONFLICTS,
10064 "conflicts must be resolved before rebasing "
10065 "can continue; changes destined for some "
10066 "files were not yet merged and should be "
10067 "merged manually if required before the "
10068 "rebase operation is continued");
10070 error = got_error_msg(GOT_ERR_CONFLICTS,
10071 "changes destined for some files were not "
10072 "yet merged and should be merged manually "
10073 "if required before the rebase operation "
10077 error = rebase_complete(worktree, fileindex, branch,
10078 new_base_branch, tmp_branch, repo, create_backup);
10080 got_object_id_queue_free(&commits);
10081 free(branch_head_commit_id);
10082 free(resume_commit_id);
10085 got_object_commit_close(commit);
10087 got_ref_close(branch);
10088 if (new_base_branch)
10089 got_ref_close(new_base_branch);
10091 got_ref_close(tmp_branch);
10093 got_worktree_close(worktree);
10095 const struct got_error *close_err = got_repo_close(repo);
10100 const struct got_error *pack_err =
10101 got_repo_pack_fds_close(pack_fds);
10109 usage_histedit(void)
10111 fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
10112 "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
10117 #define GOT_HISTEDIT_PICK 'p'
10118 #define GOT_HISTEDIT_EDIT 'e'
10119 #define GOT_HISTEDIT_FOLD 'f'
10120 #define GOT_HISTEDIT_DROP 'd'
10121 #define GOT_HISTEDIT_MESG 'm'
10123 static const struct got_histedit_cmd {
10124 unsigned char code;
10127 } got_histedit_cmds[] = {
10128 { GOT_HISTEDIT_PICK, "pick", "use commit" },
10129 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
10130 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
10132 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
10133 { GOT_HISTEDIT_MESG, "mesg",
10134 "single-line log message for commit above (open editor if empty)" },
10137 struct got_histedit_list_entry {
10138 TAILQ_ENTRY(got_histedit_list_entry) entry;
10139 struct got_object_id *commit_id;
10140 const struct got_histedit_cmd *cmd;
10143 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
10145 static const struct got_error *
10146 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
10147 FILE *f, struct got_repository *repo)
10149 const struct got_error *err = NULL;
10150 char *logmsg = NULL, *id_str = NULL;
10151 struct got_commit_object *commit = NULL;
10154 err = got_object_open_as_commit(&commit, repo, commit_id);
10158 err = get_short_logmsg(&logmsg, 34, commit);
10162 err = got_object_id_str(&id_str, commit_id);
10166 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
10168 err = got_ferror(f, GOT_ERR_IO);
10171 got_object_commit_close(commit);
10177 static const struct got_error *
10178 histedit_write_commit_list(struct got_object_id_queue *commits,
10179 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
10180 struct got_repository *repo)
10182 const struct got_error *err = NULL;
10183 struct got_object_qid *qid;
10184 const char *histedit_cmd = NULL;
10186 if (STAILQ_EMPTY(commits))
10187 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10189 STAILQ_FOREACH(qid, commits, entry) {
10190 histedit_cmd = got_histedit_cmds[0].name;
10192 histedit_cmd = "edit";
10193 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
10194 histedit_cmd = "fold";
10195 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
10198 if (edit_logmsg_only) {
10199 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
10201 err = got_ferror(f, GOT_ERR_IO);
10210 static const struct got_error *
10211 write_cmd_list(FILE *f, const char *branch_name,
10212 struct got_object_id_queue *commits)
10214 const struct got_error *err = NULL;
10218 struct got_object_qid *qid;
10220 qid = STAILQ_FIRST(commits);
10221 err = got_object_id_str(&id_str, &qid->id);
10226 "# Editing the history of branch '%s' starting at\n"
10228 "# Commits will be processed in order from top to "
10229 "bottom of this file.\n", branch_name, id_str);
10231 err = got_ferror(f, GOT_ERR_IO);
10235 n = fprintf(f, "# Available histedit commands:\n");
10237 err = got_ferror(f, GOT_ERR_IO);
10241 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10242 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
10243 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
10246 err = got_ferror(f, GOT_ERR_IO);
10255 static const struct got_error *
10256 histedit_syntax_error(int lineno)
10258 static char msg[42];
10261 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
10263 if (ret == -1 || ret >= sizeof(msg))
10264 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
10266 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
10269 static const struct got_error *
10270 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
10271 char *logmsg, struct got_repository *repo)
10273 const struct got_error *err;
10274 struct got_commit_object *folded_commit = NULL;
10275 char *id_str, *folded_logmsg = NULL;
10277 err = got_object_id_str(&id_str, hle->commit_id);
10281 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
10285 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
10288 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
10289 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
10290 folded_logmsg) == -1) {
10291 err = got_error_from_errno("asprintf");
10295 got_object_commit_close(folded_commit);
10297 free(folded_logmsg);
10301 static struct got_histedit_list_entry *
10302 get_folded_commits(struct got_histedit_list_entry *hle)
10304 struct got_histedit_list_entry *prev, *folded = NULL;
10306 prev = TAILQ_PREV(hle, got_histedit_list, entry);
10307 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
10308 prev->cmd->code == GOT_HISTEDIT_DROP)) {
10309 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
10311 prev = TAILQ_PREV(prev, got_histedit_list, entry);
10317 static const struct got_error *
10318 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
10319 struct got_repository *repo)
10321 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
10322 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
10323 const struct got_error *err = NULL;
10324 struct got_commit_object *commit = NULL;
10327 struct got_histedit_list_entry *folded = NULL;
10329 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10333 folded = get_folded_commits(hle);
10335 while (folded != hle) {
10336 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
10337 folded = TAILQ_NEXT(folded, entry);
10340 err = append_folded_commit_msg(&new_msg, folded,
10346 folded = TAILQ_NEXT(folded, entry);
10350 err = got_object_id_str(&id_str, hle->commit_id);
10353 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
10356 logmsg_len = asprintf(&new_msg,
10357 "%s\n# original log message of commit %s: %s",
10358 logmsg ? logmsg : "", id_str, orig_logmsg);
10359 if (logmsg_len == -1) {
10360 err = got_error_from_errno("asprintf");
10366 err = got_object_id_str(&id_str, hle->commit_id);
10370 err = got_opentemp_named_fd(&logmsg_path, &fd,
10371 GOT_TMPDIR_STR "/got-logmsg");
10375 write(fd, logmsg, logmsg_len);
10378 err = get_editor(&editor);
10382 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
10385 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
10388 hle->logmsg = strdup(new_msg);
10389 if (hle->logmsg == NULL)
10390 err = got_error_from_errno("strdup");
10393 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
10394 err = got_error_from_errno2("unlink", logmsg_path);
10400 got_object_commit_close(commit);
10404 static const struct got_error *
10405 histedit_parse_list(struct got_histedit_list *histedit_cmds,
10406 FILE *f, struct got_repository *repo)
10408 const struct got_error *err = NULL;
10409 char *line = NULL, *p, *end;
10413 const struct got_histedit_cmd *cmd;
10414 struct got_object_id *commit_id = NULL;
10415 struct got_histedit_list_entry *hle = NULL;
10418 len = getline(&line, &size, f);
10420 const struct got_error *getline_err;
10423 getline_err = got_error_from_errno("getline");
10424 err = got_ferror(f, getline_err->code);
10429 while (isspace((unsigned char)p[0]))
10431 if (p[0] == '#' || p[0] == '\0') {
10437 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10438 cmd = &got_histedit_cmds[i];
10439 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10440 isspace((unsigned char)p[strlen(cmd->name)])) {
10441 p += strlen(cmd->name);
10444 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
10449 if (i == nitems(got_histedit_cmds)) {
10450 err = histedit_syntax_error(lineno);
10453 while (isspace((unsigned char)p[0]))
10455 if (cmd->code == GOT_HISTEDIT_MESG) {
10456 if (hle == NULL || hle->logmsg != NULL) {
10457 err = got_error(GOT_ERR_HISTEDIT_CMD);
10460 if (p[0] == '\0') {
10461 err = histedit_edit_logmsg(hle, repo);
10465 hle->logmsg = strdup(p);
10466 if (hle->logmsg == NULL) {
10467 err = got_error_from_errno("strdup");
10476 while (end[0] && !isspace((unsigned char)end[0]))
10480 err = got_object_resolve_id_str(&commit_id, repo, p);
10482 /* override error code */
10483 err = histedit_syntax_error(lineno);
10487 hle = malloc(sizeof(*hle));
10489 err = got_error_from_errno("malloc");
10493 hle->commit_id = commit_id;
10494 hle->logmsg = NULL;
10498 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10506 static const struct got_error *
10507 histedit_check_script(struct got_histedit_list *histedit_cmds,
10508 struct got_object_id_queue *commits, struct got_repository *repo)
10510 const struct got_error *err = NULL;
10511 struct got_object_qid *qid;
10512 struct got_histedit_list_entry *hle;
10513 static char msg[92];
10516 if (TAILQ_EMPTY(histedit_cmds))
10517 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10518 "histedit script contains no commands");
10519 if (STAILQ_EMPTY(commits))
10520 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10522 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10523 struct got_histedit_list_entry *hle2;
10524 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10527 if (got_object_id_cmp(hle->commit_id,
10528 hle2->commit_id) != 0)
10530 err = got_object_id_str(&id_str, hle->commit_id);
10533 snprintf(msg, sizeof(msg), "commit %s is listed "
10534 "more than once in histedit script", id_str);
10536 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10540 STAILQ_FOREACH(qid, commits, entry) {
10541 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10542 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
10546 err = got_object_id_str(&id_str, &qid->id);
10549 snprintf(msg, sizeof(msg),
10550 "commit %s missing from histedit script", id_str);
10552 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10556 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10557 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10558 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10559 "last commit in histedit script cannot be folded");
10564 static const struct got_error *
10565 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10566 const char *path, struct got_object_id_queue *commits,
10567 struct got_repository *repo)
10569 const struct got_error *err = NULL;
10573 err = get_editor(&editor);
10577 if (spawn_editor(editor, path) == -1) {
10578 err = got_error_from_errno("failed spawning editor");
10582 f = fopen(path, "re");
10584 err = got_error_from_errno("fopen");
10587 err = histedit_parse_list(histedit_cmds, f, repo);
10591 err = histedit_check_script(histedit_cmds, commits, repo);
10593 if (f && fclose(f) == EOF && err == NULL)
10594 err = got_error_from_errno("fclose");
10599 static const struct got_error *
10600 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10601 struct got_object_id_queue *, const char *, const char *,
10602 struct got_repository *);
10604 static const struct got_error *
10605 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10606 struct got_object_id_queue *commits, const char *branch_name,
10607 int edit_logmsg_only, int fold_only, int edit_only,
10608 struct got_repository *repo)
10610 const struct got_error *err;
10614 err = got_opentemp_named(&path, &f, "got-histedit");
10618 err = write_cmd_list(f, branch_name, commits);
10622 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10623 fold_only, edit_only, repo);
10627 if (edit_logmsg_only || fold_only || edit_only) {
10629 err = histedit_parse_list(histedit_cmds, f, repo);
10631 if (fclose(f) == EOF) {
10632 err = got_error_from_errno("fclose");
10636 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10638 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10639 err->code != GOT_ERR_HISTEDIT_CMD)
10641 err = histedit_edit_list_retry(histedit_cmds, err,
10642 commits, path, branch_name, repo);
10646 if (f && fclose(f) == EOF && err == NULL)
10647 err = got_error_from_errno("fclose");
10648 if (path && unlink(path) != 0 && err == NULL)
10649 err = got_error_from_errno2("unlink", path);
10654 static const struct got_error *
10655 histedit_save_list(struct got_histedit_list *histedit_cmds,
10656 struct got_worktree *worktree, struct got_repository *repo)
10658 const struct got_error *err = NULL;
10661 struct got_histedit_list_entry *hle;
10662 struct got_commit_object *commit = NULL;
10664 err = got_worktree_get_histedit_script_path(&path, worktree);
10668 f = fopen(path, "we");
10670 err = got_error_from_errno2("fopen", path);
10673 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10674 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10680 int n = fprintf(f, "%c %s\n",
10681 GOT_HISTEDIT_MESG, hle->logmsg);
10683 err = got_ferror(f, GOT_ERR_IO);
10689 if (f && fclose(f) == EOF && err == NULL)
10690 err = got_error_from_errno("fclose");
10693 got_object_commit_close(commit);
10698 histedit_free_list(struct got_histedit_list *histedit_cmds)
10700 struct got_histedit_list_entry *hle;
10702 while ((hle = TAILQ_FIRST(histedit_cmds))) {
10703 TAILQ_REMOVE(histedit_cmds, hle, entry);
10708 static const struct got_error *
10709 histedit_load_list(struct got_histedit_list *histedit_cmds,
10710 const char *path, struct got_repository *repo)
10712 const struct got_error *err = NULL;
10715 f = fopen(path, "re");
10717 err = got_error_from_errno2("fopen", path);
10721 err = histedit_parse_list(histedit_cmds, f, repo);
10723 if (f && fclose(f) == EOF && err == NULL)
10724 err = got_error_from_errno("fclose");
10728 static const struct got_error *
10729 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10730 const struct got_error *edit_err, struct got_object_id_queue *commits,
10731 const char *path, const char *branch_name, struct got_repository *repo)
10733 const struct got_error *err = NULL, *prev_err = edit_err;
10736 while (resp != 'c' && resp != 'r' && resp != 'a') {
10737 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10738 "or (a)bort: ", getprogname(), prev_err->msg);
10743 histedit_free_list(histedit_cmds);
10744 err = histedit_run_editor(histedit_cmds, path, commits,
10747 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10748 err->code != GOT_ERR_HISTEDIT_CMD)
10755 } else if (resp == 'r') {
10756 histedit_free_list(histedit_cmds);
10757 err = histedit_edit_script(histedit_cmds,
10758 commits, branch_name, 0, 0, 0, repo);
10760 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10761 err->code != GOT_ERR_HISTEDIT_CMD)
10768 } else if (resp == 'a') {
10769 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10772 printf("invalid response '%c'\n", resp);
10778 static const struct got_error *
10779 histedit_complete(struct got_worktree *worktree,
10780 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10781 struct got_reference *branch, struct got_repository *repo)
10783 printf("Switching work tree to %s\n",
10784 got_ref_get_symref_target(branch));
10785 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10789 static const struct got_error *
10790 show_histedit_progress(struct got_commit_object *commit,
10791 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10793 const struct got_error *err;
10794 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10796 err = got_object_id_str(&old_id_str, hle->commit_id);
10801 err = got_object_id_str(&new_id_str, new_id);
10806 old_id_str[12] = '\0';
10808 new_id_str[12] = '\0';
10811 logmsg = strdup(hle->logmsg);
10812 if (logmsg == NULL) {
10813 err = got_error_from_errno("strdup");
10816 trim_logmsg(logmsg, 42);
10818 err = get_short_logmsg(&logmsg, 42, commit);
10823 switch (hle->cmd->code) {
10824 case GOT_HISTEDIT_PICK:
10825 case GOT_HISTEDIT_EDIT:
10826 printf("%s -> %s: %s\n", old_id_str,
10827 new_id_str ? new_id_str : "no-op change", logmsg);
10829 case GOT_HISTEDIT_DROP:
10830 case GOT_HISTEDIT_FOLD:
10831 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
10843 static const struct got_error *
10844 histedit_commit(struct got_pathlist_head *merged_paths,
10845 struct got_worktree *worktree, struct got_fileindex *fileindex,
10846 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10847 struct got_repository *repo)
10849 const struct got_error *err;
10850 struct got_commit_object *commit;
10851 struct got_object_id *new_commit_id;
10853 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10854 && hle->logmsg == NULL) {
10855 err = histedit_edit_logmsg(hle, repo);
10860 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10864 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10865 worktree, fileindex, tmp_branch, commit, hle->commit_id,
10866 hle->logmsg, repo);
10868 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10870 err = show_histedit_progress(commit, hle, NULL);
10872 err = show_histedit_progress(commit, hle, new_commit_id);
10873 free(new_commit_id);
10876 got_object_commit_close(commit);
10880 static const struct got_error *
10881 histedit_skip_commit(struct got_histedit_list_entry *hle,
10882 struct got_worktree *worktree, struct got_repository *repo)
10884 const struct got_error *error;
10885 struct got_commit_object *commit;
10887 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10892 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10896 error = show_histedit_progress(commit, hle, NULL);
10897 got_object_commit_close(commit);
10901 static const struct got_error *
10902 check_local_changes(void *arg, unsigned char status,
10903 unsigned char staged_status, const char *path,
10904 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10905 struct got_object_id *commit_id, int dirfd, const char *de_name)
10907 int *have_local_changes = arg;
10910 case GOT_STATUS_ADD:
10911 case GOT_STATUS_DELETE:
10912 case GOT_STATUS_MODIFY:
10913 case GOT_STATUS_CONFLICT:
10914 *have_local_changes = 1;
10915 return got_error(GOT_ERR_CANCELLED);
10920 switch (staged_status) {
10921 case GOT_STATUS_ADD:
10922 case GOT_STATUS_DELETE:
10923 case GOT_STATUS_MODIFY:
10924 *have_local_changes = 1;
10925 return got_error(GOT_ERR_CANCELLED);
10933 static const struct got_error *
10934 cmd_histedit(int argc, char *argv[])
10936 const struct got_error *error = NULL;
10937 struct got_worktree *worktree = NULL;
10938 struct got_fileindex *fileindex = NULL;
10939 struct got_repository *repo = NULL;
10941 struct got_reference *branch = NULL;
10942 struct got_reference *tmp_branch = NULL;
10943 struct got_object_id *resume_commit_id = NULL;
10944 struct got_object_id *base_commit_id = NULL;
10945 struct got_object_id *head_commit_id = NULL;
10946 struct got_commit_object *commit = NULL;
10947 int ch, rebase_in_progress = 0, merge_in_progress = 0;
10948 struct got_update_progress_arg upa;
10949 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10950 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10951 int list_backups = 0, delete_backups = 0;
10952 const char *edit_script_path = NULL;
10953 struct got_object_id_queue commits;
10954 struct got_pathlist_head merged_paths;
10955 const struct got_object_id_queue *parent_ids;
10956 struct got_object_qid *pid;
10957 struct got_histedit_list histedit_cmds;
10958 struct got_histedit_list_entry *hle;
10959 int *pack_fds = NULL;
10961 STAILQ_INIT(&commits);
10962 TAILQ_INIT(&histedit_cmds);
10963 TAILQ_INIT(&merged_paths);
10964 memset(&upa, 0, sizeof(upa));
10966 while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10981 edit_script_path = optarg;
10984 edit_logmsg_only = 1;
10990 delete_backups = 1;
11002 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11003 "unveil", NULL) == -1)
11006 if (abort_edit && continue_edit)
11007 option_conflict('a', 'c');
11008 if (edit_script_path && edit_logmsg_only)
11009 option_conflict('F', 'm');
11010 if (abort_edit && edit_logmsg_only)
11011 option_conflict('a', 'm');
11012 if (continue_edit && edit_logmsg_only)
11013 option_conflict('c', 'm');
11014 if (abort_edit && fold_only)
11015 option_conflict('a', 'f');
11016 if (continue_edit && fold_only)
11017 option_conflict('c', 'f');
11018 if (fold_only && edit_logmsg_only)
11019 option_conflict('f', 'm');
11020 if (edit_script_path && fold_only)
11021 option_conflict('F', 'f');
11022 if (abort_edit && edit_only)
11023 option_conflict('a', 'e');
11024 if (continue_edit && edit_only)
11025 option_conflict('c', 'e');
11026 if (edit_only && edit_logmsg_only)
11027 option_conflict('e', 'm');
11028 if (edit_script_path && edit_only)
11029 option_conflict('F', 'e');
11030 if (list_backups) {
11032 option_conflict('l', 'a');
11034 option_conflict('l', 'c');
11035 if (edit_script_path)
11036 option_conflict('l', 'F');
11037 if (edit_logmsg_only)
11038 option_conflict('l', 'm');
11040 option_conflict('l', 'f');
11042 option_conflict('l', 'e');
11043 if (delete_backups)
11044 option_conflict('l', 'X');
11045 if (argc != 0 && argc != 1)
11047 } else if (delete_backups) {
11049 option_conflict('X', 'a');
11051 option_conflict('X', 'c');
11052 if (edit_script_path)
11053 option_conflict('X', 'F');
11054 if (edit_logmsg_only)
11055 option_conflict('X', 'm');
11057 option_conflict('X', 'f');
11059 option_conflict('X', 'e');
11061 option_conflict('X', 'l');
11062 if (argc != 0 && argc != 1)
11064 } else if (argc != 0)
11068 * This command cannot apply unveil(2) in all cases because the
11069 * user may choose to run an editor to edit the histedit script
11070 * and to edit individual commit log messages.
11071 * unveil(2) traverses exec(2); if an editor is used we have to
11072 * apply unveil after edit script and log messages have been written.
11073 * XXX TODO: Make use of unveil(2) where possible.
11076 cwd = getcwd(NULL, 0);
11078 error = got_error_from_errno("getcwd");
11082 error = got_repo_pack_fds_open(&pack_fds);
11086 error = got_worktree_open(&worktree, cwd);
11088 if (list_backups || delete_backups) {
11089 if (error->code != GOT_ERR_NOT_WORKTREE)
11092 if (error->code == GOT_ERR_NOT_WORKTREE)
11093 error = wrap_not_worktree_error(error,
11099 if (list_backups || delete_backups) {
11100 error = got_repo_open(&repo,
11101 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11105 error = apply_unveil(got_repo_get_path(repo), 0,
11106 worktree ? got_worktree_get_root_path(worktree) : NULL);
11109 error = process_backup_refs(
11110 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
11111 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11112 goto done; /* nothing else to do */
11115 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11120 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11123 if (rebase_in_progress) {
11124 error = got_error(GOT_ERR_REBASING);
11128 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11132 if (merge_in_progress) {
11133 error = got_error(GOT_ERR_MERGE_BUSY);
11137 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
11141 if (edit_in_progress && edit_logmsg_only) {
11142 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11143 "histedit operation is in progress in this "
11144 "work tree and must be continued or aborted "
11145 "before the -m option can be used");
11148 if (edit_in_progress && fold_only) {
11149 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11150 "histedit operation is in progress in this "
11151 "work tree and must be continued or aborted "
11152 "before the -f option can be used");
11155 if (edit_in_progress && edit_only) {
11156 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11157 "histedit operation is in progress in this "
11158 "work tree and must be continued or aborted "
11159 "before the -e option can be used");
11163 if (edit_in_progress && abort_edit) {
11164 error = got_worktree_histedit_continue(&resume_commit_id,
11165 &tmp_branch, &branch, &base_commit_id, &fileindex,
11169 printf("Switching work tree to %s\n",
11170 got_ref_get_symref_target(branch));
11171 error = got_worktree_histedit_abort(worktree, fileindex, repo,
11172 branch, base_commit_id, abort_progress, &upa);
11175 printf("Histedit of %s aborted\n",
11176 got_ref_get_symref_target(branch));
11177 print_merge_progress_stats(&upa);
11178 goto done; /* nothing else to do */
11179 } else if (abort_edit) {
11180 error = got_error(GOT_ERR_NOT_HISTEDIT);
11184 if (continue_edit) {
11187 if (!edit_in_progress) {
11188 error = got_error(GOT_ERR_NOT_HISTEDIT);
11192 error = got_worktree_get_histedit_script_path(&path, worktree);
11196 error = histedit_load_list(&histedit_cmds, path, repo);
11201 error = got_worktree_histedit_continue(&resume_commit_id,
11202 &tmp_branch, &branch, &base_commit_id, &fileindex,
11207 error = got_ref_resolve(&head_commit_id, repo, branch);
11211 error = got_object_open_as_commit(&commit, repo,
11215 parent_ids = got_object_commit_get_parent_ids(commit);
11216 pid = STAILQ_FIRST(parent_ids);
11218 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11221 error = collect_commits(&commits, head_commit_id, &pid->id,
11222 base_commit_id, got_worktree_get_path_prefix(worktree),
11223 GOT_ERR_HISTEDIT_PATH, repo);
11224 got_object_commit_close(commit);
11229 if (edit_in_progress) {
11230 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11234 error = got_ref_open(&branch, repo,
11235 got_worktree_get_head_ref_name(worktree), 0);
11239 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11240 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11241 "will not edit commit history of a branch outside "
11242 "the \"refs/heads/\" reference namespace");
11246 error = got_ref_resolve(&head_commit_id, repo, branch);
11247 got_ref_close(branch);
11252 error = got_object_open_as_commit(&commit, repo,
11256 parent_ids = got_object_commit_get_parent_ids(commit);
11257 pid = STAILQ_FIRST(parent_ids);
11259 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11262 error = collect_commits(&commits, head_commit_id, &pid->id,
11263 got_worktree_get_base_commit_id(worktree),
11264 got_worktree_get_path_prefix(worktree),
11265 GOT_ERR_HISTEDIT_PATH, repo);
11266 got_object_commit_close(commit);
11271 if (STAILQ_EMPTY(&commits)) {
11272 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11276 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
11277 &base_commit_id, &fileindex, worktree, repo);
11281 if (edit_script_path) {
11282 error = histedit_load_list(&histedit_cmds,
11283 edit_script_path, repo);
11285 got_worktree_histedit_abort(worktree, fileindex,
11286 repo, branch, base_commit_id,
11287 abort_progress, &upa);
11288 print_merge_progress_stats(&upa);
11292 const char *branch_name;
11293 branch_name = got_ref_get_symref_target(branch);
11294 if (strncmp(branch_name, "refs/heads/", 11) == 0)
11296 error = histedit_edit_script(&histedit_cmds, &commits,
11297 branch_name, edit_logmsg_only, fold_only,
11300 got_worktree_histedit_abort(worktree, fileindex,
11301 repo, branch, base_commit_id,
11302 abort_progress, &upa);
11303 print_merge_progress_stats(&upa);
11309 error = histedit_save_list(&histedit_cmds, worktree,
11312 got_worktree_histedit_abort(worktree, fileindex,
11313 repo, branch, base_commit_id,
11314 abort_progress, &upa);
11315 print_merge_progress_stats(&upa);
11321 error = histedit_check_script(&histedit_cmds, &commits, repo);
11325 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
11326 if (resume_commit_id) {
11327 if (got_object_id_cmp(hle->commit_id,
11328 resume_commit_id) != 0)
11331 resume_commit_id = NULL;
11332 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
11333 hle->cmd->code == GOT_HISTEDIT_FOLD) {
11334 error = histedit_skip_commit(hle, worktree,
11339 struct got_pathlist_head paths;
11340 int have_changes = 0;
11342 TAILQ_INIT(&paths);
11343 error = got_pathlist_append(&paths, "", NULL);
11346 error = got_worktree_status(worktree, &paths,
11347 repo, 0, check_local_changes, &have_changes,
11348 check_cancelled, NULL);
11349 got_pathlist_free(&paths);
11351 if (error->code != GOT_ERR_CANCELLED)
11353 if (sigint_received || sigpipe_received)
11356 if (have_changes) {
11357 error = histedit_commit(NULL, worktree,
11358 fileindex, tmp_branch, hle, repo);
11362 error = got_object_open_as_commit(
11363 &commit, repo, hle->commit_id);
11366 error = show_histedit_progress(commit,
11368 got_object_commit_close(commit);
11377 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
11378 error = histedit_skip_commit(hle, worktree, repo);
11384 error = got_object_open_as_commit(&commit, repo,
11388 parent_ids = got_object_commit_get_parent_ids(commit);
11389 pid = STAILQ_FIRST(parent_ids);
11391 error = got_worktree_histedit_merge_files(&merged_paths,
11392 worktree, fileindex, &pid->id, hle->commit_id, repo,
11393 update_progress, &upa, check_cancelled, NULL);
11396 got_object_commit_close(commit);
11399 print_merge_progress_stats(&upa);
11400 if (upa.conflicts > 0 || upa.missing > 0 ||
11401 upa.not_deleted > 0 || upa.unversioned > 0) {
11402 if (upa.conflicts > 0) {
11403 error = show_rebase_merge_conflict(
11404 hle->commit_id, repo);
11408 got_worktree_rebase_pathlist_free(&merged_paths);
11412 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
11414 error = got_object_id_str(&id_str, hle->commit_id);
11417 printf("Stopping histedit for amending commit %s\n",
11420 got_worktree_rebase_pathlist_free(&merged_paths);
11421 error = got_worktree_histedit_postpone(worktree,
11426 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11427 error = histedit_skip_commit(hle, worktree, repo);
11433 error = histedit_commit(&merged_paths, worktree, fileindex,
11434 tmp_branch, hle, repo);
11435 got_worktree_rebase_pathlist_free(&merged_paths);
11440 if (upa.conflicts > 0 || upa.missing > 0 ||
11441 upa.not_deleted > 0 || upa.unversioned > 0) {
11442 error = got_worktree_histedit_postpone(worktree, fileindex);
11445 if (upa.conflicts > 0 && upa.missing == 0 &&
11446 upa.not_deleted == 0 && upa.unversioned == 0) {
11447 error = got_error_msg(GOT_ERR_CONFLICTS,
11448 "conflicts must be resolved before histedit "
11450 } else if (upa.conflicts > 0) {
11451 error = got_error_msg(GOT_ERR_CONFLICTS,
11452 "conflicts must be resolved before histedit "
11453 "can continue; changes destined for some "
11454 "files were not yet merged and should be "
11455 "merged manually if required before the "
11456 "histedit operation is continued");
11458 error = got_error_msg(GOT_ERR_CONFLICTS,
11459 "changes destined for some files were not "
11460 "yet merged and should be merged manually "
11461 "if required before the histedit operation "
11465 error = histedit_complete(worktree, fileindex, tmp_branch,
11468 got_object_id_queue_free(&commits);
11469 histedit_free_list(&histedit_cmds);
11470 free(head_commit_id);
11471 free(base_commit_id);
11472 free(resume_commit_id);
11474 got_object_commit_close(commit);
11476 got_ref_close(branch);
11478 got_ref_close(tmp_branch);
11480 got_worktree_close(worktree);
11482 const struct got_error *close_err = got_repo_close(repo);
11487 const struct got_error *pack_err =
11488 got_repo_pack_fds_close(pack_fds);
11496 usage_integrate(void)
11498 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
11502 static const struct got_error *
11503 cmd_integrate(int argc, char *argv[])
11505 const struct got_error *error = NULL;
11506 struct got_repository *repo = NULL;
11507 struct got_worktree *worktree = NULL;
11508 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
11509 const char *branch_arg = NULL;
11510 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11511 struct got_fileindex *fileindex = NULL;
11512 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11514 struct got_update_progress_arg upa;
11515 int *pack_fds = NULL;
11517 while ((ch = getopt(argc, argv, "")) != -1) {
11530 branch_arg = argv[0];
11532 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11533 "unveil", NULL) == -1)
11536 cwd = getcwd(NULL, 0);
11538 error = got_error_from_errno("getcwd");
11542 error = got_repo_pack_fds_open(&pack_fds);
11546 error = got_worktree_open(&worktree, cwd);
11548 if (error->code == GOT_ERR_NOT_WORKTREE)
11549 error = wrap_not_worktree_error(error, "integrate",
11554 error = check_rebase_or_histedit_in_progress(worktree);
11558 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11563 error = apply_unveil(got_repo_get_path(repo), 0,
11564 got_worktree_get_root_path(worktree));
11568 error = check_merge_in_progress(worktree, repo);
11572 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11573 error = got_error_from_errno("asprintf");
11577 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11578 &base_branch_ref, worktree, refname, repo);
11582 refname = strdup(got_ref_get_name(branch_ref));
11583 if (refname == NULL) {
11584 error = got_error_from_errno("strdup");
11585 got_worktree_integrate_abort(worktree, fileindex, repo,
11586 branch_ref, base_branch_ref);
11589 base_refname = strdup(got_ref_get_name(base_branch_ref));
11590 if (base_refname == NULL) {
11591 error = got_error_from_errno("strdup");
11592 got_worktree_integrate_abort(worktree, fileindex, repo,
11593 branch_ref, base_branch_ref);
11597 error = got_ref_resolve(&commit_id, repo, branch_ref);
11601 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11605 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11606 error = got_error_msg(GOT_ERR_SAME_BRANCH,
11607 "specified branch has already been integrated");
11608 got_worktree_integrate_abort(worktree, fileindex, repo,
11609 branch_ref, base_branch_ref);
11613 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11615 if (error->code == GOT_ERR_ANCESTRY)
11616 error = got_error(GOT_ERR_REBASE_REQUIRED);
11617 got_worktree_integrate_abort(worktree, fileindex, repo,
11618 branch_ref, base_branch_ref);
11622 memset(&upa, 0, sizeof(upa));
11623 error = got_worktree_integrate_continue(worktree, fileindex, repo,
11624 branch_ref, base_branch_ref, update_progress, &upa,
11625 check_cancelled, NULL);
11629 printf("Integrated %s into %s\n", refname, base_refname);
11630 print_update_progress_stats(&upa);
11633 const struct got_error *close_err = got_repo_close(repo);
11638 got_worktree_close(worktree);
11640 const struct got_error *pack_err =
11641 got_repo_pack_fds_close(pack_fds);
11646 free(base_commit_id);
11649 free(base_refname);
11656 fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11661 static const struct got_error *
11662 cmd_merge(int argc, char *argv[])
11664 const struct got_error *error = NULL;
11665 struct got_worktree *worktree = NULL;
11666 struct got_repository *repo = NULL;
11667 struct got_fileindex *fileindex = NULL;
11668 char *cwd = NULL, *id_str = NULL, *author = NULL;
11669 struct got_reference *branch = NULL, *wt_branch = NULL;
11670 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11671 struct got_object_id *wt_branch_tip = NULL;
11672 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11673 int interrupt_merge = 0;
11674 struct got_update_progress_arg upa;
11675 struct got_object_id *merge_commit_id = NULL;
11676 char *branch_name = NULL;
11677 int *pack_fds = NULL;
11679 memset(&upa, 0, sizeof(upa));
11681 while ((ch = getopt(argc, argv, "acn")) != -1) {
11687 continue_merge = 1;
11690 interrupt_merge = 1;
11702 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11703 "unveil", NULL) == -1)
11707 if (abort_merge && continue_merge)
11708 option_conflict('a', 'c');
11709 if (abort_merge || continue_merge) {
11712 } else if (argc != 1)
11715 cwd = getcwd(NULL, 0);
11717 error = got_error_from_errno("getcwd");
11721 error = got_repo_pack_fds_open(&pack_fds);
11725 error = got_worktree_open(&worktree, cwd);
11727 if (error->code == GOT_ERR_NOT_WORKTREE)
11728 error = wrap_not_worktree_error(error,
11733 error = got_repo_open(&repo,
11734 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
11739 error = apply_unveil(got_repo_get_path(repo), 0,
11740 worktree ? got_worktree_get_root_path(worktree) : NULL);
11744 error = check_rebase_or_histedit_in_progress(worktree);
11748 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11754 if (!merge_in_progress) {
11755 error = got_error(GOT_ERR_NOT_MERGING);
11758 error = got_worktree_merge_continue(&branch_name,
11759 &branch_tip, &fileindex, worktree, repo);
11762 error = got_worktree_merge_abort(worktree, fileindex, repo,
11763 abort_progress, &upa);
11766 printf("Merge of %s aborted\n", branch_name);
11767 goto done; /* nothing else to do */
11770 error = get_author(&author, repo, worktree);
11774 if (continue_merge) {
11775 if (!merge_in_progress) {
11776 error = got_error(GOT_ERR_NOT_MERGING);
11779 error = got_worktree_merge_continue(&branch_name,
11780 &branch_tip, &fileindex, worktree, repo);
11784 error = got_ref_open(&branch, repo, argv[0], 0);
11787 branch_name = strdup(got_ref_get_name(branch));
11788 if (branch_name == NULL) {
11789 error = got_error_from_errno("strdup");
11792 error = got_ref_resolve(&branch_tip, repo, branch);
11797 error = got_ref_open(&wt_branch, repo,
11798 got_worktree_get_head_ref_name(worktree), 0);
11801 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11804 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11805 wt_branch_tip, branch_tip, 0, repo,
11806 check_cancelled, NULL);
11807 if (error && error->code != GOT_ERR_ANCESTRY)
11810 if (!continue_merge) {
11811 error = check_path_prefix(wt_branch_tip, branch_tip,
11812 got_worktree_get_path_prefix(worktree),
11813 GOT_ERR_MERGE_PATH, repo);
11817 error = check_same_branch(wt_branch_tip, branch,
11820 if (error->code != GOT_ERR_ANCESTRY)
11824 static char msg[512];
11825 snprintf(msg, sizeof(msg),
11826 "cannot create a merge commit because "
11827 "%s is based on %s; %s can be integrated "
11828 "with 'got integrate' instead", branch_name,
11829 got_worktree_get_head_ref_name(worktree),
11831 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11835 error = got_worktree_merge_prepare(&fileindex, worktree,
11840 error = got_worktree_merge_branch(worktree, fileindex,
11841 yca_id, branch_tip, repo, update_progress, &upa,
11842 check_cancelled, NULL);
11845 print_merge_progress_stats(&upa);
11846 if (!upa.did_something) {
11847 error = got_worktree_merge_abort(worktree, fileindex,
11848 repo, abort_progress, &upa);
11851 printf("Already up-to-date\n");
11856 if (interrupt_merge) {
11857 error = got_worktree_merge_postpone(worktree, fileindex);
11860 printf("Merge of %s interrupted on request\n", branch_name);
11861 } else if (upa.conflicts > 0 || upa.missing > 0 ||
11862 upa.not_deleted > 0 || upa.unversioned > 0) {
11863 error = got_worktree_merge_postpone(worktree, fileindex);
11866 if (upa.conflicts > 0 && upa.missing == 0 &&
11867 upa.not_deleted == 0 && upa.unversioned == 0) {
11868 error = got_error_msg(GOT_ERR_CONFLICTS,
11869 "conflicts must be resolved before merging "
11871 } else if (upa.conflicts > 0) {
11872 error = got_error_msg(GOT_ERR_CONFLICTS,
11873 "conflicts must be resolved before merging "
11874 "can continue; changes destined for some "
11875 "files were not yet merged and "
11876 "should be merged manually if required before the "
11877 "merge operation is continued");
11879 error = got_error_msg(GOT_ERR_CONFLICTS,
11880 "changes destined for some "
11881 "files were not yet merged and should be "
11882 "merged manually if required before the "
11883 "merge operation is continued");
11887 error = got_worktree_merge_commit(&merge_commit_id, worktree,
11888 fileindex, author, NULL, 1, branch_tip, branch_name,
11889 repo, continue_merge ? print_status : NULL, NULL);
11892 error = got_worktree_merge_complete(worktree, fileindex, repo);
11895 error = got_object_id_str(&id_str, merge_commit_id);
11898 printf("Merged %s into %s: %s\n", branch_name,
11899 got_worktree_get_head_ref_name(worktree),
11905 free(merge_commit_id);
11911 got_ref_close(branch);
11913 got_ref_close(wt_branch);
11915 got_worktree_close(worktree);
11917 const struct got_error *close_err = got_repo_close(repo);
11922 const struct got_error *pack_err =
11923 got_repo_pack_fds_close(pack_fds);
11933 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11934 "[-S] [file-path ...]\n",
11939 static const struct got_error *
11940 print_stage(void *arg, unsigned char status, unsigned char staged_status,
11941 const char *path, struct got_object_id *blob_id,
11942 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11943 int dirfd, const char *de_name)
11945 const struct got_error *err = NULL;
11946 char *id_str = NULL;
11948 if (staged_status != GOT_STATUS_ADD &&
11949 staged_status != GOT_STATUS_MODIFY &&
11950 staged_status != GOT_STATUS_DELETE)
11953 if (staged_status == GOT_STATUS_ADD ||
11954 staged_status == GOT_STATUS_MODIFY)
11955 err = got_object_id_str(&id_str, staged_blob_id);
11957 err = got_object_id_str(&id_str, blob_id);
11961 printf("%s %c %s\n", id_str, staged_status, path);
11966 static const struct got_error *
11967 cmd_stage(int argc, char *argv[])
11969 const struct got_error *error = NULL;
11970 struct got_repository *repo = NULL;
11971 struct got_worktree *worktree = NULL;
11973 struct got_pathlist_head paths;
11974 struct got_pathlist_entry *pe;
11975 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11976 FILE *patch_script_file = NULL;
11977 const char *patch_script_path = NULL;
11978 struct choose_patch_arg cpa;
11979 int *pack_fds = NULL;
11981 TAILQ_INIT(&paths);
11983 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11992 patch_script_path = optarg;
11995 allow_bad_symlinks = 1;
12007 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12008 "unveil", NULL) == -1)
12011 if (list_stage && (pflag || patch_script_path))
12012 errx(1, "-l option cannot be used with other options");
12013 if (patch_script_path && !pflag)
12014 errx(1, "-F option can only be used together with -p option");
12016 cwd = getcwd(NULL, 0);
12018 error = got_error_from_errno("getcwd");
12022 error = got_repo_pack_fds_open(&pack_fds);
12026 error = got_worktree_open(&worktree, cwd);
12028 if (error->code == GOT_ERR_NOT_WORKTREE)
12029 error = wrap_not_worktree_error(error, "stage", cwd);
12033 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12038 if (patch_script_path) {
12039 patch_script_file = fopen(patch_script_path, "re");
12040 if (patch_script_file == NULL) {
12041 error = got_error_from_errno2("fopen",
12042 patch_script_path);
12046 error = apply_unveil(got_repo_get_path(repo), 0,
12047 got_worktree_get_root_path(worktree));
12051 error = check_merge_in_progress(worktree, repo);
12055 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12060 error = got_worktree_status(worktree, &paths, repo, 0,
12061 print_stage, NULL, check_cancelled, NULL);
12063 cpa.patch_script_file = patch_script_file;
12064 cpa.action = "stage";
12065 error = got_worktree_stage(worktree, &paths,
12066 pflag ? NULL : print_status, NULL,
12067 pflag ? choose_patch : NULL, &cpa,
12068 allow_bad_symlinks, repo);
12071 if (patch_script_file && fclose(patch_script_file) == EOF &&
12073 error = got_error_from_errno2("fclose", patch_script_path);
12075 const struct got_error *close_err = got_repo_close(repo);
12080 got_worktree_close(worktree);
12082 const struct got_error *pack_err =
12083 got_repo_pack_fds_close(pack_fds);
12087 TAILQ_FOREACH(pe, &paths, entry)
12088 free((char *)pe->path);
12089 got_pathlist_free(&paths);
12095 usage_unstage(void)
12097 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
12098 "[file-path ...]\n",
12104 static const struct got_error *
12105 cmd_unstage(int argc, char *argv[])
12107 const struct got_error *error = NULL;
12108 struct got_repository *repo = NULL;
12109 struct got_worktree *worktree = NULL;
12111 struct got_pathlist_head paths;
12112 struct got_pathlist_entry *pe;
12114 struct got_update_progress_arg upa;
12115 FILE *patch_script_file = NULL;
12116 const char *patch_script_path = NULL;
12117 struct choose_patch_arg cpa;
12118 int *pack_fds = NULL;
12120 TAILQ_INIT(&paths);
12122 while ((ch = getopt(argc, argv, "pF:")) != -1) {
12128 patch_script_path = optarg;
12140 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12141 "unveil", NULL) == -1)
12144 if (patch_script_path && !pflag)
12145 errx(1, "-F option can only be used together with -p option");
12147 cwd = getcwd(NULL, 0);
12149 error = got_error_from_errno("getcwd");
12153 error = got_repo_pack_fds_open(&pack_fds);
12157 error = got_worktree_open(&worktree, cwd);
12159 if (error->code == GOT_ERR_NOT_WORKTREE)
12160 error = wrap_not_worktree_error(error, "unstage", cwd);
12164 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12169 if (patch_script_path) {
12170 patch_script_file = fopen(patch_script_path, "re");
12171 if (patch_script_file == NULL) {
12172 error = got_error_from_errno2("fopen",
12173 patch_script_path);
12178 error = apply_unveil(got_repo_get_path(repo), 0,
12179 got_worktree_get_root_path(worktree));
12183 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12187 cpa.patch_script_file = patch_script_file;
12188 cpa.action = "unstage";
12189 memset(&upa, 0, sizeof(upa));
12190 error = got_worktree_unstage(worktree, &paths, update_progress,
12191 &upa, pflag ? choose_patch : NULL, &cpa, repo);
12193 print_merge_progress_stats(&upa);
12195 if (patch_script_file && fclose(patch_script_file) == EOF &&
12197 error = got_error_from_errno2("fclose", patch_script_path);
12199 const struct got_error *close_err = got_repo_close(repo);
12204 got_worktree_close(worktree);
12206 const struct got_error *pack_err =
12207 got_repo_pack_fds_close(pack_fds);
12211 TAILQ_FOREACH(pe, &paths, entry)
12212 free((char *)pe->path);
12213 got_pathlist_free(&paths);
12221 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
12222 "arg1 [arg2 ...]\n", getprogname());
12226 static const struct got_error *
12227 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12229 const struct got_error *err;
12230 struct got_blob_object *blob;
12232 err = got_object_open_as_blob(&blob, repo, id, 8192);
12236 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
12237 got_object_blob_close(blob);
12241 static const struct got_error *
12242 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12244 const struct got_error *err;
12245 struct got_tree_object *tree;
12248 err = got_object_open_as_tree(&tree, repo, id);
12252 nentries = got_object_tree_get_nentries(tree);
12253 for (i = 0; i < nentries; i++) {
12254 struct got_tree_entry *te;
12256 if (sigint_received || sigpipe_received)
12258 te = got_object_tree_get_entry(tree, i);
12259 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
12262 fprintf(outfile, "%s %.7o %s\n", id_str,
12263 got_tree_entry_get_mode(te),
12264 got_tree_entry_get_name(te));
12268 got_object_tree_close(tree);
12273 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
12283 h = (long long)gmtoff / 3600;
12284 m = ((long long)gmtoff - h*3600) / 60;
12285 snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
12288 static const struct got_error *
12289 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12291 const struct got_error *err;
12292 struct got_commit_object *commit;
12293 const struct got_object_id_queue *parent_ids;
12294 struct got_object_qid *pid;
12295 char *id_str = NULL;
12296 const char *logmsg = NULL;
12299 err = got_object_open_as_commit(&commit, repo, id);
12303 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
12307 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
12308 parent_ids = got_object_commit_get_parent_ids(commit);
12309 fprintf(outfile, "numparents %d\n",
12310 got_object_commit_get_nparents(commit));
12311 STAILQ_FOREACH(pid, parent_ids, entry) {
12313 err = got_object_id_str(&pid_str, &pid->id);
12316 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
12319 format_gmtoff(gmtoff, sizeof(gmtoff),
12320 got_object_commit_get_author_gmtoff(commit));
12321 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
12322 got_object_commit_get_author(commit),
12323 (long long)got_object_commit_get_author_time(commit),
12326 format_gmtoff(gmtoff, sizeof(gmtoff),
12327 got_object_commit_get_committer_gmtoff(commit));
12328 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
12329 got_object_commit_get_author(commit),
12330 (long long)got_object_commit_get_committer_time(commit),
12333 logmsg = got_object_commit_get_logmsg_raw(commit);
12334 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
12335 fprintf(outfile, "%s", logmsg);
12338 got_object_commit_close(commit);
12342 static const struct got_error *
12343 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12345 const struct got_error *err;
12346 struct got_tag_object *tag;
12347 char *id_str = NULL;
12348 const char *tagmsg = NULL;
12351 err = got_object_open_as_tag(&tag, repo, id);
12355 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
12359 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
12361 switch (got_object_tag_get_object_type(tag)) {
12362 case GOT_OBJ_TYPE_BLOB:
12363 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12364 GOT_OBJ_LABEL_BLOB);
12366 case GOT_OBJ_TYPE_TREE:
12367 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12368 GOT_OBJ_LABEL_TREE);
12370 case GOT_OBJ_TYPE_COMMIT:
12371 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12372 GOT_OBJ_LABEL_COMMIT);
12374 case GOT_OBJ_TYPE_TAG:
12375 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12376 GOT_OBJ_LABEL_TAG);
12382 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
12383 got_object_tag_get_name(tag));
12385 format_gmtoff(gmtoff, sizeof(gmtoff),
12386 got_object_tag_get_tagger_gmtoff(tag));
12387 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
12388 got_object_tag_get_tagger(tag),
12389 (long long)got_object_tag_get_tagger_time(tag),
12392 tagmsg = got_object_tag_get_message(tag);
12393 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
12394 fprintf(outfile, "%s", tagmsg);
12397 got_object_tag_close(tag);
12401 static const struct got_error *
12402 cmd_cat(int argc, char *argv[])
12404 const struct got_error *error;
12405 struct got_repository *repo = NULL;
12406 struct got_worktree *worktree = NULL;
12407 char *cwd = NULL, *repo_path = NULL, *label = NULL;
12408 const char *commit_id_str = NULL;
12409 struct got_object_id *id = NULL, *commit_id = NULL;
12410 struct got_commit_object *commit = NULL;
12411 int ch, obj_type, i, force_path = 0;
12412 struct got_reflist_head refs;
12413 int *pack_fds = NULL;
12418 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12423 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
12426 commit_id_str = optarg;
12429 repo_path = realpath(optarg, NULL);
12430 if (repo_path == NULL)
12431 return got_error_from_errno2("realpath",
12433 got_path_strip_trailing_slashes(repo_path);
12447 cwd = getcwd(NULL, 0);
12449 error = got_error_from_errno("getcwd");
12453 error = got_repo_pack_fds_open(&pack_fds);
12457 if (repo_path == NULL) {
12458 error = got_worktree_open(&worktree, cwd);
12459 if (error && error->code != GOT_ERR_NOT_WORKTREE)
12462 repo_path = strdup(
12463 got_worktree_get_repo_path(worktree));
12464 if (repo_path == NULL) {
12465 error = got_error_from_errno("strdup");
12469 /* Release work tree lock. */
12470 got_worktree_close(worktree);
12475 if (repo_path == NULL) {
12476 repo_path = strdup(cwd);
12477 if (repo_path == NULL)
12478 return got_error_from_errno("strdup");
12481 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
12486 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
12490 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
12494 if (commit_id_str == NULL)
12495 commit_id_str = GOT_REF_HEAD;
12496 error = got_repo_match_object_id(&commit_id, NULL,
12497 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
12501 error = got_object_open_as_commit(&commit, repo, commit_id);
12505 for (i = 0; i < argc; i++) {
12507 error = got_object_id_by_path(&id, repo, commit,
12512 error = got_repo_match_object_id(&id, &label, argv[i],
12513 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
12516 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
12517 error->code != GOT_ERR_NOT_REF)
12519 error = got_object_id_by_path(&id, repo,
12526 error = got_object_get_type(&obj_type, repo, id);
12530 switch (obj_type) {
12531 case GOT_OBJ_TYPE_BLOB:
12532 error = cat_blob(id, repo, stdout);
12534 case GOT_OBJ_TYPE_TREE:
12535 error = cat_tree(id, repo, stdout);
12537 case GOT_OBJ_TYPE_COMMIT:
12538 error = cat_commit(id, repo, stdout);
12540 case GOT_OBJ_TYPE_TAG:
12541 error = cat_tag(id, repo, stdout);
12544 error = got_error(GOT_ERR_OBJ_TYPE);
12559 got_object_commit_close(commit);
12561 got_worktree_close(worktree);
12563 const struct got_error *close_err = got_repo_close(repo);
12568 const struct got_error *pack_err =
12569 got_repo_pack_fds_close(pack_fds);
12574 got_ref_list_free(&refs);
12581 fprintf(stderr, "usage: %s info [path ...]\n",
12586 static const struct got_error *
12587 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12588 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12589 struct got_object_id *commit_id)
12591 const struct got_error *err = NULL;
12592 char *id_str = NULL;
12594 struct tm mytm, *tm;
12595 struct got_pathlist_head *paths = arg;
12596 struct got_pathlist_entry *pe;
12599 * Clear error indication from any of the path arguments which
12600 * would cause this file index entry to be displayed.
12602 TAILQ_FOREACH(pe, paths, entry) {
12603 if (got_path_cmp(path, pe->path, strlen(path),
12604 pe->path_len) == 0 ||
12605 got_path_is_child(path, pe->path, pe->path_len))
12606 pe->data = NULL; /* no error */
12609 printf(GOT_COMMIT_SEP_STR);
12611 printf("symlink: %s\n", path);
12612 else if (S_ISREG(mode)) {
12613 printf("file: %s\n", path);
12614 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12615 } else if (S_ISDIR(mode))
12616 printf("directory: %s\n", path);
12618 printf("something: %s\n", path);
12620 tm = localtime_r(&mtime, &mytm);
12623 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12624 return got_error(GOT_ERR_NO_SPACE);
12625 printf("timestamp: %s\n", datebuf);
12628 err = got_object_id_str(&id_str, blob_id);
12631 printf("based on blob: %s\n", id_str);
12635 if (staged_blob_id) {
12636 err = got_object_id_str(&id_str, staged_blob_id);
12639 printf("based on staged blob: %s\n", id_str);
12644 err = got_object_id_str(&id_str, commit_id);
12647 printf("based on commit: %s\n", id_str);
12654 static const struct got_error *
12655 cmd_info(int argc, char *argv[])
12657 const struct got_error *error = NULL;
12658 struct got_worktree *worktree = NULL;
12659 char *cwd = NULL, *id_str = NULL;
12660 struct got_pathlist_head paths;
12661 struct got_pathlist_entry *pe;
12662 char *uuidstr = NULL;
12663 int ch, show_files = 0;
12664 int *pack_fds = NULL;
12666 TAILQ_INIT(&paths);
12668 while ((ch = getopt(argc, argv, "")) != -1) {
12680 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12684 cwd = getcwd(NULL, 0);
12686 error = got_error_from_errno("getcwd");
12690 error = got_repo_pack_fds_open(&pack_fds);
12694 error = got_worktree_open(&worktree, cwd);
12696 if (error->code == GOT_ERR_NOT_WORKTREE)
12697 error = wrap_not_worktree_error(error, "info", cwd);
12702 /* Remove "cpath" promise. */
12703 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
12707 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
12712 error = get_worktree_paths_from_argv(&paths, argc, argv,
12719 error = got_object_id_str(&id_str,
12720 got_worktree_get_base_commit_id(worktree));
12724 error = got_worktree_get_uuid(&uuidstr, worktree);
12728 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12729 printf("work tree base commit: %s\n", id_str);
12730 printf("work tree path prefix: %s\n",
12731 got_worktree_get_path_prefix(worktree));
12732 printf("work tree branch reference: %s\n",
12733 got_worktree_get_head_ref_name(worktree));
12734 printf("work tree UUID: %s\n", uuidstr);
12735 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12738 struct got_pathlist_entry *pe;
12739 TAILQ_FOREACH(pe, &paths, entry) {
12740 if (pe->path_len == 0)
12743 * Assume this path will fail. This will be corrected
12744 * in print_path_info() in case the path does suceeed.
12746 pe->data = (void *)got_error_path(pe->path,
12749 error = got_worktree_path_info(worktree, &paths,
12750 print_path_info, &paths, check_cancelled, NULL);
12753 TAILQ_FOREACH(pe, &paths, entry) {
12754 if (pe->data != NULL) {
12755 error = pe->data; /* bad path */
12762 const struct got_error *pack_err =
12763 got_repo_pack_fds_close(pack_fds);
12767 TAILQ_FOREACH(pe, &paths, entry)
12768 free((char *)pe->path);
12769 got_pathlist_free(&paths);