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>
22 #include <sys/param.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"
54 #include "got_blame.h"
55 #include "got_privsep.h"
56 #include "got_opentemp.h"
57 #include "got_gotconfig.h"
60 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
63 static volatile sig_atomic_t sigint_received;
64 static volatile sig_atomic_t sigpipe_received;
67 catch_sigint(int signo)
73 catch_sigpipe(int signo)
81 const struct got_error *(*cmd_main)(int, char *[]);
82 void (*cmd_usage)(void);
83 const char *cmd_alias;
86 __dead static void usage(int, int);
87 __dead static void usage_init(void);
88 __dead static void usage_import(void);
89 __dead static void usage_clone(void);
90 __dead static void usage_fetch(void);
91 __dead static void usage_checkout(void);
92 __dead static void usage_update(void);
93 __dead static void usage_log(void);
94 __dead static void usage_diff(void);
95 __dead static void usage_blame(void);
96 __dead static void usage_tree(void);
97 __dead static void usage_status(void);
98 __dead static void usage_ref(void);
99 __dead static void usage_branch(void);
100 __dead static void usage_tag(void);
101 __dead static void usage_add(void);
102 __dead static void usage_remove(void);
103 __dead static void usage_revert(void);
104 __dead static void usage_commit(void);
105 __dead static void usage_cherrypick(void);
106 __dead static void usage_backout(void);
107 __dead static void usage_rebase(void);
108 __dead static void usage_histedit(void);
109 __dead static void usage_integrate(void);
110 __dead static void usage_stage(void);
111 __dead static void usage_unstage(void);
112 __dead static void usage_cat(void);
113 __dead static void usage_info(void);
115 static const struct got_error* cmd_init(int, char *[]);
116 static const struct got_error* cmd_import(int, char *[]);
117 static const struct got_error* cmd_clone(int, char *[]);
118 static const struct got_error* cmd_fetch(int, char *[]);
119 static const struct got_error* cmd_checkout(int, char *[]);
120 static const struct got_error* cmd_update(int, char *[]);
121 static const struct got_error* cmd_log(int, char *[]);
122 static const struct got_error* cmd_diff(int, char *[]);
123 static const struct got_error* cmd_blame(int, char *[]);
124 static const struct got_error* cmd_tree(int, char *[]);
125 static const struct got_error* cmd_status(int, char *[]);
126 static const struct got_error* cmd_ref(int, char *[]);
127 static const struct got_error* cmd_branch(int, char *[]);
128 static const struct got_error* cmd_tag(int, char *[]);
129 static const struct got_error* cmd_add(int, char *[]);
130 static const struct got_error* cmd_remove(int, char *[]);
131 static const struct got_error* cmd_revert(int, char *[]);
132 static const struct got_error* cmd_commit(int, char *[]);
133 static const struct got_error* cmd_cherrypick(int, char *[]);
134 static const struct got_error* cmd_backout(int, char *[]);
135 static const struct got_error* cmd_rebase(int, char *[]);
136 static const struct got_error* cmd_histedit(int, char *[]);
137 static const struct got_error* cmd_integrate(int, char *[]);
138 static const struct got_error* cmd_stage(int, char *[]);
139 static const struct got_error* cmd_unstage(int, char *[]);
140 static const struct got_error* cmd_cat(int, char *[]);
141 static const struct got_error* cmd_info(int, char *[]);
143 static struct got_cmd got_commands[] = {
144 { "init", cmd_init, usage_init, "" },
145 { "import", cmd_import, usage_import, "im" },
146 { "clone", cmd_clone, usage_clone, "cl" },
147 { "fetch", cmd_fetch, usage_fetch, "fe" },
148 { "checkout", cmd_checkout, usage_checkout, "co" },
149 { "update", cmd_update, usage_update, "up" },
150 { "log", cmd_log, usage_log, "" },
151 { "diff", cmd_diff, usage_diff, "di" },
152 { "blame", cmd_blame, usage_blame, "bl" },
153 { "tree", cmd_tree, usage_tree, "tr" },
154 { "status", cmd_status, usage_status, "st" },
155 { "ref", cmd_ref, usage_ref, "" },
156 { "branch", cmd_branch, usage_branch, "br" },
157 { "tag", cmd_tag, usage_tag, "" },
158 { "add", cmd_add, usage_add, "" },
159 { "remove", cmd_remove, usage_remove, "rm" },
160 { "revert", cmd_revert, usage_revert, "rv" },
161 { "commit", cmd_commit, usage_commit, "ci" },
162 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
163 { "backout", cmd_backout, usage_backout, "bo" },
164 { "rebase", cmd_rebase, usage_rebase, "rb" },
165 { "histedit", cmd_histedit, usage_histedit, "he" },
166 { "integrate", cmd_integrate, usage_integrate,"ig" },
167 { "stage", cmd_stage, usage_stage, "sg" },
168 { "unstage", cmd_unstage, usage_unstage, "ug" },
169 { "cat", cmd_cat, usage_cat, "" },
170 { "info", cmd_info, usage_info, "" },
174 list_commands(FILE *fp)
178 fprintf(fp, "commands:");
179 for (i = 0; i < nitems(got_commands); i++) {
180 struct got_cmd *cmd = &got_commands[i];
181 fprintf(fp, " %s", cmd->cmd_name);
187 main(int argc, char *argv[])
192 int hflag = 0, Vflag = 0;
193 static struct option longopts[] = {
194 { "version", no_argument, NULL, 'V' },
198 setlocale(LC_CTYPE, "");
200 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
220 got_version_print_str();
225 usage(hflag, hflag ? 0 : 1);
227 signal(SIGINT, catch_sigint);
228 signal(SIGPIPE, catch_sigpipe);
230 for (i = 0; i < nitems(got_commands); i++) {
231 const struct got_error *error;
233 cmd = &got_commands[i];
235 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
236 strcmp(cmd->cmd_alias, argv[0]) != 0)
240 got_commands[i].cmd_usage();
242 error = got_commands[i].cmd_main(argc, argv);
243 if (error && error->code != GOT_ERR_CANCELLED &&
244 error->code != GOT_ERR_PRIVSEP_EXIT &&
245 !(sigpipe_received &&
246 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
248 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
249 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
256 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
257 list_commands(stderr);
262 usage(int hflag, int status)
264 FILE *fp = (status == 0) ? stdout : stderr;
266 fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
273 static const struct got_error *
274 get_editor(char **abspath)
276 const struct got_error *err = NULL;
281 editor = getenv("VISUAL");
283 editor = getenv("EDITOR");
286 err = got_path_find_prog(abspath, editor);
291 if (*abspath == NULL) {
292 *abspath = strdup("/bin/ed");
293 if (*abspath == NULL)
294 return got_error_from_errno("strdup");
300 static const struct got_error *
301 apply_unveil(const char *repo_path, int repo_read_only,
302 const char *worktree_path)
304 const struct got_error *err;
307 if (unveil("gmon.out", "rwc") != 0)
308 return got_error_from_errno2("unveil", "gmon.out");
310 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
311 return got_error_from_errno2("unveil", repo_path);
313 if (worktree_path && unveil(worktree_path, "rwc") != 0)
314 return got_error_from_errno2("unveil", worktree_path);
316 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
317 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
319 err = got_privsep_unveil_exec_helpers();
323 if (unveil(NULL, NULL) != 0)
324 return got_error_from_errno("unveil");
332 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
336 static const struct got_error *
337 cmd_init(int argc, char *argv[])
339 const struct got_error *error = NULL;
340 char *repo_path = NULL;
343 while ((ch = getopt(argc, argv, "")) != -1) {
355 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
361 repo_path = strdup(argv[0]);
362 if (repo_path == NULL)
363 return got_error_from_errno("strdup");
365 got_path_strip_trailing_slashes(repo_path);
367 error = got_path_mkdir(repo_path);
369 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
372 error = apply_unveil(repo_path, 0, NULL);
376 error = got_repo_init(repo_path);
385 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
386 "[-r repository-path] [-I pattern] path\n", getprogname());
391 spawn_editor(const char *editor, const char *file)
394 sig_t sighup, sigint, sigquit;
397 sighup = signal(SIGHUP, SIG_IGN);
398 sigint = signal(SIGINT, SIG_IGN);
399 sigquit = signal(SIGQUIT, SIG_IGN);
401 switch (pid = fork()) {
405 execl(editor, editor, file, (char *)NULL);
409 while (waitpid(pid, &st, 0) == -1)
414 (void)signal(SIGHUP, sighup);
415 (void)signal(SIGINT, sigint);
416 (void)signal(SIGQUIT, sigquit);
418 if (!WIFEXITED(st)) {
423 return WEXITSTATUS(st);
426 static const struct got_error *
427 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
428 const char *initial_content, size_t initial_content_len)
430 const struct got_error *err = NULL;
436 size_t len, logmsg_len;
437 char *initial_content_stripped = NULL, *buf = NULL, *s;
441 if (stat(logmsg_path, &st) == -1)
442 return got_error_from_errno2("stat", logmsg_path);
444 if (spawn_editor(editor, logmsg_path) == -1)
445 return got_error_from_errno("failed spawning editor");
447 if (stat(logmsg_path, &st2) == -1)
448 return got_error_from_errno("stat");
450 if (st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
451 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
452 "no changes made to commit message, aborting");
455 * Set up a stripped version of the initial content without comments
456 * and blank lines. We need this in order to check if the message
457 * has in fact been edited.
459 initial_content_stripped = malloc(initial_content_len + 1);
460 if (initial_content_stripped == NULL)
461 return got_error_from_errno("malloc");
462 initial_content_stripped[0] = '\0';
464 buf = strdup(initial_content);
466 err = got_error_from_errno("strdup");
471 while ((line = strsep(&s, "\n")) != NULL) {
472 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
473 continue; /* remove comments and leading empty lines */
474 len = strlcat(initial_content_stripped, line,
475 initial_content_len + 1);
476 if (len >= initial_content_len + 1) {
477 err = got_error(GOT_ERR_NO_SPACE);
481 while (len > 0 && initial_content_stripped[len - 1] == '\n') {
482 initial_content_stripped[len - 1] = '\0';
486 logmsg_len = st2.st_size;
487 *logmsg = malloc(logmsg_len + 1);
489 return got_error_from_errno("malloc");
492 fp = fopen(logmsg_path, "r");
494 err = got_error_from_errno("fopen");
499 while ((linelen = getline(&line, &linesize, fp)) != -1) {
500 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
501 continue; /* remove comments and leading empty lines */
502 len = strlcat(*logmsg, line, logmsg_len + 1);
503 if (len >= logmsg_len + 1) {
504 err = got_error(GOT_ERR_NO_SPACE);
510 err = got_ferror(fp, GOT_ERR_IO);
513 while (len > 0 && (*logmsg)[len - 1] == '\n') {
514 (*logmsg)[len - 1] = '\0';
519 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
520 "commit message cannot be empty, aborting");
523 if (strcmp(*logmsg, initial_content_stripped) == 0)
524 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
525 "no changes made to commit message, aborting");
527 free(initial_content_stripped);
529 if (fp && fclose(fp) == EOF && err == NULL)
530 err = got_error_from_errno("fclose");
538 static const struct got_error *
539 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
540 const char *path_dir, const char *branch_name)
542 char *initial_content = NULL;
543 const struct got_error *err = NULL;
544 int initial_content_len;
547 initial_content_len = asprintf(&initial_content,
548 "\n# %s to be imported to branch %s\n", path_dir,
550 if (initial_content_len == -1)
551 return got_error_from_errno("asprintf");
553 err = got_opentemp_named_fd(logmsg_path, &fd,
554 GOT_TMPDIR_STR "/got-importmsg");
558 if (write(fd, initial_content, initial_content_len) == -1) {
559 err = got_error_from_errno2("write", *logmsg_path);
563 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
564 initial_content_len);
566 if (fd != -1 && close(fd) == -1 && err == NULL)
567 err = got_error_from_errno2("close", *logmsg_path);
568 free(initial_content);
576 static const struct got_error *
577 import_progress(void *arg, const char *path)
579 printf("A %s\n", path);
583 static const struct got_error *
584 get_author(char **author, struct got_repository *repo,
585 struct got_worktree *worktree)
587 const struct got_error *err = NULL;
588 const char *got_author = NULL, *name, *email;
589 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
594 worktree_conf = got_worktree_get_gotconfig(worktree);
595 repo_conf = got_repo_get_gotconfig(repo);
598 * Priority of potential author information sources, from most
599 * significant to least significant:
600 * 1) work tree's .got/got.conf file
601 * 2) repository's got.conf file
602 * 3) repository's git config file
603 * 4) environment variables
604 * 5) global git config files (in user's home directory or /etc)
608 got_author = got_gotconfig_get_author(worktree_conf);
609 if (got_author == NULL)
610 got_author = got_gotconfig_get_author(repo_conf);
611 if (got_author == NULL) {
612 name = got_repo_get_gitconfig_author_name(repo);
613 email = got_repo_get_gitconfig_author_email(repo);
615 if (asprintf(author, "%s <%s>", name, email) == -1)
616 return got_error_from_errno("asprintf");
620 got_author = getenv("GOT_AUTHOR");
621 if (got_author == NULL) {
622 name = got_repo_get_global_gitconfig_author_name(repo);
623 email = got_repo_get_global_gitconfig_author_email(
626 if (asprintf(author, "%s <%s>", name, email)
628 return got_error_from_errno("asprintf");
631 /* TODO: Look up user in password database? */
632 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
636 *author = strdup(got_author);
638 return got_error_from_errno("strdup");
641 * Really dumb email address check; we're only doing this to
642 * avoid git's object parser breaking on commits we create.
644 while (*got_author && *got_author != '<')
646 if (*got_author != '<') {
647 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
650 while (*got_author && *got_author != '@')
652 if (*got_author != '@') {
653 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
656 while (*got_author && *got_author != '>')
658 if (*got_author != '>')
659 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
668 static const struct got_error *
669 get_gitconfig_path(char **gitconfig_path)
671 const char *homedir = getenv("HOME");
673 *gitconfig_path = NULL;
675 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
676 return got_error_from_errno("asprintf");
682 static const struct got_error *
683 cmd_import(int argc, char *argv[])
685 const struct got_error *error = NULL;
686 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
687 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
688 const char *branch_name = "main";
689 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
690 struct got_repository *repo = NULL;
691 struct got_reference *branch_ref = NULL, *head_ref = NULL;
692 struct got_object_id *new_commit_id = NULL;
694 struct got_pathlist_head ignores;
695 struct got_pathlist_entry *pe;
696 int preserve_logmsg = 0;
698 TAILQ_INIT(&ignores);
700 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
703 branch_name = optarg;
706 logmsg = strdup(optarg);
707 if (logmsg == NULL) {
708 error = got_error_from_errno("strdup");
713 repo_path = realpath(optarg, NULL);
714 if (repo_path == NULL) {
715 error = got_error_from_errno2("realpath",
721 if (optarg[0] == '\0')
723 error = got_pathlist_insert(&pe, &ignores, optarg,
738 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
746 if (repo_path == NULL) {
747 repo_path = getcwd(NULL, 0);
748 if (repo_path == NULL)
749 return got_error_from_errno("getcwd");
751 got_path_strip_trailing_slashes(repo_path);
752 error = get_gitconfig_path(&gitconfig_path);
755 error = got_repo_open(&repo, repo_path, gitconfig_path);
759 error = get_author(&author, repo, NULL);
764 * Don't let the user create a branch name with a leading '-'.
765 * While technically a valid reference name, this case is usually
766 * an unintended typo.
768 if (branch_name[0] == '-')
769 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
771 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
772 error = got_error_from_errno("asprintf");
776 error = got_ref_open(&branch_ref, repo, refname, 0);
778 if (error->code != GOT_ERR_NOT_REF)
781 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
782 "import target branch already exists");
786 path_dir = realpath(argv[0], NULL);
787 if (path_dir == NULL) {
788 error = got_error_from_errno2("realpath", argv[0]);
791 got_path_strip_trailing_slashes(path_dir);
794 * unveil(2) traverses exec(2); if an editor is used we have
795 * to apply unveil after the log message has been written.
797 if (logmsg == NULL || strlen(logmsg) == 0) {
798 error = get_editor(&editor);
802 error = collect_import_msg(&logmsg, &logmsg_path, editor,
805 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
812 if (unveil(path_dir, "r") != 0) {
813 error = got_error_from_errno2("unveil", path_dir);
819 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
826 error = got_repo_import(&new_commit_id, path_dir, logmsg,
827 author, &ignores, repo, import_progress, NULL);
834 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
841 error = got_ref_write(branch_ref, repo);
848 error = got_object_id_str(&id_str, new_commit_id);
855 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
857 if (error->code != GOT_ERR_NOT_REF) {
863 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
871 error = got_ref_write(head_ref, repo);
879 printf("Created branch %s with commit %s\n",
880 got_ref_get_name(branch_ref), id_str);
882 if (preserve_logmsg) {
883 fprintf(stderr, "%s: log message preserved in %s\n",
884 getprogname(), logmsg_path);
885 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
886 error = got_error_from_errno2("unlink", logmsg_path);
895 free(gitconfig_path);
897 got_ref_close(branch_ref);
899 got_ref_close(head_ref);
906 fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
907 "[-R reference] repository-url [directory]\n", getprogname());
911 struct got_fetch_progress_arg {
912 char last_scaled_size[FMT_SCALED_STRSIZE];
917 struct got_repository *repo;
922 struct got_pathlist_head *symrefs;
923 struct got_pathlist_head *wanted_branches;
927 const char *remote_repo_path;
929 int fetch_all_branches;
930 int mirror_references;
934 /* XXX forward declaration */
935 static const struct got_error *
936 create_config_files(const char *proto, const char *host, const char *port,
937 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
938 int mirror_references, struct got_pathlist_head *symrefs,
939 struct got_pathlist_head *wanted_branches, struct got_repository *repo);
941 static const struct got_error *
942 fetch_progress(void *arg, const char *message, off_t packfile_size,
943 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
945 const struct got_error *err = NULL;
946 struct got_fetch_progress_arg *a = arg;
947 char scaled_size[FMT_SCALED_STRSIZE];
948 int p_indexed, p_resolved;
949 int print_size = 0, print_indexed = 0, print_resolved = 0;
952 * In order to allow a failed clone to be resumed with 'got fetch'
953 * we try to create configuration files as soon as possible.
954 * Once the server has sent information about its default branch
955 * we have all required information.
957 if (a->create_configs && !a->configs_created &&
958 !TAILQ_EMPTY(a->config_info.symrefs)) {
959 err = create_config_files(a->config_info.proto,
960 a->config_info.host, a->config_info.port,
961 a->config_info.remote_repo_path,
962 a->config_info.git_url,
963 a->config_info.fetch_all_branches,
964 a->config_info.mirror_references,
965 a->config_info.symrefs,
966 a->config_info.wanted_branches, a->repo);
969 a->configs_created = 1;
972 if (a->verbosity < 0)
975 if (message && message[0] != '\0') {
976 printf("\rserver: %s", message);
981 if (packfile_size > 0 || nobj_indexed > 0) {
982 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
983 (a->last_scaled_size[0] == '\0' ||
984 strcmp(scaled_size, a->last_scaled_size)) != 0) {
986 if (strlcpy(a->last_scaled_size, scaled_size,
987 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
988 return got_error(GOT_ERR_NO_SPACE);
990 if (nobj_indexed > 0) {
991 p_indexed = (nobj_indexed * 100) / nobj_total;
992 if (p_indexed != a->last_p_indexed) {
993 a->last_p_indexed = p_indexed;
998 if (nobj_resolved > 0) {
999 p_resolved = (nobj_resolved * 100) /
1000 (nobj_total - nobj_loose);
1001 if (p_resolved != a->last_p_resolved) {
1002 a->last_p_resolved = p_resolved;
1010 if (print_size || print_indexed || print_resolved)
1013 printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1015 printf("; indexing %d%%", p_indexed);
1017 printf("; resolving deltas %d%%", p_resolved);
1018 if (print_size || print_indexed || print_resolved)
1024 static const struct got_error *
1025 create_symref(const char *refname, struct got_reference *target_ref,
1026 int verbosity, struct got_repository *repo)
1028 const struct got_error *err;
1029 struct got_reference *head_symref;
1031 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1035 err = got_ref_write(head_symref, repo);
1036 if (err == NULL && verbosity > 0) {
1037 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1038 got_ref_get_name(target_ref));
1040 got_ref_close(head_symref);
1044 static const struct got_error *
1045 list_remote_refs(struct got_pathlist_head *symrefs,
1046 struct got_pathlist_head *refs)
1048 const struct got_error *err;
1049 struct got_pathlist_entry *pe;
1051 TAILQ_FOREACH(pe, symrefs, entry) {
1052 const char *refname = pe->path;
1053 const char *targetref = pe->data;
1055 printf("%s: %s\n", refname, targetref);
1058 TAILQ_FOREACH(pe, refs, entry) {
1059 const char *refname = pe->path;
1060 struct got_object_id *id = pe->data;
1063 err = got_object_id_str(&id_str, id);
1066 printf("%s: %s\n", refname, id_str);
1073 static const struct got_error *
1074 create_ref(const char *refname, struct got_object_id *id,
1075 int verbosity, struct got_repository *repo)
1077 const struct got_error *err = NULL;
1078 struct got_reference *ref;
1081 err = got_object_id_str(&id_str, id);
1085 err = got_ref_alloc(&ref, refname, id);
1089 err = got_ref_write(ref, repo);
1092 if (err == NULL && verbosity >= 0)
1093 printf("Created reference %s: %s\n", refname, id_str);
1100 match_wanted_ref(const char *refname, const char *wanted_ref)
1102 if (strncmp(refname, "refs/", 5) != 0)
1107 * Prevent fetching of references that won't make any
1108 * sense outside of the remote repository's context.
1110 if (strncmp(refname, "got/", 4) == 0)
1112 if (strncmp(refname, "remotes/", 8) == 0)
1115 if (strncmp(wanted_ref, "refs/", 5) == 0)
1118 /* Allow prefix match. */
1119 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1122 /* Allow exact match. */
1123 return (strcmp(refname, wanted_ref) == 0);
1127 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1129 struct got_pathlist_entry *pe;
1131 TAILQ_FOREACH(pe, wanted_refs, entry) {
1132 if (match_wanted_ref(refname, pe->path))
1139 static const struct got_error *
1140 create_wanted_ref(const char *refname, struct got_object_id *id,
1141 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1143 const struct got_error *err;
1144 char *remote_refname;
1146 if (strncmp("refs/", refname, 5) == 0)
1149 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1150 remote_repo_name, refname) == -1)
1151 return got_error_from_errno("asprintf");
1153 err = create_ref(remote_refname, id, verbosity, repo);
1154 free(remote_refname);
1158 static const struct got_error *
1159 create_gotconfig(const char *proto, const char *host, const char *port,
1160 const char *remote_repo_path, int fetch_all_branches, int mirror_references,
1161 struct got_repository *repo)
1163 const struct got_error *err = NULL;
1164 char *gotconfig_path = NULL;
1165 char *gotconfig = NULL;
1166 FILE *gotconfig_file = NULL;
1169 /* Create got.conf(5). */
1170 gotconfig_path = got_repo_get_path_gotconfig(repo);
1171 if (gotconfig_path == NULL) {
1172 err = got_error_from_errno("got_repo_get_path_gotconfig");
1175 gotconfig_file = fopen(gotconfig_path, "a");
1176 if (gotconfig_file == NULL) {
1177 err = got_error_from_errno2("fopen", gotconfig_path);
1180 if (asprintf(&gotconfig,
1185 "\trepository \"%s\"\n"
1188 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1189 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1191 mirror_references ? "\tmirror-references yes\n" : "") == -1) {
1192 err = got_error_from_errno("asprintf");
1195 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1196 if (n != strlen(gotconfig)) {
1197 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1202 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1203 err = got_error_from_errno2("fclose", gotconfig_path);
1204 free(gotconfig_path);
1208 static const struct got_error *
1209 create_gitconfig(const char *git_url, const char *default_branch,
1210 int fetch_all_branches, int mirror_references, struct got_repository *repo)
1212 const struct got_error *err = NULL;
1213 char *gitconfig_path = NULL;
1214 char *gitconfig = NULL;
1215 FILE *gitconfig_file = NULL;
1218 /* Create a config file Git can understand. */
1219 gitconfig_path = got_repo_get_path_gitconfig(repo);
1220 if (gitconfig_path == NULL) {
1221 err = got_error_from_errno("got_repo_get_path_gitconfig");
1224 gitconfig_file = fopen(gitconfig_path, "a");
1225 if (gitconfig_file == NULL) {
1226 err = got_error_from_errno2("fopen", gitconfig_path);
1229 if (mirror_references) {
1230 if (asprintf(&gitconfig,
1233 "\tfetch = +refs/*:refs/*\n"
1234 "\tmirror = true\n",
1235 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url) == -1) {
1236 err = got_error_from_errno("asprintf");
1239 } else if (fetch_all_branches) {
1240 if (asprintf(&gitconfig,
1243 "\tfetch = +refs/heads/*:refs/remotes/%s/*\n",
1244 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1245 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1246 err = got_error_from_errno("asprintf");
1250 const char *branchname;
1253 * If the server specified a default branch, use just that one.
1254 * Otherwise fall back to fetching all branches on next fetch.
1256 if (default_branch) {
1257 branchname = default_branch;
1258 if (strncmp(branchname, "refs/heads/", 11) == 0)
1261 branchname = "*"; /* fall back to all branches */
1262 if (asprintf(&gitconfig,
1265 "\tfetch = +refs/heads/%s:refs/remotes/%s/%s\n",
1266 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url,
1267 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1268 branchname) == -1) {
1269 err = got_error_from_errno("asprintf");
1273 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1274 if (n != strlen(gitconfig)) {
1275 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1279 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1280 err = got_error_from_errno2("fclose", gitconfig_path);
1281 free(gitconfig_path);
1285 static const struct got_error *
1286 create_config_files(const char *proto, const char *host, const char *port,
1287 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1288 int mirror_references, struct got_pathlist_head *symrefs,
1289 struct got_pathlist_head *wanted_branches, struct got_repository *repo)
1291 const struct got_error *err = NULL;
1292 const char *default_branch = NULL;
1293 struct got_pathlist_entry *pe;
1296 * If we asked for a set of wanted branches then use the first
1299 if (!TAILQ_EMPTY(wanted_branches)) {
1300 pe = TAILQ_FIRST(wanted_branches);
1301 default_branch = pe->path;
1303 /* First HEAD ref listed by server is the default branch. */
1304 TAILQ_FOREACH(pe, symrefs, entry) {
1305 const char *refname = pe->path;
1306 const char *target = pe->data;
1308 if (strcmp(refname, GOT_REF_HEAD) != 0)
1311 default_branch = target;
1316 /* Create got.conf(5). */
1317 err = create_gotconfig(proto, host, port, remote_repo_path,
1318 fetch_all_branches, mirror_references, repo);
1322 /* Create a config file Git can understand. */
1323 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1324 mirror_references, repo);
1327 static const struct got_error *
1328 cmd_clone(int argc, char *argv[])
1330 const struct got_error *error = NULL;
1331 const char *uri, *dirname;
1332 char *proto, *host, *port, *repo_name, *server_path;
1333 char *default_destdir = NULL, *id_str = NULL;
1334 const char *repo_path;
1335 struct got_repository *repo = NULL;
1336 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1337 struct got_pathlist_entry *pe;
1338 struct got_object_id *pack_hash = NULL;
1339 int ch, fetchfd = -1, fetchstatus;
1340 pid_t fetchpid = -1;
1341 struct got_fetch_progress_arg fpa;
1342 char *git_url = NULL;
1343 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1344 int list_refs_only = 0;
1347 TAILQ_INIT(&symrefs);
1348 TAILQ_INIT(&wanted_branches);
1349 TAILQ_INIT(&wanted_refs);
1351 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1354 fetch_all_branches = 1;
1357 error = got_pathlist_append(&wanted_branches,
1366 mirror_references = 1;
1371 else if (verbosity < 3)
1378 error = got_pathlist_append(&wanted_refs,
1391 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1392 errx(1, "-a and -b options are mutually exclusive");
1393 if (list_refs_only) {
1394 if (!TAILQ_EMPTY(&wanted_branches))
1395 errx(1, "-l and -b options are mutually exclusive");
1396 if (fetch_all_branches)
1397 errx(1, "-l and -a options are mutually exclusive");
1398 if (mirror_references)
1399 errx(1, "-l and -m options are mutually exclusive");
1400 if (verbosity == -1)
1401 errx(1, "-l and -q options are mutually exclusive");
1402 if (!TAILQ_EMPTY(&wanted_refs))
1403 errx(1, "-l and -R options are mutually exclusive");
1415 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1420 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1421 host, port ? ":" : "", port ? port : "",
1422 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1423 error = got_error_from_errno("asprintf");
1427 if (strcmp(proto, "git") == 0) {
1429 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1430 "sendfd dns inet unveil", NULL) == -1)
1433 } else if (strcmp(proto, "git+ssh") == 0 ||
1434 strcmp(proto, "ssh") == 0) {
1436 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1437 "sendfd unveil", NULL) == -1)
1440 } else if (strcmp(proto, "http") == 0 ||
1441 strcmp(proto, "git+http") == 0) {
1442 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1445 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1448 if (dirname == NULL) {
1449 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1450 error = got_error_from_errno("asprintf");
1453 repo_path = default_destdir;
1455 repo_path = dirname;
1457 if (!list_refs_only) {
1458 error = got_path_mkdir(repo_path);
1460 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1461 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1463 if (!got_path_dir_is_empty(repo_path)) {
1464 error = got_error_path(repo_path,
1465 GOT_ERR_DIR_NOT_EMPTY);
1470 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1471 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1472 error = got_error_from_errno2("unveil",
1473 GOT_FETCH_PATH_SSH);
1477 error = apply_unveil(repo_path, 0, NULL);
1482 printf("Connecting to %s%s%s\n", host,
1483 port ? ":" : "", port ? port : "");
1485 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1486 server_path, verbosity);
1490 if (!list_refs_only) {
1491 error = got_repo_init(repo_path);
1494 error = got_repo_open(&repo, repo_path, NULL);
1499 fpa.last_scaled_size[0] = '\0';
1500 fpa.last_p_indexed = -1;
1501 fpa.last_p_resolved = -1;
1502 fpa.verbosity = verbosity;
1503 fpa.create_configs = 1;
1504 fpa.configs_created = 0;
1506 fpa.config_info.symrefs = &symrefs;
1507 fpa.config_info.wanted_branches = &wanted_branches;
1508 fpa.config_info.proto = proto;
1509 fpa.config_info.host = host;
1510 fpa.config_info.port = port;
1511 fpa.config_info.remote_repo_path = server_path;
1512 fpa.config_info.git_url = git_url;
1513 fpa.config_info.fetch_all_branches = fetch_all_branches;
1514 fpa.config_info.mirror_references = mirror_references;
1515 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1516 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1517 fetch_all_branches, &wanted_branches, &wanted_refs,
1518 list_refs_only, verbosity, fetchfd, repo,
1519 fetch_progress, &fpa);
1523 if (list_refs_only) {
1524 error = list_remote_refs(&symrefs, &refs);
1528 error = got_object_id_str(&id_str, pack_hash);
1532 printf("\nFetched %s.pack\n", id_str);
1535 /* Set up references provided with the pack file. */
1536 TAILQ_FOREACH(pe, &refs, entry) {
1537 const char *refname = pe->path;
1538 struct got_object_id *id = pe->data;
1539 char *remote_refname;
1541 if (is_wanted_ref(&wanted_refs, refname) &&
1542 !mirror_references) {
1543 error = create_wanted_ref(refname, id,
1544 GOT_FETCH_DEFAULT_REMOTE_NAME,
1545 verbosity - 1, repo);
1551 error = create_ref(refname, id, verbosity - 1, repo);
1555 if (mirror_references)
1558 if (strncmp("refs/heads/", refname, 11) != 0)
1561 if (asprintf(&remote_refname,
1562 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1563 refname + 11) == -1) {
1564 error = got_error_from_errno("asprintf");
1567 error = create_ref(remote_refname, id, verbosity - 1, repo);
1568 free(remote_refname);
1573 /* Set the HEAD reference if the server provided one. */
1574 TAILQ_FOREACH(pe, &symrefs, entry) {
1575 struct got_reference *target_ref;
1576 const char *refname = pe->path;
1577 const char *target = pe->data;
1578 char *remote_refname = NULL, *remote_target = NULL;
1580 if (strcmp(refname, GOT_REF_HEAD) != 0)
1583 error = got_ref_open(&target_ref, repo, target, 0);
1585 if (error->code == GOT_ERR_NOT_REF) {
1592 error = create_symref(refname, target_ref, verbosity, repo);
1593 got_ref_close(target_ref);
1597 if (mirror_references)
1600 if (strncmp("refs/heads/", target, 11) != 0)
1603 if (asprintf(&remote_refname,
1604 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1606 error = got_error_from_errno("asprintf");
1609 if (asprintf(&remote_target,
1610 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1611 target + 11) == -1) {
1612 error = got_error_from_errno("asprintf");
1613 free(remote_refname);
1616 error = got_ref_open(&target_ref, repo, remote_target, 0);
1618 free(remote_refname);
1619 free(remote_target);
1620 if (error->code == GOT_ERR_NOT_REF) {
1626 error = create_symref(remote_refname, target_ref,
1627 verbosity - 1, repo);
1628 free(remote_refname);
1629 free(remote_target);
1630 got_ref_close(target_ref);
1636 * We failed to set the HEAD reference. If we asked for
1637 * a set of wanted branches use the first of one of those
1638 * which could be fetched instead.
1640 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1641 const char *target = pe->path;
1642 struct got_reference *target_ref;
1644 error = got_ref_open(&target_ref, repo, target, 0);
1646 if (error->code == GOT_ERR_NOT_REF) {
1653 error = create_symref(GOT_REF_HEAD, target_ref,
1655 got_ref_close(target_ref);
1663 printf("Created %s repository '%s'\n",
1664 mirror_references ? "mirrored" : "cloned", repo_path);
1667 if (kill(fetchpid, SIGTERM) == -1)
1668 error = got_error_from_errno("kill");
1669 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1670 error = got_error_from_errno("waitpid");
1672 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1673 error = got_error_from_errno("close");
1675 got_repo_close(repo);
1676 TAILQ_FOREACH(pe, &refs, entry) {
1677 free((void *)pe->path);
1680 got_pathlist_free(&refs);
1681 TAILQ_FOREACH(pe, &symrefs, entry) {
1682 free((void *)pe->path);
1685 got_pathlist_free(&symrefs);
1686 got_pathlist_free(&wanted_branches);
1687 got_pathlist_free(&wanted_refs);
1694 free(default_destdir);
1699 static const struct got_error *
1700 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1701 int replace_tags, int verbosity, struct got_repository *repo)
1703 const struct got_error *err = NULL;
1704 char *new_id_str = NULL;
1705 struct got_object_id *old_id = NULL;
1707 err = got_object_id_str(&new_id_str, new_id);
1711 if (!replace_tags &&
1712 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1713 err = got_ref_resolve(&old_id, repo, ref);
1716 if (got_object_id_cmp(old_id, new_id) == 0)
1718 if (verbosity >= 0) {
1719 printf("Rejecting update of existing tag %s: %s\n",
1720 got_ref_get_name(ref), new_id_str);
1725 if (got_ref_is_symbolic(ref)) {
1726 if (verbosity >= 0) {
1727 printf("Replacing reference %s: %s\n",
1728 got_ref_get_name(ref),
1729 got_ref_get_symref_target(ref));
1731 err = got_ref_change_symref_to_ref(ref, new_id);
1734 err = got_ref_write(ref, repo);
1738 err = got_ref_resolve(&old_id, repo, ref);
1741 if (got_object_id_cmp(old_id, new_id) == 0)
1744 err = got_ref_change_ref(ref, new_id);
1747 err = got_ref_write(ref, repo);
1753 printf("Updated %s: %s\n", got_ref_get_name(ref),
1761 static const struct got_error *
1762 update_symref(const char *refname, struct got_reference *target_ref,
1763 int verbosity, struct got_repository *repo)
1765 const struct got_error *err = NULL, *unlock_err;
1766 struct got_reference *symref;
1767 int symref_is_locked = 0;
1769 err = got_ref_open(&symref, repo, refname, 1);
1771 if (err->code != GOT_ERR_NOT_REF)
1773 err = got_ref_alloc_symref(&symref, refname, target_ref);
1777 err = got_ref_write(symref, repo);
1782 printf("Created reference %s: %s\n",
1783 got_ref_get_name(symref),
1784 got_ref_get_symref_target(symref));
1786 symref_is_locked = 1;
1788 if (strcmp(got_ref_get_symref_target(symref),
1789 got_ref_get_name(target_ref)) == 0)
1792 err = got_ref_change_symref(symref,
1793 got_ref_get_name(target_ref));
1797 err = got_ref_write(symref, repo);
1802 printf("Updated %s: %s\n", got_ref_get_name(symref),
1803 got_ref_get_symref_target(symref));
1807 if (symref_is_locked) {
1808 unlock_err = got_ref_unlock(symref);
1809 if (unlock_err && err == NULL)
1812 got_ref_close(symref);
1819 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1820 "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1821 "[remote-repository-name]\n",
1826 static const struct got_error *
1827 delete_missing_ref(struct got_reference *ref,
1828 int verbosity, struct got_repository *repo)
1830 const struct got_error *err = NULL;
1831 struct got_object_id *id = NULL;
1832 char *id_str = NULL;
1834 if (got_ref_is_symbolic(ref)) {
1835 err = got_ref_delete(ref, repo);
1838 if (verbosity >= 0) {
1839 printf("Deleted reference %s: %s\n",
1840 got_ref_get_name(ref),
1841 got_ref_get_symref_target(ref));
1844 err = got_ref_resolve(&id, repo, ref);
1847 err = got_object_id_str(&id_str, id);
1851 err = got_ref_delete(ref, repo);
1854 if (verbosity >= 0) {
1855 printf("Deleted reference %s: %s\n",
1856 got_ref_get_name(ref), id_str);
1865 static const struct got_error *
1866 delete_missing_refs(struct got_pathlist_head *their_refs,
1867 struct got_pathlist_head *their_symrefs,
1868 const struct got_remote_repo *remote,
1869 int verbosity, struct got_repository *repo)
1871 const struct got_error *err = NULL, *unlock_err;
1872 struct got_reflist_head my_refs;
1873 struct got_reflist_entry *re;
1874 struct got_pathlist_entry *pe;
1875 char *remote_namespace = NULL;
1876 char *local_refname = NULL;
1878 SIMPLEQ_INIT(&my_refs);
1880 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
1882 return got_error_from_errno("asprintf");
1884 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
1888 SIMPLEQ_FOREACH(re, &my_refs, entry) {
1889 const char *refname = got_ref_get_name(re->ref);
1891 if (!remote->mirror_references) {
1892 if (strncmp(refname, remote_namespace,
1893 strlen(remote_namespace)) == 0) {
1894 if (strcmp(refname + strlen(remote_namespace),
1897 if (asprintf(&local_refname, "refs/heads/%s",
1898 refname + strlen(remote_namespace)) == -1) {
1899 err = got_error_from_errno("asprintf");
1902 } else if (strncmp(refname, "refs/tags/", 10) != 0)
1906 TAILQ_FOREACH(pe, their_refs, entry) {
1907 if (strcmp(local_refname, pe->path) == 0)
1913 TAILQ_FOREACH(pe, their_symrefs, entry) {
1914 if (strcmp(local_refname, pe->path) == 0)
1920 err = delete_missing_ref(re->ref, verbosity, repo);
1924 if (local_refname) {
1925 struct got_reference *ref;
1926 err = got_ref_open(&ref, repo, local_refname, 1);
1928 if (err->code != GOT_ERR_NOT_REF)
1930 free(local_refname);
1931 local_refname = NULL;
1934 err = delete_missing_ref(ref, verbosity, repo);
1937 unlock_err = got_ref_unlock(ref);
1939 if (unlock_err && err == NULL) {
1944 free(local_refname);
1945 local_refname = NULL;
1949 free(remote_namespace);
1950 free(local_refname);
1954 static const struct got_error *
1955 update_wanted_ref(const char *refname, struct got_object_id *id,
1956 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1958 const struct got_error *err, *unlock_err;
1959 char *remote_refname;
1960 struct got_reference *ref;
1962 if (strncmp("refs/", refname, 5) == 0)
1965 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1966 remote_repo_name, refname) == -1)
1967 return got_error_from_errno("asprintf");
1969 err = got_ref_open(&ref, repo, remote_refname, 1);
1971 if (err->code != GOT_ERR_NOT_REF)
1973 err = create_ref(remote_refname, id, verbosity, repo);
1975 err = update_ref(ref, id, 0, verbosity, repo);
1976 unlock_err = got_ref_unlock(ref);
1977 if (unlock_err && err == NULL)
1982 free(remote_refname);
1986 static const struct got_error *
1987 cmd_fetch(int argc, char *argv[])
1989 const struct got_error *error = NULL, *unlock_err;
1990 char *cwd = NULL, *repo_path = NULL;
1991 const char *remote_name;
1992 char *proto = NULL, *host = NULL, *port = NULL;
1993 char *repo_name = NULL, *server_path = NULL;
1994 const struct got_remote_repo *remotes, *remote = NULL;
1996 char *id_str = NULL;
1997 struct got_repository *repo = NULL;
1998 struct got_worktree *worktree = NULL;
1999 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2000 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2001 struct got_pathlist_entry *pe;
2002 struct got_object_id *pack_hash = NULL;
2003 int i, ch, fetchfd = -1, fetchstatus;
2004 pid_t fetchpid = -1;
2005 struct got_fetch_progress_arg fpa;
2006 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2007 int delete_refs = 0, replace_tags = 0;
2010 TAILQ_INIT(&symrefs);
2011 TAILQ_INIT(&wanted_branches);
2012 TAILQ_INIT(&wanted_refs);
2014 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2017 fetch_all_branches = 1;
2020 error = got_pathlist_append(&wanted_branches,
2032 repo_path = realpath(optarg, NULL);
2033 if (repo_path == NULL)
2034 return got_error_from_errno2("realpath",
2036 got_path_strip_trailing_slashes(repo_path);
2044 else if (verbosity < 3)
2051 error = got_pathlist_append(&wanted_refs,
2064 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2065 errx(1, "-a and -b options are mutually exclusive");
2066 if (list_refs_only) {
2067 if (!TAILQ_EMPTY(&wanted_branches))
2068 errx(1, "-l and -b options are mutually exclusive");
2069 if (fetch_all_branches)
2070 errx(1, "-l and -a options are mutually exclusive");
2072 errx(1, "-l and -d options are mutually exclusive");
2073 if (verbosity == -1)
2074 errx(1, "-l and -q options are mutually exclusive");
2078 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2080 remote_name = argv[0];
2084 cwd = getcwd(NULL, 0);
2086 error = got_error_from_errno("getcwd");
2090 if (repo_path == NULL) {
2091 error = got_worktree_open(&worktree, cwd);
2092 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2098 strdup(got_worktree_get_repo_path(worktree));
2099 if (repo_path == NULL)
2100 error = got_error_from_errno("strdup");
2104 repo_path = strdup(cwd);
2105 if (repo_path == NULL) {
2106 error = got_error_from_errno("strdup");
2112 error = got_repo_open(&repo, repo_path, NULL);
2117 worktree_conf = got_worktree_get_gotconfig(worktree);
2118 if (worktree_conf) {
2119 got_gotconfig_get_remotes(&nremotes, &remotes,
2121 for (i = 0; i < nremotes; i++) {
2122 if (strcmp(remotes[i].name, remote_name) == 0) {
2123 remote = &remotes[i];
2129 if (remote == NULL) {
2130 repo_conf = got_repo_get_gotconfig(repo);
2132 got_gotconfig_get_remotes(&nremotes, &remotes,
2134 for (i = 0; i < nremotes; i++) {
2135 if (strcmp(remotes[i].name, remote_name) == 0) {
2136 remote = &remotes[i];
2142 if (remote == NULL) {
2143 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2144 for (i = 0; i < nremotes; i++) {
2145 if (strcmp(remotes[i].name, remote_name) == 0) {
2146 remote = &remotes[i];
2151 if (remote == NULL) {
2152 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2156 if (TAILQ_EMPTY(&wanted_branches) && remote->nbranches > 0) {
2157 for (i = 0; i < remote->nbranches; i++) {
2158 got_pathlist_append(&wanted_branches,
2159 remote->branches[i], NULL);
2164 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2165 &repo_name, remote->url);
2169 if (strcmp(proto, "git") == 0) {
2171 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2172 "sendfd dns inet unveil", NULL) == -1)
2175 } else if (strcmp(proto, "git+ssh") == 0 ||
2176 strcmp(proto, "ssh") == 0) {
2178 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2179 "sendfd unveil", NULL) == -1)
2182 } else if (strcmp(proto, "http") == 0 ||
2183 strcmp(proto, "git+http") == 0) {
2184 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2187 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2191 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2192 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2193 error = got_error_from_errno2("unveil",
2194 GOT_FETCH_PATH_SSH);
2198 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2203 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2204 port ? ":" : "", port ? port : "");
2206 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2207 server_path, verbosity);
2211 fpa.last_scaled_size[0] = '\0';
2212 fpa.last_p_indexed = -1;
2213 fpa.last_p_resolved = -1;
2214 fpa.verbosity = verbosity;
2216 fpa.create_configs = 0;
2217 fpa.configs_created = 0;
2218 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2219 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2220 remote->mirror_references, fetch_all_branches, &wanted_branches,
2221 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2222 fetch_progress, &fpa);
2226 if (list_refs_only) {
2227 error = list_remote_refs(&symrefs, &refs);
2231 if (pack_hash == NULL) {
2233 printf("Already up-to-date\n");
2234 } else if (verbosity >= 0) {
2235 error = got_object_id_str(&id_str, pack_hash);
2238 printf("\nFetched %s.pack\n", id_str);
2243 /* Update references provided with the pack file. */
2244 TAILQ_FOREACH(pe, &refs, entry) {
2245 const char *refname = pe->path;
2246 struct got_object_id *id = pe->data;
2247 struct got_reference *ref;
2248 char *remote_refname;
2250 if (is_wanted_ref(&wanted_refs, refname) &&
2251 !remote->mirror_references) {
2252 error = update_wanted_ref(refname, id,
2253 remote->name, verbosity, repo);
2259 if (remote->mirror_references ||
2260 strncmp("refs/tags/", refname, 10) == 0) {
2261 error = got_ref_open(&ref, repo, refname, 1);
2263 if (error->code != GOT_ERR_NOT_REF)
2265 error = create_ref(refname, id, verbosity,
2270 error = update_ref(ref, id, replace_tags,
2272 unlock_err = got_ref_unlock(ref);
2273 if (unlock_err && error == NULL)
2279 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2280 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2281 remote_name, refname + 11) == -1) {
2282 error = got_error_from_errno("asprintf");
2286 error = got_ref_open(&ref, repo, remote_refname, 1);
2288 if (error->code != GOT_ERR_NOT_REF)
2290 error = create_ref(remote_refname, id,
2295 error = update_ref(ref, id, replace_tags,
2297 unlock_err = got_ref_unlock(ref);
2298 if (unlock_err && error == NULL)
2305 /* Also create a local branch if none exists yet. */
2306 error = got_ref_open(&ref, repo, refname, 1);
2308 if (error->code != GOT_ERR_NOT_REF)
2310 error = create_ref(refname, id, verbosity,
2315 unlock_err = got_ref_unlock(ref);
2316 if (unlock_err && error == NULL)
2323 error = delete_missing_refs(&refs, &symrefs, remote,
2329 if (!remote->mirror_references) {
2330 /* Update remote HEAD reference if the server provided one. */
2331 TAILQ_FOREACH(pe, &symrefs, entry) {
2332 struct got_reference *target_ref;
2333 const char *refname = pe->path;
2334 const char *target = pe->data;
2335 char *remote_refname = NULL, *remote_target = NULL;
2337 if (strcmp(refname, GOT_REF_HEAD) != 0)
2340 if (strncmp("refs/heads/", target, 11) != 0)
2343 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2344 remote->name, refname) == -1) {
2345 error = got_error_from_errno("asprintf");
2348 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2349 remote->name, target + 11) == -1) {
2350 error = got_error_from_errno("asprintf");
2351 free(remote_refname);
2355 error = got_ref_open(&target_ref, repo, remote_target,
2358 free(remote_refname);
2359 free(remote_target);
2360 if (error->code == GOT_ERR_NOT_REF) {
2366 error = update_symref(remote_refname, target_ref,
2368 free(remote_refname);
2369 free(remote_target);
2370 got_ref_close(target_ref);
2377 if (kill(fetchpid, SIGTERM) == -1)
2378 error = got_error_from_errno("kill");
2379 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2380 error = got_error_from_errno("waitpid");
2382 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2383 error = got_error_from_errno("close");
2385 got_repo_close(repo);
2387 got_worktree_close(worktree);
2388 TAILQ_FOREACH(pe, &refs, entry) {
2389 free((void *)pe->path);
2392 got_pathlist_free(&refs);
2393 TAILQ_FOREACH(pe, &symrefs, entry) {
2394 free((void *)pe->path);
2397 got_pathlist_free(&symrefs);
2398 got_pathlist_free(&wanted_branches);
2399 got_pathlist_free(&wanted_refs);
2414 usage_checkout(void)
2416 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2417 "[-p prefix] repository-path [worktree-path]\n", getprogname());
2422 show_worktree_base_ref_warning(void)
2424 fprintf(stderr, "%s: warning: could not create a reference "
2425 "to the work tree's base commit; the commit could be "
2426 "garbage-collected by Git; making the repository "
2427 "writable and running 'got update' will prevent this\n",
2431 struct got_checkout_progress_arg {
2432 const char *worktree_path;
2433 int had_base_commit_ref_error;
2436 static const struct got_error *
2437 checkout_progress(void *arg, unsigned char status, const char *path)
2439 struct got_checkout_progress_arg *a = arg;
2441 /* Base commit bump happens silently. */
2442 if (status == GOT_STATUS_BUMP_BASE)
2445 if (status == GOT_STATUS_BASE_REF_ERR) {
2446 a->had_base_commit_ref_error = 1;
2450 while (path[0] == '/')
2453 printf("%c %s/%s\n", status, a->worktree_path, path);
2457 static const struct got_error *
2458 check_cancelled(void *arg)
2460 if (sigint_received || sigpipe_received)
2461 return got_error(GOT_ERR_CANCELLED);
2465 static const struct got_error *
2466 check_linear_ancestry(struct got_object_id *commit_id,
2467 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2468 struct got_repository *repo)
2470 const struct got_error *err = NULL;
2471 struct got_object_id *yca_id;
2473 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2474 commit_id, base_commit_id, repo, check_cancelled, NULL);
2479 return got_error(GOT_ERR_ANCESTRY);
2482 * Require a straight line of history between the target commit
2483 * and the work tree's base commit.
2485 * Non-linear situations such as this require a rebase:
2487 * (commit) D F (base_commit)
2495 * 'got update' only handles linear cases:
2496 * Update forwards in time: A (base/yca) - B - C - D (commit)
2497 * Update backwards in time: D (base) - C - B - A (commit/yca)
2499 if (allow_forwards_in_time_only) {
2500 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2501 return got_error(GOT_ERR_ANCESTRY);
2502 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2503 got_object_id_cmp(base_commit_id, yca_id) != 0)
2504 return got_error(GOT_ERR_ANCESTRY);
2510 static const struct got_error *
2511 check_same_branch(struct got_object_id *commit_id,
2512 struct got_reference *head_ref, struct got_object_id *yca_id,
2513 struct got_repository *repo)
2515 const struct got_error *err = NULL;
2516 struct got_commit_graph *graph = NULL;
2517 struct got_object_id *head_commit_id = NULL;
2518 int is_same_branch = 0;
2520 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2524 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2528 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2533 err = got_commit_graph_open(&graph, "/", 1);
2537 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2538 check_cancelled, NULL);
2543 struct got_object_id *id;
2544 err = got_commit_graph_iter_next(&id, graph, repo,
2545 check_cancelled, NULL);
2547 if (err->code == GOT_ERR_ITER_COMPLETED)
2553 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2555 if (got_object_id_cmp(id, commit_id) == 0) {
2563 got_commit_graph_close(graph);
2564 free(head_commit_id);
2565 if (!err && !is_same_branch)
2566 err = got_error(GOT_ERR_ANCESTRY);
2570 static const struct got_error *
2571 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2573 static char msg[512];
2574 const char *branch_name;
2576 if (got_ref_is_symbolic(ref))
2577 branch_name = got_ref_get_symref_target(ref);
2579 branch_name = got_ref_get_name(ref);
2581 if (strncmp("refs/heads/", branch_name, 11) == 0)
2584 snprintf(msg, sizeof(msg),
2585 "target commit is not contained in branch '%s'; "
2586 "the branch to use must be specified with -b; "
2587 "if necessary a new branch can be created for "
2588 "this commit with 'got branch -c %s BRANCH_NAME'",
2589 branch_name, commit_id_str);
2591 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2594 static const struct got_error *
2595 cmd_checkout(int argc, char *argv[])
2597 const struct got_error *error = NULL;
2598 struct got_repository *repo = NULL;
2599 struct got_reference *head_ref = NULL;
2600 struct got_worktree *worktree = NULL;
2601 char *repo_path = NULL;
2602 char *worktree_path = NULL;
2603 const char *path_prefix = "";
2604 const char *branch_name = GOT_REF_HEAD;
2605 char *commit_id_str = NULL;
2607 int ch, same_path_prefix, allow_nonempty = 0;
2608 struct got_pathlist_head paths;
2609 struct got_checkout_progress_arg cpa;
2613 while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2616 branch_name = optarg;
2619 commit_id_str = strdup(optarg);
2620 if (commit_id_str == NULL)
2621 return got_error_from_errno("strdup");
2627 path_prefix = optarg;
2639 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2640 "unveil", NULL) == -1)
2644 char *base, *dotgit;
2646 repo_path = realpath(argv[0], NULL);
2647 if (repo_path == NULL)
2648 return got_error_from_errno2("realpath", argv[0]);
2649 cwd = getcwd(NULL, 0);
2651 error = got_error_from_errno("getcwd");
2658 error = got_path_basename(&base, path);
2661 dotgit = strstr(base, ".git");
2664 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2665 error = got_error_from_errno("asprintf");
2670 } else if (argc == 2) {
2671 repo_path = realpath(argv[0], NULL);
2672 if (repo_path == NULL) {
2673 error = got_error_from_errno2("realpath", argv[0]);
2676 worktree_path = realpath(argv[1], NULL);
2677 if (worktree_path == NULL) {
2678 if (errno != ENOENT) {
2679 error = got_error_from_errno2("realpath",
2683 worktree_path = strdup(argv[1]);
2684 if (worktree_path == NULL) {
2685 error = got_error_from_errno("strdup");
2692 got_path_strip_trailing_slashes(repo_path);
2693 got_path_strip_trailing_slashes(worktree_path);
2695 error = got_repo_open(&repo, repo_path, NULL);
2699 /* Pre-create work tree path for unveil(2) */
2700 error = got_path_mkdir(worktree_path);
2702 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2703 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2705 if (!allow_nonempty &&
2706 !got_path_dir_is_empty(worktree_path)) {
2707 error = got_error_path(worktree_path,
2708 GOT_ERR_DIR_NOT_EMPTY);
2713 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2717 error = got_ref_open(&head_ref, repo, branch_name, 0);
2721 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2722 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2725 error = got_worktree_open(&worktree, worktree_path);
2729 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2733 if (!same_path_prefix) {
2734 error = got_error(GOT_ERR_PATH_PREFIX);
2738 if (commit_id_str) {
2739 struct got_object_id *commit_id;
2740 error = got_repo_match_object_id(&commit_id, NULL,
2741 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
2744 error = check_linear_ancestry(commit_id,
2745 got_worktree_get_base_commit_id(worktree), 0, repo);
2746 if (error != NULL) {
2748 if (error->code == GOT_ERR_ANCESTRY) {
2749 error = checkout_ancestry_error(
2750 head_ref, commit_id_str);
2754 error = check_same_branch(commit_id, head_ref, NULL, repo);
2756 if (error->code == GOT_ERR_ANCESTRY) {
2757 error = checkout_ancestry_error(
2758 head_ref, commit_id_str);
2762 error = got_worktree_set_base_commit_id(worktree, repo,
2769 error = got_pathlist_append(&paths, "", NULL);
2772 cpa.worktree_path = worktree_path;
2773 cpa.had_base_commit_ref_error = 0;
2774 error = got_worktree_checkout_files(worktree, &paths, repo,
2775 checkout_progress, &cpa, check_cancelled, NULL);
2779 printf("Now shut up and hack\n");
2780 if (cpa.had_base_commit_ref_error)
2781 show_worktree_base_ref_warning();
2783 got_pathlist_free(&paths);
2784 free(commit_id_str);
2786 free(worktree_path);
2791 struct got_update_progress_arg {
2799 print_update_progress_stats(struct got_update_progress_arg *upa)
2801 if (!upa->did_something)
2804 if (upa->conflicts > 0)
2805 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2806 if (upa->obstructed > 0)
2807 printf("File paths obstructed by a non-regular file: %d\n",
2809 if (upa->not_updated > 0)
2810 printf("Files not updated because of existing merge "
2811 "conflicts: %d\n", upa->not_updated);
2817 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2822 static const struct got_error *
2823 update_progress(void *arg, unsigned char status, const char *path)
2825 struct got_update_progress_arg *upa = arg;
2827 if (status == GOT_STATUS_EXISTS ||
2828 status == GOT_STATUS_BASE_REF_ERR)
2831 upa->did_something = 1;
2833 /* Base commit bump happens silently. */
2834 if (status == GOT_STATUS_BUMP_BASE)
2837 if (status == GOT_STATUS_CONFLICT)
2839 if (status == GOT_STATUS_OBSTRUCTED)
2841 if (status == GOT_STATUS_CANNOT_UPDATE)
2844 while (path[0] == '/')
2846 printf("%c %s\n", status, path);
2850 static const struct got_error *
2851 switch_head_ref(struct got_reference *head_ref,
2852 struct got_object_id *commit_id, struct got_worktree *worktree,
2853 struct got_repository *repo)
2855 const struct got_error *err = NULL;
2857 int ref_has_moved = 0;
2859 /* Trivial case: switching between two different references. */
2860 if (strcmp(got_ref_get_name(head_ref),
2861 got_worktree_get_head_ref_name(worktree)) != 0) {
2862 printf("Switching work tree from %s to %s\n",
2863 got_worktree_get_head_ref_name(worktree),
2864 got_ref_get_name(head_ref));
2865 return got_worktree_set_head_ref(worktree, head_ref);
2868 err = check_linear_ancestry(commit_id,
2869 got_worktree_get_base_commit_id(worktree), 0, repo);
2871 if (err->code != GOT_ERR_ANCESTRY)
2878 /* Switching to a rebased branch with the same reference name. */
2879 err = got_object_id_str(&base_id_str,
2880 got_worktree_get_base_commit_id(worktree));
2883 printf("Reference %s now points at a different branch\n",
2884 got_worktree_get_head_ref_name(worktree));
2885 printf("Switching work tree from %s to %s\n", base_id_str,
2886 got_worktree_get_head_ref_name(worktree));
2890 static const struct got_error *
2891 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
2893 const struct got_error *err;
2896 err = got_worktree_rebase_in_progress(&in_progress, worktree);
2900 return got_error(GOT_ERR_REBASING);
2902 err = got_worktree_histedit_in_progress(&in_progress, worktree);
2906 return got_error(GOT_ERR_HISTEDIT_BUSY);
2911 static const struct got_error *
2912 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
2913 char *argv[], struct got_worktree *worktree)
2915 const struct got_error *err = NULL;
2922 return got_error_from_errno("strdup");
2923 return got_pathlist_append(paths, path, NULL);
2926 for (i = 0; i < argc; i++) {
2927 err = got_worktree_resolve_path(&path, worktree, argv[i]);
2930 err = got_pathlist_append(paths, path, NULL);
2940 static const struct got_error *
2941 wrap_not_worktree_error(const struct got_error *orig_err,
2942 const char *cmdname, const char *path)
2944 const struct got_error *err;
2945 struct got_repository *repo;
2946 static char msg[512];
2948 err = got_repo_open(&repo, path, NULL);
2952 snprintf(msg, sizeof(msg),
2953 "'got %s' needs a work tree in addition to a git repository\n"
2954 "Work trees can be checked out from this Git repository with "
2956 "The got(1) manual page contains more information.", cmdname);
2957 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
2958 got_repo_close(repo);
2962 static const struct got_error *
2963 cmd_update(int argc, char *argv[])
2965 const struct got_error *error = NULL;
2966 struct got_repository *repo = NULL;
2967 struct got_worktree *worktree = NULL;
2968 char *worktree_path = NULL;
2969 struct got_object_id *commit_id = NULL;
2970 char *commit_id_str = NULL;
2971 const char *branch_name = NULL;
2972 struct got_reference *head_ref = NULL;
2973 struct got_pathlist_head paths;
2974 struct got_pathlist_entry *pe;
2976 struct got_update_progress_arg upa;
2980 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
2983 branch_name = optarg;
2986 commit_id_str = strdup(optarg);
2987 if (commit_id_str == NULL)
2988 return got_error_from_errno("strdup");
3000 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3001 "unveil", NULL) == -1)
3004 worktree_path = getcwd(NULL, 0);
3005 if (worktree_path == NULL) {
3006 error = got_error_from_errno("getcwd");
3009 error = got_worktree_open(&worktree, worktree_path);
3011 if (error->code == GOT_ERR_NOT_WORKTREE)
3012 error = wrap_not_worktree_error(error, "update",
3017 error = check_rebase_or_histedit_in_progress(worktree);
3021 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3026 error = apply_unveil(got_repo_get_path(repo), 0,
3027 got_worktree_get_root_path(worktree));
3031 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3035 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3036 got_worktree_get_head_ref_name(worktree), 0);
3039 if (commit_id_str == NULL) {
3040 error = got_ref_resolve(&commit_id, repo, head_ref);
3043 error = got_object_id_str(&commit_id_str, commit_id);
3047 error = got_repo_match_object_id(&commit_id, NULL,
3048 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
3049 free(commit_id_str);
3050 commit_id_str = NULL;
3053 error = got_object_id_str(&commit_id_str, commit_id);
3059 struct got_object_id *head_commit_id;
3060 TAILQ_FOREACH(pe, &paths, entry) {
3061 if (pe->path_len == 0)
3063 error = got_error_msg(GOT_ERR_BAD_PATH,
3064 "switching between branches requires that "
3065 "the entire work tree gets updated");
3068 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3071 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3073 free(head_commit_id);
3076 error = check_same_branch(commit_id, head_ref, NULL, repo);
3079 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3083 error = check_linear_ancestry(commit_id,
3084 got_worktree_get_base_commit_id(worktree), 0, repo);
3085 if (error != NULL) {
3086 if (error->code == GOT_ERR_ANCESTRY)
3087 error = got_error(GOT_ERR_BRANCH_MOVED);
3090 error = check_same_branch(commit_id, head_ref, NULL, repo);
3095 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3097 error = got_worktree_set_base_commit_id(worktree, repo,
3103 memset(&upa, 0, sizeof(upa));
3104 error = got_worktree_checkout_files(worktree, &paths, repo,
3105 update_progress, &upa, check_cancelled, NULL);
3109 if (upa.did_something)
3110 printf("Updated to commit %s\n", commit_id_str);
3112 printf("Already up-to-date\n");
3113 print_update_progress_stats(&upa);
3115 free(worktree_path);
3116 TAILQ_FOREACH(pe, &paths, entry)
3117 free((char *)pe->path);
3118 got_pathlist_free(&paths);
3120 free(commit_id_str);
3124 static const struct got_error *
3125 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3126 const char *path, int diff_context, int ignore_whitespace,
3127 int force_text_diff, struct got_repository *repo)
3129 const struct got_error *err = NULL;
3130 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3133 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3138 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3142 while (path[0] == '/')
3144 err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3145 diff_context, ignore_whitespace, force_text_diff, stdout);
3148 got_object_blob_close(blob1);
3149 got_object_blob_close(blob2);
3153 static const struct got_error *
3154 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3155 const char *path, int diff_context, int ignore_whitespace,
3156 int force_text_diff, struct got_repository *repo)
3158 const struct got_error *err = NULL;
3159 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3160 struct got_diff_blob_output_unidiff_arg arg;
3163 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3168 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3172 arg.diff_context = diff_context;
3173 arg.ignore_whitespace = ignore_whitespace;
3174 arg.force_text_diff = force_text_diff;
3175 arg.outfile = stdout;
3176 arg.line_offsets = NULL;
3178 while (path[0] == '/')
3180 err = got_diff_tree(tree1, tree2, path, path, repo,
3181 got_diff_blob_output_unidiff, &arg, 1);
3184 got_object_tree_close(tree1);
3186 got_object_tree_close(tree2);
3190 static const struct got_error *
3191 get_changed_paths(struct got_pathlist_head *paths,
3192 struct got_commit_object *commit, struct got_repository *repo)
3194 const struct got_error *err = NULL;
3195 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3196 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3197 struct got_object_qid *qid;
3199 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3201 struct got_commit_object *pcommit;
3202 err = got_object_open_as_commit(&pcommit, repo,
3207 tree_id1 = got_object_commit_get_tree_id(pcommit);
3208 got_object_commit_close(pcommit);
3213 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3218 tree_id2 = got_object_commit_get_tree_id(commit);
3219 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3223 err = got_diff_tree(tree1, tree2, "", "", repo,
3224 got_diff_tree_collect_changed_paths, paths, 0);
3227 got_object_tree_close(tree1);
3229 got_object_tree_close(tree2);
3233 static const struct got_error *
3234 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3235 const char *path, int diff_context, struct got_repository *repo)
3237 const struct got_error *err = NULL;
3238 struct got_commit_object *pcommit = NULL;
3239 char *id_str1 = NULL, *id_str2 = NULL;
3240 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3241 struct got_object_qid *qid;
3243 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3245 err = got_object_open_as_commit(&pcommit, repo,
3251 if (path && path[0] != '\0') {
3253 err = got_object_id_by_path(&obj_id2, repo, id, path);
3256 err = got_object_id_str(&id_str2, obj_id2);
3262 err = got_object_id_by_path(&obj_id1, repo,
3265 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3270 err = got_object_id_str(&id_str1, obj_id1);
3277 err = got_object_get_type(&obj_type, repo, obj_id2);
3282 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3284 case GOT_OBJ_TYPE_BLOB:
3285 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3288 case GOT_OBJ_TYPE_TREE:
3289 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3293 err = got_error(GOT_ERR_OBJ_TYPE);
3299 obj_id2 = got_object_commit_get_tree_id(commit);
3300 err = got_object_id_str(&id_str2, obj_id2);
3304 obj_id1 = got_object_commit_get_tree_id(pcommit);
3305 err = got_object_id_str(&id_str1, obj_id1);
3309 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3311 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3318 got_object_commit_close(pcommit);
3323 get_datestr(time_t *time, char *datebuf)
3325 struct tm mytm, *tm;
3328 tm = gmtime_r(time, &mytm);
3331 s = asctime_r(tm, datebuf);
3334 p = strchr(s, '\n');
3340 static const struct got_error *
3341 match_logmsg(int *have_match, struct got_object_id *id,
3342 struct got_commit_object *commit, regex_t *regex)
3344 const struct got_error *err = NULL;
3345 regmatch_t regmatch;
3346 char *id_str = NULL, *logmsg = NULL;
3350 err = got_object_id_str(&id_str, id);
3354 err = got_object_commit_get_logmsg(&logmsg, commit);
3358 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3367 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3370 regmatch_t regmatch;
3371 struct got_pathlist_entry *pe;
3375 TAILQ_FOREACH(pe, changed_paths, entry) {
3376 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3383 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3385 static const struct got_error *
3386 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3387 struct got_repository *repo, const char *path,
3388 struct got_pathlist_head *changed_paths, int show_patch,
3389 int diff_context, struct got_reflist_head *refs)
3391 const struct got_error *err = NULL;
3392 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3394 time_t committer_time;
3395 const char *author, *committer;
3396 char *refs_str = NULL;
3397 struct got_reflist_entry *re;
3399 SIMPLEQ_FOREACH(re, refs, entry) {
3402 struct got_tag_object *tag = NULL;
3403 struct got_object_id *ref_id;
3406 name = got_ref_get_name(re->ref);
3407 if (strcmp(name, GOT_REF_HEAD) == 0)
3409 if (strncmp(name, "refs/", 5) == 0)
3411 if (strncmp(name, "got/", 4) == 0)
3413 if (strncmp(name, "heads/", 6) == 0)
3415 if (strncmp(name, "remotes/", 8) == 0) {
3417 s = strstr(name, "/" GOT_REF_HEAD);
3418 if (s != NULL && s[strlen(s)] == '\0')
3421 err = got_ref_resolve(&ref_id, repo, re->ref);
3424 if (strncmp(name, "tags/", 5) == 0) {
3425 err = got_object_open_as_tag(&tag, repo, ref_id);
3427 if (err->code != GOT_ERR_OBJ_TYPE) {
3431 /* Ref points at something other than a tag. */
3436 cmp = got_object_id_cmp(tag ?
3437 got_object_tag_get_object_id(tag) : ref_id, id);
3440 got_object_tag_close(tag);
3444 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3446 err = got_error_from_errno("asprintf");
3452 err = got_object_id_str(&id_str, id);
3456 printf(GOT_COMMIT_SEP_STR);
3457 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3458 refs_str ? refs_str : "", refs_str ? ")" : "");
3463 printf("from: %s\n", got_object_commit_get_author(commit));
3464 committer_time = got_object_commit_get_committer_time(commit);
3465 datestr = get_datestr(&committer_time, datebuf);
3467 printf("date: %s UTC\n", datestr);
3468 author = got_object_commit_get_author(commit);
3469 committer = got_object_commit_get_committer(commit);
3470 if (strcmp(author, committer) != 0)
3471 printf("via: %s\n", committer);
3472 if (got_object_commit_get_nparents(commit) > 1) {
3473 const struct got_object_id_queue *parent_ids;
3474 struct got_object_qid *qid;
3476 parent_ids = got_object_commit_get_parent_ids(commit);
3477 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3478 err = got_object_id_str(&id_str, qid->id);
3481 printf("parent %d: %s\n", n++, id_str);
3486 err = got_object_commit_get_logmsg(&logmsg0, commit);
3492 line = strsep(&logmsg, "\n");
3494 printf(" %s\n", line);
3498 if (changed_paths) {
3499 struct got_pathlist_entry *pe;
3500 TAILQ_FOREACH(pe, changed_paths, entry) {
3501 struct got_diff_changed_path *cp = pe->data;
3502 printf(" %c %s\n", cp->status, pe->path);
3507 err = print_patch(commit, id, path, diff_context, repo);
3512 if (fflush(stdout) != 0 && err == NULL)
3513 err = got_error_from_errno("fflush");
3517 static const struct got_error *
3518 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3519 struct got_repository *repo, const char *path, int show_changed_paths,
3520 int show_patch, const char *search_pattern, int diff_context, int limit,
3521 int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3523 const struct got_error *err;
3524 struct got_commit_graph *graph;
3527 struct got_object_id_queue reversed_commits;
3528 struct got_object_qid *qid;
3529 struct got_commit_object *commit;
3530 struct got_pathlist_head changed_paths;
3531 struct got_pathlist_entry *pe;
3533 SIMPLEQ_INIT(&reversed_commits);
3534 TAILQ_INIT(&changed_paths);
3536 if (search_pattern && regcomp(®ex, search_pattern,
3537 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3538 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3540 err = got_commit_graph_open(&graph, path, !log_branches);
3543 err = got_commit_graph_iter_start(graph, root_id, repo,
3544 check_cancelled, NULL);
3548 struct got_object_id *id;
3550 if (sigint_received || sigpipe_received)
3553 err = got_commit_graph_iter_next(&id, graph, repo,
3554 check_cancelled, NULL);
3556 if (err->code == GOT_ERR_ITER_COMPLETED)
3563 err = got_object_open_as_commit(&commit, repo, id);
3567 if (show_changed_paths && !reverse_display_order) {
3568 err = get_changed_paths(&changed_paths, commit, repo);
3573 if (search_pattern) {
3574 err = match_logmsg(&have_match, id, commit, ®ex);
3576 got_object_commit_close(commit);
3579 if (have_match == 0 && show_changed_paths)
3580 match_changed_paths(&have_match,
3581 &changed_paths, ®ex);
3582 if (have_match == 0) {
3583 got_object_commit_close(commit);
3584 TAILQ_FOREACH(pe, &changed_paths, entry) {
3585 free((char *)pe->path);
3588 got_pathlist_free(&changed_paths);
3593 if (reverse_display_order) {
3594 err = got_object_qid_alloc(&qid, id);
3597 SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3598 got_object_commit_close(commit);
3600 err = print_commit(commit, id, repo, path,
3601 show_changed_paths ? &changed_paths : NULL,
3602 show_patch, diff_context, refs);
3603 got_object_commit_close(commit);
3607 if ((limit && --limit == 0) ||
3608 (end_id && got_object_id_cmp(id, end_id) == 0))
3611 TAILQ_FOREACH(pe, &changed_paths, entry) {
3612 free((char *)pe->path);
3615 got_pathlist_free(&changed_paths);
3617 if (reverse_display_order) {
3618 SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3619 err = got_object_open_as_commit(&commit, repo, qid->id);
3622 if (show_changed_paths) {
3623 err = get_changed_paths(&changed_paths,
3628 err = print_commit(commit, qid->id, repo, path,
3629 show_changed_paths ? &changed_paths : NULL,
3630 show_patch, diff_context, refs);
3631 got_object_commit_close(commit);
3634 TAILQ_FOREACH(pe, &changed_paths, entry) {
3635 free((char *)pe->path);
3638 got_pathlist_free(&changed_paths);
3642 while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3643 qid = SIMPLEQ_FIRST(&reversed_commits);
3644 SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3645 got_object_qid_free(qid);
3647 TAILQ_FOREACH(pe, &changed_paths, entry) {
3648 free((char *)pe->path);
3651 got_pathlist_free(&changed_paths);
3654 got_commit_graph_close(graph);
3661 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3662 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3663 "[-R] [path]\n", getprogname());
3668 get_default_log_limit(void)
3670 const char *got_default_log_limit;
3674 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3675 if (got_default_log_limit == NULL)
3677 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3683 static const struct got_error *
3684 cmd_log(int argc, char *argv[])
3686 const struct got_error *error;
3687 struct got_repository *repo = NULL;
3688 struct got_worktree *worktree = NULL;
3689 struct got_object_id *start_id = NULL, *end_id = NULL;
3690 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3691 const char *start_commit = NULL, *end_commit = NULL;
3692 const char *search_pattern = NULL;
3693 int diff_context = -1, ch;
3694 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3695 int reverse_display_order = 0;
3697 struct got_reflist_head refs;
3699 SIMPLEQ_INIT(&refs);
3702 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3708 limit = get_default_log_limit();
3710 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3716 show_changed_paths = 1;
3719 start_commit = optarg;
3722 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3725 err(1, "-C option %s", errstr);
3728 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3730 err(1, "-l option %s", errstr);
3736 repo_path = realpath(optarg, NULL);
3737 if (repo_path == NULL)
3738 return got_error_from_errno2("realpath",
3740 got_path_strip_trailing_slashes(repo_path);
3743 reverse_display_order = 1;
3746 search_pattern = optarg;
3749 end_commit = optarg;
3760 if (diff_context == -1)
3762 else if (!show_patch)
3763 errx(1, "-C requires -p");
3765 cwd = getcwd(NULL, 0);
3767 error = got_error_from_errno("getcwd");
3771 if (repo_path == NULL) {
3772 error = got_worktree_open(&worktree, cwd);
3773 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3780 error = got_worktree_resolve_path(&path, worktree,
3785 path = strdup(argv[0]);
3787 error = got_error_from_errno("strdup");
3791 } else if (argc != 0)
3794 if (repo_path == NULL) {
3795 repo_path = worktree ?
3796 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3798 if (repo_path == NULL) {
3799 error = got_error_from_errno("strdup");
3803 error = got_repo_open(&repo, repo_path, NULL);
3807 error = apply_unveil(got_repo_get_path(repo), 1,
3808 worktree ? got_worktree_get_root_path(worktree) : NULL);
3812 if (start_commit == NULL) {
3813 struct got_reference *head_ref;
3814 struct got_commit_object *commit = NULL;
3815 error = got_ref_open(&head_ref, repo,
3816 worktree ? got_worktree_get_head_ref_name(worktree)
3820 error = got_ref_resolve(&start_id, repo, head_ref);
3821 got_ref_close(head_ref);
3824 error = got_object_open_as_commit(&commit, repo,
3828 got_object_commit_close(commit);
3830 error = got_repo_match_object_id(&start_id, NULL,
3831 start_commit, GOT_OBJ_TYPE_COMMIT, 1, repo);
3835 if (end_commit != NULL) {
3836 error = got_repo_match_object_id(&end_id, NULL,
3837 end_commit, GOT_OBJ_TYPE_COMMIT, 1, repo);
3844 * If a path was specified on the command line it was resolved
3845 * to a path in the work tree above. Prepend the work tree's
3846 * path prefix to obtain the corresponding in-repository path.
3850 prefix = got_worktree_get_path_prefix(worktree);
3851 if (asprintf(&in_repo_path, "%s%s%s", prefix,
3852 (path[0] != '\0') ? "/" : "", path) == -1) {
3853 error = got_error_from_errno("asprintf");
3858 error = got_repo_map_path(&in_repo_path, repo,
3864 path = in_repo_path;
3867 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3871 error = print_commits(start_id, end_id, repo, path ? path : "",
3872 show_changed_paths, show_patch, search_pattern, diff_context,
3873 limit, log_branches, reverse_display_order, &refs);
3879 got_worktree_close(worktree);
3881 const struct got_error *repo_error;
3882 repo_error = got_repo_close(repo);
3886 got_ref_list_free(&refs);
3893 fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
3894 "[-s] [-w] [object1 object2 | path]\n", getprogname());
3898 struct print_diff_arg {
3899 struct got_repository *repo;
3900 struct got_worktree *worktree;
3905 int ignore_whitespace;
3906 int force_text_diff;
3910 * Create a file which contains the target path of a symlink so we can feed
3911 * it as content to the diff engine.
3913 static const struct got_error *
3914 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3915 const char *abspath)
3917 const struct got_error *err = NULL;
3918 char target_path[PATH_MAX];
3919 ssize_t target_len, outlen;
3924 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3925 if (target_len == -1)
3926 return got_error_from_errno2("readlinkat", abspath);
3928 target_len = readlink(abspath, target_path, PATH_MAX);
3929 if (target_len == -1)
3930 return got_error_from_errno2("readlink", abspath);
3933 *fd = got_opentempfd();
3935 return got_error_from_errno("got_opentempfd");
3937 outlen = write(*fd, target_path, target_len);
3939 err = got_error_from_errno("got_opentempfd");
3943 if (lseek(*fd, 0, SEEK_SET) == -1) {
3944 err = got_error_from_errno2("lseek", abspath);
3955 static const struct got_error *
3956 print_diff(void *arg, unsigned char status, unsigned char staged_status,
3957 const char *path, struct got_object_id *blob_id,
3958 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3959 int dirfd, const char *de_name)
3961 struct print_diff_arg *a = arg;
3962 const struct got_error *err = NULL;
3963 struct got_blob_object *blob1 = NULL;
3966 char *abspath = NULL, *label1 = NULL;
3969 if (a->diff_staged) {
3970 if (staged_status != GOT_STATUS_MODIFY &&
3971 staged_status != GOT_STATUS_ADD &&
3972 staged_status != GOT_STATUS_DELETE)
3975 if (staged_status == GOT_STATUS_DELETE)
3977 if (status == GOT_STATUS_NONEXISTENT)
3978 return got_error_set_errno(ENOENT, path);
3979 if (status != GOT_STATUS_MODIFY &&
3980 status != GOT_STATUS_ADD &&
3981 status != GOT_STATUS_DELETE &&
3982 status != GOT_STATUS_CONFLICT)
3986 if (!a->header_shown) {
3987 printf("diff %s %s%s\n", a->id_str,
3988 got_worktree_get_root_path(a->worktree),
3989 a->diff_staged ? " (staged changes)" : "");
3990 a->header_shown = 1;
3993 if (a->diff_staged) {
3994 const char *label1 = NULL, *label2 = NULL;
3995 switch (staged_status) {
3996 case GOT_STATUS_MODIFY:
4000 case GOT_STATUS_ADD:
4003 case GOT_STATUS_DELETE:
4007 return got_error(GOT_ERR_FILE_STATUS);
4009 return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4010 staged_blob_id, label1, label2, a->diff_context,
4011 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4014 if (staged_status == GOT_STATUS_ADD ||
4015 staged_status == GOT_STATUS_MODIFY) {
4017 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4021 err = got_object_id_str(&id_str, staged_blob_id);
4024 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4025 err = got_error_from_errno("asprintf");
4030 } else if (status != GOT_STATUS_ADD) {
4031 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4036 if (status != GOT_STATUS_DELETE) {
4037 if (asprintf(&abspath, "%s/%s",
4038 got_worktree_get_root_path(a->worktree), path) == -1) {
4039 err = got_error_from_errno("asprintf");
4044 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4046 if (errno != ELOOP) {
4047 err = got_error_from_errno2("openat",
4051 err = get_symlink_target_file(&fd, dirfd,
4057 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4059 if (errno != ELOOP) {
4060 err = got_error_from_errno2("open",
4064 err = get_symlink_target_file(&fd, dirfd,
4070 if (fstat(fd, &sb) == -1) {
4071 err = got_error_from_errno2("fstat", abspath);
4074 f2 = fdopen(fd, "r");
4076 err = got_error_from_errno2("fdopen", abspath);
4083 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4084 a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4087 got_object_blob_close(blob1);
4088 if (f2 && fclose(f2) == EOF && err == NULL)
4089 err = got_error_from_errno("fclose");
4090 if (fd != -1 && close(fd) == -1 && err == NULL)
4091 err = got_error_from_errno("close");
4096 static const struct got_error *
4097 cmd_diff(int argc, char *argv[])
4099 const struct got_error *error;
4100 struct got_repository *repo = NULL;
4101 struct got_worktree *worktree = NULL;
4102 char *cwd = NULL, *repo_path = NULL;
4103 struct got_object_id *id1 = NULL, *id2 = NULL;
4104 const char *id_str1 = NULL, *id_str2 = NULL;
4105 char *label1 = NULL, *label2 = NULL;
4107 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4108 int force_text_diff = 0;
4113 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4118 while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4121 force_text_diff = 1;
4124 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4127 err(1, "-C option %s", errstr);
4130 repo_path = realpath(optarg, NULL);
4131 if (repo_path == NULL)
4132 return got_error_from_errno2("realpath",
4134 got_path_strip_trailing_slashes(repo_path);
4140 ignore_whitespace = 1;
4151 cwd = getcwd(NULL, 0);
4153 error = got_error_from_errno("getcwd");
4159 "-r option can't be used when diffing a work tree");
4160 error = got_worktree_open(&worktree, cwd);
4162 if (error->code == GOT_ERR_NOT_WORKTREE)
4163 error = wrap_not_worktree_error(error, "diff",
4167 repo_path = strdup(got_worktree_get_repo_path(worktree));
4168 if (repo_path == NULL) {
4169 error = got_error_from_errno("strdup");
4173 error = got_worktree_resolve_path(&path, worktree,
4180 error = got_error_from_errno("strdup");
4184 } else if (argc == 2) {
4186 errx(1, "-s option can't be used when diffing "
4187 "objects in repository");
4190 if (repo_path == NULL) {
4191 error = got_worktree_open(&worktree, cwd);
4192 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4196 got_worktree_get_repo_path(worktree));
4197 if (repo_path == NULL) {
4198 error = got_error_from_errno("strdup");
4202 repo_path = strdup(cwd);
4203 if (repo_path == NULL) {
4204 error = got_error_from_errno("strdup");
4212 error = got_repo_open(&repo, repo_path, NULL);
4217 error = apply_unveil(got_repo_get_path(repo), 1,
4218 worktree ? got_worktree_get_root_path(worktree) : NULL);
4223 struct print_diff_arg arg;
4224 struct got_pathlist_head paths;
4229 error = got_object_id_str(&id_str,
4230 got_worktree_get_base_commit_id(worktree));
4234 arg.worktree = worktree;
4235 arg.diff_context = diff_context;
4236 arg.id_str = id_str;
4237 arg.header_shown = 0;
4238 arg.diff_staged = diff_staged;
4239 arg.ignore_whitespace = ignore_whitespace;
4240 arg.force_text_diff = force_text_diff;
4242 error = got_pathlist_append(&paths, path, NULL);
4246 error = got_worktree_status(worktree, &paths, repo, print_diff,
4247 &arg, check_cancelled, NULL);
4249 got_pathlist_free(&paths);
4253 error = got_repo_match_object_id(&id1, &label1, id_str1,
4254 GOT_OBJ_TYPE_ANY, 1, repo);
4258 error = got_repo_match_object_id(&id2, &label2, id_str2,
4259 GOT_OBJ_TYPE_ANY, 1, repo);
4263 error = got_object_get_type(&type1, repo, id1);
4267 error = got_object_get_type(&type2, repo, id2);
4271 if (type1 != type2) {
4272 error = got_error(GOT_ERR_OBJ_TYPE);
4277 case GOT_OBJ_TYPE_BLOB:
4278 error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4279 NULL, NULL, diff_context, ignore_whitespace,
4280 force_text_diff, repo, stdout);
4282 case GOT_OBJ_TYPE_TREE:
4283 error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4284 "", "", diff_context, ignore_whitespace, force_text_diff,
4287 case GOT_OBJ_TYPE_COMMIT:
4288 printf("diff %s %s\n", label1, label2);
4289 error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4290 diff_context, ignore_whitespace, force_text_diff, repo,
4294 error = got_error(GOT_ERR_OBJ_TYPE);
4303 got_worktree_close(worktree);
4305 const struct got_error *repo_error;
4306 repo_error = got_repo_close(repo);
4317 "usage: %s blame [-c commit] [-r repository-path] path\n",
4326 char datebuf[11]; /* YYYY-MM-DD + NUL */
4329 struct blame_cb_args {
4330 struct blame_line *lines;
4334 off_t *line_offsets;
4336 struct got_repository *repo;
4339 static const struct got_error *
4340 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4342 const struct got_error *err = NULL;
4343 struct blame_cb_args *a = arg;
4344 struct blame_line *bline;
4346 size_t linesize = 0;
4347 struct got_commit_object *commit = NULL;
4350 time_t committer_time;
4352 if (nlines != a->nlines ||
4353 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4354 return got_error(GOT_ERR_RANGE);
4356 if (sigint_received)
4357 return got_error(GOT_ERR_ITER_COMPLETED);
4360 return NULL; /* no change in this commit */
4362 /* Annotate this line. */
4363 bline = &a->lines[lineno - 1];
4364 if (bline->annotated)
4366 err = got_object_id_str(&bline->id_str, id);
4370 err = got_object_open_as_commit(&commit, a->repo, id);
4374 bline->committer = strdup(got_object_commit_get_committer(commit));
4375 if (bline->committer == NULL) {
4376 err = got_error_from_errno("strdup");
4380 committer_time = got_object_commit_get_committer_time(commit);
4381 if (localtime_r(&committer_time, &tm) == NULL)
4382 return got_error_from_errno("localtime_r");
4383 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4384 &tm) >= sizeof(bline->datebuf)) {
4385 err = got_error(GOT_ERR_NO_SPACE);
4388 bline->annotated = 1;
4390 /* Print lines annotated so far. */
4391 bline = &a->lines[a->lineno_cur - 1];
4392 if (!bline->annotated)
4395 offset = a->line_offsets[a->lineno_cur - 1];
4396 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4397 err = got_error_from_errno("fseeko");
4401 while (bline->annotated) {
4402 char *smallerthan, *at, *nl, *committer;
4405 if (getline(&line, &linesize, a->f) == -1) {
4407 err = got_error_from_errno("getline");
4411 committer = bline->committer;
4412 smallerthan = strchr(committer, '<');
4413 if (smallerthan && smallerthan[1] != '\0')
4414 committer = smallerthan + 1;
4415 at = strchr(committer, '@');
4418 len = strlen(committer);
4420 committer[8] = '\0';
4422 nl = strchr(line, '\n');
4425 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4426 bline->id_str, bline->datebuf, committer, line);
4429 bline = &a->lines[a->lineno_cur - 1];
4433 got_object_commit_close(commit);
4438 static const struct got_error *
4439 cmd_blame(int argc, char *argv[])
4441 const struct got_error *error;
4442 struct got_repository *repo = NULL;
4443 struct got_worktree *worktree = NULL;
4444 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4445 char *link_target = NULL;
4446 struct got_object_id *obj_id = NULL;
4447 struct got_object_id *commit_id = NULL;
4448 struct got_blob_object *blob = NULL;
4449 char *commit_id_str = NULL;
4450 struct blame_cb_args bca;
4451 int ch, obj_type, i;
4454 memset(&bca, 0, sizeof(bca));
4457 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4462 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4465 commit_id_str = optarg;
4468 repo_path = realpath(optarg, NULL);
4469 if (repo_path == NULL)
4470 return got_error_from_errno2("realpath",
4472 got_path_strip_trailing_slashes(repo_path);
4488 cwd = getcwd(NULL, 0);
4490 error = got_error_from_errno("getcwd");
4493 if (repo_path == NULL) {
4494 error = got_worktree_open(&worktree, cwd);
4495 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4501 strdup(got_worktree_get_repo_path(worktree));
4502 if (repo_path == NULL) {
4503 error = got_error_from_errno("strdup");
4508 repo_path = strdup(cwd);
4509 if (repo_path == NULL) {
4510 error = got_error_from_errno("strdup");
4516 error = got_repo_open(&repo, repo_path, NULL);
4521 const char *prefix = got_worktree_get_path_prefix(worktree);
4524 error = got_worktree_resolve_path(&p, worktree, path);
4527 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4528 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4530 error = got_error_from_errno("asprintf");
4535 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4537 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4540 error = got_repo_map_path(&in_repo_path, repo, path);
4545 if (commit_id_str == NULL) {
4546 struct got_reference *head_ref;
4547 error = got_ref_open(&head_ref, repo, worktree ?
4548 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4551 error = got_ref_resolve(&commit_id, repo, head_ref);
4552 got_ref_close(head_ref);
4556 error = got_repo_match_object_id(&commit_id, NULL,
4557 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4562 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4567 error = got_object_id_by_path(&obj_id, repo, commit_id,
4568 link_target ? link_target : in_repo_path);
4572 error = got_object_get_type(&obj_type, repo, obj_id);
4576 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4577 error = got_error_path(link_target ? link_target : in_repo_path,
4582 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4585 bca.f = got_opentemp();
4586 if (bca.f == NULL) {
4587 error = got_error_from_errno("got_opentemp");
4590 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4591 &bca.line_offsets, bca.f, blob);
4592 if (error || bca.nlines == 0)
4595 /* Don't include \n at EOF in the blame line count. */
4596 if (bca.line_offsets[bca.nlines - 1] == filesize)
4599 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4600 if (bca.lines == NULL) {
4601 error = got_error_from_errno("calloc");
4605 bca.nlines_prec = 0;
4613 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4614 repo, blame_cb, &bca, check_cancelled, NULL);
4623 got_object_blob_close(blob);
4625 got_worktree_close(worktree);
4627 const struct got_error *repo_error;
4628 repo_error = got_repo_close(repo);
4633 for (i = 0; i < bca.nlines; i++) {
4634 struct blame_line *bline = &bca.lines[i];
4635 free(bline->id_str);
4636 free(bline->committer);
4640 free(bca.line_offsets);
4641 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4642 error = got_error_from_errno("fclose");
4650 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4655 static const struct got_error *
4656 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4657 const char *root_path, struct got_repository *repo)
4659 const struct got_error *err = NULL;
4660 int is_root_path = (strcmp(path, root_path) == 0);
4661 const char *modestr = "";
4662 mode_t mode = got_tree_entry_get_mode(te);
4663 char *link_target = NULL;
4665 path += strlen(root_path);
4666 while (path[0] == '/')
4669 if (got_object_tree_entry_is_submodule(te))
4671 else if (S_ISLNK(mode)) {
4674 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4677 for (i = 0; i < strlen(link_target); i++) {
4678 if (!isprint((unsigned char)link_target[i]))
4679 link_target[i] = '?';
4684 else if (S_ISDIR(mode))
4686 else if (mode & S_IXUSR)
4689 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4690 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4691 link_target ? " -> ": "", link_target ? link_target : "");
4697 static const struct got_error *
4698 print_tree(const char *path, struct got_object_id *commit_id,
4699 int show_ids, int recurse, const char *root_path,
4700 struct got_repository *repo)
4702 const struct got_error *err = NULL;
4703 struct got_object_id *tree_id = NULL;
4704 struct got_tree_object *tree = NULL;
4707 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4711 err = got_object_open_as_tree(&tree, repo, tree_id);
4714 nentries = got_object_tree_get_nentries(tree);
4715 for (i = 0; i < nentries; i++) {
4716 struct got_tree_entry *te;
4719 if (sigint_received || sigpipe_received)
4722 te = got_object_tree_get_entry(tree, i);
4725 err = got_object_id_str(&id_str,
4726 got_tree_entry_get_id(te));
4729 if (asprintf(&id, "%s ", id_str) == -1) {
4730 err = got_error_from_errno("asprintf");
4736 err = print_entry(te, id, path, root_path, repo);
4741 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4743 if (asprintf(&child_path, "%s%s%s", path,
4744 path[0] == '/' && path[1] == '\0' ? "" : "/",
4745 got_tree_entry_get_name(te)) == -1) {
4746 err = got_error_from_errno("asprintf");
4749 err = print_tree(child_path, commit_id, show_ids, 1,
4758 got_object_tree_close(tree);
4763 static const struct got_error *
4764 cmd_tree(int argc, char *argv[])
4766 const struct got_error *error;
4767 struct got_repository *repo = NULL;
4768 struct got_worktree *worktree = NULL;
4769 const char *path, *refname = NULL;
4770 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4771 struct got_object_id *commit_id = NULL;
4772 char *commit_id_str = NULL;
4773 int show_ids = 0, recurse = 0;
4777 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4782 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4785 commit_id_str = optarg;
4788 repo_path = realpath(optarg, NULL);
4789 if (repo_path == NULL)
4790 return got_error_from_errno2("realpath",
4792 got_path_strip_trailing_slashes(repo_path);
4816 cwd = getcwd(NULL, 0);
4818 error = got_error_from_errno("getcwd");
4821 if (repo_path == NULL) {
4822 error = got_worktree_open(&worktree, cwd);
4823 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4829 strdup(got_worktree_get_repo_path(worktree));
4830 if (repo_path == NULL)
4831 error = got_error_from_errno("strdup");
4835 repo_path = strdup(cwd);
4836 if (repo_path == NULL) {
4837 error = got_error_from_errno("strdup");
4843 error = got_repo_open(&repo, repo_path, NULL);
4848 const char *prefix = got_worktree_get_path_prefix(worktree);
4853 error = got_worktree_resolve_path(&p, worktree, path);
4856 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4857 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4859 error = got_error_from_errno("asprintf");
4864 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4868 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4873 error = got_repo_map_path(&in_repo_path, repo, path);
4878 if (commit_id_str == NULL) {
4879 struct got_reference *head_ref;
4881 refname = got_worktree_get_head_ref_name(worktree);
4883 refname = GOT_REF_HEAD;
4884 error = got_ref_open(&head_ref, repo, refname, 0);
4887 error = got_ref_resolve(&commit_id, repo, head_ref);
4888 got_ref_close(head_ref);
4892 error = got_repo_match_object_id(&commit_id, NULL,
4893 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4898 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4899 in_repo_path, repo);
4906 got_worktree_close(worktree);
4908 const struct got_error *repo_error;
4909 repo_error = got_repo_close(repo);
4919 fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4924 static const struct got_error *
4925 print_status(void *arg, unsigned char status, unsigned char staged_status,
4926 const char *path, struct got_object_id *blob_id,
4927 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4928 int dirfd, const char *de_name)
4930 if (status == staged_status && (status == GOT_STATUS_DELETE))
4931 status = GOT_STATUS_NO_CHANGE;
4933 char *status_codes = arg;
4934 size_t ncodes = strlen(status_codes);
4936 for (i = 0; i < ncodes ; i++) {
4937 if (status == status_codes[i] ||
4938 staged_status == status_codes[i])
4944 printf("%c%c %s\n", status, staged_status, path);
4948 static const struct got_error *
4949 cmd_status(int argc, char *argv[])
4951 const struct got_error *error = NULL;
4952 struct got_repository *repo = NULL;
4953 struct got_worktree *worktree = NULL;
4954 char *cwd = NULL, *status_codes = NULL;;
4955 struct got_pathlist_head paths;
4956 struct got_pathlist_entry *pe;
4961 while ((ch = getopt(argc, argv, "s:")) != -1) {
4964 for (i = 0; i < strlen(optarg); i++) {
4965 switch (optarg[i]) {
4966 case GOT_STATUS_MODIFY:
4967 case GOT_STATUS_ADD:
4968 case GOT_STATUS_DELETE:
4969 case GOT_STATUS_CONFLICT:
4970 case GOT_STATUS_MISSING:
4971 case GOT_STATUS_OBSTRUCTED:
4972 case GOT_STATUS_UNVERSIONED:
4973 case GOT_STATUS_MODE_CHANGE:
4974 case GOT_STATUS_NONEXISTENT:
4977 errx(1, "invalid status code '%c'",
4981 status_codes = optarg;
4993 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4997 cwd = getcwd(NULL, 0);
4999 error = got_error_from_errno("getcwd");
5003 error = got_worktree_open(&worktree, cwd);
5005 if (error->code == GOT_ERR_NOT_WORKTREE)
5006 error = wrap_not_worktree_error(error, "status", cwd);
5010 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5015 error = apply_unveil(got_repo_get_path(repo), 1,
5016 got_worktree_get_root_path(worktree));
5020 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5024 error = got_worktree_status(worktree, &paths, repo, print_status,
5025 status_codes, check_cancelled, NULL);
5027 TAILQ_FOREACH(pe, &paths, entry)
5028 free((char *)pe->path);
5029 got_pathlist_free(&paths);
5038 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5044 static const struct got_error *
5045 list_refs(struct got_repository *repo, const char *refname)
5047 static const struct got_error *err = NULL;
5048 struct got_reflist_head refs;
5049 struct got_reflist_entry *re;
5051 SIMPLEQ_INIT(&refs);
5052 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5056 SIMPLEQ_FOREACH(re, &refs, entry) {
5058 refstr = got_ref_to_str(re->ref);
5060 return got_error_from_errno("got_ref_to_str");
5061 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5065 got_ref_list_free(&refs);
5069 static const struct got_error *
5070 delete_ref(struct got_repository *repo, const char *refname)
5072 const struct got_error *err = NULL;
5073 struct got_reference *ref;
5075 err = got_ref_open(&ref, repo, refname, 0);
5079 err = got_ref_delete(ref, repo);
5084 static const struct got_error *
5085 add_ref(struct got_repository *repo, const char *refname, const char *target)
5087 const struct got_error *err = NULL;
5088 struct got_object_id *id;
5089 struct got_reference *ref = NULL;
5092 * Don't let the user create a reference name with a leading '-'.
5093 * While technically a valid reference name, this case is usually
5094 * an unintended typo.
5096 if (refname[0] == '-')
5097 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5099 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5102 struct got_reference *target_ref;
5104 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5106 err = got_ref_open(&target_ref, repo, target, 0);
5109 err = got_ref_resolve(&id, repo, target_ref);
5110 got_ref_close(target_ref);
5115 err = got_ref_alloc(&ref, refname, id);
5119 err = got_ref_write(ref, repo);
5127 static const struct got_error *
5128 add_symref(struct got_repository *repo, const char *refname, const char *target)
5130 const struct got_error *err = NULL;
5131 struct got_reference *ref = NULL;
5132 struct got_reference *target_ref = NULL;
5135 * Don't let the user create a reference name with a leading '-'.
5136 * While technically a valid reference name, this case is usually
5137 * an unintended typo.
5139 if (refname[0] == '-')
5140 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5142 err = got_ref_open(&target_ref, repo, target, 0);
5146 err = got_ref_alloc_symref(&ref, refname, target_ref);
5150 err = got_ref_write(ref, repo);
5153 got_ref_close(target_ref);
5159 static const struct got_error *
5160 cmd_ref(int argc, char *argv[])
5162 const struct got_error *error = NULL;
5163 struct got_repository *repo = NULL;
5164 struct got_worktree *worktree = NULL;
5165 char *cwd = NULL, *repo_path = NULL;
5166 int ch, do_list = 0, do_delete = 0;
5167 const char *obj_arg = NULL, *symref_target= NULL;
5168 char *refname = NULL;
5170 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5179 repo_path = realpath(optarg, NULL);
5180 if (repo_path == NULL)
5181 return got_error_from_errno2("realpath",
5183 got_path_strip_trailing_slashes(repo_path);
5189 symref_target = optarg;
5197 if (obj_arg && do_list)
5198 errx(1, "-c and -l options are mutually exclusive");
5199 if (obj_arg && do_delete)
5200 errx(1, "-c and -d options are mutually exclusive");
5201 if (obj_arg && symref_target)
5202 errx(1, "-c and -s options are mutually exclusive");
5203 if (symref_target && do_delete)
5204 errx(1, "-s and -d options are mutually exclusive");
5205 if (symref_target && do_list)
5206 errx(1, "-s and -l options are mutually exclusive");
5207 if (do_delete && do_list)
5208 errx(1, "-d and -l options are mutually exclusive");
5214 if (argc != 0 && argc != 1)
5217 refname = strdup(argv[0]);
5218 if (refname == NULL) {
5219 error = got_error_from_errno("strdup");
5226 refname = strdup(argv[0]);
5227 if (refname == NULL) {
5228 error = got_error_from_errno("strdup");
5234 got_path_strip_trailing_slashes(refname);
5238 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5242 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5243 "sendfd unveil", NULL) == -1)
5247 cwd = getcwd(NULL, 0);
5249 error = got_error_from_errno("getcwd");
5253 if (repo_path == NULL) {
5254 error = got_worktree_open(&worktree, cwd);
5255 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5261 strdup(got_worktree_get_repo_path(worktree));
5262 if (repo_path == NULL)
5263 error = got_error_from_errno("strdup");
5267 repo_path = strdup(cwd);
5268 if (repo_path == NULL) {
5269 error = got_error_from_errno("strdup");
5275 error = got_repo_open(&repo, repo_path, NULL);
5279 error = apply_unveil(got_repo_get_path(repo), do_list,
5280 worktree ? got_worktree_get_root_path(worktree) : NULL);
5285 error = list_refs(repo, refname);
5287 error = delete_ref(repo, refname);
5288 else if (symref_target)
5289 error = add_symref(repo, refname, symref_target);
5291 if (obj_arg == NULL)
5293 error = add_ref(repo, refname, obj_arg);
5298 got_repo_close(repo);
5300 got_worktree_close(worktree);
5310 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5311 "[name]\n", getprogname());
5315 static const struct got_error *
5316 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5317 struct got_reference *ref)
5319 const struct got_error *err = NULL;
5320 const char *refname, *marker = " ";
5323 refname = got_ref_get_name(ref);
5324 if (worktree && strcmp(refname,
5325 got_worktree_get_head_ref_name(worktree)) == 0) {
5326 struct got_object_id *id = NULL;
5328 err = got_ref_resolve(&id, repo, ref);
5331 if (got_object_id_cmp(id,
5332 got_worktree_get_base_commit_id(worktree)) == 0)
5339 if (strncmp(refname, "refs/heads/", 11) == 0)
5341 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5344 refstr = got_ref_to_str(ref);
5346 return got_error_from_errno("got_ref_to_str");
5348 printf("%s%s: %s\n", marker, refname, refstr);
5353 static const struct got_error *
5354 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5356 const char *refname;
5358 if (worktree == NULL)
5359 return got_error(GOT_ERR_NOT_WORKTREE);
5361 refname = got_worktree_get_head_ref_name(worktree);
5363 if (strncmp(refname, "refs/heads/", 11) == 0)
5365 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5368 printf("%s\n", refname);
5373 static const struct got_error *
5374 list_branches(struct got_repository *repo, struct got_worktree *worktree)
5376 static const struct got_error *err = NULL;
5377 struct got_reflist_head refs;
5378 struct got_reflist_entry *re;
5379 struct got_reference *temp_ref = NULL;
5380 int rebase_in_progress, histedit_in_progress;
5382 SIMPLEQ_INIT(&refs);
5385 err = got_worktree_rebase_in_progress(&rebase_in_progress,
5390 err = got_worktree_histedit_in_progress(&histedit_in_progress,
5395 if (rebase_in_progress || histedit_in_progress) {
5396 err = got_ref_open(&temp_ref, repo,
5397 got_worktree_get_head_ref_name(worktree), 0);
5400 list_branch(repo, worktree, temp_ref);
5401 got_ref_close(temp_ref);
5405 err = got_ref_list(&refs, repo, "refs/heads",
5406 got_ref_cmp_by_name, NULL);
5410 SIMPLEQ_FOREACH(re, &refs, entry)
5411 list_branch(repo, worktree, re->ref);
5413 got_ref_list_free(&refs);
5417 static const struct got_error *
5418 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5419 const char *branch_name)
5421 const struct got_error *err = NULL;
5422 struct got_reference *ref = NULL;
5425 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5426 return got_error_from_errno("asprintf");
5428 err = got_ref_open(&ref, repo, refname, 0);
5433 strcmp(got_worktree_get_head_ref_name(worktree),
5434 got_ref_get_name(ref)) == 0) {
5435 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5436 "will not delete this work tree's current branch");
5440 err = got_ref_delete(ref, repo);
5448 static const struct got_error *
5449 add_branch(struct got_repository *repo, const char *branch_name,
5450 struct got_object_id *base_commit_id)
5452 const struct got_error *err = NULL;
5453 struct got_reference *ref = NULL;
5454 char *base_refname = NULL, *refname = NULL;
5457 * Don't let the user create a branch name with a leading '-'.
5458 * While technically a valid reference name, this case is usually
5459 * an unintended typo.
5461 if (branch_name[0] == '-')
5462 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5464 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5465 err = got_error_from_errno("asprintf");
5469 err = got_ref_open(&ref, repo, refname, 0);
5471 err = got_error(GOT_ERR_BRANCH_EXISTS);
5473 } else if (err->code != GOT_ERR_NOT_REF)
5476 err = got_ref_alloc(&ref, refname, base_commit_id);
5480 err = got_ref_write(ref, repo);
5489 static const struct got_error *
5490 cmd_branch(int argc, char *argv[])
5492 const struct got_error *error = NULL;
5493 struct got_repository *repo = NULL;
5494 struct got_worktree *worktree = NULL;
5495 char *cwd = NULL, *repo_path = NULL;
5496 int ch, do_list = 0, do_show = 0, do_update = 1;
5497 const char *delref = NULL, *commit_id_arg = NULL;
5498 struct got_reference *ref = NULL;
5499 struct got_pathlist_head paths;
5500 struct got_pathlist_entry *pe;
5501 struct got_object_id *commit_id = NULL;
5502 char *commit_id_str = NULL;
5506 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5509 commit_id_arg = optarg;
5515 repo_path = realpath(optarg, NULL);
5516 if (repo_path == NULL)
5517 return got_error_from_errno2("realpath",
5519 got_path_strip_trailing_slashes(repo_path);
5533 if (do_list && delref)
5534 errx(1, "-l and -d options are mutually exclusive");
5539 if (!do_list && !delref && argc == 0)
5542 if ((do_list || delref || do_show) && commit_id_arg != NULL)
5543 errx(1, "-c option can only be used when creating a branch");
5545 if (do_list || delref) {
5548 } else if (!do_show && argc != 1)
5552 if (do_list || do_show) {
5553 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5557 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5558 "sendfd unveil", NULL) == -1)
5562 cwd = getcwd(NULL, 0);
5564 error = got_error_from_errno("getcwd");
5568 if (repo_path == NULL) {
5569 error = got_worktree_open(&worktree, cwd);
5570 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5576 strdup(got_worktree_get_repo_path(worktree));
5577 if (repo_path == NULL)
5578 error = got_error_from_errno("strdup");
5582 repo_path = strdup(cwd);
5583 if (repo_path == NULL) {
5584 error = got_error_from_errno("strdup");
5590 error = got_repo_open(&repo, repo_path, NULL);
5594 error = apply_unveil(got_repo_get_path(repo), do_list,
5595 worktree ? got_worktree_get_root_path(worktree) : NULL);
5600 error = show_current_branch(repo, worktree);
5602 error = list_branches(repo, worktree);
5604 error = delete_branch(repo, worktree, delref);
5606 if (commit_id_arg == NULL)
5607 commit_id_arg = worktree ?
5608 got_worktree_get_head_ref_name(worktree) :
5610 error = got_repo_match_object_id(&commit_id, NULL,
5611 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5614 error = add_branch(repo, argv[0], commit_id);
5617 if (worktree && do_update) {
5618 struct got_update_progress_arg upa;
5619 char *branch_refname = NULL;
5621 error = got_object_id_str(&commit_id_str, commit_id);
5624 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5628 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5630 error = got_error_from_errno("asprintf");
5633 error = got_ref_open(&ref, repo, branch_refname, 0);
5634 free(branch_refname);
5637 error = switch_head_ref(ref, commit_id, worktree,
5641 error = got_worktree_set_base_commit_id(worktree, repo,
5645 memset(&upa, 0, sizeof(upa));
5646 error = got_worktree_checkout_files(worktree, &paths,
5647 repo, update_progress, &upa, check_cancelled,
5651 if (upa.did_something)
5652 printf("Updated to commit %s\n", commit_id_str);
5653 print_update_progress_stats(&upa);
5660 got_repo_close(repo);
5662 got_worktree_close(worktree);
5666 free(commit_id_str);
5667 TAILQ_FOREACH(pe, &paths, entry)
5668 free((char *)pe->path);
5669 got_pathlist_free(&paths);
5678 "usage: %s tag [-c commit] [-r repository] [-l] "
5679 "[-m message] name\n", getprogname());
5684 static const struct got_error *
5685 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5687 const struct got_error *err = NULL;
5688 struct got_reflist_entry *re, *se, *new;
5689 struct got_object_id *re_id, *se_id;
5690 struct got_tag_object *re_tag, *se_tag;
5691 time_t re_time, se_time;
5693 SIMPLEQ_FOREACH(re, tags, entry) {
5694 se = SIMPLEQ_FIRST(sorted);
5696 err = got_reflist_entry_dup(&new, re);
5699 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5702 err = got_ref_resolve(&re_id, repo, re->ref);
5705 err = got_object_open_as_tag(&re_tag, repo, re_id);
5709 re_time = got_object_tag_get_tagger_time(re_tag);
5710 got_object_tag_close(re_tag);
5714 err = got_ref_resolve(&se_id, repo, re->ref);
5717 err = got_object_open_as_tag(&se_tag, repo, se_id);
5721 se_time = got_object_tag_get_tagger_time(se_tag);
5722 got_object_tag_close(se_tag);
5724 if (se_time > re_time) {
5725 err = got_reflist_entry_dup(&new, re);
5728 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5731 se = SIMPLEQ_NEXT(se, entry);
5740 static const struct got_error *
5741 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5743 static const struct got_error *err = NULL;
5744 struct got_reflist_head refs;
5745 struct got_reflist_entry *re;
5747 SIMPLEQ_INIT(&refs);
5749 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5753 SIMPLEQ_FOREACH(re, &refs, entry) {
5754 const char *refname;
5755 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5759 struct got_object_id *id;
5760 struct got_tag_object *tag;
5761 struct got_commit_object *commit = NULL;
5763 refname = got_ref_get_name(re->ref);
5764 if (strncmp(refname, "refs/tags/", 10) != 0)
5767 refstr = got_ref_to_str(re->ref);
5768 if (refstr == NULL) {
5769 err = got_error_from_errno("got_ref_to_str");
5772 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5775 err = got_ref_resolve(&id, repo, re->ref);
5778 err = got_object_open_as_tag(&tag, repo, id);
5780 if (err->code != GOT_ERR_OBJ_TYPE) {
5784 /* "lightweight" tag */
5785 err = got_object_open_as_commit(&commit, repo, id);
5790 tagger = got_object_commit_get_committer(commit);
5792 got_object_commit_get_committer_time(commit);
5793 err = got_object_id_str(&id_str, id);
5799 tagger = got_object_tag_get_tagger(tag);
5800 tagger_time = got_object_tag_get_tagger_time(tag);
5801 err = got_object_id_str(&id_str,
5802 got_object_tag_get_object_id(tag));
5806 printf("from: %s\n", tagger);
5807 datestr = get_datestr(&tagger_time, datebuf);
5809 printf("date: %s UTC\n", datestr);
5811 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5813 switch (got_object_tag_get_object_type(tag)) {
5814 case GOT_OBJ_TYPE_BLOB:
5815 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5818 case GOT_OBJ_TYPE_TREE:
5819 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5822 case GOT_OBJ_TYPE_COMMIT:
5823 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5826 case GOT_OBJ_TYPE_TAG:
5827 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5836 err = got_object_commit_get_logmsg(&tagmsg0, commit);
5839 got_object_commit_close(commit);
5841 tagmsg0 = strdup(got_object_tag_get_message(tag));
5842 got_object_tag_close(tag);
5843 if (tagmsg0 == NULL) {
5844 err = got_error_from_errno("strdup");
5851 line = strsep(&tagmsg, "\n");
5853 printf(" %s\n", line);
5858 got_ref_list_free(&refs);
5862 static const struct got_error *
5863 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5864 const char *tag_name, const char *repo_path)
5866 const struct got_error *err = NULL;
5867 char *template = NULL, *initial_content = NULL;
5868 char *editor = NULL;
5869 int initial_content_len;
5872 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5873 err = got_error_from_errno("asprintf");
5877 initial_content_len = asprintf(&initial_content,
5878 "\n# tagging commit %s as %s\n",
5879 commit_id_str, tag_name);
5880 if (initial_content_len == -1) {
5881 err = got_error_from_errno("asprintf");
5885 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5889 if (write(fd, initial_content, initial_content_len) == -1) {
5890 err = got_error_from_errno2("write", *tagmsg_path);
5894 err = get_editor(&editor);
5897 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
5898 initial_content_len);
5900 free(initial_content);
5904 if (fd != -1 && close(fd) == -1 && err == NULL)
5905 err = got_error_from_errno2("close", *tagmsg_path);
5907 /* Editor is done; we can now apply unveil(2) */
5909 err = apply_unveil(repo_path, 0, NULL);
5917 static const struct got_error *
5918 add_tag(struct got_repository *repo, struct got_worktree *worktree,
5919 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5921 const struct got_error *err = NULL;
5922 struct got_object_id *commit_id = NULL, *tag_id = NULL;
5923 char *label = NULL, *commit_id_str = NULL;
5924 struct got_reference *ref = NULL;
5925 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5926 char *tagmsg_path = NULL, *tag_id_str = NULL;
5927 int preserve_tagmsg = 0;
5930 * Don't let the user create a tag name with a leading '-'.
5931 * While technically a valid reference name, this case is usually
5932 * an unintended typo.
5934 if (tag_name[0] == '-')
5935 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5937 err = get_author(&tagger, repo, worktree);
5941 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5942 GOT_OBJ_TYPE_COMMIT, 1, repo);
5946 err = got_object_id_str(&commit_id_str, commit_id);
5950 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5951 refname = strdup(tag_name);
5952 if (refname == NULL) {
5953 err = got_error_from_errno("strdup");
5957 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5958 err = got_error_from_errno("asprintf");
5962 err = got_ref_open(&ref, repo, refname, 0);
5964 err = got_error(GOT_ERR_TAG_EXISTS);
5966 } else if (err->code != GOT_ERR_NOT_REF)
5969 if (tagmsg_arg == NULL) {
5970 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5971 tag_name, got_repo_get_path(repo));
5973 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
5974 tagmsg_path != NULL)
5975 preserve_tagmsg = 1;
5980 err = got_object_tag_create(&tag_id, tag_name, commit_id,
5981 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
5984 preserve_tagmsg = 1;
5988 err = got_ref_alloc(&ref, refname, tag_id);
5991 preserve_tagmsg = 1;
5995 err = got_ref_write(ref, repo);
5998 preserve_tagmsg = 1;
6002 err = got_object_id_str(&tag_id_str, tag_id);
6005 preserve_tagmsg = 1;
6008 printf("Created tag %s\n", tag_id_str);
6010 if (preserve_tagmsg) {
6011 fprintf(stderr, "%s: tag message preserved in %s\n",
6012 getprogname(), tagmsg_path);
6013 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6014 err = got_error_from_errno2("unlink", tagmsg_path);
6019 free(commit_id_str);
6027 static const struct got_error *
6028 cmd_tag(int argc, char *argv[])
6030 const struct got_error *error = NULL;
6031 struct got_repository *repo = NULL;
6032 struct got_worktree *worktree = NULL;
6033 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6034 char *gitconfig_path = NULL;
6035 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6036 int ch, do_list = 0;
6038 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6041 commit_id_arg = optarg;
6047 repo_path = realpath(optarg, NULL);
6048 if (repo_path == NULL)
6049 return got_error_from_errno2("realpath",
6051 got_path_strip_trailing_slashes(repo_path);
6066 if (commit_id_arg != NULL)
6068 "-c option can only be used when creating a tag");
6070 errx(1, "-l and -m options are mutually exclusive");
6073 } else if (argc != 1)
6080 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6084 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6085 "sendfd unveil", NULL) == -1)
6089 cwd = getcwd(NULL, 0);
6091 error = got_error_from_errno("getcwd");
6095 if (repo_path == NULL) {
6096 error = got_worktree_open(&worktree, cwd);
6097 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6103 strdup(got_worktree_get_repo_path(worktree));
6104 if (repo_path == NULL)
6105 error = got_error_from_errno("strdup");
6109 repo_path = strdup(cwd);
6110 if (repo_path == NULL) {
6111 error = got_error_from_errno("strdup");
6118 error = got_repo_open(&repo, repo_path, NULL);
6121 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6124 error = list_tags(repo, worktree);
6126 error = get_gitconfig_path(&gitconfig_path);
6129 error = got_repo_open(&repo, repo_path, gitconfig_path);
6134 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6139 if (commit_id_arg == NULL) {
6140 struct got_reference *head_ref;
6141 struct got_object_id *commit_id;
6142 error = got_ref_open(&head_ref, repo,
6143 worktree ? got_worktree_get_head_ref_name(worktree)
6147 error = got_ref_resolve(&commit_id, repo, head_ref);
6148 got_ref_close(head_ref);
6151 error = got_object_id_str(&commit_id_str, commit_id);
6157 error = add_tag(repo, worktree, tag_name,
6158 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6162 got_repo_close(repo);
6164 got_worktree_close(worktree);
6167 free(gitconfig_path);
6168 free(commit_id_str);
6175 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6180 static const struct got_error *
6181 add_progress(void *arg, unsigned char status, const char *path)
6183 while (path[0] == '/')
6185 printf("%c %s\n", status, path);
6189 static const struct got_error *
6190 cmd_add(int argc, char *argv[])
6192 const struct got_error *error = NULL;
6193 struct got_repository *repo = NULL;
6194 struct got_worktree *worktree = NULL;
6196 struct got_pathlist_head paths;
6197 struct got_pathlist_entry *pe;
6198 int ch, can_recurse = 0, no_ignores = 0;
6202 while ((ch = getopt(argc, argv, "IR")) != -1) {
6220 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6227 cwd = getcwd(NULL, 0);
6229 error = got_error_from_errno("getcwd");
6233 error = got_worktree_open(&worktree, cwd);
6235 if (error->code == GOT_ERR_NOT_WORKTREE)
6236 error = wrap_not_worktree_error(error, "add", cwd);
6240 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6245 error = apply_unveil(got_repo_get_path(repo), 1,
6246 got_worktree_get_root_path(worktree));
6250 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6254 if (!can_recurse && no_ignores) {
6255 error = got_error_msg(GOT_ERR_BAD_PATH,
6256 "disregarding ignores requires -R option");
6264 TAILQ_FOREACH(pe, &paths, entry) {
6265 if (asprintf(&ondisk_path, "%s/%s",
6266 got_worktree_get_root_path(worktree),
6268 error = got_error_from_errno("asprintf");
6271 if (lstat(ondisk_path, &sb) == -1) {
6272 if (errno == ENOENT) {
6276 error = got_error_from_errno2("lstat",
6282 if (S_ISDIR(sb.st_mode)) {
6283 error = got_error_msg(GOT_ERR_BAD_PATH,
6284 "adding directories requires -R option");
6290 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6291 NULL, repo, no_ignores);
6294 got_repo_close(repo);
6296 got_worktree_close(worktree);
6297 TAILQ_FOREACH(pe, &paths, entry)
6298 free((char *)pe->path);
6299 got_pathlist_free(&paths);
6307 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6308 "path ...\n", getprogname());
6312 static const struct got_error *
6313 print_remove_status(void *arg, unsigned char status,
6314 unsigned char staged_status, const char *path)
6316 while (path[0] == '/')
6318 if (status == GOT_STATUS_NONEXISTENT)
6320 if (status == staged_status && (status == GOT_STATUS_DELETE))
6321 status = GOT_STATUS_NO_CHANGE;
6322 printf("%c%c %s\n", status, staged_status, path);
6326 static const struct got_error *
6327 cmd_remove(int argc, char *argv[])
6329 const struct got_error *error = NULL;
6330 struct got_worktree *worktree = NULL;
6331 struct got_repository *repo = NULL;
6332 const char *status_codes = NULL;
6334 struct got_pathlist_head paths;
6335 struct got_pathlist_entry *pe;
6336 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6340 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6343 delete_local_mods = 1;
6352 for (i = 0; i < strlen(optarg); i++) {
6353 switch (optarg[i]) {
6354 case GOT_STATUS_MODIFY:
6355 delete_local_mods = 1;
6357 case GOT_STATUS_MISSING:
6360 errx(1, "invalid status code '%c'",
6364 status_codes = optarg;
6376 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6383 cwd = getcwd(NULL, 0);
6385 error = got_error_from_errno("getcwd");
6388 error = got_worktree_open(&worktree, cwd);
6390 if (error->code == GOT_ERR_NOT_WORKTREE)
6391 error = wrap_not_worktree_error(error, "remove", cwd);
6395 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6400 error = apply_unveil(got_repo_get_path(repo), 1,
6401 got_worktree_get_root_path(worktree));
6405 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6412 TAILQ_FOREACH(pe, &paths, entry) {
6413 if (asprintf(&ondisk_path, "%s/%s",
6414 got_worktree_get_root_path(worktree),
6416 error = got_error_from_errno("asprintf");
6419 if (lstat(ondisk_path, &sb) == -1) {
6420 if (errno == ENOENT) {
6424 error = got_error_from_errno2("lstat",
6430 if (S_ISDIR(sb.st_mode)) {
6431 error = got_error_msg(GOT_ERR_BAD_PATH,
6432 "removing directories requires -R option");
6438 error = got_worktree_schedule_delete(worktree, &paths,
6439 delete_local_mods, status_codes, print_remove_status, NULL,
6440 repo, keep_on_disk);
6443 got_repo_close(repo);
6445 got_worktree_close(worktree);
6446 TAILQ_FOREACH(pe, &paths, entry)
6447 free((char *)pe->path);
6448 got_pathlist_free(&paths);
6456 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6457 "path ...\n", getprogname());
6461 static const struct got_error *
6462 revert_progress(void *arg, unsigned char status, const char *path)
6464 if (status == GOT_STATUS_UNVERSIONED)
6467 while (path[0] == '/')
6469 printf("%c %s\n", status, path);
6473 struct choose_patch_arg {
6474 FILE *patch_script_file;
6478 static const struct got_error *
6479 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6480 int nchanges, const char *action)
6483 size_t linesize = 0;
6487 case GOT_STATUS_ADD:
6488 printf("A %s\n%s this addition? [y/n] ", path, action);
6490 case GOT_STATUS_DELETE:
6491 printf("D %s\n%s this deletion? [y/n] ", path, action);
6493 case GOT_STATUS_MODIFY:
6494 if (fseek(patch_file, 0L, SEEK_SET) == -1)
6495 return got_error_from_errno("fseek");
6496 printf(GOT_COMMIT_SEP_STR);
6497 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6499 if (ferror(patch_file))
6500 return got_error_from_errno("getline");
6501 printf(GOT_COMMIT_SEP_STR);
6502 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6503 path, n, nchanges, action);
6506 return got_error_path(path, GOT_ERR_FILE_STATUS);
6512 static const struct got_error *
6513 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6514 FILE *patch_file, int n, int nchanges)
6516 const struct got_error *err = NULL;
6518 size_t linesize = 0;
6521 struct choose_patch_arg *a = arg;
6523 *choice = GOT_PATCH_CHOICE_NONE;
6525 if (a->patch_script_file) {
6527 err = show_change(status, path, patch_file, n, nchanges,
6531 linelen = getline(&line, &linesize, a->patch_script_file);
6532 if (linelen == -1) {
6533 if (ferror(a->patch_script_file))
6534 return got_error_from_errno("getline");
6537 nl = strchr(line, '\n');
6540 if (strcmp(line, "y") == 0) {
6541 *choice = GOT_PATCH_CHOICE_YES;
6543 } else if (strcmp(line, "n") == 0) {
6544 *choice = GOT_PATCH_CHOICE_NO;
6546 } else if (strcmp(line, "q") == 0 &&
6547 status == GOT_STATUS_MODIFY) {
6548 *choice = GOT_PATCH_CHOICE_QUIT;
6551 printf("invalid response '%s'\n", line);
6556 while (resp != 'y' && resp != 'n' && resp != 'q') {
6557 err = show_change(status, path, patch_file, n, nchanges,
6564 if (status == GOT_STATUS_MODIFY) {
6565 if (resp != 'y' && resp != 'n' && resp != 'q') {
6566 printf("invalid response '%c'\n", resp);
6569 } else if (resp != 'y' && resp != 'n') {
6570 printf("invalid response '%c'\n", resp);
6576 *choice = GOT_PATCH_CHOICE_YES;
6577 else if (resp == 'n')
6578 *choice = GOT_PATCH_CHOICE_NO;
6579 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6580 *choice = GOT_PATCH_CHOICE_QUIT;
6586 static const struct got_error *
6587 cmd_revert(int argc, char *argv[])
6589 const struct got_error *error = NULL;
6590 struct got_worktree *worktree = NULL;
6591 struct got_repository *repo = NULL;
6592 char *cwd = NULL, *path = NULL;
6593 struct got_pathlist_head paths;
6594 struct got_pathlist_entry *pe;
6595 int ch, can_recurse = 0, pflag = 0;
6596 FILE *patch_script_file = NULL;
6597 const char *patch_script_path = NULL;
6598 struct choose_patch_arg cpa;
6602 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6608 patch_script_path = optarg;
6623 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6624 "unveil", NULL) == -1)
6629 if (patch_script_path && !pflag)
6630 errx(1, "-F option can only be used together with -p option");
6632 cwd = getcwd(NULL, 0);
6634 error = got_error_from_errno("getcwd");
6637 error = got_worktree_open(&worktree, cwd);
6639 if (error->code == GOT_ERR_NOT_WORKTREE)
6640 error = wrap_not_worktree_error(error, "revert", cwd);
6644 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6649 if (patch_script_path) {
6650 patch_script_file = fopen(patch_script_path, "r");
6651 if (patch_script_file == NULL) {
6652 error = got_error_from_errno2("fopen",
6657 error = apply_unveil(got_repo_get_path(repo), 1,
6658 got_worktree_get_root_path(worktree));
6662 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6669 TAILQ_FOREACH(pe, &paths, entry) {
6670 if (asprintf(&ondisk_path, "%s/%s",
6671 got_worktree_get_root_path(worktree),
6673 error = got_error_from_errno("asprintf");
6676 if (lstat(ondisk_path, &sb) == -1) {
6677 if (errno == ENOENT) {
6681 error = got_error_from_errno2("lstat",
6687 if (S_ISDIR(sb.st_mode)) {
6688 error = got_error_msg(GOT_ERR_BAD_PATH,
6689 "reverting directories requires -R option");
6695 cpa.patch_script_file = patch_script_file;
6696 cpa.action = "revert";
6697 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6698 pflag ? choose_patch : NULL, &cpa, repo);
6700 if (patch_script_file && fclose(patch_script_file) == EOF &&
6702 error = got_error_from_errno2("fclose", patch_script_path);
6704 got_repo_close(repo);
6706 got_worktree_close(worktree);
6715 fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6720 struct collect_commit_logmsg_arg {
6721 const char *cmdline_log;
6723 const char *worktree_path;
6724 const char *branch_name;
6725 const char *repo_path;
6730 static const struct got_error *
6731 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6734 char *initial_content = NULL;
6735 struct got_pathlist_entry *pe;
6736 const struct got_error *err = NULL;
6737 char *template = NULL;
6738 struct collect_commit_logmsg_arg *a = arg;
6739 int initial_content_len;
6743 /* if a message was specified on the command line, just use it */
6744 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6745 len = strlen(a->cmdline_log) + 1;
6746 *logmsg = malloc(len + 1);
6747 if (*logmsg == NULL)
6748 return got_error_from_errno("malloc");
6749 strlcpy(*logmsg, a->cmdline_log, len);
6753 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6754 return got_error_from_errno("asprintf");
6756 initial_content_len = asprintf(&initial_content,
6757 "\n# changes to be committed on branch %s:\n",
6759 if (initial_content_len == -1)
6760 return got_error_from_errno("asprintf");
6762 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6766 if (write(fd, initial_content, initial_content_len) == -1) {
6767 err = got_error_from_errno2("write", a->logmsg_path);
6771 TAILQ_FOREACH(pe, commitable_paths, entry) {
6772 struct got_commitable *ct = pe->data;
6773 dprintf(fd, "# %c %s\n",
6774 got_commitable_get_status(ct),
6775 got_commitable_get_path(ct));
6778 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
6779 initial_content_len);
6781 free(initial_content);
6784 if (fd != -1 && close(fd) == -1 && err == NULL)
6785 err = got_error_from_errno2("close", a->logmsg_path);
6787 /* Editor is done; we can now apply unveil(2) */
6789 err = apply_unveil(a->repo_path, 0, a->worktree_path);
6797 static const struct got_error *
6798 cmd_commit(int argc, char *argv[])
6800 const struct got_error *error = NULL;
6801 struct got_worktree *worktree = NULL;
6802 struct got_repository *repo = NULL;
6803 char *cwd = NULL, *id_str = NULL;
6804 struct got_object_id *id = NULL;
6805 const char *logmsg = NULL;
6806 struct collect_commit_logmsg_arg cl_arg;
6807 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6808 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6809 int allow_bad_symlinks = 0;
6810 struct got_pathlist_head paths;
6813 cl_arg.logmsg_path = NULL;
6815 while ((ch = getopt(argc, argv, "m:S")) != -1) {
6821 allow_bad_symlinks = 1;
6833 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6834 "unveil", NULL) == -1)
6837 cwd = getcwd(NULL, 0);
6839 error = got_error_from_errno("getcwd");
6842 error = got_worktree_open(&worktree, cwd);
6844 if (error->code == GOT_ERR_NOT_WORKTREE)
6845 error = wrap_not_worktree_error(error, "commit", cwd);
6849 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6852 if (rebase_in_progress) {
6853 error = got_error(GOT_ERR_REBASING);
6857 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6862 error = get_gitconfig_path(&gitconfig_path);
6865 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6870 error = get_author(&author, repo, worktree);
6875 * unveil(2) traverses exec(2); if an editor is used we have
6876 * to apply unveil after the log message has been written.
6878 if (logmsg == NULL || strlen(logmsg) == 0)
6879 error = get_editor(&editor);
6881 error = apply_unveil(got_repo_get_path(repo), 0,
6882 got_worktree_get_root_path(worktree));
6886 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6890 cl_arg.editor = editor;
6891 cl_arg.cmdline_log = logmsg;
6892 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6893 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6894 if (!histedit_in_progress) {
6895 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6896 error = got_error(GOT_ERR_COMMIT_BRANCH);
6899 cl_arg.branch_name += 11;
6901 cl_arg.repo_path = got_repo_get_path(repo);
6902 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6903 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6904 print_status, NULL, repo);
6906 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6907 cl_arg.logmsg_path != NULL)
6908 preserve_logmsg = 1;
6912 error = got_object_id_str(&id_str, id);
6915 printf("Created commit %s\n", id_str);
6917 if (preserve_logmsg) {
6918 fprintf(stderr, "%s: log message preserved in %s\n",
6919 getprogname(), cl_arg.logmsg_path);
6920 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6922 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6923 free(cl_arg.logmsg_path);
6925 got_repo_close(repo);
6927 got_worktree_close(worktree);
6930 free(gitconfig_path);
6937 usage_cherrypick(void)
6939 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6943 static const struct got_error *
6944 cmd_cherrypick(int argc, char *argv[])
6946 const struct got_error *error = NULL;
6947 struct got_worktree *worktree = NULL;
6948 struct got_repository *repo = NULL;
6949 char *cwd = NULL, *commit_id_str = NULL;
6950 struct got_object_id *commit_id = NULL;
6951 struct got_commit_object *commit = NULL;
6952 struct got_object_qid *pid;
6953 struct got_reference *head_ref = NULL;
6955 struct got_update_progress_arg upa;
6957 while ((ch = getopt(argc, argv, "")) != -1) {
6969 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6970 "unveil", NULL) == -1)
6976 cwd = getcwd(NULL, 0);
6978 error = got_error_from_errno("getcwd");
6981 error = got_worktree_open(&worktree, cwd);
6983 if (error->code == GOT_ERR_NOT_WORKTREE)
6984 error = wrap_not_worktree_error(error, "cherrypick",
6989 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6994 error = apply_unveil(got_repo_get_path(repo), 0,
6995 got_worktree_get_root_path(worktree));
6999 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7000 GOT_OBJ_TYPE_COMMIT, repo);
7001 if (error != NULL) {
7002 struct got_reference *ref;
7003 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7005 error = got_ref_open(&ref, repo, argv[0], 0);
7008 error = got_ref_resolve(&commit_id, repo, ref);
7013 error = got_object_id_str(&commit_id_str, commit_id);
7017 error = got_ref_open(&head_ref, repo,
7018 got_worktree_get_head_ref_name(worktree), 0);
7022 error = check_same_branch(commit_id, head_ref, NULL, repo);
7024 if (error->code != GOT_ERR_ANCESTRY)
7028 error = got_error(GOT_ERR_SAME_BRANCH);
7032 error = got_object_open_as_commit(&commit, repo, commit_id);
7035 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7036 memset(&upa, 0, sizeof(upa));
7037 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7038 commit_id, repo, update_progress, &upa, check_cancelled,
7043 if (upa.did_something)
7044 printf("Merged commit %s\n", commit_id_str);
7045 print_update_progress_stats(&upa);
7048 got_object_commit_close(commit);
7049 free(commit_id_str);
7051 got_ref_close(head_ref);
7053 got_worktree_close(worktree);
7055 got_repo_close(repo);
7062 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7066 static const struct got_error *
7067 cmd_backout(int argc, char *argv[])
7069 const struct got_error *error = NULL;
7070 struct got_worktree *worktree = NULL;
7071 struct got_repository *repo = NULL;
7072 char *cwd = NULL, *commit_id_str = NULL;
7073 struct got_object_id *commit_id = NULL;
7074 struct got_commit_object *commit = NULL;
7075 struct got_object_qid *pid;
7076 struct got_reference *head_ref = NULL;
7078 struct got_update_progress_arg upa;
7080 while ((ch = getopt(argc, argv, "")) != -1) {
7092 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7093 "unveil", NULL) == -1)
7099 cwd = getcwd(NULL, 0);
7101 error = got_error_from_errno("getcwd");
7104 error = got_worktree_open(&worktree, cwd);
7106 if (error->code == GOT_ERR_NOT_WORKTREE)
7107 error = wrap_not_worktree_error(error, "backout", cwd);
7111 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7116 error = apply_unveil(got_repo_get_path(repo), 0,
7117 got_worktree_get_root_path(worktree));
7121 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7122 GOT_OBJ_TYPE_COMMIT, repo);
7123 if (error != NULL) {
7124 struct got_reference *ref;
7125 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7127 error = got_ref_open(&ref, repo, argv[0], 0);
7130 error = got_ref_resolve(&commit_id, repo, ref);
7135 error = got_object_id_str(&commit_id_str, commit_id);
7139 error = got_ref_open(&head_ref, repo,
7140 got_worktree_get_head_ref_name(worktree), 0);
7144 error = check_same_branch(commit_id, head_ref, NULL, repo);
7148 error = got_object_open_as_commit(&commit, repo, commit_id);
7151 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7153 error = got_error(GOT_ERR_ROOT_COMMIT);
7157 memset(&upa, 0, sizeof(upa));
7158 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7159 update_progress, &upa, check_cancelled, NULL);
7163 if (upa.did_something)
7164 printf("Backed out commit %s\n", commit_id_str);
7165 print_update_progress_stats(&upa);
7168 got_object_commit_close(commit);
7169 free(commit_id_str);
7171 got_ref_close(head_ref);
7173 got_worktree_close(worktree);
7175 got_repo_close(repo);
7182 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7188 trim_logmsg(char *logmsg, int limit)
7193 len = strlen(logmsg);
7197 nl = strchr(logmsg, '\n');
7202 static const struct got_error *
7203 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7205 const struct got_error *err;
7206 char *logmsg0 = NULL;
7209 err = got_object_commit_get_logmsg(&logmsg0, commit);
7214 while (isspace((unsigned char)s[0]))
7217 *logmsg = strdup(s);
7218 if (*logmsg == NULL) {
7219 err = got_error_from_errno("strdup");
7223 trim_logmsg(*logmsg, limit);
7229 static const struct got_error *
7230 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7232 const struct got_error *err;
7233 struct got_commit_object *commit = NULL;
7234 char *id_str = NULL, *logmsg = NULL;
7236 err = got_object_open_as_commit(&commit, repo, id);
7240 err = got_object_id_str(&id_str, id);
7246 err = get_short_logmsg(&logmsg, 42, commit);
7250 printf("%s -> merge conflict: %s\n", id_str, logmsg);
7253 got_object_commit_close(commit);
7258 static const struct got_error *
7259 show_rebase_progress(struct got_commit_object *commit,
7260 struct got_object_id *old_id, struct got_object_id *new_id)
7262 const struct got_error *err;
7263 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7265 err = got_object_id_str(&old_id_str, old_id);
7270 err = got_object_id_str(&new_id_str, new_id);
7275 old_id_str[12] = '\0';
7277 new_id_str[12] = '\0';
7279 err = get_short_logmsg(&logmsg, 42, commit);
7283 printf("%s -> %s: %s\n", old_id_str,
7284 new_id_str ? new_id_str : "no-op change", logmsg);
7292 static const struct got_error *
7293 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7294 struct got_reference *branch, struct got_reference *new_base_branch,
7295 struct got_reference *tmp_branch, struct got_repository *repo)
7297 printf("Switching work tree to %s\n", got_ref_get_name(branch));
7298 return got_worktree_rebase_complete(worktree, fileindex,
7299 new_base_branch, tmp_branch, branch, repo);
7302 static const struct got_error *
7303 rebase_commit(struct got_pathlist_head *merged_paths,
7304 struct got_worktree *worktree, struct got_fileindex *fileindex,
7305 struct got_reference *tmp_branch,
7306 struct got_object_id *commit_id, struct got_repository *repo)
7308 const struct got_error *error;
7309 struct got_commit_object *commit;
7310 struct got_object_id *new_commit_id;
7312 error = got_object_open_as_commit(&commit, repo, commit_id);
7316 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7317 worktree, fileindex, tmp_branch, commit, commit_id, repo);
7319 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7321 error = show_rebase_progress(commit, commit_id, NULL);
7323 error = show_rebase_progress(commit, commit_id, new_commit_id);
7324 free(new_commit_id);
7327 got_object_commit_close(commit);
7331 struct check_path_prefix_arg {
7332 const char *path_prefix;
7337 static const struct got_error *
7338 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7339 struct got_blob_object *blob2, struct got_object_id *id1,
7340 struct got_object_id *id2, const char *path1, const char *path2,
7341 mode_t mode1, mode_t mode2, struct got_repository *repo)
7343 struct check_path_prefix_arg *a = arg;
7345 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7346 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7347 return got_error(a->errcode);
7352 static const struct got_error *
7353 check_path_prefix(struct got_object_id *parent_id,
7354 struct got_object_id *commit_id, const char *path_prefix,
7355 int errcode, struct got_repository *repo)
7357 const struct got_error *err;
7358 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7359 struct got_commit_object *commit = NULL, *parent_commit = NULL;
7360 struct check_path_prefix_arg cpp_arg;
7362 if (got_path_is_root_dir(path_prefix))
7365 err = got_object_open_as_commit(&commit, repo, commit_id);
7369 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7373 err = got_object_open_as_tree(&tree1, repo,
7374 got_object_commit_get_tree_id(parent_commit));
7378 err = got_object_open_as_tree(&tree2, repo,
7379 got_object_commit_get_tree_id(commit));
7383 cpp_arg.path_prefix = path_prefix;
7384 while (cpp_arg.path_prefix[0] == '/')
7385 cpp_arg.path_prefix++;
7386 cpp_arg.len = strlen(cpp_arg.path_prefix);
7387 cpp_arg.errcode = errcode;
7388 err = got_diff_tree(tree1, tree2, "", "", repo,
7389 check_path_prefix_in_diff, &cpp_arg, 0);
7392 got_object_tree_close(tree1);
7394 got_object_tree_close(tree2);
7396 got_object_commit_close(commit);
7398 got_object_commit_close(parent_commit);
7402 static const struct got_error *
7403 collect_commits(struct got_object_id_queue *commits,
7404 struct got_object_id *initial_commit_id,
7405 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7406 const char *path_prefix, int path_prefix_errcode,
7407 struct got_repository *repo)
7409 const struct got_error *err = NULL;
7410 struct got_commit_graph *graph = NULL;
7411 struct got_object_id *parent_id = NULL;
7412 struct got_object_qid *qid;
7413 struct got_object_id *commit_id = initial_commit_id;
7415 err = got_commit_graph_open(&graph, "/", 1);
7419 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7420 check_cancelled, NULL);
7423 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7424 err = got_commit_graph_iter_next(&parent_id, graph, repo,
7425 check_cancelled, NULL);
7427 if (err->code == GOT_ERR_ITER_COMPLETED) {
7428 err = got_error_msg(GOT_ERR_ANCESTRY,
7429 "ran out of commits to rebase before "
7430 "youngest common ancestor commit has "
7435 err = check_path_prefix(parent_id, commit_id,
7436 path_prefix, path_prefix_errcode, repo);
7440 err = got_object_qid_alloc(&qid, commit_id);
7443 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7444 commit_id = parent_id;
7448 got_commit_graph_close(graph);
7452 static const struct got_error *
7453 cmd_rebase(int argc, char *argv[])
7455 const struct got_error *error = NULL;
7456 struct got_worktree *worktree = NULL;
7457 struct got_repository *repo = NULL;
7458 struct got_fileindex *fileindex = NULL;
7460 struct got_reference *branch = NULL;
7461 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7462 struct got_object_id *commit_id = NULL, *parent_id = NULL;
7463 struct got_object_id *resume_commit_id = NULL;
7464 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7465 struct got_commit_object *commit = NULL;
7466 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7467 int histedit_in_progress = 0;
7468 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7469 struct got_object_id_queue commits;
7470 struct got_pathlist_head merged_paths;
7471 const struct got_object_id_queue *parent_ids;
7472 struct got_object_qid *qid, *pid;
7474 SIMPLEQ_INIT(&commits);
7475 TAILQ_INIT(&merged_paths);
7477 while ((ch = getopt(argc, argv, "ac")) != -1) {
7483 continue_rebase = 1;
7495 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7496 "unveil", NULL) == -1)
7499 if (abort_rebase && continue_rebase)
7501 else if (abort_rebase || continue_rebase) {
7504 } else if (argc != 1)
7507 cwd = getcwd(NULL, 0);
7509 error = got_error_from_errno("getcwd");
7512 error = got_worktree_open(&worktree, cwd);
7514 if (error->code == GOT_ERR_NOT_WORKTREE)
7515 error = wrap_not_worktree_error(error, "rebase", cwd);
7519 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7524 error = apply_unveil(got_repo_get_path(repo), 0,
7525 got_worktree_get_root_path(worktree));
7529 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7533 if (histedit_in_progress) {
7534 error = got_error(GOT_ERR_HISTEDIT_BUSY);
7538 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7543 struct got_update_progress_arg upa;
7544 if (!rebase_in_progress) {
7545 error = got_error(GOT_ERR_NOT_REBASING);
7548 error = got_worktree_rebase_continue(&resume_commit_id,
7549 &new_base_branch, &tmp_branch, &branch, &fileindex,
7553 printf("Switching work tree to %s\n",
7554 got_ref_get_symref_target(new_base_branch));
7555 memset(&upa, 0, sizeof(upa));
7556 error = got_worktree_rebase_abort(worktree, fileindex, repo,
7557 new_base_branch, update_progress, &upa);
7560 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7561 print_update_progress_stats(&upa);
7562 goto done; /* nothing else to do */
7565 if (continue_rebase) {
7566 if (!rebase_in_progress) {
7567 error = got_error(GOT_ERR_NOT_REBASING);
7570 error = got_worktree_rebase_continue(&resume_commit_id,
7571 &new_base_branch, &tmp_branch, &branch, &fileindex,
7576 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7577 resume_commit_id, repo);
7581 yca_id = got_object_id_dup(resume_commit_id);
7582 if (yca_id == NULL) {
7583 error = got_error_from_errno("got_object_id_dup");
7587 error = got_ref_open(&branch, repo, argv[0], 0);
7592 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7596 if (!continue_rebase) {
7597 struct got_object_id *base_commit_id;
7599 base_commit_id = got_worktree_get_base_commit_id(worktree);
7600 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7601 base_commit_id, branch_head_commit_id, repo,
7602 check_cancelled, NULL);
7605 if (yca_id == NULL) {
7606 error = got_error_msg(GOT_ERR_ANCESTRY,
7607 "specified branch shares no common ancestry "
7608 "with work tree's branch");
7612 error = check_same_branch(base_commit_id, branch, yca_id, repo);
7614 if (error->code != GOT_ERR_ANCESTRY)
7618 error = got_error_msg(GOT_ERR_SAME_BRANCH,
7619 "specified branch resolves to a commit which "
7620 "is already contained in work tree's branch");
7623 error = got_worktree_rebase_prepare(&new_base_branch,
7624 &tmp_branch, &fileindex, worktree, branch, repo);
7629 commit_id = branch_head_commit_id;
7630 error = got_object_open_as_commit(&commit, repo, commit_id);
7634 parent_ids = got_object_commit_get_parent_ids(commit);
7635 pid = SIMPLEQ_FIRST(parent_ids);
7637 if (!continue_rebase) {
7638 struct got_update_progress_arg upa;
7639 memset(&upa, 0, sizeof(upa));
7640 error = got_worktree_rebase_abort(worktree, fileindex,
7641 repo, new_base_branch, update_progress, &upa);
7644 printf("Rebase of %s aborted\n",
7645 got_ref_get_name(branch));
7646 print_update_progress_stats(&upa);
7649 error = got_error(GOT_ERR_EMPTY_REBASE);
7652 error = collect_commits(&commits, commit_id, pid->id,
7653 yca_id, got_worktree_get_path_prefix(worktree),
7654 GOT_ERR_REBASE_PATH, repo);
7655 got_object_commit_close(commit);
7660 if (SIMPLEQ_EMPTY(&commits)) {
7661 if (continue_rebase) {
7662 error = rebase_complete(worktree, fileindex,
7663 branch, new_base_branch, tmp_branch, repo);
7666 /* Fast-forward the reference of the branch. */
7667 struct got_object_id *new_head_commit_id;
7669 error = got_ref_resolve(&new_head_commit_id, repo,
7673 error = got_object_id_str(&id_str, new_head_commit_id);
7674 printf("Forwarding %s to commit %s\n",
7675 got_ref_get_name(branch), id_str);
7677 error = got_ref_change_ref(branch,
7678 new_head_commit_id);
7685 SIMPLEQ_FOREACH(qid, &commits, entry) {
7686 struct got_update_progress_arg upa;
7688 commit_id = qid->id;
7689 parent_id = pid ? pid->id : yca_id;
7692 memset(&upa, 0, sizeof(upa));
7693 error = got_worktree_rebase_merge_files(&merged_paths,
7694 worktree, fileindex, parent_id, commit_id, repo,
7695 update_progress, &upa, check_cancelled, NULL);
7699 print_update_progress_stats(&upa);
7700 if (upa.conflicts > 0)
7701 rebase_status = GOT_STATUS_CONFLICT;
7703 if (rebase_status == GOT_STATUS_CONFLICT) {
7704 error = show_rebase_merge_conflict(qid->id, repo);
7707 got_worktree_rebase_pathlist_free(&merged_paths);
7711 error = rebase_commit(&merged_paths, worktree, fileindex,
7712 tmp_branch, commit_id, repo);
7713 got_worktree_rebase_pathlist_free(&merged_paths);
7718 if (rebase_status == GOT_STATUS_CONFLICT) {
7719 error = got_worktree_rebase_postpone(worktree, fileindex);
7722 error = got_error_msg(GOT_ERR_CONFLICTS,
7723 "conflicts must be resolved before rebasing can continue");
7725 error = rebase_complete(worktree, fileindex, branch,
7726 new_base_branch, tmp_branch, repo);
7728 got_object_id_queue_free(&commits);
7729 free(branch_head_commit_id);
7730 free(resume_commit_id);
7733 got_object_commit_close(commit);
7735 got_ref_close(branch);
7736 if (new_base_branch)
7737 got_ref_close(new_base_branch);
7739 got_ref_close(tmp_branch);
7741 got_worktree_close(worktree);
7743 got_repo_close(repo);
7748 usage_histedit(void)
7750 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7755 #define GOT_HISTEDIT_PICK 'p'
7756 #define GOT_HISTEDIT_EDIT 'e'
7757 #define GOT_HISTEDIT_FOLD 'f'
7758 #define GOT_HISTEDIT_DROP 'd'
7759 #define GOT_HISTEDIT_MESG 'm'
7761 static struct got_histedit_cmd {
7765 } got_histedit_cmds[] = {
7766 { GOT_HISTEDIT_PICK, "pick", "use commit" },
7767 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7768 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7770 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7771 { GOT_HISTEDIT_MESG, "mesg",
7772 "single-line log message for commit above (open editor if empty)" },
7775 struct got_histedit_list_entry {
7776 TAILQ_ENTRY(got_histedit_list_entry) entry;
7777 struct got_object_id *commit_id;
7778 const struct got_histedit_cmd *cmd;
7781 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7783 static const struct got_error *
7784 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7785 FILE *f, struct got_repository *repo)
7787 const struct got_error *err = NULL;
7788 char *logmsg = NULL, *id_str = NULL;
7789 struct got_commit_object *commit = NULL;
7792 err = got_object_open_as_commit(&commit, repo, commit_id);
7796 err = get_short_logmsg(&logmsg, 34, commit);
7800 err = got_object_id_str(&id_str, commit_id);
7804 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7806 err = got_ferror(f, GOT_ERR_IO);
7809 got_object_commit_close(commit);
7815 static const struct got_error *
7816 histedit_write_commit_list(struct got_object_id_queue *commits,
7817 FILE *f, int edit_logmsg_only, struct got_repository *repo)
7819 const struct got_error *err = NULL;
7820 struct got_object_qid *qid;
7822 if (SIMPLEQ_EMPTY(commits))
7823 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7825 SIMPLEQ_FOREACH(qid, commits, entry) {
7826 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7830 if (edit_logmsg_only) {
7831 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7833 err = got_ferror(f, GOT_ERR_IO);
7842 static const struct got_error *
7843 write_cmd_list(FILE *f, const char *branch_name,
7844 struct got_object_id_queue *commits)
7846 const struct got_error *err = NULL;
7849 struct got_object_qid *qid;
7851 qid = SIMPLEQ_FIRST(commits);
7852 err = got_object_id_str(&id_str, qid->id);
7857 "# Editing the history of branch '%s' starting at\n"
7859 "# Commits will be processed in order from top to "
7860 "bottom of this file.\n", branch_name, id_str);
7862 err = got_ferror(f, GOT_ERR_IO);
7866 n = fprintf(f, "# Available histedit commands:\n");
7868 err = got_ferror(f, GOT_ERR_IO);
7872 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7873 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7874 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7877 err = got_ferror(f, GOT_ERR_IO);
7886 static const struct got_error *
7887 histedit_syntax_error(int lineno)
7889 static char msg[42];
7892 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7894 if (ret == -1 || ret >= sizeof(msg))
7895 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7897 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7900 static const struct got_error *
7901 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7902 char *logmsg, struct got_repository *repo)
7904 const struct got_error *err;
7905 struct got_commit_object *folded_commit = NULL;
7906 char *id_str, *folded_logmsg = NULL;
7908 err = got_object_id_str(&id_str, hle->commit_id);
7912 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7916 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7919 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7920 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7921 folded_logmsg) == -1) {
7922 err = got_error_from_errno("asprintf");
7926 got_object_commit_close(folded_commit);
7928 free(folded_logmsg);
7932 static struct got_histedit_list_entry *
7933 get_folded_commits(struct got_histedit_list_entry *hle)
7935 struct got_histedit_list_entry *prev, *folded = NULL;
7937 prev = TAILQ_PREV(hle, got_histedit_list, entry);
7938 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7939 prev->cmd->code == GOT_HISTEDIT_DROP)) {
7940 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7942 prev = TAILQ_PREV(prev, got_histedit_list, entry);
7948 static const struct got_error *
7949 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7950 struct got_repository *repo)
7952 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7953 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7954 const struct got_error *err = NULL;
7955 struct got_commit_object *commit = NULL;
7958 struct got_histedit_list_entry *folded = NULL;
7960 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7964 folded = get_folded_commits(hle);
7966 while (folded != hle) {
7967 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7968 folded = TAILQ_NEXT(folded, entry);
7971 err = append_folded_commit_msg(&new_msg, folded,
7977 folded = TAILQ_NEXT(folded, entry);
7981 err = got_object_id_str(&id_str, hle->commit_id);
7984 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
7987 logmsg_len = asprintf(&new_msg,
7988 "%s\n# original log message of commit %s: %s",
7989 logmsg ? logmsg : "", id_str, orig_logmsg);
7990 if (logmsg_len == -1) {
7991 err = got_error_from_errno("asprintf");
7997 err = got_object_id_str(&id_str, hle->commit_id);
8001 err = got_opentemp_named_fd(&logmsg_path, &fd,
8002 GOT_TMPDIR_STR "/got-logmsg");
8006 write(fd, logmsg, logmsg_len);
8009 err = get_editor(&editor);
8013 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8016 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8018 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
8021 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8022 err = got_error_from_errno2("unlink", logmsg_path);
8028 got_object_commit_close(commit);
8032 static const struct got_error *
8033 histedit_parse_list(struct got_histedit_list *histedit_cmds,
8034 FILE *f, struct got_repository *repo)
8036 const struct got_error *err = NULL;
8037 char *line = NULL, *p, *end;
8041 const struct got_histedit_cmd *cmd;
8042 struct got_object_id *commit_id = NULL;
8043 struct got_histedit_list_entry *hle = NULL;
8046 len = getline(&line, &size, f);
8048 const struct got_error *getline_err;
8051 getline_err = got_error_from_errno("getline");
8052 err = got_ferror(f, getline_err->code);
8057 while (isspace((unsigned char)p[0]))
8059 if (p[0] == '#' || p[0] == '\0') {
8065 for (i = 0; i < nitems(got_histedit_cmds); i++) {
8066 cmd = &got_histedit_cmds[i];
8067 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8068 isspace((unsigned char)p[strlen(cmd->name)])) {
8069 p += strlen(cmd->name);
8072 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8077 if (i == nitems(got_histedit_cmds)) {
8078 err = histedit_syntax_error(lineno);
8081 while (isspace((unsigned char)p[0]))
8083 if (cmd->code == GOT_HISTEDIT_MESG) {
8084 if (hle == NULL || hle->logmsg != NULL) {
8085 err = got_error(GOT_ERR_HISTEDIT_CMD);
8089 err = histedit_edit_logmsg(hle, repo);
8093 hle->logmsg = strdup(p);
8094 if (hle->logmsg == NULL) {
8095 err = got_error_from_errno("strdup");
8104 while (end[0] && !isspace((unsigned char)end[0]))
8108 err = got_object_resolve_id_str(&commit_id, repo, p);
8110 /* override error code */
8111 err = histedit_syntax_error(lineno);
8115 hle = malloc(sizeof(*hle));
8117 err = got_error_from_errno("malloc");
8121 hle->commit_id = commit_id;
8126 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8134 static const struct got_error *
8135 histedit_check_script(struct got_histedit_list *histedit_cmds,
8136 struct got_object_id_queue *commits, struct got_repository *repo)
8138 const struct got_error *err = NULL;
8139 struct got_object_qid *qid;
8140 struct got_histedit_list_entry *hle;
8141 static char msg[92];
8144 if (TAILQ_EMPTY(histedit_cmds))
8145 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8146 "histedit script contains no commands");
8147 if (SIMPLEQ_EMPTY(commits))
8148 return got_error(GOT_ERR_EMPTY_HISTEDIT);
8150 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8151 struct got_histedit_list_entry *hle2;
8152 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8155 if (got_object_id_cmp(hle->commit_id,
8156 hle2->commit_id) != 0)
8158 err = got_object_id_str(&id_str, hle->commit_id);
8161 snprintf(msg, sizeof(msg), "commit %s is listed "
8162 "more than once in histedit script", id_str);
8164 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8168 SIMPLEQ_FOREACH(qid, commits, entry) {
8169 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8170 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8174 err = got_object_id_str(&id_str, qid->id);
8177 snprintf(msg, sizeof(msg),
8178 "commit %s missing from histedit script", id_str);
8180 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8184 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8185 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8186 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8187 "last commit in histedit script cannot be folded");
8192 static const struct got_error *
8193 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8194 const char *path, struct got_object_id_queue *commits,
8195 struct got_repository *repo)
8197 const struct got_error *err = NULL;
8201 err = get_editor(&editor);
8205 if (spawn_editor(editor, path) == -1) {
8206 err = got_error_from_errno("failed spawning editor");
8210 f = fopen(path, "r");
8212 err = got_error_from_errno("fopen");
8215 err = histedit_parse_list(histedit_cmds, f, repo);
8219 err = histedit_check_script(histedit_cmds, commits, repo);
8221 if (f && fclose(f) != 0 && err == NULL)
8222 err = got_error_from_errno("fclose");
8227 static const struct got_error *
8228 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8229 struct got_object_id_queue *, const char *, const char *,
8230 struct got_repository *);
8232 static const struct got_error *
8233 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8234 struct got_object_id_queue *commits, const char *branch_name,
8235 int edit_logmsg_only, struct got_repository *repo)
8237 const struct got_error *err;
8241 err = got_opentemp_named(&path, &f, "got-histedit");
8245 err = write_cmd_list(f, branch_name, commits);
8249 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
8253 if (edit_logmsg_only) {
8255 err = histedit_parse_list(histedit_cmds, f, repo);
8257 if (fclose(f) != 0) {
8258 err = got_error_from_errno("fclose");
8262 err = histedit_run_editor(histedit_cmds, path, commits, repo);
8264 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8265 err->code != GOT_ERR_HISTEDIT_CMD)
8267 err = histedit_edit_list_retry(histedit_cmds, err,
8268 commits, path, branch_name, repo);
8272 if (f && fclose(f) != 0 && err == NULL)
8273 err = got_error_from_errno("fclose");
8274 if (path && unlink(path) != 0 && err == NULL)
8275 err = got_error_from_errno2("unlink", path);
8280 static const struct got_error *
8281 histedit_save_list(struct got_histedit_list *histedit_cmds,
8282 struct got_worktree *worktree, struct got_repository *repo)
8284 const struct got_error *err = NULL;
8287 struct got_histedit_list_entry *hle;
8288 struct got_commit_object *commit = NULL;
8290 err = got_worktree_get_histedit_script_path(&path, worktree);
8294 f = fopen(path, "w");
8296 err = got_error_from_errno2("fopen", path);
8299 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8300 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8306 int n = fprintf(f, "%c %s\n",
8307 GOT_HISTEDIT_MESG, hle->logmsg);
8309 err = got_ferror(f, GOT_ERR_IO);
8315 if (f && fclose(f) != 0 && err == NULL)
8316 err = got_error_from_errno("fclose");
8319 got_object_commit_close(commit);
8324 histedit_free_list(struct got_histedit_list *histedit_cmds)
8326 struct got_histedit_list_entry *hle;
8328 while ((hle = TAILQ_FIRST(histedit_cmds))) {
8329 TAILQ_REMOVE(histedit_cmds, hle, entry);
8334 static const struct got_error *
8335 histedit_load_list(struct got_histedit_list *histedit_cmds,
8336 const char *path, struct got_repository *repo)
8338 const struct got_error *err = NULL;
8341 f = fopen(path, "r");
8343 err = got_error_from_errno2("fopen", path);
8347 err = histedit_parse_list(histedit_cmds, f, repo);
8349 if (f && fclose(f) != 0 && err == NULL)
8350 err = got_error_from_errno("fclose");
8354 static const struct got_error *
8355 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8356 const struct got_error *edit_err, struct got_object_id_queue *commits,
8357 const char *path, const char *branch_name, struct got_repository *repo)
8359 const struct got_error *err = NULL, *prev_err = edit_err;
8362 while (resp != 'c' && resp != 'r' && resp != 'a') {
8363 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8364 "or (a)bort: ", getprogname(), prev_err->msg);
8369 histedit_free_list(histedit_cmds);
8370 err = histedit_run_editor(histedit_cmds, path, commits,
8373 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8374 err->code != GOT_ERR_HISTEDIT_CMD)
8381 } else if (resp == 'r') {
8382 histedit_free_list(histedit_cmds);
8383 err = histedit_edit_script(histedit_cmds,
8384 commits, branch_name, 0, repo);
8386 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8387 err->code != GOT_ERR_HISTEDIT_CMD)
8394 } else if (resp == 'a') {
8395 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8398 printf("invalid response '%c'\n", resp);
8404 static const struct got_error *
8405 histedit_complete(struct got_worktree *worktree,
8406 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8407 struct got_reference *branch, struct got_repository *repo)
8409 printf("Switching work tree to %s\n",
8410 got_ref_get_symref_target(branch));
8411 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8415 static const struct got_error *
8416 show_histedit_progress(struct got_commit_object *commit,
8417 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8419 const struct got_error *err;
8420 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8422 err = got_object_id_str(&old_id_str, hle->commit_id);
8427 err = got_object_id_str(&new_id_str, new_id);
8432 old_id_str[12] = '\0';
8434 new_id_str[12] = '\0';
8437 logmsg = strdup(hle->logmsg);
8438 if (logmsg == NULL) {
8439 err = got_error_from_errno("strdup");
8442 trim_logmsg(logmsg, 42);
8444 err = get_short_logmsg(&logmsg, 42, commit);
8449 switch (hle->cmd->code) {
8450 case GOT_HISTEDIT_PICK:
8451 case GOT_HISTEDIT_EDIT:
8452 printf("%s -> %s: %s\n", old_id_str,
8453 new_id_str ? new_id_str : "no-op change", logmsg);
8455 case GOT_HISTEDIT_DROP:
8456 case GOT_HISTEDIT_FOLD:
8457 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8469 static const struct got_error *
8470 histedit_commit(struct got_pathlist_head *merged_paths,
8471 struct got_worktree *worktree, struct got_fileindex *fileindex,
8472 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8473 struct got_repository *repo)
8475 const struct got_error *err;
8476 struct got_commit_object *commit;
8477 struct got_object_id *new_commit_id;
8479 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8480 && hle->logmsg == NULL) {
8481 err = histedit_edit_logmsg(hle, repo);
8486 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8490 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8491 worktree, fileindex, tmp_branch, commit, hle->commit_id,
8494 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8496 err = show_histedit_progress(commit, hle, NULL);
8498 err = show_histedit_progress(commit, hle, new_commit_id);
8499 free(new_commit_id);
8502 got_object_commit_close(commit);
8506 static const struct got_error *
8507 histedit_skip_commit(struct got_histedit_list_entry *hle,
8508 struct got_worktree *worktree, struct got_repository *repo)
8510 const struct got_error *error;
8511 struct got_commit_object *commit;
8513 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8518 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8522 error = show_histedit_progress(commit, hle, NULL);
8523 got_object_commit_close(commit);
8527 static const struct got_error *
8528 check_local_changes(void *arg, unsigned char status,
8529 unsigned char staged_status, const char *path,
8530 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8531 struct got_object_id *commit_id, int dirfd, const char *de_name)
8533 int *have_local_changes = arg;
8536 case GOT_STATUS_ADD:
8537 case GOT_STATUS_DELETE:
8538 case GOT_STATUS_MODIFY:
8539 case GOT_STATUS_CONFLICT:
8540 *have_local_changes = 1;
8541 return got_error(GOT_ERR_CANCELLED);
8546 switch (staged_status) {
8547 case GOT_STATUS_ADD:
8548 case GOT_STATUS_DELETE:
8549 case GOT_STATUS_MODIFY:
8550 *have_local_changes = 1;
8551 return got_error(GOT_ERR_CANCELLED);
8559 static const struct got_error *
8560 cmd_histedit(int argc, char *argv[])
8562 const struct got_error *error = NULL;
8563 struct got_worktree *worktree = NULL;
8564 struct got_fileindex *fileindex = NULL;
8565 struct got_repository *repo = NULL;
8567 struct got_reference *branch = NULL;
8568 struct got_reference *tmp_branch = NULL;
8569 struct got_object_id *resume_commit_id = NULL;
8570 struct got_object_id *base_commit_id = NULL;
8571 struct got_object_id *head_commit_id = NULL;
8572 struct got_commit_object *commit = NULL;
8573 int ch, rebase_in_progress = 0;
8574 struct got_update_progress_arg upa;
8575 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8576 int edit_logmsg_only = 0;
8577 const char *edit_script_path = NULL;
8578 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8579 struct got_object_id_queue commits;
8580 struct got_pathlist_head merged_paths;
8581 const struct got_object_id_queue *parent_ids;
8582 struct got_object_qid *pid;
8583 struct got_histedit_list histedit_cmds;
8584 struct got_histedit_list_entry *hle;
8586 SIMPLEQ_INIT(&commits);
8587 TAILQ_INIT(&histedit_cmds);
8588 TAILQ_INIT(&merged_paths);
8589 memset(&upa, 0, sizeof(upa));
8591 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8600 edit_script_path = optarg;
8603 edit_logmsg_only = 1;
8615 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8616 "unveil", NULL) == -1)
8619 if (abort_edit && continue_edit)
8620 errx(1, "histedit's -a and -c options are mutually exclusive");
8621 if (edit_script_path && edit_logmsg_only)
8622 errx(1, "histedit's -F and -m options are mutually exclusive");
8623 if (abort_edit && edit_logmsg_only)
8624 errx(1, "histedit's -a and -m options are mutually exclusive");
8625 if (continue_edit && edit_logmsg_only)
8626 errx(1, "histedit's -c and -m options are mutually exclusive");
8631 * This command cannot apply unveil(2) in all cases because the
8632 * user may choose to run an editor to edit the histedit script
8633 * and to edit individual commit log messages.
8634 * unveil(2) traverses exec(2); if an editor is used we have to
8635 * apply unveil after edit script and log messages have been written.
8636 * XXX TODO: Make use of unveil(2) where possible.
8639 cwd = getcwd(NULL, 0);
8641 error = got_error_from_errno("getcwd");
8644 error = got_worktree_open(&worktree, cwd);
8646 if (error->code == GOT_ERR_NOT_WORKTREE)
8647 error = wrap_not_worktree_error(error, "histedit", cwd);
8651 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8656 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8659 if (rebase_in_progress) {
8660 error = got_error(GOT_ERR_REBASING);
8664 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8668 if (edit_in_progress && edit_logmsg_only) {
8669 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8670 "histedit operation is in progress in this "
8671 "work tree and must be continued or aborted "
8672 "before the -m option can be used");
8676 if (edit_in_progress && abort_edit) {
8677 error = got_worktree_histedit_continue(&resume_commit_id,
8678 &tmp_branch, &branch, &base_commit_id, &fileindex,
8682 printf("Switching work tree to %s\n",
8683 got_ref_get_symref_target(branch));
8684 error = got_worktree_histedit_abort(worktree, fileindex, repo,
8685 branch, base_commit_id, update_progress, &upa);
8688 printf("Histedit of %s aborted\n",
8689 got_ref_get_symref_target(branch));
8690 print_update_progress_stats(&upa);
8691 goto done; /* nothing else to do */
8692 } else if (abort_edit) {
8693 error = got_error(GOT_ERR_NOT_HISTEDIT);
8697 if (continue_edit) {
8700 if (!edit_in_progress) {
8701 error = got_error(GOT_ERR_NOT_HISTEDIT);
8705 error = got_worktree_get_histedit_script_path(&path, worktree);
8709 error = histedit_load_list(&histedit_cmds, path, repo);
8714 error = got_worktree_histedit_continue(&resume_commit_id,
8715 &tmp_branch, &branch, &base_commit_id, &fileindex,
8720 error = got_ref_resolve(&head_commit_id, repo, branch);
8724 error = got_object_open_as_commit(&commit, repo,
8728 parent_ids = got_object_commit_get_parent_ids(commit);
8729 pid = SIMPLEQ_FIRST(parent_ids);
8731 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8734 error = collect_commits(&commits, head_commit_id, pid->id,
8735 base_commit_id, got_worktree_get_path_prefix(worktree),
8736 GOT_ERR_HISTEDIT_PATH, repo);
8737 got_object_commit_close(commit);
8742 if (edit_in_progress) {
8743 error = got_error(GOT_ERR_HISTEDIT_BUSY);
8747 error = got_ref_open(&branch, repo,
8748 got_worktree_get_head_ref_name(worktree), 0);
8752 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8753 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8754 "will not edit commit history of a branch outside "
8755 "the \"refs/heads/\" reference namespace");
8759 error = got_ref_resolve(&head_commit_id, repo, branch);
8760 got_ref_close(branch);
8765 error = got_object_open_as_commit(&commit, repo,
8769 parent_ids = got_object_commit_get_parent_ids(commit);
8770 pid = SIMPLEQ_FIRST(parent_ids);
8772 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8775 error = collect_commits(&commits, head_commit_id, pid->id,
8776 got_worktree_get_base_commit_id(worktree),
8777 got_worktree_get_path_prefix(worktree),
8778 GOT_ERR_HISTEDIT_PATH, repo);
8779 got_object_commit_close(commit);
8784 if (SIMPLEQ_EMPTY(&commits)) {
8785 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8789 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8790 &base_commit_id, &fileindex, worktree, repo);
8794 if (edit_script_path) {
8795 error = histedit_load_list(&histedit_cmds,
8796 edit_script_path, repo);
8798 got_worktree_histedit_abort(worktree, fileindex,
8799 repo, branch, base_commit_id,
8800 update_progress, &upa);
8801 print_update_progress_stats(&upa);
8805 const char *branch_name;
8806 branch_name = got_ref_get_symref_target(branch);
8807 if (strncmp(branch_name, "refs/heads/", 11) == 0)
8809 error = histedit_edit_script(&histedit_cmds, &commits,
8810 branch_name, edit_logmsg_only, repo);
8812 got_worktree_histedit_abort(worktree, fileindex,
8813 repo, branch, base_commit_id,
8814 update_progress, &upa);
8815 print_update_progress_stats(&upa);
8821 error = histedit_save_list(&histedit_cmds, worktree,
8824 got_worktree_histedit_abort(worktree, fileindex,
8825 repo, branch, base_commit_id,
8826 update_progress, &upa);
8827 print_update_progress_stats(&upa);
8833 error = histedit_check_script(&histedit_cmds, &commits, repo);
8837 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8838 if (resume_commit_id) {
8839 if (got_object_id_cmp(hle->commit_id,
8840 resume_commit_id) != 0)
8843 resume_commit_id = NULL;
8844 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8845 hle->cmd->code == GOT_HISTEDIT_FOLD) {
8846 error = histedit_skip_commit(hle, worktree,
8851 struct got_pathlist_head paths;
8852 int have_changes = 0;
8855 error = got_pathlist_append(&paths, "", NULL);
8858 error = got_worktree_status(worktree, &paths,
8859 repo, check_local_changes, &have_changes,
8860 check_cancelled, NULL);
8861 got_pathlist_free(&paths);
8863 if (error->code != GOT_ERR_CANCELLED)
8865 if (sigint_received || sigpipe_received)
8869 error = histedit_commit(NULL, worktree,
8870 fileindex, tmp_branch, hle, repo);
8874 error = got_object_open_as_commit(
8875 &commit, repo, hle->commit_id);
8878 error = show_histedit_progress(commit,
8880 got_object_commit_close(commit);
8889 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8890 error = histedit_skip_commit(hle, worktree, repo);
8896 error = got_object_open_as_commit(&commit, repo,
8900 parent_ids = got_object_commit_get_parent_ids(commit);
8901 pid = SIMPLEQ_FIRST(parent_ids);
8903 error = got_worktree_histedit_merge_files(&merged_paths,
8904 worktree, fileindex, pid->id, hle->commit_id, repo,
8905 update_progress, &upa, check_cancelled, NULL);
8908 got_object_commit_close(commit);
8911 print_update_progress_stats(&upa);
8912 if (upa.conflicts > 0)
8913 rebase_status = GOT_STATUS_CONFLICT;
8915 if (rebase_status == GOT_STATUS_CONFLICT) {
8916 error = show_rebase_merge_conflict(hle->commit_id,
8920 got_worktree_rebase_pathlist_free(&merged_paths);
8924 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8926 error = got_object_id_str(&id_str, hle->commit_id);
8929 printf("Stopping histedit for amending commit %s\n",
8932 got_worktree_rebase_pathlist_free(&merged_paths);
8933 error = got_worktree_histedit_postpone(worktree,
8938 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8939 error = histedit_skip_commit(hle, worktree, repo);
8945 error = histedit_commit(&merged_paths, worktree, fileindex,
8946 tmp_branch, hle, repo);
8947 got_worktree_rebase_pathlist_free(&merged_paths);
8952 if (rebase_status == GOT_STATUS_CONFLICT) {
8953 error = got_worktree_histedit_postpone(worktree, fileindex);
8956 error = got_error_msg(GOT_ERR_CONFLICTS,
8957 "conflicts must be resolved before histedit can continue");
8959 error = histedit_complete(worktree, fileindex, tmp_branch,
8962 got_object_id_queue_free(&commits);
8963 histedit_free_list(&histedit_cmds);
8964 free(head_commit_id);
8965 free(base_commit_id);
8966 free(resume_commit_id);
8968 got_object_commit_close(commit);
8970 got_ref_close(branch);
8972 got_ref_close(tmp_branch);
8974 got_worktree_close(worktree);
8976 got_repo_close(repo);
8981 usage_integrate(void)
8983 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
8987 static const struct got_error *
8988 cmd_integrate(int argc, char *argv[])
8990 const struct got_error *error = NULL;
8991 struct got_repository *repo = NULL;
8992 struct got_worktree *worktree = NULL;
8993 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
8994 const char *branch_arg = NULL;
8995 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
8996 struct got_fileindex *fileindex = NULL;
8997 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
8999 struct got_update_progress_arg upa;
9001 while ((ch = getopt(argc, argv, "")) != -1) {
9014 branch_arg = argv[0];
9016 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9017 "unveil", NULL) == -1)
9020 cwd = getcwd(NULL, 0);
9022 error = got_error_from_errno("getcwd");
9026 error = got_worktree_open(&worktree, cwd);
9028 if (error->code == GOT_ERR_NOT_WORKTREE)
9029 error = wrap_not_worktree_error(error, "integrate",
9034 error = check_rebase_or_histedit_in_progress(worktree);
9038 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9043 error = apply_unveil(got_repo_get_path(repo), 0,
9044 got_worktree_get_root_path(worktree));
9048 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9049 error = got_error_from_errno("asprintf");
9053 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9054 &base_branch_ref, worktree, refname, repo);
9058 refname = strdup(got_ref_get_name(branch_ref));
9059 if (refname == NULL) {
9060 error = got_error_from_errno("strdup");
9061 got_worktree_integrate_abort(worktree, fileindex, repo,
9062 branch_ref, base_branch_ref);
9065 base_refname = strdup(got_ref_get_name(base_branch_ref));
9066 if (base_refname == NULL) {
9067 error = got_error_from_errno("strdup");
9068 got_worktree_integrate_abort(worktree, fileindex, repo,
9069 branch_ref, base_branch_ref);
9073 error = got_ref_resolve(&commit_id, repo, branch_ref);
9077 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9081 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9082 error = got_error_msg(GOT_ERR_SAME_BRANCH,
9083 "specified branch has already been integrated");
9084 got_worktree_integrate_abort(worktree, fileindex, repo,
9085 branch_ref, base_branch_ref);
9089 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9091 if (error->code == GOT_ERR_ANCESTRY)
9092 error = got_error(GOT_ERR_REBASE_REQUIRED);
9093 got_worktree_integrate_abort(worktree, fileindex, repo,
9094 branch_ref, base_branch_ref);
9098 memset(&upa, 0, sizeof(upa));
9099 error = got_worktree_integrate_continue(worktree, fileindex, repo,
9100 branch_ref, base_branch_ref, update_progress, &upa,
9101 check_cancelled, NULL);
9105 printf("Integrated %s into %s\n", refname, base_refname);
9106 print_update_progress_stats(&upa);
9109 got_repo_close(repo);
9111 got_worktree_close(worktree);
9113 free(base_commit_id);
9123 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9124 "[-S] [file-path ...]\n",
9129 static const struct got_error *
9130 print_stage(void *arg, unsigned char status, unsigned char staged_status,
9131 const char *path, struct got_object_id *blob_id,
9132 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9133 int dirfd, const char *de_name)
9135 const struct got_error *err = NULL;
9136 char *id_str = NULL;
9138 if (staged_status != GOT_STATUS_ADD &&
9139 staged_status != GOT_STATUS_MODIFY &&
9140 staged_status != GOT_STATUS_DELETE)
9143 if (staged_status == GOT_STATUS_ADD ||
9144 staged_status == GOT_STATUS_MODIFY)
9145 err = got_object_id_str(&id_str, staged_blob_id);
9147 err = got_object_id_str(&id_str, blob_id);
9151 printf("%s %c %s\n", id_str, staged_status, path);
9156 static const struct got_error *
9157 cmd_stage(int argc, char *argv[])
9159 const struct got_error *error = NULL;
9160 struct got_repository *repo = NULL;
9161 struct got_worktree *worktree = NULL;
9163 struct got_pathlist_head paths;
9164 struct got_pathlist_entry *pe;
9165 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9166 FILE *patch_script_file = NULL;
9167 const char *patch_script_path = NULL;
9168 struct choose_patch_arg cpa;
9172 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9181 patch_script_path = optarg;
9184 allow_bad_symlinks = 1;
9196 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9197 "unveil", NULL) == -1)
9200 if (list_stage && (pflag || patch_script_path))
9201 errx(1, "-l option cannot be used with other options");
9202 if (patch_script_path && !pflag)
9203 errx(1, "-F option can only be used together with -p option");
9205 cwd = getcwd(NULL, 0);
9207 error = got_error_from_errno("getcwd");
9211 error = got_worktree_open(&worktree, cwd);
9213 if (error->code == GOT_ERR_NOT_WORKTREE)
9214 error = wrap_not_worktree_error(error, "stage", cwd);
9218 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9223 if (patch_script_path) {
9224 patch_script_file = fopen(patch_script_path, "r");
9225 if (patch_script_file == NULL) {
9226 error = got_error_from_errno2("fopen",
9231 error = apply_unveil(got_repo_get_path(repo), 0,
9232 got_worktree_get_root_path(worktree));
9236 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9241 error = got_worktree_status(worktree, &paths, repo,
9242 print_stage, NULL, check_cancelled, NULL);
9244 cpa.patch_script_file = patch_script_file;
9245 cpa.action = "stage";
9246 error = got_worktree_stage(worktree, &paths,
9247 pflag ? NULL : print_status, NULL,
9248 pflag ? choose_patch : NULL, &cpa,
9249 allow_bad_symlinks, repo);
9252 if (patch_script_file && fclose(patch_script_file) == EOF &&
9254 error = got_error_from_errno2("fclose", patch_script_path);
9256 got_repo_close(repo);
9258 got_worktree_close(worktree);
9259 TAILQ_FOREACH(pe, &paths, entry)
9260 free((char *)pe->path);
9261 got_pathlist_free(&paths);
9269 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9270 "[file-path ...]\n",
9276 static const struct got_error *
9277 cmd_unstage(int argc, char *argv[])
9279 const struct got_error *error = NULL;
9280 struct got_repository *repo = NULL;
9281 struct got_worktree *worktree = NULL;
9283 struct got_pathlist_head paths;
9284 struct got_pathlist_entry *pe;
9286 struct got_update_progress_arg upa;
9287 FILE *patch_script_file = NULL;
9288 const char *patch_script_path = NULL;
9289 struct choose_patch_arg cpa;
9293 while ((ch = getopt(argc, argv, "pF:")) != -1) {
9299 patch_script_path = optarg;
9311 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9312 "unveil", NULL) == -1)
9315 if (patch_script_path && !pflag)
9316 errx(1, "-F option can only be used together with -p option");
9318 cwd = getcwd(NULL, 0);
9320 error = got_error_from_errno("getcwd");
9324 error = got_worktree_open(&worktree, cwd);
9326 if (error->code == GOT_ERR_NOT_WORKTREE)
9327 error = wrap_not_worktree_error(error, "unstage", cwd);
9331 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9336 if (patch_script_path) {
9337 patch_script_file = fopen(patch_script_path, "r");
9338 if (patch_script_file == NULL) {
9339 error = got_error_from_errno2("fopen",
9345 error = apply_unveil(got_repo_get_path(repo), 0,
9346 got_worktree_get_root_path(worktree));
9350 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9354 cpa.patch_script_file = patch_script_file;
9355 cpa.action = "unstage";
9356 memset(&upa, 0, sizeof(upa));
9357 error = got_worktree_unstage(worktree, &paths, update_progress,
9358 &upa, pflag ? choose_patch : NULL, &cpa, repo);
9360 print_update_progress_stats(&upa);
9362 if (patch_script_file && fclose(patch_script_file) == EOF &&
9364 error = got_error_from_errno2("fclose", patch_script_path);
9366 got_repo_close(repo);
9368 got_worktree_close(worktree);
9369 TAILQ_FOREACH(pe, &paths, entry)
9370 free((char *)pe->path);
9371 got_pathlist_free(&paths);
9379 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9380 "arg1 [arg2 ...]\n", getprogname());
9384 static const struct got_error *
9385 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9387 const struct got_error *err;
9388 struct got_blob_object *blob;
9390 err = got_object_open_as_blob(&blob, repo, id, 8192);
9394 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9395 got_object_blob_close(blob);
9399 static const struct got_error *
9400 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9402 const struct got_error *err;
9403 struct got_tree_object *tree;
9406 err = got_object_open_as_tree(&tree, repo, id);
9410 nentries = got_object_tree_get_nentries(tree);
9411 for (i = 0; i < nentries; i++) {
9412 struct got_tree_entry *te;
9414 if (sigint_received || sigpipe_received)
9416 te = got_object_tree_get_entry(tree, i);
9417 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9420 fprintf(outfile, "%s %.7o %s\n", id_str,
9421 got_tree_entry_get_mode(te),
9422 got_tree_entry_get_name(te));
9426 got_object_tree_close(tree);
9430 static const struct got_error *
9431 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9433 const struct got_error *err;
9434 struct got_commit_object *commit;
9435 const struct got_object_id_queue *parent_ids;
9436 struct got_object_qid *pid;
9437 char *id_str = NULL;
9438 const char *logmsg = NULL;
9440 err = got_object_open_as_commit(&commit, repo, id);
9444 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9448 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9449 parent_ids = got_object_commit_get_parent_ids(commit);
9450 fprintf(outfile, "numparents %d\n",
9451 got_object_commit_get_nparents(commit));
9452 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9454 err = got_object_id_str(&pid_str, pid->id);
9457 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9460 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9461 got_object_commit_get_author(commit),
9462 (long long)got_object_commit_get_author_time(commit));
9464 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9465 got_object_commit_get_author(commit),
9466 (long long)got_object_commit_get_committer_time(commit));
9468 logmsg = got_object_commit_get_logmsg_raw(commit);
9469 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9470 fprintf(outfile, "%s", logmsg);
9473 got_object_commit_close(commit);
9477 static const struct got_error *
9478 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9480 const struct got_error *err;
9481 struct got_tag_object *tag;
9482 char *id_str = NULL;
9483 const char *tagmsg = NULL;
9485 err = got_object_open_as_tag(&tag, repo, id);
9489 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9493 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9495 switch (got_object_tag_get_object_type(tag)) {
9496 case GOT_OBJ_TYPE_BLOB:
9497 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9498 GOT_OBJ_LABEL_BLOB);
9500 case GOT_OBJ_TYPE_TREE:
9501 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9502 GOT_OBJ_LABEL_TREE);
9504 case GOT_OBJ_TYPE_COMMIT:
9505 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9506 GOT_OBJ_LABEL_COMMIT);
9508 case GOT_OBJ_TYPE_TAG:
9509 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9516 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9517 got_object_tag_get_name(tag));
9519 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9520 got_object_tag_get_tagger(tag),
9521 (long long)got_object_tag_get_tagger_time(tag));
9523 tagmsg = got_object_tag_get_message(tag);
9524 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9525 fprintf(outfile, "%s", tagmsg);
9528 got_object_tag_close(tag);
9532 static const struct got_error *
9533 cmd_cat(int argc, char *argv[])
9535 const struct got_error *error;
9536 struct got_repository *repo = NULL;
9537 struct got_worktree *worktree = NULL;
9538 char *cwd = NULL, *repo_path = NULL, *label = NULL;
9539 const char *commit_id_str = NULL;
9540 struct got_object_id *id = NULL, *commit_id = NULL;
9541 int ch, obj_type, i, force_path = 0;
9544 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9549 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9552 commit_id_str = optarg;
9555 repo_path = realpath(optarg, NULL);
9556 if (repo_path == NULL)
9557 return got_error_from_errno2("realpath",
9559 got_path_strip_trailing_slashes(repo_path);
9573 cwd = getcwd(NULL, 0);
9575 error = got_error_from_errno("getcwd");
9578 error = got_worktree_open(&worktree, cwd);
9579 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9582 if (repo_path == NULL) {
9584 got_worktree_get_repo_path(worktree));
9585 if (repo_path == NULL) {
9586 error = got_error_from_errno("strdup");
9592 if (repo_path == NULL) {
9593 repo_path = getcwd(NULL, 0);
9594 if (repo_path == NULL)
9595 return got_error_from_errno("getcwd");
9598 error = got_repo_open(&repo, repo_path, NULL);
9603 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9607 if (commit_id_str == NULL)
9608 commit_id_str = GOT_REF_HEAD;
9609 error = got_repo_match_object_id(&commit_id, NULL,
9610 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9614 for (i = 0; i < argc; i++) {
9616 error = got_object_id_by_path(&id, repo, commit_id,
9621 error = got_repo_match_object_id(&id, &label, argv[i],
9622 GOT_OBJ_TYPE_ANY, 0, repo);
9624 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9625 error->code != GOT_ERR_NOT_REF)
9627 error = got_object_id_by_path(&id, repo,
9628 commit_id, argv[i]);
9634 error = got_object_get_type(&obj_type, repo, id);
9639 case GOT_OBJ_TYPE_BLOB:
9640 error = cat_blob(id, repo, stdout);
9642 case GOT_OBJ_TYPE_TREE:
9643 error = cat_tree(id, repo, stdout);
9645 case GOT_OBJ_TYPE_COMMIT:
9646 error = cat_commit(id, repo, stdout);
9648 case GOT_OBJ_TYPE_TAG:
9649 error = cat_tag(id, repo, stdout);
9652 error = got_error(GOT_ERR_OBJ_TYPE);
9667 got_worktree_close(worktree);
9669 const struct got_error *repo_error;
9670 repo_error = got_repo_close(repo);
9680 fprintf(stderr, "usage: %s info [path ...]\n",
9685 static const struct got_error *
9686 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9687 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9688 struct got_object_id *commit_id)
9690 const struct got_error *err = NULL;
9691 char *id_str = NULL;
9693 struct tm mytm, *tm;
9694 struct got_pathlist_head *paths = arg;
9695 struct got_pathlist_entry *pe;
9698 * Clear error indication from any of the path arguments which
9699 * would cause this file index entry to be displayed.
9701 TAILQ_FOREACH(pe, paths, entry) {
9702 if (got_path_cmp(path, pe->path, strlen(path),
9703 pe->path_len) == 0 ||
9704 got_path_is_child(path, pe->path, pe->path_len))
9705 pe->data = NULL; /* no error */
9708 printf(GOT_COMMIT_SEP_STR);
9710 printf("symlink: %s\n", path);
9711 else if (S_ISREG(mode)) {
9712 printf("file: %s\n", path);
9713 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9714 } else if (S_ISDIR(mode))
9715 printf("directory: %s\n", path);
9717 printf("something: %s\n", path);
9719 tm = localtime_r(&mtime, &mytm);
9722 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9723 return got_error(GOT_ERR_NO_SPACE);
9724 printf("timestamp: %s\n", datebuf);
9727 err = got_object_id_str(&id_str, blob_id);
9730 printf("based on blob: %s\n", id_str);
9734 if (staged_blob_id) {
9735 err = got_object_id_str(&id_str, staged_blob_id);
9738 printf("based on staged blob: %s\n", id_str);
9743 err = got_object_id_str(&id_str, commit_id);
9746 printf("based on commit: %s\n", id_str);
9753 static const struct got_error *
9754 cmd_info(int argc, char *argv[])
9756 const struct got_error *error = NULL;
9757 struct got_worktree *worktree = NULL;
9758 char *cwd = NULL, *id_str = NULL;
9759 struct got_pathlist_head paths;
9760 struct got_pathlist_entry *pe;
9761 char *uuidstr = NULL;
9762 int ch, show_files = 0;
9766 while ((ch = getopt(argc, argv, "")) != -1) {
9778 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9782 cwd = getcwd(NULL, 0);
9784 error = got_error_from_errno("getcwd");
9788 error = got_worktree_open(&worktree, cwd);
9790 if (error->code == GOT_ERR_NOT_WORKTREE)
9791 error = wrap_not_worktree_error(error, "status", cwd);
9795 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9800 error = get_worktree_paths_from_argv(&paths, argc, argv,
9807 error = got_object_id_str(&id_str,
9808 got_worktree_get_base_commit_id(worktree));
9812 error = got_worktree_get_uuid(&uuidstr, worktree);
9816 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9817 printf("work tree base commit: %s\n", id_str);
9818 printf("work tree path prefix: %s\n",
9819 got_worktree_get_path_prefix(worktree));
9820 printf("work tree branch reference: %s\n",
9821 got_worktree_get_head_ref_name(worktree));
9822 printf("work tree UUID: %s\n", uuidstr);
9823 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9826 struct got_pathlist_entry *pe;
9827 TAILQ_FOREACH(pe, &paths, entry) {
9828 if (pe->path_len == 0)
9831 * Assume this path will fail. This will be corrected
9832 * in print_path_info() in case the path does suceeed.
9834 pe->data = (void *)got_error_path(pe->path,
9837 error = got_worktree_path_info(worktree, &paths,
9838 print_path_info, &paths, check_cancelled, NULL);
9841 TAILQ_FOREACH(pe, &paths, entry) {
9842 if (pe->data != NULL) {
9843 error = pe->data; /* bad path */
9849 TAILQ_FOREACH(pe, &paths, entry)
9850 free((char *)pe->path);
9851 got_pathlist_free(&paths);