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,
3708 if (path && path[0] != '\0') {
3710 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3713 err = got_object_id_str(&id_str2, obj_id2);
3719 err = got_object_id_by_path(&obj_id1, repo,
3722 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3727 err = got_object_id_str(&id_str1, obj_id1);
3734 err = got_object_get_type(&obj_type, repo, obj_id2);
3740 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3742 case GOT_OBJ_TYPE_BLOB:
3743 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3744 0, 0, repo, outfile);
3746 case GOT_OBJ_TYPE_TREE:
3747 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3748 0, 0, repo, outfile);
3751 err = got_error(GOT_ERR_OBJ_TYPE);
3757 obj_id2 = got_object_commit_get_tree_id(commit);
3758 err = got_object_id_str(&id_str2, obj_id2);
3762 obj_id1 = got_object_commit_get_tree_id(pcommit);
3763 err = got_object_id_str(&id_str1, obj_id1);
3768 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3769 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3776 got_object_commit_close(pcommit);
3781 get_datestr(time_t *time, char *datebuf)
3783 struct tm mytm, *tm;
3786 tm = gmtime_r(time, &mytm);
3789 s = asctime_r(tm, datebuf);
3792 p = strchr(s, '\n');
3798 static const struct got_error *
3799 match_commit(int *have_match, struct got_object_id *id,
3800 struct got_commit_object *commit, regex_t *regex)
3802 const struct got_error *err = NULL;
3803 regmatch_t regmatch;
3804 char *id_str = NULL, *logmsg = NULL;
3808 err = got_object_id_str(&id_str, id);
3812 err = got_object_commit_get_logmsg(&logmsg, commit);
3816 if (regexec(regex, got_object_commit_get_author(commit), 1,
3817 ®match, 0) == 0 ||
3818 regexec(regex, got_object_commit_get_committer(commit), 1,
3819 ®match, 0) == 0 ||
3820 regexec(regex, id_str, 1, ®match, 0) == 0 ||
3821 regexec(regex, logmsg, 1, ®match, 0) == 0)
3830 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3833 regmatch_t regmatch;
3834 struct got_pathlist_entry *pe;
3838 TAILQ_FOREACH(pe, changed_paths, entry) {
3839 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3846 static const struct got_error *
3847 match_patch(int *have_match, struct got_commit_object *commit,
3848 struct got_object_id *id, const char *path, int diff_context,
3849 struct got_repository *repo, regex_t *regex, FILE *f)
3851 const struct got_error *err = NULL;
3853 size_t linesize = 0;
3855 regmatch_t regmatch;
3859 err = got_opentemp_truncate(f);
3863 err = print_patch(commit, id, path, diff_context, repo, f);
3867 if (fseeko(f, 0L, SEEK_SET) == -1) {
3868 err = got_error_from_errno("fseeko");
3872 while ((linelen = getline(&line, &linesize, f)) != -1) {
3873 if (regexec(regex, line, 1, ®match, 0) == 0) {
3883 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3885 static const struct got_error*
3886 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3887 struct got_object_id *id, struct got_repository *repo,
3890 static const struct got_error *err = NULL;
3891 struct got_reflist_entry *re;
3897 TAILQ_FOREACH(re, refs, entry) {
3898 struct got_tag_object *tag = NULL;
3899 struct got_object_id *ref_id;
3902 name = got_ref_get_name(re->ref);
3903 if (strcmp(name, GOT_REF_HEAD) == 0)
3905 if (strncmp(name, "refs/", 5) == 0)
3907 if (strncmp(name, "got/", 4) == 0)
3909 if (strncmp(name, "heads/", 6) == 0)
3911 if (strncmp(name, "remotes/", 8) == 0) {
3915 s = strstr(name, "/" GOT_REF_HEAD);
3916 if (s != NULL && s[strlen(s)] == '\0')
3919 err = got_ref_resolve(&ref_id, repo, re->ref);
3922 if (strncmp(name, "tags/", 5) == 0) {
3923 err = got_object_open_as_tag(&tag, repo, ref_id);
3925 if (err->code != GOT_ERR_OBJ_TYPE) {
3929 /* Ref points at something other than a tag. */
3934 cmp = got_object_id_cmp(tag ?
3935 got_object_tag_get_object_id(tag) : ref_id, id);
3938 got_object_tag_close(tag);
3942 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3943 s ? ", " : "", name) == -1) {
3944 err = got_error_from_errno("asprintf");
3955 static const struct got_error *
3956 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
3957 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
3959 const struct got_error *err = NULL;
3960 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
3961 char *comma, *s, *nl;
3962 struct got_reflist_head *refs;
3963 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
3965 time_t committer_time;
3967 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3969 err = build_refs_str(&ref_str, refs, id, repo, 1);
3973 /* Display the first matching ref only. */
3974 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
3978 if (ref_str == NULL) {
3979 err = got_object_id_str(&id_str, id);
3984 committer_time = got_object_commit_get_committer_time(commit);
3985 if (gmtime_r(&committer_time, &tm) == NULL) {
3986 err = got_error_from_errno("gmtime_r");
3989 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
3990 err = got_error(GOT_ERR_NO_SPACE);
3994 err = got_object_commit_get_logmsg(&logmsg0, commit);
3999 while (isspace((unsigned char)s[0]))
4002 nl = strchr(s, '\n');
4008 printf("%s%-7s %s\n", datebuf, ref_str, s);
4010 printf("%s%.7s %s\n", datebuf, id_str, s);
4012 if (fflush(stdout) != 0 && err == NULL)
4013 err = got_error_from_errno("fflush");
4021 static const struct got_error *
4022 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4023 struct got_repository *repo, const char *path,
4024 struct got_pathlist_head *changed_paths, int show_patch,
4025 int diff_context, struct got_reflist_object_id_map *refs_idmap,
4026 const char *custom_refs_str)
4028 const struct got_error *err = NULL;
4029 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4031 time_t committer_time;
4032 const char *author, *committer;
4033 char *refs_str = NULL;
4035 err = got_object_id_str(&id_str, id);
4039 if (custom_refs_str == NULL) {
4040 struct got_reflist_head *refs;
4041 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4043 err = build_refs_str(&refs_str, refs, id, repo, 0);
4049 printf(GOT_COMMIT_SEP_STR);
4050 if (custom_refs_str)
4051 printf("commit %s (%s)\n", id_str, custom_refs_str);
4053 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
4054 refs_str ? refs_str : "", refs_str ? ")" : "");
4059 printf("from: %s\n", got_object_commit_get_author(commit));
4060 committer_time = got_object_commit_get_committer_time(commit);
4061 datestr = get_datestr(&committer_time, datebuf);
4063 printf("date: %s UTC\n", datestr);
4064 author = got_object_commit_get_author(commit);
4065 committer = got_object_commit_get_committer(commit);
4066 if (strcmp(author, committer) != 0)
4067 printf("via: %s\n", committer);
4068 if (got_object_commit_get_nparents(commit) > 1) {
4069 const struct got_object_id_queue *parent_ids;
4070 struct got_object_qid *qid;
4072 parent_ids = got_object_commit_get_parent_ids(commit);
4073 STAILQ_FOREACH(qid, parent_ids, entry) {
4074 err = got_object_id_str(&id_str, &qid->id);
4077 printf("parent %d: %s\n", n++, id_str);
4083 err = got_object_commit_get_logmsg(&logmsg0, commit);
4089 line = strsep(&logmsg, "\n");
4091 printf(" %s\n", line);
4095 if (changed_paths) {
4096 struct got_pathlist_entry *pe;
4097 TAILQ_FOREACH(pe, changed_paths, entry) {
4098 struct got_diff_changed_path *cp = pe->data;
4099 printf(" %c %s\n", cp->status, pe->path);
4104 err = print_patch(commit, id, path, diff_context, repo, stdout);
4109 if (fflush(stdout) != 0 && err == NULL)
4110 err = got_error_from_errno("fflush");
4117 static const struct got_error *
4118 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4119 struct got_repository *repo, const char *path, int show_changed_paths,
4120 int show_patch, const char *search_pattern, int diff_context, int limit,
4121 int log_branches, int reverse_display_order,
4122 struct got_reflist_object_id_map *refs_idmap, int one_line,
4125 const struct got_error *err;
4126 struct got_commit_graph *graph;
4129 struct got_object_id_queue reversed_commits;
4130 struct got_object_qid *qid;
4131 struct got_commit_object *commit;
4132 struct got_pathlist_head changed_paths;
4133 struct got_pathlist_entry *pe;
4135 STAILQ_INIT(&reversed_commits);
4136 TAILQ_INIT(&changed_paths);
4138 if (search_pattern && regcomp(®ex, search_pattern,
4139 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4140 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4142 err = got_commit_graph_open(&graph, path, !log_branches);
4145 err = got_commit_graph_iter_start(graph, root_id, repo,
4146 check_cancelled, NULL);
4150 struct got_object_id *id;
4152 if (sigint_received || sigpipe_received)
4155 err = got_commit_graph_iter_next(&id, graph, repo,
4156 check_cancelled, NULL);
4158 if (err->code == GOT_ERR_ITER_COMPLETED)
4165 err = got_object_open_as_commit(&commit, repo, id);
4169 if (show_changed_paths && !reverse_display_order) {
4170 err = get_changed_paths(&changed_paths, commit, repo);
4175 if (search_pattern) {
4176 err = match_commit(&have_match, id, commit, ®ex);
4178 got_object_commit_close(commit);
4181 if (have_match == 0 && show_changed_paths)
4182 match_changed_paths(&have_match,
4183 &changed_paths, ®ex);
4184 if (have_match == 0 && show_patch) {
4185 err = match_patch(&have_match, commit, id,
4186 path, diff_context, repo, ®ex,
4191 if (have_match == 0) {
4192 got_object_commit_close(commit);
4193 TAILQ_FOREACH(pe, &changed_paths, entry) {
4194 free((char *)pe->path);
4197 got_pathlist_free(&changed_paths);
4202 if (reverse_display_order) {
4203 err = got_object_qid_alloc(&qid, id);
4206 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4207 got_object_commit_close(commit);
4210 err = print_commit_oneline(commit, id,
4213 err = print_commit(commit, id, repo, path,
4214 show_changed_paths ? &changed_paths : NULL,
4215 show_patch, diff_context, refs_idmap, NULL);
4216 got_object_commit_close(commit);
4220 if ((limit && --limit == 0) ||
4221 (end_id && got_object_id_cmp(id, end_id) == 0))
4224 TAILQ_FOREACH(pe, &changed_paths, entry) {
4225 free((char *)pe->path);
4228 got_pathlist_free(&changed_paths);
4230 if (reverse_display_order) {
4231 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4232 err = got_object_open_as_commit(&commit, repo,
4236 if (show_changed_paths) {
4237 err = get_changed_paths(&changed_paths,
4243 err = print_commit_oneline(commit, &qid->id,
4246 err = print_commit(commit, &qid->id, repo, path,
4247 show_changed_paths ? &changed_paths : NULL,
4248 show_patch, diff_context, refs_idmap, NULL);
4249 got_object_commit_close(commit);
4252 TAILQ_FOREACH(pe, &changed_paths, entry) {
4253 free((char *)pe->path);
4256 got_pathlist_free(&changed_paths);
4260 while (!STAILQ_EMPTY(&reversed_commits)) {
4261 qid = STAILQ_FIRST(&reversed_commits);
4262 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4263 got_object_qid_free(qid);
4265 TAILQ_FOREACH(pe, &changed_paths, entry) {
4266 free((char *)pe->path);
4269 got_pathlist_free(&changed_paths);
4272 got_commit_graph_close(graph);
4279 fprintf(stderr, "usage: %s log [-b] [-p] [-P] [-s] [-c commit] "
4280 "[-C number] [ -l N ] [-x commit] [-S search-pattern] "
4281 "[-r repository-path] [-R] [path]\n", getprogname());
4286 get_default_log_limit(void)
4288 const char *got_default_log_limit;
4292 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4293 if (got_default_log_limit == NULL)
4295 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4301 static const struct got_error *
4302 cmd_log(int argc, char *argv[])
4304 const struct got_error *error;
4305 struct got_repository *repo = NULL;
4306 struct got_worktree *worktree = NULL;
4307 struct got_object_id *start_id = NULL, *end_id = NULL;
4308 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4309 const char *start_commit = NULL, *end_commit = NULL;
4310 const char *search_pattern = NULL;
4311 int diff_context = -1, ch;
4312 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4313 int reverse_display_order = 0, one_line = 0;
4315 struct got_reflist_head refs;
4316 struct got_reflist_object_id_map *refs_idmap = NULL;
4317 FILE *tmpfile = NULL;
4318 int *pack_fds = NULL;
4323 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4329 limit = get_default_log_limit();
4331 while ((ch = getopt(argc, argv, "bpPc:C:l:r:RsS:x:")) != -1) {
4337 show_changed_paths = 1;
4340 start_commit = optarg;
4343 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4346 errx(1, "number of context lines is %s: %s",
4350 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4352 errx(1, "number of commits is %s: %s",
4359 repo_path = realpath(optarg, NULL);
4360 if (repo_path == NULL)
4361 return got_error_from_errno2("realpath",
4363 got_path_strip_trailing_slashes(repo_path);
4366 reverse_display_order = 1;
4372 search_pattern = optarg;
4375 end_commit = optarg;
4386 if (diff_context == -1)
4388 else if (!show_patch)
4389 errx(1, "-C requires -p");
4391 if (one_line && (show_patch || show_changed_paths))
4392 errx(1, "cannot use -s with -p or -P");
4394 cwd = getcwd(NULL, 0);
4396 error = got_error_from_errno("getcwd");
4400 error = got_repo_pack_fds_open(&pack_fds);
4404 if (repo_path == NULL) {
4405 error = got_worktree_open(&worktree, cwd);
4406 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4413 error = got_worktree_resolve_path(&path, worktree,
4418 path = strdup(argv[0]);
4420 error = got_error_from_errno("strdup");
4424 } else if (argc != 0)
4427 if (repo_path == NULL) {
4428 repo_path = worktree ?
4429 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4431 if (repo_path == NULL) {
4432 error = got_error_from_errno("strdup");
4436 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4440 error = apply_unveil(got_repo_get_path(repo), 1,
4441 worktree ? got_worktree_get_root_path(worktree) : NULL);
4445 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4449 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4453 if (start_commit == NULL) {
4454 struct got_reference *head_ref;
4455 struct got_commit_object *commit = NULL;
4456 error = got_ref_open(&head_ref, repo,
4457 worktree ? got_worktree_get_head_ref_name(worktree)
4461 error = got_ref_resolve(&start_id, repo, head_ref);
4462 got_ref_close(head_ref);
4465 error = got_object_open_as_commit(&commit, repo,
4469 got_object_commit_close(commit);
4471 error = got_repo_match_object_id(&start_id, NULL,
4472 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4476 if (end_commit != NULL) {
4477 error = got_repo_match_object_id(&end_id, NULL,
4478 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4485 * If a path was specified on the command line it was resolved
4486 * to a path in the work tree above. Prepend the work tree's
4487 * path prefix to obtain the corresponding in-repository path.
4491 prefix = got_worktree_get_path_prefix(worktree);
4492 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4493 (path[0] != '\0') ? "/" : "", path) == -1) {
4494 error = got_error_from_errno("asprintf");
4499 error = got_repo_map_path(&in_repo_path, repo,
4505 path = in_repo_path;
4509 /* Release work tree lock. */
4510 got_worktree_close(worktree);
4514 if (search_pattern && show_patch) {
4515 tmpfile = got_opentemp();
4516 if (tmpfile == NULL) {
4517 error = got_error_from_errno("got_opentemp");
4522 error = print_commits(start_id, end_id, repo, path ? path : "",
4523 show_changed_paths, show_patch, search_pattern, diff_context,
4524 limit, log_branches, reverse_display_order, refs_idmap, one_line,
4531 got_worktree_close(worktree);
4533 const struct got_error *close_err = got_repo_close(repo);
4538 const struct got_error *pack_err =
4539 got_repo_pack_fds_close(pack_fds);
4544 got_reflist_object_id_map_free(refs_idmap);
4545 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4546 error = got_error_from_errno("fclose");
4547 got_ref_list_free(&refs);
4554 fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4555 "[-r repository-path] [-s] [-w] [-P] "
4556 "[object1 object2 | path ...]\n", getprogname());
4560 struct print_diff_arg {
4561 struct got_repository *repo;
4562 struct got_worktree *worktree;
4567 int ignore_whitespace;
4568 int force_text_diff;
4572 * Create a file which contains the target path of a symlink so we can feed
4573 * it as content to the diff engine.
4575 static const struct got_error *
4576 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4577 const char *abspath)
4579 const struct got_error *err = NULL;
4580 char target_path[PATH_MAX];
4581 ssize_t target_len, outlen;
4586 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4587 if (target_len == -1)
4588 return got_error_from_errno2("readlinkat", abspath);
4590 target_len = readlink(abspath, target_path, PATH_MAX);
4591 if (target_len == -1)
4592 return got_error_from_errno2("readlink", abspath);
4595 *fd = got_opentempfd();
4597 return got_error_from_errno("got_opentempfd");
4599 outlen = write(*fd, target_path, target_len);
4601 err = got_error_from_errno("got_opentempfd");
4605 if (lseek(*fd, 0, SEEK_SET) == -1) {
4606 err = got_error_from_errno2("lseek", abspath);
4617 static const struct got_error *
4618 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4619 const char *path, struct got_object_id *blob_id,
4620 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4621 int dirfd, const char *de_name)
4623 struct print_diff_arg *a = arg;
4624 const struct got_error *err = NULL;
4625 struct got_blob_object *blob1 = NULL;
4627 FILE *f1 = NULL, *f2 = NULL;
4628 char *abspath = NULL, *label1 = NULL;
4632 if (a->diff_staged) {
4633 if (staged_status != GOT_STATUS_MODIFY &&
4634 staged_status != GOT_STATUS_ADD &&
4635 staged_status != GOT_STATUS_DELETE)
4638 if (staged_status == GOT_STATUS_DELETE)
4640 if (status == GOT_STATUS_NONEXISTENT)
4641 return got_error_set_errno(ENOENT, path);
4642 if (status != GOT_STATUS_MODIFY &&
4643 status != GOT_STATUS_ADD &&
4644 status != GOT_STATUS_DELETE &&
4645 status != GOT_STATUS_CONFLICT)
4649 if (!a->header_shown) {
4650 printf("diff %s %s%s\n", a->id_str,
4651 got_worktree_get_root_path(a->worktree),
4652 a->diff_staged ? " (staged changes)" : "");
4653 a->header_shown = 1;
4656 if (a->diff_staged) {
4657 const char *label1 = NULL, *label2 = NULL;
4658 switch (staged_status) {
4659 case GOT_STATUS_MODIFY:
4663 case GOT_STATUS_ADD:
4666 case GOT_STATUS_DELETE:
4670 return got_error(GOT_ERR_FILE_STATUS);
4672 f1 = got_opentemp();
4674 err = got_error_from_errno("got_opentemp");
4677 f2 = got_opentemp();
4679 err = got_error_from_errno("got_opentemp");
4682 err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4683 blob_id, staged_blob_id, label1, label2, a->diff_context,
4684 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4688 if (staged_status == GOT_STATUS_ADD ||
4689 staged_status == GOT_STATUS_MODIFY) {
4691 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4695 err = got_object_id_str(&id_str, staged_blob_id);
4698 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4699 err = got_error_from_errno("asprintf");
4704 } else if (status != GOT_STATUS_ADD) {
4705 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4710 if (status != GOT_STATUS_DELETE) {
4711 if (asprintf(&abspath, "%s/%s",
4712 got_worktree_get_root_path(a->worktree), path) == -1) {
4713 err = got_error_from_errno("asprintf");
4718 fd = openat(dirfd, de_name,
4719 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4721 if (!got_err_open_nofollow_on_symlink()) {
4722 err = got_error_from_errno2("openat",
4726 err = get_symlink_target_file(&fd, dirfd,
4732 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4734 if (!got_err_open_nofollow_on_symlink()) {
4735 err = got_error_from_errno2("open",
4739 err = get_symlink_target_file(&fd, dirfd,
4745 if (fstat(fd, &sb) == -1) {
4746 err = got_error_from_errno2("fstat", abspath);
4749 f2 = fdopen(fd, "r");
4751 err = got_error_from_errno2("fdopen", abspath);
4759 f1 = got_opentemp();
4761 err = got_error_from_errno("got_opentemp");
4764 err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
4770 err = got_diff_blob_file(blob1, f1, size1, label1, f2, sb.st_size,
4771 path, a->diff_context, a->ignore_whitespace, a->force_text_diff,
4775 got_object_blob_close(blob1);
4776 if (f1 && fclose(f1) == EOF && err == NULL)
4777 err = got_error_from_errno("fclose");
4778 if (f2 && fclose(f2) == EOF && err == NULL)
4779 err = got_error_from_errno("fclose");
4780 if (fd != -1 && close(fd) == -1 && err == NULL)
4781 err = got_error_from_errno("close");
4786 static const struct got_error *
4787 cmd_diff(int argc, char *argv[])
4789 const struct got_error *error;
4790 struct got_repository *repo = NULL;
4791 struct got_worktree *worktree = NULL;
4792 char *cwd = NULL, *repo_path = NULL;
4793 const char *commit_args[2] = { NULL, NULL };
4794 int ncommit_args = 0;
4795 struct got_object_id *ids[2] = { NULL, NULL };
4796 char *labels[2] = { NULL, NULL };
4797 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4798 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4799 int force_text_diff = 0, force_path = 0, rflag = 0;
4801 struct got_reflist_head refs;
4802 struct got_pathlist_head paths;
4803 struct got_pathlist_entry *pe;
4804 FILE *f1 = NULL, *f2 = NULL;
4805 int *pack_fds = NULL;
4811 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4816 while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4819 force_text_diff = 1;
4822 if (ncommit_args >= 2)
4823 errx(1, "too many -c options used");
4824 commit_args[ncommit_args++] = optarg;
4827 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4830 errx(1, "number of context lines is %s: %s",
4834 repo_path = realpath(optarg, NULL);
4835 if (repo_path == NULL)
4836 return got_error_from_errno2("realpath",
4838 got_path_strip_trailing_slashes(repo_path);
4845 ignore_whitespace = 1;
4859 cwd = getcwd(NULL, 0);
4861 error = got_error_from_errno("getcwd");
4865 error = got_repo_pack_fds_open(&pack_fds);
4869 if (repo_path == NULL) {
4870 error = got_worktree_open(&worktree, cwd);
4871 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4877 strdup(got_worktree_get_repo_path(worktree));
4878 if (repo_path == NULL) {
4879 error = got_error_from_errno("strdup");
4883 repo_path = strdup(cwd);
4884 if (repo_path == NULL) {
4885 error = got_error_from_errno("strdup");
4891 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4896 if (rflag || worktree == NULL || ncommit_args > 0) {
4898 error = got_error_msg(GOT_ERR_NOT_IMPL,
4899 "-P option can only be used when diffing "
4904 error = got_error_msg(GOT_ERR_NOT_IMPL,
4905 "-s option can only be used when diffing "
4911 error = apply_unveil(got_repo_get_path(repo), 1,
4912 worktree ? got_worktree_get_root_path(worktree) : NULL);
4916 if ((!force_path && argc == 2) || ncommit_args > 0) {
4917 int obj_type = (ncommit_args > 0 ?
4918 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4919 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4923 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4925 if (ncommit_args > 0)
4926 arg = commit_args[i];
4929 error = got_repo_match_object_id(&ids[i], &labels[i],
4930 arg, obj_type, &refs, repo);
4932 if (error->code != GOT_ERR_NOT_REF &&
4933 error->code != GOT_ERR_NO_OBJ)
4935 if (ncommit_args > 0)
4943 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4944 struct print_diff_arg arg;
4947 if (worktree == NULL) {
4948 if (argc == 2 && ids[0] == NULL) {
4949 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4951 } else if (argc == 2 && ids[1] == NULL) {
4952 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4954 } else if (argc > 0) {
4955 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4956 "%s", "specified paths cannot be resolved");
4959 error = got_error(GOT_ERR_NOT_WORKTREE);
4964 error = get_worktree_paths_from_argv(&paths, argc, argv,
4969 error = got_object_id_str(&id_str,
4970 got_worktree_get_base_commit_id(worktree));
4974 arg.worktree = worktree;
4975 arg.diff_context = diff_context;
4976 arg.id_str = id_str;
4977 arg.header_shown = 0;
4978 arg.diff_staged = diff_staged;
4979 arg.ignore_whitespace = ignore_whitespace;
4980 arg.force_text_diff = force_text_diff;
4982 error = got_worktree_status(worktree, &paths, repo, 0,
4983 print_diff, &arg, check_cancelled, NULL);
4988 if (ncommit_args == 1) {
4989 struct got_commit_object *commit;
4990 error = got_object_open_as_commit(&commit, repo, ids[0]);
4994 labels[1] = labels[0];
4996 if (got_object_commit_get_nparents(commit) > 0) {
4997 const struct got_object_id_queue *pids;
4998 struct got_object_qid *pid;
4999 pids = got_object_commit_get_parent_ids(commit);
5000 pid = STAILQ_FIRST(pids);
5001 ids[0] = got_object_id_dup(&pid->id);
5002 if (ids[0] == NULL) {
5003 error = got_error_from_errno(
5004 "got_object_id_dup");
5005 got_object_commit_close(commit);
5008 error = got_object_id_str(&labels[0], ids[0]);
5010 got_object_commit_close(commit);
5015 labels[0] = strdup("/dev/null");
5016 if (labels[0] == NULL) {
5017 error = got_error_from_errno("strdup");
5018 got_object_commit_close(commit);
5023 got_object_commit_close(commit);
5026 if (ncommit_args == 0 && argc > 2) {
5027 error = got_error_msg(GOT_ERR_BAD_PATH,
5028 "path arguments cannot be used when diffing two objects");
5033 error = got_object_get_type(&type1, repo, ids[0]);
5038 error = got_object_get_type(&type2, repo, ids[1]);
5041 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5042 error = got_error(GOT_ERR_OBJ_TYPE);
5045 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
5046 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5047 "path arguments cannot be used when diffing blobs");
5051 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5053 struct got_pathlist_entry *new;
5057 error = got_worktree_resolve_path(&p, worktree,
5061 prefix = got_worktree_get_path_prefix(worktree);
5062 while (prefix[0] == '/')
5064 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5065 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5067 error = got_error_from_errno("asprintf");
5073 char *mapped_path, *s;
5074 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5080 in_repo_path = strdup(s);
5081 if (in_repo_path == NULL) {
5082 error = got_error_from_errno("asprintf");
5089 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5090 if (error || new == NULL /* duplicate */)
5097 /* Release work tree lock. */
5098 got_worktree_close(worktree);
5102 f1 = got_opentemp();
5104 error = got_error_from_errno("got_opentemp");
5108 f2 = got_opentemp();
5110 error = got_error_from_errno("got_opentemp");
5114 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5115 case GOT_OBJ_TYPE_BLOB:
5116 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5117 ids[0], ids[1], NULL, NULL, diff_context,
5118 ignore_whitespace, force_text_diff, repo, stdout);
5120 case GOT_OBJ_TYPE_TREE:
5121 error = got_diff_objects_as_trees(NULL, NULL, f1, f2,
5122 ids[0], ids[1], &paths, "", "", diff_context,
5123 ignore_whitespace, force_text_diff, repo, stdout);
5125 case GOT_OBJ_TYPE_COMMIT:
5126 printf("diff %s %s\n", labels[0], labels[1]);
5127 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5128 ids[0], ids[1], &paths, diff_context, ignore_whitespace,
5129 force_text_diff, repo, stdout);
5132 error = got_error(GOT_ERR_OBJ_TYPE);
5140 got_worktree_close(worktree);
5142 const struct got_error *close_err = got_repo_close(repo);
5147 const struct got_error *pack_err =
5148 got_repo_pack_fds_close(pack_fds);
5152 TAILQ_FOREACH(pe, &paths, entry)
5153 free((char *)pe->path);
5154 got_pathlist_free(&paths);
5155 got_ref_list_free(&refs);
5156 if (f1 && fclose(f1) == EOF && error == NULL)
5157 error = got_error_from_errno("fclose");
5158 if (f2 && fclose(f2) == EOF && error == NULL)
5159 error = got_error_from_errno("fclose");
5167 "usage: %s blame [-c commit] [-r repository-path] path\n",
5176 char datebuf[11]; /* YYYY-MM-DD + NUL */
5179 struct blame_cb_args {
5180 struct blame_line *lines;
5184 off_t *line_offsets;
5186 struct got_repository *repo;
5189 static const struct got_error *
5190 blame_cb(void *arg, int nlines, int lineno,
5191 struct got_commit_object *commit, struct got_object_id *id)
5193 const struct got_error *err = NULL;
5194 struct blame_cb_args *a = arg;
5195 struct blame_line *bline;
5197 size_t linesize = 0;
5200 time_t committer_time;
5202 if (nlines != a->nlines ||
5203 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5204 return got_error(GOT_ERR_RANGE);
5206 if (sigint_received)
5207 return got_error(GOT_ERR_ITER_COMPLETED);
5210 return NULL; /* no change in this commit */
5212 /* Annotate this line. */
5213 bline = &a->lines[lineno - 1];
5214 if (bline->annotated)
5216 err = got_object_id_str(&bline->id_str, id);
5220 bline->committer = strdup(got_object_commit_get_committer(commit));
5221 if (bline->committer == NULL) {
5222 err = got_error_from_errno("strdup");
5226 committer_time = got_object_commit_get_committer_time(commit);
5227 if (gmtime_r(&committer_time, &tm) == NULL)
5228 return got_error_from_errno("gmtime_r");
5229 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5231 err = got_error(GOT_ERR_NO_SPACE);
5234 bline->annotated = 1;
5236 /* Print lines annotated so far. */
5237 bline = &a->lines[a->lineno_cur - 1];
5238 if (!bline->annotated)
5241 offset = a->line_offsets[a->lineno_cur - 1];
5242 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5243 err = got_error_from_errno("fseeko");
5247 while (bline->annotated) {
5248 char *smallerthan, *at, *nl, *committer;
5251 if (getline(&line, &linesize, a->f) == -1) {
5253 err = got_error_from_errno("getline");
5257 committer = bline->committer;
5258 smallerthan = strchr(committer, '<');
5259 if (smallerthan && smallerthan[1] != '\0')
5260 committer = smallerthan + 1;
5261 at = strchr(committer, '@');
5264 len = strlen(committer);
5266 committer[8] = '\0';
5268 nl = strchr(line, '\n');
5271 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5272 bline->id_str, bline->datebuf, committer, line);
5275 bline = &a->lines[a->lineno_cur - 1];
5282 static const struct got_error *
5283 cmd_blame(int argc, char *argv[])
5285 const struct got_error *error;
5286 struct got_repository *repo = NULL;
5287 struct got_worktree *worktree = NULL;
5288 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5289 char *link_target = NULL;
5290 struct got_object_id *obj_id = NULL;
5291 struct got_object_id *commit_id = NULL;
5292 struct got_commit_object *commit = NULL;
5293 struct got_blob_object *blob = NULL;
5294 char *commit_id_str = NULL;
5295 struct blame_cb_args bca;
5296 int ch, obj_type, i;
5298 int *pack_fds = NULL;
5300 memset(&bca, 0, sizeof(bca));
5303 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5308 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5311 commit_id_str = optarg;
5314 repo_path = realpath(optarg, NULL);
5315 if (repo_path == NULL)
5316 return got_error_from_errno2("realpath",
5318 got_path_strip_trailing_slashes(repo_path);
5334 cwd = getcwd(NULL, 0);
5336 error = got_error_from_errno("getcwd");
5340 error = got_repo_pack_fds_open(&pack_fds);
5344 if (repo_path == NULL) {
5345 error = got_worktree_open(&worktree, cwd);
5346 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5352 strdup(got_worktree_get_repo_path(worktree));
5353 if (repo_path == NULL) {
5354 error = got_error_from_errno("strdup");
5359 repo_path = strdup(cwd);
5360 if (repo_path == NULL) {
5361 error = got_error_from_errno("strdup");
5367 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5372 const char *prefix = got_worktree_get_path_prefix(worktree);
5375 error = got_worktree_resolve_path(&p, worktree, path);
5378 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5379 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5381 error = got_error_from_errno("asprintf");
5386 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5388 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5391 error = got_repo_map_path(&in_repo_path, repo, path);
5396 if (commit_id_str == NULL) {
5397 struct got_reference *head_ref;
5398 error = got_ref_open(&head_ref, repo, worktree ?
5399 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5402 error = got_ref_resolve(&commit_id, repo, head_ref);
5403 got_ref_close(head_ref);
5407 struct got_reflist_head refs;
5409 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5413 error = got_repo_match_object_id(&commit_id, NULL,
5414 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5415 got_ref_list_free(&refs);
5421 /* Release work tree lock. */
5422 got_worktree_close(worktree);
5426 error = got_object_open_as_commit(&commit, repo, commit_id);
5430 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5435 error = got_object_id_by_path(&obj_id, repo, commit,
5436 link_target ? link_target : in_repo_path);
5440 error = got_object_get_type(&obj_type, repo, obj_id);
5444 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5445 error = got_error_path(link_target ? link_target : in_repo_path,
5450 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5453 bca.f = got_opentemp();
5454 if (bca.f == NULL) {
5455 error = got_error_from_errno("got_opentemp");
5458 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5459 &bca.line_offsets, bca.f, blob);
5460 if (error || bca.nlines == 0)
5463 /* Don't include \n at EOF in the blame line count. */
5464 if (bca.line_offsets[bca.nlines - 1] == filesize)
5467 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5468 if (bca.lines == NULL) {
5469 error = got_error_from_errno("calloc");
5473 bca.nlines_prec = 0;
5481 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5482 repo, blame_cb, &bca, check_cancelled, NULL);
5491 got_object_commit_close(commit);
5493 got_object_blob_close(blob);
5495 got_worktree_close(worktree);
5497 const struct got_error *close_err = got_repo_close(repo);
5502 const struct got_error *pack_err =
5503 got_repo_pack_fds_close(pack_fds);
5508 for (i = 0; i < bca.nlines; i++) {
5509 struct blame_line *bline = &bca.lines[i];
5510 free(bline->id_str);
5511 free(bline->committer);
5515 free(bca.line_offsets);
5516 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5517 error = got_error_from_errno("fclose");
5525 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5530 static const struct got_error *
5531 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5532 const char *root_path, struct got_repository *repo)
5534 const struct got_error *err = NULL;
5535 int is_root_path = (strcmp(path, root_path) == 0);
5536 const char *modestr = "";
5537 mode_t mode = got_tree_entry_get_mode(te);
5538 char *link_target = NULL;
5540 path += strlen(root_path);
5541 while (path[0] == '/')
5544 if (got_object_tree_entry_is_submodule(te))
5546 else if (S_ISLNK(mode)) {
5549 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5552 for (i = 0; i < strlen(link_target); i++) {
5553 if (!isprint((unsigned char)link_target[i]))
5554 link_target[i] = '?';
5559 else if (S_ISDIR(mode))
5561 else if (mode & S_IXUSR)
5564 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5565 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5566 link_target ? " -> ": "", link_target ? link_target : "");
5572 static const struct got_error *
5573 print_tree(const char *path, struct got_commit_object *commit,
5574 int show_ids, int recurse, const char *root_path,
5575 struct got_repository *repo)
5577 const struct got_error *err = NULL;
5578 struct got_object_id *tree_id = NULL;
5579 struct got_tree_object *tree = NULL;
5582 err = got_object_id_by_path(&tree_id, repo, commit, path);
5586 err = got_object_open_as_tree(&tree, repo, tree_id);
5589 nentries = got_object_tree_get_nentries(tree);
5590 for (i = 0; i < nentries; i++) {
5591 struct got_tree_entry *te;
5594 if (sigint_received || sigpipe_received)
5597 te = got_object_tree_get_entry(tree, i);
5600 err = got_object_id_str(&id_str,
5601 got_tree_entry_get_id(te));
5604 if (asprintf(&id, "%s ", id_str) == -1) {
5605 err = got_error_from_errno("asprintf");
5611 err = print_entry(te, id, path, root_path, repo);
5616 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5618 if (asprintf(&child_path, "%s%s%s", path,
5619 path[0] == '/' && path[1] == '\0' ? "" : "/",
5620 got_tree_entry_get_name(te)) == -1) {
5621 err = got_error_from_errno("asprintf");
5624 err = print_tree(child_path, commit, show_ids, 1,
5633 got_object_tree_close(tree);
5638 static const struct got_error *
5639 cmd_tree(int argc, char *argv[])
5641 const struct got_error *error;
5642 struct got_repository *repo = NULL;
5643 struct got_worktree *worktree = NULL;
5644 const char *path, *refname = NULL;
5645 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5646 struct got_object_id *commit_id = NULL;
5647 struct got_commit_object *commit = NULL;
5648 char *commit_id_str = NULL;
5649 int show_ids = 0, recurse = 0;
5651 int *pack_fds = NULL;
5654 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5659 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5662 commit_id_str = optarg;
5665 repo_path = realpath(optarg, NULL);
5666 if (repo_path == NULL)
5667 return got_error_from_errno2("realpath",
5669 got_path_strip_trailing_slashes(repo_path);
5693 cwd = getcwd(NULL, 0);
5695 error = got_error_from_errno("getcwd");
5699 error = got_repo_pack_fds_open(&pack_fds);
5703 if (repo_path == NULL) {
5704 error = got_worktree_open(&worktree, cwd);
5705 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5711 strdup(got_worktree_get_repo_path(worktree));
5712 if (repo_path == NULL)
5713 error = got_error_from_errno("strdup");
5717 repo_path = strdup(cwd);
5718 if (repo_path == NULL) {
5719 error = got_error_from_errno("strdup");
5725 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5730 const char *prefix = got_worktree_get_path_prefix(worktree);
5735 error = got_worktree_resolve_path(&p, worktree, path);
5738 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5739 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5741 error = got_error_from_errno("asprintf");
5746 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5750 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5755 error = got_repo_map_path(&in_repo_path, repo, path);
5760 if (commit_id_str == NULL) {
5761 struct got_reference *head_ref;
5763 refname = got_worktree_get_head_ref_name(worktree);
5765 refname = GOT_REF_HEAD;
5766 error = got_ref_open(&head_ref, repo, refname, 0);
5769 error = got_ref_resolve(&commit_id, repo, head_ref);
5770 got_ref_close(head_ref);
5774 struct got_reflist_head refs;
5776 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5780 error = got_repo_match_object_id(&commit_id, NULL,
5781 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5782 got_ref_list_free(&refs);
5788 /* Release work tree lock. */
5789 got_worktree_close(worktree);
5793 error = got_object_open_as_commit(&commit, repo, commit_id);
5797 error = print_tree(in_repo_path, commit, show_ids, recurse,
5798 in_repo_path, repo);
5805 got_object_commit_close(commit);
5807 got_worktree_close(worktree);
5809 const struct got_error *close_err = got_repo_close(repo);
5814 const struct got_error *pack_err =
5815 got_repo_pack_fds_close(pack_fds);
5825 fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5826 "[-S status-codes] [path ...]\n", getprogname());
5830 struct got_status_arg {
5835 static const struct got_error *
5836 print_status(void *arg, unsigned char status, unsigned char staged_status,
5837 const char *path, struct got_object_id *blob_id,
5838 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5839 int dirfd, const char *de_name)
5841 struct got_status_arg *st = arg;
5843 if (status == staged_status && (status == GOT_STATUS_DELETE))
5844 status = GOT_STATUS_NO_CHANGE;
5845 if (st != NULL && st->status_codes) {
5846 size_t ncodes = strlen(st->status_codes);
5849 for (i = 0; i < ncodes ; i++) {
5851 if (status == st->status_codes[i] ||
5852 staged_status == st->status_codes[i]) {
5857 if (status == st->status_codes[i] ||
5858 staged_status == st->status_codes[i])
5863 if (st->suppress && j == 0)
5870 printf("%c%c %s\n", status, staged_status, path);
5874 static const struct got_error *
5875 cmd_status(int argc, char *argv[])
5877 const struct got_error *error = NULL;
5878 struct got_repository *repo = NULL;
5879 struct got_worktree *worktree = NULL;
5880 struct got_status_arg st;
5882 struct got_pathlist_head paths;
5883 struct got_pathlist_entry *pe;
5884 int ch, i, no_ignores = 0;
5885 int *pack_fds = NULL;
5889 memset(&st, 0, sizeof(st));
5890 st.status_codes = NULL;
5893 while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5899 if (st.status_codes != NULL && st.suppress == 0)
5900 option_conflict('S', 's');
5904 for (i = 0; i < strlen(optarg); i++) {
5905 switch (optarg[i]) {
5906 case GOT_STATUS_MODIFY:
5907 case GOT_STATUS_ADD:
5908 case GOT_STATUS_DELETE:
5909 case GOT_STATUS_CONFLICT:
5910 case GOT_STATUS_MISSING:
5911 case GOT_STATUS_OBSTRUCTED:
5912 case GOT_STATUS_UNVERSIONED:
5913 case GOT_STATUS_MODE_CHANGE:
5914 case GOT_STATUS_NONEXISTENT:
5917 errx(1, "invalid status code '%c'",
5921 if (ch == 's' && st.suppress)
5922 option_conflict('s', 'S');
5923 st.status_codes = optarg;
5935 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5939 cwd = getcwd(NULL, 0);
5941 error = got_error_from_errno("getcwd");
5945 error = got_repo_pack_fds_open(&pack_fds);
5949 error = got_worktree_open(&worktree, cwd);
5951 if (error->code == GOT_ERR_NOT_WORKTREE)
5952 error = wrap_not_worktree_error(error, "status", cwd);
5956 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5961 error = apply_unveil(got_repo_get_path(repo), 1,
5962 got_worktree_get_root_path(worktree));
5966 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5970 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5971 print_status, &st, check_cancelled, NULL);
5974 const struct got_error *pack_err =
5975 got_repo_pack_fds_close(pack_fds);
5980 TAILQ_FOREACH(pe, &paths, entry)
5981 free((char *)pe->path);
5982 got_pathlist_free(&paths);
5991 "usage: %s ref [-r repository] [-l] [-t] [-c object] "
5992 "[-s reference] [-d] [name]\n",
5997 static const struct got_error *
5998 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6000 static const struct got_error *err = NULL;
6001 struct got_reflist_head refs;
6002 struct got_reflist_entry *re;
6005 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6006 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6011 TAILQ_FOREACH(re, &refs, entry) {
6013 refstr = got_ref_to_str(re->ref);
6014 if (refstr == NULL) {
6015 err = got_error_from_errno("got_ref_to_str");
6018 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6022 got_ref_list_free(&refs);
6026 static const struct got_error *
6027 delete_ref_by_name(struct got_repository *repo, const char *refname)
6029 const struct got_error *err;
6030 struct got_reference *ref;
6032 err = got_ref_open(&ref, repo, refname, 0);
6036 err = delete_ref(repo, ref);
6041 static const struct got_error *
6042 add_ref(struct got_repository *repo, const char *refname, const char *target)
6044 const struct got_error *err = NULL;
6045 struct got_object_id *id = NULL;
6046 struct got_reference *ref = NULL;
6047 struct got_reflist_head refs;
6050 * Don't let the user create a reference name with a leading '-'.
6051 * While technically a valid reference name, this case is usually
6052 * an unintended typo.
6054 if (refname[0] == '-')
6055 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6058 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6061 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6063 got_ref_list_free(&refs);
6067 err = got_ref_alloc(&ref, refname, id);
6071 err = got_ref_write(ref, repo);
6079 static const struct got_error *
6080 add_symref(struct got_repository *repo, const char *refname, const char *target)
6082 const struct got_error *err = NULL;
6083 struct got_reference *ref = NULL;
6084 struct got_reference *target_ref = NULL;
6087 * Don't let the user create a reference name with a leading '-'.
6088 * While technically a valid reference name, this case is usually
6089 * an unintended typo.
6091 if (refname[0] == '-')
6092 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6094 err = got_ref_open(&target_ref, repo, target, 0);
6098 err = got_ref_alloc_symref(&ref, refname, target_ref);
6102 err = got_ref_write(ref, repo);
6105 got_ref_close(target_ref);
6111 static const struct got_error *
6112 cmd_ref(int argc, char *argv[])
6114 const struct got_error *error = NULL;
6115 struct got_repository *repo = NULL;
6116 struct got_worktree *worktree = NULL;
6117 char *cwd = NULL, *repo_path = NULL;
6118 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6119 const char *obj_arg = NULL, *symref_target= NULL;
6120 char *refname = NULL;
6121 int *pack_fds = NULL;
6123 while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
6132 repo_path = realpath(optarg, NULL);
6133 if (repo_path == NULL)
6134 return got_error_from_errno2("realpath",
6136 got_path_strip_trailing_slashes(repo_path);
6142 symref_target = optarg;
6153 if (obj_arg && do_list)
6154 option_conflict('c', 'l');
6155 if (obj_arg && do_delete)
6156 option_conflict('c', 'd');
6157 if (obj_arg && symref_target)
6158 option_conflict('c', 's');
6159 if (symref_target && do_delete)
6160 option_conflict('s', 'd');
6161 if (symref_target && do_list)
6162 option_conflict('s', 'l');
6163 if (do_delete && do_list)
6164 option_conflict('d', 'l');
6165 if (sort_by_time && !do_list)
6166 errx(1, "-t option requires -l option");
6172 if (argc != 0 && argc != 1)
6175 refname = strdup(argv[0]);
6176 if (refname == NULL) {
6177 error = got_error_from_errno("strdup");
6184 refname = strdup(argv[0]);
6185 if (refname == NULL) {
6186 error = got_error_from_errno("strdup");
6192 got_path_strip_trailing_slashes(refname);
6195 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6196 "sendfd unveil", NULL) == -1)
6199 cwd = getcwd(NULL, 0);
6201 error = got_error_from_errno("getcwd");
6205 error = got_repo_pack_fds_open(&pack_fds);
6209 if (repo_path == NULL) {
6210 error = got_worktree_open(&worktree, cwd);
6211 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6217 strdup(got_worktree_get_repo_path(worktree));
6218 if (repo_path == NULL)
6219 error = got_error_from_errno("strdup");
6223 repo_path = strdup(cwd);
6224 if (repo_path == NULL) {
6225 error = got_error_from_errno("strdup");
6231 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6237 /* Remove "cpath" promise. */
6238 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6244 error = apply_unveil(got_repo_get_path(repo), do_list,
6245 worktree ? got_worktree_get_root_path(worktree) : NULL);
6250 error = list_refs(repo, refname, sort_by_time);
6252 error = delete_ref_by_name(repo, refname);
6253 else if (symref_target)
6254 error = add_symref(repo, refname, symref_target);
6256 if (obj_arg == NULL)
6258 error = add_ref(repo, refname, obj_arg);
6263 const struct got_error *close_err = got_repo_close(repo);
6268 got_worktree_close(worktree);
6270 const struct got_error *pack_err =
6271 got_repo_pack_fds_close(pack_fds);
6284 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
6285 "[-n] [name]\n", getprogname());
6289 static const struct got_error *
6290 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6291 struct got_reference *ref)
6293 const struct got_error *err = NULL;
6294 const char *refname, *marker = " ";
6297 refname = got_ref_get_name(ref);
6298 if (worktree && strcmp(refname,
6299 got_worktree_get_head_ref_name(worktree)) == 0) {
6300 struct got_object_id *id = NULL;
6302 err = got_ref_resolve(&id, repo, ref);
6305 if (got_object_id_cmp(id,
6306 got_worktree_get_base_commit_id(worktree)) == 0)
6313 if (strncmp(refname, "refs/heads/", 11) == 0)
6315 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6317 if (strncmp(refname, "refs/remotes/", 13) == 0)
6320 refstr = got_ref_to_str(ref);
6322 return got_error_from_errno("got_ref_to_str");
6324 printf("%s%s: %s\n", marker, refname, refstr);
6329 static const struct got_error *
6330 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6332 const char *refname;
6334 if (worktree == NULL)
6335 return got_error(GOT_ERR_NOT_WORKTREE);
6337 refname = got_worktree_get_head_ref_name(worktree);
6339 if (strncmp(refname, "refs/heads/", 11) == 0)
6341 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6344 printf("%s\n", refname);
6349 static const struct got_error *
6350 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6353 static const struct got_error *err = NULL;
6354 struct got_reflist_head refs;
6355 struct got_reflist_entry *re;
6356 struct got_reference *temp_ref = NULL;
6357 int rebase_in_progress, histedit_in_progress;
6362 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6367 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6372 if (rebase_in_progress || histedit_in_progress) {
6373 err = got_ref_open(&temp_ref, repo,
6374 got_worktree_get_head_ref_name(worktree), 0);
6377 list_branch(repo, worktree, temp_ref);
6378 got_ref_close(temp_ref);
6382 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6383 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6388 TAILQ_FOREACH(re, &refs, entry)
6389 list_branch(repo, worktree, re->ref);
6391 got_ref_list_free(&refs);
6393 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6394 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6399 TAILQ_FOREACH(re, &refs, entry)
6400 list_branch(repo, worktree, re->ref);
6402 got_ref_list_free(&refs);
6407 static const struct got_error *
6408 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6409 const char *branch_name)
6411 const struct got_error *err = NULL;
6412 struct got_reference *ref = NULL;
6413 char *refname, *remote_refname = NULL;
6415 if (strncmp(branch_name, "refs/", 5) == 0)
6417 if (strncmp(branch_name, "heads/", 6) == 0)
6419 else if (strncmp(branch_name, "remotes/", 8) == 0)
6422 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6423 return got_error_from_errno("asprintf");
6425 if (asprintf(&remote_refname, "refs/remotes/%s",
6426 branch_name) == -1) {
6427 err = got_error_from_errno("asprintf");
6431 err = got_ref_open(&ref, repo, refname, 0);
6433 const struct got_error *err2;
6434 if (err->code != GOT_ERR_NOT_REF)
6437 * Keep 'err' intact such that if neither branch exists
6438 * we report "refs/heads" rather than "refs/remotes" in
6439 * our error message.
6441 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6448 strcmp(got_worktree_get_head_ref_name(worktree),
6449 got_ref_get_name(ref)) == 0) {
6450 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6451 "will not delete this work tree's current branch");
6455 err = delete_ref(repo, ref);
6460 free(remote_refname);
6464 static const struct got_error *
6465 add_branch(struct got_repository *repo, const char *branch_name,
6466 struct got_object_id *base_commit_id)
6468 const struct got_error *err = NULL;
6469 struct got_reference *ref = NULL;
6470 char *base_refname = NULL, *refname = NULL;
6473 * Don't let the user create a branch name with a leading '-'.
6474 * While technically a valid reference name, this case is usually
6475 * an unintended typo.
6477 if (branch_name[0] == '-')
6478 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6480 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6483 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6484 err = got_error_from_errno("asprintf");
6488 err = got_ref_open(&ref, repo, refname, 0);
6490 err = got_error(GOT_ERR_BRANCH_EXISTS);
6492 } else if (err->code != GOT_ERR_NOT_REF)
6495 err = got_ref_alloc(&ref, refname, base_commit_id);
6499 err = got_ref_write(ref, repo);
6508 static const struct got_error *
6509 cmd_branch(int argc, char *argv[])
6511 const struct got_error *error = NULL;
6512 struct got_repository *repo = NULL;
6513 struct got_worktree *worktree = NULL;
6514 char *cwd = NULL, *repo_path = NULL;
6515 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6516 const char *delref = NULL, *commit_id_arg = NULL;
6517 struct got_reference *ref = NULL;
6518 struct got_pathlist_head paths;
6519 struct got_pathlist_entry *pe;
6520 struct got_object_id *commit_id = NULL;
6521 char *commit_id_str = NULL;
6522 int *pack_fds = NULL;
6526 while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6529 commit_id_arg = optarg;
6535 repo_path = realpath(optarg, NULL);
6536 if (repo_path == NULL)
6537 return got_error_from_errno2("realpath",
6539 got_path_strip_trailing_slashes(repo_path);
6556 if (do_list && delref)
6557 option_conflict('l', 'd');
6558 if (sort_by_time && !do_list)
6559 errx(1, "-t option requires -l option");
6564 if (!do_list && !delref && argc == 0)
6567 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6568 errx(1, "-c option can only be used when creating a branch");
6570 if (do_list || delref) {
6573 } else if (!do_show && argc != 1)
6577 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6578 "sendfd unveil", NULL) == -1)
6581 cwd = getcwd(NULL, 0);
6583 error = got_error_from_errno("getcwd");
6587 error = got_repo_pack_fds_open(&pack_fds);
6591 if (repo_path == NULL) {
6592 error = got_worktree_open(&worktree, cwd);
6593 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6599 strdup(got_worktree_get_repo_path(worktree));
6600 if (repo_path == NULL)
6601 error = got_error_from_errno("strdup");
6605 repo_path = strdup(cwd);
6606 if (repo_path == NULL) {
6607 error = got_error_from_errno("strdup");
6613 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6618 if (do_list || do_show) {
6619 /* Remove "cpath" promise. */
6620 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6626 error = apply_unveil(got_repo_get_path(repo), do_list,
6627 worktree ? got_worktree_get_root_path(worktree) : NULL);
6632 error = show_current_branch(repo, worktree);
6634 error = list_branches(repo, worktree, sort_by_time);
6636 error = delete_branch(repo, worktree, delref);
6638 struct got_reflist_head refs;
6640 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6644 if (commit_id_arg == NULL)
6645 commit_id_arg = worktree ?
6646 got_worktree_get_head_ref_name(worktree) :
6648 error = got_repo_match_object_id(&commit_id, NULL,
6649 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6650 got_ref_list_free(&refs);
6653 error = add_branch(repo, argv[0], commit_id);
6656 if (worktree && do_update) {
6657 struct got_update_progress_arg upa;
6658 char *branch_refname = NULL;
6660 error = got_object_id_str(&commit_id_str, commit_id);
6663 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6667 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6669 error = got_error_from_errno("asprintf");
6672 error = got_ref_open(&ref, repo, branch_refname, 0);
6673 free(branch_refname);
6676 error = switch_head_ref(ref, commit_id, worktree,
6680 error = got_worktree_set_base_commit_id(worktree, repo,
6684 memset(&upa, 0, sizeof(upa));
6685 error = got_worktree_checkout_files(worktree, &paths,
6686 repo, update_progress, &upa, check_cancelled,
6690 if (upa.did_something) {
6691 printf("Updated to %s: %s\n",
6692 got_worktree_get_head_ref_name(worktree),
6695 print_update_progress_stats(&upa);
6702 const struct got_error *close_err = got_repo_close(repo);
6707 got_worktree_close(worktree);
6709 const struct got_error *pack_err =
6710 got_repo_pack_fds_close(pack_fds);
6717 free(commit_id_str);
6718 TAILQ_FOREACH(pe, &paths, entry)
6719 free((char *)pe->path);
6720 got_pathlist_free(&paths);
6729 "usage: %s tag [-c commit] [-r repository] [-l] "
6730 "[-m message] name\n", getprogname());
6735 static const struct got_error *
6736 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6738 const struct got_error *err = NULL;
6739 struct got_reflist_entry *re, *se, *new;
6740 struct got_object_id *re_id, *se_id;
6741 struct got_tag_object *re_tag, *se_tag;
6742 time_t re_time, se_time;
6744 STAILQ_FOREACH(re, tags, entry) {
6745 se = STAILQ_FIRST(sorted);
6747 err = got_reflist_entry_dup(&new, re);
6750 STAILQ_INSERT_HEAD(sorted, new, entry);
6753 err = got_ref_resolve(&re_id, repo, re->ref);
6756 err = got_object_open_as_tag(&re_tag, repo, re_id);
6760 re_time = got_object_tag_get_tagger_time(re_tag);
6761 got_object_tag_close(re_tag);
6765 err = got_ref_resolve(&se_id, repo, re->ref);
6768 err = got_object_open_as_tag(&se_tag, repo, se_id);
6772 se_time = got_object_tag_get_tagger_time(se_tag);
6773 got_object_tag_close(se_tag);
6775 if (se_time > re_time) {
6776 err = got_reflist_entry_dup(&new, re);
6779 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6782 se = STAILQ_NEXT(se, entry);
6791 static const struct got_error *
6792 list_tags(struct got_repository *repo)
6794 static const struct got_error *err = NULL;
6795 struct got_reflist_head refs;
6796 struct got_reflist_entry *re;
6800 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6804 TAILQ_FOREACH(re, &refs, entry) {
6805 const char *refname;
6806 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6810 struct got_object_id *id;
6811 struct got_tag_object *tag;
6812 struct got_commit_object *commit = NULL;
6814 refname = got_ref_get_name(re->ref);
6815 if (strncmp(refname, "refs/tags/", 10) != 0)
6818 refstr = got_ref_to_str(re->ref);
6819 if (refstr == NULL) {
6820 err = got_error_from_errno("got_ref_to_str");
6823 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6826 err = got_ref_resolve(&id, repo, re->ref);
6829 err = got_object_open_as_tag(&tag, repo, id);
6831 if (err->code != GOT_ERR_OBJ_TYPE) {
6835 /* "lightweight" tag */
6836 err = got_object_open_as_commit(&commit, repo, id);
6841 tagger = got_object_commit_get_committer(commit);
6843 got_object_commit_get_committer_time(commit);
6844 err = got_object_id_str(&id_str, id);
6850 tagger = got_object_tag_get_tagger(tag);
6851 tagger_time = got_object_tag_get_tagger_time(tag);
6852 err = got_object_id_str(&id_str,
6853 got_object_tag_get_object_id(tag));
6857 printf("from: %s\n", tagger);
6858 datestr = get_datestr(&tagger_time, datebuf);
6860 printf("date: %s UTC\n", datestr);
6862 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6864 switch (got_object_tag_get_object_type(tag)) {
6865 case GOT_OBJ_TYPE_BLOB:
6866 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6869 case GOT_OBJ_TYPE_TREE:
6870 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6873 case GOT_OBJ_TYPE_COMMIT:
6874 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6877 case GOT_OBJ_TYPE_TAG:
6878 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6887 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6890 got_object_commit_close(commit);
6892 tagmsg0 = strdup(got_object_tag_get_message(tag));
6893 got_object_tag_close(tag);
6894 if (tagmsg0 == NULL) {
6895 err = got_error_from_errno("strdup");
6902 line = strsep(&tagmsg, "\n");
6904 printf(" %s\n", line);
6909 got_ref_list_free(&refs);
6913 static const struct got_error *
6914 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6915 const char *tag_name, const char *repo_path)
6917 const struct got_error *err = NULL;
6918 char *template = NULL, *initial_content = NULL;
6919 char *editor = NULL;
6920 int initial_content_len;
6923 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6924 err = got_error_from_errno("asprintf");
6928 initial_content_len = asprintf(&initial_content,
6929 "\n# tagging commit %s as %s\n",
6930 commit_id_str, tag_name);
6931 if (initial_content_len == -1) {
6932 err = got_error_from_errno("asprintf");
6936 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6940 if (write(fd, initial_content, initial_content_len) == -1) {
6941 err = got_error_from_errno2("write", *tagmsg_path);
6945 err = get_editor(&editor);
6948 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6949 initial_content_len, 1);
6951 free(initial_content);
6955 if (fd != -1 && close(fd) == -1 && err == NULL)
6956 err = got_error_from_errno2("close", *tagmsg_path);
6958 /* Editor is done; we can now apply unveil(2) */
6960 err = apply_unveil(repo_path, 0, NULL);
6968 static const struct got_error *
6969 add_tag(struct got_repository *repo, const char *tagger,
6970 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6972 const struct got_error *err = NULL;
6973 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6974 char *label = NULL, *commit_id_str = NULL;
6975 struct got_reference *ref = NULL;
6976 char *refname = NULL, *tagmsg = NULL;
6977 char *tagmsg_path = NULL, *tag_id_str = NULL;
6978 int preserve_tagmsg = 0;
6979 struct got_reflist_head refs;
6984 * Don't let the user create a tag name with a leading '-'.
6985 * While technically a valid reference name, this case is usually
6986 * an unintended typo.
6988 if (tag_name[0] == '-')
6989 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6991 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6995 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6996 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7000 err = got_object_id_str(&commit_id_str, commit_id);
7004 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7005 refname = strdup(tag_name);
7006 if (refname == NULL) {
7007 err = got_error_from_errno("strdup");
7011 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
7012 err = got_error_from_errno("asprintf");
7016 err = got_ref_open(&ref, repo, refname, 0);
7018 err = got_error(GOT_ERR_TAG_EXISTS);
7020 } else if (err->code != GOT_ERR_NOT_REF)
7023 if (tagmsg_arg == NULL) {
7024 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7025 tag_name, got_repo_get_path(repo));
7027 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7028 tagmsg_path != NULL)
7029 preserve_tagmsg = 1;
7034 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7035 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
7038 preserve_tagmsg = 1;
7042 err = got_ref_alloc(&ref, refname, tag_id);
7045 preserve_tagmsg = 1;
7049 err = got_ref_write(ref, repo);
7052 preserve_tagmsg = 1;
7056 err = got_object_id_str(&tag_id_str, tag_id);
7059 preserve_tagmsg = 1;
7062 printf("Created tag %s\n", tag_id_str);
7064 if (preserve_tagmsg) {
7065 fprintf(stderr, "%s: tag message preserved in %s\n",
7066 getprogname(), tagmsg_path);
7067 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7068 err = got_error_from_errno2("unlink", tagmsg_path);
7073 free(commit_id_str);
7077 got_ref_list_free(&refs);
7081 static const struct got_error *
7082 cmd_tag(int argc, char *argv[])
7084 const struct got_error *error = NULL;
7085 struct got_repository *repo = NULL;
7086 struct got_worktree *worktree = NULL;
7087 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7088 char *gitconfig_path = NULL, *tagger = NULL;
7089 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
7090 int ch, do_list = 0;
7091 int *pack_fds = NULL;
7093 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
7096 commit_id_arg = optarg;
7102 repo_path = realpath(optarg, NULL);
7103 if (repo_path == NULL)
7104 return got_error_from_errno2("realpath",
7106 got_path_strip_trailing_slashes(repo_path);
7121 if (commit_id_arg != NULL)
7123 "-c option can only be used when creating a tag");
7125 option_conflict('l', 'm');
7128 } else if (argc != 1)
7134 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7135 "sendfd unveil", NULL) == -1)
7138 cwd = getcwd(NULL, 0);
7140 error = got_error_from_errno("getcwd");
7144 error = got_repo_pack_fds_open(&pack_fds);
7148 if (repo_path == NULL) {
7149 error = got_worktree_open(&worktree, cwd);
7150 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7156 strdup(got_worktree_get_repo_path(worktree));
7157 if (repo_path == NULL)
7158 error = got_error_from_errno("strdup");
7162 repo_path = strdup(cwd);
7163 if (repo_path == NULL) {
7164 error = got_error_from_errno("strdup");
7172 /* Release work tree lock. */
7173 got_worktree_close(worktree);
7176 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7181 /* Remove "cpath" promise. */
7182 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7186 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7189 error = list_tags(repo);
7191 error = get_gitconfig_path(&gitconfig_path);
7194 error = got_repo_open(&repo, repo_path, gitconfig_path,
7199 error = get_author(&tagger, repo, worktree);
7203 /* Release work tree lock. */
7204 got_worktree_close(worktree);
7209 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7214 if (commit_id_arg == NULL) {
7215 struct got_reference *head_ref;
7216 struct got_object_id *commit_id;
7217 error = got_ref_open(&head_ref, repo,
7218 worktree ? got_worktree_get_head_ref_name(worktree)
7222 error = got_ref_resolve(&commit_id, repo, head_ref);
7223 got_ref_close(head_ref);
7226 error = got_object_id_str(&commit_id_str, commit_id);
7232 error = add_tag(repo, tagger, tag_name,
7233 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
7237 const struct got_error *close_err = got_repo_close(repo);
7242 got_worktree_close(worktree);
7244 const struct got_error *pack_err =
7245 got_repo_pack_fds_close(pack_fds);
7251 free(gitconfig_path);
7252 free(commit_id_str);
7260 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
7265 static const struct got_error *
7266 add_progress(void *arg, unsigned char status, const char *path)
7268 while (path[0] == '/')
7270 printf("%c %s\n", status, path);
7274 static const struct got_error *
7275 cmd_add(int argc, char *argv[])
7277 const struct got_error *error = NULL;
7278 struct got_repository *repo = NULL;
7279 struct got_worktree *worktree = NULL;
7281 struct got_pathlist_head paths;
7282 struct got_pathlist_entry *pe;
7283 int ch, can_recurse = 0, no_ignores = 0;
7284 int *pack_fds = NULL;
7288 while ((ch = getopt(argc, argv, "IR")) != -1) {
7306 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7313 cwd = getcwd(NULL, 0);
7315 error = got_error_from_errno("getcwd");
7319 error = got_repo_pack_fds_open(&pack_fds);
7323 error = got_worktree_open(&worktree, cwd);
7325 if (error->code == GOT_ERR_NOT_WORKTREE)
7326 error = wrap_not_worktree_error(error, "add", cwd);
7330 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7335 error = apply_unveil(got_repo_get_path(repo), 1,
7336 got_worktree_get_root_path(worktree));
7340 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7347 TAILQ_FOREACH(pe, &paths, entry) {
7348 if (asprintf(&ondisk_path, "%s/%s",
7349 got_worktree_get_root_path(worktree),
7351 error = got_error_from_errno("asprintf");
7354 if (lstat(ondisk_path, &sb) == -1) {
7355 if (errno == ENOENT) {
7359 error = got_error_from_errno2("lstat",
7365 if (S_ISDIR(sb.st_mode)) {
7366 error = got_error_msg(GOT_ERR_BAD_PATH,
7367 "adding directories requires -R option");
7373 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7374 NULL, repo, no_ignores);
7377 const struct got_error *close_err = got_repo_close(repo);
7382 got_worktree_close(worktree);
7384 const struct got_error *pack_err =
7385 got_repo_pack_fds_close(pack_fds);
7389 TAILQ_FOREACH(pe, &paths, entry)
7390 free((char *)pe->path);
7391 got_pathlist_free(&paths);
7399 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
7400 "path ...\n", getprogname());
7404 static const struct got_error *
7405 print_remove_status(void *arg, unsigned char status,
7406 unsigned char staged_status, const char *path)
7408 while (path[0] == '/')
7410 if (status == GOT_STATUS_NONEXISTENT)
7412 if (status == staged_status && (status == GOT_STATUS_DELETE))
7413 status = GOT_STATUS_NO_CHANGE;
7414 printf("%c%c %s\n", status, staged_status, path);
7418 static const struct got_error *
7419 cmd_remove(int argc, char *argv[])
7421 const struct got_error *error = NULL;
7422 struct got_worktree *worktree = NULL;
7423 struct got_repository *repo = NULL;
7424 const char *status_codes = NULL;
7426 struct got_pathlist_head paths;
7427 struct got_pathlist_entry *pe;
7428 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7429 int ignore_missing_paths = 0;
7430 int *pack_fds = NULL;
7434 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7437 delete_local_mods = 1;
7438 ignore_missing_paths = 1;
7447 for (i = 0; i < strlen(optarg); i++) {
7448 switch (optarg[i]) {
7449 case GOT_STATUS_MODIFY:
7450 delete_local_mods = 1;
7452 case GOT_STATUS_MISSING:
7453 ignore_missing_paths = 1;
7456 errx(1, "invalid status code '%c'",
7460 status_codes = optarg;
7472 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7479 cwd = getcwd(NULL, 0);
7481 error = got_error_from_errno("getcwd");
7485 error = got_repo_pack_fds_open(&pack_fds);
7489 error = got_worktree_open(&worktree, cwd);
7491 if (error->code == GOT_ERR_NOT_WORKTREE)
7492 error = wrap_not_worktree_error(error, "remove", cwd);
7496 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7501 error = apply_unveil(got_repo_get_path(repo), 1,
7502 got_worktree_get_root_path(worktree));
7506 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7513 TAILQ_FOREACH(pe, &paths, entry) {
7514 if (asprintf(&ondisk_path, "%s/%s",
7515 got_worktree_get_root_path(worktree),
7517 error = got_error_from_errno("asprintf");
7520 if (lstat(ondisk_path, &sb) == -1) {
7521 if (errno == ENOENT) {
7525 error = got_error_from_errno2("lstat",
7531 if (S_ISDIR(sb.st_mode)) {
7532 error = got_error_msg(GOT_ERR_BAD_PATH,
7533 "removing directories requires -R option");
7539 error = got_worktree_schedule_delete(worktree, &paths,
7540 delete_local_mods, status_codes, print_remove_status, NULL,
7541 repo, keep_on_disk, ignore_missing_paths);
7544 const struct got_error *close_err = got_repo_close(repo);
7549 got_worktree_close(worktree);
7551 const struct got_error *pack_err =
7552 got_repo_pack_fds_close(pack_fds);
7556 TAILQ_FOREACH(pe, &paths, entry)
7557 free((char *)pe->path);
7558 got_pathlist_free(&paths);
7566 fprintf(stderr, "usage: %s patch [-n] [-p strip-count] "
7567 "[-R] [patchfile]\n", getprogname());
7571 static const struct got_error *
7572 patch_from_stdin(int *patchfd)
7574 const struct got_error *err = NULL;
7576 char *path, buf[BUFSIZ];
7577 sig_t sighup, sigint, sigquit;
7579 err = got_opentemp_named_fd(&path, patchfd,
7580 GOT_TMPDIR_STR "/got-patch");
7586 sighup = signal(SIGHUP, SIG_DFL);
7587 sigint = signal(SIGINT, SIG_DFL);
7588 sigquit = signal(SIGQUIT, SIG_DFL);
7591 r = read(0, buf, sizeof(buf));
7593 err = got_error_from_errno("read");
7598 if (write(*patchfd, buf, r) == -1) {
7599 err = got_error_from_errno("write");
7604 signal(SIGHUP, sighup);
7605 signal(SIGINT, sigint);
7606 signal(SIGQUIT, sigquit);
7608 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7609 err = got_error_from_errno("lseek");
7619 static const struct got_error *
7620 patch_progress(void *arg, const char *old, const char *new,
7621 unsigned char status, const struct got_error *error, long old_from,
7622 long old_lines, long new_from, long new_lines, long offset,
7623 const struct got_error *hunk_err)
7625 const char *path = new == NULL ? old : new;
7627 while (*path == '/')
7631 printf("%c %s\n", status, path);
7634 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7636 if (offset != 0 || hunk_err != NULL) {
7637 printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
7638 old_lines, new_from, new_lines);
7639 if (hunk_err != NULL)
7640 printf("%s\n", hunk_err->msg);
7642 printf("applied with offset %ld\n", offset);
7648 static const struct got_error *
7649 cmd_patch(int argc, char *argv[])
7651 const struct got_error *error = NULL, *close_error = NULL;
7652 struct got_worktree *worktree = NULL;
7653 struct got_repository *repo = NULL;
7656 int ch, nop = 0, strip = -1, reverse = 0;
7658 int *pack_fds = NULL;
7660 while ((ch = getopt(argc, argv, "np:R")) != -1) {
7666 strip = strtonum(optarg, 0, INT_MAX, &errstr);
7668 errx(1, "pathname strip count is %s: %s",
7684 error = patch_from_stdin(&patchfd);
7687 } else if (argc == 1) {
7688 patchfd = open(argv[0], O_RDONLY);
7689 if (patchfd == -1) {
7690 error = got_error_from_errno2("open", argv[0]);
7696 if ((cwd = getcwd(NULL, 0)) == NULL) {
7697 error = got_error_from_errno("getcwd");
7701 error = got_repo_pack_fds_open(&pack_fds);
7705 error = got_worktree_open(&worktree, cwd);
7709 const char *repo_path = got_worktree_get_repo_path(worktree);
7710 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7714 error = apply_unveil(got_repo_get_path(repo), 0,
7715 got_worktree_get_root_path(worktree));
7720 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock",
7725 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
7726 &patch_progress, NULL, check_cancelled, NULL);
7730 close_error = got_repo_close(repo);
7732 error = close_error;
7734 if (worktree != NULL) {
7735 close_error = got_worktree_close(worktree);
7737 error = close_error;
7740 const struct got_error *pack_err =
7741 got_repo_pack_fds_close(pack_fds);
7752 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7753 "path ...\n", getprogname());
7757 static const struct got_error *
7758 revert_progress(void *arg, unsigned char status, const char *path)
7760 if (status == GOT_STATUS_UNVERSIONED)
7763 while (path[0] == '/')
7765 printf("%c %s\n", status, path);
7769 struct choose_patch_arg {
7770 FILE *patch_script_file;
7774 static const struct got_error *
7775 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7776 int nchanges, const char *action)
7778 const struct got_error *err;
7780 size_t linesize = 0;
7784 case GOT_STATUS_ADD:
7785 printf("A %s\n%s this addition? [y/n] ", path, action);
7787 case GOT_STATUS_DELETE:
7788 printf("D %s\n%s this deletion? [y/n] ", path, action);
7790 case GOT_STATUS_MODIFY:
7791 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7792 return got_error_from_errno("fseek");
7793 printf(GOT_COMMIT_SEP_STR);
7794 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7796 if (linelen == -1 && ferror(patch_file)) {
7797 err = got_error_from_errno("getline");
7802 printf(GOT_COMMIT_SEP_STR);
7803 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7804 path, n, nchanges, action);
7807 return got_error_path(path, GOT_ERR_FILE_STATUS);
7813 static const struct got_error *
7814 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7815 FILE *patch_file, int n, int nchanges)
7817 const struct got_error *err = NULL;
7819 size_t linesize = 0;
7822 struct choose_patch_arg *a = arg;
7824 *choice = GOT_PATCH_CHOICE_NONE;
7826 if (a->patch_script_file) {
7828 err = show_change(status, path, patch_file, n, nchanges,
7832 linelen = getline(&line, &linesize, a->patch_script_file);
7833 if (linelen == -1) {
7834 if (ferror(a->patch_script_file))
7835 return got_error_from_errno("getline");
7838 nl = strchr(line, '\n');
7841 if (strcmp(line, "y") == 0) {
7842 *choice = GOT_PATCH_CHOICE_YES;
7844 } else if (strcmp(line, "n") == 0) {
7845 *choice = GOT_PATCH_CHOICE_NO;
7847 } else if (strcmp(line, "q") == 0 &&
7848 status == GOT_STATUS_MODIFY) {
7849 *choice = GOT_PATCH_CHOICE_QUIT;
7852 printf("invalid response '%s'\n", line);
7857 while (resp != 'y' && resp != 'n' && resp != 'q') {
7858 err = show_change(status, path, patch_file, n, nchanges,
7865 if (status == GOT_STATUS_MODIFY) {
7866 if (resp != 'y' && resp != 'n' && resp != 'q') {
7867 printf("invalid response '%c'\n", resp);
7870 } else if (resp != 'y' && resp != 'n') {
7871 printf("invalid response '%c'\n", resp);
7877 *choice = GOT_PATCH_CHOICE_YES;
7878 else if (resp == 'n')
7879 *choice = GOT_PATCH_CHOICE_NO;
7880 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7881 *choice = GOT_PATCH_CHOICE_QUIT;
7886 static const struct got_error *
7887 cmd_revert(int argc, char *argv[])
7889 const struct got_error *error = NULL;
7890 struct got_worktree *worktree = NULL;
7891 struct got_repository *repo = NULL;
7892 char *cwd = NULL, *path = NULL;
7893 struct got_pathlist_head paths;
7894 struct got_pathlist_entry *pe;
7895 int ch, can_recurse = 0, pflag = 0;
7896 FILE *patch_script_file = NULL;
7897 const char *patch_script_path = NULL;
7898 struct choose_patch_arg cpa;
7899 int *pack_fds = NULL;
7903 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7909 patch_script_path = optarg;
7924 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7925 "unveil", NULL) == -1)
7930 if (patch_script_path && !pflag)
7931 errx(1, "-F option can only be used together with -p option");
7933 cwd = getcwd(NULL, 0);
7935 error = got_error_from_errno("getcwd");
7939 error = got_repo_pack_fds_open(&pack_fds);
7943 error = got_worktree_open(&worktree, cwd);
7945 if (error->code == GOT_ERR_NOT_WORKTREE)
7946 error = wrap_not_worktree_error(error, "revert", cwd);
7950 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7955 if (patch_script_path) {
7956 patch_script_file = fopen(patch_script_path, "re");
7957 if (patch_script_file == NULL) {
7958 error = got_error_from_errno2("fopen",
7963 error = apply_unveil(got_repo_get_path(repo), 1,
7964 got_worktree_get_root_path(worktree));
7968 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7975 TAILQ_FOREACH(pe, &paths, entry) {
7976 if (asprintf(&ondisk_path, "%s/%s",
7977 got_worktree_get_root_path(worktree),
7979 error = got_error_from_errno("asprintf");
7982 if (lstat(ondisk_path, &sb) == -1) {
7983 if (errno == ENOENT) {
7987 error = got_error_from_errno2("lstat",
7993 if (S_ISDIR(sb.st_mode)) {
7994 error = got_error_msg(GOT_ERR_BAD_PATH,
7995 "reverting directories requires -R option");
8001 cpa.patch_script_file = patch_script_file;
8002 cpa.action = "revert";
8003 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8004 pflag ? choose_patch : NULL, &cpa, repo);
8006 if (patch_script_file && fclose(patch_script_file) == EOF &&
8008 error = got_error_from_errno2("fclose", patch_script_path);
8010 const struct got_error *close_err = got_repo_close(repo);
8015 got_worktree_close(worktree);
8017 const struct got_error *pack_err =
8018 got_repo_pack_fds_close(pack_fds);
8030 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
8031 "[path ...]\n", getprogname());
8035 struct collect_commit_logmsg_arg {
8036 const char *cmdline_log;
8037 const char *prepared_log;
8038 int non_interactive;
8040 const char *worktree_path;
8041 const char *branch_name;
8042 const char *repo_path;
8047 static const struct got_error *
8048 read_prepared_logmsg(char **logmsg, const char *path)
8050 const struct got_error *err = NULL;
8056 memset(&sb, 0, sizeof(sb));
8058 f = fopen(path, "re");
8060 return got_error_from_errno2("fopen", path);
8062 if (fstat(fileno(f), &sb) == -1) {
8063 err = got_error_from_errno2("fstat", path);
8066 if (sb.st_size == 0) {
8067 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8071 *logmsg = malloc(sb.st_size + 1);
8072 if (*logmsg == NULL) {
8073 err = got_error_from_errno("malloc");
8077 r = fread(*logmsg, 1, sb.st_size, f);
8078 if (r != sb.st_size) {
8080 err = got_error_from_errno2("fread", path);
8082 err = got_error(GOT_ERR_IO);
8085 (*logmsg)[sb.st_size] = '\0';
8087 if (fclose(f) == EOF && err == NULL)
8088 err = got_error_from_errno2("fclose", path);
8097 static const struct got_error *
8098 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
8101 char *initial_content = NULL;
8102 struct got_pathlist_entry *pe;
8103 const struct got_error *err = NULL;
8104 char *template = NULL;
8105 struct collect_commit_logmsg_arg *a = arg;
8106 int initial_content_len;
8110 /* if a message was specified on the command line, just use it */
8111 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
8112 len = strlen(a->cmdline_log) + 1;
8113 *logmsg = malloc(len + 1);
8114 if (*logmsg == NULL)
8115 return got_error_from_errno("malloc");
8116 strlcpy(*logmsg, a->cmdline_log, len);
8118 } else if (a->prepared_log != NULL && a->non_interactive)
8119 return read_prepared_logmsg(logmsg, a->prepared_log);
8121 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
8122 return got_error_from_errno("asprintf");
8124 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
8128 if (a->prepared_log) {
8130 err = read_prepared_logmsg(&msg, a->prepared_log);
8133 if (write(fd, msg, strlen(msg)) == -1) {
8134 err = got_error_from_errno2("write", a->logmsg_path);
8141 initial_content_len = asprintf(&initial_content,
8142 "\n# changes to be committed on branch %s:\n",
8144 if (initial_content_len == -1) {
8145 err = got_error_from_errno("asprintf");
8149 if (write(fd, initial_content, initial_content_len) == -1) {
8150 err = got_error_from_errno2("write", a->logmsg_path);
8154 TAILQ_FOREACH(pe, commitable_paths, entry) {
8155 struct got_commitable *ct = pe->data;
8156 dprintf(fd, "# %c %s\n",
8157 got_commitable_get_status(ct),
8158 got_commitable_get_path(ct));
8161 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
8162 initial_content_len, a->prepared_log ? 0 : 1);
8164 free(initial_content);
8167 if (fd != -1 && close(fd) == -1 && err == NULL)
8168 err = got_error_from_errno2("close", a->logmsg_path);
8170 /* Editor is done; we can now apply unveil(2) */
8172 err = apply_unveil(a->repo_path, 0, a->worktree_path);
8180 static const struct got_error *
8181 cmd_commit(int argc, char *argv[])
8183 const struct got_error *error = NULL;
8184 struct got_worktree *worktree = NULL;
8185 struct got_repository *repo = NULL;
8186 char *cwd = NULL, *id_str = NULL;
8187 struct got_object_id *id = NULL;
8188 const char *logmsg = NULL;
8189 char *prepared_logmsg = NULL;
8190 struct collect_commit_logmsg_arg cl_arg;
8191 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
8192 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
8193 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
8194 struct got_pathlist_head paths;
8195 int *pack_fds = NULL;
8198 cl_arg.logmsg_path = NULL;
8200 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
8204 option_conflict('F', 'm');
8205 prepared_logmsg = realpath(optarg, NULL);
8206 if (prepared_logmsg == NULL)
8207 return got_error_from_errno2("realpath",
8211 if (prepared_logmsg)
8212 option_conflict('m', 'F');
8216 non_interactive = 1;
8219 allow_bad_symlinks = 1;
8231 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8232 "unveil", NULL) == -1)
8235 cwd = getcwd(NULL, 0);
8237 error = got_error_from_errno("getcwd");
8241 error = got_repo_pack_fds_open(&pack_fds);
8245 error = got_worktree_open(&worktree, cwd);
8247 if (error->code == GOT_ERR_NOT_WORKTREE)
8248 error = wrap_not_worktree_error(error, "commit", cwd);
8252 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8255 if (rebase_in_progress) {
8256 error = got_error(GOT_ERR_REBASING);
8260 error = got_worktree_histedit_in_progress(&histedit_in_progress,
8265 error = get_gitconfig_path(&gitconfig_path);
8268 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8269 gitconfig_path, pack_fds);
8273 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
8276 if (merge_in_progress) {
8277 error = got_error(GOT_ERR_MERGE_BUSY);
8281 error = get_author(&author, repo, worktree);
8286 * unveil(2) traverses exec(2); if an editor is used we have
8287 * to apply unveil after the log message has been written.
8289 if (logmsg == NULL || strlen(logmsg) == 0)
8290 error = get_editor(&editor);
8292 error = apply_unveil(got_repo_get_path(repo), 0,
8293 got_worktree_get_root_path(worktree));
8297 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8301 cl_arg.editor = editor;
8302 cl_arg.cmdline_log = logmsg;
8303 cl_arg.prepared_log = prepared_logmsg;
8304 cl_arg.non_interactive = non_interactive;
8305 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
8306 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
8307 if (!histedit_in_progress) {
8308 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
8309 error = got_error(GOT_ERR_COMMIT_BRANCH);
8312 cl_arg.branch_name += 11;
8314 cl_arg.repo_path = got_repo_get_path(repo);
8315 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
8316 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
8317 print_status, NULL, repo);
8319 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
8320 cl_arg.logmsg_path != NULL)
8321 preserve_logmsg = 1;
8325 error = got_object_id_str(&id_str, id);
8328 printf("Created commit %s\n", id_str);
8330 if (preserve_logmsg) {
8331 fprintf(stderr, "%s: log message preserved in %s\n",
8332 getprogname(), cl_arg.logmsg_path);
8333 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
8335 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
8336 free(cl_arg.logmsg_path);
8338 const struct got_error *close_err = got_repo_close(repo);
8343 got_worktree_close(worktree);
8345 const struct got_error *pack_err =
8346 got_repo_pack_fds_close(pack_fds);
8352 free(gitconfig_path);
8355 free(prepared_logmsg);
8362 fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
8363 "[-r repository-path] [-t tag] [-T] [-q] [-v] "
8364 "[remote-repository]\n", getprogname());
8369 print_load_info(int print_colored, int print_found, int print_trees,
8370 int ncolored, int nfound, int ntrees)
8372 if (print_colored) {
8373 printf("%d commit%s colored", ncolored,
8374 ncolored == 1 ? "" : "s");
8377 printf("%s%d object%s found",
8378 ncolored > 0 ? "; " : "",
8379 nfound, nfound == 1 ? "" : "s");
8382 printf("; %d tree%s scanned", ntrees,
8383 ntrees == 1 ? "" : "s");
8387 struct got_send_progress_arg {
8388 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8395 int last_nobj_total;
8399 int printed_something;
8401 struct got_pathlist_head *delete_branches;
8404 static const struct got_error *
8405 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8406 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8407 int nobj_written, off_t bytes_sent, const char *refname, int success)
8409 struct got_send_progress_arg *a = arg;
8410 char scaled_packsize[FMT_SCALED_STRSIZE];
8411 char scaled_sent[FMT_SCALED_STRSIZE];
8412 int p_deltify = 0, p_written = 0, p_sent = 0;
8413 int print_colored = 0, print_found = 0, print_trees = 0;
8414 int print_searching = 0, print_total = 0;
8415 int print_deltify = 0, print_written = 0, print_sent = 0;
8417 if (a->verbosity < 0)
8421 const char *status = success ? "accepted" : "rejected";
8424 struct got_pathlist_entry *pe;
8425 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8426 const char *branchname = pe->path;
8427 if (got_path_cmp(branchname, refname,
8428 strlen(branchname), strlen(refname)) == 0) {
8430 a->sent_something = 1;
8436 if (a->printed_something)
8438 printf("Server has %s %s", status, refname);
8439 a->printed_something = 1;
8443 if (a->last_ncolored != ncolored) {
8445 a->last_ncolored = ncolored;
8448 if (a->last_nfound != nfound) {
8451 a->last_nfound = nfound;
8454 if (a->last_ntrees != ntrees) {
8458 a->last_ntrees = ntrees;
8461 if ((print_colored || print_found || print_trees) &&
8464 print_load_info(print_colored, print_found, print_trees,
8465 ncolored, nfound, ntrees);
8466 a->printed_something = 1;
8469 } else if (!a->loading_done) {
8471 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8473 a->loading_done = 1;
8476 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8477 return got_error_from_errno("fmt_scaled");
8478 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8479 return got_error_from_errno("fmt_scaled");
8481 if (a->last_ncommits != ncommits) {
8482 print_searching = 1;
8483 a->last_ncommits = ncommits;
8486 if (a->last_nobj_total != nobj_total) {
8487 print_searching = 1;
8489 a->last_nobj_total = nobj_total;
8492 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8493 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8494 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8495 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8496 return got_error(GOT_ERR_NO_SPACE);
8499 if (nobj_deltify > 0 || nobj_written > 0) {
8500 if (nobj_deltify > 0) {
8501 p_deltify = (nobj_deltify * 100) / nobj_total;
8502 if (p_deltify != a->last_p_deltify) {
8503 a->last_p_deltify = p_deltify;
8504 print_searching = 1;
8509 if (nobj_written > 0) {
8510 p_written = (nobj_written * 100) / nobj_total;
8511 if (p_written != a->last_p_written) {
8512 a->last_p_written = p_written;
8513 print_searching = 1;
8521 if (bytes_sent > 0) {
8522 p_sent = (bytes_sent * 100) / packfile_size;
8523 if (p_sent != a->last_p_sent) {
8524 a->last_p_sent = p_sent;
8525 print_searching = 1;
8531 a->sent_something = 1;
8534 if (print_searching || print_total || print_deltify || print_written ||
8537 if (print_searching)
8538 printf("packing %d reference%s", ncommits,
8539 ncommits == 1 ? "" : "s");
8541 printf("; %d object%s", nobj_total,
8542 nobj_total == 1 ? "" : "s");
8544 printf("; deltify: %d%%", p_deltify);
8546 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8547 scaled_packsize, p_sent);
8548 else if (print_written)
8549 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8550 scaled_packsize, p_written);
8551 if (print_searching || print_total || print_deltify ||
8552 print_written || print_sent) {
8553 a->printed_something = 1;
8559 static const struct got_error *
8560 cmd_send(int argc, char *argv[])
8562 const struct got_error *error = NULL;
8563 char *cwd = NULL, *repo_path = NULL;
8564 const char *remote_name;
8565 char *proto = NULL, *host = NULL, *port = NULL;
8566 char *repo_name = NULL, *server_path = NULL;
8567 const struct got_remote_repo *remotes, *remote = NULL;
8568 int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
8569 struct got_repository *repo = NULL;
8570 struct got_worktree *worktree = NULL;
8571 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8572 struct got_pathlist_head branches;
8573 struct got_pathlist_head tags;
8574 struct got_reflist_head all_branches;
8575 struct got_reflist_head all_tags;
8576 struct got_pathlist_head delete_args;
8577 struct got_pathlist_head delete_branches;
8578 struct got_reflist_entry *re;
8579 struct got_pathlist_entry *pe;
8580 int i, ch, sendfd = -1, sendstatus;
8582 struct got_send_progress_arg spa;
8583 int verbosity = 0, overwrite_refs = 0;
8584 int send_all_branches = 0, send_all_tags = 0;
8585 struct got_reference *ref = NULL;
8586 int *pack_fds = NULL;
8588 TAILQ_INIT(&branches);
8590 TAILQ_INIT(&all_branches);
8591 TAILQ_INIT(&all_tags);
8592 TAILQ_INIT(&delete_args);
8593 TAILQ_INIT(&delete_branches);
8595 while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8598 send_all_branches = 1;
8601 error = got_pathlist_append(&branches, optarg, NULL);
8607 error = got_pathlist_append(&delete_args, optarg, NULL);
8615 repo_path = realpath(optarg, NULL);
8616 if (repo_path == NULL)
8617 return got_error_from_errno2("realpath",
8619 got_path_strip_trailing_slashes(repo_path);
8622 error = got_pathlist_append(&tags, optarg, NULL);
8633 else if (verbosity < 3)
8647 if (send_all_branches && !TAILQ_EMPTY(&branches))
8648 option_conflict('a', 'b');
8649 if (send_all_tags && !TAILQ_EMPTY(&tags))
8650 option_conflict('T', 't');
8654 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8656 remote_name = argv[0];
8660 cwd = getcwd(NULL, 0);
8662 error = got_error_from_errno("getcwd");
8666 error = got_repo_pack_fds_open(&pack_fds);
8670 if (repo_path == NULL) {
8671 error = got_worktree_open(&worktree, cwd);
8672 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8678 strdup(got_worktree_get_repo_path(worktree));
8679 if (repo_path == NULL)
8680 error = got_error_from_errno("strdup");
8684 repo_path = strdup(cwd);
8685 if (repo_path == NULL) {
8686 error = got_error_from_errno("strdup");
8692 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8697 worktree_conf = got_worktree_get_gotconfig(worktree);
8698 if (worktree_conf) {
8699 got_gotconfig_get_remotes(&nremotes, &remotes,
8701 for (i = 0; i < nremotes; i++) {
8702 if (strcmp(remotes[i].name, remote_name) == 0) {
8703 remote = &remotes[i];
8709 if (remote == NULL) {
8710 repo_conf = got_repo_get_gotconfig(repo);
8712 got_gotconfig_get_remotes(&nremotes, &remotes,
8714 for (i = 0; i < nremotes; i++) {
8715 if (strcmp(remotes[i].name, remote_name) == 0) {
8716 remote = &remotes[i];
8722 if (remote == NULL) {
8723 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8724 for (i = 0; i < nremotes; i++) {
8725 if (strcmp(remotes[i].name, remote_name) == 0) {
8726 remote = &remotes[i];
8731 if (remote == NULL) {
8732 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8736 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8737 &repo_name, remote->send_url);
8741 if (strcmp(proto, "git") == 0) {
8743 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8744 "sendfd dns inet unveil", NULL) == -1)
8747 } else if (strcmp(proto, "git+ssh") == 0 ||
8748 strcmp(proto, "ssh") == 0) {
8750 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8751 "sendfd unveil", NULL) == -1)
8754 } else if (strcmp(proto, "http") == 0 ||
8755 strcmp(proto, "git+http") == 0) {
8756 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8759 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8763 error = got_dial_apply_unveil(proto);
8767 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8771 if (send_all_branches) {
8772 error = got_ref_list(&all_branches, repo, "refs/heads",
8773 got_ref_cmp_by_name, NULL);
8776 TAILQ_FOREACH(re, &all_branches, entry) {
8777 const char *branchname = got_ref_get_name(re->ref);
8778 error = got_pathlist_append(&branches,
8784 } else if (nbranches == 0) {
8785 for (i = 0; i < remote->nsend_branches; i++) {
8786 got_pathlist_append(&branches,
8787 remote->send_branches[i], NULL);
8791 if (send_all_tags) {
8792 error = got_ref_list(&all_tags, repo, "refs/tags",
8793 got_ref_cmp_by_name, NULL);
8796 TAILQ_FOREACH(re, &all_tags, entry) {
8797 const char *tagname = got_ref_get_name(re->ref);
8798 error = got_pathlist_append(&tags,
8807 * To prevent accidents only branches in refs/heads/ can be deleted
8808 * with 'got send -d'.
8809 * Deleting anything else requires local repository access or Git.
8811 TAILQ_FOREACH(pe, &delete_args, entry) {
8812 const char *branchname = pe->path;
8814 struct got_pathlist_entry *new;
8815 if (strncmp(branchname, "refs/heads/", 11) == 0) {
8816 s = strdup(branchname);
8818 error = got_error_from_errno("strdup");
8822 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8823 error = got_error_from_errno("asprintf");
8827 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8828 if (error || new == NULL /* duplicate */)
8835 if (nbranches == 0 && ndelete_branches == 0) {
8836 struct got_reference *head_ref;
8838 error = got_ref_open(&head_ref, repo,
8839 got_worktree_get_head_ref_name(worktree), 0);
8841 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8844 if (got_ref_is_symbolic(head_ref)) {
8845 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8846 got_ref_close(head_ref);
8851 error = got_pathlist_append(&branches, got_ref_get_name(ref),
8859 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8860 port ? ":" : "", port ? port : "");
8862 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8863 server_path, verbosity);
8867 memset(&spa, 0, sizeof(spa));
8868 spa.last_scaled_packsize[0] = '\0';
8869 spa.last_p_deltify = -1;
8870 spa.last_p_written = -1;
8871 spa.verbosity = verbosity;
8872 spa.delete_branches = &delete_branches;
8873 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8874 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8875 check_cancelled, NULL);
8876 if (spa.printed_something)
8880 if (!spa.sent_something && verbosity >= 0)
8881 printf("Already up-to-date\n");
8884 if (kill(sendpid, SIGTERM) == -1)
8885 error = got_error_from_errno("kill");
8886 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8887 error = got_error_from_errno("waitpid");
8889 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8890 error = got_error_from_errno("close");
8892 const struct got_error *close_err = got_repo_close(repo);
8897 got_worktree_close(worktree);
8899 const struct got_error *pack_err =
8900 got_repo_pack_fds_close(pack_fds);
8906 got_pathlist_free(&branches);
8907 got_pathlist_free(&tags);
8908 got_ref_list_free(&all_branches);
8909 got_ref_list_free(&all_tags);
8910 got_pathlist_free(&delete_args);
8911 TAILQ_FOREACH(pe, &delete_branches, entry)
8912 free((char *)pe->path);
8913 got_pathlist_free(&delete_branches);
8925 usage_cherrypick(void)
8927 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8931 static const struct got_error *
8932 cmd_cherrypick(int argc, char *argv[])
8934 const struct got_error *error = NULL;
8935 struct got_worktree *worktree = NULL;
8936 struct got_repository *repo = NULL;
8937 char *cwd = NULL, *commit_id_str = NULL;
8938 struct got_object_id *commit_id = NULL;
8939 struct got_commit_object *commit = NULL;
8940 struct got_object_qid *pid;
8942 struct got_update_progress_arg upa;
8943 int *pack_fds = NULL;
8945 while ((ch = getopt(argc, argv, "")) != -1) {
8957 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8958 "unveil", NULL) == -1)
8964 cwd = getcwd(NULL, 0);
8966 error = got_error_from_errno("getcwd");
8970 error = got_repo_pack_fds_open(&pack_fds);
8974 error = got_worktree_open(&worktree, cwd);
8976 if (error->code == GOT_ERR_NOT_WORKTREE)
8977 error = wrap_not_worktree_error(error, "cherrypick",
8982 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8987 error = apply_unveil(got_repo_get_path(repo), 0,
8988 got_worktree_get_root_path(worktree));
8992 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8993 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8996 error = got_object_id_str(&commit_id_str, commit_id);
9000 error = got_object_open_as_commit(&commit, repo, commit_id);
9003 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9004 memset(&upa, 0, sizeof(upa));
9005 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
9006 commit_id, repo, update_progress, &upa, check_cancelled,
9011 if (upa.did_something)
9012 printf("Merged commit %s\n", commit_id_str);
9013 print_merge_progress_stats(&upa);
9016 got_object_commit_close(commit);
9017 free(commit_id_str);
9019 got_worktree_close(worktree);
9021 const struct got_error *close_err = got_repo_close(repo);
9026 const struct got_error *pack_err =
9027 got_repo_pack_fds_close(pack_fds);
9038 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
9042 static const struct got_error *
9043 cmd_backout(int argc, char *argv[])
9045 const struct got_error *error = NULL;
9046 struct got_worktree *worktree = NULL;
9047 struct got_repository *repo = NULL;
9048 char *cwd = NULL, *commit_id_str = NULL;
9049 struct got_object_id *commit_id = NULL;
9050 struct got_commit_object *commit = NULL;
9051 struct got_object_qid *pid;
9053 struct got_update_progress_arg upa;
9054 int *pack_fds = NULL;
9056 while ((ch = getopt(argc, argv, "")) != -1) {
9068 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9069 "unveil", NULL) == -1)
9075 cwd = getcwd(NULL, 0);
9077 error = got_error_from_errno("getcwd");
9081 error = got_repo_pack_fds_open(&pack_fds);
9085 error = got_worktree_open(&worktree, cwd);
9087 if (error->code == GOT_ERR_NOT_WORKTREE)
9088 error = wrap_not_worktree_error(error, "backout", cwd);
9092 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9097 error = apply_unveil(got_repo_get_path(repo), 0,
9098 got_worktree_get_root_path(worktree));
9102 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
9103 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9106 error = got_object_id_str(&commit_id_str, commit_id);
9110 error = got_object_open_as_commit(&commit, repo, commit_id);
9113 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
9115 error = got_error(GOT_ERR_ROOT_COMMIT);
9119 memset(&upa, 0, sizeof(upa));
9120 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
9121 repo, update_progress, &upa, check_cancelled, NULL);
9125 if (upa.did_something)
9126 printf("Backed out commit %s\n", commit_id_str);
9127 print_merge_progress_stats(&upa);
9130 got_object_commit_close(commit);
9131 free(commit_id_str);
9133 got_worktree_close(worktree);
9135 const struct got_error *close_err = got_repo_close(repo);
9140 const struct got_error *pack_err =
9141 got_repo_pack_fds_close(pack_fds);
9151 fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
9157 trim_logmsg(char *logmsg, int limit)
9162 len = strlen(logmsg);
9166 nl = strchr(logmsg, '\n');
9171 static const struct got_error *
9172 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
9174 const struct got_error *err;
9175 char *logmsg0 = NULL;
9178 err = got_object_commit_get_logmsg(&logmsg0, commit);
9183 while (isspace((unsigned char)s[0]))
9186 *logmsg = strdup(s);
9187 if (*logmsg == NULL) {
9188 err = got_error_from_errno("strdup");
9192 trim_logmsg(*logmsg, limit);
9198 static const struct got_error *
9199 show_rebase_merge_conflict(struct got_object_id *id,
9200 struct got_repository *repo)
9202 const struct got_error *err;
9203 struct got_commit_object *commit = NULL;
9204 char *id_str = NULL, *logmsg = NULL;
9206 err = got_object_open_as_commit(&commit, repo, id);
9210 err = got_object_id_str(&id_str, id);
9216 err = get_short_logmsg(&logmsg, 42, commit);
9220 printf("%s -> merge conflict: %s\n", id_str, logmsg);
9223 got_object_commit_close(commit);
9228 static const struct got_error *
9229 show_rebase_progress(struct got_commit_object *commit,
9230 struct got_object_id *old_id, struct got_object_id *new_id)
9232 const struct got_error *err;
9233 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9235 err = got_object_id_str(&old_id_str, old_id);
9240 err = got_object_id_str(&new_id_str, new_id);
9245 old_id_str[12] = '\0';
9247 new_id_str[12] = '\0';
9249 err = get_short_logmsg(&logmsg, 42, commit);
9253 printf("%s -> %s: %s\n", old_id_str,
9254 new_id_str ? new_id_str : "no-op change", logmsg);
9262 static const struct got_error *
9263 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
9264 struct got_reference *branch, struct got_reference *new_base_branch,
9265 struct got_reference *tmp_branch, struct got_repository *repo,
9268 printf("Switching work tree to %s\n", got_ref_get_name(branch));
9269 return got_worktree_rebase_complete(worktree, fileindex,
9270 new_base_branch, tmp_branch, branch, repo, create_backup);
9273 static const struct got_error *
9274 rebase_commit(struct got_pathlist_head *merged_paths,
9275 struct got_worktree *worktree, struct got_fileindex *fileindex,
9276 struct got_reference *tmp_branch,
9277 struct got_object_id *commit_id, struct got_repository *repo)
9279 const struct got_error *error;
9280 struct got_commit_object *commit;
9281 struct got_object_id *new_commit_id;
9283 error = got_object_open_as_commit(&commit, repo, commit_id);
9287 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
9288 worktree, fileindex, tmp_branch, commit, commit_id, repo);
9290 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
9292 error = show_rebase_progress(commit, commit_id, NULL);
9294 error = show_rebase_progress(commit, commit_id, new_commit_id);
9295 free(new_commit_id);
9298 got_object_commit_close(commit);
9302 struct check_path_prefix_arg {
9303 const char *path_prefix;
9308 static const struct got_error *
9309 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
9310 struct got_blob_object *blob2, FILE *f1, FILE *f2,
9311 struct got_object_id *id1, struct got_object_id *id2,
9312 const char *path1, const char *path2,
9313 mode_t mode1, mode_t mode2, struct got_repository *repo)
9315 struct check_path_prefix_arg *a = arg;
9317 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
9318 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
9319 return got_error(a->errcode);
9324 static const struct got_error *
9325 check_path_prefix(struct got_object_id *parent_id,
9326 struct got_object_id *commit_id, const char *path_prefix,
9327 int errcode, struct got_repository *repo)
9329 const struct got_error *err;
9330 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
9331 struct got_commit_object *commit = NULL, *parent_commit = NULL;
9332 struct check_path_prefix_arg cpp_arg;
9334 if (got_path_is_root_dir(path_prefix))
9337 err = got_object_open_as_commit(&commit, repo, commit_id);
9341 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
9345 err = got_object_open_as_tree(&tree1, repo,
9346 got_object_commit_get_tree_id(parent_commit));
9350 err = got_object_open_as_tree(&tree2, repo,
9351 got_object_commit_get_tree_id(commit));
9355 cpp_arg.path_prefix = path_prefix;
9356 while (cpp_arg.path_prefix[0] == '/')
9357 cpp_arg.path_prefix++;
9358 cpp_arg.len = strlen(cpp_arg.path_prefix);
9359 cpp_arg.errcode = errcode;
9360 err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
9361 check_path_prefix_in_diff, &cpp_arg, 0);
9364 got_object_tree_close(tree1);
9366 got_object_tree_close(tree2);
9368 got_object_commit_close(commit);
9370 got_object_commit_close(parent_commit);
9374 static const struct got_error *
9375 collect_commits(struct got_object_id_queue *commits,
9376 struct got_object_id *initial_commit_id,
9377 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
9378 const char *path_prefix, int path_prefix_errcode,
9379 struct got_repository *repo)
9381 const struct got_error *err = NULL;
9382 struct got_commit_graph *graph = NULL;
9383 struct got_object_id *parent_id = NULL;
9384 struct got_object_qid *qid;
9385 struct got_object_id *commit_id = initial_commit_id;
9387 err = got_commit_graph_open(&graph, "/", 1);
9391 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
9392 check_cancelled, NULL);
9395 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
9396 err = got_commit_graph_iter_next(&parent_id, graph, repo,
9397 check_cancelled, NULL);
9399 if (err->code == GOT_ERR_ITER_COMPLETED) {
9400 err = got_error_msg(GOT_ERR_ANCESTRY,
9401 "ran out of commits to rebase before "
9402 "youngest common ancestor commit has "
9407 err = check_path_prefix(parent_id, commit_id,
9408 path_prefix, path_prefix_errcode, repo);
9412 err = got_object_qid_alloc(&qid, commit_id);
9415 STAILQ_INSERT_HEAD(commits, qid, entry);
9416 commit_id = parent_id;
9420 got_commit_graph_close(graph);
9424 static const struct got_error *
9425 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9427 const struct got_error *err = NULL;
9428 time_t committer_time;
9430 char datebuf[11]; /* YYYY-MM-DD + NUL */
9431 char *author0 = NULL, *author, *smallerthan;
9432 char *logmsg0 = NULL, *logmsg, *newline;
9434 committer_time = got_object_commit_get_committer_time(commit);
9435 if (gmtime_r(&committer_time, &tm) == NULL)
9436 return got_error_from_errno("gmtime_r");
9437 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9438 return got_error(GOT_ERR_NO_SPACE);
9440 author0 = strdup(got_object_commit_get_author(commit));
9441 if (author0 == NULL)
9442 return got_error_from_errno("strdup");
9444 smallerthan = strchr(author, '<');
9445 if (smallerthan && smallerthan[1] != '\0')
9446 author = smallerthan + 1;
9447 author[strcspn(author, "@>")] = '\0';
9449 err = got_object_commit_get_logmsg(&logmsg0, commit);
9453 while (*logmsg == '\n')
9455 newline = strchr(logmsg, '\n');
9459 if (asprintf(brief_str, "%s %s %s",
9460 datebuf, author, logmsg) == -1)
9461 err = got_error_from_errno("asprintf");
9468 static const struct got_error *
9469 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9470 struct got_repository *repo)
9472 const struct got_error *err;
9475 err = got_object_id_str(&id_str, id);
9479 err = got_ref_delete(ref, repo);
9483 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
9489 static const struct got_error *
9490 print_backup_ref(const char *branch_name, const char *new_id_str,
9491 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
9492 struct got_reflist_object_id_map *refs_idmap,
9493 struct got_repository *repo)
9495 const struct got_error *err = NULL;
9496 struct got_reflist_head *refs;
9497 char *refs_str = NULL;
9498 struct got_object_id *new_commit_id = NULL;
9499 struct got_commit_object *new_commit = NULL;
9500 char *new_commit_brief_str = NULL;
9501 struct got_object_id *yca_id = NULL;
9502 struct got_commit_object *yca_commit = NULL;
9503 char *yca_id_str = NULL, *yca_brief_str = NULL;
9504 char *custom_refs_str;
9506 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9507 return got_error_from_errno("asprintf");
9509 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9510 0, 0, refs_idmap, custom_refs_str);
9514 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9518 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9520 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
9525 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9529 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9533 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9534 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9538 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9539 refs_str ? " (" : "", refs_str ? refs_str : "",
9540 refs_str ? ")" : "", new_commit_brief_str);
9541 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9542 got_object_id_cmp(yca_id, old_commit_id) != 0) {
9546 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9550 err = get_commit_brief_str(&yca_brief_str, yca_commit);
9554 err = got_object_id_str(&yca_id_str, yca_id);
9558 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9560 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
9564 printf("history forked at %s%s%s%s\n %s\n",
9566 refs_str ? " (" : "", refs_str ? refs_str : "",
9567 refs_str ? ")" : "", yca_brief_str);
9570 free(custom_refs_str);
9571 free(new_commit_id);
9575 free(yca_brief_str);
9577 got_object_commit_close(new_commit);
9579 got_object_commit_close(yca_commit);
9584 static const struct got_error *
9585 process_backup_refs(const char *backup_ref_prefix,
9586 const char *wanted_branch_name,
9587 int delete, struct got_repository *repo)
9589 const struct got_error *err;
9590 struct got_reflist_head refs, backup_refs;
9591 struct got_reflist_entry *re;
9592 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9593 struct got_object_id *old_commit_id = NULL;
9594 char *branch_name = NULL;
9595 struct got_commit_object *old_commit = NULL;
9596 struct got_reflist_object_id_map *refs_idmap = NULL;
9597 int wanted_branch_found = 0;
9600 TAILQ_INIT(&backup_refs);
9602 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9606 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9610 if (wanted_branch_name) {
9611 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9612 wanted_branch_name += 11;
9615 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9616 got_ref_cmp_by_commit_timestamp_descending, repo);
9620 TAILQ_FOREACH(re, &backup_refs, entry) {
9621 const char *refname = got_ref_get_name(re->ref);
9624 err = check_cancelled(NULL);
9628 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9632 err = got_object_open_as_commit(&old_commit, repo,
9637 if (strncmp(backup_ref_prefix, refname,
9638 backup_ref_prefix_len) == 0)
9639 refname += backup_ref_prefix_len;
9641 while (refname[0] == '/')
9644 branch_name = strdup(refname);
9645 if (branch_name == NULL) {
9646 err = got_error_from_errno("strdup");
9649 slash = strrchr(branch_name, '/');
9652 refname += strlen(branch_name) + 1;
9655 if (wanted_branch_name == NULL ||
9656 strcmp(wanted_branch_name, branch_name) == 0) {
9657 wanted_branch_found = 1;
9659 err = delete_backup_ref(re->ref,
9660 old_commit_id, repo);
9662 err = print_backup_ref(branch_name, refname,
9663 old_commit_id, old_commit, refs_idmap,
9670 free(old_commit_id);
9671 old_commit_id = NULL;
9674 got_object_commit_close(old_commit);
9678 if (wanted_branch_name && !wanted_branch_found) {
9679 err = got_error_fmt(GOT_ERR_NOT_REF,
9680 "%s/%s/", backup_ref_prefix, wanted_branch_name);
9684 got_reflist_object_id_map_free(refs_idmap);
9685 got_ref_list_free(&refs);
9686 got_ref_list_free(&backup_refs);
9687 free(old_commit_id);
9690 got_object_commit_close(old_commit);
9694 static const struct got_error *
9695 abort_progress(void *arg, unsigned char status, const char *path)
9698 * Unversioned files should not clutter progress output when
9699 * an operation is aborted.
9701 if (status == GOT_STATUS_UNVERSIONED)
9704 return update_progress(arg, status, path);
9707 static const struct got_error *
9708 cmd_rebase(int argc, char *argv[])
9710 const struct got_error *error = NULL;
9711 struct got_worktree *worktree = NULL;
9712 struct got_repository *repo = NULL;
9713 struct got_fileindex *fileindex = NULL;
9715 struct got_reference *branch = NULL;
9716 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9717 struct got_object_id *commit_id = NULL, *parent_id = NULL;
9718 struct got_object_id *resume_commit_id = NULL;
9719 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9720 struct got_commit_object *commit = NULL;
9721 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9722 int histedit_in_progress = 0, merge_in_progress = 0;
9723 int create_backup = 1, list_backups = 0, delete_backups = 0;
9724 struct got_object_id_queue commits;
9725 struct got_pathlist_head merged_paths;
9726 const struct got_object_id_queue *parent_ids;
9727 struct got_object_qid *qid, *pid;
9728 struct got_update_progress_arg upa;
9729 int *pack_fds = NULL;
9731 STAILQ_INIT(&commits);
9732 TAILQ_INIT(&merged_paths);
9733 memset(&upa, 0, sizeof(upa));
9735 while ((ch = getopt(argc, argv, "aclX")) != -1) {
9741 continue_rebase = 1;
9759 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9760 "unveil", NULL) == -1)
9765 option_conflict('l', 'a');
9766 if (continue_rebase)
9767 option_conflict('l', 'c');
9769 option_conflict('l', 'X');
9770 if (argc != 0 && argc != 1)
9772 } else if (delete_backups) {
9774 option_conflict('X', 'a');
9775 if (continue_rebase)
9776 option_conflict('X', 'c');
9778 option_conflict('l', 'X');
9779 if (argc != 0 && argc != 1)
9782 if (abort_rebase && continue_rebase)
9784 else if (abort_rebase || continue_rebase) {
9787 } else if (argc != 1)
9791 cwd = getcwd(NULL, 0);
9793 error = got_error_from_errno("getcwd");
9797 error = got_repo_pack_fds_open(&pack_fds);
9801 error = got_worktree_open(&worktree, cwd);
9803 if (list_backups || delete_backups) {
9804 if (error->code != GOT_ERR_NOT_WORKTREE)
9807 if (error->code == GOT_ERR_NOT_WORKTREE)
9808 error = wrap_not_worktree_error(error,
9814 error = got_repo_open(&repo,
9815 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
9820 error = apply_unveil(got_repo_get_path(repo), 0,
9821 worktree ? got_worktree_get_root_path(worktree) : NULL);
9825 if (list_backups || delete_backups) {
9826 error = process_backup_refs(
9827 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9828 argc == 1 ? argv[0] : NULL, delete_backups, repo);
9829 goto done; /* nothing else to do */
9832 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9836 if (histedit_in_progress) {
9837 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9841 error = got_worktree_merge_in_progress(&merge_in_progress,
9845 if (merge_in_progress) {
9846 error = got_error(GOT_ERR_MERGE_BUSY);
9850 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9855 if (!rebase_in_progress) {
9856 error = got_error(GOT_ERR_NOT_REBASING);
9859 error = got_worktree_rebase_continue(&resume_commit_id,
9860 &new_base_branch, &tmp_branch, &branch, &fileindex,
9864 printf("Switching work tree to %s\n",
9865 got_ref_get_symref_target(new_base_branch));
9866 error = got_worktree_rebase_abort(worktree, fileindex, repo,
9867 new_base_branch, abort_progress, &upa);
9870 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9871 print_merge_progress_stats(&upa);
9872 goto done; /* nothing else to do */
9875 if (continue_rebase) {
9876 if (!rebase_in_progress) {
9877 error = got_error(GOT_ERR_NOT_REBASING);
9880 error = got_worktree_rebase_continue(&resume_commit_id,
9881 &new_base_branch, &tmp_branch, &branch, &fileindex,
9886 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9887 resume_commit_id, repo);
9891 yca_id = got_object_id_dup(resume_commit_id);
9892 if (yca_id == NULL) {
9893 error = got_error_from_errno("got_object_id_dup");
9897 error = got_ref_open(&branch, repo, argv[0], 0);
9902 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9906 if (!continue_rebase) {
9907 struct got_object_id *base_commit_id;
9909 base_commit_id = got_worktree_get_base_commit_id(worktree);
9910 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9911 base_commit_id, branch_head_commit_id, 1, repo,
9912 check_cancelled, NULL);
9915 if (yca_id == NULL) {
9916 error = got_error_msg(GOT_ERR_ANCESTRY,
9917 "specified branch shares no common ancestry "
9918 "with work tree's branch");
9922 error = check_same_branch(base_commit_id, branch, yca_id, repo);
9924 if (error->code != GOT_ERR_ANCESTRY)
9928 struct got_pathlist_head paths;
9929 printf("%s is already based on %s\n",
9930 got_ref_get_name(branch),
9931 got_worktree_get_head_ref_name(worktree));
9932 error = switch_head_ref(branch, branch_head_commit_id,
9936 error = got_worktree_set_base_commit_id(worktree, repo,
9937 branch_head_commit_id);
9941 error = got_pathlist_append(&paths, "", NULL);
9944 error = got_worktree_checkout_files(worktree,
9945 &paths, repo, update_progress, &upa,
9946 check_cancelled, NULL);
9947 got_pathlist_free(&paths);
9950 if (upa.did_something) {
9952 error = got_object_id_str(&id_str,
9953 branch_head_commit_id);
9956 printf("Updated to %s: %s\n",
9957 got_worktree_get_head_ref_name(worktree),
9961 printf("Already up-to-date\n");
9962 print_update_progress_stats(&upa);
9967 commit_id = branch_head_commit_id;
9968 error = got_object_open_as_commit(&commit, repo, commit_id);
9972 parent_ids = got_object_commit_get_parent_ids(commit);
9973 pid = STAILQ_FIRST(parent_ids);
9975 error = got_error(GOT_ERR_EMPTY_REBASE);
9978 error = collect_commits(&commits, commit_id, &pid->id,
9979 yca_id, got_worktree_get_path_prefix(worktree),
9980 GOT_ERR_REBASE_PATH, repo);
9981 got_object_commit_close(commit);
9986 if (!continue_rebase) {
9987 error = got_worktree_rebase_prepare(&new_base_branch,
9988 &tmp_branch, &fileindex, worktree, branch, repo);
9993 if (STAILQ_EMPTY(&commits)) {
9994 if (continue_rebase) {
9995 error = rebase_complete(worktree, fileindex,
9996 branch, new_base_branch, tmp_branch, repo,
10000 /* Fast-forward the reference of the branch. */
10001 struct got_object_id *new_head_commit_id;
10003 error = got_ref_resolve(&new_head_commit_id, repo,
10007 error = got_object_id_str(&id_str, new_head_commit_id);
10008 printf("Forwarding %s to commit %s\n",
10009 got_ref_get_name(branch), id_str);
10011 error = got_ref_change_ref(branch,
10012 new_head_commit_id);
10015 /* No backup needed since objects did not change. */
10021 STAILQ_FOREACH(qid, &commits, entry) {
10023 commit_id = &qid->id;
10024 parent_id = pid ? &pid->id : yca_id;
10027 memset(&upa, 0, sizeof(upa));
10028 error = got_worktree_rebase_merge_files(&merged_paths,
10029 worktree, fileindex, parent_id, commit_id, repo,
10030 update_progress, &upa, check_cancelled, NULL);
10034 print_merge_progress_stats(&upa);
10035 if (upa.conflicts > 0 || upa.missing > 0 ||
10036 upa.not_deleted > 0 || upa.unversioned > 0) {
10037 if (upa.conflicts > 0) {
10038 error = show_rebase_merge_conflict(&qid->id,
10043 got_worktree_rebase_pathlist_free(&merged_paths);
10047 error = rebase_commit(&merged_paths, worktree, fileindex,
10048 tmp_branch, commit_id, repo);
10049 got_worktree_rebase_pathlist_free(&merged_paths);
10054 if (upa.conflicts > 0 || upa.missing > 0 ||
10055 upa.not_deleted > 0 || upa.unversioned > 0) {
10056 error = got_worktree_rebase_postpone(worktree, fileindex);
10059 if (upa.conflicts > 0 && upa.missing == 0 &&
10060 upa.not_deleted == 0 && upa.unversioned == 0) {
10061 error = got_error_msg(GOT_ERR_CONFLICTS,
10062 "conflicts must be resolved before rebasing "
10064 } else if (upa.conflicts > 0) {
10065 error = got_error_msg(GOT_ERR_CONFLICTS,
10066 "conflicts must be resolved before rebasing "
10067 "can continue; changes destined for some "
10068 "files were not yet merged and should be "
10069 "merged manually if required before the "
10070 "rebase operation is continued");
10072 error = got_error_msg(GOT_ERR_CONFLICTS,
10073 "changes destined for some files were not "
10074 "yet merged and should be merged manually "
10075 "if required before the rebase operation "
10079 error = rebase_complete(worktree, fileindex, branch,
10080 new_base_branch, tmp_branch, repo, create_backup);
10082 got_object_id_queue_free(&commits);
10083 free(branch_head_commit_id);
10084 free(resume_commit_id);
10087 got_object_commit_close(commit);
10089 got_ref_close(branch);
10090 if (new_base_branch)
10091 got_ref_close(new_base_branch);
10093 got_ref_close(tmp_branch);
10095 got_worktree_close(worktree);
10097 const struct got_error *close_err = got_repo_close(repo);
10102 const struct got_error *pack_err =
10103 got_repo_pack_fds_close(pack_fds);
10111 usage_histedit(void)
10113 fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
10114 "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
10119 #define GOT_HISTEDIT_PICK 'p'
10120 #define GOT_HISTEDIT_EDIT 'e'
10121 #define GOT_HISTEDIT_FOLD 'f'
10122 #define GOT_HISTEDIT_DROP 'd'
10123 #define GOT_HISTEDIT_MESG 'm'
10125 static const struct got_histedit_cmd {
10126 unsigned char code;
10129 } got_histedit_cmds[] = {
10130 { GOT_HISTEDIT_PICK, "pick", "use commit" },
10131 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
10132 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
10134 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
10135 { GOT_HISTEDIT_MESG, "mesg",
10136 "single-line log message for commit above (open editor if empty)" },
10139 struct got_histedit_list_entry {
10140 TAILQ_ENTRY(got_histedit_list_entry) entry;
10141 struct got_object_id *commit_id;
10142 const struct got_histedit_cmd *cmd;
10145 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
10147 static const struct got_error *
10148 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
10149 FILE *f, struct got_repository *repo)
10151 const struct got_error *err = NULL;
10152 char *logmsg = NULL, *id_str = NULL;
10153 struct got_commit_object *commit = NULL;
10156 err = got_object_open_as_commit(&commit, repo, commit_id);
10160 err = get_short_logmsg(&logmsg, 34, commit);
10164 err = got_object_id_str(&id_str, commit_id);
10168 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
10170 err = got_ferror(f, GOT_ERR_IO);
10173 got_object_commit_close(commit);
10179 static const struct got_error *
10180 histedit_write_commit_list(struct got_object_id_queue *commits,
10181 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
10182 struct got_repository *repo)
10184 const struct got_error *err = NULL;
10185 struct got_object_qid *qid;
10186 const char *histedit_cmd = NULL;
10188 if (STAILQ_EMPTY(commits))
10189 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10191 STAILQ_FOREACH(qid, commits, entry) {
10192 histedit_cmd = got_histedit_cmds[0].name;
10194 histedit_cmd = "edit";
10195 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
10196 histedit_cmd = "fold";
10197 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
10200 if (edit_logmsg_only) {
10201 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
10203 err = got_ferror(f, GOT_ERR_IO);
10212 static const struct got_error *
10213 write_cmd_list(FILE *f, const char *branch_name,
10214 struct got_object_id_queue *commits)
10216 const struct got_error *err = NULL;
10220 struct got_object_qid *qid;
10222 qid = STAILQ_FIRST(commits);
10223 err = got_object_id_str(&id_str, &qid->id);
10228 "# Editing the history of branch '%s' starting at\n"
10230 "# Commits will be processed in order from top to "
10231 "bottom of this file.\n", branch_name, id_str);
10233 err = got_ferror(f, GOT_ERR_IO);
10237 n = fprintf(f, "# Available histedit commands:\n");
10239 err = got_ferror(f, GOT_ERR_IO);
10243 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10244 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
10245 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
10248 err = got_ferror(f, GOT_ERR_IO);
10257 static const struct got_error *
10258 histedit_syntax_error(int lineno)
10260 static char msg[42];
10263 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
10265 if (ret == -1 || ret >= sizeof(msg))
10266 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
10268 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
10271 static const struct got_error *
10272 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
10273 char *logmsg, struct got_repository *repo)
10275 const struct got_error *err;
10276 struct got_commit_object *folded_commit = NULL;
10277 char *id_str, *folded_logmsg = NULL;
10279 err = got_object_id_str(&id_str, hle->commit_id);
10283 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
10287 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
10290 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
10291 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
10292 folded_logmsg) == -1) {
10293 err = got_error_from_errno("asprintf");
10297 got_object_commit_close(folded_commit);
10299 free(folded_logmsg);
10303 static struct got_histedit_list_entry *
10304 get_folded_commits(struct got_histedit_list_entry *hle)
10306 struct got_histedit_list_entry *prev, *folded = NULL;
10308 prev = TAILQ_PREV(hle, got_histedit_list, entry);
10309 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
10310 prev->cmd->code == GOT_HISTEDIT_DROP)) {
10311 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
10313 prev = TAILQ_PREV(prev, got_histedit_list, entry);
10319 static const struct got_error *
10320 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
10321 struct got_repository *repo)
10323 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
10324 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
10325 const struct got_error *err = NULL;
10326 struct got_commit_object *commit = NULL;
10329 struct got_histedit_list_entry *folded = NULL;
10331 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10335 folded = get_folded_commits(hle);
10337 while (folded != hle) {
10338 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
10339 folded = TAILQ_NEXT(folded, entry);
10342 err = append_folded_commit_msg(&new_msg, folded,
10348 folded = TAILQ_NEXT(folded, entry);
10352 err = got_object_id_str(&id_str, hle->commit_id);
10355 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
10358 logmsg_len = asprintf(&new_msg,
10359 "%s\n# original log message of commit %s: %s",
10360 logmsg ? logmsg : "", id_str, orig_logmsg);
10361 if (logmsg_len == -1) {
10362 err = got_error_from_errno("asprintf");
10368 err = got_object_id_str(&id_str, hle->commit_id);
10372 err = got_opentemp_named_fd(&logmsg_path, &fd,
10373 GOT_TMPDIR_STR "/got-logmsg");
10377 write(fd, logmsg, logmsg_len);
10380 err = get_editor(&editor);
10384 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
10387 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
10390 hle->logmsg = strdup(new_msg);
10391 if (hle->logmsg == NULL)
10392 err = got_error_from_errno("strdup");
10395 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
10396 err = got_error_from_errno2("unlink", logmsg_path);
10402 got_object_commit_close(commit);
10406 static const struct got_error *
10407 histedit_parse_list(struct got_histedit_list *histedit_cmds,
10408 FILE *f, struct got_repository *repo)
10410 const struct got_error *err = NULL;
10411 char *line = NULL, *p, *end;
10415 const struct got_histedit_cmd *cmd;
10416 struct got_object_id *commit_id = NULL;
10417 struct got_histedit_list_entry *hle = NULL;
10420 len = getline(&line, &size, f);
10422 const struct got_error *getline_err;
10425 getline_err = got_error_from_errno("getline");
10426 err = got_ferror(f, getline_err->code);
10431 while (isspace((unsigned char)p[0]))
10433 if (p[0] == '#' || p[0] == '\0') {
10439 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10440 cmd = &got_histedit_cmds[i];
10441 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10442 isspace((unsigned char)p[strlen(cmd->name)])) {
10443 p += strlen(cmd->name);
10446 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
10451 if (i == nitems(got_histedit_cmds)) {
10452 err = histedit_syntax_error(lineno);
10455 while (isspace((unsigned char)p[0]))
10457 if (cmd->code == GOT_HISTEDIT_MESG) {
10458 if (hle == NULL || hle->logmsg != NULL) {
10459 err = got_error(GOT_ERR_HISTEDIT_CMD);
10462 if (p[0] == '\0') {
10463 err = histedit_edit_logmsg(hle, repo);
10467 hle->logmsg = strdup(p);
10468 if (hle->logmsg == NULL) {
10469 err = got_error_from_errno("strdup");
10478 while (end[0] && !isspace((unsigned char)end[0]))
10482 err = got_object_resolve_id_str(&commit_id, repo, p);
10484 /* override error code */
10485 err = histedit_syntax_error(lineno);
10489 hle = malloc(sizeof(*hle));
10491 err = got_error_from_errno("malloc");
10495 hle->commit_id = commit_id;
10496 hle->logmsg = NULL;
10500 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10508 static const struct got_error *
10509 histedit_check_script(struct got_histedit_list *histedit_cmds,
10510 struct got_object_id_queue *commits, struct got_repository *repo)
10512 const struct got_error *err = NULL;
10513 struct got_object_qid *qid;
10514 struct got_histedit_list_entry *hle;
10515 static char msg[92];
10518 if (TAILQ_EMPTY(histedit_cmds))
10519 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10520 "histedit script contains no commands");
10521 if (STAILQ_EMPTY(commits))
10522 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10524 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10525 struct got_histedit_list_entry *hle2;
10526 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10529 if (got_object_id_cmp(hle->commit_id,
10530 hle2->commit_id) != 0)
10532 err = got_object_id_str(&id_str, hle->commit_id);
10535 snprintf(msg, sizeof(msg), "commit %s is listed "
10536 "more than once in histedit script", id_str);
10538 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10542 STAILQ_FOREACH(qid, commits, entry) {
10543 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10544 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
10548 err = got_object_id_str(&id_str, &qid->id);
10551 snprintf(msg, sizeof(msg),
10552 "commit %s missing from histedit script", id_str);
10554 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10558 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10559 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10560 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10561 "last commit in histedit script cannot be folded");
10566 static const struct got_error *
10567 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10568 const char *path, struct got_object_id_queue *commits,
10569 struct got_repository *repo)
10571 const struct got_error *err = NULL;
10575 err = get_editor(&editor);
10579 if (spawn_editor(editor, path) == -1) {
10580 err = got_error_from_errno("failed spawning editor");
10584 f = fopen(path, "re");
10586 err = got_error_from_errno("fopen");
10589 err = histedit_parse_list(histedit_cmds, f, repo);
10593 err = histedit_check_script(histedit_cmds, commits, repo);
10595 if (f && fclose(f) == EOF && err == NULL)
10596 err = got_error_from_errno("fclose");
10601 static const struct got_error *
10602 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10603 struct got_object_id_queue *, const char *, const char *,
10604 struct got_repository *);
10606 static const struct got_error *
10607 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10608 struct got_object_id_queue *commits, const char *branch_name,
10609 int edit_logmsg_only, int fold_only, int edit_only,
10610 struct got_repository *repo)
10612 const struct got_error *err;
10616 err = got_opentemp_named(&path, &f, "got-histedit");
10620 err = write_cmd_list(f, branch_name, commits);
10624 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10625 fold_only, edit_only, repo);
10629 if (edit_logmsg_only || fold_only || edit_only) {
10631 err = histedit_parse_list(histedit_cmds, f, repo);
10633 if (fclose(f) == EOF) {
10634 err = got_error_from_errno("fclose");
10638 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10640 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10641 err->code != GOT_ERR_HISTEDIT_CMD)
10643 err = histedit_edit_list_retry(histedit_cmds, err,
10644 commits, path, branch_name, repo);
10648 if (f && fclose(f) == EOF && err == NULL)
10649 err = got_error_from_errno("fclose");
10650 if (path && unlink(path) != 0 && err == NULL)
10651 err = got_error_from_errno2("unlink", path);
10656 static const struct got_error *
10657 histedit_save_list(struct got_histedit_list *histedit_cmds,
10658 struct got_worktree *worktree, struct got_repository *repo)
10660 const struct got_error *err = NULL;
10663 struct got_histedit_list_entry *hle;
10664 struct got_commit_object *commit = NULL;
10666 err = got_worktree_get_histedit_script_path(&path, worktree);
10670 f = fopen(path, "we");
10672 err = got_error_from_errno2("fopen", path);
10675 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10676 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10682 int n = fprintf(f, "%c %s\n",
10683 GOT_HISTEDIT_MESG, hle->logmsg);
10685 err = got_ferror(f, GOT_ERR_IO);
10691 if (f && fclose(f) == EOF && err == NULL)
10692 err = got_error_from_errno("fclose");
10695 got_object_commit_close(commit);
10700 histedit_free_list(struct got_histedit_list *histedit_cmds)
10702 struct got_histedit_list_entry *hle;
10704 while ((hle = TAILQ_FIRST(histedit_cmds))) {
10705 TAILQ_REMOVE(histedit_cmds, hle, entry);
10710 static const struct got_error *
10711 histedit_load_list(struct got_histedit_list *histedit_cmds,
10712 const char *path, struct got_repository *repo)
10714 const struct got_error *err = NULL;
10717 f = fopen(path, "re");
10719 err = got_error_from_errno2("fopen", path);
10723 err = histedit_parse_list(histedit_cmds, f, repo);
10725 if (f && fclose(f) == EOF && err == NULL)
10726 err = got_error_from_errno("fclose");
10730 static const struct got_error *
10731 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10732 const struct got_error *edit_err, struct got_object_id_queue *commits,
10733 const char *path, const char *branch_name, struct got_repository *repo)
10735 const struct got_error *err = NULL, *prev_err = edit_err;
10738 while (resp != 'c' && resp != 'r' && resp != 'a') {
10739 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10740 "or (a)bort: ", getprogname(), prev_err->msg);
10745 histedit_free_list(histedit_cmds);
10746 err = histedit_run_editor(histedit_cmds, path, commits,
10749 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10750 err->code != GOT_ERR_HISTEDIT_CMD)
10757 } else if (resp == 'r') {
10758 histedit_free_list(histedit_cmds);
10759 err = histedit_edit_script(histedit_cmds,
10760 commits, branch_name, 0, 0, 0, repo);
10762 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10763 err->code != GOT_ERR_HISTEDIT_CMD)
10770 } else if (resp == 'a') {
10771 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10774 printf("invalid response '%c'\n", resp);
10780 static const struct got_error *
10781 histedit_complete(struct got_worktree *worktree,
10782 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10783 struct got_reference *branch, struct got_repository *repo)
10785 printf("Switching work tree to %s\n",
10786 got_ref_get_symref_target(branch));
10787 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10791 static const struct got_error *
10792 show_histedit_progress(struct got_commit_object *commit,
10793 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10795 const struct got_error *err;
10796 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10798 err = got_object_id_str(&old_id_str, hle->commit_id);
10803 err = got_object_id_str(&new_id_str, new_id);
10808 old_id_str[12] = '\0';
10810 new_id_str[12] = '\0';
10813 logmsg = strdup(hle->logmsg);
10814 if (logmsg == NULL) {
10815 err = got_error_from_errno("strdup");
10818 trim_logmsg(logmsg, 42);
10820 err = get_short_logmsg(&logmsg, 42, commit);
10825 switch (hle->cmd->code) {
10826 case GOT_HISTEDIT_PICK:
10827 case GOT_HISTEDIT_EDIT:
10828 printf("%s -> %s: %s\n", old_id_str,
10829 new_id_str ? new_id_str : "no-op change", logmsg);
10831 case GOT_HISTEDIT_DROP:
10832 case GOT_HISTEDIT_FOLD:
10833 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
10845 static const struct got_error *
10846 histedit_commit(struct got_pathlist_head *merged_paths,
10847 struct got_worktree *worktree, struct got_fileindex *fileindex,
10848 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10849 struct got_repository *repo)
10851 const struct got_error *err;
10852 struct got_commit_object *commit;
10853 struct got_object_id *new_commit_id;
10855 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10856 && hle->logmsg == NULL) {
10857 err = histedit_edit_logmsg(hle, repo);
10862 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10866 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10867 worktree, fileindex, tmp_branch, commit, hle->commit_id,
10868 hle->logmsg, repo);
10870 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10872 err = show_histedit_progress(commit, hle, NULL);
10874 err = show_histedit_progress(commit, hle, new_commit_id);
10875 free(new_commit_id);
10878 got_object_commit_close(commit);
10882 static const struct got_error *
10883 histedit_skip_commit(struct got_histedit_list_entry *hle,
10884 struct got_worktree *worktree, struct got_repository *repo)
10886 const struct got_error *error;
10887 struct got_commit_object *commit;
10889 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10894 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10898 error = show_histedit_progress(commit, hle, NULL);
10899 got_object_commit_close(commit);
10903 static const struct got_error *
10904 check_local_changes(void *arg, unsigned char status,
10905 unsigned char staged_status, const char *path,
10906 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10907 struct got_object_id *commit_id, int dirfd, const char *de_name)
10909 int *have_local_changes = arg;
10912 case GOT_STATUS_ADD:
10913 case GOT_STATUS_DELETE:
10914 case GOT_STATUS_MODIFY:
10915 case GOT_STATUS_CONFLICT:
10916 *have_local_changes = 1;
10917 return got_error(GOT_ERR_CANCELLED);
10922 switch (staged_status) {
10923 case GOT_STATUS_ADD:
10924 case GOT_STATUS_DELETE:
10925 case GOT_STATUS_MODIFY:
10926 *have_local_changes = 1;
10927 return got_error(GOT_ERR_CANCELLED);
10935 static const struct got_error *
10936 cmd_histedit(int argc, char *argv[])
10938 const struct got_error *error = NULL;
10939 struct got_worktree *worktree = NULL;
10940 struct got_fileindex *fileindex = NULL;
10941 struct got_repository *repo = NULL;
10943 struct got_reference *branch = NULL;
10944 struct got_reference *tmp_branch = NULL;
10945 struct got_object_id *resume_commit_id = NULL;
10946 struct got_object_id *base_commit_id = NULL;
10947 struct got_object_id *head_commit_id = NULL;
10948 struct got_commit_object *commit = NULL;
10949 int ch, rebase_in_progress = 0, merge_in_progress = 0;
10950 struct got_update_progress_arg upa;
10951 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10952 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10953 int list_backups = 0, delete_backups = 0;
10954 const char *edit_script_path = NULL;
10955 struct got_object_id_queue commits;
10956 struct got_pathlist_head merged_paths;
10957 const struct got_object_id_queue *parent_ids;
10958 struct got_object_qid *pid;
10959 struct got_histedit_list histedit_cmds;
10960 struct got_histedit_list_entry *hle;
10961 int *pack_fds = NULL;
10963 STAILQ_INIT(&commits);
10964 TAILQ_INIT(&histedit_cmds);
10965 TAILQ_INIT(&merged_paths);
10966 memset(&upa, 0, sizeof(upa));
10968 while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10983 edit_script_path = optarg;
10986 edit_logmsg_only = 1;
10992 delete_backups = 1;
11004 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11005 "unveil", NULL) == -1)
11008 if (abort_edit && continue_edit)
11009 option_conflict('a', 'c');
11010 if (edit_script_path && edit_logmsg_only)
11011 option_conflict('F', 'm');
11012 if (abort_edit && edit_logmsg_only)
11013 option_conflict('a', 'm');
11014 if (continue_edit && edit_logmsg_only)
11015 option_conflict('c', 'm');
11016 if (abort_edit && fold_only)
11017 option_conflict('a', 'f');
11018 if (continue_edit && fold_only)
11019 option_conflict('c', 'f');
11020 if (fold_only && edit_logmsg_only)
11021 option_conflict('f', 'm');
11022 if (edit_script_path && fold_only)
11023 option_conflict('F', 'f');
11024 if (abort_edit && edit_only)
11025 option_conflict('a', 'e');
11026 if (continue_edit && edit_only)
11027 option_conflict('c', 'e');
11028 if (edit_only && edit_logmsg_only)
11029 option_conflict('e', 'm');
11030 if (edit_script_path && edit_only)
11031 option_conflict('F', 'e');
11032 if (list_backups) {
11034 option_conflict('l', 'a');
11036 option_conflict('l', 'c');
11037 if (edit_script_path)
11038 option_conflict('l', 'F');
11039 if (edit_logmsg_only)
11040 option_conflict('l', 'm');
11042 option_conflict('l', 'f');
11044 option_conflict('l', 'e');
11045 if (delete_backups)
11046 option_conflict('l', 'X');
11047 if (argc != 0 && argc != 1)
11049 } else if (delete_backups) {
11051 option_conflict('X', 'a');
11053 option_conflict('X', 'c');
11054 if (edit_script_path)
11055 option_conflict('X', 'F');
11056 if (edit_logmsg_only)
11057 option_conflict('X', 'm');
11059 option_conflict('X', 'f');
11061 option_conflict('X', 'e');
11063 option_conflict('X', 'l');
11064 if (argc != 0 && argc != 1)
11066 } else if (argc != 0)
11070 * This command cannot apply unveil(2) in all cases because the
11071 * user may choose to run an editor to edit the histedit script
11072 * and to edit individual commit log messages.
11073 * unveil(2) traverses exec(2); if an editor is used we have to
11074 * apply unveil after edit script and log messages have been written.
11075 * XXX TODO: Make use of unveil(2) where possible.
11078 cwd = getcwd(NULL, 0);
11080 error = got_error_from_errno("getcwd");
11084 error = got_repo_pack_fds_open(&pack_fds);
11088 error = got_worktree_open(&worktree, cwd);
11090 if (list_backups || delete_backups) {
11091 if (error->code != GOT_ERR_NOT_WORKTREE)
11094 if (error->code == GOT_ERR_NOT_WORKTREE)
11095 error = wrap_not_worktree_error(error,
11101 if (list_backups || delete_backups) {
11102 error = got_repo_open(&repo,
11103 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11107 error = apply_unveil(got_repo_get_path(repo), 0,
11108 worktree ? got_worktree_get_root_path(worktree) : NULL);
11111 error = process_backup_refs(
11112 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
11113 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11114 goto done; /* nothing else to do */
11117 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11122 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11125 if (rebase_in_progress) {
11126 error = got_error(GOT_ERR_REBASING);
11130 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11134 if (merge_in_progress) {
11135 error = got_error(GOT_ERR_MERGE_BUSY);
11139 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
11143 if (edit_in_progress && edit_logmsg_only) {
11144 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11145 "histedit operation is in progress in this "
11146 "work tree and must be continued or aborted "
11147 "before the -m option can be used");
11150 if (edit_in_progress && fold_only) {
11151 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11152 "histedit operation is in progress in this "
11153 "work tree and must be continued or aborted "
11154 "before the -f option can be used");
11157 if (edit_in_progress && edit_only) {
11158 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
11159 "histedit operation is in progress in this "
11160 "work tree and must be continued or aborted "
11161 "before the -e option can be used");
11165 if (edit_in_progress && abort_edit) {
11166 error = got_worktree_histedit_continue(&resume_commit_id,
11167 &tmp_branch, &branch, &base_commit_id, &fileindex,
11171 printf("Switching work tree to %s\n",
11172 got_ref_get_symref_target(branch));
11173 error = got_worktree_histedit_abort(worktree, fileindex, repo,
11174 branch, base_commit_id, abort_progress, &upa);
11177 printf("Histedit of %s aborted\n",
11178 got_ref_get_symref_target(branch));
11179 print_merge_progress_stats(&upa);
11180 goto done; /* nothing else to do */
11181 } else if (abort_edit) {
11182 error = got_error(GOT_ERR_NOT_HISTEDIT);
11186 if (continue_edit) {
11189 if (!edit_in_progress) {
11190 error = got_error(GOT_ERR_NOT_HISTEDIT);
11194 error = got_worktree_get_histedit_script_path(&path, worktree);
11198 error = histedit_load_list(&histedit_cmds, path, repo);
11203 error = got_worktree_histedit_continue(&resume_commit_id,
11204 &tmp_branch, &branch, &base_commit_id, &fileindex,
11209 error = got_ref_resolve(&head_commit_id, repo, branch);
11213 error = got_object_open_as_commit(&commit, repo,
11217 parent_ids = got_object_commit_get_parent_ids(commit);
11218 pid = STAILQ_FIRST(parent_ids);
11220 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11223 error = collect_commits(&commits, head_commit_id, &pid->id,
11224 base_commit_id, got_worktree_get_path_prefix(worktree),
11225 GOT_ERR_HISTEDIT_PATH, repo);
11226 got_object_commit_close(commit);
11231 if (edit_in_progress) {
11232 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11236 error = got_ref_open(&branch, repo,
11237 got_worktree_get_head_ref_name(worktree), 0);
11241 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11242 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11243 "will not edit commit history of a branch outside "
11244 "the \"refs/heads/\" reference namespace");
11248 error = got_ref_resolve(&head_commit_id, repo, branch);
11249 got_ref_close(branch);
11254 error = got_object_open_as_commit(&commit, repo,
11258 parent_ids = got_object_commit_get_parent_ids(commit);
11259 pid = STAILQ_FIRST(parent_ids);
11261 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11264 error = collect_commits(&commits, head_commit_id, &pid->id,
11265 got_worktree_get_base_commit_id(worktree),
11266 got_worktree_get_path_prefix(worktree),
11267 GOT_ERR_HISTEDIT_PATH, repo);
11268 got_object_commit_close(commit);
11273 if (STAILQ_EMPTY(&commits)) {
11274 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
11278 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
11279 &base_commit_id, &fileindex, worktree, repo);
11283 if (edit_script_path) {
11284 error = histedit_load_list(&histedit_cmds,
11285 edit_script_path, repo);
11287 got_worktree_histedit_abort(worktree, fileindex,
11288 repo, branch, base_commit_id,
11289 abort_progress, &upa);
11290 print_merge_progress_stats(&upa);
11294 const char *branch_name;
11295 branch_name = got_ref_get_symref_target(branch);
11296 if (strncmp(branch_name, "refs/heads/", 11) == 0)
11298 error = histedit_edit_script(&histedit_cmds, &commits,
11299 branch_name, edit_logmsg_only, fold_only,
11302 got_worktree_histedit_abort(worktree, fileindex,
11303 repo, branch, base_commit_id,
11304 abort_progress, &upa);
11305 print_merge_progress_stats(&upa);
11311 error = histedit_save_list(&histedit_cmds, worktree,
11314 got_worktree_histedit_abort(worktree, fileindex,
11315 repo, branch, base_commit_id,
11316 abort_progress, &upa);
11317 print_merge_progress_stats(&upa);
11323 error = histedit_check_script(&histedit_cmds, &commits, repo);
11327 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
11328 if (resume_commit_id) {
11329 if (got_object_id_cmp(hle->commit_id,
11330 resume_commit_id) != 0)
11333 resume_commit_id = NULL;
11334 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
11335 hle->cmd->code == GOT_HISTEDIT_FOLD) {
11336 error = histedit_skip_commit(hle, worktree,
11341 struct got_pathlist_head paths;
11342 int have_changes = 0;
11344 TAILQ_INIT(&paths);
11345 error = got_pathlist_append(&paths, "", NULL);
11348 error = got_worktree_status(worktree, &paths,
11349 repo, 0, check_local_changes, &have_changes,
11350 check_cancelled, NULL);
11351 got_pathlist_free(&paths);
11353 if (error->code != GOT_ERR_CANCELLED)
11355 if (sigint_received || sigpipe_received)
11358 if (have_changes) {
11359 error = histedit_commit(NULL, worktree,
11360 fileindex, tmp_branch, hle, repo);
11364 error = got_object_open_as_commit(
11365 &commit, repo, hle->commit_id);
11368 error = show_histedit_progress(commit,
11370 got_object_commit_close(commit);
11379 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
11380 error = histedit_skip_commit(hle, worktree, repo);
11386 error = got_object_open_as_commit(&commit, repo,
11390 parent_ids = got_object_commit_get_parent_ids(commit);
11391 pid = STAILQ_FIRST(parent_ids);
11393 error = got_worktree_histedit_merge_files(&merged_paths,
11394 worktree, fileindex, &pid->id, hle->commit_id, repo,
11395 update_progress, &upa, check_cancelled, NULL);
11398 got_object_commit_close(commit);
11401 print_merge_progress_stats(&upa);
11402 if (upa.conflicts > 0 || upa.missing > 0 ||
11403 upa.not_deleted > 0 || upa.unversioned > 0) {
11404 if (upa.conflicts > 0) {
11405 error = show_rebase_merge_conflict(
11406 hle->commit_id, repo);
11410 got_worktree_rebase_pathlist_free(&merged_paths);
11414 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
11416 error = got_object_id_str(&id_str, hle->commit_id);
11419 printf("Stopping histedit for amending commit %s\n",
11422 got_worktree_rebase_pathlist_free(&merged_paths);
11423 error = got_worktree_histedit_postpone(worktree,
11428 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11429 error = histedit_skip_commit(hle, worktree, repo);
11435 error = histedit_commit(&merged_paths, worktree, fileindex,
11436 tmp_branch, hle, repo);
11437 got_worktree_rebase_pathlist_free(&merged_paths);
11442 if (upa.conflicts > 0 || upa.missing > 0 ||
11443 upa.not_deleted > 0 || upa.unversioned > 0) {
11444 error = got_worktree_histedit_postpone(worktree, fileindex);
11447 if (upa.conflicts > 0 && upa.missing == 0 &&
11448 upa.not_deleted == 0 && upa.unversioned == 0) {
11449 error = got_error_msg(GOT_ERR_CONFLICTS,
11450 "conflicts must be resolved before histedit "
11452 } else if (upa.conflicts > 0) {
11453 error = got_error_msg(GOT_ERR_CONFLICTS,
11454 "conflicts must be resolved before histedit "
11455 "can continue; changes destined for some "
11456 "files were not yet merged and should be "
11457 "merged manually if required before the "
11458 "histedit operation is continued");
11460 error = got_error_msg(GOT_ERR_CONFLICTS,
11461 "changes destined for some files were not "
11462 "yet merged and should be merged manually "
11463 "if required before the histedit operation "
11467 error = histedit_complete(worktree, fileindex, tmp_branch,
11470 got_object_id_queue_free(&commits);
11471 histedit_free_list(&histedit_cmds);
11472 free(head_commit_id);
11473 free(base_commit_id);
11474 free(resume_commit_id);
11476 got_object_commit_close(commit);
11478 got_ref_close(branch);
11480 got_ref_close(tmp_branch);
11482 got_worktree_close(worktree);
11484 const struct got_error *close_err = got_repo_close(repo);
11489 const struct got_error *pack_err =
11490 got_repo_pack_fds_close(pack_fds);
11498 usage_integrate(void)
11500 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
11504 static const struct got_error *
11505 cmd_integrate(int argc, char *argv[])
11507 const struct got_error *error = NULL;
11508 struct got_repository *repo = NULL;
11509 struct got_worktree *worktree = NULL;
11510 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
11511 const char *branch_arg = NULL;
11512 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11513 struct got_fileindex *fileindex = NULL;
11514 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11516 struct got_update_progress_arg upa;
11517 int *pack_fds = NULL;
11519 while ((ch = getopt(argc, argv, "")) != -1) {
11532 branch_arg = argv[0];
11534 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11535 "unveil", NULL) == -1)
11538 cwd = getcwd(NULL, 0);
11540 error = got_error_from_errno("getcwd");
11544 error = got_repo_pack_fds_open(&pack_fds);
11548 error = got_worktree_open(&worktree, cwd);
11550 if (error->code == GOT_ERR_NOT_WORKTREE)
11551 error = wrap_not_worktree_error(error, "integrate",
11556 error = check_rebase_or_histedit_in_progress(worktree);
11560 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11565 error = apply_unveil(got_repo_get_path(repo), 0,
11566 got_worktree_get_root_path(worktree));
11570 error = check_merge_in_progress(worktree, repo);
11574 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11575 error = got_error_from_errno("asprintf");
11579 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11580 &base_branch_ref, worktree, refname, repo);
11584 refname = strdup(got_ref_get_name(branch_ref));
11585 if (refname == NULL) {
11586 error = got_error_from_errno("strdup");
11587 got_worktree_integrate_abort(worktree, fileindex, repo,
11588 branch_ref, base_branch_ref);
11591 base_refname = strdup(got_ref_get_name(base_branch_ref));
11592 if (base_refname == NULL) {
11593 error = got_error_from_errno("strdup");
11594 got_worktree_integrate_abort(worktree, fileindex, repo,
11595 branch_ref, base_branch_ref);
11599 error = got_ref_resolve(&commit_id, repo, branch_ref);
11603 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11607 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11608 error = got_error_msg(GOT_ERR_SAME_BRANCH,
11609 "specified branch has already been integrated");
11610 got_worktree_integrate_abort(worktree, fileindex, repo,
11611 branch_ref, base_branch_ref);
11615 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11617 if (error->code == GOT_ERR_ANCESTRY)
11618 error = got_error(GOT_ERR_REBASE_REQUIRED);
11619 got_worktree_integrate_abort(worktree, fileindex, repo,
11620 branch_ref, base_branch_ref);
11624 memset(&upa, 0, sizeof(upa));
11625 error = got_worktree_integrate_continue(worktree, fileindex, repo,
11626 branch_ref, base_branch_ref, update_progress, &upa,
11627 check_cancelled, NULL);
11631 printf("Integrated %s into %s\n", refname, base_refname);
11632 print_update_progress_stats(&upa);
11635 const struct got_error *close_err = got_repo_close(repo);
11640 got_worktree_close(worktree);
11642 const struct got_error *pack_err =
11643 got_repo_pack_fds_close(pack_fds);
11648 free(base_commit_id);
11651 free(base_refname);
11658 fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11663 static const struct got_error *
11664 cmd_merge(int argc, char *argv[])
11666 const struct got_error *error = NULL;
11667 struct got_worktree *worktree = NULL;
11668 struct got_repository *repo = NULL;
11669 struct got_fileindex *fileindex = NULL;
11670 char *cwd = NULL, *id_str = NULL, *author = NULL;
11671 struct got_reference *branch = NULL, *wt_branch = NULL;
11672 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11673 struct got_object_id *wt_branch_tip = NULL;
11674 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11675 int interrupt_merge = 0;
11676 struct got_update_progress_arg upa;
11677 struct got_object_id *merge_commit_id = NULL;
11678 char *branch_name = NULL;
11679 int *pack_fds = NULL;
11681 memset(&upa, 0, sizeof(upa));
11683 while ((ch = getopt(argc, argv, "acn")) != -1) {
11689 continue_merge = 1;
11692 interrupt_merge = 1;
11704 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11705 "unveil", NULL) == -1)
11709 if (abort_merge && continue_merge)
11710 option_conflict('a', 'c');
11711 if (abort_merge || continue_merge) {
11714 } else if (argc != 1)
11717 cwd = getcwd(NULL, 0);
11719 error = got_error_from_errno("getcwd");
11723 error = got_repo_pack_fds_open(&pack_fds);
11727 error = got_worktree_open(&worktree, cwd);
11729 if (error->code == GOT_ERR_NOT_WORKTREE)
11730 error = wrap_not_worktree_error(error,
11735 error = got_repo_open(&repo,
11736 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL,
11741 error = apply_unveil(got_repo_get_path(repo), 0,
11742 worktree ? got_worktree_get_root_path(worktree) : NULL);
11746 error = check_rebase_or_histedit_in_progress(worktree);
11750 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11756 if (!merge_in_progress) {
11757 error = got_error(GOT_ERR_NOT_MERGING);
11760 error = got_worktree_merge_continue(&branch_name,
11761 &branch_tip, &fileindex, worktree, repo);
11764 error = got_worktree_merge_abort(worktree, fileindex, repo,
11765 abort_progress, &upa);
11768 printf("Merge of %s aborted\n", branch_name);
11769 goto done; /* nothing else to do */
11772 error = get_author(&author, repo, worktree);
11776 if (continue_merge) {
11777 if (!merge_in_progress) {
11778 error = got_error(GOT_ERR_NOT_MERGING);
11781 error = got_worktree_merge_continue(&branch_name,
11782 &branch_tip, &fileindex, worktree, repo);
11786 error = got_ref_open(&branch, repo, argv[0], 0);
11789 branch_name = strdup(got_ref_get_name(branch));
11790 if (branch_name == NULL) {
11791 error = got_error_from_errno("strdup");
11794 error = got_ref_resolve(&branch_tip, repo, branch);
11799 error = got_ref_open(&wt_branch, repo,
11800 got_worktree_get_head_ref_name(worktree), 0);
11803 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11806 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11807 wt_branch_tip, branch_tip, 0, repo,
11808 check_cancelled, NULL);
11809 if (error && error->code != GOT_ERR_ANCESTRY)
11812 if (!continue_merge) {
11813 error = check_path_prefix(wt_branch_tip, branch_tip,
11814 got_worktree_get_path_prefix(worktree),
11815 GOT_ERR_MERGE_PATH, repo);
11819 error = check_same_branch(wt_branch_tip, branch,
11822 if (error->code != GOT_ERR_ANCESTRY)
11826 static char msg[512];
11827 snprintf(msg, sizeof(msg),
11828 "cannot create a merge commit because "
11829 "%s is based on %s; %s can be integrated "
11830 "with 'got integrate' instead", branch_name,
11831 got_worktree_get_head_ref_name(worktree),
11833 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11837 error = got_worktree_merge_prepare(&fileindex, worktree,
11842 error = got_worktree_merge_branch(worktree, fileindex,
11843 yca_id, branch_tip, repo, update_progress, &upa,
11844 check_cancelled, NULL);
11847 print_merge_progress_stats(&upa);
11848 if (!upa.did_something) {
11849 error = got_worktree_merge_abort(worktree, fileindex,
11850 repo, abort_progress, &upa);
11853 printf("Already up-to-date\n");
11858 if (interrupt_merge) {
11859 error = got_worktree_merge_postpone(worktree, fileindex);
11862 printf("Merge of %s interrupted on request\n", branch_name);
11863 } else if (upa.conflicts > 0 || upa.missing > 0 ||
11864 upa.not_deleted > 0 || upa.unversioned > 0) {
11865 error = got_worktree_merge_postpone(worktree, fileindex);
11868 if (upa.conflicts > 0 && upa.missing == 0 &&
11869 upa.not_deleted == 0 && upa.unversioned == 0) {
11870 error = got_error_msg(GOT_ERR_CONFLICTS,
11871 "conflicts must be resolved before merging "
11873 } else if (upa.conflicts > 0) {
11874 error = got_error_msg(GOT_ERR_CONFLICTS,
11875 "conflicts must be resolved before merging "
11876 "can continue; changes destined for some "
11877 "files were not yet merged and "
11878 "should be merged manually if required before the "
11879 "merge operation is continued");
11881 error = got_error_msg(GOT_ERR_CONFLICTS,
11882 "changes destined for some "
11883 "files were not yet merged and should be "
11884 "merged manually if required before the "
11885 "merge operation is continued");
11889 error = got_worktree_merge_commit(&merge_commit_id, worktree,
11890 fileindex, author, NULL, 1, branch_tip, branch_name,
11891 repo, continue_merge ? print_status : NULL, NULL);
11894 error = got_worktree_merge_complete(worktree, fileindex, repo);
11897 error = got_object_id_str(&id_str, merge_commit_id);
11900 printf("Merged %s into %s: %s\n", branch_name,
11901 got_worktree_get_head_ref_name(worktree),
11907 free(merge_commit_id);
11913 got_ref_close(branch);
11915 got_ref_close(wt_branch);
11917 got_worktree_close(worktree);
11919 const struct got_error *close_err = got_repo_close(repo);
11924 const struct got_error *pack_err =
11925 got_repo_pack_fds_close(pack_fds);
11935 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11936 "[-S] [file-path ...]\n",
11941 static const struct got_error *
11942 print_stage(void *arg, unsigned char status, unsigned char staged_status,
11943 const char *path, struct got_object_id *blob_id,
11944 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11945 int dirfd, const char *de_name)
11947 const struct got_error *err = NULL;
11948 char *id_str = NULL;
11950 if (staged_status != GOT_STATUS_ADD &&
11951 staged_status != GOT_STATUS_MODIFY &&
11952 staged_status != GOT_STATUS_DELETE)
11955 if (staged_status == GOT_STATUS_ADD ||
11956 staged_status == GOT_STATUS_MODIFY)
11957 err = got_object_id_str(&id_str, staged_blob_id);
11959 err = got_object_id_str(&id_str, blob_id);
11963 printf("%s %c %s\n", id_str, staged_status, path);
11968 static const struct got_error *
11969 cmd_stage(int argc, char *argv[])
11971 const struct got_error *error = NULL;
11972 struct got_repository *repo = NULL;
11973 struct got_worktree *worktree = NULL;
11975 struct got_pathlist_head paths;
11976 struct got_pathlist_entry *pe;
11977 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11978 FILE *patch_script_file = NULL;
11979 const char *patch_script_path = NULL;
11980 struct choose_patch_arg cpa;
11981 int *pack_fds = NULL;
11983 TAILQ_INIT(&paths);
11985 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11994 patch_script_path = optarg;
11997 allow_bad_symlinks = 1;
12009 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12010 "unveil", NULL) == -1)
12013 if (list_stage && (pflag || patch_script_path))
12014 errx(1, "-l option cannot be used with other options");
12015 if (patch_script_path && !pflag)
12016 errx(1, "-F option can only be used together with -p option");
12018 cwd = getcwd(NULL, 0);
12020 error = got_error_from_errno("getcwd");
12024 error = got_repo_pack_fds_open(&pack_fds);
12028 error = got_worktree_open(&worktree, cwd);
12030 if (error->code == GOT_ERR_NOT_WORKTREE)
12031 error = wrap_not_worktree_error(error, "stage", cwd);
12035 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12040 if (patch_script_path) {
12041 patch_script_file = fopen(patch_script_path, "re");
12042 if (patch_script_file == NULL) {
12043 error = got_error_from_errno2("fopen",
12044 patch_script_path);
12048 error = apply_unveil(got_repo_get_path(repo), 0,
12049 got_worktree_get_root_path(worktree));
12053 error = check_merge_in_progress(worktree, repo);
12057 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12062 error = got_worktree_status(worktree, &paths, repo, 0,
12063 print_stage, NULL, check_cancelled, NULL);
12065 cpa.patch_script_file = patch_script_file;
12066 cpa.action = "stage";
12067 error = got_worktree_stage(worktree, &paths,
12068 pflag ? NULL : print_status, NULL,
12069 pflag ? choose_patch : NULL, &cpa,
12070 allow_bad_symlinks, repo);
12073 if (patch_script_file && fclose(patch_script_file) == EOF &&
12075 error = got_error_from_errno2("fclose", patch_script_path);
12077 const struct got_error *close_err = got_repo_close(repo);
12082 got_worktree_close(worktree);
12084 const struct got_error *pack_err =
12085 got_repo_pack_fds_close(pack_fds);
12089 TAILQ_FOREACH(pe, &paths, entry)
12090 free((char *)pe->path);
12091 got_pathlist_free(&paths);
12097 usage_unstage(void)
12099 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
12100 "[file-path ...]\n",
12106 static const struct got_error *
12107 cmd_unstage(int argc, char *argv[])
12109 const struct got_error *error = NULL;
12110 struct got_repository *repo = NULL;
12111 struct got_worktree *worktree = NULL;
12113 struct got_pathlist_head paths;
12114 struct got_pathlist_entry *pe;
12116 struct got_update_progress_arg upa;
12117 FILE *patch_script_file = NULL;
12118 const char *patch_script_path = NULL;
12119 struct choose_patch_arg cpa;
12120 int *pack_fds = NULL;
12122 TAILQ_INIT(&paths);
12124 while ((ch = getopt(argc, argv, "pF:")) != -1) {
12130 patch_script_path = optarg;
12142 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12143 "unveil", NULL) == -1)
12146 if (patch_script_path && !pflag)
12147 errx(1, "-F option can only be used together with -p option");
12149 cwd = getcwd(NULL, 0);
12151 error = got_error_from_errno("getcwd");
12155 error = got_repo_pack_fds_open(&pack_fds);
12159 error = got_worktree_open(&worktree, cwd);
12161 if (error->code == GOT_ERR_NOT_WORKTREE)
12162 error = wrap_not_worktree_error(error, "unstage", cwd);
12166 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12171 if (patch_script_path) {
12172 patch_script_file = fopen(patch_script_path, "re");
12173 if (patch_script_file == NULL) {
12174 error = got_error_from_errno2("fopen",
12175 patch_script_path);
12180 error = apply_unveil(got_repo_get_path(repo), 0,
12181 got_worktree_get_root_path(worktree));
12185 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
12189 cpa.patch_script_file = patch_script_file;
12190 cpa.action = "unstage";
12191 memset(&upa, 0, sizeof(upa));
12192 error = got_worktree_unstage(worktree, &paths, update_progress,
12193 &upa, pflag ? choose_patch : NULL, &cpa, repo);
12195 print_merge_progress_stats(&upa);
12197 if (patch_script_file && fclose(patch_script_file) == EOF &&
12199 error = got_error_from_errno2("fclose", patch_script_path);
12201 const struct got_error *close_err = got_repo_close(repo);
12206 got_worktree_close(worktree);
12208 const struct got_error *pack_err =
12209 got_repo_pack_fds_close(pack_fds);
12213 TAILQ_FOREACH(pe, &paths, entry)
12214 free((char *)pe->path);
12215 got_pathlist_free(&paths);
12223 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
12224 "arg1 [arg2 ...]\n", getprogname());
12228 static const struct got_error *
12229 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12231 const struct got_error *err;
12232 struct got_blob_object *blob;
12234 err = got_object_open_as_blob(&blob, repo, id, 8192);
12238 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
12239 got_object_blob_close(blob);
12243 static const struct got_error *
12244 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12246 const struct got_error *err;
12247 struct got_tree_object *tree;
12250 err = got_object_open_as_tree(&tree, repo, id);
12254 nentries = got_object_tree_get_nentries(tree);
12255 for (i = 0; i < nentries; i++) {
12256 struct got_tree_entry *te;
12258 if (sigint_received || sigpipe_received)
12260 te = got_object_tree_get_entry(tree, i);
12261 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
12264 fprintf(outfile, "%s %.7o %s\n", id_str,
12265 got_tree_entry_get_mode(te),
12266 got_tree_entry_get_name(te));
12270 got_object_tree_close(tree);
12275 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
12285 h = (long long)gmtoff / 3600;
12286 m = ((long long)gmtoff - h*3600) / 60;
12287 snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
12290 static const struct got_error *
12291 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12293 const struct got_error *err;
12294 struct got_commit_object *commit;
12295 const struct got_object_id_queue *parent_ids;
12296 struct got_object_qid *pid;
12297 char *id_str = NULL;
12298 const char *logmsg = NULL;
12301 err = got_object_open_as_commit(&commit, repo, id);
12305 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
12309 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
12310 parent_ids = got_object_commit_get_parent_ids(commit);
12311 fprintf(outfile, "numparents %d\n",
12312 got_object_commit_get_nparents(commit));
12313 STAILQ_FOREACH(pid, parent_ids, entry) {
12315 err = got_object_id_str(&pid_str, &pid->id);
12318 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
12321 format_gmtoff(gmtoff, sizeof(gmtoff),
12322 got_object_commit_get_author_gmtoff(commit));
12323 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
12324 got_object_commit_get_author(commit),
12325 (long long)got_object_commit_get_author_time(commit),
12328 format_gmtoff(gmtoff, sizeof(gmtoff),
12329 got_object_commit_get_committer_gmtoff(commit));
12330 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
12331 got_object_commit_get_author(commit),
12332 (long long)got_object_commit_get_committer_time(commit),
12335 logmsg = got_object_commit_get_logmsg_raw(commit);
12336 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
12337 fprintf(outfile, "%s", logmsg);
12340 got_object_commit_close(commit);
12344 static const struct got_error *
12345 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
12347 const struct got_error *err;
12348 struct got_tag_object *tag;
12349 char *id_str = NULL;
12350 const char *tagmsg = NULL;
12353 err = got_object_open_as_tag(&tag, repo, id);
12357 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
12361 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
12363 switch (got_object_tag_get_object_type(tag)) {
12364 case GOT_OBJ_TYPE_BLOB:
12365 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12366 GOT_OBJ_LABEL_BLOB);
12368 case GOT_OBJ_TYPE_TREE:
12369 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12370 GOT_OBJ_LABEL_TREE);
12372 case GOT_OBJ_TYPE_COMMIT:
12373 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12374 GOT_OBJ_LABEL_COMMIT);
12376 case GOT_OBJ_TYPE_TAG:
12377 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
12378 GOT_OBJ_LABEL_TAG);
12384 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
12385 got_object_tag_get_name(tag));
12387 format_gmtoff(gmtoff, sizeof(gmtoff),
12388 got_object_tag_get_tagger_gmtoff(tag));
12389 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
12390 got_object_tag_get_tagger(tag),
12391 (long long)got_object_tag_get_tagger_time(tag),
12394 tagmsg = got_object_tag_get_message(tag);
12395 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
12396 fprintf(outfile, "%s", tagmsg);
12399 got_object_tag_close(tag);
12403 static const struct got_error *
12404 cmd_cat(int argc, char *argv[])
12406 const struct got_error *error;
12407 struct got_repository *repo = NULL;
12408 struct got_worktree *worktree = NULL;
12409 char *cwd = NULL, *repo_path = NULL, *label = NULL;
12410 const char *commit_id_str = NULL;
12411 struct got_object_id *id = NULL, *commit_id = NULL;
12412 struct got_commit_object *commit = NULL;
12413 int ch, obj_type, i, force_path = 0;
12414 struct got_reflist_head refs;
12415 int *pack_fds = NULL;
12420 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12425 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
12428 commit_id_str = optarg;
12431 repo_path = realpath(optarg, NULL);
12432 if (repo_path == NULL)
12433 return got_error_from_errno2("realpath",
12435 got_path_strip_trailing_slashes(repo_path);
12449 cwd = getcwd(NULL, 0);
12451 error = got_error_from_errno("getcwd");
12455 error = got_repo_pack_fds_open(&pack_fds);
12459 if (repo_path == NULL) {
12460 error = got_worktree_open(&worktree, cwd);
12461 if (error && error->code != GOT_ERR_NOT_WORKTREE)
12464 repo_path = strdup(
12465 got_worktree_get_repo_path(worktree));
12466 if (repo_path == NULL) {
12467 error = got_error_from_errno("strdup");
12471 /* Release work tree lock. */
12472 got_worktree_close(worktree);
12477 if (repo_path == NULL) {
12478 repo_path = strdup(cwd);
12479 if (repo_path == NULL)
12480 return got_error_from_errno("strdup");
12483 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
12488 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
12492 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
12496 if (commit_id_str == NULL)
12497 commit_id_str = GOT_REF_HEAD;
12498 error = got_repo_match_object_id(&commit_id, NULL,
12499 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
12503 error = got_object_open_as_commit(&commit, repo, commit_id);
12507 for (i = 0; i < argc; i++) {
12509 error = got_object_id_by_path(&id, repo, commit,
12514 error = got_repo_match_object_id(&id, &label, argv[i],
12515 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
12518 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
12519 error->code != GOT_ERR_NOT_REF)
12521 error = got_object_id_by_path(&id, repo,
12528 error = got_object_get_type(&obj_type, repo, id);
12532 switch (obj_type) {
12533 case GOT_OBJ_TYPE_BLOB:
12534 error = cat_blob(id, repo, stdout);
12536 case GOT_OBJ_TYPE_TREE:
12537 error = cat_tree(id, repo, stdout);
12539 case GOT_OBJ_TYPE_COMMIT:
12540 error = cat_commit(id, repo, stdout);
12542 case GOT_OBJ_TYPE_TAG:
12543 error = cat_tag(id, repo, stdout);
12546 error = got_error(GOT_ERR_OBJ_TYPE);
12561 got_object_commit_close(commit);
12563 got_worktree_close(worktree);
12565 const struct got_error *close_err = got_repo_close(repo);
12570 const struct got_error *pack_err =
12571 got_repo_pack_fds_close(pack_fds);
12576 got_ref_list_free(&refs);
12583 fprintf(stderr, "usage: %s info [path ...]\n",
12588 static const struct got_error *
12589 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12590 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12591 struct got_object_id *commit_id)
12593 const struct got_error *err = NULL;
12594 char *id_str = NULL;
12596 struct tm mytm, *tm;
12597 struct got_pathlist_head *paths = arg;
12598 struct got_pathlist_entry *pe;
12601 * Clear error indication from any of the path arguments which
12602 * would cause this file index entry to be displayed.
12604 TAILQ_FOREACH(pe, paths, entry) {
12605 if (got_path_cmp(path, pe->path, strlen(path),
12606 pe->path_len) == 0 ||
12607 got_path_is_child(path, pe->path, pe->path_len))
12608 pe->data = NULL; /* no error */
12611 printf(GOT_COMMIT_SEP_STR);
12613 printf("symlink: %s\n", path);
12614 else if (S_ISREG(mode)) {
12615 printf("file: %s\n", path);
12616 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12617 } else if (S_ISDIR(mode))
12618 printf("directory: %s\n", path);
12620 printf("something: %s\n", path);
12622 tm = localtime_r(&mtime, &mytm);
12625 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12626 return got_error(GOT_ERR_NO_SPACE);
12627 printf("timestamp: %s\n", datebuf);
12630 err = got_object_id_str(&id_str, blob_id);
12633 printf("based on blob: %s\n", id_str);
12637 if (staged_blob_id) {
12638 err = got_object_id_str(&id_str, staged_blob_id);
12641 printf("based on staged blob: %s\n", id_str);
12646 err = got_object_id_str(&id_str, commit_id);
12649 printf("based on commit: %s\n", id_str);
12656 static const struct got_error *
12657 cmd_info(int argc, char *argv[])
12659 const struct got_error *error = NULL;
12660 struct got_worktree *worktree = NULL;
12661 char *cwd = NULL, *id_str = NULL;
12662 struct got_pathlist_head paths;
12663 struct got_pathlist_entry *pe;
12664 char *uuidstr = NULL;
12665 int ch, show_files = 0;
12666 int *pack_fds = NULL;
12668 TAILQ_INIT(&paths);
12670 while ((ch = getopt(argc, argv, "")) != -1) {
12682 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12686 cwd = getcwd(NULL, 0);
12688 error = got_error_from_errno("getcwd");
12692 error = got_repo_pack_fds_open(&pack_fds);
12696 error = got_worktree_open(&worktree, cwd);
12698 if (error->code == GOT_ERR_NOT_WORKTREE)
12699 error = wrap_not_worktree_error(error, "info", cwd);
12704 /* Remove "cpath" promise. */
12705 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
12709 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
12714 error = get_worktree_paths_from_argv(&paths, argc, argv,
12721 error = got_object_id_str(&id_str,
12722 got_worktree_get_base_commit_id(worktree));
12726 error = got_worktree_get_uuid(&uuidstr, worktree);
12730 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12731 printf("work tree base commit: %s\n", id_str);
12732 printf("work tree path prefix: %s\n",
12733 got_worktree_get_path_prefix(worktree));
12734 printf("work tree branch reference: %s\n",
12735 got_worktree_get_head_ref_name(worktree));
12736 printf("work tree UUID: %s\n", uuidstr);
12737 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12740 struct got_pathlist_entry *pe;
12741 TAILQ_FOREACH(pe, &paths, entry) {
12742 if (pe->path_len == 0)
12745 * Assume this path will fail. This will be corrected
12746 * in print_path_info() in case the path does suceeed.
12748 pe->data = (void *)got_error_path(pe->path,
12751 error = got_worktree_path_info(worktree, &paths,
12752 print_path_info, &paths, check_cancelled, NULL);
12755 TAILQ_FOREACH(pe, &paths, entry) {
12756 if (pe->data != NULL) {
12757 error = pe->data; /* bad path */
12764 const struct got_error *pack_err =
12765 got_repo_pack_fds_close(pack_fds);
12769 TAILQ_FOREACH(pe, &paths, entry)
12770 free((char *)pe->path);
12771 got_pathlist_free(&paths);