2 * Copyright (c) 2017 Martin Pieuchot <mpi@openbsd.org>
3 * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
4 * Copyright (c) 2020 Ori Bernstein <ori@openbsd.org>
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 #include <sys/queue.h>
20 #include <sys/types.h>
43 #include "got_version.h"
44 #include "got_error.h"
45 #include "got_object.h"
46 #include "got_reference.h"
47 #include "got_repository.h"
49 #include "got_cancel.h"
50 #include "got_worktree.h"
52 #include "got_commit_graph.h"
53 #include "got_fetch.h"
55 #include "got_blame.h"
56 #include "got_privsep.h"
57 #include "got_opentemp.h"
58 #include "got_gotconfig.h"
60 #include "got_patch.h"
63 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
66 static volatile sig_atomic_t sigint_received;
67 static volatile sig_atomic_t sigpipe_received;
70 catch_sigint(int signo)
76 catch_sigpipe(int signo)
84 const struct got_error *(*cmd_main)(int, char *[]);
85 void (*cmd_usage)(void);
86 const char *cmd_alias;
89 __dead static void usage(int, int);
90 __dead static void usage_init(void);
91 __dead static void usage_import(void);
92 __dead static void usage_clone(void);
93 __dead static void usage_fetch(void);
94 __dead static void usage_checkout(void);
95 __dead static void usage_update(void);
96 __dead static void usage_log(void);
97 __dead static void usage_diff(void);
98 __dead static void usage_blame(void);
99 __dead static void usage_tree(void);
100 __dead static void usage_status(void);
101 __dead static void usage_ref(void);
102 __dead static void usage_branch(void);
103 __dead static void usage_tag(void);
104 __dead static void usage_add(void);
105 __dead static void usage_remove(void);
106 __dead static void usage_patch(void);
107 __dead static void usage_revert(void);
108 __dead static void usage_commit(void);
109 __dead static void usage_send(void);
110 __dead static void usage_cherrypick(void);
111 __dead static void usage_backout(void);
112 __dead static void usage_rebase(void);
113 __dead static void usage_histedit(void);
114 __dead static void usage_integrate(void);
115 __dead static void usage_merge(void);
116 __dead static void usage_stage(void);
117 __dead static void usage_unstage(void);
118 __dead static void usage_cat(void);
119 __dead static void usage_info(void);
121 static const struct got_error* cmd_init(int, char *[]);
122 static const struct got_error* cmd_import(int, char *[]);
123 static const struct got_error* cmd_clone(int, char *[]);
124 static const struct got_error* cmd_fetch(int, char *[]);
125 static const struct got_error* cmd_checkout(int, char *[]);
126 static const struct got_error* cmd_update(int, char *[]);
127 static const struct got_error* cmd_log(int, char *[]);
128 static const struct got_error* cmd_diff(int, char *[]);
129 static const struct got_error* cmd_blame(int, char *[]);
130 static const struct got_error* cmd_tree(int, char *[]);
131 static const struct got_error* cmd_status(int, char *[]);
132 static const struct got_error* cmd_ref(int, char *[]);
133 static const struct got_error* cmd_branch(int, char *[]);
134 static const struct got_error* cmd_tag(int, char *[]);
135 static const struct got_error* cmd_add(int, char *[]);
136 static const struct got_error* cmd_remove(int, char *[]);
137 static const struct got_error* cmd_patch(int, char *[]);
138 static const struct got_error* cmd_revert(int, char *[]);
139 static const struct got_error* cmd_commit(int, char *[]);
140 static const struct got_error* cmd_send(int, char *[]);
141 static const struct got_error* cmd_cherrypick(int, char *[]);
142 static const struct got_error* cmd_backout(int, char *[]);
143 static const struct got_error* cmd_rebase(int, char *[]);
144 static const struct got_error* cmd_histedit(int, char *[]);
145 static const struct got_error* cmd_integrate(int, char *[]);
146 static const struct got_error* cmd_merge(int, char *[]);
147 static const struct got_error* cmd_stage(int, char *[]);
148 static const struct got_error* cmd_unstage(int, char *[]);
149 static const struct got_error* cmd_cat(int, char *[]);
150 static const struct got_error* cmd_info(int, char *[]);
152 static const struct got_cmd got_commands[] = {
153 { "init", cmd_init, usage_init, "" },
154 { "import", cmd_import, usage_import, "im" },
155 { "clone", cmd_clone, usage_clone, "cl" },
156 { "fetch", cmd_fetch, usage_fetch, "fe" },
157 { "checkout", cmd_checkout, usage_checkout, "co" },
158 { "update", cmd_update, usage_update, "up" },
159 { "log", cmd_log, usage_log, "" },
160 { "diff", cmd_diff, usage_diff, "di" },
161 { "blame", cmd_blame, usage_blame, "bl" },
162 { "tree", cmd_tree, usage_tree, "tr" },
163 { "status", cmd_status, usage_status, "st" },
164 { "ref", cmd_ref, usage_ref, "" },
165 { "branch", cmd_branch, usage_branch, "br" },
166 { "tag", cmd_tag, usage_tag, "" },
167 { "add", cmd_add, usage_add, "" },
168 { "remove", cmd_remove, usage_remove, "rm" },
169 { "patch", cmd_patch, usage_patch, "pa" },
170 { "revert", cmd_revert, usage_revert, "rv" },
171 { "commit", cmd_commit, usage_commit, "ci" },
172 { "send", cmd_send, usage_send, "se" },
173 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
174 { "backout", cmd_backout, usage_backout, "bo" },
175 { "rebase", cmd_rebase, usage_rebase, "rb" },
176 { "histedit", cmd_histedit, usage_histedit, "he" },
177 { "integrate", cmd_integrate, usage_integrate,"ig" },
178 { "merge", cmd_merge, usage_merge, "mg" },
179 { "stage", cmd_stage, usage_stage, "sg" },
180 { "unstage", cmd_unstage, usage_unstage, "ug" },
181 { "cat", cmd_cat, usage_cat, "" },
182 { "info", cmd_info, usage_info, "" },
186 list_commands(FILE *fp)
190 fprintf(fp, "commands:");
191 for (i = 0; i < nitems(got_commands); i++) {
192 const struct got_cmd *cmd = &got_commands[i];
193 fprintf(fp, " %s", cmd->cmd_name);
199 option_conflict(char a, char b)
201 errx(1, "-%c and -%c options are mutually exclusive", a, b);
205 main(int argc, char *argv[])
207 const struct got_cmd *cmd;
210 int hflag = 0, Vflag = 0;
211 static const struct option longopts[] = {
212 { "version", no_argument, NULL, 'V' },
216 setlocale(LC_CTYPE, "");
218 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
238 got_version_print_str();
243 usage(hflag, hflag ? 0 : 1);
245 signal(SIGINT, catch_sigint);
246 signal(SIGPIPE, catch_sigpipe);
248 for (i = 0; i < nitems(got_commands); i++) {
249 const struct got_error *error;
251 cmd = &got_commands[i];
253 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
254 strcmp(cmd->cmd_alias, argv[0]) != 0)
260 error = cmd->cmd_main(argc, argv);
261 if (error && error->code != GOT_ERR_CANCELLED &&
262 error->code != GOT_ERR_PRIVSEP_EXIT &&
263 !(sigpipe_received &&
264 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
266 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
267 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
274 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
275 list_commands(stderr);
280 usage(int hflag, int status)
282 FILE *fp = (status == 0) ? stdout : stderr;
284 fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
291 static const struct got_error *
292 get_editor(char **abspath)
294 const struct got_error *err = NULL;
299 editor = getenv("VISUAL");
301 editor = getenv("EDITOR");
304 err = got_path_find_prog(abspath, editor);
309 if (*abspath == NULL) {
310 *abspath = strdup("/bin/ed");
311 if (*abspath == NULL)
312 return got_error_from_errno("strdup");
318 static const struct got_error *
319 apply_unveil(const char *repo_path, int repo_read_only,
320 const char *worktree_path)
322 const struct got_error *err;
325 if (unveil("gmon.out", "rwc") != 0)
326 return got_error_from_errno2("unveil", "gmon.out");
328 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
329 return got_error_from_errno2("unveil", repo_path);
331 if (worktree_path && unveil(worktree_path, "rwc") != 0)
332 return got_error_from_errno2("unveil", worktree_path);
334 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
335 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
337 err = got_privsep_unveil_exec_helpers();
341 if (unveil(NULL, NULL) != 0)
342 return got_error_from_errno("unveil");
350 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
354 static const struct got_error *
355 cmd_init(int argc, char *argv[])
357 const struct got_error *error = NULL;
358 char *repo_path = NULL;
361 while ((ch = getopt(argc, argv, "")) != -1) {
373 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
379 repo_path = strdup(argv[0]);
380 if (repo_path == NULL)
381 return got_error_from_errno("strdup");
383 got_path_strip_trailing_slashes(repo_path);
385 error = got_path_mkdir(repo_path);
387 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
390 error = apply_unveil(repo_path, 0, NULL);
394 error = got_repo_init(repo_path);
403 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
404 "[-r repository-path] [-I pattern] path\n", getprogname());
409 spawn_editor(const char *editor, const char *file)
412 sig_t sighup, sigint, sigquit;
415 sighup = signal(SIGHUP, SIG_IGN);
416 sigint = signal(SIGINT, SIG_IGN);
417 sigquit = signal(SIGQUIT, SIG_IGN);
419 switch (pid = fork()) {
423 execl(editor, editor, file, (char *)NULL);
427 while (waitpid(pid, &st, 0) == -1)
432 (void)signal(SIGHUP, sighup);
433 (void)signal(SIGINT, sigint);
434 (void)signal(SIGQUIT, sigquit);
436 if (!WIFEXITED(st)) {
441 return WEXITSTATUS(st);
444 static const struct got_error *
445 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
446 const char *initial_content, size_t initial_content_len,
447 int require_modification)
449 const struct got_error *err = NULL;
455 size_t len, logmsg_len;
456 char *initial_content_stripped = NULL, *buf = NULL, *s;
460 if (stat(logmsg_path, &st) == -1)
461 return got_error_from_errno2("stat", logmsg_path);
463 if (spawn_editor(editor, logmsg_path) == -1)
464 return got_error_from_errno("failed spawning editor");
466 if (stat(logmsg_path, &st2) == -1)
467 return got_error_from_errno("stat");
469 if (require_modification &&
470 st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
471 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
472 "no changes made to commit message, aborting");
475 * Set up a stripped version of the initial content without comments
476 * and blank lines. We need this in order to check if the message
477 * has in fact been edited.
479 initial_content_stripped = malloc(initial_content_len + 1);
480 if (initial_content_stripped == NULL)
481 return got_error_from_errno("malloc");
482 initial_content_stripped[0] = '\0';
484 buf = strdup(initial_content);
486 err = got_error_from_errno("strdup");
491 while ((line = strsep(&s, "\n")) != NULL) {
492 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
493 continue; /* remove comments and leading empty lines */
494 len = strlcat(initial_content_stripped, line,
495 initial_content_len + 1);
496 if (len >= initial_content_len + 1) {
497 err = got_error(GOT_ERR_NO_SPACE);
501 while (len > 0 && initial_content_stripped[len - 1] == '\n') {
502 initial_content_stripped[len - 1] = '\0';
506 logmsg_len = st2.st_size;
507 *logmsg = malloc(logmsg_len + 1);
509 return got_error_from_errno("malloc");
512 fp = fopen(logmsg_path, "re");
514 err = got_error_from_errno("fopen");
519 while ((linelen = getline(&line, &linesize, fp)) != -1) {
520 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
521 continue; /* remove comments and leading empty lines */
522 len = strlcat(*logmsg, line, logmsg_len + 1);
523 if (len >= logmsg_len + 1) {
524 err = got_error(GOT_ERR_NO_SPACE);
530 err = got_ferror(fp, GOT_ERR_IO);
533 while (len > 0 && (*logmsg)[len - 1] == '\n') {
534 (*logmsg)[len - 1] = '\0';
539 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
540 "commit message cannot be empty, aborting");
543 if (require_modification &&
544 strcmp(*logmsg, initial_content_stripped) == 0)
545 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
546 "no changes made to commit message, aborting");
548 free(initial_content_stripped);
550 if (fp && fclose(fp) == EOF && err == NULL)
551 err = got_error_from_errno("fclose");
559 static const struct got_error *
560 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
561 const char *path_dir, const char *branch_name)
563 char *initial_content = NULL;
564 const struct got_error *err = NULL;
565 int initial_content_len;
568 initial_content_len = asprintf(&initial_content,
569 "\n# %s to be imported to branch %s\n", path_dir,
571 if (initial_content_len == -1)
572 return got_error_from_errno("asprintf");
574 err = got_opentemp_named_fd(logmsg_path, &fd,
575 GOT_TMPDIR_STR "/got-importmsg");
579 if (write(fd, initial_content, initial_content_len) == -1) {
580 err = got_error_from_errno2("write", *logmsg_path);
584 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
585 initial_content_len, 1);
587 if (fd != -1 && close(fd) == -1 && err == NULL)
588 err = got_error_from_errno2("close", *logmsg_path);
589 free(initial_content);
597 static const struct got_error *
598 import_progress(void *arg, const char *path)
600 printf("A %s\n", path);
605 valid_author(const char *author)
608 * Really dumb email address check; we're only doing this to
609 * avoid git's object parser breaking on commits we create.
611 while (*author && *author != '<')
615 while (*author && *author != '@')
619 while (*author && *author != '>')
621 return *author == '>';
624 static const struct got_error *
625 get_author(char **author, struct got_repository *repo,
626 struct got_worktree *worktree)
628 const struct got_error *err = NULL;
629 const char *got_author = NULL, *name, *email;
630 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
635 worktree_conf = got_worktree_get_gotconfig(worktree);
636 repo_conf = got_repo_get_gotconfig(repo);
639 * Priority of potential author information sources, from most
640 * significant to least significant:
641 * 1) work tree's .got/got.conf file
642 * 2) repository's got.conf file
643 * 3) repository's git config file
644 * 4) environment variables
645 * 5) global git config files (in user's home directory or /etc)
649 got_author = got_gotconfig_get_author(worktree_conf);
650 if (got_author == NULL)
651 got_author = got_gotconfig_get_author(repo_conf);
652 if (got_author == NULL) {
653 name = got_repo_get_gitconfig_author_name(repo);
654 email = got_repo_get_gitconfig_author_email(repo);
656 if (asprintf(author, "%s <%s>", name, email) == -1)
657 return got_error_from_errno("asprintf");
661 got_author = getenv("GOT_AUTHOR");
662 if (got_author == NULL) {
663 name = got_repo_get_global_gitconfig_author_name(repo);
664 email = got_repo_get_global_gitconfig_author_email(
667 if (asprintf(author, "%s <%s>", name, email)
669 return got_error_from_errno("asprintf");
672 /* TODO: Look up user in password database? */
673 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
677 *author = strdup(got_author);
679 return got_error_from_errno("strdup");
681 if (!valid_author(*author)) {
682 err = got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", *author);
689 static const struct got_error *
690 get_gitconfig_path(char **gitconfig_path)
692 const char *homedir = getenv("HOME");
694 *gitconfig_path = NULL;
696 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
697 return got_error_from_errno("asprintf");
703 static const struct got_error *
704 cmd_import(int argc, char *argv[])
706 const struct got_error *error = NULL;
707 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
708 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
709 const char *branch_name = "main";
710 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
711 struct got_repository *repo = NULL;
712 struct got_reference *branch_ref = NULL, *head_ref = NULL;
713 struct got_object_id *new_commit_id = NULL;
715 struct got_pathlist_head ignores;
716 struct got_pathlist_entry *pe;
717 int preserve_logmsg = 0;
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_open(&repo, repo_path, gitconfig_path);
780 error = get_author(&author, repo, NULL);
785 * Don't let the user create a branch name with a leading '-'.
786 * While technically a valid reference name, this case is usually
787 * an unintended typo.
789 if (branch_name[0] == '-')
790 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
792 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
793 error = got_error_from_errno("asprintf");
797 error = got_ref_open(&branch_ref, repo, refname, 0);
799 if (error->code != GOT_ERR_NOT_REF)
802 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
803 "import target branch already exists");
807 path_dir = realpath(argv[0], NULL);
808 if (path_dir == NULL) {
809 error = got_error_from_errno2("realpath", argv[0]);
812 got_path_strip_trailing_slashes(path_dir);
815 * unveil(2) traverses exec(2); if an editor is used we have
816 * to apply unveil after the log message has been written.
818 if (logmsg == NULL || strlen(logmsg) == 0) {
819 error = get_editor(&editor);
823 error = collect_import_msg(&logmsg, &logmsg_path, editor,
826 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
833 if (unveil(path_dir, "r") != 0) {
834 error = got_error_from_errno2("unveil", path_dir);
840 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
847 error = got_repo_import(&new_commit_id, path_dir, logmsg,
848 author, &ignores, repo, import_progress, NULL);
855 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
862 error = got_ref_write(branch_ref, repo);
869 error = got_object_id_str(&id_str, new_commit_id);
876 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
878 if (error->code != GOT_ERR_NOT_REF) {
884 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
892 error = got_ref_write(head_ref, repo);
900 printf("Created branch %s with commit %s\n",
901 got_ref_get_name(branch_ref), id_str);
903 if (preserve_logmsg) {
904 fprintf(stderr, "%s: log message preserved in %s\n",
905 getprogname(), logmsg_path);
906 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
907 error = got_error_from_errno2("unlink", logmsg_path);
916 free(gitconfig_path);
918 got_ref_close(branch_ref);
920 got_ref_close(head_ref);
927 fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
928 "[-R reference] repository-url [directory]\n", getprogname());
932 struct got_fetch_progress_arg {
933 char last_scaled_size[FMT_SCALED_STRSIZE];
938 struct got_repository *repo;
943 struct got_pathlist_head *symrefs;
944 struct got_pathlist_head *wanted_branches;
945 struct got_pathlist_head *wanted_refs;
949 const char *remote_repo_path;
951 int fetch_all_branches;
952 int mirror_references;
956 /* XXX forward declaration */
957 static const struct got_error *
958 create_config_files(const char *proto, const char *host, const char *port,
959 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
960 int mirror_references, struct got_pathlist_head *symrefs,
961 struct got_pathlist_head *wanted_branches,
962 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
964 static const struct got_error *
965 fetch_progress(void *arg, const char *message, off_t packfile_size,
966 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
968 const struct got_error *err = NULL;
969 struct got_fetch_progress_arg *a = arg;
970 char scaled_size[FMT_SCALED_STRSIZE];
971 int p_indexed, p_resolved;
972 int print_size = 0, print_indexed = 0, print_resolved = 0;
975 * In order to allow a failed clone to be resumed with 'got fetch'
976 * we try to create configuration files as soon as possible.
977 * Once the server has sent information about its default branch
978 * we have all required information.
980 if (a->create_configs && !a->configs_created &&
981 !TAILQ_EMPTY(a->config_info.symrefs)) {
982 err = create_config_files(a->config_info.proto,
983 a->config_info.host, a->config_info.port,
984 a->config_info.remote_repo_path,
985 a->config_info.git_url,
986 a->config_info.fetch_all_branches,
987 a->config_info.mirror_references,
988 a->config_info.symrefs,
989 a->config_info.wanted_branches,
990 a->config_info.wanted_refs, a->repo);
993 a->configs_created = 1;
996 if (a->verbosity < 0)
999 if (message && message[0] != '\0') {
1000 printf("\rserver: %s", message);
1005 if (packfile_size > 0 || nobj_indexed > 0) {
1006 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1007 (a->last_scaled_size[0] == '\0' ||
1008 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1010 if (strlcpy(a->last_scaled_size, scaled_size,
1011 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1012 return got_error(GOT_ERR_NO_SPACE);
1014 if (nobj_indexed > 0) {
1015 p_indexed = (nobj_indexed * 100) / nobj_total;
1016 if (p_indexed != a->last_p_indexed) {
1017 a->last_p_indexed = p_indexed;
1022 if (nobj_resolved > 0) {
1023 p_resolved = (nobj_resolved * 100) /
1024 (nobj_total - nobj_loose);
1025 if (p_resolved != a->last_p_resolved) {
1026 a->last_p_resolved = p_resolved;
1034 if (print_size || print_indexed || print_resolved)
1037 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1039 printf("; indexing %d%%", p_indexed);
1041 printf("; resolving deltas %d%%", p_resolved);
1042 if (print_size || print_indexed || print_resolved)
1048 static const struct got_error *
1049 create_symref(const char *refname, struct got_reference *target_ref,
1050 int verbosity, struct got_repository *repo)
1052 const struct got_error *err;
1053 struct got_reference *head_symref;
1055 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1059 err = got_ref_write(head_symref, repo);
1060 if (err == NULL && verbosity > 0) {
1061 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1062 got_ref_get_name(target_ref));
1064 got_ref_close(head_symref);
1068 static const struct got_error *
1069 list_remote_refs(struct got_pathlist_head *symrefs,
1070 struct got_pathlist_head *refs)
1072 const struct got_error *err;
1073 struct got_pathlist_entry *pe;
1075 TAILQ_FOREACH(pe, symrefs, entry) {
1076 const char *refname = pe->path;
1077 const char *targetref = pe->data;
1079 printf("%s: %s\n", refname, targetref);
1082 TAILQ_FOREACH(pe, refs, entry) {
1083 const char *refname = pe->path;
1084 struct got_object_id *id = pe->data;
1087 err = got_object_id_str(&id_str, id);
1090 printf("%s: %s\n", refname, id_str);
1097 static const struct got_error *
1098 create_ref(const char *refname, struct got_object_id *id,
1099 int verbosity, struct got_repository *repo)
1101 const struct got_error *err = NULL;
1102 struct got_reference *ref;
1105 err = got_object_id_str(&id_str, id);
1109 err = got_ref_alloc(&ref, refname, id);
1113 err = got_ref_write(ref, repo);
1116 if (err == NULL && verbosity >= 0)
1117 printf("Created reference %s: %s\n", refname, id_str);
1124 match_wanted_ref(const char *refname, const char *wanted_ref)
1126 if (strncmp(refname, "refs/", 5) != 0)
1131 * Prevent fetching of references that won't make any
1132 * sense outside of the remote repository's context.
1134 if (strncmp(refname, "got/", 4) == 0)
1136 if (strncmp(refname, "remotes/", 8) == 0)
1139 if (strncmp(wanted_ref, "refs/", 5) == 0)
1142 /* Allow prefix match. */
1143 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1146 /* Allow exact match. */
1147 return (strcmp(refname, wanted_ref) == 0);
1151 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1153 struct got_pathlist_entry *pe;
1155 TAILQ_FOREACH(pe, wanted_refs, entry) {
1156 if (match_wanted_ref(refname, pe->path))
1163 static const struct got_error *
1164 create_wanted_ref(const char *refname, struct got_object_id *id,
1165 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1167 const struct got_error *err;
1168 char *remote_refname;
1170 if (strncmp("refs/", refname, 5) == 0)
1173 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1174 remote_repo_name, refname) == -1)
1175 return got_error_from_errno("asprintf");
1177 err = create_ref(remote_refname, id, verbosity, repo);
1178 free(remote_refname);
1182 static const struct got_error *
1183 create_gotconfig(const char *proto, const char *host, const char *port,
1184 const char *remote_repo_path, const char *default_branch,
1185 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1186 struct got_pathlist_head *wanted_refs, int mirror_references,
1187 struct got_repository *repo)
1189 const struct got_error *err = NULL;
1190 char *gotconfig_path = NULL;
1191 char *gotconfig = NULL;
1192 FILE *gotconfig_file = NULL;
1193 const char *branchname = NULL;
1194 char *branches = NULL, *refs = NULL;
1197 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1198 struct got_pathlist_entry *pe;
1199 TAILQ_FOREACH(pe, wanted_branches, entry) {
1201 branchname = pe->path;
1202 if (strncmp(branchname, "refs/heads/", 11) == 0)
1204 if (asprintf(&s, "%s\"%s\" ",
1205 branches ? branches : "", branchname) == -1) {
1206 err = got_error_from_errno("asprintf");
1212 } else if (!fetch_all_branches && default_branch) {
1213 branchname = default_branch;
1214 if (strncmp(branchname, "refs/heads/", 11) == 0)
1216 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1217 err = got_error_from_errno("asprintf");
1221 if (!TAILQ_EMPTY(wanted_refs)) {
1222 struct got_pathlist_entry *pe;
1223 TAILQ_FOREACH(pe, wanted_refs, entry) {
1225 const char *refname = pe->path;
1226 if (strncmp(refname, "refs/", 5) == 0)
1228 if (asprintf(&s, "%s\"%s\" ",
1229 refs ? refs : "", refname) == -1) {
1230 err = got_error_from_errno("asprintf");
1238 /* Create got.conf(5). */
1239 gotconfig_path = got_repo_get_path_gotconfig(repo);
1240 if (gotconfig_path == NULL) {
1241 err = got_error_from_errno("got_repo_get_path_gotconfig");
1244 gotconfig_file = fopen(gotconfig_path, "ae");
1245 if (gotconfig_file == NULL) {
1246 err = got_error_from_errno2("fopen", gotconfig_path);
1249 if (asprintf(&gotconfig,
1254 "\trepository \"%s\"\n"
1260 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1261 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1262 remote_repo_path, branches ? "\tbranch { " : "",
1263 branches ? branches : "", branches ? "}\n" : "",
1264 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1265 mirror_references ? "\tmirror-references yes\n" : "",
1266 fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1267 err = got_error_from_errno("asprintf");
1270 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1271 if (n != strlen(gotconfig)) {
1272 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1277 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1278 err = got_error_from_errno2("fclose", gotconfig_path);
1279 free(gotconfig_path);
1284 static const struct got_error *
1285 create_gitconfig(const char *git_url, const char *default_branch,
1286 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1287 struct got_pathlist_head *wanted_refs, int mirror_references,
1288 struct got_repository *repo)
1290 const struct got_error *err = NULL;
1291 char *gitconfig_path = NULL;
1292 char *gitconfig = NULL;
1293 FILE *gitconfig_file = NULL;
1294 char *branches = NULL, *refs = NULL;
1295 const char *branchname;
1298 /* Create a config file Git can understand. */
1299 gitconfig_path = got_repo_get_path_gitconfig(repo);
1300 if (gitconfig_path == NULL) {
1301 err = got_error_from_errno("got_repo_get_path_gitconfig");
1304 gitconfig_file = fopen(gitconfig_path, "ae");
1305 if (gitconfig_file == NULL) {
1306 err = got_error_from_errno2("fopen", gitconfig_path);
1309 if (fetch_all_branches) {
1310 if (mirror_references) {
1311 if (asprintf(&branches,
1312 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1313 err = got_error_from_errno("asprintf");
1316 } else if (asprintf(&branches,
1317 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1318 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1319 err = got_error_from_errno("asprintf");
1322 } else if (!TAILQ_EMPTY(wanted_branches)) {
1323 struct got_pathlist_entry *pe;
1324 TAILQ_FOREACH(pe, wanted_branches, entry) {
1326 branchname = pe->path;
1327 if (strncmp(branchname, "refs/heads/", 11) == 0)
1329 if (mirror_references) {
1331 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1332 branches ? branches : "",
1333 branchname, branchname) == -1) {
1334 err = got_error_from_errno("asprintf");
1337 } else if (asprintf(&s,
1338 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1339 branches ? branches : "",
1340 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1341 branchname) == -1) {
1342 err = got_error_from_errno("asprintf");
1350 * If the server specified a default branch, use just that one.
1351 * Otherwise fall back to fetching all branches on next fetch.
1353 if (default_branch) {
1354 branchname = default_branch;
1355 if (strncmp(branchname, "refs/heads/", 11) == 0)
1358 branchname = "*"; /* fall back to all branches */
1359 if (mirror_references) {
1360 if (asprintf(&branches,
1361 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1362 branchname, branchname) == -1) {
1363 err = got_error_from_errno("asprintf");
1366 } else if (asprintf(&branches,
1367 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1368 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1369 branchname) == -1) {
1370 err = got_error_from_errno("asprintf");
1374 if (!TAILQ_EMPTY(wanted_refs)) {
1375 struct got_pathlist_entry *pe;
1376 TAILQ_FOREACH(pe, wanted_refs, entry) {
1378 const char *refname = pe->path;
1379 if (strncmp(refname, "refs/", 5) == 0)
1381 if (mirror_references) {
1383 "%s\tfetch = refs/%s:refs/%s\n",
1384 refs ? refs : "", refname, refname) == -1) {
1385 err = got_error_from_errno("asprintf");
1388 } else if (asprintf(&s,
1389 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1391 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1393 err = got_error_from_errno("asprintf");
1401 if (asprintf(&gitconfig,
1406 "\tfetch = refs/tags/*:refs/tags/*\n",
1407 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1408 refs ? refs : "") == -1) {
1409 err = got_error_from_errno("asprintf");
1412 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1413 if (n != strlen(gitconfig)) {
1414 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1418 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1419 err = got_error_from_errno2("fclose", gitconfig_path);
1420 free(gitconfig_path);
1425 static const struct got_error *
1426 create_config_files(const char *proto, const char *host, const char *port,
1427 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1428 int mirror_references, struct got_pathlist_head *symrefs,
1429 struct got_pathlist_head *wanted_branches,
1430 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1432 const struct got_error *err = NULL;
1433 const char *default_branch = NULL;
1434 struct got_pathlist_entry *pe;
1437 * If we asked for a set of wanted branches then use the first
1440 if (!TAILQ_EMPTY(wanted_branches)) {
1441 pe = TAILQ_FIRST(wanted_branches);
1442 default_branch = pe->path;
1444 /* First HEAD ref listed by server is the default branch. */
1445 TAILQ_FOREACH(pe, symrefs, entry) {
1446 const char *refname = pe->path;
1447 const char *target = pe->data;
1449 if (strcmp(refname, GOT_REF_HEAD) != 0)
1452 default_branch = target;
1457 /* Create got.conf(5). */
1458 err = create_gotconfig(proto, host, port, remote_repo_path,
1459 default_branch, fetch_all_branches, wanted_branches,
1460 wanted_refs, mirror_references, repo);
1464 /* Create a config file Git can understand. */
1465 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1466 wanted_branches, wanted_refs, mirror_references, repo);
1469 static const struct got_error *
1470 cmd_clone(int argc, char *argv[])
1472 const struct got_error *error = NULL;
1473 const char *uri, *dirname;
1474 char *proto, *host, *port, *repo_name, *server_path;
1475 char *default_destdir = NULL, *id_str = NULL;
1476 const char *repo_path;
1477 struct got_repository *repo = NULL;
1478 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1479 struct got_pathlist_entry *pe;
1480 struct got_object_id *pack_hash = NULL;
1481 int ch, fetchfd = -1, fetchstatus;
1482 pid_t fetchpid = -1;
1483 struct got_fetch_progress_arg fpa;
1484 char *git_url = NULL;
1485 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1486 int list_refs_only = 0;
1489 TAILQ_INIT(&symrefs);
1490 TAILQ_INIT(&wanted_branches);
1491 TAILQ_INIT(&wanted_refs);
1493 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1496 fetch_all_branches = 1;
1499 error = got_pathlist_append(&wanted_branches,
1508 mirror_references = 1;
1513 else if (verbosity < 3)
1520 error = got_pathlist_append(&wanted_refs,
1533 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1534 option_conflict('a', 'b');
1535 if (list_refs_only) {
1536 if (!TAILQ_EMPTY(&wanted_branches))
1537 option_conflict('l', 'b');
1538 if (fetch_all_branches)
1539 option_conflict('l', 'a');
1540 if (mirror_references)
1541 option_conflict('l', 'm');
1542 if (!TAILQ_EMPTY(&wanted_refs))
1543 option_conflict('l', 'R');
1555 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1560 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1561 host, port ? ":" : "", port ? port : "",
1562 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1563 error = got_error_from_errno("asprintf");
1567 if (strcmp(proto, "git") == 0) {
1569 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1570 "sendfd dns inet unveil", NULL) == -1)
1573 } else if (strcmp(proto, "git+ssh") == 0 ||
1574 strcmp(proto, "ssh") == 0) {
1576 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1577 "sendfd unveil", NULL) == -1)
1580 } else if (strcmp(proto, "http") == 0 ||
1581 strcmp(proto, "git+http") == 0) {
1582 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1585 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1588 if (dirname == NULL) {
1589 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1590 error = got_error_from_errno("asprintf");
1593 repo_path = default_destdir;
1595 repo_path = dirname;
1597 if (!list_refs_only) {
1598 error = got_path_mkdir(repo_path);
1600 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1601 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1603 if (!got_path_dir_is_empty(repo_path)) {
1604 error = got_error_path(repo_path,
1605 GOT_ERR_DIR_NOT_EMPTY);
1610 error = got_dial_apply_unveil(proto);
1614 error = apply_unveil(repo_path, 0, NULL);
1619 printf("Connecting to %s%s%s\n", host,
1620 port ? ":" : "", port ? port : "");
1622 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1623 server_path, verbosity);
1627 if (!list_refs_only) {
1628 error = got_repo_init(repo_path);
1631 error = got_repo_open(&repo, repo_path, NULL);
1636 fpa.last_scaled_size[0] = '\0';
1637 fpa.last_p_indexed = -1;
1638 fpa.last_p_resolved = -1;
1639 fpa.verbosity = verbosity;
1640 fpa.create_configs = 1;
1641 fpa.configs_created = 0;
1643 fpa.config_info.symrefs = &symrefs;
1644 fpa.config_info.wanted_branches = &wanted_branches;
1645 fpa.config_info.wanted_refs = &wanted_refs;
1646 fpa.config_info.proto = proto;
1647 fpa.config_info.host = host;
1648 fpa.config_info.port = port;
1649 fpa.config_info.remote_repo_path = server_path;
1650 fpa.config_info.git_url = git_url;
1651 fpa.config_info.fetch_all_branches = fetch_all_branches;
1652 fpa.config_info.mirror_references = mirror_references;
1653 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1654 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1655 fetch_all_branches, &wanted_branches, &wanted_refs,
1656 list_refs_only, verbosity, fetchfd, repo,
1657 fetch_progress, &fpa);
1661 if (list_refs_only) {
1662 error = list_remote_refs(&symrefs, &refs);
1666 if (pack_hash == NULL) {
1667 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1668 "server sent an empty pack file");
1671 error = got_object_id_str(&id_str, pack_hash);
1675 printf("\nFetched %s.pack\n", id_str);
1678 /* Set up references provided with the pack file. */
1679 TAILQ_FOREACH(pe, &refs, entry) {
1680 const char *refname = pe->path;
1681 struct got_object_id *id = pe->data;
1682 char *remote_refname;
1684 if (is_wanted_ref(&wanted_refs, refname) &&
1685 !mirror_references) {
1686 error = create_wanted_ref(refname, id,
1687 GOT_FETCH_DEFAULT_REMOTE_NAME,
1688 verbosity - 1, repo);
1694 error = create_ref(refname, id, verbosity - 1, repo);
1698 if (mirror_references)
1701 if (strncmp("refs/heads/", refname, 11) != 0)
1704 if (asprintf(&remote_refname,
1705 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1706 refname + 11) == -1) {
1707 error = got_error_from_errno("asprintf");
1710 error = create_ref(remote_refname, id, verbosity - 1, repo);
1711 free(remote_refname);
1716 /* Set the HEAD reference if the server provided one. */
1717 TAILQ_FOREACH(pe, &symrefs, entry) {
1718 struct got_reference *target_ref;
1719 const char *refname = pe->path;
1720 const char *target = pe->data;
1721 char *remote_refname = NULL, *remote_target = NULL;
1723 if (strcmp(refname, GOT_REF_HEAD) != 0)
1726 error = got_ref_open(&target_ref, repo, target, 0);
1728 if (error->code == GOT_ERR_NOT_REF) {
1735 error = create_symref(refname, target_ref, verbosity, repo);
1736 got_ref_close(target_ref);
1740 if (mirror_references)
1743 if (strncmp("refs/heads/", target, 11) != 0)
1746 if (asprintf(&remote_refname,
1747 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1749 error = got_error_from_errno("asprintf");
1752 if (asprintf(&remote_target,
1753 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1754 target + 11) == -1) {
1755 error = got_error_from_errno("asprintf");
1756 free(remote_refname);
1759 error = got_ref_open(&target_ref, repo, remote_target, 0);
1761 free(remote_refname);
1762 free(remote_target);
1763 if (error->code == GOT_ERR_NOT_REF) {
1769 error = create_symref(remote_refname, target_ref,
1770 verbosity - 1, repo);
1771 free(remote_refname);
1772 free(remote_target);
1773 got_ref_close(target_ref);
1779 * We failed to set the HEAD reference. If we asked for
1780 * a set of wanted branches use the first of one of those
1781 * which could be fetched instead.
1783 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1784 const char *target = pe->path;
1785 struct got_reference *target_ref;
1787 error = got_ref_open(&target_ref, repo, target, 0);
1789 if (error->code == GOT_ERR_NOT_REF) {
1796 error = create_symref(GOT_REF_HEAD, target_ref,
1798 got_ref_close(target_ref);
1806 printf("Created %s repository '%s'\n",
1807 mirror_references ? "mirrored" : "cloned", repo_path);
1810 if (kill(fetchpid, SIGTERM) == -1)
1811 error = got_error_from_errno("kill");
1812 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1813 error = got_error_from_errno("waitpid");
1815 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1816 error = got_error_from_errno("close");
1818 const struct got_error *close_err = got_repo_close(repo);
1822 TAILQ_FOREACH(pe, &refs, entry) {
1823 free((void *)pe->path);
1826 got_pathlist_free(&refs);
1827 TAILQ_FOREACH(pe, &symrefs, entry) {
1828 free((void *)pe->path);
1831 got_pathlist_free(&symrefs);
1832 got_pathlist_free(&wanted_branches);
1833 got_pathlist_free(&wanted_refs);
1840 free(default_destdir);
1845 static const struct got_error *
1846 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1847 int replace_tags, int verbosity, struct got_repository *repo)
1849 const struct got_error *err = NULL;
1850 char *new_id_str = NULL;
1851 struct got_object_id *old_id = NULL;
1853 err = got_object_id_str(&new_id_str, new_id);
1857 if (!replace_tags &&
1858 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1859 err = got_ref_resolve(&old_id, repo, ref);
1862 if (got_object_id_cmp(old_id, new_id) == 0)
1864 if (verbosity >= 0) {
1865 printf("Rejecting update of existing tag %s: %s\n",
1866 got_ref_get_name(ref), new_id_str);
1871 if (got_ref_is_symbolic(ref)) {
1872 if (verbosity >= 0) {
1873 printf("Replacing reference %s: %s\n",
1874 got_ref_get_name(ref),
1875 got_ref_get_symref_target(ref));
1877 err = got_ref_change_symref_to_ref(ref, new_id);
1880 err = got_ref_write(ref, repo);
1884 err = got_ref_resolve(&old_id, repo, ref);
1887 if (got_object_id_cmp(old_id, new_id) == 0)
1890 err = got_ref_change_ref(ref, new_id);
1893 err = got_ref_write(ref, repo);
1899 printf("Updated %s: %s\n", got_ref_get_name(ref),
1907 static const struct got_error *
1908 update_symref(const char *refname, struct got_reference *target_ref,
1909 int verbosity, struct got_repository *repo)
1911 const struct got_error *err = NULL, *unlock_err;
1912 struct got_reference *symref;
1913 int symref_is_locked = 0;
1915 err = got_ref_open(&symref, repo, refname, 1);
1917 if (err->code != GOT_ERR_NOT_REF)
1919 err = got_ref_alloc_symref(&symref, refname, target_ref);
1923 err = got_ref_write(symref, repo);
1928 printf("Created reference %s: %s\n",
1929 got_ref_get_name(symref),
1930 got_ref_get_symref_target(symref));
1932 symref_is_locked = 1;
1934 if (strcmp(got_ref_get_symref_target(symref),
1935 got_ref_get_name(target_ref)) == 0)
1938 err = got_ref_change_symref(symref,
1939 got_ref_get_name(target_ref));
1943 err = got_ref_write(symref, repo);
1948 printf("Updated %s: %s\n", got_ref_get_name(symref),
1949 got_ref_get_symref_target(symref));
1953 if (symref_is_locked) {
1954 unlock_err = got_ref_unlock(symref);
1955 if (unlock_err && err == NULL)
1958 got_ref_close(symref);
1965 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1966 "[-r repository-path] [-t] [-q] [-v] [-R reference] [-X] "
1967 "[remote-repository-name]\n",
1972 static const struct got_error *
1973 delete_missing_ref(struct got_reference *ref,
1974 int verbosity, struct got_repository *repo)
1976 const struct got_error *err = NULL;
1977 struct got_object_id *id = NULL;
1978 char *id_str = NULL;
1980 if (got_ref_is_symbolic(ref)) {
1981 err = got_ref_delete(ref, repo);
1984 if (verbosity >= 0) {
1985 printf("Deleted %s: %s\n",
1986 got_ref_get_name(ref),
1987 got_ref_get_symref_target(ref));
1990 err = got_ref_resolve(&id, repo, ref);
1993 err = got_object_id_str(&id_str, id);
1997 err = got_ref_delete(ref, repo);
2000 if (verbosity >= 0) {
2001 printf("Deleted %s: %s\n",
2002 got_ref_get_name(ref), id_str);
2011 static const struct got_error *
2012 delete_missing_refs(struct got_pathlist_head *their_refs,
2013 struct got_pathlist_head *their_symrefs,
2014 const struct got_remote_repo *remote,
2015 int verbosity, struct got_repository *repo)
2017 const struct got_error *err = NULL, *unlock_err;
2018 struct got_reflist_head my_refs;
2019 struct got_reflist_entry *re;
2020 struct got_pathlist_entry *pe;
2021 char *remote_namespace = NULL;
2022 char *local_refname = NULL;
2024 TAILQ_INIT(&my_refs);
2026 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2028 return got_error_from_errno("asprintf");
2030 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2034 TAILQ_FOREACH(re, &my_refs, entry) {
2035 const char *refname = got_ref_get_name(re->ref);
2036 const char *their_refname;
2038 if (remote->mirror_references) {
2039 their_refname = refname;
2041 if (strncmp(refname, remote_namespace,
2042 strlen(remote_namespace)) == 0) {
2043 if (strcmp(refname + strlen(remote_namespace),
2046 if (asprintf(&local_refname, "refs/heads/%s",
2047 refname + strlen(remote_namespace)) == -1) {
2048 err = got_error_from_errno("asprintf");
2051 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2054 their_refname = local_refname;
2057 TAILQ_FOREACH(pe, their_refs, entry) {
2058 if (strcmp(their_refname, pe->path) == 0)
2064 TAILQ_FOREACH(pe, their_symrefs, entry) {
2065 if (strcmp(their_refname, pe->path) == 0)
2071 err = delete_missing_ref(re->ref, verbosity, repo);
2075 if (local_refname) {
2076 struct got_reference *ref;
2077 err = got_ref_open(&ref, repo, local_refname, 1);
2079 if (err->code != GOT_ERR_NOT_REF)
2081 free(local_refname);
2082 local_refname = NULL;
2085 err = delete_missing_ref(ref, verbosity, repo);
2088 unlock_err = got_ref_unlock(ref);
2090 if (unlock_err && err == NULL) {
2095 free(local_refname);
2096 local_refname = NULL;
2100 free(remote_namespace);
2101 free(local_refname);
2105 static const struct got_error *
2106 update_wanted_ref(const char *refname, struct got_object_id *id,
2107 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2109 const struct got_error *err, *unlock_err;
2110 char *remote_refname;
2111 struct got_reference *ref;
2113 if (strncmp("refs/", refname, 5) == 0)
2116 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2117 remote_repo_name, refname) == -1)
2118 return got_error_from_errno("asprintf");
2120 err = got_ref_open(&ref, repo, remote_refname, 1);
2122 if (err->code != GOT_ERR_NOT_REF)
2124 err = create_ref(remote_refname, id, verbosity, repo);
2126 err = update_ref(ref, id, 0, verbosity, repo);
2127 unlock_err = got_ref_unlock(ref);
2128 if (unlock_err && err == NULL)
2133 free(remote_refname);
2137 static const struct got_error *
2138 delete_ref(struct got_repository *repo, struct got_reference *ref)
2140 const struct got_error *err = NULL;
2141 struct got_object_id *id = NULL;
2142 char *id_str = NULL;
2145 if (got_ref_is_symbolic(ref)) {
2146 target = got_ref_get_symref_target(ref);
2148 err = got_ref_resolve(&id, repo, ref);
2151 err = got_object_id_str(&id_str, id);
2157 err = got_ref_delete(ref, repo);
2161 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2168 static const struct got_error *
2169 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2171 const struct got_error *err = NULL;
2172 struct got_reflist_head refs;
2173 struct got_reflist_entry *re;
2178 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2179 err = got_error_from_errno("asprintf");
2182 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2186 TAILQ_FOREACH(re, &refs, entry)
2187 delete_ref(repo, re->ref);
2189 got_ref_list_free(&refs);
2193 static const struct got_error *
2194 cmd_fetch(int argc, char *argv[])
2196 const struct got_error *error = NULL, *unlock_err;
2197 char *cwd = NULL, *repo_path = NULL;
2198 const char *remote_name;
2199 char *proto = NULL, *host = NULL, *port = NULL;
2200 char *repo_name = NULL, *server_path = NULL;
2201 const struct got_remote_repo *remotes, *remote = NULL;
2203 char *id_str = NULL;
2204 struct got_repository *repo = NULL;
2205 struct got_worktree *worktree = NULL;
2206 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2207 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2208 struct got_pathlist_entry *pe;
2209 struct got_object_id *pack_hash = NULL;
2210 int i, ch, fetchfd = -1, fetchstatus;
2211 pid_t fetchpid = -1;
2212 struct got_fetch_progress_arg fpa;
2213 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2214 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2217 TAILQ_INIT(&symrefs);
2218 TAILQ_INIT(&wanted_branches);
2219 TAILQ_INIT(&wanted_refs);
2221 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:X")) != -1) {
2224 fetch_all_branches = 1;
2227 error = got_pathlist_append(&wanted_branches,
2239 repo_path = realpath(optarg, NULL);
2240 if (repo_path == NULL)
2241 return got_error_from_errno2("realpath",
2243 got_path_strip_trailing_slashes(repo_path);
2251 else if (verbosity < 3)
2258 error = got_pathlist_append(&wanted_refs,
2274 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2275 option_conflict('a', 'b');
2276 if (list_refs_only) {
2277 if (!TAILQ_EMPTY(&wanted_branches))
2278 option_conflict('l', 'b');
2279 if (fetch_all_branches)
2280 option_conflict('l', 'a');
2282 option_conflict('l', 'd');
2284 option_conflict('l', 'X');
2286 if (delete_remote) {
2287 if (fetch_all_branches)
2288 option_conflict('X', 'a');
2289 if (!TAILQ_EMPTY(&wanted_branches))
2290 option_conflict('X', 'b');
2292 option_conflict('X', 'd');
2294 option_conflict('X', 't');
2295 if (!TAILQ_EMPTY(&wanted_refs))
2296 option_conflict('X', 'R');
2301 errx(1, "-X option requires a remote name");
2302 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2303 } else if (argc == 1)
2304 remote_name = argv[0];
2308 cwd = getcwd(NULL, 0);
2310 error = got_error_from_errno("getcwd");
2314 if (repo_path == NULL) {
2315 error = got_worktree_open(&worktree, cwd);
2316 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2322 strdup(got_worktree_get_repo_path(worktree));
2323 if (repo_path == NULL)
2324 error = got_error_from_errno("strdup");
2328 repo_path = strdup(cwd);
2329 if (repo_path == NULL) {
2330 error = got_error_from_errno("strdup");
2336 error = got_repo_open(&repo, repo_path, NULL);
2340 if (delete_remote) {
2341 error = delete_refs_for_remote(repo, remote_name);
2342 goto done; /* nothing else to do */
2346 worktree_conf = got_worktree_get_gotconfig(worktree);
2347 if (worktree_conf) {
2348 got_gotconfig_get_remotes(&nremotes, &remotes,
2350 for (i = 0; i < nremotes; i++) {
2351 if (strcmp(remotes[i].name, remote_name) == 0) {
2352 remote = &remotes[i];
2358 if (remote == NULL) {
2359 repo_conf = got_repo_get_gotconfig(repo);
2361 got_gotconfig_get_remotes(&nremotes, &remotes,
2363 for (i = 0; i < nremotes; i++) {
2364 if (strcmp(remotes[i].name, remote_name) == 0) {
2365 remote = &remotes[i];
2371 if (remote == NULL) {
2372 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2373 for (i = 0; i < nremotes; i++) {
2374 if (strcmp(remotes[i].name, remote_name) == 0) {
2375 remote = &remotes[i];
2380 if (remote == NULL) {
2381 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2385 if (TAILQ_EMPTY(&wanted_branches)) {
2386 if (!fetch_all_branches)
2387 fetch_all_branches = remote->fetch_all_branches;
2388 for (i = 0; i < remote->nfetch_branches; i++) {
2389 got_pathlist_append(&wanted_branches,
2390 remote->fetch_branches[i], NULL);
2393 if (TAILQ_EMPTY(&wanted_refs)) {
2394 for (i = 0; i < remote->nfetch_refs; i++) {
2395 got_pathlist_append(&wanted_refs,
2396 remote->fetch_refs[i], NULL);
2400 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2401 &repo_name, remote->fetch_url);
2405 if (strcmp(proto, "git") == 0) {
2407 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2408 "sendfd dns inet unveil", NULL) == -1)
2411 } else if (strcmp(proto, "git+ssh") == 0 ||
2412 strcmp(proto, "ssh") == 0) {
2414 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2415 "sendfd unveil", NULL) == -1)
2418 } else if (strcmp(proto, "http") == 0 ||
2419 strcmp(proto, "git+http") == 0) {
2420 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2423 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2427 error = got_dial_apply_unveil(proto);
2431 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2436 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2437 port ? ":" : "", port ? port : "");
2439 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2440 server_path, verbosity);
2444 fpa.last_scaled_size[0] = '\0';
2445 fpa.last_p_indexed = -1;
2446 fpa.last_p_resolved = -1;
2447 fpa.verbosity = verbosity;
2449 fpa.create_configs = 0;
2450 fpa.configs_created = 0;
2451 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2452 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2453 remote->mirror_references, fetch_all_branches, &wanted_branches,
2454 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2455 fetch_progress, &fpa);
2459 if (list_refs_only) {
2460 error = list_remote_refs(&symrefs, &refs);
2464 if (pack_hash == NULL) {
2466 printf("Already up-to-date\n");
2467 } else if (verbosity >= 0) {
2468 error = got_object_id_str(&id_str, pack_hash);
2471 printf("\nFetched %s.pack\n", id_str);
2476 /* Update references provided with the pack file. */
2477 TAILQ_FOREACH(pe, &refs, entry) {
2478 const char *refname = pe->path;
2479 struct got_object_id *id = pe->data;
2480 struct got_reference *ref;
2481 char *remote_refname;
2483 if (is_wanted_ref(&wanted_refs, refname) &&
2484 !remote->mirror_references) {
2485 error = update_wanted_ref(refname, id,
2486 remote->name, verbosity, repo);
2492 if (remote->mirror_references ||
2493 strncmp("refs/tags/", refname, 10) == 0) {
2494 error = got_ref_open(&ref, repo, refname, 1);
2496 if (error->code != GOT_ERR_NOT_REF)
2498 error = create_ref(refname, id, verbosity,
2503 error = update_ref(ref, id, replace_tags,
2505 unlock_err = got_ref_unlock(ref);
2506 if (unlock_err && error == NULL)
2512 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2513 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2514 remote_name, refname + 11) == -1) {
2515 error = got_error_from_errno("asprintf");
2519 error = got_ref_open(&ref, repo, remote_refname, 1);
2521 if (error->code != GOT_ERR_NOT_REF)
2523 error = create_ref(remote_refname, id,
2528 error = update_ref(ref, id, replace_tags,
2530 unlock_err = got_ref_unlock(ref);
2531 if (unlock_err && error == NULL)
2538 /* Also create a local branch if none exists yet. */
2539 error = got_ref_open(&ref, repo, refname, 1);
2541 if (error->code != GOT_ERR_NOT_REF)
2543 error = create_ref(refname, id, verbosity,
2548 unlock_err = got_ref_unlock(ref);
2549 if (unlock_err && error == NULL)
2556 error = delete_missing_refs(&refs, &symrefs, remote,
2562 if (!remote->mirror_references) {
2563 /* Update remote HEAD reference if the server provided one. */
2564 TAILQ_FOREACH(pe, &symrefs, entry) {
2565 struct got_reference *target_ref;
2566 const char *refname = pe->path;
2567 const char *target = pe->data;
2568 char *remote_refname = NULL, *remote_target = NULL;
2570 if (strcmp(refname, GOT_REF_HEAD) != 0)
2573 if (strncmp("refs/heads/", target, 11) != 0)
2576 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2577 remote->name, refname) == -1) {
2578 error = got_error_from_errno("asprintf");
2581 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2582 remote->name, target + 11) == -1) {
2583 error = got_error_from_errno("asprintf");
2584 free(remote_refname);
2588 error = got_ref_open(&target_ref, repo, remote_target,
2591 free(remote_refname);
2592 free(remote_target);
2593 if (error->code == GOT_ERR_NOT_REF) {
2599 error = update_symref(remote_refname, target_ref,
2601 free(remote_refname);
2602 free(remote_target);
2603 got_ref_close(target_ref);
2610 if (kill(fetchpid, SIGTERM) == -1)
2611 error = got_error_from_errno("kill");
2612 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2613 error = got_error_from_errno("waitpid");
2615 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2616 error = got_error_from_errno("close");
2618 const struct got_error *close_err = got_repo_close(repo);
2623 got_worktree_close(worktree);
2624 TAILQ_FOREACH(pe, &refs, entry) {
2625 free((void *)pe->path);
2628 got_pathlist_free(&refs);
2629 TAILQ_FOREACH(pe, &symrefs, entry) {
2630 free((void *)pe->path);
2633 got_pathlist_free(&symrefs);
2634 got_pathlist_free(&wanted_branches);
2635 got_pathlist_free(&wanted_refs);
2650 usage_checkout(void)
2652 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2653 "[-p prefix] [-q] repository-path [worktree-path]\n",
2659 show_worktree_base_ref_warning(void)
2661 fprintf(stderr, "%s: warning: could not create a reference "
2662 "to the work tree's base commit; the commit could be "
2663 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2664 "repository writable and running 'got update' will prevent this\n",
2668 struct got_checkout_progress_arg {
2669 const char *worktree_path;
2670 int had_base_commit_ref_error;
2674 static const struct got_error *
2675 checkout_progress(void *arg, unsigned char status, const char *path)
2677 struct got_checkout_progress_arg *a = arg;
2679 /* Base commit bump happens silently. */
2680 if (status == GOT_STATUS_BUMP_BASE)
2683 if (status == GOT_STATUS_BASE_REF_ERR) {
2684 a->had_base_commit_ref_error = 1;
2688 while (path[0] == '/')
2691 if (a->verbosity >= 0)
2692 printf("%c %s/%s\n", status, a->worktree_path, path);
2697 static const struct got_error *
2698 check_cancelled(void *arg)
2700 if (sigint_received || sigpipe_received)
2701 return got_error(GOT_ERR_CANCELLED);
2705 static const struct got_error *
2706 check_linear_ancestry(struct got_object_id *commit_id,
2707 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2708 struct got_repository *repo)
2710 const struct got_error *err = NULL;
2711 struct got_object_id *yca_id;
2713 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2714 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2719 return got_error(GOT_ERR_ANCESTRY);
2722 * Require a straight line of history between the target commit
2723 * and the work tree's base commit.
2725 * Non-linear situations such as this require a rebase:
2727 * (commit) D F (base_commit)
2735 * 'got update' only handles linear cases:
2736 * Update forwards in time: A (base/yca) - B - C - D (commit)
2737 * Update backwards in time: D (base) - C - B - A (commit/yca)
2739 if (allow_forwards_in_time_only) {
2740 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2741 return got_error(GOT_ERR_ANCESTRY);
2742 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2743 got_object_id_cmp(base_commit_id, yca_id) != 0)
2744 return got_error(GOT_ERR_ANCESTRY);
2750 static const struct got_error *
2751 check_same_branch(struct got_object_id *commit_id,
2752 struct got_reference *head_ref, struct got_object_id *yca_id,
2753 struct got_repository *repo)
2755 const struct got_error *err = NULL;
2756 struct got_commit_graph *graph = NULL;
2757 struct got_object_id *head_commit_id = NULL;
2758 int is_same_branch = 0;
2760 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2764 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2768 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2773 err = got_commit_graph_open(&graph, "/", 1);
2777 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2778 check_cancelled, NULL);
2783 struct got_object_id *id;
2784 err = got_commit_graph_iter_next(&id, graph, repo,
2785 check_cancelled, NULL);
2787 if (err->code == GOT_ERR_ITER_COMPLETED)
2793 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2795 if (got_object_id_cmp(id, commit_id) == 0) {
2803 got_commit_graph_close(graph);
2804 free(head_commit_id);
2805 if (!err && !is_same_branch)
2806 err = got_error(GOT_ERR_ANCESTRY);
2810 static const struct got_error *
2811 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2813 static char msg[512];
2814 const char *branch_name;
2816 if (got_ref_is_symbolic(ref))
2817 branch_name = got_ref_get_symref_target(ref);
2819 branch_name = got_ref_get_name(ref);
2821 if (strncmp("refs/heads/", branch_name, 11) == 0)
2824 snprintf(msg, sizeof(msg),
2825 "target commit is not contained in branch '%s'; "
2826 "the branch to use must be specified with -b; "
2827 "if necessary a new branch can be created for "
2828 "this commit with 'got branch -c %s BRANCH_NAME'",
2829 branch_name, commit_id_str);
2831 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2834 static const struct got_error *
2835 cmd_checkout(int argc, char *argv[])
2837 const struct got_error *error = NULL;
2838 struct got_repository *repo = NULL;
2839 struct got_reference *head_ref = NULL, *ref = NULL;
2840 struct got_worktree *worktree = NULL;
2841 char *repo_path = NULL;
2842 char *worktree_path = NULL;
2843 const char *path_prefix = "";
2844 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2845 char *commit_id_str = NULL;
2846 struct got_object_id *commit_id = NULL;
2848 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2849 struct got_pathlist_head paths;
2850 struct got_checkout_progress_arg cpa;
2854 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
2857 branch_name = optarg;
2860 commit_id_str = strdup(optarg);
2861 if (commit_id_str == NULL)
2862 return got_error_from_errno("strdup");
2868 path_prefix = optarg;
2883 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2884 "unveil", NULL) == -1)
2888 char *base, *dotgit;
2890 repo_path = realpath(argv[0], NULL);
2891 if (repo_path == NULL)
2892 return got_error_from_errno2("realpath", argv[0]);
2893 cwd = getcwd(NULL, 0);
2895 error = got_error_from_errno("getcwd");
2902 error = got_path_basename(&base, path);
2905 dotgit = strstr(base, ".git");
2908 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2909 error = got_error_from_errno("asprintf");
2914 } else if (argc == 2) {
2915 repo_path = realpath(argv[0], NULL);
2916 if (repo_path == NULL) {
2917 error = got_error_from_errno2("realpath", argv[0]);
2920 worktree_path = realpath(argv[1], NULL);
2921 if (worktree_path == NULL) {
2922 if (errno != ENOENT) {
2923 error = got_error_from_errno2("realpath",
2927 worktree_path = strdup(argv[1]);
2928 if (worktree_path == NULL) {
2929 error = got_error_from_errno("strdup");
2936 got_path_strip_trailing_slashes(repo_path);
2937 got_path_strip_trailing_slashes(worktree_path);
2939 error = got_repo_open(&repo, repo_path, NULL);
2943 /* Pre-create work tree path for unveil(2) */
2944 error = got_path_mkdir(worktree_path);
2946 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2947 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2949 if (!allow_nonempty &&
2950 !got_path_dir_is_empty(worktree_path)) {
2951 error = got_error_path(worktree_path,
2952 GOT_ERR_DIR_NOT_EMPTY);
2957 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2961 error = got_ref_open(&head_ref, repo, branch_name, 0);
2965 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2966 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2969 error = got_worktree_open(&worktree, worktree_path);
2973 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2977 if (!same_path_prefix) {
2978 error = got_error(GOT_ERR_PATH_PREFIX);
2982 if (commit_id_str) {
2983 struct got_reflist_head refs;
2985 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2989 error = got_repo_match_object_id(&commit_id, NULL,
2990 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2991 got_ref_list_free(&refs);
2994 error = check_linear_ancestry(commit_id,
2995 got_worktree_get_base_commit_id(worktree), 0, repo);
2996 if (error != NULL) {
2997 if (error->code == GOT_ERR_ANCESTRY) {
2998 error = checkout_ancestry_error(
2999 head_ref, commit_id_str);
3003 error = check_same_branch(commit_id, head_ref, NULL, repo);
3005 if (error->code == GOT_ERR_ANCESTRY) {
3006 error = checkout_ancestry_error(
3007 head_ref, commit_id_str);
3011 error = got_worktree_set_base_commit_id(worktree, repo,
3015 /* Expand potentially abbreviated commit ID string. */
3016 free(commit_id_str);
3017 error = got_object_id_str(&commit_id_str, commit_id);
3021 commit_id = got_object_id_dup(
3022 got_worktree_get_base_commit_id(worktree));
3023 if (commit_id == NULL) {
3024 error = got_error_from_errno("got_object_id_dup");
3027 error = got_object_id_str(&commit_id_str, commit_id);
3032 error = got_pathlist_append(&paths, "", NULL);
3035 cpa.worktree_path = worktree_path;
3036 cpa.had_base_commit_ref_error = 0;
3037 cpa.verbosity = verbosity;
3038 error = got_worktree_checkout_files(worktree, &paths, repo,
3039 checkout_progress, &cpa, check_cancelled, NULL);
3043 if (got_ref_is_symbolic(head_ref)) {
3044 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3047 refname = got_ref_get_name(ref);
3049 refname = got_ref_get_name(head_ref);
3050 printf("Checked out %s: %s\n", refname, commit_id_str);
3051 printf("Now shut up and hack\n");
3052 if (cpa.had_base_commit_ref_error)
3053 show_worktree_base_ref_warning();
3056 got_ref_close(head_ref);
3059 got_pathlist_free(&paths);
3060 free(commit_id_str);
3063 free(worktree_path);
3068 struct got_update_progress_arg {
3080 print_update_progress_stats(struct got_update_progress_arg *upa)
3082 if (!upa->did_something)
3085 if (upa->conflicts > 0)
3086 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3087 if (upa->obstructed > 0)
3088 printf("File paths obstructed by a non-regular file: %d\n",
3090 if (upa->not_updated > 0)
3091 printf("Files not updated because of existing merge "
3092 "conflicts: %d\n", upa->not_updated);
3096 * The meaning of some status codes differs between merge-style operations and
3097 * update operations. For example, the ! status code means "file was missing"
3098 * if changes were merged into the work tree, and "missing file was restored"
3099 * if the work tree was updated. This function should be used by any operation
3100 * which merges changes into the work tree without updating the work tree.
3103 print_merge_progress_stats(struct got_update_progress_arg *upa)
3105 if (!upa->did_something)
3108 if (upa->conflicts > 0)
3109 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3110 if (upa->obstructed > 0)
3111 printf("File paths obstructed by a non-regular file: %d\n",
3113 if (upa->missing > 0)
3114 printf("Files which had incoming changes but could not be "
3115 "found in the work tree: %d\n", upa->missing);
3116 if (upa->not_deleted > 0)
3117 printf("Files not deleted due to differences in deleted "
3118 "content: %d\n", upa->not_deleted);
3119 if (upa->unversioned > 0)
3120 printf("Files not merged because an unversioned file was "
3121 "found in the work tree: %d\n", upa->unversioned);
3127 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [-q] "
3133 static const struct got_error *
3134 update_progress(void *arg, unsigned char status, const char *path)
3136 struct got_update_progress_arg *upa = arg;
3138 if (status == GOT_STATUS_EXISTS ||
3139 status == GOT_STATUS_BASE_REF_ERR)
3142 upa->did_something = 1;
3144 /* Base commit bump happens silently. */
3145 if (status == GOT_STATUS_BUMP_BASE)
3148 if (status == GOT_STATUS_CONFLICT)
3150 if (status == GOT_STATUS_OBSTRUCTED)
3152 if (status == GOT_STATUS_CANNOT_UPDATE)
3154 if (status == GOT_STATUS_MISSING)
3156 if (status == GOT_STATUS_CANNOT_DELETE)
3158 if (status == GOT_STATUS_UNVERSIONED)
3161 while (path[0] == '/')
3163 if (upa->verbosity >= 0)
3164 printf("%c %s\n", status, path);
3169 static const struct got_error *
3170 switch_head_ref(struct got_reference *head_ref,
3171 struct got_object_id *commit_id, struct got_worktree *worktree,
3172 struct got_repository *repo)
3174 const struct got_error *err = NULL;
3176 int ref_has_moved = 0;
3178 /* Trivial case: switching between two different references. */
3179 if (strcmp(got_ref_get_name(head_ref),
3180 got_worktree_get_head_ref_name(worktree)) != 0) {
3181 printf("Switching work tree from %s to %s\n",
3182 got_worktree_get_head_ref_name(worktree),
3183 got_ref_get_name(head_ref));
3184 return got_worktree_set_head_ref(worktree, head_ref);
3187 err = check_linear_ancestry(commit_id,
3188 got_worktree_get_base_commit_id(worktree), 0, repo);
3190 if (err->code != GOT_ERR_ANCESTRY)
3197 /* Switching to a rebased branch with the same reference name. */
3198 err = got_object_id_str(&base_id_str,
3199 got_worktree_get_base_commit_id(worktree));
3202 printf("Reference %s now points at a different branch\n",
3203 got_worktree_get_head_ref_name(worktree));
3204 printf("Switching work tree from %s to %s\n", base_id_str,
3205 got_worktree_get_head_ref_name(worktree));
3209 static const struct got_error *
3210 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3212 const struct got_error *err;
3215 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3219 return got_error(GOT_ERR_REBASING);
3221 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3225 return got_error(GOT_ERR_HISTEDIT_BUSY);
3230 static const struct got_error *
3231 check_merge_in_progress(struct got_worktree *worktree,
3232 struct got_repository *repo)
3234 const struct got_error *err;
3237 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3241 return got_error(GOT_ERR_MERGE_BUSY);
3246 static const struct got_error *
3247 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3248 char *argv[], struct got_worktree *worktree)
3250 const struct got_error *err = NULL;
3252 struct got_pathlist_entry *new;
3258 return got_error_from_errno("strdup");
3259 return got_pathlist_append(paths, path, NULL);
3262 for (i = 0; i < argc; i++) {
3263 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3266 err = got_pathlist_insert(&new, paths, path, NULL);
3267 if (err || new == NULL /* duplicate */) {
3277 static const struct got_error *
3278 wrap_not_worktree_error(const struct got_error *orig_err,
3279 const char *cmdname, const char *path)
3281 const struct got_error *err;
3282 struct got_repository *repo;
3283 static char msg[512];
3285 err = got_repo_open(&repo, path, NULL);
3289 snprintf(msg, sizeof(msg),
3290 "'got %s' needs a work tree in addition to a git repository\n"
3291 "Work trees can be checked out from this Git repository with "
3293 "The got(1) manual page contains more information.", cmdname);
3294 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3295 got_repo_close(repo);
3299 static const struct got_error *
3300 cmd_update(int argc, char *argv[])
3302 const struct got_error *error = NULL;
3303 struct got_repository *repo = NULL;
3304 struct got_worktree *worktree = NULL;
3305 char *worktree_path = NULL;
3306 struct got_object_id *commit_id = NULL;
3307 char *commit_id_str = NULL;
3308 const char *branch_name = NULL;
3309 struct got_reference *head_ref = NULL;
3310 struct got_pathlist_head paths;
3311 struct got_pathlist_entry *pe;
3312 int ch, verbosity = 0;
3313 struct got_update_progress_arg upa;
3317 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3320 branch_name = optarg;
3323 commit_id_str = strdup(optarg);
3324 if (commit_id_str == NULL)
3325 return got_error_from_errno("strdup");
3340 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3341 "unveil", NULL) == -1)
3344 worktree_path = getcwd(NULL, 0);
3345 if (worktree_path == NULL) {
3346 error = got_error_from_errno("getcwd");
3349 error = got_worktree_open(&worktree, worktree_path);
3351 if (error->code == GOT_ERR_NOT_WORKTREE)
3352 error = wrap_not_worktree_error(error, "update",
3357 error = check_rebase_or_histedit_in_progress(worktree);
3361 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3366 error = apply_unveil(got_repo_get_path(repo), 0,
3367 got_worktree_get_root_path(worktree));
3371 error = check_merge_in_progress(worktree, repo);
3375 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3379 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3380 got_worktree_get_head_ref_name(worktree), 0);
3383 if (commit_id_str == NULL) {
3384 error = got_ref_resolve(&commit_id, repo, head_ref);
3387 error = got_object_id_str(&commit_id_str, commit_id);
3391 struct got_reflist_head refs;
3393 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3397 error = got_repo_match_object_id(&commit_id, NULL,
3398 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3399 got_ref_list_free(&refs);
3400 free(commit_id_str);
3401 commit_id_str = NULL;
3404 error = got_object_id_str(&commit_id_str, commit_id);
3410 struct got_object_id *head_commit_id;
3411 TAILQ_FOREACH(pe, &paths, entry) {
3412 if (pe->path_len == 0)
3414 error = got_error_msg(GOT_ERR_BAD_PATH,
3415 "switching between branches requires that "
3416 "the entire work tree gets updated");
3419 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3422 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3424 free(head_commit_id);
3427 error = check_same_branch(commit_id, head_ref, NULL, repo);
3430 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3434 error = check_linear_ancestry(commit_id,
3435 got_worktree_get_base_commit_id(worktree), 0, repo);
3436 if (error != NULL) {
3437 if (error->code == GOT_ERR_ANCESTRY)
3438 error = got_error(GOT_ERR_BRANCH_MOVED);
3441 error = check_same_branch(commit_id, head_ref, NULL, repo);
3446 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3448 error = got_worktree_set_base_commit_id(worktree, repo,
3454 memset(&upa, 0, sizeof(upa));
3455 upa.verbosity = verbosity;
3456 error = got_worktree_checkout_files(worktree, &paths, repo,
3457 update_progress, &upa, check_cancelled, NULL);
3461 if (upa.did_something) {
3462 printf("Updated to %s: %s\n",
3463 got_worktree_get_head_ref_name(worktree), commit_id_str);
3465 printf("Already up-to-date\n");
3466 print_update_progress_stats(&upa);
3468 free(worktree_path);
3469 TAILQ_FOREACH(pe, &paths, entry)
3470 free((char *)pe->path);
3471 got_pathlist_free(&paths);
3473 free(commit_id_str);
3477 static const struct got_error *
3478 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3479 const char *path, int diff_context, int ignore_whitespace,
3480 int force_text_diff, struct got_repository *repo)
3482 const struct got_error *err = NULL;
3483 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3484 FILE *f1 = NULL, *f2 = NULL;
3487 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3490 f1 = got_opentemp();
3492 err = got_error_from_errno("got_opentemp");
3497 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3501 f2 = got_opentemp();
3503 err = got_error_from_errno("got_opentemp");
3507 while (path[0] == '/')
3509 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3510 diff_context, ignore_whitespace, force_text_diff, stdout);
3513 got_object_blob_close(blob1);
3514 got_object_blob_close(blob2);
3515 if (f1 && fclose(f1) == EOF && err == NULL)
3516 err = got_error_from_errno("fclose");
3517 if (f2 && fclose(f2) == EOF && err == NULL)
3518 err = got_error_from_errno("fclose");
3522 static const struct got_error *
3523 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3524 const char *path, int diff_context, int ignore_whitespace,
3525 int force_text_diff, struct got_repository *repo)
3527 const struct got_error *err = NULL;
3528 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3529 struct got_diff_blob_output_unidiff_arg arg;
3530 FILE *f1 = NULL, *f2 = NULL;
3533 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3536 f1 = got_opentemp();
3538 err = got_error_from_errno("got_opentemp");
3543 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3547 f2 = got_opentemp();
3549 err = got_error_from_errno("got_opentemp");
3553 arg.diff_context = diff_context;
3554 arg.ignore_whitespace = ignore_whitespace;
3555 arg.force_text_diff = force_text_diff;
3556 arg.outfile = stdout;
3557 arg.line_offsets = NULL;
3559 while (path[0] == '/')
3561 err = got_diff_tree(tree1, tree2, f1, f2, path, path, repo,
3562 got_diff_blob_output_unidiff, &arg, 1);
3565 got_object_tree_close(tree1);
3567 got_object_tree_close(tree2);
3568 if (f1 && fclose(f1) == EOF && err == NULL)
3569 err = got_error_from_errno("fclose");
3570 if (f2 && fclose(f2) == EOF && err == NULL)
3571 err = got_error_from_errno("fclose");
3575 static const struct got_error *
3576 get_changed_paths(struct got_pathlist_head *paths,
3577 struct got_commit_object *commit, struct got_repository *repo)
3579 const struct got_error *err = NULL;
3580 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3581 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3582 struct got_object_qid *qid;
3584 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3586 struct got_commit_object *pcommit;
3587 err = got_object_open_as_commit(&pcommit, repo,
3592 tree_id1 = got_object_id_dup(
3593 got_object_commit_get_tree_id(pcommit));
3594 if (tree_id1 == NULL) {
3595 got_object_commit_close(pcommit);
3596 return got_error_from_errno("got_object_id_dup");
3598 got_object_commit_close(pcommit);
3603 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3608 tree_id2 = got_object_commit_get_tree_id(commit);
3609 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3613 err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
3614 got_diff_tree_collect_changed_paths, paths, 0);
3617 got_object_tree_close(tree1);
3619 got_object_tree_close(tree2);
3624 static const struct got_error *
3625 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3626 const char *path, int diff_context, struct got_repository *repo)
3628 const struct got_error *err = NULL;
3629 struct got_commit_object *pcommit = NULL;
3630 char *id_str1 = NULL, *id_str2 = NULL;
3631 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3632 struct got_object_qid *qid;
3634 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3636 err = got_object_open_as_commit(&pcommit, repo,
3642 if (path && path[0] != '\0') {
3644 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3647 err = got_object_id_str(&id_str2, obj_id2);
3653 err = got_object_id_by_path(&obj_id1, repo,
3656 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3661 err = got_object_id_str(&id_str1, obj_id1);
3668 err = got_object_get_type(&obj_type, repo, obj_id2);
3673 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3675 case GOT_OBJ_TYPE_BLOB:
3676 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3679 case GOT_OBJ_TYPE_TREE:
3680 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3684 err = got_error(GOT_ERR_OBJ_TYPE);
3690 obj_id2 = got_object_commit_get_tree_id(commit);
3691 err = got_object_id_str(&id_str2, obj_id2);
3695 obj_id1 = got_object_commit_get_tree_id(pcommit);
3696 err = got_object_id_str(&id_str1, obj_id1);
3700 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3702 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3709 got_object_commit_close(pcommit);
3714 get_datestr(time_t *time, char *datebuf)
3716 struct tm mytm, *tm;
3719 tm = gmtime_r(time, &mytm);
3722 s = asctime_r(tm, datebuf);
3725 p = strchr(s, '\n');
3731 static const struct got_error *
3732 match_logmsg(int *have_match, struct got_object_id *id,
3733 struct got_commit_object *commit, regex_t *regex)
3735 const struct got_error *err = NULL;
3736 regmatch_t regmatch;
3737 char *id_str = NULL, *logmsg = NULL;
3741 err = got_object_id_str(&id_str, id);
3745 err = got_object_commit_get_logmsg(&logmsg, commit);
3749 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3758 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3761 regmatch_t regmatch;
3762 struct got_pathlist_entry *pe;
3766 TAILQ_FOREACH(pe, changed_paths, entry) {
3767 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3774 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3776 static const struct got_error*
3777 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3778 struct got_object_id *id, struct got_repository *repo)
3780 static const struct got_error *err = NULL;
3781 struct got_reflist_entry *re;
3787 TAILQ_FOREACH(re, refs, entry) {
3788 struct got_tag_object *tag = NULL;
3789 struct got_object_id *ref_id;
3792 name = got_ref_get_name(re->ref);
3793 if (strcmp(name, GOT_REF_HEAD) == 0)
3795 if (strncmp(name, "refs/", 5) == 0)
3797 if (strncmp(name, "got/", 4) == 0)
3799 if (strncmp(name, "heads/", 6) == 0)
3801 if (strncmp(name, "remotes/", 8) == 0) {
3803 s = strstr(name, "/" GOT_REF_HEAD);
3804 if (s != NULL && s[strlen(s)] == '\0')
3807 err = got_ref_resolve(&ref_id, repo, re->ref);
3810 if (strncmp(name, "tags/", 5) == 0) {
3811 err = got_object_open_as_tag(&tag, repo, ref_id);
3813 if (err->code != GOT_ERR_OBJ_TYPE) {
3817 /* Ref points at something other than a tag. */
3822 cmp = got_object_id_cmp(tag ?
3823 got_object_tag_get_object_id(tag) : ref_id, id);
3826 got_object_tag_close(tag);
3830 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3831 s ? ", " : "", name) == -1) {
3832 err = got_error_from_errno("asprintf");
3843 static const struct got_error *
3844 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3845 struct got_repository *repo, const char *path,
3846 struct got_pathlist_head *changed_paths, int show_patch,
3847 int diff_context, struct got_reflist_object_id_map *refs_idmap,
3848 const char *custom_refs_str)
3850 const struct got_error *err = NULL;
3851 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3853 time_t committer_time;
3854 const char *author, *committer;
3855 char *refs_str = NULL;
3857 err = got_object_id_str(&id_str, id);
3861 if (custom_refs_str == NULL) {
3862 struct got_reflist_head *refs;
3863 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3865 err = build_refs_str(&refs_str, refs, id, repo);
3871 printf(GOT_COMMIT_SEP_STR);
3872 if (custom_refs_str)
3873 printf("commit %s (%s)\n", id_str, custom_refs_str);
3875 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3876 refs_str ? refs_str : "", refs_str ? ")" : "");
3881 printf("from: %s\n", got_object_commit_get_author(commit));
3882 committer_time = got_object_commit_get_committer_time(commit);
3883 datestr = get_datestr(&committer_time, datebuf);
3885 printf("date: %s UTC\n", datestr);
3886 author = got_object_commit_get_author(commit);
3887 committer = got_object_commit_get_committer(commit);
3888 if (strcmp(author, committer) != 0)
3889 printf("via: %s\n", committer);
3890 if (got_object_commit_get_nparents(commit) > 1) {
3891 const struct got_object_id_queue *parent_ids;
3892 struct got_object_qid *qid;
3894 parent_ids = got_object_commit_get_parent_ids(commit);
3895 STAILQ_FOREACH(qid, parent_ids, entry) {
3896 err = got_object_id_str(&id_str, &qid->id);
3899 printf("parent %d: %s\n", n++, id_str);
3905 err = got_object_commit_get_logmsg(&logmsg0, commit);
3911 line = strsep(&logmsg, "\n");
3913 printf(" %s\n", line);
3917 if (changed_paths) {
3918 struct got_pathlist_entry *pe;
3919 TAILQ_FOREACH(pe, changed_paths, entry) {
3920 struct got_diff_changed_path *cp = pe->data;
3921 printf(" %c %s\n", cp->status, pe->path);
3926 err = print_patch(commit, id, path, diff_context, repo);
3931 if (fflush(stdout) != 0 && err == NULL)
3932 err = got_error_from_errno("fflush");
3939 static const struct got_error *
3940 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3941 struct got_repository *repo, const char *path, int show_changed_paths,
3942 int show_patch, const char *search_pattern, int diff_context, int limit,
3943 int log_branches, int reverse_display_order,
3944 struct got_reflist_object_id_map *refs_idmap)
3946 const struct got_error *err;
3947 struct got_commit_graph *graph;
3950 struct got_object_id_queue reversed_commits;
3951 struct got_object_qid *qid;
3952 struct got_commit_object *commit;
3953 struct got_pathlist_head changed_paths;
3954 struct got_pathlist_entry *pe;
3956 STAILQ_INIT(&reversed_commits);
3957 TAILQ_INIT(&changed_paths);
3959 if (search_pattern && regcomp(®ex, search_pattern,
3960 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3961 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3963 err = got_commit_graph_open(&graph, path, !log_branches);
3966 err = got_commit_graph_iter_start(graph, root_id, repo,
3967 check_cancelled, NULL);
3971 struct got_object_id *id;
3973 if (sigint_received || sigpipe_received)
3976 err = got_commit_graph_iter_next(&id, graph, repo,
3977 check_cancelled, NULL);
3979 if (err->code == GOT_ERR_ITER_COMPLETED)
3986 err = got_object_open_as_commit(&commit, repo, id);
3990 if (show_changed_paths && !reverse_display_order) {
3991 err = get_changed_paths(&changed_paths, commit, repo);
3996 if (search_pattern) {
3997 err = match_logmsg(&have_match, id, commit, ®ex);
3999 got_object_commit_close(commit);
4002 if (have_match == 0 && show_changed_paths)
4003 match_changed_paths(&have_match,
4004 &changed_paths, ®ex);
4005 if (have_match == 0) {
4006 got_object_commit_close(commit);
4007 TAILQ_FOREACH(pe, &changed_paths, entry) {
4008 free((char *)pe->path);
4011 got_pathlist_free(&changed_paths);
4016 if (reverse_display_order) {
4017 err = got_object_qid_alloc(&qid, id);
4020 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4021 got_object_commit_close(commit);
4023 err = print_commit(commit, id, repo, path,
4024 show_changed_paths ? &changed_paths : NULL,
4025 show_patch, diff_context, refs_idmap, NULL);
4026 got_object_commit_close(commit);
4030 if ((limit && --limit == 0) ||
4031 (end_id && got_object_id_cmp(id, end_id) == 0))
4034 TAILQ_FOREACH(pe, &changed_paths, entry) {
4035 free((char *)pe->path);
4038 got_pathlist_free(&changed_paths);
4040 if (reverse_display_order) {
4041 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4042 err = got_object_open_as_commit(&commit, repo,
4046 if (show_changed_paths) {
4047 err = get_changed_paths(&changed_paths,
4052 err = print_commit(commit, &qid->id, repo, path,
4053 show_changed_paths ? &changed_paths : NULL,
4054 show_patch, diff_context, refs_idmap, NULL);
4055 got_object_commit_close(commit);
4058 TAILQ_FOREACH(pe, &changed_paths, entry) {
4059 free((char *)pe->path);
4062 got_pathlist_free(&changed_paths);
4066 while (!STAILQ_EMPTY(&reversed_commits)) {
4067 qid = STAILQ_FIRST(&reversed_commits);
4068 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4069 got_object_qid_free(qid);
4071 TAILQ_FOREACH(pe, &changed_paths, entry) {
4072 free((char *)pe->path);
4075 got_pathlist_free(&changed_paths);
4078 got_commit_graph_close(graph);
4085 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
4086 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
4087 "[-R] [path]\n", getprogname());
4092 get_default_log_limit(void)
4094 const char *got_default_log_limit;
4098 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4099 if (got_default_log_limit == NULL)
4101 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4107 static const struct got_error *
4108 cmd_log(int argc, char *argv[])
4110 const struct got_error *error;
4111 struct got_repository *repo = NULL;
4112 struct got_worktree *worktree = NULL;
4113 struct got_object_id *start_id = NULL, *end_id = NULL;
4114 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4115 const char *start_commit = NULL, *end_commit = NULL;
4116 const char *search_pattern = NULL;
4117 int diff_context = -1, ch;
4118 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4119 int reverse_display_order = 0;
4121 struct got_reflist_head refs;
4122 struct got_reflist_object_id_map *refs_idmap = NULL;
4127 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4133 limit = get_default_log_limit();
4135 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
4141 show_changed_paths = 1;
4144 start_commit = optarg;
4147 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4150 errx(1, "number of context lines is %s: %s",
4154 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4156 errx(1, "number of commits is %s: %s",
4163 repo_path = realpath(optarg, NULL);
4164 if (repo_path == NULL)
4165 return got_error_from_errno2("realpath",
4167 got_path_strip_trailing_slashes(repo_path);
4170 reverse_display_order = 1;
4173 search_pattern = optarg;
4176 end_commit = optarg;
4187 if (diff_context == -1)
4189 else if (!show_patch)
4190 errx(1, "-C requires -p");
4192 cwd = getcwd(NULL, 0);
4194 error = got_error_from_errno("getcwd");
4198 if (repo_path == NULL) {
4199 error = got_worktree_open(&worktree, cwd);
4200 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4207 error = got_worktree_resolve_path(&path, worktree,
4212 path = strdup(argv[0]);
4214 error = got_error_from_errno("strdup");
4218 } else if (argc != 0)
4221 if (repo_path == NULL) {
4222 repo_path = worktree ?
4223 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4225 if (repo_path == NULL) {
4226 error = got_error_from_errno("strdup");
4230 error = got_repo_open(&repo, repo_path, NULL);
4234 error = apply_unveil(got_repo_get_path(repo), 1,
4235 worktree ? got_worktree_get_root_path(worktree) : NULL);
4239 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4243 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4247 if (start_commit == NULL) {
4248 struct got_reference *head_ref;
4249 struct got_commit_object *commit = NULL;
4250 error = got_ref_open(&head_ref, repo,
4251 worktree ? got_worktree_get_head_ref_name(worktree)
4255 error = got_ref_resolve(&start_id, repo, head_ref);
4256 got_ref_close(head_ref);
4259 error = got_object_open_as_commit(&commit, repo,
4263 got_object_commit_close(commit);
4265 error = got_repo_match_object_id(&start_id, NULL,
4266 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4270 if (end_commit != NULL) {
4271 error = got_repo_match_object_id(&end_id, NULL,
4272 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4279 * If a path was specified on the command line it was resolved
4280 * to a path in the work tree above. Prepend the work tree's
4281 * path prefix to obtain the corresponding in-repository path.
4285 prefix = got_worktree_get_path_prefix(worktree);
4286 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4287 (path[0] != '\0') ? "/" : "", path) == -1) {
4288 error = got_error_from_errno("asprintf");
4293 error = got_repo_map_path(&in_repo_path, repo,
4299 path = in_repo_path;
4303 /* Release work tree lock. */
4304 got_worktree_close(worktree);
4308 error = print_commits(start_id, end_id, repo, path ? path : "",
4309 show_changed_paths, show_patch, search_pattern, diff_context,
4310 limit, log_branches, reverse_display_order, refs_idmap);
4316 got_worktree_close(worktree);
4318 const struct got_error *close_err = got_repo_close(repo);
4323 got_reflist_object_id_map_free(refs_idmap);
4324 got_ref_list_free(&refs);
4331 fprintf(stderr, "usage: %s diff [-a] [-c commit] [-C number] "
4332 "[-r repository-path] [-s] [-w] [-P] "
4333 "[object1 object2 | path ...]\n", getprogname());
4337 struct print_diff_arg {
4338 struct got_repository *repo;
4339 struct got_worktree *worktree;
4344 int ignore_whitespace;
4345 int force_text_diff;
4349 * Create a file which contains the target path of a symlink so we can feed
4350 * it as content to the diff engine.
4352 static const struct got_error *
4353 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4354 const char *abspath)
4356 const struct got_error *err = NULL;
4357 char target_path[PATH_MAX];
4358 ssize_t target_len, outlen;
4363 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4364 if (target_len == -1)
4365 return got_error_from_errno2("readlinkat", abspath);
4367 target_len = readlink(abspath, target_path, PATH_MAX);
4368 if (target_len == -1)
4369 return got_error_from_errno2("readlink", abspath);
4372 *fd = got_opentempfd();
4374 return got_error_from_errno("got_opentempfd");
4376 outlen = write(*fd, target_path, target_len);
4378 err = got_error_from_errno("got_opentempfd");
4382 if (lseek(*fd, 0, SEEK_SET) == -1) {
4383 err = got_error_from_errno2("lseek", abspath);
4394 static const struct got_error *
4395 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4396 const char *path, struct got_object_id *blob_id,
4397 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4398 int dirfd, const char *de_name)
4400 struct print_diff_arg *a = arg;
4401 const struct got_error *err = NULL;
4402 struct got_blob_object *blob1 = NULL;
4404 FILE *f1 = NULL, *f2 = NULL;
4405 char *abspath = NULL, *label1 = NULL;
4409 if (a->diff_staged) {
4410 if (staged_status != GOT_STATUS_MODIFY &&
4411 staged_status != GOT_STATUS_ADD &&
4412 staged_status != GOT_STATUS_DELETE)
4415 if (staged_status == GOT_STATUS_DELETE)
4417 if (status == GOT_STATUS_NONEXISTENT)
4418 return got_error_set_errno(ENOENT, path);
4419 if (status != GOT_STATUS_MODIFY &&
4420 status != GOT_STATUS_ADD &&
4421 status != GOT_STATUS_DELETE &&
4422 status != GOT_STATUS_CONFLICT)
4426 if (!a->header_shown) {
4427 printf("diff %s %s%s\n", a->id_str,
4428 got_worktree_get_root_path(a->worktree),
4429 a->diff_staged ? " (staged changes)" : "");
4430 a->header_shown = 1;
4433 if (a->diff_staged) {
4434 const char *label1 = NULL, *label2 = NULL;
4435 switch (staged_status) {
4436 case GOT_STATUS_MODIFY:
4440 case GOT_STATUS_ADD:
4443 case GOT_STATUS_DELETE:
4447 return got_error(GOT_ERR_FILE_STATUS);
4449 f1 = got_opentemp();
4451 err = got_error_from_errno("got_opentemp");
4454 f2 = got_opentemp();
4456 err = got_error_from_errno("got_opentemp");
4459 err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4460 blob_id, staged_blob_id, label1, label2, a->diff_context,
4461 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4465 if (staged_status == GOT_STATUS_ADD ||
4466 staged_status == GOT_STATUS_MODIFY) {
4468 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4472 err = got_object_id_str(&id_str, staged_blob_id);
4475 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4476 err = got_error_from_errno("asprintf");
4481 } else if (status != GOT_STATUS_ADD) {
4482 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4487 if (status != GOT_STATUS_DELETE) {
4488 if (asprintf(&abspath, "%s/%s",
4489 got_worktree_get_root_path(a->worktree), path) == -1) {
4490 err = got_error_from_errno("asprintf");
4495 fd = openat(dirfd, de_name,
4496 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4498 if (!got_err_open_nofollow_on_symlink()) {
4499 err = got_error_from_errno2("openat",
4503 err = get_symlink_target_file(&fd, dirfd,
4509 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4511 if (!got_err_open_nofollow_on_symlink()) {
4512 err = got_error_from_errno2("open",
4516 err = get_symlink_target_file(&fd, dirfd,
4522 if (fstat(fd, &sb) == -1) {
4523 err = got_error_from_errno2("fstat", abspath);
4526 f2 = fdopen(fd, "r");
4528 err = got_error_from_errno2("fdopen", abspath);
4536 f1 = got_opentemp();
4538 err = got_error_from_errno("got_opentemp");
4541 err = got_object_blob_dump_to_file(&size1, NULL, NULL, f1,
4547 err = got_diff_blob_file(blob1, f1, size1, label1, f2, sb.st_size,
4548 path, a->diff_context, a->ignore_whitespace, a->force_text_diff,
4552 got_object_blob_close(blob1);
4553 if (f1 && fclose(f1) == EOF && err == NULL)
4554 err = got_error_from_errno("fclose");
4555 if (f2 && fclose(f2) == EOF && err == NULL)
4556 err = got_error_from_errno("fclose");
4557 if (fd != -1 && close(fd) == -1 && err == NULL)
4558 err = got_error_from_errno("close");
4563 static const struct got_error *
4564 cmd_diff(int argc, char *argv[])
4566 const struct got_error *error;
4567 struct got_repository *repo = NULL;
4568 struct got_worktree *worktree = NULL;
4569 char *cwd = NULL, *repo_path = NULL;
4570 const char *commit_args[2] = { NULL, NULL };
4571 int ncommit_args = 0;
4572 struct got_object_id *ids[2] = { NULL, NULL };
4573 char *labels[2] = { NULL, NULL };
4574 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
4575 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
4576 int force_text_diff = 0, force_path = 0, rflag = 0;
4578 struct got_reflist_head refs;
4579 struct got_pathlist_head paths;
4580 struct got_pathlist_entry *pe;
4581 FILE *f1 = NULL, *f2 = NULL;
4587 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4592 while ((ch = getopt(argc, argv, "ac:C:r:swP")) != -1) {
4595 force_text_diff = 1;
4598 if (ncommit_args >= 2)
4599 errx(1, "too many -c options used");
4600 commit_args[ncommit_args++] = optarg;
4603 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4606 errx(1, "number of context lines is %s: %s",
4610 repo_path = realpath(optarg, NULL);
4611 if (repo_path == NULL)
4612 return got_error_from_errno2("realpath",
4614 got_path_strip_trailing_slashes(repo_path);
4621 ignore_whitespace = 1;
4635 cwd = getcwd(NULL, 0);
4637 error = got_error_from_errno("getcwd");
4641 if (repo_path == NULL) {
4642 error = got_worktree_open(&worktree, cwd);
4643 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4649 strdup(got_worktree_get_repo_path(worktree));
4650 if (repo_path == NULL) {
4651 error = got_error_from_errno("strdup");
4655 repo_path = strdup(cwd);
4656 if (repo_path == NULL) {
4657 error = got_error_from_errno("strdup");
4663 error = got_repo_open(&repo, repo_path, NULL);
4668 if (rflag || worktree == NULL || ncommit_args > 0) {
4670 error = got_error_msg(GOT_ERR_NOT_IMPL,
4671 "-P option can only be used when diffing "
4676 error = got_error_msg(GOT_ERR_NOT_IMPL,
4677 "-s option can only be used when diffing "
4683 error = apply_unveil(got_repo_get_path(repo), 1,
4684 worktree ? got_worktree_get_root_path(worktree) : NULL);
4688 if ((!force_path && argc == 2) || ncommit_args > 0) {
4689 int obj_type = (ncommit_args > 0 ?
4690 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
4691 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4695 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
4697 if (ncommit_args > 0)
4698 arg = commit_args[i];
4701 error = got_repo_match_object_id(&ids[i], &labels[i],
4702 arg, obj_type, &refs, repo);
4704 if (error->code != GOT_ERR_NOT_REF &&
4705 error->code != GOT_ERR_NO_OBJ)
4707 if (ncommit_args > 0)
4715 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
4716 struct print_diff_arg arg;
4719 if (worktree == NULL) {
4720 if (argc == 2 && ids[0] == NULL) {
4721 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
4723 } else if (argc == 2 && ids[1] == NULL) {
4724 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
4726 } else if (argc > 0) {
4727 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
4728 "%s", "specified paths cannot be resolved");
4731 error = got_error(GOT_ERR_NOT_WORKTREE);
4736 error = get_worktree_paths_from_argv(&paths, argc, argv,
4741 error = got_object_id_str(&id_str,
4742 got_worktree_get_base_commit_id(worktree));
4746 arg.worktree = worktree;
4747 arg.diff_context = diff_context;
4748 arg.id_str = id_str;
4749 arg.header_shown = 0;
4750 arg.diff_staged = diff_staged;
4751 arg.ignore_whitespace = ignore_whitespace;
4752 arg.force_text_diff = force_text_diff;
4754 error = got_worktree_status(worktree, &paths, repo, 0,
4755 print_diff, &arg, check_cancelled, NULL);
4760 if (ncommit_args == 1) {
4761 struct got_commit_object *commit;
4762 error = got_object_open_as_commit(&commit, repo, ids[0]);
4766 labels[1] = labels[0];
4768 if (got_object_commit_get_nparents(commit) > 0) {
4769 const struct got_object_id_queue *pids;
4770 struct got_object_qid *pid;
4771 pids = got_object_commit_get_parent_ids(commit);
4772 pid = STAILQ_FIRST(pids);
4773 ids[0] = got_object_id_dup(&pid->id);
4774 if (ids[0] == NULL) {
4775 error = got_error_from_errno(
4776 "got_object_id_dup");
4777 got_object_commit_close(commit);
4780 error = got_object_id_str(&labels[0], ids[0]);
4782 got_object_commit_close(commit);
4787 labels[0] = strdup("/dev/null");
4788 if (labels[0] == NULL) {
4789 error = got_error_from_errno("strdup");
4790 got_object_commit_close(commit);
4795 got_object_commit_close(commit);
4798 if (ncommit_args == 0 && argc > 2) {
4799 error = got_error_msg(GOT_ERR_BAD_PATH,
4800 "path arguments cannot be used when diffing two objects");
4805 error = got_object_get_type(&type1, repo, ids[0]);
4810 error = got_object_get_type(&type2, repo, ids[1]);
4813 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
4814 error = got_error(GOT_ERR_OBJ_TYPE);
4817 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 0) {
4818 error = got_error_msg(GOT_ERR_OBJ_TYPE,
4819 "path arguments cannot be used when diffing blobs");
4823 for (i = 0; ncommit_args > 0 && i < argc; i++) {
4825 struct got_pathlist_entry *new;
4829 error = got_worktree_resolve_path(&p, worktree,
4833 prefix = got_worktree_get_path_prefix(worktree);
4834 while (prefix[0] == '/')
4836 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4837 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
4839 error = got_error_from_errno("asprintf");
4845 char *mapped_path, *s;
4846 error = got_repo_map_path(&mapped_path, repo, argv[i]);
4852 in_repo_path = strdup(s);
4853 if (in_repo_path == NULL) {
4854 error = got_error_from_errno("asprintf");
4861 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
4862 if (error || new == NULL /* duplicate */)
4869 /* Release work tree lock. */
4870 got_worktree_close(worktree);
4874 f1 = got_opentemp();
4876 error = got_error_from_errno("got_opentemp");
4880 f2 = got_opentemp();
4882 error = got_error_from_errno("got_opentemp");
4886 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
4887 case GOT_OBJ_TYPE_BLOB:
4888 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
4889 ids[0], ids[1], NULL, NULL, diff_context,
4890 ignore_whitespace, force_text_diff, repo, stdout);
4892 case GOT_OBJ_TYPE_TREE:
4893 error = got_diff_objects_as_trees(NULL, NULL, f1, f2,
4894 ids[0], ids[1], &paths, "", "", diff_context,
4895 ignore_whitespace, force_text_diff, repo, stdout);
4897 case GOT_OBJ_TYPE_COMMIT:
4898 printf("diff %s %s\n", labels[0], labels[1]);
4899 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
4900 ids[0], ids[1], &paths, diff_context, ignore_whitespace,
4901 force_text_diff, repo, stdout);
4904 error = got_error(GOT_ERR_OBJ_TYPE);
4912 got_worktree_close(worktree);
4914 const struct got_error *close_err = got_repo_close(repo);
4918 TAILQ_FOREACH(pe, &paths, entry)
4919 free((char *)pe->path);
4920 got_pathlist_free(&paths);
4921 got_ref_list_free(&refs);
4922 if (f1 && fclose(f1) == EOF && error == NULL)
4923 error = got_error_from_errno("fclose");
4924 if (f2 && fclose(f2) == EOF && error == NULL)
4925 error = got_error_from_errno("fclose");
4933 "usage: %s blame [-c commit] [-r repository-path] path\n",
4942 char datebuf[11]; /* YYYY-MM-DD + NUL */
4945 struct blame_cb_args {
4946 struct blame_line *lines;
4950 off_t *line_offsets;
4952 struct got_repository *repo;
4955 static const struct got_error *
4956 blame_cb(void *arg, int nlines, int lineno,
4957 struct got_commit_object *commit, struct got_object_id *id)
4959 const struct got_error *err = NULL;
4960 struct blame_cb_args *a = arg;
4961 struct blame_line *bline;
4963 size_t linesize = 0;
4966 time_t committer_time;
4968 if (nlines != a->nlines ||
4969 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4970 return got_error(GOT_ERR_RANGE);
4972 if (sigint_received)
4973 return got_error(GOT_ERR_ITER_COMPLETED);
4976 return NULL; /* no change in this commit */
4978 /* Annotate this line. */
4979 bline = &a->lines[lineno - 1];
4980 if (bline->annotated)
4982 err = got_object_id_str(&bline->id_str, id);
4986 bline->committer = strdup(got_object_commit_get_committer(commit));
4987 if (bline->committer == NULL) {
4988 err = got_error_from_errno("strdup");
4992 committer_time = got_object_commit_get_committer_time(commit);
4993 if (gmtime_r(&committer_time, &tm) == NULL)
4994 return got_error_from_errno("gmtime_r");
4995 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4997 err = got_error(GOT_ERR_NO_SPACE);
5000 bline->annotated = 1;
5002 /* Print lines annotated so far. */
5003 bline = &a->lines[a->lineno_cur - 1];
5004 if (!bline->annotated)
5007 offset = a->line_offsets[a->lineno_cur - 1];
5008 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5009 err = got_error_from_errno("fseeko");
5013 while (bline->annotated) {
5014 char *smallerthan, *at, *nl, *committer;
5017 if (getline(&line, &linesize, a->f) == -1) {
5019 err = got_error_from_errno("getline");
5023 committer = bline->committer;
5024 smallerthan = strchr(committer, '<');
5025 if (smallerthan && smallerthan[1] != '\0')
5026 committer = smallerthan + 1;
5027 at = strchr(committer, '@');
5030 len = strlen(committer);
5032 committer[8] = '\0';
5034 nl = strchr(line, '\n');
5037 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5038 bline->id_str, bline->datebuf, committer, line);
5041 bline = &a->lines[a->lineno_cur - 1];
5048 static const struct got_error *
5049 cmd_blame(int argc, char *argv[])
5051 const struct got_error *error;
5052 struct got_repository *repo = NULL;
5053 struct got_worktree *worktree = NULL;
5054 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5055 char *link_target = NULL;
5056 struct got_object_id *obj_id = NULL;
5057 struct got_object_id *commit_id = NULL;
5058 struct got_commit_object *commit = NULL;
5059 struct got_blob_object *blob = NULL;
5060 char *commit_id_str = NULL;
5061 struct blame_cb_args bca;
5062 int ch, obj_type, i;
5065 memset(&bca, 0, sizeof(bca));
5068 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5073 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5076 commit_id_str = optarg;
5079 repo_path = realpath(optarg, NULL);
5080 if (repo_path == NULL)
5081 return got_error_from_errno2("realpath",
5083 got_path_strip_trailing_slashes(repo_path);
5099 cwd = getcwd(NULL, 0);
5101 error = got_error_from_errno("getcwd");
5104 if (repo_path == NULL) {
5105 error = got_worktree_open(&worktree, cwd);
5106 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5112 strdup(got_worktree_get_repo_path(worktree));
5113 if (repo_path == NULL) {
5114 error = got_error_from_errno("strdup");
5119 repo_path = strdup(cwd);
5120 if (repo_path == NULL) {
5121 error = got_error_from_errno("strdup");
5127 error = got_repo_open(&repo, repo_path, NULL);
5132 const char *prefix = got_worktree_get_path_prefix(worktree);
5135 error = got_worktree_resolve_path(&p, worktree, path);
5138 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5139 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5141 error = got_error_from_errno("asprintf");
5146 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5148 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5151 error = got_repo_map_path(&in_repo_path, repo, path);
5156 if (commit_id_str == NULL) {
5157 struct got_reference *head_ref;
5158 error = got_ref_open(&head_ref, repo, worktree ?
5159 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5162 error = got_ref_resolve(&commit_id, repo, head_ref);
5163 got_ref_close(head_ref);
5167 struct got_reflist_head refs;
5169 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5173 error = got_repo_match_object_id(&commit_id, NULL,
5174 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5175 got_ref_list_free(&refs);
5181 /* Release work tree lock. */
5182 got_worktree_close(worktree);
5186 error = got_object_open_as_commit(&commit, repo, commit_id);
5190 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5195 error = got_object_id_by_path(&obj_id, repo, commit,
5196 link_target ? link_target : in_repo_path);
5200 error = got_object_get_type(&obj_type, repo, obj_id);
5204 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5205 error = got_error_path(link_target ? link_target : in_repo_path,
5210 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
5213 bca.f = got_opentemp();
5214 if (bca.f == NULL) {
5215 error = got_error_from_errno("got_opentemp");
5218 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5219 &bca.line_offsets, bca.f, blob);
5220 if (error || bca.nlines == 0)
5223 /* Don't include \n at EOF in the blame line count. */
5224 if (bca.line_offsets[bca.nlines - 1] == filesize)
5227 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5228 if (bca.lines == NULL) {
5229 error = got_error_from_errno("calloc");
5233 bca.nlines_prec = 0;
5241 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5242 repo, blame_cb, &bca, check_cancelled, NULL);
5251 got_object_commit_close(commit);
5253 got_object_blob_close(blob);
5255 got_worktree_close(worktree);
5257 const struct got_error *close_err = got_repo_close(repo);
5262 for (i = 0; i < bca.nlines; i++) {
5263 struct blame_line *bline = &bca.lines[i];
5264 free(bline->id_str);
5265 free(bline->committer);
5269 free(bca.line_offsets);
5270 if (bca.f && fclose(bca.f) == EOF && error == NULL)
5271 error = got_error_from_errno("fclose");
5279 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
5284 static const struct got_error *
5285 print_entry(struct got_tree_entry *te, const char *id, const char *path,
5286 const char *root_path, struct got_repository *repo)
5288 const struct got_error *err = NULL;
5289 int is_root_path = (strcmp(path, root_path) == 0);
5290 const char *modestr = "";
5291 mode_t mode = got_tree_entry_get_mode(te);
5292 char *link_target = NULL;
5294 path += strlen(root_path);
5295 while (path[0] == '/')
5298 if (got_object_tree_entry_is_submodule(te))
5300 else if (S_ISLNK(mode)) {
5303 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
5306 for (i = 0; i < strlen(link_target); i++) {
5307 if (!isprint((unsigned char)link_target[i]))
5308 link_target[i] = '?';
5313 else if (S_ISDIR(mode))
5315 else if (mode & S_IXUSR)
5318 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
5319 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
5320 link_target ? " -> ": "", link_target ? link_target : "");
5326 static const struct got_error *
5327 print_tree(const char *path, struct got_commit_object *commit,
5328 int show_ids, int recurse, const char *root_path,
5329 struct got_repository *repo)
5331 const struct got_error *err = NULL;
5332 struct got_object_id *tree_id = NULL;
5333 struct got_tree_object *tree = NULL;
5336 err = got_object_id_by_path(&tree_id, repo, commit, path);
5340 err = got_object_open_as_tree(&tree, repo, tree_id);
5343 nentries = got_object_tree_get_nentries(tree);
5344 for (i = 0; i < nentries; i++) {
5345 struct got_tree_entry *te;
5348 if (sigint_received || sigpipe_received)
5351 te = got_object_tree_get_entry(tree, i);
5354 err = got_object_id_str(&id_str,
5355 got_tree_entry_get_id(te));
5358 if (asprintf(&id, "%s ", id_str) == -1) {
5359 err = got_error_from_errno("asprintf");
5365 err = print_entry(te, id, path, root_path, repo);
5370 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
5372 if (asprintf(&child_path, "%s%s%s", path,
5373 path[0] == '/' && path[1] == '\0' ? "" : "/",
5374 got_tree_entry_get_name(te)) == -1) {
5375 err = got_error_from_errno("asprintf");
5378 err = print_tree(child_path, commit, show_ids, 1,
5387 got_object_tree_close(tree);
5392 static const struct got_error *
5393 cmd_tree(int argc, char *argv[])
5395 const struct got_error *error;
5396 struct got_repository *repo = NULL;
5397 struct got_worktree *worktree = NULL;
5398 const char *path, *refname = NULL;
5399 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5400 struct got_object_id *commit_id = NULL;
5401 struct got_commit_object *commit = NULL;
5402 char *commit_id_str = NULL;
5403 int show_ids = 0, recurse = 0;
5407 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5412 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
5415 commit_id_str = optarg;
5418 repo_path = realpath(optarg, NULL);
5419 if (repo_path == NULL)
5420 return got_error_from_errno2("realpath",
5422 got_path_strip_trailing_slashes(repo_path);
5446 cwd = getcwd(NULL, 0);
5448 error = got_error_from_errno("getcwd");
5451 if (repo_path == NULL) {
5452 error = got_worktree_open(&worktree, cwd);
5453 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5459 strdup(got_worktree_get_repo_path(worktree));
5460 if (repo_path == NULL)
5461 error = got_error_from_errno("strdup");
5465 repo_path = strdup(cwd);
5466 if (repo_path == NULL) {
5467 error = got_error_from_errno("strdup");
5473 error = got_repo_open(&repo, repo_path, NULL);
5478 const char *prefix = got_worktree_get_path_prefix(worktree);
5483 error = got_worktree_resolve_path(&p, worktree, path);
5486 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5487 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5489 error = got_error_from_errno("asprintf");
5494 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5498 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5503 error = got_repo_map_path(&in_repo_path, repo, path);
5508 if (commit_id_str == NULL) {
5509 struct got_reference *head_ref;
5511 refname = got_worktree_get_head_ref_name(worktree);
5513 refname = GOT_REF_HEAD;
5514 error = got_ref_open(&head_ref, repo, refname, 0);
5517 error = got_ref_resolve(&commit_id, repo, head_ref);
5518 got_ref_close(head_ref);
5522 struct got_reflist_head refs;
5524 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5528 error = got_repo_match_object_id(&commit_id, NULL,
5529 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5530 got_ref_list_free(&refs);
5536 /* Release work tree lock. */
5537 got_worktree_close(worktree);
5541 error = got_object_open_as_commit(&commit, repo, commit_id);
5545 error = print_tree(in_repo_path, commit, show_ids, recurse,
5546 in_repo_path, repo);
5553 got_object_commit_close(commit);
5555 got_worktree_close(worktree);
5557 const struct got_error *close_err = got_repo_close(repo);
5567 fprintf(stderr, "usage: %s status [-I] [-s status-codes ] "
5568 "[-S status-codes] [path ...]\n", getprogname());
5572 struct got_status_arg {
5577 static const struct got_error *
5578 print_status(void *arg, unsigned char status, unsigned char staged_status,
5579 const char *path, struct got_object_id *blob_id,
5580 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5581 int dirfd, const char *de_name)
5583 struct got_status_arg *st = arg;
5585 if (status == staged_status && (status == GOT_STATUS_DELETE))
5586 status = GOT_STATUS_NO_CHANGE;
5587 if (st != NULL && st->status_codes) {
5588 size_t ncodes = strlen(st->status_codes);
5591 for (i = 0; i < ncodes ; i++) {
5593 if (status == st->status_codes[i] ||
5594 staged_status == st->status_codes[i]) {
5599 if (status == st->status_codes[i] ||
5600 staged_status == st->status_codes[i])
5605 if (st->suppress && j == 0)
5612 printf("%c%c %s\n", status, staged_status, path);
5616 static const struct got_error *
5617 cmd_status(int argc, char *argv[])
5619 const struct got_error *error = NULL;
5620 struct got_repository *repo = NULL;
5621 struct got_worktree *worktree = NULL;
5622 struct got_status_arg st;
5624 struct got_pathlist_head paths;
5625 struct got_pathlist_entry *pe;
5626 int ch, i, no_ignores = 0;
5630 memset(&st, 0, sizeof(st));
5631 st.status_codes = NULL;
5634 while ((ch = getopt(argc, argv, "Is:S:")) != -1) {
5640 if (st.status_codes != NULL && st.suppress == 0)
5641 option_conflict('S', 's');
5645 for (i = 0; i < strlen(optarg); i++) {
5646 switch (optarg[i]) {
5647 case GOT_STATUS_MODIFY:
5648 case GOT_STATUS_ADD:
5649 case GOT_STATUS_DELETE:
5650 case GOT_STATUS_CONFLICT:
5651 case GOT_STATUS_MISSING:
5652 case GOT_STATUS_OBSTRUCTED:
5653 case GOT_STATUS_UNVERSIONED:
5654 case GOT_STATUS_MODE_CHANGE:
5655 case GOT_STATUS_NONEXISTENT:
5658 errx(1, "invalid status code '%c'",
5662 if (ch == 's' && st.suppress)
5663 option_conflict('s', 'S');
5664 st.status_codes = optarg;
5676 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5680 cwd = getcwd(NULL, 0);
5682 error = got_error_from_errno("getcwd");
5686 error = got_worktree_open(&worktree, cwd);
5688 if (error->code == GOT_ERR_NOT_WORKTREE)
5689 error = wrap_not_worktree_error(error, "status", cwd);
5693 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5698 error = apply_unveil(got_repo_get_path(repo), 1,
5699 got_worktree_get_root_path(worktree));
5703 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5707 error = got_worktree_status(worktree, &paths, repo, no_ignores,
5708 print_status, &st, check_cancelled, NULL);
5710 TAILQ_FOREACH(pe, &paths, entry)
5711 free((char *)pe->path);
5712 got_pathlist_free(&paths);
5721 "usage: %s ref [-r repository] [-l] [-t] [-c object] "
5722 "[-s reference] [-d] [name]\n",
5727 static const struct got_error *
5728 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
5730 static const struct got_error *err = NULL;
5731 struct got_reflist_head refs;
5732 struct got_reflist_entry *re;
5735 err = got_ref_list(&refs, repo, refname, sort_by_time ?
5736 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
5741 TAILQ_FOREACH(re, &refs, entry) {
5743 refstr = got_ref_to_str(re->ref);
5744 if (refstr == NULL) {
5745 err = got_error_from_errno("got_ref_to_str");
5748 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5752 got_ref_list_free(&refs);
5756 static const struct got_error *
5757 delete_ref_by_name(struct got_repository *repo, const char *refname)
5759 const struct got_error *err;
5760 struct got_reference *ref;
5762 err = got_ref_open(&ref, repo, refname, 0);
5766 err = delete_ref(repo, ref);
5771 static const struct got_error *
5772 add_ref(struct got_repository *repo, const char *refname, const char *target)
5774 const struct got_error *err = NULL;
5775 struct got_object_id *id = NULL;
5776 struct got_reference *ref = NULL;
5777 struct got_reflist_head refs;
5780 * Don't let the user create a reference name with a leading '-'.
5781 * While technically a valid reference name, this case is usually
5782 * an unintended typo.
5784 if (refname[0] == '-')
5785 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5788 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
5791 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
5793 got_ref_list_free(&refs);
5797 err = got_ref_alloc(&ref, refname, id);
5801 err = got_ref_write(ref, repo);
5809 static const struct got_error *
5810 add_symref(struct got_repository *repo, const char *refname, const char *target)
5812 const struct got_error *err = NULL;
5813 struct got_reference *ref = NULL;
5814 struct got_reference *target_ref = NULL;
5817 * Don't let the user create a reference name with a leading '-'.
5818 * While technically a valid reference name, this case is usually
5819 * an unintended typo.
5821 if (refname[0] == '-')
5822 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5824 err = got_ref_open(&target_ref, repo, target, 0);
5828 err = got_ref_alloc_symref(&ref, refname, target_ref);
5832 err = got_ref_write(ref, repo);
5835 got_ref_close(target_ref);
5841 static const struct got_error *
5842 cmd_ref(int argc, char *argv[])
5844 const struct got_error *error = NULL;
5845 struct got_repository *repo = NULL;
5846 struct got_worktree *worktree = NULL;
5847 char *cwd = NULL, *repo_path = NULL;
5848 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
5849 const char *obj_arg = NULL, *symref_target= NULL;
5850 char *refname = NULL;
5852 while ((ch = getopt(argc, argv, "c:dr:ls:t")) != -1) {
5861 repo_path = realpath(optarg, NULL);
5862 if (repo_path == NULL)
5863 return got_error_from_errno2("realpath",
5865 got_path_strip_trailing_slashes(repo_path);
5871 symref_target = optarg;
5882 if (obj_arg && do_list)
5883 option_conflict('c', 'l');
5884 if (obj_arg && do_delete)
5885 option_conflict('c', 'd');
5886 if (obj_arg && symref_target)
5887 option_conflict('c', 's');
5888 if (symref_target && do_delete)
5889 option_conflict('s', 'd');
5890 if (symref_target && do_list)
5891 option_conflict('s', 'l');
5892 if (do_delete && do_list)
5893 option_conflict('d', 'l');
5894 if (sort_by_time && !do_list)
5895 errx(1, "-t option requires -l option");
5901 if (argc != 0 && argc != 1)
5904 refname = strdup(argv[0]);
5905 if (refname == NULL) {
5906 error = got_error_from_errno("strdup");
5913 refname = strdup(argv[0]);
5914 if (refname == NULL) {
5915 error = got_error_from_errno("strdup");
5921 got_path_strip_trailing_slashes(refname);
5924 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5925 "sendfd unveil", NULL) == -1)
5928 cwd = getcwd(NULL, 0);
5930 error = got_error_from_errno("getcwd");
5934 if (repo_path == NULL) {
5935 error = got_worktree_open(&worktree, cwd);
5936 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5942 strdup(got_worktree_get_repo_path(worktree));
5943 if (repo_path == NULL)
5944 error = got_error_from_errno("strdup");
5948 repo_path = strdup(cwd);
5949 if (repo_path == NULL) {
5950 error = got_error_from_errno("strdup");
5956 error = got_repo_open(&repo, repo_path, NULL);
5962 /* Remove "cpath" promise. */
5963 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5969 error = apply_unveil(got_repo_get_path(repo), do_list,
5970 worktree ? got_worktree_get_root_path(worktree) : NULL);
5975 error = list_refs(repo, refname, sort_by_time);
5977 error = delete_ref_by_name(repo, refname);
5978 else if (symref_target)
5979 error = add_symref(repo, refname, symref_target);
5981 if (obj_arg == NULL)
5983 error = add_ref(repo, refname, obj_arg);
5988 const struct got_error *close_err = got_repo_close(repo);
5993 got_worktree_close(worktree);
6003 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-t] "
6004 "[-n] [name]\n", getprogname());
6008 static const struct got_error *
6009 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6010 struct got_reference *ref)
6012 const struct got_error *err = NULL;
6013 const char *refname, *marker = " ";
6016 refname = got_ref_get_name(ref);
6017 if (worktree && strcmp(refname,
6018 got_worktree_get_head_ref_name(worktree)) == 0) {
6019 struct got_object_id *id = NULL;
6021 err = got_ref_resolve(&id, repo, ref);
6024 if (got_object_id_cmp(id,
6025 got_worktree_get_base_commit_id(worktree)) == 0)
6032 if (strncmp(refname, "refs/heads/", 11) == 0)
6034 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6036 if (strncmp(refname, "refs/remotes/", 13) == 0)
6039 refstr = got_ref_to_str(ref);
6041 return got_error_from_errno("got_ref_to_str");
6043 printf("%s%s: %s\n", marker, refname, refstr);
6048 static const struct got_error *
6049 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6051 const char *refname;
6053 if (worktree == NULL)
6054 return got_error(GOT_ERR_NOT_WORKTREE);
6056 refname = got_worktree_get_head_ref_name(worktree);
6058 if (strncmp(refname, "refs/heads/", 11) == 0)
6060 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6063 printf("%s\n", refname);
6068 static const struct got_error *
6069 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6072 static const struct got_error *err = NULL;
6073 struct got_reflist_head refs;
6074 struct got_reflist_entry *re;
6075 struct got_reference *temp_ref = NULL;
6076 int rebase_in_progress, histedit_in_progress;
6081 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6086 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6091 if (rebase_in_progress || histedit_in_progress) {
6092 err = got_ref_open(&temp_ref, repo,
6093 got_worktree_get_head_ref_name(worktree), 0);
6096 list_branch(repo, worktree, temp_ref);
6097 got_ref_close(temp_ref);
6101 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6102 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6107 TAILQ_FOREACH(re, &refs, entry)
6108 list_branch(repo, worktree, re->ref);
6110 got_ref_list_free(&refs);
6112 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6113 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6118 TAILQ_FOREACH(re, &refs, entry)
6119 list_branch(repo, worktree, re->ref);
6121 got_ref_list_free(&refs);
6126 static const struct got_error *
6127 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6128 const char *branch_name)
6130 const struct got_error *err = NULL;
6131 struct got_reference *ref = NULL;
6132 char *refname, *remote_refname = NULL;
6134 if (strncmp(branch_name, "refs/", 5) == 0)
6136 if (strncmp(branch_name, "heads/", 6) == 0)
6138 else if (strncmp(branch_name, "remotes/", 8) == 0)
6141 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6142 return got_error_from_errno("asprintf");
6144 if (asprintf(&remote_refname, "refs/remotes/%s",
6145 branch_name) == -1) {
6146 err = got_error_from_errno("asprintf");
6150 err = got_ref_open(&ref, repo, refname, 0);
6152 const struct got_error *err2;
6153 if (err->code != GOT_ERR_NOT_REF)
6156 * Keep 'err' intact such that if neither branch exists
6157 * we report "refs/heads" rather than "refs/remotes" in
6158 * our error message.
6160 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6167 strcmp(got_worktree_get_head_ref_name(worktree),
6168 got_ref_get_name(ref)) == 0) {
6169 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6170 "will not delete this work tree's current branch");
6174 err = delete_ref(repo, ref);
6179 free(remote_refname);
6183 static const struct got_error *
6184 add_branch(struct got_repository *repo, const char *branch_name,
6185 struct got_object_id *base_commit_id)
6187 const struct got_error *err = NULL;
6188 struct got_reference *ref = NULL;
6189 char *base_refname = NULL, *refname = NULL;
6192 * Don't let the user create a branch name with a leading '-'.
6193 * While technically a valid reference name, this case is usually
6194 * an unintended typo.
6196 if (branch_name[0] == '-')
6197 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6199 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6202 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6203 err = got_error_from_errno("asprintf");
6207 err = got_ref_open(&ref, repo, refname, 0);
6209 err = got_error(GOT_ERR_BRANCH_EXISTS);
6211 } else if (err->code != GOT_ERR_NOT_REF)
6214 err = got_ref_alloc(&ref, refname, base_commit_id);
6218 err = got_ref_write(ref, repo);
6227 static const struct got_error *
6228 cmd_branch(int argc, char *argv[])
6230 const struct got_error *error = NULL;
6231 struct got_repository *repo = NULL;
6232 struct got_worktree *worktree = NULL;
6233 char *cwd = NULL, *repo_path = NULL;
6234 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
6235 const char *delref = NULL, *commit_id_arg = NULL;
6236 struct got_reference *ref = NULL;
6237 struct got_pathlist_head paths;
6238 struct got_pathlist_entry *pe;
6239 struct got_object_id *commit_id = NULL;
6240 char *commit_id_str = NULL;
6244 while ((ch = getopt(argc, argv, "c:d:r:lnt")) != -1) {
6247 commit_id_arg = optarg;
6253 repo_path = realpath(optarg, NULL);
6254 if (repo_path == NULL)
6255 return got_error_from_errno2("realpath",
6257 got_path_strip_trailing_slashes(repo_path);
6274 if (do_list && delref)
6275 option_conflict('l', 'd');
6276 if (sort_by_time && !do_list)
6277 errx(1, "-t option requires -l option");
6282 if (!do_list && !delref && argc == 0)
6285 if ((do_list || delref || do_show) && commit_id_arg != NULL)
6286 errx(1, "-c option can only be used when creating a branch");
6288 if (do_list || delref) {
6291 } else if (!do_show && argc != 1)
6295 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6296 "sendfd unveil", NULL) == -1)
6299 cwd = getcwd(NULL, 0);
6301 error = got_error_from_errno("getcwd");
6305 if (repo_path == NULL) {
6306 error = got_worktree_open(&worktree, cwd);
6307 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6313 strdup(got_worktree_get_repo_path(worktree));
6314 if (repo_path == NULL)
6315 error = got_error_from_errno("strdup");
6319 repo_path = strdup(cwd);
6320 if (repo_path == NULL) {
6321 error = got_error_from_errno("strdup");
6327 error = got_repo_open(&repo, repo_path, NULL);
6332 if (do_list || do_show) {
6333 /* Remove "cpath" promise. */
6334 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6340 error = apply_unveil(got_repo_get_path(repo), do_list,
6341 worktree ? got_worktree_get_root_path(worktree) : NULL);
6346 error = show_current_branch(repo, worktree);
6348 error = list_branches(repo, worktree, sort_by_time);
6350 error = delete_branch(repo, worktree, delref);
6352 struct got_reflist_head refs;
6354 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6358 if (commit_id_arg == NULL)
6359 commit_id_arg = worktree ?
6360 got_worktree_get_head_ref_name(worktree) :
6362 error = got_repo_match_object_id(&commit_id, NULL,
6363 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6364 got_ref_list_free(&refs);
6367 error = add_branch(repo, argv[0], commit_id);
6370 if (worktree && do_update) {
6371 struct got_update_progress_arg upa;
6372 char *branch_refname = NULL;
6374 error = got_object_id_str(&commit_id_str, commit_id);
6377 error = get_worktree_paths_from_argv(&paths, 0, NULL,
6381 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
6383 error = got_error_from_errno("asprintf");
6386 error = got_ref_open(&ref, repo, branch_refname, 0);
6387 free(branch_refname);
6390 error = switch_head_ref(ref, commit_id, worktree,
6394 error = got_worktree_set_base_commit_id(worktree, repo,
6398 memset(&upa, 0, sizeof(upa));
6399 error = got_worktree_checkout_files(worktree, &paths,
6400 repo, update_progress, &upa, check_cancelled,
6404 if (upa.did_something) {
6405 printf("Updated to %s: %s\n",
6406 got_worktree_get_head_ref_name(worktree),
6409 print_update_progress_stats(&upa);
6416 const struct got_error *close_err = got_repo_close(repo);
6421 got_worktree_close(worktree);
6425 free(commit_id_str);
6426 TAILQ_FOREACH(pe, &paths, entry)
6427 free((char *)pe->path);
6428 got_pathlist_free(&paths);
6437 "usage: %s tag [-c commit] [-r repository] [-l] "
6438 "[-m message] name\n", getprogname());
6443 static const struct got_error *
6444 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
6446 const struct got_error *err = NULL;
6447 struct got_reflist_entry *re, *se, *new;
6448 struct got_object_id *re_id, *se_id;
6449 struct got_tag_object *re_tag, *se_tag;
6450 time_t re_time, se_time;
6452 STAILQ_FOREACH(re, tags, entry) {
6453 se = STAILQ_FIRST(sorted);
6455 err = got_reflist_entry_dup(&new, re);
6458 STAILQ_INSERT_HEAD(sorted, new, entry);
6461 err = got_ref_resolve(&re_id, repo, re->ref);
6464 err = got_object_open_as_tag(&re_tag, repo, re_id);
6468 re_time = got_object_tag_get_tagger_time(re_tag);
6469 got_object_tag_close(re_tag);
6473 err = got_ref_resolve(&se_id, repo, re->ref);
6476 err = got_object_open_as_tag(&se_tag, repo, se_id);
6480 se_time = got_object_tag_get_tagger_time(se_tag);
6481 got_object_tag_close(se_tag);
6483 if (se_time > re_time) {
6484 err = got_reflist_entry_dup(&new, re);
6487 STAILQ_INSERT_AFTER(sorted, se, new, entry);
6490 se = STAILQ_NEXT(se, entry);
6499 static const struct got_error *
6500 list_tags(struct got_repository *repo)
6502 static const struct got_error *err = NULL;
6503 struct got_reflist_head refs;
6504 struct got_reflist_entry *re;
6508 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
6512 TAILQ_FOREACH(re, &refs, entry) {
6513 const char *refname;
6514 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
6518 struct got_object_id *id;
6519 struct got_tag_object *tag;
6520 struct got_commit_object *commit = NULL;
6522 refname = got_ref_get_name(re->ref);
6523 if (strncmp(refname, "refs/tags/", 10) != 0)
6526 refstr = got_ref_to_str(re->ref);
6527 if (refstr == NULL) {
6528 err = got_error_from_errno("got_ref_to_str");
6531 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
6534 err = got_ref_resolve(&id, repo, re->ref);
6537 err = got_object_open_as_tag(&tag, repo, id);
6539 if (err->code != GOT_ERR_OBJ_TYPE) {
6543 /* "lightweight" tag */
6544 err = got_object_open_as_commit(&commit, repo, id);
6549 tagger = got_object_commit_get_committer(commit);
6551 got_object_commit_get_committer_time(commit);
6552 err = got_object_id_str(&id_str, id);
6558 tagger = got_object_tag_get_tagger(tag);
6559 tagger_time = got_object_tag_get_tagger_time(tag);
6560 err = got_object_id_str(&id_str,
6561 got_object_tag_get_object_id(tag));
6565 printf("from: %s\n", tagger);
6566 datestr = get_datestr(&tagger_time, datebuf);
6568 printf("date: %s UTC\n", datestr);
6570 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6572 switch (got_object_tag_get_object_type(tag)) {
6573 case GOT_OBJ_TYPE_BLOB:
6574 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6577 case GOT_OBJ_TYPE_TREE:
6578 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6581 case GOT_OBJ_TYPE_COMMIT:
6582 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6585 case GOT_OBJ_TYPE_TAG:
6586 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6595 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6598 got_object_commit_close(commit);
6600 tagmsg0 = strdup(got_object_tag_get_message(tag));
6601 got_object_tag_close(tag);
6602 if (tagmsg0 == NULL) {
6603 err = got_error_from_errno("strdup");
6610 line = strsep(&tagmsg, "\n");
6612 printf(" %s\n", line);
6617 got_ref_list_free(&refs);
6621 static const struct got_error *
6622 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6623 const char *tag_name, const char *repo_path)
6625 const struct got_error *err = NULL;
6626 char *template = NULL, *initial_content = NULL;
6627 char *editor = NULL;
6628 int initial_content_len;
6631 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6632 err = got_error_from_errno("asprintf");
6636 initial_content_len = asprintf(&initial_content,
6637 "\n# tagging commit %s as %s\n",
6638 commit_id_str, tag_name);
6639 if (initial_content_len == -1) {
6640 err = got_error_from_errno("asprintf");
6644 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6648 if (write(fd, initial_content, initial_content_len) == -1) {
6649 err = got_error_from_errno2("write", *tagmsg_path);
6653 err = get_editor(&editor);
6656 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6657 initial_content_len, 1);
6659 free(initial_content);
6663 if (fd != -1 && close(fd) == -1 && err == NULL)
6664 err = got_error_from_errno2("close", *tagmsg_path);
6666 /* Editor is done; we can now apply unveil(2) */
6668 err = apply_unveil(repo_path, 0, NULL);
6676 static const struct got_error *
6677 add_tag(struct got_repository *repo, const char *tagger,
6678 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6680 const struct got_error *err = NULL;
6681 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6682 char *label = NULL, *commit_id_str = NULL;
6683 struct got_reference *ref = NULL;
6684 char *refname = NULL, *tagmsg = NULL;
6685 char *tagmsg_path = NULL, *tag_id_str = NULL;
6686 int preserve_tagmsg = 0;
6687 struct got_reflist_head refs;
6692 * Don't let the user create a tag name with a leading '-'.
6693 * While technically a valid reference name, this case is usually
6694 * an unintended typo.
6696 if (tag_name[0] == '-')
6697 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6699 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6703 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6704 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6708 err = got_object_id_str(&commit_id_str, commit_id);
6712 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6713 refname = strdup(tag_name);
6714 if (refname == NULL) {
6715 err = got_error_from_errno("strdup");
6719 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6720 err = got_error_from_errno("asprintf");
6724 err = got_ref_open(&ref, repo, refname, 0);
6726 err = got_error(GOT_ERR_TAG_EXISTS);
6728 } else if (err->code != GOT_ERR_NOT_REF)
6731 if (tagmsg_arg == NULL) {
6732 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6733 tag_name, got_repo_get_path(repo));
6735 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6736 tagmsg_path != NULL)
6737 preserve_tagmsg = 1;
6742 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6743 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6746 preserve_tagmsg = 1;
6750 err = got_ref_alloc(&ref, refname, tag_id);
6753 preserve_tagmsg = 1;
6757 err = got_ref_write(ref, repo);
6760 preserve_tagmsg = 1;
6764 err = got_object_id_str(&tag_id_str, tag_id);
6767 preserve_tagmsg = 1;
6770 printf("Created tag %s\n", tag_id_str);
6772 if (preserve_tagmsg) {
6773 fprintf(stderr, "%s: tag message preserved in %s\n",
6774 getprogname(), tagmsg_path);
6775 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6776 err = got_error_from_errno2("unlink", tagmsg_path);
6781 free(commit_id_str);
6785 got_ref_list_free(&refs);
6789 static const struct got_error *
6790 cmd_tag(int argc, char *argv[])
6792 const struct got_error *error = NULL;
6793 struct got_repository *repo = NULL;
6794 struct got_worktree *worktree = NULL;
6795 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6796 char *gitconfig_path = NULL, *tagger = NULL;
6797 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6798 int ch, do_list = 0;
6800 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6803 commit_id_arg = optarg;
6809 repo_path = realpath(optarg, NULL);
6810 if (repo_path == NULL)
6811 return got_error_from_errno2("realpath",
6813 got_path_strip_trailing_slashes(repo_path);
6828 if (commit_id_arg != NULL)
6830 "-c option can only be used when creating a tag");
6832 option_conflict('l', 'm');
6835 } else if (argc != 1)
6841 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6842 "sendfd unveil", NULL) == -1)
6845 cwd = getcwd(NULL, 0);
6847 error = got_error_from_errno("getcwd");
6851 if (repo_path == NULL) {
6852 error = got_worktree_open(&worktree, cwd);
6853 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6859 strdup(got_worktree_get_repo_path(worktree));
6860 if (repo_path == NULL)
6861 error = got_error_from_errno("strdup");
6865 repo_path = strdup(cwd);
6866 if (repo_path == NULL) {
6867 error = got_error_from_errno("strdup");
6875 /* Release work tree lock. */
6876 got_worktree_close(worktree);
6879 error = got_repo_open(&repo, repo_path, NULL);
6883 /* Remove "cpath" promise. */
6884 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6888 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6891 error = list_tags(repo);
6893 error = get_gitconfig_path(&gitconfig_path);
6896 error = got_repo_open(&repo, repo_path, gitconfig_path);
6900 error = get_author(&tagger, repo, worktree);
6904 /* Release work tree lock. */
6905 got_worktree_close(worktree);
6910 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6915 if (commit_id_arg == NULL) {
6916 struct got_reference *head_ref;
6917 struct got_object_id *commit_id;
6918 error = got_ref_open(&head_ref, repo,
6919 worktree ? got_worktree_get_head_ref_name(worktree)
6923 error = got_ref_resolve(&commit_id, repo, head_ref);
6924 got_ref_close(head_ref);
6927 error = got_object_id_str(&commit_id_str, commit_id);
6933 error = add_tag(repo, tagger, tag_name,
6934 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6938 const struct got_error *close_err = got_repo_close(repo);
6943 got_worktree_close(worktree);
6946 free(gitconfig_path);
6947 free(commit_id_str);
6955 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6960 static const struct got_error *
6961 add_progress(void *arg, unsigned char status, const char *path)
6963 while (path[0] == '/')
6965 printf("%c %s\n", status, path);
6969 static const struct got_error *
6970 cmd_add(int argc, char *argv[])
6972 const struct got_error *error = NULL;
6973 struct got_repository *repo = NULL;
6974 struct got_worktree *worktree = NULL;
6976 struct got_pathlist_head paths;
6977 struct got_pathlist_entry *pe;
6978 int ch, can_recurse = 0, no_ignores = 0;
6982 while ((ch = getopt(argc, argv, "IR")) != -1) {
7000 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7007 cwd = getcwd(NULL, 0);
7009 error = got_error_from_errno("getcwd");
7013 error = got_worktree_open(&worktree, cwd);
7015 if (error->code == GOT_ERR_NOT_WORKTREE)
7016 error = wrap_not_worktree_error(error, "add", cwd);
7020 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7025 error = apply_unveil(got_repo_get_path(repo), 1,
7026 got_worktree_get_root_path(worktree));
7030 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7037 TAILQ_FOREACH(pe, &paths, entry) {
7038 if (asprintf(&ondisk_path, "%s/%s",
7039 got_worktree_get_root_path(worktree),
7041 error = got_error_from_errno("asprintf");
7044 if (lstat(ondisk_path, &sb) == -1) {
7045 if (errno == ENOENT) {
7049 error = got_error_from_errno2("lstat",
7055 if (S_ISDIR(sb.st_mode)) {
7056 error = got_error_msg(GOT_ERR_BAD_PATH,
7057 "adding directories requires -R option");
7063 error = got_worktree_schedule_add(worktree, &paths, add_progress,
7064 NULL, repo, no_ignores);
7067 const struct got_error *close_err = got_repo_close(repo);
7072 got_worktree_close(worktree);
7073 TAILQ_FOREACH(pe, &paths, entry)
7074 free((char *)pe->path);
7075 got_pathlist_free(&paths);
7083 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
7084 "path ...\n", getprogname());
7088 static const struct got_error *
7089 print_remove_status(void *arg, unsigned char status,
7090 unsigned char staged_status, const char *path)
7092 while (path[0] == '/')
7094 if (status == GOT_STATUS_NONEXISTENT)
7096 if (status == staged_status && (status == GOT_STATUS_DELETE))
7097 status = GOT_STATUS_NO_CHANGE;
7098 printf("%c%c %s\n", status, staged_status, path);
7102 static const struct got_error *
7103 cmd_remove(int argc, char *argv[])
7105 const struct got_error *error = NULL;
7106 struct got_worktree *worktree = NULL;
7107 struct got_repository *repo = NULL;
7108 const char *status_codes = NULL;
7110 struct got_pathlist_head paths;
7111 struct got_pathlist_entry *pe;
7112 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
7113 int ignore_missing_paths = 0;
7117 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
7120 delete_local_mods = 1;
7121 ignore_missing_paths = 1;
7130 for (i = 0; i < strlen(optarg); i++) {
7131 switch (optarg[i]) {
7132 case GOT_STATUS_MODIFY:
7133 delete_local_mods = 1;
7135 case GOT_STATUS_MISSING:
7136 ignore_missing_paths = 1;
7139 errx(1, "invalid status code '%c'",
7143 status_codes = optarg;
7155 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7162 cwd = getcwd(NULL, 0);
7164 error = got_error_from_errno("getcwd");
7167 error = got_worktree_open(&worktree, cwd);
7169 if (error->code == GOT_ERR_NOT_WORKTREE)
7170 error = wrap_not_worktree_error(error, "remove", cwd);
7174 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7179 error = apply_unveil(got_repo_get_path(repo), 1,
7180 got_worktree_get_root_path(worktree));
7184 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7191 TAILQ_FOREACH(pe, &paths, entry) {
7192 if (asprintf(&ondisk_path, "%s/%s",
7193 got_worktree_get_root_path(worktree),
7195 error = got_error_from_errno("asprintf");
7198 if (lstat(ondisk_path, &sb) == -1) {
7199 if (errno == ENOENT) {
7203 error = got_error_from_errno2("lstat",
7209 if (S_ISDIR(sb.st_mode)) {
7210 error = got_error_msg(GOT_ERR_BAD_PATH,
7211 "removing directories requires -R option");
7217 error = got_worktree_schedule_delete(worktree, &paths,
7218 delete_local_mods, status_codes, print_remove_status, NULL,
7219 repo, keep_on_disk, ignore_missing_paths);
7222 const struct got_error *close_err = got_repo_close(repo);
7227 got_worktree_close(worktree);
7228 TAILQ_FOREACH(pe, &paths, entry)
7229 free((char *)pe->path);
7230 got_pathlist_free(&paths);
7238 fprintf(stderr, "usage: %s patch [-n] [-p strip-count] "
7239 "[-R] [patchfile]\n", getprogname());
7243 static const struct got_error *
7244 patch_from_stdin(int *patchfd)
7246 const struct got_error *err = NULL;
7248 char *path, buf[BUFSIZ];
7249 sig_t sighup, sigint, sigquit;
7251 err = got_opentemp_named_fd(&path, patchfd,
7252 GOT_TMPDIR_STR "/got-patch");
7258 sighup = signal(SIGHUP, SIG_DFL);
7259 sigint = signal(SIGINT, SIG_DFL);
7260 sigquit = signal(SIGQUIT, SIG_DFL);
7263 r = read(0, buf, sizeof(buf));
7265 err = got_error_from_errno("read");
7270 if (write(*patchfd, buf, r) == -1) {
7271 err = got_error_from_errno("write");
7276 signal(SIGHUP, sighup);
7277 signal(SIGINT, sigint);
7278 signal(SIGQUIT, sigquit);
7280 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
7281 err = got_error_from_errno("lseek");
7291 static const struct got_error *
7292 patch_progress(void *arg, const char *old, const char *new,
7293 unsigned char status, const struct got_error *error, long old_from,
7294 long old_lines, long new_from, long new_lines, long offset,
7295 const struct got_error *hunk_err)
7297 const char *path = new == NULL ? old : new;
7299 while (*path == '/')
7303 printf("%c %s\n", status, path);
7306 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
7308 if (offset != 0 || hunk_err != NULL) {
7309 printf("@@ -%ld,%ld +%ld,%ld @@ ", old_from,
7310 old_lines, new_from, new_lines);
7311 if (hunk_err != NULL)
7312 printf("%s\n", hunk_err->msg);
7314 printf("applied with offset %ld\n", offset);
7320 static const struct got_error *
7321 cmd_patch(int argc, char *argv[])
7323 const struct got_error *error = NULL, *close_error = NULL;
7324 struct got_worktree *worktree = NULL;
7325 struct got_repository *repo = NULL;
7328 int ch, nop = 0, strip = -1, reverse = 0;
7331 while ((ch = getopt(argc, argv, "np:R")) != -1) {
7337 strip = strtonum(optarg, 0, INT_MAX, &errstr);
7339 errx(1, "pathname strip count is %s: %s",
7355 error = patch_from_stdin(&patchfd);
7358 } else if (argc == 1) {
7359 patchfd = open(argv[0], O_RDONLY);
7360 if (patchfd == -1) {
7361 error = got_error_from_errno2("open", argv[0]);
7367 if ((cwd = getcwd(NULL, 0)) == NULL) {
7368 error = got_error_from_errno("getcwd");
7372 error = got_worktree_open(&worktree, cwd);
7376 const char *repo_path = got_worktree_get_repo_path(worktree);
7377 error = got_repo_open(&repo, repo_path, NULL);
7381 error = apply_unveil(got_repo_get_path(repo), 0,
7382 got_worktree_get_root_path(worktree));
7387 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock",
7392 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
7393 &patch_progress, NULL, check_cancelled, NULL);
7397 close_error = got_repo_close(repo);
7399 error = close_error;
7401 if (worktree != NULL) {
7402 close_error = got_worktree_close(worktree);
7404 error = close_error;
7413 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
7414 "path ...\n", getprogname());
7418 static const struct got_error *
7419 revert_progress(void *arg, unsigned char status, const char *path)
7421 if (status == GOT_STATUS_UNVERSIONED)
7424 while (path[0] == '/')
7426 printf("%c %s\n", status, path);
7430 struct choose_patch_arg {
7431 FILE *patch_script_file;
7435 static const struct got_error *
7436 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
7437 int nchanges, const char *action)
7440 size_t linesize = 0;
7444 case GOT_STATUS_ADD:
7445 printf("A %s\n%s this addition? [y/n] ", path, action);
7447 case GOT_STATUS_DELETE:
7448 printf("D %s\n%s this deletion? [y/n] ", path, action);
7450 case GOT_STATUS_MODIFY:
7451 if (fseek(patch_file, 0L, SEEK_SET) == -1)
7452 return got_error_from_errno("fseek");
7453 printf(GOT_COMMIT_SEP_STR);
7454 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
7456 if (ferror(patch_file))
7457 return got_error_from_errno("getline");
7458 printf(GOT_COMMIT_SEP_STR);
7459 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
7460 path, n, nchanges, action);
7463 return got_error_path(path, GOT_ERR_FILE_STATUS);
7469 static const struct got_error *
7470 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
7471 FILE *patch_file, int n, int nchanges)
7473 const struct got_error *err = NULL;
7475 size_t linesize = 0;
7478 struct choose_patch_arg *a = arg;
7480 *choice = GOT_PATCH_CHOICE_NONE;
7482 if (a->patch_script_file) {
7484 err = show_change(status, path, patch_file, n, nchanges,
7488 linelen = getline(&line, &linesize, a->patch_script_file);
7489 if (linelen == -1) {
7490 if (ferror(a->patch_script_file))
7491 return got_error_from_errno("getline");
7494 nl = strchr(line, '\n');
7497 if (strcmp(line, "y") == 0) {
7498 *choice = GOT_PATCH_CHOICE_YES;
7500 } else if (strcmp(line, "n") == 0) {
7501 *choice = GOT_PATCH_CHOICE_NO;
7503 } else if (strcmp(line, "q") == 0 &&
7504 status == GOT_STATUS_MODIFY) {
7505 *choice = GOT_PATCH_CHOICE_QUIT;
7508 printf("invalid response '%s'\n", line);
7513 while (resp != 'y' && resp != 'n' && resp != 'q') {
7514 err = show_change(status, path, patch_file, n, nchanges,
7521 if (status == GOT_STATUS_MODIFY) {
7522 if (resp != 'y' && resp != 'n' && resp != 'q') {
7523 printf("invalid response '%c'\n", resp);
7526 } else if (resp != 'y' && resp != 'n') {
7527 printf("invalid response '%c'\n", resp);
7533 *choice = GOT_PATCH_CHOICE_YES;
7534 else if (resp == 'n')
7535 *choice = GOT_PATCH_CHOICE_NO;
7536 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
7537 *choice = GOT_PATCH_CHOICE_QUIT;
7542 static const struct got_error *
7543 cmd_revert(int argc, char *argv[])
7545 const struct got_error *error = NULL;
7546 struct got_worktree *worktree = NULL;
7547 struct got_repository *repo = NULL;
7548 char *cwd = NULL, *path = NULL;
7549 struct got_pathlist_head paths;
7550 struct got_pathlist_entry *pe;
7551 int ch, can_recurse = 0, pflag = 0;
7552 FILE *patch_script_file = NULL;
7553 const char *patch_script_path = NULL;
7554 struct choose_patch_arg cpa;
7558 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
7564 patch_script_path = optarg;
7579 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7580 "unveil", NULL) == -1)
7585 if (patch_script_path && !pflag)
7586 errx(1, "-F option can only be used together with -p option");
7588 cwd = getcwd(NULL, 0);
7590 error = got_error_from_errno("getcwd");
7593 error = got_worktree_open(&worktree, cwd);
7595 if (error->code == GOT_ERR_NOT_WORKTREE)
7596 error = wrap_not_worktree_error(error, "revert", cwd);
7600 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7605 if (patch_script_path) {
7606 patch_script_file = fopen(patch_script_path, "re");
7607 if (patch_script_file == NULL) {
7608 error = got_error_from_errno2("fopen",
7613 error = apply_unveil(got_repo_get_path(repo), 1,
7614 got_worktree_get_root_path(worktree));
7618 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7625 TAILQ_FOREACH(pe, &paths, entry) {
7626 if (asprintf(&ondisk_path, "%s/%s",
7627 got_worktree_get_root_path(worktree),
7629 error = got_error_from_errno("asprintf");
7632 if (lstat(ondisk_path, &sb) == -1) {
7633 if (errno == ENOENT) {
7637 error = got_error_from_errno2("lstat",
7643 if (S_ISDIR(sb.st_mode)) {
7644 error = got_error_msg(GOT_ERR_BAD_PATH,
7645 "reverting directories requires -R option");
7651 cpa.patch_script_file = patch_script_file;
7652 cpa.action = "revert";
7653 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
7654 pflag ? choose_patch : NULL, &cpa, repo);
7656 if (patch_script_file && fclose(patch_script_file) == EOF &&
7658 error = got_error_from_errno2("fclose", patch_script_path);
7660 const struct got_error *close_err = got_repo_close(repo);
7665 got_worktree_close(worktree);
7674 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
7675 "[path ...]\n", getprogname());
7679 struct collect_commit_logmsg_arg {
7680 const char *cmdline_log;
7681 const char *prepared_log;
7682 int non_interactive;
7684 const char *worktree_path;
7685 const char *branch_name;
7686 const char *repo_path;
7691 static const struct got_error *
7692 read_prepared_logmsg(char **logmsg, const char *path)
7694 const struct got_error *err = NULL;
7700 memset(&sb, 0, sizeof(sb));
7702 f = fopen(path, "re");
7704 return got_error_from_errno2("fopen", path);
7706 if (fstat(fileno(f), &sb) == -1) {
7707 err = got_error_from_errno2("fstat", path);
7710 if (sb.st_size == 0) {
7711 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
7715 *logmsg = malloc(sb.st_size + 1);
7716 if (*logmsg == NULL) {
7717 err = got_error_from_errno("malloc");
7721 r = fread(*logmsg, 1, sb.st_size, f);
7722 if (r != sb.st_size) {
7724 err = got_error_from_errno2("fread", path);
7726 err = got_error(GOT_ERR_IO);
7729 (*logmsg)[sb.st_size] = '\0';
7731 if (fclose(f) == EOF && err == NULL)
7732 err = got_error_from_errno2("fclose", path);
7741 static const struct got_error *
7742 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7745 char *initial_content = NULL;
7746 struct got_pathlist_entry *pe;
7747 const struct got_error *err = NULL;
7748 char *template = NULL;
7749 struct collect_commit_logmsg_arg *a = arg;
7750 int initial_content_len;
7754 /* if a message was specified on the command line, just use it */
7755 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7756 len = strlen(a->cmdline_log) + 1;
7757 *logmsg = malloc(len + 1);
7758 if (*logmsg == NULL)
7759 return got_error_from_errno("malloc");
7760 strlcpy(*logmsg, a->cmdline_log, len);
7762 } else if (a->prepared_log != NULL && a->non_interactive)
7763 return read_prepared_logmsg(logmsg, a->prepared_log);
7765 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7766 return got_error_from_errno("asprintf");
7768 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7772 if (a->prepared_log) {
7774 err = read_prepared_logmsg(&msg, a->prepared_log);
7777 if (write(fd, msg, strlen(msg)) == -1) {
7778 err = got_error_from_errno2("write", a->logmsg_path);
7785 initial_content_len = asprintf(&initial_content,
7786 "\n# changes to be committed on branch %s:\n",
7788 if (initial_content_len == -1) {
7789 err = got_error_from_errno("asprintf");
7793 if (write(fd, initial_content, initial_content_len) == -1) {
7794 err = got_error_from_errno2("write", a->logmsg_path);
7798 TAILQ_FOREACH(pe, commitable_paths, entry) {
7799 struct got_commitable *ct = pe->data;
7800 dprintf(fd, "# %c %s\n",
7801 got_commitable_get_status(ct),
7802 got_commitable_get_path(ct));
7805 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7806 initial_content_len, a->prepared_log ? 0 : 1);
7808 free(initial_content);
7811 if (fd != -1 && close(fd) == -1 && err == NULL)
7812 err = got_error_from_errno2("close", a->logmsg_path);
7814 /* Editor is done; we can now apply unveil(2) */
7816 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7824 static const struct got_error *
7825 cmd_commit(int argc, char *argv[])
7827 const struct got_error *error = NULL;
7828 struct got_worktree *worktree = NULL;
7829 struct got_repository *repo = NULL;
7830 char *cwd = NULL, *id_str = NULL;
7831 struct got_object_id *id = NULL;
7832 const char *logmsg = NULL;
7833 char *prepared_logmsg = NULL;
7834 struct collect_commit_logmsg_arg cl_arg;
7835 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7836 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7837 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
7838 struct got_pathlist_head paths;
7841 cl_arg.logmsg_path = NULL;
7843 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7847 option_conflict('F', 'm');
7848 prepared_logmsg = realpath(optarg, NULL);
7849 if (prepared_logmsg == NULL)
7850 return got_error_from_errno2("realpath",
7854 if (prepared_logmsg)
7855 option_conflict('m', 'F');
7859 non_interactive = 1;
7862 allow_bad_symlinks = 1;
7874 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7875 "unveil", NULL) == -1)
7878 cwd = getcwd(NULL, 0);
7880 error = got_error_from_errno("getcwd");
7883 error = got_worktree_open(&worktree, cwd);
7885 if (error->code == GOT_ERR_NOT_WORKTREE)
7886 error = wrap_not_worktree_error(error, "commit", cwd);
7890 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7893 if (rebase_in_progress) {
7894 error = got_error(GOT_ERR_REBASING);
7898 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7903 error = get_gitconfig_path(&gitconfig_path);
7906 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7911 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
7914 if (merge_in_progress) {
7915 error = got_error(GOT_ERR_MERGE_BUSY);
7919 error = get_author(&author, repo, worktree);
7924 * unveil(2) traverses exec(2); if an editor is used we have
7925 * to apply unveil after the log message has been written.
7927 if (logmsg == NULL || strlen(logmsg) == 0)
7928 error = get_editor(&editor);
7930 error = apply_unveil(got_repo_get_path(repo), 0,
7931 got_worktree_get_root_path(worktree));
7935 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7939 cl_arg.editor = editor;
7940 cl_arg.cmdline_log = logmsg;
7941 cl_arg.prepared_log = prepared_logmsg;
7942 cl_arg.non_interactive = non_interactive;
7943 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7944 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7945 if (!histedit_in_progress) {
7946 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7947 error = got_error(GOT_ERR_COMMIT_BRANCH);
7950 cl_arg.branch_name += 11;
7952 cl_arg.repo_path = got_repo_get_path(repo);
7953 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7954 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7955 print_status, NULL, repo);
7957 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7958 cl_arg.logmsg_path != NULL)
7959 preserve_logmsg = 1;
7963 error = got_object_id_str(&id_str, id);
7966 printf("Created commit %s\n", id_str);
7968 if (preserve_logmsg) {
7969 fprintf(stderr, "%s: log message preserved in %s\n",
7970 getprogname(), cl_arg.logmsg_path);
7971 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7973 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7974 free(cl_arg.logmsg_path);
7976 const struct got_error *close_err = got_repo_close(repo);
7981 got_worktree_close(worktree);
7984 free(gitconfig_path);
7987 free(prepared_logmsg);
7994 fprintf(stderr, "usage: %s send [-a] [-b branch] [-d branch] [-f] "
7995 "[-r repository-path] [-t tag] [-T] [-q] [-v] "
7996 "[remote-repository]\n", getprogname());
8001 print_load_info(int print_colored, int print_found, int print_trees,
8002 int ncolored, int nfound, int ntrees)
8004 if (print_colored) {
8005 printf("%d commit%s colored", ncolored,
8006 ncolored == 1 ? "" : "s");
8009 printf("%s%d object%s found",
8010 ncolored > 0 ? "; " : "",
8011 nfound, nfound == 1 ? "" : "s");
8014 printf("; %d tree%s scanned", ntrees,
8015 ntrees == 1 ? "" : "s");
8019 struct got_send_progress_arg {
8020 char last_scaled_packsize[FMT_SCALED_STRSIZE];
8027 int last_nobj_total;
8031 int printed_something;
8033 struct got_pathlist_head *delete_branches;
8036 static const struct got_error *
8037 send_progress(void *arg, int ncolored, int nfound, int ntrees,
8038 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
8039 int nobj_written, off_t bytes_sent, const char *refname, int success)
8041 struct got_send_progress_arg *a = arg;
8042 char scaled_packsize[FMT_SCALED_STRSIZE];
8043 char scaled_sent[FMT_SCALED_STRSIZE];
8044 int p_deltify = 0, p_written = 0, p_sent = 0;
8045 int print_colored = 0, print_found = 0, print_trees = 0;
8046 int print_searching = 0, print_total = 0;
8047 int print_deltify = 0, print_written = 0, print_sent = 0;
8049 if (a->verbosity < 0)
8053 const char *status = success ? "accepted" : "rejected";
8056 struct got_pathlist_entry *pe;
8057 TAILQ_FOREACH(pe, a->delete_branches, entry) {
8058 const char *branchname = pe->path;
8059 if (got_path_cmp(branchname, refname,
8060 strlen(branchname), strlen(refname)) == 0) {
8062 a->sent_something = 1;
8068 if (a->printed_something)
8070 printf("Server has %s %s", status, refname);
8071 a->printed_something = 1;
8075 if (a->last_ncolored != ncolored) {
8077 a->last_ncolored = ncolored;
8080 if (a->last_nfound != nfound) {
8083 a->last_nfound = nfound;
8086 if (a->last_ntrees != ntrees) {
8090 a->last_ntrees = ntrees;
8093 if ((print_colored || print_found || print_trees) &&
8096 print_load_info(print_colored, print_found, print_trees,
8097 ncolored, nfound, ntrees);
8098 a->printed_something = 1;
8101 } else if (!a->loading_done) {
8103 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
8105 a->loading_done = 1;
8108 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
8109 return got_error_from_errno("fmt_scaled");
8110 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
8111 return got_error_from_errno("fmt_scaled");
8113 if (a->last_ncommits != ncommits) {
8114 print_searching = 1;
8115 a->last_ncommits = ncommits;
8118 if (a->last_nobj_total != nobj_total) {
8119 print_searching = 1;
8121 a->last_nobj_total = nobj_total;
8124 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
8125 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
8126 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
8127 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
8128 return got_error(GOT_ERR_NO_SPACE);
8131 if (nobj_deltify > 0 || nobj_written > 0) {
8132 if (nobj_deltify > 0) {
8133 p_deltify = (nobj_deltify * 100) / nobj_total;
8134 if (p_deltify != a->last_p_deltify) {
8135 a->last_p_deltify = p_deltify;
8136 print_searching = 1;
8141 if (nobj_written > 0) {
8142 p_written = (nobj_written * 100) / nobj_total;
8143 if (p_written != a->last_p_written) {
8144 a->last_p_written = p_written;
8145 print_searching = 1;
8153 if (bytes_sent > 0) {
8154 p_sent = (bytes_sent * 100) / packfile_size;
8155 if (p_sent != a->last_p_sent) {
8156 a->last_p_sent = p_sent;
8157 print_searching = 1;
8163 a->sent_something = 1;
8166 if (print_searching || print_total || print_deltify || print_written ||
8169 if (print_searching)
8170 printf("packing %d reference%s", ncommits,
8171 ncommits == 1 ? "" : "s");
8173 printf("; %d object%s", nobj_total,
8174 nobj_total == 1 ? "" : "s");
8176 printf("; deltify: %d%%", p_deltify);
8178 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8179 scaled_packsize, p_sent);
8180 else if (print_written)
8181 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
8182 scaled_packsize, p_written);
8183 if (print_searching || print_total || print_deltify ||
8184 print_written || print_sent) {
8185 a->printed_something = 1;
8191 static const struct got_error *
8192 cmd_send(int argc, char *argv[])
8194 const struct got_error *error = NULL;
8195 char *cwd = NULL, *repo_path = NULL;
8196 const char *remote_name;
8197 char *proto = NULL, *host = NULL, *port = NULL;
8198 char *repo_name = NULL, *server_path = NULL;
8199 const struct got_remote_repo *remotes, *remote = NULL;
8200 int nremotes, nbranches = 0, ntags = 0, ndelete_branches = 0;
8201 struct got_repository *repo = NULL;
8202 struct got_worktree *worktree = NULL;
8203 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
8204 struct got_pathlist_head branches;
8205 struct got_pathlist_head tags;
8206 struct got_reflist_head all_branches;
8207 struct got_reflist_head all_tags;
8208 struct got_pathlist_head delete_args;
8209 struct got_pathlist_head delete_branches;
8210 struct got_reflist_entry *re;
8211 struct got_pathlist_entry *pe;
8212 int i, ch, sendfd = -1, sendstatus;
8214 struct got_send_progress_arg spa;
8215 int verbosity = 0, overwrite_refs = 0;
8216 int send_all_branches = 0, send_all_tags = 0;
8217 struct got_reference *ref = NULL;
8219 TAILQ_INIT(&branches);
8221 TAILQ_INIT(&all_branches);
8222 TAILQ_INIT(&all_tags);
8223 TAILQ_INIT(&delete_args);
8224 TAILQ_INIT(&delete_branches);
8226 while ((ch = getopt(argc, argv, "ab:d:fr:t:Tvq")) != -1) {
8229 send_all_branches = 1;
8232 error = got_pathlist_append(&branches, optarg, NULL);
8238 error = got_pathlist_append(&delete_args, optarg, NULL);
8246 repo_path = realpath(optarg, NULL);
8247 if (repo_path == NULL)
8248 return got_error_from_errno2("realpath",
8250 got_path_strip_trailing_slashes(repo_path);
8253 error = got_pathlist_append(&tags, optarg, NULL);
8264 else if (verbosity < 3)
8278 if (send_all_branches && !TAILQ_EMPTY(&branches))
8279 option_conflict('a', 'b');
8280 if (send_all_tags && !TAILQ_EMPTY(&tags))
8281 option_conflict('T', 't');
8285 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
8287 remote_name = argv[0];
8291 cwd = getcwd(NULL, 0);
8293 error = got_error_from_errno("getcwd");
8297 if (repo_path == NULL) {
8298 error = got_worktree_open(&worktree, cwd);
8299 if (error && error->code != GOT_ERR_NOT_WORKTREE)
8305 strdup(got_worktree_get_repo_path(worktree));
8306 if (repo_path == NULL)
8307 error = got_error_from_errno("strdup");
8311 repo_path = strdup(cwd);
8312 if (repo_path == NULL) {
8313 error = got_error_from_errno("strdup");
8319 error = got_repo_open(&repo, repo_path, NULL);
8324 worktree_conf = got_worktree_get_gotconfig(worktree);
8325 if (worktree_conf) {
8326 got_gotconfig_get_remotes(&nremotes, &remotes,
8328 for (i = 0; i < nremotes; i++) {
8329 if (strcmp(remotes[i].name, remote_name) == 0) {
8330 remote = &remotes[i];
8336 if (remote == NULL) {
8337 repo_conf = got_repo_get_gotconfig(repo);
8339 got_gotconfig_get_remotes(&nremotes, &remotes,
8341 for (i = 0; i < nremotes; i++) {
8342 if (strcmp(remotes[i].name, remote_name) == 0) {
8343 remote = &remotes[i];
8349 if (remote == NULL) {
8350 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
8351 for (i = 0; i < nremotes; i++) {
8352 if (strcmp(remotes[i].name, remote_name) == 0) {
8353 remote = &remotes[i];
8358 if (remote == NULL) {
8359 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
8363 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
8364 &repo_name, remote->send_url);
8368 if (strcmp(proto, "git") == 0) {
8370 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8371 "sendfd dns inet unveil", NULL) == -1)
8374 } else if (strcmp(proto, "git+ssh") == 0 ||
8375 strcmp(proto, "ssh") == 0) {
8377 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
8378 "sendfd unveil", NULL) == -1)
8381 } else if (strcmp(proto, "http") == 0 ||
8382 strcmp(proto, "git+http") == 0) {
8383 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
8386 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
8390 error = got_dial_apply_unveil(proto);
8394 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
8398 if (send_all_branches) {
8399 error = got_ref_list(&all_branches, repo, "refs/heads",
8400 got_ref_cmp_by_name, NULL);
8403 TAILQ_FOREACH(re, &all_branches, entry) {
8404 const char *branchname = got_ref_get_name(re->ref);
8405 error = got_pathlist_append(&branches,
8411 } else if (nbranches == 0) {
8412 for (i = 0; i < remote->nsend_branches; i++) {
8413 got_pathlist_append(&branches,
8414 remote->send_branches[i], NULL);
8418 if (send_all_tags) {
8419 error = got_ref_list(&all_tags, repo, "refs/tags",
8420 got_ref_cmp_by_name, NULL);
8423 TAILQ_FOREACH(re, &all_tags, entry) {
8424 const char *tagname = got_ref_get_name(re->ref);
8425 error = got_pathlist_append(&tags,
8434 * To prevent accidents only branches in refs/heads/ can be deleted
8435 * with 'got send -d'.
8436 * Deleting anything else requires local repository access or Git.
8438 TAILQ_FOREACH(pe, &delete_args, entry) {
8439 const char *branchname = pe->path;
8441 struct got_pathlist_entry *new;
8442 if (strncmp(branchname, "refs/heads/", 11) == 0) {
8443 s = strdup(branchname);
8445 error = got_error_from_errno("strdup");
8449 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
8450 error = got_error_from_errno("asprintf");
8454 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
8455 if (error || new == NULL /* duplicate */)
8462 if (nbranches == 0 && ndelete_branches == 0) {
8463 struct got_reference *head_ref;
8465 error = got_ref_open(&head_ref, repo,
8466 got_worktree_get_head_ref_name(worktree), 0);
8468 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
8471 if (got_ref_is_symbolic(head_ref)) {
8472 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
8473 got_ref_close(head_ref);
8478 error = got_pathlist_append(&branches, got_ref_get_name(ref),
8486 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
8487 port ? ":" : "", port ? port : "");
8489 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
8490 server_path, verbosity);
8494 memset(&spa, 0, sizeof(spa));
8495 spa.last_scaled_packsize[0] = '\0';
8496 spa.last_p_deltify = -1;
8497 spa.last_p_written = -1;
8498 spa.verbosity = verbosity;
8499 spa.delete_branches = &delete_branches;
8500 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
8501 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
8502 check_cancelled, NULL);
8503 if (spa.printed_something)
8507 if (!spa.sent_something && verbosity >= 0)
8508 printf("Already up-to-date\n");
8511 if (kill(sendpid, SIGTERM) == -1)
8512 error = got_error_from_errno("kill");
8513 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
8514 error = got_error_from_errno("waitpid");
8516 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
8517 error = got_error_from_errno("close");
8519 const struct got_error *close_err = got_repo_close(repo);
8524 got_worktree_close(worktree);
8527 got_pathlist_free(&branches);
8528 got_pathlist_free(&tags);
8529 got_ref_list_free(&all_branches);
8530 got_ref_list_free(&all_tags);
8531 got_pathlist_free(&delete_args);
8532 TAILQ_FOREACH(pe, &delete_branches, entry)
8533 free((char *)pe->path);
8534 got_pathlist_free(&delete_branches);
8546 usage_cherrypick(void)
8548 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
8552 static const struct got_error *
8553 cmd_cherrypick(int argc, char *argv[])
8555 const struct got_error *error = NULL;
8556 struct got_worktree *worktree = NULL;
8557 struct got_repository *repo = NULL;
8558 char *cwd = NULL, *commit_id_str = NULL;
8559 struct got_object_id *commit_id = NULL;
8560 struct got_commit_object *commit = NULL;
8561 struct got_object_qid *pid;
8563 struct got_update_progress_arg upa;
8565 while ((ch = getopt(argc, argv, "")) != -1) {
8577 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8578 "unveil", NULL) == -1)
8584 cwd = getcwd(NULL, 0);
8586 error = got_error_from_errno("getcwd");
8589 error = got_worktree_open(&worktree, cwd);
8591 if (error->code == GOT_ERR_NOT_WORKTREE)
8592 error = wrap_not_worktree_error(error, "cherrypick",
8597 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8602 error = apply_unveil(got_repo_get_path(repo), 0,
8603 got_worktree_get_root_path(worktree));
8607 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8608 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8611 error = got_object_id_str(&commit_id_str, commit_id);
8615 error = got_object_open_as_commit(&commit, repo, commit_id);
8618 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8619 memset(&upa, 0, sizeof(upa));
8620 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
8621 commit_id, repo, update_progress, &upa, check_cancelled,
8626 if (upa.did_something)
8627 printf("Merged commit %s\n", commit_id_str);
8628 print_merge_progress_stats(&upa);
8631 got_object_commit_close(commit);
8632 free(commit_id_str);
8634 got_worktree_close(worktree);
8636 const struct got_error *close_err = got_repo_close(repo);
8646 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
8650 static const struct got_error *
8651 cmd_backout(int argc, char *argv[])
8653 const struct got_error *error = NULL;
8654 struct got_worktree *worktree = NULL;
8655 struct got_repository *repo = NULL;
8656 char *cwd = NULL, *commit_id_str = NULL;
8657 struct got_object_id *commit_id = NULL;
8658 struct got_commit_object *commit = NULL;
8659 struct got_object_qid *pid;
8661 struct got_update_progress_arg upa;
8663 while ((ch = getopt(argc, argv, "")) != -1) {
8675 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8676 "unveil", NULL) == -1)
8682 cwd = getcwd(NULL, 0);
8684 error = got_error_from_errno("getcwd");
8687 error = got_worktree_open(&worktree, cwd);
8689 if (error->code == GOT_ERR_NOT_WORKTREE)
8690 error = wrap_not_worktree_error(error, "backout", cwd);
8694 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8699 error = apply_unveil(got_repo_get_path(repo), 0,
8700 got_worktree_get_root_path(worktree));
8704 error = got_repo_match_object_id(&commit_id, NULL, argv[0],
8705 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8708 error = got_object_id_str(&commit_id_str, commit_id);
8712 error = got_object_open_as_commit(&commit, repo, commit_id);
8715 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8717 error = got_error(GOT_ERR_ROOT_COMMIT);
8721 memset(&upa, 0, sizeof(upa));
8722 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
8723 repo, update_progress, &upa, check_cancelled, NULL);
8727 if (upa.did_something)
8728 printf("Backed out commit %s\n", commit_id_str);
8729 print_merge_progress_stats(&upa);
8732 got_object_commit_close(commit);
8733 free(commit_id_str);
8735 got_worktree_close(worktree);
8737 const struct got_error *close_err = got_repo_close(repo);
8747 fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [-X] [branch]\n",
8753 trim_logmsg(char *logmsg, int limit)
8758 len = strlen(logmsg);
8762 nl = strchr(logmsg, '\n');
8767 static const struct got_error *
8768 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
8770 const struct got_error *err;
8771 char *logmsg0 = NULL;
8774 err = got_object_commit_get_logmsg(&logmsg0, commit);
8779 while (isspace((unsigned char)s[0]))
8782 *logmsg = strdup(s);
8783 if (*logmsg == NULL) {
8784 err = got_error_from_errno("strdup");
8788 trim_logmsg(*logmsg, limit);
8794 static const struct got_error *
8795 show_rebase_merge_conflict(struct got_object_id *id,
8796 struct got_repository *repo)
8798 const struct got_error *err;
8799 struct got_commit_object *commit = NULL;
8800 char *id_str = NULL, *logmsg = NULL;
8802 err = got_object_open_as_commit(&commit, repo, id);
8806 err = got_object_id_str(&id_str, id);
8812 err = get_short_logmsg(&logmsg, 42, commit);
8816 printf("%s -> merge conflict: %s\n", id_str, logmsg);
8819 got_object_commit_close(commit);
8824 static const struct got_error *
8825 show_rebase_progress(struct got_commit_object *commit,
8826 struct got_object_id *old_id, struct got_object_id *new_id)
8828 const struct got_error *err;
8829 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8831 err = got_object_id_str(&old_id_str, old_id);
8836 err = got_object_id_str(&new_id_str, new_id);
8841 old_id_str[12] = '\0';
8843 new_id_str[12] = '\0';
8845 err = get_short_logmsg(&logmsg, 42, commit);
8849 printf("%s -> %s: %s\n", old_id_str,
8850 new_id_str ? new_id_str : "no-op change", logmsg);
8858 static const struct got_error *
8859 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
8860 struct got_reference *branch, struct got_reference *new_base_branch,
8861 struct got_reference *tmp_branch, struct got_repository *repo,
8864 printf("Switching work tree to %s\n", got_ref_get_name(branch));
8865 return got_worktree_rebase_complete(worktree, fileindex,
8866 new_base_branch, tmp_branch, branch, repo, create_backup);
8869 static const struct got_error *
8870 rebase_commit(struct got_pathlist_head *merged_paths,
8871 struct got_worktree *worktree, struct got_fileindex *fileindex,
8872 struct got_reference *tmp_branch,
8873 struct got_object_id *commit_id, struct got_repository *repo)
8875 const struct got_error *error;
8876 struct got_commit_object *commit;
8877 struct got_object_id *new_commit_id;
8879 error = got_object_open_as_commit(&commit, repo, commit_id);
8883 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
8884 worktree, fileindex, tmp_branch, commit, commit_id, repo);
8886 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
8888 error = show_rebase_progress(commit, commit_id, NULL);
8890 error = show_rebase_progress(commit, commit_id, new_commit_id);
8891 free(new_commit_id);
8894 got_object_commit_close(commit);
8898 struct check_path_prefix_arg {
8899 const char *path_prefix;
8904 static const struct got_error *
8905 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
8906 struct got_blob_object *blob2, FILE *f1, FILE *f2,
8907 struct got_object_id *id1, struct got_object_id *id2,
8908 const char *path1, const char *path2,
8909 mode_t mode1, mode_t mode2, struct got_repository *repo)
8911 struct check_path_prefix_arg *a = arg;
8913 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
8914 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
8915 return got_error(a->errcode);
8920 static const struct got_error *
8921 check_path_prefix(struct got_object_id *parent_id,
8922 struct got_object_id *commit_id, const char *path_prefix,
8923 int errcode, struct got_repository *repo)
8925 const struct got_error *err;
8926 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
8927 struct got_commit_object *commit = NULL, *parent_commit = NULL;
8928 struct check_path_prefix_arg cpp_arg;
8930 if (got_path_is_root_dir(path_prefix))
8933 err = got_object_open_as_commit(&commit, repo, commit_id);
8937 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
8941 err = got_object_open_as_tree(&tree1, repo,
8942 got_object_commit_get_tree_id(parent_commit));
8946 err = got_object_open_as_tree(&tree2, repo,
8947 got_object_commit_get_tree_id(commit));
8951 cpp_arg.path_prefix = path_prefix;
8952 while (cpp_arg.path_prefix[0] == '/')
8953 cpp_arg.path_prefix++;
8954 cpp_arg.len = strlen(cpp_arg.path_prefix);
8955 cpp_arg.errcode = errcode;
8956 err = got_diff_tree(tree1, tree2, NULL, NULL, "", "", repo,
8957 check_path_prefix_in_diff, &cpp_arg, 0);
8960 got_object_tree_close(tree1);
8962 got_object_tree_close(tree2);
8964 got_object_commit_close(commit);
8966 got_object_commit_close(parent_commit);
8970 static const struct got_error *
8971 collect_commits(struct got_object_id_queue *commits,
8972 struct got_object_id *initial_commit_id,
8973 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
8974 const char *path_prefix, int path_prefix_errcode,
8975 struct got_repository *repo)
8977 const struct got_error *err = NULL;
8978 struct got_commit_graph *graph = NULL;
8979 struct got_object_id *parent_id = NULL;
8980 struct got_object_qid *qid;
8981 struct got_object_id *commit_id = initial_commit_id;
8983 err = got_commit_graph_open(&graph, "/", 1);
8987 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
8988 check_cancelled, NULL);
8991 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
8992 err = got_commit_graph_iter_next(&parent_id, graph, repo,
8993 check_cancelled, NULL);
8995 if (err->code == GOT_ERR_ITER_COMPLETED) {
8996 err = got_error_msg(GOT_ERR_ANCESTRY,
8997 "ran out of commits to rebase before "
8998 "youngest common ancestor commit has "
9003 err = check_path_prefix(parent_id, commit_id,
9004 path_prefix, path_prefix_errcode, repo);
9008 err = got_object_qid_alloc(&qid, commit_id);
9011 STAILQ_INSERT_HEAD(commits, qid, entry);
9012 commit_id = parent_id;
9016 got_commit_graph_close(graph);
9020 static const struct got_error *
9021 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
9023 const struct got_error *err = NULL;
9024 time_t committer_time;
9026 char datebuf[11]; /* YYYY-MM-DD + NUL */
9027 char *author0 = NULL, *author, *smallerthan;
9028 char *logmsg0 = NULL, *logmsg, *newline;
9030 committer_time = got_object_commit_get_committer_time(commit);
9031 if (gmtime_r(&committer_time, &tm) == NULL)
9032 return got_error_from_errno("gmtime_r");
9033 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
9034 return got_error(GOT_ERR_NO_SPACE);
9036 author0 = strdup(got_object_commit_get_author(commit));
9037 if (author0 == NULL)
9038 return got_error_from_errno("strdup");
9040 smallerthan = strchr(author, '<');
9041 if (smallerthan && smallerthan[1] != '\0')
9042 author = smallerthan + 1;
9043 author[strcspn(author, "@>")] = '\0';
9045 err = got_object_commit_get_logmsg(&logmsg0, commit);
9049 while (*logmsg == '\n')
9051 newline = strchr(logmsg, '\n');
9055 if (asprintf(brief_str, "%s %s %s",
9056 datebuf, author, logmsg) == -1)
9057 err = got_error_from_errno("asprintf");
9064 static const struct got_error *
9065 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
9066 struct got_repository *repo)
9068 const struct got_error *err;
9071 err = got_object_id_str(&id_str, id);
9075 err = got_ref_delete(ref, repo);
9079 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
9085 static const struct got_error *
9086 print_backup_ref(const char *branch_name, const char *new_id_str,
9087 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
9088 struct got_reflist_object_id_map *refs_idmap,
9089 struct got_repository *repo)
9091 const struct got_error *err = NULL;
9092 struct got_reflist_head *refs;
9093 char *refs_str = NULL;
9094 struct got_object_id *new_commit_id = NULL;
9095 struct got_commit_object *new_commit = NULL;
9096 char *new_commit_brief_str = NULL;
9097 struct got_object_id *yca_id = NULL;
9098 struct got_commit_object *yca_commit = NULL;
9099 char *yca_id_str = NULL, *yca_brief_str = NULL;
9100 char *custom_refs_str;
9102 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
9103 return got_error_from_errno("asprintf");
9105 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
9106 0, 0, refs_idmap, custom_refs_str);
9110 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
9114 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
9116 err = build_refs_str(&refs_str, refs, new_commit_id, repo);
9121 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
9125 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
9129 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9130 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
9134 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
9135 refs_str ? " (" : "", refs_str ? refs_str : "",
9136 refs_str ? ")" : "", new_commit_brief_str);
9137 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
9138 got_object_id_cmp(yca_id, old_commit_id) != 0) {
9142 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
9146 err = get_commit_brief_str(&yca_brief_str, yca_commit);
9150 err = got_object_id_str(&yca_id_str, yca_id);
9154 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
9156 err = build_refs_str(&refs_str, refs, yca_id, repo);
9160 printf("history forked at %s%s%s%s\n %s\n",
9162 refs_str ? " (" : "", refs_str ? refs_str : "",
9163 refs_str ? ")" : "", yca_brief_str);
9166 free(custom_refs_str);
9167 free(new_commit_id);
9171 free(yca_brief_str);
9173 got_object_commit_close(new_commit);
9175 got_object_commit_close(yca_commit);
9180 static const struct got_error *
9181 process_backup_refs(const char *backup_ref_prefix,
9182 const char *wanted_branch_name,
9183 int delete, struct got_repository *repo)
9185 const struct got_error *err;
9186 struct got_reflist_head refs, backup_refs;
9187 struct got_reflist_entry *re;
9188 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
9189 struct got_object_id *old_commit_id = NULL;
9190 char *branch_name = NULL;
9191 struct got_commit_object *old_commit = NULL;
9192 struct got_reflist_object_id_map *refs_idmap = NULL;
9193 int wanted_branch_found = 0;
9196 TAILQ_INIT(&backup_refs);
9198 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9202 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
9206 if (wanted_branch_name) {
9207 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
9208 wanted_branch_name += 11;
9211 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
9212 got_ref_cmp_by_commit_timestamp_descending, repo);
9216 TAILQ_FOREACH(re, &backup_refs, entry) {
9217 const char *refname = got_ref_get_name(re->ref);
9220 err = check_cancelled(NULL);
9224 err = got_ref_resolve(&old_commit_id, repo, re->ref);
9228 err = got_object_open_as_commit(&old_commit, repo,
9233 if (strncmp(backup_ref_prefix, refname,
9234 backup_ref_prefix_len) == 0)
9235 refname += backup_ref_prefix_len;
9237 while (refname[0] == '/')
9240 branch_name = strdup(refname);
9241 if (branch_name == NULL) {
9242 err = got_error_from_errno("strdup");
9245 slash = strrchr(branch_name, '/');
9248 refname += strlen(branch_name) + 1;
9251 if (wanted_branch_name == NULL ||
9252 strcmp(wanted_branch_name, branch_name) == 0) {
9253 wanted_branch_found = 1;
9255 err = delete_backup_ref(re->ref,
9256 old_commit_id, repo);
9258 err = print_backup_ref(branch_name, refname,
9259 old_commit_id, old_commit, refs_idmap,
9266 free(old_commit_id);
9267 old_commit_id = NULL;
9270 got_object_commit_close(old_commit);
9274 if (wanted_branch_name && !wanted_branch_found) {
9275 err = got_error_fmt(GOT_ERR_NOT_REF,
9276 "%s/%s/", backup_ref_prefix, wanted_branch_name);
9280 got_reflist_object_id_map_free(refs_idmap);
9281 got_ref_list_free(&refs);
9282 got_ref_list_free(&backup_refs);
9283 free(old_commit_id);
9286 got_object_commit_close(old_commit);
9290 static const struct got_error *
9291 abort_progress(void *arg, unsigned char status, const char *path)
9294 * Unversioned files should not clutter progress output when
9295 * an operation is aborted.
9297 if (status == GOT_STATUS_UNVERSIONED)
9300 return update_progress(arg, status, path);
9303 static const struct got_error *
9304 cmd_rebase(int argc, char *argv[])
9306 const struct got_error *error = NULL;
9307 struct got_worktree *worktree = NULL;
9308 struct got_repository *repo = NULL;
9309 struct got_fileindex *fileindex = NULL;
9311 struct got_reference *branch = NULL;
9312 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
9313 struct got_object_id *commit_id = NULL, *parent_id = NULL;
9314 struct got_object_id *resume_commit_id = NULL;
9315 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
9316 struct got_commit_object *commit = NULL;
9317 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
9318 int histedit_in_progress = 0, merge_in_progress = 0;
9319 int create_backup = 1, list_backups = 0, delete_backups = 0;
9320 struct got_object_id_queue commits;
9321 struct got_pathlist_head merged_paths;
9322 const struct got_object_id_queue *parent_ids;
9323 struct got_object_qid *qid, *pid;
9324 struct got_update_progress_arg upa;
9326 STAILQ_INIT(&commits);
9327 TAILQ_INIT(&merged_paths);
9328 memset(&upa, 0, sizeof(upa));
9330 while ((ch = getopt(argc, argv, "aclX")) != -1) {
9336 continue_rebase = 1;
9354 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9355 "unveil", NULL) == -1)
9360 option_conflict('l', 'a');
9361 if (continue_rebase)
9362 option_conflict('l', 'c');
9364 option_conflict('l', 'X');
9365 if (argc != 0 && argc != 1)
9367 } else if (delete_backups) {
9369 option_conflict('X', 'a');
9370 if (continue_rebase)
9371 option_conflict('X', 'c');
9373 option_conflict('l', 'X');
9374 if (argc != 0 && argc != 1)
9377 if (abort_rebase && continue_rebase)
9379 else if (abort_rebase || continue_rebase) {
9382 } else if (argc != 1)
9386 cwd = getcwd(NULL, 0);
9388 error = got_error_from_errno("getcwd");
9391 error = got_worktree_open(&worktree, cwd);
9393 if (list_backups || delete_backups) {
9394 if (error->code != GOT_ERR_NOT_WORKTREE)
9397 if (error->code == GOT_ERR_NOT_WORKTREE)
9398 error = wrap_not_worktree_error(error,
9404 error = got_repo_open(&repo,
9405 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
9409 error = apply_unveil(got_repo_get_path(repo), 0,
9410 worktree ? got_worktree_get_root_path(worktree) : NULL);
9414 if (list_backups || delete_backups) {
9415 error = process_backup_refs(
9416 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
9417 argc == 1 ? argv[0] : NULL, delete_backups, repo);
9418 goto done; /* nothing else to do */
9421 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9425 if (histedit_in_progress) {
9426 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9430 error = got_worktree_merge_in_progress(&merge_in_progress,
9434 if (merge_in_progress) {
9435 error = got_error(GOT_ERR_MERGE_BUSY);
9439 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9444 if (!rebase_in_progress) {
9445 error = got_error(GOT_ERR_NOT_REBASING);
9448 error = got_worktree_rebase_continue(&resume_commit_id,
9449 &new_base_branch, &tmp_branch, &branch, &fileindex,
9453 printf("Switching work tree to %s\n",
9454 got_ref_get_symref_target(new_base_branch));
9455 error = got_worktree_rebase_abort(worktree, fileindex, repo,
9456 new_base_branch, abort_progress, &upa);
9459 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
9460 print_merge_progress_stats(&upa);
9461 goto done; /* nothing else to do */
9464 if (continue_rebase) {
9465 if (!rebase_in_progress) {
9466 error = got_error(GOT_ERR_NOT_REBASING);
9469 error = got_worktree_rebase_continue(&resume_commit_id,
9470 &new_base_branch, &tmp_branch, &branch, &fileindex,
9475 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
9476 resume_commit_id, repo);
9480 yca_id = got_object_id_dup(resume_commit_id);
9481 if (yca_id == NULL) {
9482 error = got_error_from_errno("got_object_id_dup");
9486 error = got_ref_open(&branch, repo, argv[0], 0);
9491 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
9495 if (!continue_rebase) {
9496 struct got_object_id *base_commit_id;
9498 base_commit_id = got_worktree_get_base_commit_id(worktree);
9499 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
9500 base_commit_id, branch_head_commit_id, 1, repo,
9501 check_cancelled, NULL);
9504 if (yca_id == NULL) {
9505 error = got_error_msg(GOT_ERR_ANCESTRY,
9506 "specified branch shares no common ancestry "
9507 "with work tree's branch");
9511 error = check_same_branch(base_commit_id, branch, yca_id, repo);
9513 if (error->code != GOT_ERR_ANCESTRY)
9517 struct got_pathlist_head paths;
9518 printf("%s is already based on %s\n",
9519 got_ref_get_name(branch),
9520 got_worktree_get_head_ref_name(worktree));
9521 error = switch_head_ref(branch, branch_head_commit_id,
9525 error = got_worktree_set_base_commit_id(worktree, repo,
9526 branch_head_commit_id);
9530 error = got_pathlist_append(&paths, "", NULL);
9533 error = got_worktree_checkout_files(worktree,
9534 &paths, repo, update_progress, &upa,
9535 check_cancelled, NULL);
9536 got_pathlist_free(&paths);
9539 if (upa.did_something) {
9541 error = got_object_id_str(&id_str,
9542 branch_head_commit_id);
9545 printf("Updated to %s: %s\n",
9546 got_worktree_get_head_ref_name(worktree),
9550 printf("Already up-to-date\n");
9551 print_update_progress_stats(&upa);
9556 commit_id = branch_head_commit_id;
9557 error = got_object_open_as_commit(&commit, repo, commit_id);
9561 parent_ids = got_object_commit_get_parent_ids(commit);
9562 pid = STAILQ_FIRST(parent_ids);
9564 error = got_error(GOT_ERR_EMPTY_REBASE);
9567 error = collect_commits(&commits, commit_id, &pid->id,
9568 yca_id, got_worktree_get_path_prefix(worktree),
9569 GOT_ERR_REBASE_PATH, repo);
9570 got_object_commit_close(commit);
9575 if (!continue_rebase) {
9576 error = got_worktree_rebase_prepare(&new_base_branch,
9577 &tmp_branch, &fileindex, worktree, branch, repo);
9582 if (STAILQ_EMPTY(&commits)) {
9583 if (continue_rebase) {
9584 error = rebase_complete(worktree, fileindex,
9585 branch, new_base_branch, tmp_branch, repo,
9589 /* Fast-forward the reference of the branch. */
9590 struct got_object_id *new_head_commit_id;
9592 error = got_ref_resolve(&new_head_commit_id, repo,
9596 error = got_object_id_str(&id_str, new_head_commit_id);
9597 printf("Forwarding %s to commit %s\n",
9598 got_ref_get_name(branch), id_str);
9600 error = got_ref_change_ref(branch,
9601 new_head_commit_id);
9604 /* No backup needed since objects did not change. */
9610 STAILQ_FOREACH(qid, &commits, entry) {
9612 commit_id = &qid->id;
9613 parent_id = pid ? &pid->id : yca_id;
9616 memset(&upa, 0, sizeof(upa));
9617 error = got_worktree_rebase_merge_files(&merged_paths,
9618 worktree, fileindex, parent_id, commit_id, repo,
9619 update_progress, &upa, check_cancelled, NULL);
9623 print_merge_progress_stats(&upa);
9624 if (upa.conflicts > 0 || upa.missing > 0 ||
9625 upa.not_deleted > 0 || upa.unversioned > 0) {
9626 if (upa.conflicts > 0) {
9627 error = show_rebase_merge_conflict(&qid->id,
9632 got_worktree_rebase_pathlist_free(&merged_paths);
9636 error = rebase_commit(&merged_paths, worktree, fileindex,
9637 tmp_branch, commit_id, repo);
9638 got_worktree_rebase_pathlist_free(&merged_paths);
9643 if (upa.conflicts > 0 || upa.missing > 0 ||
9644 upa.not_deleted > 0 || upa.unversioned > 0) {
9645 error = got_worktree_rebase_postpone(worktree, fileindex);
9648 if (upa.conflicts > 0 && upa.missing == 0 &&
9649 upa.not_deleted == 0 && upa.unversioned == 0) {
9650 error = got_error_msg(GOT_ERR_CONFLICTS,
9651 "conflicts must be resolved before rebasing "
9653 } else if (upa.conflicts > 0) {
9654 error = got_error_msg(GOT_ERR_CONFLICTS,
9655 "conflicts must be resolved before rebasing "
9656 "can continue; changes destined for some "
9657 "files were not yet merged and should be "
9658 "merged manually if required before the "
9659 "rebase operation is continued");
9661 error = got_error_msg(GOT_ERR_CONFLICTS,
9662 "changes destined for some files were not "
9663 "yet merged and should be merged manually "
9664 "if required before the rebase operation "
9668 error = rebase_complete(worktree, fileindex, branch,
9669 new_base_branch, tmp_branch, repo, create_backup);
9671 got_object_id_queue_free(&commits);
9672 free(branch_head_commit_id);
9673 free(resume_commit_id);
9676 got_object_commit_close(commit);
9678 got_ref_close(branch);
9679 if (new_base_branch)
9680 got_ref_close(new_base_branch);
9682 got_ref_close(tmp_branch);
9684 got_worktree_close(worktree);
9686 const struct got_error *close_err = got_repo_close(repo);
9694 usage_histedit(void)
9696 fprintf(stderr, "usage: %s histedit [-a] [-c] [-e] [-f] "
9697 "[-F histedit-script] [-m] [-l] [-X] [branch]\n",
9702 #define GOT_HISTEDIT_PICK 'p'
9703 #define GOT_HISTEDIT_EDIT 'e'
9704 #define GOT_HISTEDIT_FOLD 'f'
9705 #define GOT_HISTEDIT_DROP 'd'
9706 #define GOT_HISTEDIT_MESG 'm'
9708 static const struct got_histedit_cmd {
9712 } got_histedit_cmds[] = {
9713 { GOT_HISTEDIT_PICK, "pick", "use commit" },
9714 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
9715 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
9717 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
9718 { GOT_HISTEDIT_MESG, "mesg",
9719 "single-line log message for commit above (open editor if empty)" },
9722 struct got_histedit_list_entry {
9723 TAILQ_ENTRY(got_histedit_list_entry) entry;
9724 struct got_object_id *commit_id;
9725 const struct got_histedit_cmd *cmd;
9728 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
9730 static const struct got_error *
9731 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
9732 FILE *f, struct got_repository *repo)
9734 const struct got_error *err = NULL;
9735 char *logmsg = NULL, *id_str = NULL;
9736 struct got_commit_object *commit = NULL;
9739 err = got_object_open_as_commit(&commit, repo, commit_id);
9743 err = get_short_logmsg(&logmsg, 34, commit);
9747 err = got_object_id_str(&id_str, commit_id);
9751 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
9753 err = got_ferror(f, GOT_ERR_IO);
9756 got_object_commit_close(commit);
9762 static const struct got_error *
9763 histedit_write_commit_list(struct got_object_id_queue *commits,
9764 FILE *f, int edit_logmsg_only, int fold_only, int edit_only,
9765 struct got_repository *repo)
9767 const struct got_error *err = NULL;
9768 struct got_object_qid *qid;
9769 const char *histedit_cmd = NULL;
9771 if (STAILQ_EMPTY(commits))
9772 return got_error(GOT_ERR_EMPTY_HISTEDIT);
9774 STAILQ_FOREACH(qid, commits, entry) {
9775 histedit_cmd = got_histedit_cmds[0].name;
9777 histedit_cmd = "edit";
9778 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
9779 histedit_cmd = "fold";
9780 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
9783 if (edit_logmsg_only) {
9784 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
9786 err = got_ferror(f, GOT_ERR_IO);
9795 static const struct got_error *
9796 write_cmd_list(FILE *f, const char *branch_name,
9797 struct got_object_id_queue *commits)
9799 const struct got_error *err = NULL;
9803 struct got_object_qid *qid;
9805 qid = STAILQ_FIRST(commits);
9806 err = got_object_id_str(&id_str, &qid->id);
9811 "# Editing the history of branch '%s' starting at\n"
9813 "# Commits will be processed in order from top to "
9814 "bottom of this file.\n", branch_name, id_str);
9816 err = got_ferror(f, GOT_ERR_IO);
9820 n = fprintf(f, "# Available histedit commands:\n");
9822 err = got_ferror(f, GOT_ERR_IO);
9826 for (i = 0; i < nitems(got_histedit_cmds); i++) {
9827 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
9828 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
9831 err = got_ferror(f, GOT_ERR_IO);
9840 static const struct got_error *
9841 histedit_syntax_error(int lineno)
9843 static char msg[42];
9846 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
9848 if (ret == -1 || ret >= sizeof(msg))
9849 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
9851 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
9854 static const struct got_error *
9855 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
9856 char *logmsg, struct got_repository *repo)
9858 const struct got_error *err;
9859 struct got_commit_object *folded_commit = NULL;
9860 char *id_str, *folded_logmsg = NULL;
9862 err = got_object_id_str(&id_str, hle->commit_id);
9866 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
9870 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
9873 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
9874 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
9875 folded_logmsg) == -1) {
9876 err = got_error_from_errno("asprintf");
9880 got_object_commit_close(folded_commit);
9882 free(folded_logmsg);
9886 static struct got_histedit_list_entry *
9887 get_folded_commits(struct got_histedit_list_entry *hle)
9889 struct got_histedit_list_entry *prev, *folded = NULL;
9891 prev = TAILQ_PREV(hle, got_histedit_list, entry);
9892 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
9893 prev->cmd->code == GOT_HISTEDIT_DROP)) {
9894 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
9896 prev = TAILQ_PREV(prev, got_histedit_list, entry);
9902 static const struct got_error *
9903 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
9904 struct got_repository *repo)
9906 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
9907 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
9908 const struct got_error *err = NULL;
9909 struct got_commit_object *commit = NULL;
9912 struct got_histedit_list_entry *folded = NULL;
9914 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9918 folded = get_folded_commits(hle);
9920 while (folded != hle) {
9921 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
9922 folded = TAILQ_NEXT(folded, entry);
9925 err = append_folded_commit_msg(&new_msg, folded,
9931 folded = TAILQ_NEXT(folded, entry);
9935 err = got_object_id_str(&id_str, hle->commit_id);
9938 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
9941 logmsg_len = asprintf(&new_msg,
9942 "%s\n# original log message of commit %s: %s",
9943 logmsg ? logmsg : "", id_str, orig_logmsg);
9944 if (logmsg_len == -1) {
9945 err = got_error_from_errno("asprintf");
9951 err = got_object_id_str(&id_str, hle->commit_id);
9955 err = got_opentemp_named_fd(&logmsg_path, &fd,
9956 GOT_TMPDIR_STR "/got-logmsg");
9960 write(fd, logmsg, logmsg_len);
9963 err = get_editor(&editor);
9967 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
9970 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
9973 hle->logmsg = strdup(new_msg);
9974 if (hle->logmsg == NULL)
9975 err = got_error_from_errno("strdup");
9978 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
9979 err = got_error_from_errno2("unlink", logmsg_path);
9985 got_object_commit_close(commit);
9989 static const struct got_error *
9990 histedit_parse_list(struct got_histedit_list *histedit_cmds,
9991 FILE *f, struct got_repository *repo)
9993 const struct got_error *err = NULL;
9994 char *line = NULL, *p, *end;
9998 const struct got_histedit_cmd *cmd;
9999 struct got_object_id *commit_id = NULL;
10000 struct got_histedit_list_entry *hle = NULL;
10003 len = getline(&line, &size, f);
10005 const struct got_error *getline_err;
10008 getline_err = got_error_from_errno("getline");
10009 err = got_ferror(f, getline_err->code);
10014 while (isspace((unsigned char)p[0]))
10016 if (p[0] == '#' || p[0] == '\0') {
10022 for (i = 0; i < nitems(got_histedit_cmds); i++) {
10023 cmd = &got_histedit_cmds[i];
10024 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
10025 isspace((unsigned char)p[strlen(cmd->name)])) {
10026 p += strlen(cmd->name);
10029 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
10034 if (i == nitems(got_histedit_cmds)) {
10035 err = histedit_syntax_error(lineno);
10038 while (isspace((unsigned char)p[0]))
10040 if (cmd->code == GOT_HISTEDIT_MESG) {
10041 if (hle == NULL || hle->logmsg != NULL) {
10042 err = got_error(GOT_ERR_HISTEDIT_CMD);
10045 if (p[0] == '\0') {
10046 err = histedit_edit_logmsg(hle, repo);
10050 hle->logmsg = strdup(p);
10051 if (hle->logmsg == NULL) {
10052 err = got_error_from_errno("strdup");
10061 while (end[0] && !isspace((unsigned char)end[0]))
10065 err = got_object_resolve_id_str(&commit_id, repo, p);
10067 /* override error code */
10068 err = histedit_syntax_error(lineno);
10072 hle = malloc(sizeof(*hle));
10074 err = got_error_from_errno("malloc");
10078 hle->commit_id = commit_id;
10079 hle->logmsg = NULL;
10083 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
10091 static const struct got_error *
10092 histedit_check_script(struct got_histedit_list *histedit_cmds,
10093 struct got_object_id_queue *commits, struct got_repository *repo)
10095 const struct got_error *err = NULL;
10096 struct got_object_qid *qid;
10097 struct got_histedit_list_entry *hle;
10098 static char msg[92];
10101 if (TAILQ_EMPTY(histedit_cmds))
10102 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
10103 "histedit script contains no commands");
10104 if (STAILQ_EMPTY(commits))
10105 return got_error(GOT_ERR_EMPTY_HISTEDIT);
10107 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10108 struct got_histedit_list_entry *hle2;
10109 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
10112 if (got_object_id_cmp(hle->commit_id,
10113 hle2->commit_id) != 0)
10115 err = got_object_id_str(&id_str, hle->commit_id);
10118 snprintf(msg, sizeof(msg), "commit %s is listed "
10119 "more than once in histedit script", id_str);
10121 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10125 STAILQ_FOREACH(qid, commits, entry) {
10126 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10127 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
10131 err = got_object_id_str(&id_str, &qid->id);
10134 snprintf(msg, sizeof(msg),
10135 "commit %s missing from histedit script", id_str);
10137 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
10141 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
10142 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
10143 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
10144 "last commit in histedit script cannot be folded");
10149 static const struct got_error *
10150 histedit_run_editor(struct got_histedit_list *histedit_cmds,
10151 const char *path, struct got_object_id_queue *commits,
10152 struct got_repository *repo)
10154 const struct got_error *err = NULL;
10158 err = get_editor(&editor);
10162 if (spawn_editor(editor, path) == -1) {
10163 err = got_error_from_errno("failed spawning editor");
10167 f = fopen(path, "re");
10169 err = got_error_from_errno("fopen");
10172 err = histedit_parse_list(histedit_cmds, f, repo);
10176 err = histedit_check_script(histedit_cmds, commits, repo);
10178 if (f && fclose(f) == EOF && err == NULL)
10179 err = got_error_from_errno("fclose");
10184 static const struct got_error *
10185 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
10186 struct got_object_id_queue *, const char *, const char *,
10187 struct got_repository *);
10189 static const struct got_error *
10190 histedit_edit_script(struct got_histedit_list *histedit_cmds,
10191 struct got_object_id_queue *commits, const char *branch_name,
10192 int edit_logmsg_only, int fold_only, int edit_only,
10193 struct got_repository *repo)
10195 const struct got_error *err;
10199 err = got_opentemp_named(&path, &f, "got-histedit");
10203 err = write_cmd_list(f, branch_name, commits);
10207 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
10208 fold_only, edit_only, repo);
10212 if (edit_logmsg_only || fold_only || edit_only) {
10214 err = histedit_parse_list(histedit_cmds, f, repo);
10216 if (fclose(f) == EOF) {
10217 err = got_error_from_errno("fclose");
10221 err = histedit_run_editor(histedit_cmds, path, commits, repo);
10223 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10224 err->code != GOT_ERR_HISTEDIT_CMD)
10226 err = histedit_edit_list_retry(histedit_cmds, err,
10227 commits, path, branch_name, repo);
10231 if (f && fclose(f) == EOF && err == NULL)
10232 err = got_error_from_errno("fclose");
10233 if (path && unlink(path) != 0 && err == NULL)
10234 err = got_error_from_errno2("unlink", path);
10239 static const struct got_error *
10240 histedit_save_list(struct got_histedit_list *histedit_cmds,
10241 struct got_worktree *worktree, struct got_repository *repo)
10243 const struct got_error *err = NULL;
10246 struct got_histedit_list_entry *hle;
10247 struct got_commit_object *commit = NULL;
10249 err = got_worktree_get_histedit_script_path(&path, worktree);
10253 f = fopen(path, "we");
10255 err = got_error_from_errno2("fopen", path);
10258 TAILQ_FOREACH(hle, histedit_cmds, entry) {
10259 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
10265 int n = fprintf(f, "%c %s\n",
10266 GOT_HISTEDIT_MESG, hle->logmsg);
10268 err = got_ferror(f, GOT_ERR_IO);
10274 if (f && fclose(f) == EOF && err == NULL)
10275 err = got_error_from_errno("fclose");
10278 got_object_commit_close(commit);
10283 histedit_free_list(struct got_histedit_list *histedit_cmds)
10285 struct got_histedit_list_entry *hle;
10287 while ((hle = TAILQ_FIRST(histedit_cmds))) {
10288 TAILQ_REMOVE(histedit_cmds, hle, entry);
10293 static const struct got_error *
10294 histedit_load_list(struct got_histedit_list *histedit_cmds,
10295 const char *path, struct got_repository *repo)
10297 const struct got_error *err = NULL;
10300 f = fopen(path, "re");
10302 err = got_error_from_errno2("fopen", path);
10306 err = histedit_parse_list(histedit_cmds, f, repo);
10308 if (f && fclose(f) == EOF && err == NULL)
10309 err = got_error_from_errno("fclose");
10313 static const struct got_error *
10314 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
10315 const struct got_error *edit_err, struct got_object_id_queue *commits,
10316 const char *path, const char *branch_name, struct got_repository *repo)
10318 const struct got_error *err = NULL, *prev_err = edit_err;
10321 while (resp != 'c' && resp != 'r' && resp != 'a') {
10322 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
10323 "or (a)bort: ", getprogname(), prev_err->msg);
10328 histedit_free_list(histedit_cmds);
10329 err = histedit_run_editor(histedit_cmds, path, commits,
10332 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10333 err->code != GOT_ERR_HISTEDIT_CMD)
10340 } else if (resp == 'r') {
10341 histedit_free_list(histedit_cmds);
10342 err = histedit_edit_script(histedit_cmds,
10343 commits, branch_name, 0, 0, 0, repo);
10345 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
10346 err->code != GOT_ERR_HISTEDIT_CMD)
10353 } else if (resp == 'a') {
10354 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
10357 printf("invalid response '%c'\n", resp);
10363 static const struct got_error *
10364 histedit_complete(struct got_worktree *worktree,
10365 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
10366 struct got_reference *branch, struct got_repository *repo)
10368 printf("Switching work tree to %s\n",
10369 got_ref_get_symref_target(branch));
10370 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
10374 static const struct got_error *
10375 show_histedit_progress(struct got_commit_object *commit,
10376 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
10378 const struct got_error *err;
10379 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10381 err = got_object_id_str(&old_id_str, hle->commit_id);
10386 err = got_object_id_str(&new_id_str, new_id);
10391 old_id_str[12] = '\0';
10393 new_id_str[12] = '\0';
10396 logmsg = strdup(hle->logmsg);
10397 if (logmsg == NULL) {
10398 err = got_error_from_errno("strdup");
10401 trim_logmsg(logmsg, 42);
10403 err = get_short_logmsg(&logmsg, 42, commit);
10408 switch (hle->cmd->code) {
10409 case GOT_HISTEDIT_PICK:
10410 case GOT_HISTEDIT_EDIT:
10411 printf("%s -> %s: %s\n", old_id_str,
10412 new_id_str ? new_id_str : "no-op change", logmsg);
10414 case GOT_HISTEDIT_DROP:
10415 case GOT_HISTEDIT_FOLD:
10416 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
10428 static const struct got_error *
10429 histedit_commit(struct got_pathlist_head *merged_paths,
10430 struct got_worktree *worktree, struct got_fileindex *fileindex,
10431 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
10432 struct got_repository *repo)
10434 const struct got_error *err;
10435 struct got_commit_object *commit;
10436 struct got_object_id *new_commit_id;
10438 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
10439 && hle->logmsg == NULL) {
10440 err = histedit_edit_logmsg(hle, repo);
10445 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
10449 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
10450 worktree, fileindex, tmp_branch, commit, hle->commit_id,
10451 hle->logmsg, repo);
10453 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
10455 err = show_histedit_progress(commit, hle, NULL);
10457 err = show_histedit_progress(commit, hle, new_commit_id);
10458 free(new_commit_id);
10461 got_object_commit_close(commit);
10465 static const struct got_error *
10466 histedit_skip_commit(struct got_histedit_list_entry *hle,
10467 struct got_worktree *worktree, struct got_repository *repo)
10469 const struct got_error *error;
10470 struct got_commit_object *commit;
10472 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
10477 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
10481 error = show_histedit_progress(commit, hle, NULL);
10482 got_object_commit_close(commit);
10486 static const struct got_error *
10487 check_local_changes(void *arg, unsigned char status,
10488 unsigned char staged_status, const char *path,
10489 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10490 struct got_object_id *commit_id, int dirfd, const char *de_name)
10492 int *have_local_changes = arg;
10495 case GOT_STATUS_ADD:
10496 case GOT_STATUS_DELETE:
10497 case GOT_STATUS_MODIFY:
10498 case GOT_STATUS_CONFLICT:
10499 *have_local_changes = 1;
10500 return got_error(GOT_ERR_CANCELLED);
10505 switch (staged_status) {
10506 case GOT_STATUS_ADD:
10507 case GOT_STATUS_DELETE:
10508 case GOT_STATUS_MODIFY:
10509 *have_local_changes = 1;
10510 return got_error(GOT_ERR_CANCELLED);
10518 static const struct got_error *
10519 cmd_histedit(int argc, char *argv[])
10521 const struct got_error *error = NULL;
10522 struct got_worktree *worktree = NULL;
10523 struct got_fileindex *fileindex = NULL;
10524 struct got_repository *repo = NULL;
10526 struct got_reference *branch = NULL;
10527 struct got_reference *tmp_branch = NULL;
10528 struct got_object_id *resume_commit_id = NULL;
10529 struct got_object_id *base_commit_id = NULL;
10530 struct got_object_id *head_commit_id = NULL;
10531 struct got_commit_object *commit = NULL;
10532 int ch, rebase_in_progress = 0, merge_in_progress = 0;
10533 struct got_update_progress_arg upa;
10534 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
10535 int edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
10536 int list_backups = 0, delete_backups = 0;
10537 const char *edit_script_path = NULL;
10538 struct got_object_id_queue commits;
10539 struct got_pathlist_head merged_paths;
10540 const struct got_object_id_queue *parent_ids;
10541 struct got_object_qid *pid;
10542 struct got_histedit_list histedit_cmds;
10543 struct got_histedit_list_entry *hle;
10545 STAILQ_INIT(&commits);
10546 TAILQ_INIT(&histedit_cmds);
10547 TAILQ_INIT(&merged_paths);
10548 memset(&upa, 0, sizeof(upa));
10550 while ((ch = getopt(argc, argv, "acefF:mlX")) != -1) {
10565 edit_script_path = optarg;
10568 edit_logmsg_only = 1;
10574 delete_backups = 1;
10586 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10587 "unveil", NULL) == -1)
10590 if (abort_edit && continue_edit)
10591 option_conflict('a', 'c');
10592 if (edit_script_path && edit_logmsg_only)
10593 option_conflict('F', 'm');
10594 if (abort_edit && edit_logmsg_only)
10595 option_conflict('a', 'm');
10596 if (continue_edit && edit_logmsg_only)
10597 option_conflict('c', 'm');
10598 if (abort_edit && fold_only)
10599 option_conflict('a', 'f');
10600 if (continue_edit && fold_only)
10601 option_conflict('c', 'f');
10602 if (fold_only && edit_logmsg_only)
10603 option_conflict('f', 'm');
10604 if (edit_script_path && fold_only)
10605 option_conflict('F', 'f');
10606 if (abort_edit && edit_only)
10607 option_conflict('a', 'e');
10608 if (continue_edit && edit_only)
10609 option_conflict('c', 'e');
10610 if (edit_only && edit_logmsg_only)
10611 option_conflict('e', 'm');
10612 if (edit_script_path && edit_only)
10613 option_conflict('F', 'e');
10614 if (list_backups) {
10616 option_conflict('l', 'a');
10618 option_conflict('l', 'c');
10619 if (edit_script_path)
10620 option_conflict('l', 'F');
10621 if (edit_logmsg_only)
10622 option_conflict('l', 'm');
10624 option_conflict('l', 'f');
10626 option_conflict('l', 'e');
10627 if (delete_backups)
10628 option_conflict('l', 'X');
10629 if (argc != 0 && argc != 1)
10631 } else if (delete_backups) {
10633 option_conflict('X', 'a');
10635 option_conflict('X', 'c');
10636 if (edit_script_path)
10637 option_conflict('X', 'F');
10638 if (edit_logmsg_only)
10639 option_conflict('X', 'm');
10641 option_conflict('X', 'f');
10643 option_conflict('X', 'e');
10645 option_conflict('X', 'l');
10646 if (argc != 0 && argc != 1)
10648 } else if (argc != 0)
10652 * This command cannot apply unveil(2) in all cases because the
10653 * user may choose to run an editor to edit the histedit script
10654 * and to edit individual commit log messages.
10655 * unveil(2) traverses exec(2); if an editor is used we have to
10656 * apply unveil after edit script and log messages have been written.
10657 * XXX TODO: Make use of unveil(2) where possible.
10660 cwd = getcwd(NULL, 0);
10662 error = got_error_from_errno("getcwd");
10665 error = got_worktree_open(&worktree, cwd);
10667 if (list_backups || delete_backups) {
10668 if (error->code != GOT_ERR_NOT_WORKTREE)
10671 if (error->code == GOT_ERR_NOT_WORKTREE)
10672 error = wrap_not_worktree_error(error,
10678 if (list_backups || delete_backups) {
10679 error = got_repo_open(&repo,
10680 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10684 error = apply_unveil(got_repo_get_path(repo), 0,
10685 worktree ? got_worktree_get_root_path(worktree) : NULL);
10688 error = process_backup_refs(
10689 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
10690 argc == 1 ? argv[0] : NULL, delete_backups, repo);
10691 goto done; /* nothing else to do */
10694 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
10699 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10702 if (rebase_in_progress) {
10703 error = got_error(GOT_ERR_REBASING);
10707 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10711 if (merge_in_progress) {
10712 error = got_error(GOT_ERR_MERGE_BUSY);
10716 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
10720 if (edit_in_progress && edit_logmsg_only) {
10721 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10722 "histedit operation is in progress in this "
10723 "work tree and must be continued or aborted "
10724 "before the -m option can be used");
10727 if (edit_in_progress && fold_only) {
10728 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10729 "histedit operation is in progress in this "
10730 "work tree and must be continued or aborted "
10731 "before the -f option can be used");
10734 if (edit_in_progress && edit_only) {
10735 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
10736 "histedit operation is in progress in this "
10737 "work tree and must be continued or aborted "
10738 "before the -e option can be used");
10742 if (edit_in_progress && abort_edit) {
10743 error = got_worktree_histedit_continue(&resume_commit_id,
10744 &tmp_branch, &branch, &base_commit_id, &fileindex,
10748 printf("Switching work tree to %s\n",
10749 got_ref_get_symref_target(branch));
10750 error = got_worktree_histedit_abort(worktree, fileindex, repo,
10751 branch, base_commit_id, abort_progress, &upa);
10754 printf("Histedit of %s aborted\n",
10755 got_ref_get_symref_target(branch));
10756 print_merge_progress_stats(&upa);
10757 goto done; /* nothing else to do */
10758 } else if (abort_edit) {
10759 error = got_error(GOT_ERR_NOT_HISTEDIT);
10763 if (continue_edit) {
10766 if (!edit_in_progress) {
10767 error = got_error(GOT_ERR_NOT_HISTEDIT);
10771 error = got_worktree_get_histedit_script_path(&path, worktree);
10775 error = histedit_load_list(&histedit_cmds, path, repo);
10780 error = got_worktree_histedit_continue(&resume_commit_id,
10781 &tmp_branch, &branch, &base_commit_id, &fileindex,
10786 error = got_ref_resolve(&head_commit_id, repo, branch);
10790 error = got_object_open_as_commit(&commit, repo,
10794 parent_ids = got_object_commit_get_parent_ids(commit);
10795 pid = STAILQ_FIRST(parent_ids);
10797 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10800 error = collect_commits(&commits, head_commit_id, &pid->id,
10801 base_commit_id, got_worktree_get_path_prefix(worktree),
10802 GOT_ERR_HISTEDIT_PATH, repo);
10803 got_object_commit_close(commit);
10808 if (edit_in_progress) {
10809 error = got_error(GOT_ERR_HISTEDIT_BUSY);
10813 error = got_ref_open(&branch, repo,
10814 got_worktree_get_head_ref_name(worktree), 0);
10818 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
10819 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
10820 "will not edit commit history of a branch outside "
10821 "the \"refs/heads/\" reference namespace");
10825 error = got_ref_resolve(&head_commit_id, repo, branch);
10826 got_ref_close(branch);
10831 error = got_object_open_as_commit(&commit, repo,
10835 parent_ids = got_object_commit_get_parent_ids(commit);
10836 pid = STAILQ_FIRST(parent_ids);
10838 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10841 error = collect_commits(&commits, head_commit_id, &pid->id,
10842 got_worktree_get_base_commit_id(worktree),
10843 got_worktree_get_path_prefix(worktree),
10844 GOT_ERR_HISTEDIT_PATH, repo);
10845 got_object_commit_close(commit);
10850 if (STAILQ_EMPTY(&commits)) {
10851 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
10855 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
10856 &base_commit_id, &fileindex, worktree, repo);
10860 if (edit_script_path) {
10861 error = histedit_load_list(&histedit_cmds,
10862 edit_script_path, repo);
10864 got_worktree_histedit_abort(worktree, fileindex,
10865 repo, branch, base_commit_id,
10866 abort_progress, &upa);
10867 print_merge_progress_stats(&upa);
10871 const char *branch_name;
10872 branch_name = got_ref_get_symref_target(branch);
10873 if (strncmp(branch_name, "refs/heads/", 11) == 0)
10875 error = histedit_edit_script(&histedit_cmds, &commits,
10876 branch_name, edit_logmsg_only, fold_only,
10879 got_worktree_histedit_abort(worktree, fileindex,
10880 repo, branch, base_commit_id,
10881 abort_progress, &upa);
10882 print_merge_progress_stats(&upa);
10888 error = histedit_save_list(&histedit_cmds, worktree,
10891 got_worktree_histedit_abort(worktree, fileindex,
10892 repo, branch, base_commit_id,
10893 abort_progress, &upa);
10894 print_merge_progress_stats(&upa);
10900 error = histedit_check_script(&histedit_cmds, &commits, repo);
10904 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
10905 if (resume_commit_id) {
10906 if (got_object_id_cmp(hle->commit_id,
10907 resume_commit_id) != 0)
10910 resume_commit_id = NULL;
10911 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
10912 hle->cmd->code == GOT_HISTEDIT_FOLD) {
10913 error = histedit_skip_commit(hle, worktree,
10918 struct got_pathlist_head paths;
10919 int have_changes = 0;
10921 TAILQ_INIT(&paths);
10922 error = got_pathlist_append(&paths, "", NULL);
10925 error = got_worktree_status(worktree, &paths,
10926 repo, 0, check_local_changes, &have_changes,
10927 check_cancelled, NULL);
10928 got_pathlist_free(&paths);
10930 if (error->code != GOT_ERR_CANCELLED)
10932 if (sigint_received || sigpipe_received)
10935 if (have_changes) {
10936 error = histedit_commit(NULL, worktree,
10937 fileindex, tmp_branch, hle, repo);
10941 error = got_object_open_as_commit(
10942 &commit, repo, hle->commit_id);
10945 error = show_histedit_progress(commit,
10947 got_object_commit_close(commit);
10956 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
10957 error = histedit_skip_commit(hle, worktree, repo);
10963 error = got_object_open_as_commit(&commit, repo,
10967 parent_ids = got_object_commit_get_parent_ids(commit);
10968 pid = STAILQ_FIRST(parent_ids);
10970 error = got_worktree_histedit_merge_files(&merged_paths,
10971 worktree, fileindex, &pid->id, hle->commit_id, repo,
10972 update_progress, &upa, check_cancelled, NULL);
10975 got_object_commit_close(commit);
10978 print_merge_progress_stats(&upa);
10979 if (upa.conflicts > 0 || upa.missing > 0 ||
10980 upa.not_deleted > 0 || upa.unversioned > 0) {
10981 if (upa.conflicts > 0) {
10982 error = show_rebase_merge_conflict(
10983 hle->commit_id, repo);
10987 got_worktree_rebase_pathlist_free(&merged_paths);
10991 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
10993 error = got_object_id_str(&id_str, hle->commit_id);
10996 printf("Stopping histedit for amending commit %s\n",
10999 got_worktree_rebase_pathlist_free(&merged_paths);
11000 error = got_worktree_histedit_postpone(worktree,
11005 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
11006 error = histedit_skip_commit(hle, worktree, repo);
11012 error = histedit_commit(&merged_paths, worktree, fileindex,
11013 tmp_branch, hle, repo);
11014 got_worktree_rebase_pathlist_free(&merged_paths);
11019 if (upa.conflicts > 0 || upa.missing > 0 ||
11020 upa.not_deleted > 0 || upa.unversioned > 0) {
11021 error = got_worktree_histedit_postpone(worktree, fileindex);
11024 if (upa.conflicts > 0 && upa.missing == 0 &&
11025 upa.not_deleted == 0 && upa.unversioned == 0) {
11026 error = got_error_msg(GOT_ERR_CONFLICTS,
11027 "conflicts must be resolved before histedit "
11029 } else if (upa.conflicts > 0) {
11030 error = got_error_msg(GOT_ERR_CONFLICTS,
11031 "conflicts must be resolved before histedit "
11032 "can continue; changes destined for some "
11033 "files were not yet merged and should be "
11034 "merged manually if required before the "
11035 "histedit operation is continued");
11037 error = got_error_msg(GOT_ERR_CONFLICTS,
11038 "changes destined for some files were not "
11039 "yet merged and should be merged manually "
11040 "if required before the histedit operation "
11044 error = histedit_complete(worktree, fileindex, tmp_branch,
11047 got_object_id_queue_free(&commits);
11048 histedit_free_list(&histedit_cmds);
11049 free(head_commit_id);
11050 free(base_commit_id);
11051 free(resume_commit_id);
11053 got_object_commit_close(commit);
11055 got_ref_close(branch);
11057 got_ref_close(tmp_branch);
11059 got_worktree_close(worktree);
11061 const struct got_error *close_err = got_repo_close(repo);
11069 usage_integrate(void)
11071 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
11075 static const struct got_error *
11076 cmd_integrate(int argc, char *argv[])
11078 const struct got_error *error = NULL;
11079 struct got_repository *repo = NULL;
11080 struct got_worktree *worktree = NULL;
11081 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
11082 const char *branch_arg = NULL;
11083 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
11084 struct got_fileindex *fileindex = NULL;
11085 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
11087 struct got_update_progress_arg upa;
11089 while ((ch = getopt(argc, argv, "")) != -1) {
11102 branch_arg = argv[0];
11104 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11105 "unveil", NULL) == -1)
11108 cwd = getcwd(NULL, 0);
11110 error = got_error_from_errno("getcwd");
11114 error = got_worktree_open(&worktree, cwd);
11116 if (error->code == GOT_ERR_NOT_WORKTREE)
11117 error = wrap_not_worktree_error(error, "integrate",
11122 error = check_rebase_or_histedit_in_progress(worktree);
11126 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11131 error = apply_unveil(got_repo_get_path(repo), 0,
11132 got_worktree_get_root_path(worktree));
11136 error = check_merge_in_progress(worktree, repo);
11140 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
11141 error = got_error_from_errno("asprintf");
11145 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
11146 &base_branch_ref, worktree, refname, repo);
11150 refname = strdup(got_ref_get_name(branch_ref));
11151 if (refname == NULL) {
11152 error = got_error_from_errno("strdup");
11153 got_worktree_integrate_abort(worktree, fileindex, repo,
11154 branch_ref, base_branch_ref);
11157 base_refname = strdup(got_ref_get_name(base_branch_ref));
11158 if (base_refname == NULL) {
11159 error = got_error_from_errno("strdup");
11160 got_worktree_integrate_abort(worktree, fileindex, repo,
11161 branch_ref, base_branch_ref);
11165 error = got_ref_resolve(&commit_id, repo, branch_ref);
11169 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
11173 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
11174 error = got_error_msg(GOT_ERR_SAME_BRANCH,
11175 "specified branch has already been integrated");
11176 got_worktree_integrate_abort(worktree, fileindex, repo,
11177 branch_ref, base_branch_ref);
11181 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
11183 if (error->code == GOT_ERR_ANCESTRY)
11184 error = got_error(GOT_ERR_REBASE_REQUIRED);
11185 got_worktree_integrate_abort(worktree, fileindex, repo,
11186 branch_ref, base_branch_ref);
11190 memset(&upa, 0, sizeof(upa));
11191 error = got_worktree_integrate_continue(worktree, fileindex, repo,
11192 branch_ref, base_branch_ref, update_progress, &upa,
11193 check_cancelled, NULL);
11197 printf("Integrated %s into %s\n", refname, base_refname);
11198 print_update_progress_stats(&upa);
11201 const struct got_error *close_err = got_repo_close(repo);
11206 got_worktree_close(worktree);
11208 free(base_commit_id);
11211 free(base_refname);
11218 fprintf(stderr, "usage: %s merge [-a] [-c] [-n] [branch]\n",
11223 static const struct got_error *
11224 cmd_merge(int argc, char *argv[])
11226 const struct got_error *error = NULL;
11227 struct got_worktree *worktree = NULL;
11228 struct got_repository *repo = NULL;
11229 struct got_fileindex *fileindex = NULL;
11230 char *cwd = NULL, *id_str = NULL, *author = NULL;
11231 struct got_reference *branch = NULL, *wt_branch = NULL;
11232 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
11233 struct got_object_id *wt_branch_tip = NULL;
11234 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
11235 int interrupt_merge = 0;
11236 struct got_update_progress_arg upa;
11237 struct got_object_id *merge_commit_id = NULL;
11238 char *branch_name = NULL;
11240 memset(&upa, 0, sizeof(upa));
11242 while ((ch = getopt(argc, argv, "acn")) != -1) {
11248 continue_merge = 1;
11251 interrupt_merge = 1;
11263 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11264 "unveil", NULL) == -1)
11268 if (abort_merge && continue_merge)
11269 option_conflict('a', 'c');
11270 if (abort_merge || continue_merge) {
11273 } else if (argc != 1)
11276 cwd = getcwd(NULL, 0);
11278 error = got_error_from_errno("getcwd");
11282 error = got_worktree_open(&worktree, cwd);
11284 if (error->code == GOT_ERR_NOT_WORKTREE)
11285 error = wrap_not_worktree_error(error,
11290 error = got_repo_open(&repo,
11291 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
11295 error = apply_unveil(got_repo_get_path(repo), 0,
11296 worktree ? got_worktree_get_root_path(worktree) : NULL);
11300 error = check_rebase_or_histedit_in_progress(worktree);
11304 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
11310 if (!merge_in_progress) {
11311 error = got_error(GOT_ERR_NOT_MERGING);
11314 error = got_worktree_merge_continue(&branch_name,
11315 &branch_tip, &fileindex, worktree, repo);
11318 error = got_worktree_merge_abort(worktree, fileindex, repo,
11319 abort_progress, &upa);
11322 printf("Merge of %s aborted\n", branch_name);
11323 goto done; /* nothing else to do */
11326 error = get_author(&author, repo, worktree);
11330 if (continue_merge) {
11331 if (!merge_in_progress) {
11332 error = got_error(GOT_ERR_NOT_MERGING);
11335 error = got_worktree_merge_continue(&branch_name,
11336 &branch_tip, &fileindex, worktree, repo);
11340 error = got_ref_open(&branch, repo, argv[0], 0);
11343 branch_name = strdup(got_ref_get_name(branch));
11344 if (branch_name == NULL) {
11345 error = got_error_from_errno("strdup");
11348 error = got_ref_resolve(&branch_tip, repo, branch);
11353 error = got_ref_open(&wt_branch, repo,
11354 got_worktree_get_head_ref_name(worktree), 0);
11357 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
11360 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11361 wt_branch_tip, branch_tip, 0, repo,
11362 check_cancelled, NULL);
11363 if (error && error->code != GOT_ERR_ANCESTRY)
11366 if (!continue_merge) {
11367 error = check_path_prefix(wt_branch_tip, branch_tip,
11368 got_worktree_get_path_prefix(worktree),
11369 GOT_ERR_MERGE_PATH, repo);
11373 error = check_same_branch(wt_branch_tip, branch,
11376 if (error->code != GOT_ERR_ANCESTRY)
11380 static char msg[512];
11381 snprintf(msg, sizeof(msg),
11382 "cannot create a merge commit because "
11383 "%s is based on %s; %s can be integrated "
11384 "with 'got integrate' instead", branch_name,
11385 got_worktree_get_head_ref_name(worktree),
11387 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
11391 error = got_worktree_merge_prepare(&fileindex, worktree,
11396 error = got_worktree_merge_branch(worktree, fileindex,
11397 yca_id, branch_tip, repo, update_progress, &upa,
11398 check_cancelled, NULL);
11401 print_merge_progress_stats(&upa);
11402 if (!upa.did_something) {
11403 error = got_worktree_merge_abort(worktree, fileindex,
11404 repo, abort_progress, &upa);
11407 printf("Already up-to-date\n");
11412 if (interrupt_merge) {
11413 error = got_worktree_merge_postpone(worktree, fileindex);
11416 printf("Merge of %s interrupted on request\n", branch_name);
11417 } else if (upa.conflicts > 0 || upa.missing > 0 ||
11418 upa.not_deleted > 0 || upa.unversioned > 0) {
11419 error = got_worktree_merge_postpone(worktree, fileindex);
11422 if (upa.conflicts > 0 && upa.missing == 0 &&
11423 upa.not_deleted == 0 && upa.unversioned == 0) {
11424 error = got_error_msg(GOT_ERR_CONFLICTS,
11425 "conflicts must be resolved before merging "
11427 } else if (upa.conflicts > 0) {
11428 error = got_error_msg(GOT_ERR_CONFLICTS,
11429 "conflicts must be resolved before merging "
11430 "can continue; changes destined for some "
11431 "files were not yet merged and "
11432 "should be merged manually if required before the "
11433 "merge operation is continued");
11435 error = got_error_msg(GOT_ERR_CONFLICTS,
11436 "changes destined for some "
11437 "files were not yet merged and should be "
11438 "merged manually if required before the "
11439 "merge operation is continued");
11443 error = got_worktree_merge_commit(&merge_commit_id, worktree,
11444 fileindex, author, NULL, 1, branch_tip, branch_name,
11445 repo, continue_merge ? print_status : NULL, NULL);
11448 error = got_worktree_merge_complete(worktree, fileindex, repo);
11451 error = got_object_id_str(&id_str, merge_commit_id);
11454 printf("Merged %s into %s: %s\n", branch_name,
11455 got_worktree_get_head_ref_name(worktree),
11461 free(merge_commit_id);
11467 got_ref_close(branch);
11469 got_ref_close(wt_branch);
11471 got_worktree_close(worktree);
11473 const struct got_error *close_err = got_repo_close(repo);
11483 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
11484 "[-S] [file-path ...]\n",
11489 static const struct got_error *
11490 print_stage(void *arg, unsigned char status, unsigned char staged_status,
11491 const char *path, struct got_object_id *blob_id,
11492 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
11493 int dirfd, const char *de_name)
11495 const struct got_error *err = NULL;
11496 char *id_str = NULL;
11498 if (staged_status != GOT_STATUS_ADD &&
11499 staged_status != GOT_STATUS_MODIFY &&
11500 staged_status != GOT_STATUS_DELETE)
11503 if (staged_status == GOT_STATUS_ADD ||
11504 staged_status == GOT_STATUS_MODIFY)
11505 err = got_object_id_str(&id_str, staged_blob_id);
11507 err = got_object_id_str(&id_str, blob_id);
11511 printf("%s %c %s\n", id_str, staged_status, path);
11516 static const struct got_error *
11517 cmd_stage(int argc, char *argv[])
11519 const struct got_error *error = NULL;
11520 struct got_repository *repo = NULL;
11521 struct got_worktree *worktree = NULL;
11523 struct got_pathlist_head paths;
11524 struct got_pathlist_entry *pe;
11525 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
11526 FILE *patch_script_file = NULL;
11527 const char *patch_script_path = NULL;
11528 struct choose_patch_arg cpa;
11530 TAILQ_INIT(&paths);
11532 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
11541 patch_script_path = optarg;
11544 allow_bad_symlinks = 1;
11556 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11557 "unveil", NULL) == -1)
11560 if (list_stage && (pflag || patch_script_path))
11561 errx(1, "-l option cannot be used with other options");
11562 if (patch_script_path && !pflag)
11563 errx(1, "-F option can only be used together with -p option");
11565 cwd = getcwd(NULL, 0);
11567 error = got_error_from_errno("getcwd");
11571 error = got_worktree_open(&worktree, cwd);
11573 if (error->code == GOT_ERR_NOT_WORKTREE)
11574 error = wrap_not_worktree_error(error, "stage", cwd);
11578 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11583 if (patch_script_path) {
11584 patch_script_file = fopen(patch_script_path, "re");
11585 if (patch_script_file == NULL) {
11586 error = got_error_from_errno2("fopen",
11587 patch_script_path);
11591 error = apply_unveil(got_repo_get_path(repo), 0,
11592 got_worktree_get_root_path(worktree));
11596 error = check_merge_in_progress(worktree, repo);
11600 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11605 error = got_worktree_status(worktree, &paths, repo, 0,
11606 print_stage, NULL, check_cancelled, NULL);
11608 cpa.patch_script_file = patch_script_file;
11609 cpa.action = "stage";
11610 error = got_worktree_stage(worktree, &paths,
11611 pflag ? NULL : print_status, NULL,
11612 pflag ? choose_patch : NULL, &cpa,
11613 allow_bad_symlinks, repo);
11616 if (patch_script_file && fclose(patch_script_file) == EOF &&
11618 error = got_error_from_errno2("fclose", patch_script_path);
11620 const struct got_error *close_err = got_repo_close(repo);
11625 got_worktree_close(worktree);
11626 TAILQ_FOREACH(pe, &paths, entry)
11627 free((char *)pe->path);
11628 got_pathlist_free(&paths);
11634 usage_unstage(void)
11636 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
11637 "[file-path ...]\n",
11643 static const struct got_error *
11644 cmd_unstage(int argc, char *argv[])
11646 const struct got_error *error = NULL;
11647 struct got_repository *repo = NULL;
11648 struct got_worktree *worktree = NULL;
11650 struct got_pathlist_head paths;
11651 struct got_pathlist_entry *pe;
11653 struct got_update_progress_arg upa;
11654 FILE *patch_script_file = NULL;
11655 const char *patch_script_path = NULL;
11656 struct choose_patch_arg cpa;
11658 TAILQ_INIT(&paths);
11660 while ((ch = getopt(argc, argv, "pF:")) != -1) {
11666 patch_script_path = optarg;
11678 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11679 "unveil", NULL) == -1)
11682 if (patch_script_path && !pflag)
11683 errx(1, "-F option can only be used together with -p option");
11685 cwd = getcwd(NULL, 0);
11687 error = got_error_from_errno("getcwd");
11691 error = got_worktree_open(&worktree, cwd);
11693 if (error->code == GOT_ERR_NOT_WORKTREE)
11694 error = wrap_not_worktree_error(error, "unstage", cwd);
11698 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
11703 if (patch_script_path) {
11704 patch_script_file = fopen(patch_script_path, "re");
11705 if (patch_script_file == NULL) {
11706 error = got_error_from_errno2("fopen",
11707 patch_script_path);
11712 error = apply_unveil(got_repo_get_path(repo), 0,
11713 got_worktree_get_root_path(worktree));
11717 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
11721 cpa.patch_script_file = patch_script_file;
11722 cpa.action = "unstage";
11723 memset(&upa, 0, sizeof(upa));
11724 error = got_worktree_unstage(worktree, &paths, update_progress,
11725 &upa, pflag ? choose_patch : NULL, &cpa, repo);
11727 print_merge_progress_stats(&upa);
11729 if (patch_script_file && fclose(patch_script_file) == EOF &&
11731 error = got_error_from_errno2("fclose", patch_script_path);
11733 const struct got_error *close_err = got_repo_close(repo);
11738 got_worktree_close(worktree);
11739 TAILQ_FOREACH(pe, &paths, entry)
11740 free((char *)pe->path);
11741 got_pathlist_free(&paths);
11749 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
11750 "arg1 [arg2 ...]\n", getprogname());
11754 static const struct got_error *
11755 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11757 const struct got_error *err;
11758 struct got_blob_object *blob;
11760 err = got_object_open_as_blob(&blob, repo, id, 8192);
11764 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
11765 got_object_blob_close(blob);
11769 static const struct got_error *
11770 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11772 const struct got_error *err;
11773 struct got_tree_object *tree;
11776 err = got_object_open_as_tree(&tree, repo, id);
11780 nentries = got_object_tree_get_nentries(tree);
11781 for (i = 0; i < nentries; i++) {
11782 struct got_tree_entry *te;
11784 if (sigint_received || sigpipe_received)
11786 te = got_object_tree_get_entry(tree, i);
11787 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
11790 fprintf(outfile, "%s %.7o %s\n", id_str,
11791 got_tree_entry_get_mode(te),
11792 got_tree_entry_get_name(te));
11796 got_object_tree_close(tree);
11801 format_gmtoff(char *buf, size_t sz, time_t gmtoff)
11811 h = (long long)gmtoff / 3600;
11812 m = ((long long)gmtoff - h*3600) / 60;
11813 snprintf(buf, sz, "%c%02lld%02lld", sign, h, m);
11816 static const struct got_error *
11817 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11819 const struct got_error *err;
11820 struct got_commit_object *commit;
11821 const struct got_object_id_queue *parent_ids;
11822 struct got_object_qid *pid;
11823 char *id_str = NULL;
11824 const char *logmsg = NULL;
11827 err = got_object_open_as_commit(&commit, repo, id);
11831 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
11835 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
11836 parent_ids = got_object_commit_get_parent_ids(commit);
11837 fprintf(outfile, "numparents %d\n",
11838 got_object_commit_get_nparents(commit));
11839 STAILQ_FOREACH(pid, parent_ids, entry) {
11841 err = got_object_id_str(&pid_str, &pid->id);
11844 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
11847 format_gmtoff(gmtoff, sizeof(gmtoff),
11848 got_object_commit_get_author_gmtoff(commit));
11849 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
11850 got_object_commit_get_author(commit),
11851 (long long)got_object_commit_get_author_time(commit),
11854 format_gmtoff(gmtoff, sizeof(gmtoff),
11855 got_object_commit_get_committer_gmtoff(commit));
11856 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
11857 got_object_commit_get_author(commit),
11858 (long long)got_object_commit_get_committer_time(commit),
11861 logmsg = got_object_commit_get_logmsg_raw(commit);
11862 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
11863 fprintf(outfile, "%s", logmsg);
11866 got_object_commit_close(commit);
11870 static const struct got_error *
11871 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
11873 const struct got_error *err;
11874 struct got_tag_object *tag;
11875 char *id_str = NULL;
11876 const char *tagmsg = NULL;
11879 err = got_object_open_as_tag(&tag, repo, id);
11883 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
11887 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
11889 switch (got_object_tag_get_object_type(tag)) {
11890 case GOT_OBJ_TYPE_BLOB:
11891 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11892 GOT_OBJ_LABEL_BLOB);
11894 case GOT_OBJ_TYPE_TREE:
11895 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11896 GOT_OBJ_LABEL_TREE);
11898 case GOT_OBJ_TYPE_COMMIT:
11899 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11900 GOT_OBJ_LABEL_COMMIT);
11902 case GOT_OBJ_TYPE_TAG:
11903 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
11904 GOT_OBJ_LABEL_TAG);
11910 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
11911 got_object_tag_get_name(tag));
11913 format_gmtoff(gmtoff, sizeof(gmtoff),
11914 got_object_tag_get_tagger_gmtoff(tag));
11915 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
11916 got_object_tag_get_tagger(tag),
11917 (long long)got_object_tag_get_tagger_time(tag),
11920 tagmsg = got_object_tag_get_message(tag);
11921 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
11922 fprintf(outfile, "%s", tagmsg);
11925 got_object_tag_close(tag);
11929 static const struct got_error *
11930 cmd_cat(int argc, char *argv[])
11932 const struct got_error *error;
11933 struct got_repository *repo = NULL;
11934 struct got_worktree *worktree = NULL;
11935 char *cwd = NULL, *repo_path = NULL, *label = NULL;
11936 const char *commit_id_str = NULL;
11937 struct got_object_id *id = NULL, *commit_id = NULL;
11938 struct got_commit_object *commit = NULL;
11939 int ch, obj_type, i, force_path = 0;
11940 struct got_reflist_head refs;
11945 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
11950 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
11953 commit_id_str = optarg;
11956 repo_path = realpath(optarg, NULL);
11957 if (repo_path == NULL)
11958 return got_error_from_errno2("realpath",
11960 got_path_strip_trailing_slashes(repo_path);
11974 cwd = getcwd(NULL, 0);
11976 error = got_error_from_errno("getcwd");
11980 if (repo_path == NULL) {
11981 error = got_worktree_open(&worktree, cwd);
11982 if (error && error->code != GOT_ERR_NOT_WORKTREE)
11985 repo_path = strdup(
11986 got_worktree_get_repo_path(worktree));
11987 if (repo_path == NULL) {
11988 error = got_error_from_errno("strdup");
11992 /* Release work tree lock. */
11993 got_worktree_close(worktree);
11998 if (repo_path == NULL) {
11999 repo_path = strdup(cwd);
12000 if (repo_path == NULL)
12001 return got_error_from_errno("strdup");
12004 error = got_repo_open(&repo, repo_path, NULL);
12009 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
12013 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
12017 if (commit_id_str == NULL)
12018 commit_id_str = GOT_REF_HEAD;
12019 error = got_repo_match_object_id(&commit_id, NULL,
12020 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
12024 error = got_object_open_as_commit(&commit, repo, commit_id);
12028 for (i = 0; i < argc; i++) {
12030 error = got_object_id_by_path(&id, repo, commit,
12035 error = got_repo_match_object_id(&id, &label, argv[i],
12036 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
12039 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
12040 error->code != GOT_ERR_NOT_REF)
12042 error = got_object_id_by_path(&id, repo,
12049 error = got_object_get_type(&obj_type, repo, id);
12053 switch (obj_type) {
12054 case GOT_OBJ_TYPE_BLOB:
12055 error = cat_blob(id, repo, stdout);
12057 case GOT_OBJ_TYPE_TREE:
12058 error = cat_tree(id, repo, stdout);
12060 case GOT_OBJ_TYPE_COMMIT:
12061 error = cat_commit(id, repo, stdout);
12063 case GOT_OBJ_TYPE_TAG:
12064 error = cat_tag(id, repo, stdout);
12067 error = got_error(GOT_ERR_OBJ_TYPE);
12082 got_object_commit_close(commit);
12084 got_worktree_close(worktree);
12086 const struct got_error *close_err = got_repo_close(repo);
12090 got_ref_list_free(&refs);
12097 fprintf(stderr, "usage: %s info [path ...]\n",
12102 static const struct got_error *
12103 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
12104 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12105 struct got_object_id *commit_id)
12107 const struct got_error *err = NULL;
12108 char *id_str = NULL;
12110 struct tm mytm, *tm;
12111 struct got_pathlist_head *paths = arg;
12112 struct got_pathlist_entry *pe;
12115 * Clear error indication from any of the path arguments which
12116 * would cause this file index entry to be displayed.
12118 TAILQ_FOREACH(pe, paths, entry) {
12119 if (got_path_cmp(path, pe->path, strlen(path),
12120 pe->path_len) == 0 ||
12121 got_path_is_child(path, pe->path, pe->path_len))
12122 pe->data = NULL; /* no error */
12125 printf(GOT_COMMIT_SEP_STR);
12127 printf("symlink: %s\n", path);
12128 else if (S_ISREG(mode)) {
12129 printf("file: %s\n", path);
12130 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
12131 } else if (S_ISDIR(mode))
12132 printf("directory: %s\n", path);
12134 printf("something: %s\n", path);
12136 tm = localtime_r(&mtime, &mytm);
12139 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
12140 return got_error(GOT_ERR_NO_SPACE);
12141 printf("timestamp: %s\n", datebuf);
12144 err = got_object_id_str(&id_str, blob_id);
12147 printf("based on blob: %s\n", id_str);
12151 if (staged_blob_id) {
12152 err = got_object_id_str(&id_str, staged_blob_id);
12155 printf("based on staged blob: %s\n", id_str);
12160 err = got_object_id_str(&id_str, commit_id);
12163 printf("based on commit: %s\n", id_str);
12170 static const struct got_error *
12171 cmd_info(int argc, char *argv[])
12173 const struct got_error *error = NULL;
12174 struct got_worktree *worktree = NULL;
12175 char *cwd = NULL, *id_str = NULL;
12176 struct got_pathlist_head paths;
12177 struct got_pathlist_entry *pe;
12178 char *uuidstr = NULL;
12179 int ch, show_files = 0;
12181 TAILQ_INIT(&paths);
12183 while ((ch = getopt(argc, argv, "")) != -1) {
12195 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
12199 cwd = getcwd(NULL, 0);
12201 error = got_error_from_errno("getcwd");
12205 error = got_worktree_open(&worktree, cwd);
12207 if (error->code == GOT_ERR_NOT_WORKTREE)
12208 error = wrap_not_worktree_error(error, "info", cwd);
12213 /* Remove "cpath" promise. */
12214 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
12218 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
12223 error = get_worktree_paths_from_argv(&paths, argc, argv,
12230 error = got_object_id_str(&id_str,
12231 got_worktree_get_base_commit_id(worktree));
12235 error = got_worktree_get_uuid(&uuidstr, worktree);
12239 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
12240 printf("work tree base commit: %s\n", id_str);
12241 printf("work tree path prefix: %s\n",
12242 got_worktree_get_path_prefix(worktree));
12243 printf("work tree branch reference: %s\n",
12244 got_worktree_get_head_ref_name(worktree));
12245 printf("work tree UUID: %s\n", uuidstr);
12246 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
12249 struct got_pathlist_entry *pe;
12250 TAILQ_FOREACH(pe, &paths, entry) {
12251 if (pe->path_len == 0)
12254 * Assume this path will fail. This will be corrected
12255 * in print_path_info() in case the path does suceeed.
12257 pe->data = (void *)got_error_path(pe->path,
12260 error = got_worktree_path_info(worktree, &paths,
12261 print_path_info, &paths, check_cancelled, NULL);
12264 TAILQ_FOREACH(pe, &paths, entry) {
12265 if (pe->data != NULL) {
12266 error = pe->data; /* bad path */
12272 TAILQ_FOREACH(pe, &paths, entry)
12273 free((char *)pe->path);
12274 got_pathlist_free(&paths);