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 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(blob1, blob2, path, path, diff_context,
3145 ignore_whitespace, 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 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.outfile = stdout;
3175 while (path[0] == '/')
3177 err = got_diff_tree(tree1, tree2, path, path, repo,
3178 got_diff_blob_output_unidiff, &arg, 1);
3181 got_object_tree_close(tree1);
3183 got_object_tree_close(tree2);
3187 static const struct got_error *
3188 get_changed_paths(struct got_pathlist_head *paths,
3189 struct got_commit_object *commit, struct got_repository *repo)
3191 const struct got_error *err = NULL;
3192 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3193 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3194 struct got_object_qid *qid;
3196 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3198 struct got_commit_object *pcommit;
3199 err = got_object_open_as_commit(&pcommit, repo,
3204 tree_id1 = got_object_commit_get_tree_id(pcommit);
3205 got_object_commit_close(pcommit);
3210 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3215 tree_id2 = got_object_commit_get_tree_id(commit);
3216 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3220 err = got_diff_tree(tree1, tree2, "", "", repo,
3221 got_diff_tree_collect_changed_paths, paths, 0);
3224 got_object_tree_close(tree1);
3226 got_object_tree_close(tree2);
3230 static const struct got_error *
3231 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3232 const char *path, int diff_context, struct got_repository *repo)
3234 const struct got_error *err = NULL;
3235 struct got_commit_object *pcommit = NULL;
3236 char *id_str1 = NULL, *id_str2 = NULL;
3237 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3238 struct got_object_qid *qid;
3240 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3242 err = got_object_open_as_commit(&pcommit, repo,
3248 if (path && path[0] != '\0') {
3250 err = got_object_id_by_path(&obj_id2, repo, id, path);
3253 err = got_object_id_str(&id_str2, obj_id2);
3259 err = got_object_id_by_path(&obj_id1, repo,
3262 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3267 err = got_object_id_str(&id_str1, obj_id1);
3274 err = got_object_get_type(&obj_type, repo, obj_id2);
3279 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3281 case GOT_OBJ_TYPE_BLOB:
3282 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3285 case GOT_OBJ_TYPE_TREE:
3286 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3290 err = got_error(GOT_ERR_OBJ_TYPE);
3296 obj_id2 = got_object_commit_get_tree_id(commit);
3297 err = got_object_id_str(&id_str2, obj_id2);
3301 obj_id1 = got_object_commit_get_tree_id(pcommit);
3302 err = got_object_id_str(&id_str1, obj_id1);
3306 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3307 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, repo);
3313 got_object_commit_close(pcommit);
3318 get_datestr(time_t *time, char *datebuf)
3320 struct tm mytm, *tm;
3323 tm = gmtime_r(time, &mytm);
3326 s = asctime_r(tm, datebuf);
3329 p = strchr(s, '\n');
3335 static const struct got_error *
3336 match_logmsg(int *have_match, struct got_object_id *id,
3337 struct got_commit_object *commit, regex_t *regex)
3339 const struct got_error *err = NULL;
3340 regmatch_t regmatch;
3341 char *id_str = NULL, *logmsg = NULL;
3345 err = got_object_id_str(&id_str, id);
3349 err = got_object_commit_get_logmsg(&logmsg, commit);
3353 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3362 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3365 regmatch_t regmatch;
3366 struct got_pathlist_entry *pe;
3370 TAILQ_FOREACH(pe, changed_paths, entry) {
3371 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3378 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3380 static const struct got_error *
3381 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3382 struct got_repository *repo, const char *path,
3383 struct got_pathlist_head *changed_paths, int show_patch,
3384 int diff_context, struct got_reflist_head *refs)
3386 const struct got_error *err = NULL;
3387 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3389 time_t committer_time;
3390 const char *author, *committer;
3391 char *refs_str = NULL;
3392 struct got_reflist_entry *re;
3394 SIMPLEQ_FOREACH(re, refs, entry) {
3397 struct got_tag_object *tag = NULL;
3398 struct got_object_id *ref_id;
3401 name = got_ref_get_name(re->ref);
3402 if (strcmp(name, GOT_REF_HEAD) == 0)
3404 if (strncmp(name, "refs/", 5) == 0)
3406 if (strncmp(name, "got/", 4) == 0)
3408 if (strncmp(name, "heads/", 6) == 0)
3410 if (strncmp(name, "remotes/", 8) == 0) {
3412 s = strstr(name, "/" GOT_REF_HEAD);
3413 if (s != NULL && s[strlen(s)] == '\0')
3416 err = got_ref_resolve(&ref_id, repo, re->ref);
3419 if (strncmp(name, "tags/", 5) == 0) {
3420 err = got_object_open_as_tag(&tag, repo, ref_id);
3422 if (err->code != GOT_ERR_OBJ_TYPE) {
3426 /* Ref points at something other than a tag. */
3431 cmp = got_object_id_cmp(tag ?
3432 got_object_tag_get_object_id(tag) : ref_id, id);
3435 got_object_tag_close(tag);
3439 if (asprintf(&refs_str, "%s%s%s", s ? s : "", s ? ", " : "",
3441 err = got_error_from_errno("asprintf");
3447 err = got_object_id_str(&id_str, id);
3451 printf(GOT_COMMIT_SEP_STR);
3452 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3453 refs_str ? refs_str : "", refs_str ? ")" : "");
3458 printf("from: %s\n", got_object_commit_get_author(commit));
3459 committer_time = got_object_commit_get_committer_time(commit);
3460 datestr = get_datestr(&committer_time, datebuf);
3462 printf("date: %s UTC\n", datestr);
3463 author = got_object_commit_get_author(commit);
3464 committer = got_object_commit_get_committer(commit);
3465 if (strcmp(author, committer) != 0)
3466 printf("via: %s\n", committer);
3467 if (got_object_commit_get_nparents(commit) > 1) {
3468 const struct got_object_id_queue *parent_ids;
3469 struct got_object_qid *qid;
3471 parent_ids = got_object_commit_get_parent_ids(commit);
3472 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3473 err = got_object_id_str(&id_str, qid->id);
3476 printf("parent %d: %s\n", n++, id_str);
3481 err = got_object_commit_get_logmsg(&logmsg0, commit);
3487 line = strsep(&logmsg, "\n");
3489 printf(" %s\n", line);
3493 if (changed_paths) {
3494 struct got_pathlist_entry *pe;
3495 TAILQ_FOREACH(pe, changed_paths, entry) {
3496 struct got_diff_changed_path *cp = pe->data;
3497 printf(" %c %s\n", cp->status, pe->path);
3502 err = print_patch(commit, id, path, diff_context, repo);
3507 if (fflush(stdout) != 0 && err == NULL)
3508 err = got_error_from_errno("fflush");
3512 static const struct got_error *
3513 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3514 struct got_repository *repo, const char *path, int show_changed_paths,
3515 int show_patch, const char *search_pattern, int diff_context, int limit,
3516 int log_branches, int reverse_display_order, struct got_reflist_head *refs)
3518 const struct got_error *err;
3519 struct got_commit_graph *graph;
3522 struct got_object_id_queue reversed_commits;
3523 struct got_object_qid *qid;
3524 struct got_commit_object *commit;
3525 struct got_pathlist_head changed_paths;
3526 struct got_pathlist_entry *pe;
3528 SIMPLEQ_INIT(&reversed_commits);
3529 TAILQ_INIT(&changed_paths);
3531 if (search_pattern && regcomp(®ex, search_pattern,
3532 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3533 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3535 err = got_commit_graph_open(&graph, path, !log_branches);
3538 err = got_commit_graph_iter_start(graph, root_id, repo,
3539 check_cancelled, NULL);
3543 struct got_object_id *id;
3545 if (sigint_received || sigpipe_received)
3548 err = got_commit_graph_iter_next(&id, graph, repo,
3549 check_cancelled, NULL);
3551 if (err->code == GOT_ERR_ITER_COMPLETED)
3558 err = got_object_open_as_commit(&commit, repo, id);
3562 if (show_changed_paths && !reverse_display_order) {
3563 err = get_changed_paths(&changed_paths, commit, repo);
3568 if (search_pattern) {
3569 err = match_logmsg(&have_match, id, commit, ®ex);
3571 got_object_commit_close(commit);
3574 if (have_match == 0 && show_changed_paths)
3575 match_changed_paths(&have_match,
3576 &changed_paths, ®ex);
3577 if (have_match == 0) {
3578 got_object_commit_close(commit);
3579 TAILQ_FOREACH(pe, &changed_paths, entry) {
3580 free((char *)pe->path);
3583 got_pathlist_free(&changed_paths);
3588 if (reverse_display_order) {
3589 err = got_object_qid_alloc(&qid, id);
3592 SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3593 got_object_commit_close(commit);
3595 err = print_commit(commit, id, repo, path,
3596 show_changed_paths ? &changed_paths : NULL,
3597 show_patch, diff_context, refs);
3598 got_object_commit_close(commit);
3602 if ((limit && --limit == 0) ||
3603 (end_id && got_object_id_cmp(id, end_id) == 0))
3606 TAILQ_FOREACH(pe, &changed_paths, entry) {
3607 free((char *)pe->path);
3610 got_pathlist_free(&changed_paths);
3612 if (reverse_display_order) {
3613 SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3614 err = got_object_open_as_commit(&commit, repo, qid->id);
3617 if (show_changed_paths) {
3618 err = get_changed_paths(&changed_paths,
3623 err = print_commit(commit, qid->id, repo, path,
3624 show_changed_paths ? &changed_paths : NULL,
3625 show_patch, diff_context, refs);
3626 got_object_commit_close(commit);
3629 TAILQ_FOREACH(pe, &changed_paths, entry) {
3630 free((char *)pe->path);
3633 got_pathlist_free(&changed_paths);
3637 while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3638 qid = SIMPLEQ_FIRST(&reversed_commits);
3639 SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3640 got_object_qid_free(qid);
3642 TAILQ_FOREACH(pe, &changed_paths, entry) {
3643 free((char *)pe->path);
3646 got_pathlist_free(&changed_paths);
3649 got_commit_graph_close(graph);
3656 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3657 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3658 "[-R] [path]\n", getprogname());
3663 get_default_log_limit(void)
3665 const char *got_default_log_limit;
3669 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3670 if (got_default_log_limit == NULL)
3672 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3678 static const struct got_error *
3679 resolve_commit_arg(struct got_object_id **id, const char *commit_arg,
3680 struct got_repository *repo)
3682 const struct got_error *err = NULL;
3683 struct got_reference *ref;
3687 err = got_ref_open(&ref, repo, commit_arg, 0);
3690 err = got_ref_resolve(id, repo, ref);
3694 err = got_object_get_type(&obj_type, repo, *id);
3697 if (obj_type == GOT_OBJ_TYPE_TAG) {
3698 struct got_tag_object *tag;
3699 err = got_object_open_as_tag(&tag, repo, *id);
3702 if (got_object_tag_get_object_type(tag) !=
3703 GOT_OBJ_TYPE_COMMIT) {
3704 got_object_tag_close(tag);
3705 return got_error(GOT_ERR_OBJ_TYPE);
3708 *id = got_object_id_dup(
3709 got_object_tag_get_object_id(tag));
3711 err = got_error_from_errno(
3712 "got_object_id_dup");
3713 got_object_tag_close(tag);
3716 } else if (obj_type != GOT_OBJ_TYPE_COMMIT)
3717 return got_error(GOT_ERR_OBJ_TYPE);
3719 err = got_repo_match_object_id_prefix(id, commit_arg,
3720 GOT_OBJ_TYPE_COMMIT, repo);
3726 static const struct got_error *
3727 cmd_log(int argc, char *argv[])
3729 const struct got_error *error;
3730 struct got_repository *repo = NULL;
3731 struct got_worktree *worktree = NULL;
3732 struct got_object_id *start_id = NULL, *end_id = NULL;
3733 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3734 const char *start_commit = NULL, *end_commit = NULL;
3735 const char *search_pattern = NULL;
3736 int diff_context = -1, ch;
3737 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3738 int reverse_display_order = 0;
3740 struct got_reflist_head refs;
3742 SIMPLEQ_INIT(&refs);
3745 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3751 limit = get_default_log_limit();
3753 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3759 show_changed_paths = 1;
3762 start_commit = optarg;
3765 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3768 err(1, "-C option %s", errstr);
3771 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3773 err(1, "-l option %s", errstr);
3779 repo_path = realpath(optarg, NULL);
3780 if (repo_path == NULL)
3781 return got_error_from_errno2("realpath",
3783 got_path_strip_trailing_slashes(repo_path);
3786 reverse_display_order = 1;
3789 search_pattern = optarg;
3792 end_commit = optarg;
3803 if (diff_context == -1)
3805 else if (!show_patch)
3806 errx(1, "-C requires -p");
3808 cwd = getcwd(NULL, 0);
3810 error = got_error_from_errno("getcwd");
3814 if (repo_path == NULL) {
3815 error = got_worktree_open(&worktree, cwd);
3816 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3823 error = got_worktree_resolve_path(&path, worktree,
3828 path = strdup(argv[0]);
3830 error = got_error_from_errno("strdup");
3834 } else if (argc != 0)
3837 if (repo_path == NULL) {
3838 repo_path = worktree ?
3839 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3841 if (repo_path == NULL) {
3842 error = got_error_from_errno("strdup");
3846 error = got_repo_open(&repo, repo_path, NULL);
3850 error = apply_unveil(got_repo_get_path(repo), 1,
3851 worktree ? got_worktree_get_root_path(worktree) : NULL);
3855 if (start_commit == NULL) {
3856 struct got_reference *head_ref;
3857 struct got_commit_object *commit = NULL;
3858 error = got_ref_open(&head_ref, repo,
3859 worktree ? got_worktree_get_head_ref_name(worktree)
3863 error = got_ref_resolve(&start_id, repo, head_ref);
3864 got_ref_close(head_ref);
3867 error = got_object_open_as_commit(&commit, repo,
3871 got_object_commit_close(commit);
3873 error = resolve_commit_arg(&start_id, start_commit, repo);
3877 if (end_commit != NULL) {
3878 error = resolve_commit_arg(&end_id, end_commit, repo);
3885 * If a path was specified on the command line it was resolved
3886 * to a path in the work tree above. Prepend the work tree's
3887 * path prefix to obtain the corresponding in-repository path.
3891 prefix = got_worktree_get_path_prefix(worktree);
3892 if (asprintf(&in_repo_path, "%s%s%s", prefix,
3893 (path[0] != '\0') ? "/" : "", path) == -1) {
3894 error = got_error_from_errno("asprintf");
3899 error = got_repo_map_path(&in_repo_path, repo,
3900 path ? path : "", 1);
3905 path = in_repo_path;
3908 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3912 error = print_commits(start_id, end_id, repo, path ? path : "",
3913 show_changed_paths, show_patch, search_pattern, diff_context,
3914 limit, log_branches, reverse_display_order, &refs);
3920 got_worktree_close(worktree);
3922 const struct got_error *repo_error;
3923 repo_error = got_repo_close(repo);
3927 got_ref_list_free(&refs);
3934 fprintf(stderr, "usage: %s diff [-C number] [-r repository-path] [-s] "
3935 "[-w] [object1 object2 | path]\n", getprogname());
3939 struct print_diff_arg {
3940 struct got_repository *repo;
3941 struct got_worktree *worktree;
3946 int ignore_whitespace;
3950 * Create a file which contains the target path of a symlink so we can feed
3951 * it as content to the diff engine.
3953 static const struct got_error *
3954 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
3955 const char *abspath)
3957 const struct got_error *err = NULL;
3958 char target_path[PATH_MAX];
3959 ssize_t target_len, outlen;
3964 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
3965 if (target_len == -1)
3966 return got_error_from_errno2("readlinkat", abspath);
3968 target_len = readlink(abspath, target_path, PATH_MAX);
3969 if (target_len == -1)
3970 return got_error_from_errno2("readlink", abspath);
3973 *fd = got_opentempfd();
3975 return got_error_from_errno("got_opentempfd");
3977 outlen = write(*fd, target_path, target_len);
3979 err = got_error_from_errno("got_opentempfd");
3983 if (lseek(*fd, 0, SEEK_SET) == -1) {
3984 err = got_error_from_errno2("lseek", abspath);
3995 static const struct got_error *
3996 print_diff(void *arg, unsigned char status, unsigned char staged_status,
3997 const char *path, struct got_object_id *blob_id,
3998 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3999 int dirfd, const char *de_name)
4001 struct print_diff_arg *a = arg;
4002 const struct got_error *err = NULL;
4003 struct got_blob_object *blob1 = NULL;
4006 char *abspath = NULL, *label1 = NULL;
4009 if (a->diff_staged) {
4010 if (staged_status != GOT_STATUS_MODIFY &&
4011 staged_status != GOT_STATUS_ADD &&
4012 staged_status != GOT_STATUS_DELETE)
4015 if (staged_status == GOT_STATUS_DELETE)
4017 if (status == GOT_STATUS_NONEXISTENT)
4018 return got_error_set_errno(ENOENT, path);
4019 if (status != GOT_STATUS_MODIFY &&
4020 status != GOT_STATUS_ADD &&
4021 status != GOT_STATUS_DELETE &&
4022 status != GOT_STATUS_CONFLICT)
4026 if (!a->header_shown) {
4027 printf("diff %s %s%s\n", a->id_str,
4028 got_worktree_get_root_path(a->worktree),
4029 a->diff_staged ? " (staged changes)" : "");
4030 a->header_shown = 1;
4033 if (a->diff_staged) {
4034 const char *label1 = NULL, *label2 = NULL;
4035 switch (staged_status) {
4036 case GOT_STATUS_MODIFY:
4040 case GOT_STATUS_ADD:
4043 case GOT_STATUS_DELETE:
4047 return got_error(GOT_ERR_FILE_STATUS);
4049 return got_diff_objects_as_blobs(blob_id, staged_blob_id,
4050 label1, label2, a->diff_context, a->ignore_whitespace,
4054 if (staged_status == GOT_STATUS_ADD ||
4055 staged_status == GOT_STATUS_MODIFY) {
4057 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4061 err = got_object_id_str(&id_str, staged_blob_id);
4064 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4065 err = got_error_from_errno("asprintf");
4070 } else if (status != GOT_STATUS_ADD) {
4071 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4076 if (status != GOT_STATUS_DELETE) {
4077 if (asprintf(&abspath, "%s/%s",
4078 got_worktree_get_root_path(a->worktree), path) == -1) {
4079 err = got_error_from_errno("asprintf");
4084 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4086 if (errno != ELOOP) {
4087 err = got_error_from_errno2("openat",
4091 err = get_symlink_target_file(&fd, dirfd,
4097 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4099 if (errno != ELOOP) {
4100 err = got_error_from_errno2("open",
4104 err = get_symlink_target_file(&fd, dirfd,
4110 if (fstat(fd, &sb) == -1) {
4111 err = got_error_from_errno2("fstat", abspath);
4114 f2 = fdopen(fd, "r");
4116 err = got_error_from_errno2("fdopen", abspath);
4123 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4124 a->diff_context, a->ignore_whitespace, stdout);
4127 got_object_blob_close(blob1);
4128 if (f2 && fclose(f2) == EOF && err == NULL)
4129 err = got_error_from_errno("fclose");
4130 if (fd != -1 && close(fd) == -1 && err == NULL)
4131 err = got_error_from_errno("close");
4136 static const struct got_error *
4137 cmd_diff(int argc, char *argv[])
4139 const struct got_error *error;
4140 struct got_repository *repo = NULL;
4141 struct got_worktree *worktree = NULL;
4142 char *cwd = NULL, *repo_path = NULL;
4143 struct got_object_id *id1 = NULL, *id2 = NULL;
4144 const char *id_str1 = NULL, *id_str2 = NULL;
4145 char *label1 = NULL, *label2 = NULL;
4147 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4152 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4157 while ((ch = getopt(argc, argv, "C:r:sw")) != -1) {
4160 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4163 err(1, "-C option %s", errstr);
4166 repo_path = realpath(optarg, NULL);
4167 if (repo_path == NULL)
4168 return got_error_from_errno2("realpath",
4170 got_path_strip_trailing_slashes(repo_path);
4176 ignore_whitespace = 1;
4187 cwd = getcwd(NULL, 0);
4189 error = got_error_from_errno("getcwd");
4195 "-r option can't be used when diffing a work tree");
4196 error = got_worktree_open(&worktree, cwd);
4198 if (error->code == GOT_ERR_NOT_WORKTREE)
4199 error = wrap_not_worktree_error(error, "diff",
4203 repo_path = strdup(got_worktree_get_repo_path(worktree));
4204 if (repo_path == NULL) {
4205 error = got_error_from_errno("strdup");
4209 error = got_worktree_resolve_path(&path, worktree,
4216 error = got_error_from_errno("strdup");
4220 } else if (argc == 2) {
4222 errx(1, "-s option can't be used when diffing "
4223 "objects in repository");
4226 if (repo_path == NULL) {
4227 error = got_worktree_open(&worktree, cwd);
4228 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4232 got_worktree_get_repo_path(worktree));
4233 if (repo_path == NULL) {
4234 error = got_error_from_errno("strdup");
4238 repo_path = strdup(cwd);
4239 if (repo_path == NULL) {
4240 error = got_error_from_errno("strdup");
4248 error = got_repo_open(&repo, repo_path, NULL);
4253 error = apply_unveil(got_repo_get_path(repo), 1,
4254 worktree ? got_worktree_get_root_path(worktree) : NULL);
4259 struct print_diff_arg arg;
4260 struct got_pathlist_head paths;
4265 error = got_object_id_str(&id_str,
4266 got_worktree_get_base_commit_id(worktree));
4270 arg.worktree = worktree;
4271 arg.diff_context = diff_context;
4272 arg.id_str = id_str;
4273 arg.header_shown = 0;
4274 arg.diff_staged = diff_staged;
4275 arg.ignore_whitespace = ignore_whitespace;
4277 error = got_pathlist_append(&paths, path, NULL);
4281 error = got_worktree_status(worktree, &paths, repo, print_diff,
4282 &arg, check_cancelled, NULL);
4284 got_pathlist_free(&paths);
4288 error = got_repo_match_object_id(&id1, &label1, id_str1,
4289 GOT_OBJ_TYPE_ANY, 1, repo);
4293 error = got_repo_match_object_id(&id2, &label2, id_str2,
4294 GOT_OBJ_TYPE_ANY, 1, repo);
4298 error = got_object_get_type(&type1, repo, id1);
4302 error = got_object_get_type(&type2, repo, id2);
4306 if (type1 != type2) {
4307 error = got_error(GOT_ERR_OBJ_TYPE);
4312 case GOT_OBJ_TYPE_BLOB:
4313 error = got_diff_objects_as_blobs(id1, id2, NULL, NULL,
4314 diff_context, ignore_whitespace, repo, stdout);
4316 case GOT_OBJ_TYPE_TREE:
4317 error = got_diff_objects_as_trees(id1, id2, "", "",
4318 diff_context, ignore_whitespace, repo, stdout);
4320 case GOT_OBJ_TYPE_COMMIT:
4321 printf("diff %s %s\n", label1, label2);
4322 error = got_diff_objects_as_commits(id1, id2, diff_context,
4323 ignore_whitespace, repo, stdout);
4326 error = got_error(GOT_ERR_OBJ_TYPE);
4335 got_worktree_close(worktree);
4337 const struct got_error *repo_error;
4338 repo_error = got_repo_close(repo);
4349 "usage: %s blame [-c commit] [-r repository-path] path\n",
4358 char datebuf[11]; /* YYYY-MM-DD + NUL */
4361 struct blame_cb_args {
4362 struct blame_line *lines;
4366 off_t *line_offsets;
4368 struct got_repository *repo;
4371 static const struct got_error *
4372 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4374 const struct got_error *err = NULL;
4375 struct blame_cb_args *a = arg;
4376 struct blame_line *bline;
4378 size_t linesize = 0;
4379 struct got_commit_object *commit = NULL;
4382 time_t committer_time;
4384 if (nlines != a->nlines ||
4385 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4386 return got_error(GOT_ERR_RANGE);
4388 if (sigint_received)
4389 return got_error(GOT_ERR_ITER_COMPLETED);
4392 return NULL; /* no change in this commit */
4394 /* Annotate this line. */
4395 bline = &a->lines[lineno - 1];
4396 if (bline->annotated)
4398 err = got_object_id_str(&bline->id_str, id);
4402 err = got_object_open_as_commit(&commit, a->repo, id);
4406 bline->committer = strdup(got_object_commit_get_committer(commit));
4407 if (bline->committer == NULL) {
4408 err = got_error_from_errno("strdup");
4412 committer_time = got_object_commit_get_committer_time(commit);
4413 if (localtime_r(&committer_time, &tm) == NULL)
4414 return got_error_from_errno("localtime_r");
4415 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4416 &tm) >= sizeof(bline->datebuf)) {
4417 err = got_error(GOT_ERR_NO_SPACE);
4420 bline->annotated = 1;
4422 /* Print lines annotated so far. */
4423 bline = &a->lines[a->lineno_cur - 1];
4424 if (!bline->annotated)
4427 offset = a->line_offsets[a->lineno_cur - 1];
4428 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4429 err = got_error_from_errno("fseeko");
4433 while (bline->annotated) {
4434 char *smallerthan, *at, *nl, *committer;
4437 if (getline(&line, &linesize, a->f) == -1) {
4439 err = got_error_from_errno("getline");
4443 committer = bline->committer;
4444 smallerthan = strchr(committer, '<');
4445 if (smallerthan && smallerthan[1] != '\0')
4446 committer = smallerthan + 1;
4447 at = strchr(committer, '@');
4450 len = strlen(committer);
4452 committer[8] = '\0';
4454 nl = strchr(line, '\n');
4457 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4458 bline->id_str, bline->datebuf, committer, line);
4461 bline = &a->lines[a->lineno_cur - 1];
4465 got_object_commit_close(commit);
4470 static const struct got_error *
4471 cmd_blame(int argc, char *argv[])
4473 const struct got_error *error;
4474 struct got_repository *repo = NULL;
4475 struct got_worktree *worktree = NULL;
4476 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4477 char *link_target = NULL;
4478 struct got_object_id *obj_id = NULL;
4479 struct got_object_id *commit_id = NULL;
4480 struct got_blob_object *blob = NULL;
4481 char *commit_id_str = NULL;
4482 struct blame_cb_args bca;
4483 int ch, obj_type, i;
4486 memset(&bca, 0, sizeof(bca));
4489 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4494 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4497 commit_id_str = optarg;
4500 repo_path = realpath(optarg, NULL);
4501 if (repo_path == NULL)
4502 return got_error_from_errno2("realpath",
4504 got_path_strip_trailing_slashes(repo_path);
4520 cwd = getcwd(NULL, 0);
4522 error = got_error_from_errno("getcwd");
4525 if (repo_path == NULL) {
4526 error = got_worktree_open(&worktree, cwd);
4527 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4533 strdup(got_worktree_get_repo_path(worktree));
4534 if (repo_path == NULL) {
4535 error = got_error_from_errno("strdup");
4540 repo_path = strdup(cwd);
4541 if (repo_path == NULL) {
4542 error = got_error_from_errno("strdup");
4548 error = got_repo_open(&repo, repo_path, NULL);
4552 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4557 const char *prefix = got_worktree_get_path_prefix(worktree);
4558 char *p, *worktree_subdir = cwd +
4559 strlen(got_worktree_get_root_path(worktree));
4560 if (asprintf(&p, "%s%s%s%s%s",
4561 prefix, (strcmp(prefix, "/") != 0) ? "/" : "",
4562 worktree_subdir, worktree_subdir[0] ? "/" : "",
4564 error = got_error_from_errno("asprintf");
4567 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4570 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4575 if (commit_id_str == NULL) {
4576 struct got_reference *head_ref;
4577 error = got_ref_open(&head_ref, repo, worktree ?
4578 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4581 error = got_ref_resolve(&commit_id, repo, head_ref);
4582 got_ref_close(head_ref);
4586 error = got_repo_match_object_id(&commit_id, NULL,
4587 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4592 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4597 error = got_object_id_by_path(&obj_id, repo, commit_id,
4598 link_target ? link_target : in_repo_path);
4602 error = got_object_get_type(&obj_type, repo, obj_id);
4606 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4607 error = got_error_path(link_target ? link_target : in_repo_path,
4612 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4615 bca.f = got_opentemp();
4616 if (bca.f == NULL) {
4617 error = got_error_from_errno("got_opentemp");
4620 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4621 &bca.line_offsets, bca.f, blob);
4622 if (error || bca.nlines == 0)
4625 /* Don't include \n at EOF in the blame line count. */
4626 if (bca.line_offsets[bca.nlines - 1] == filesize)
4629 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4630 if (bca.lines == NULL) {
4631 error = got_error_from_errno("calloc");
4635 bca.nlines_prec = 0;
4643 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4644 repo, blame_cb, &bca, check_cancelled, NULL);
4653 got_object_blob_close(blob);
4655 got_worktree_close(worktree);
4657 const struct got_error *repo_error;
4658 repo_error = got_repo_close(repo);
4663 for (i = 0; i < bca.nlines; i++) {
4664 struct blame_line *bline = &bca.lines[i];
4665 free(bline->id_str);
4666 free(bline->committer);
4670 free(bca.line_offsets);
4671 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4672 error = got_error_from_errno("fclose");
4680 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4685 static const struct got_error *
4686 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4687 const char *root_path, struct got_repository *repo)
4689 const struct got_error *err = NULL;
4690 int is_root_path = (strcmp(path, root_path) == 0);
4691 const char *modestr = "";
4692 mode_t mode = got_tree_entry_get_mode(te);
4693 char *link_target = NULL;
4695 path += strlen(root_path);
4696 while (path[0] == '/')
4699 if (got_object_tree_entry_is_submodule(te))
4701 else if (S_ISLNK(mode)) {
4704 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4707 for (i = 0; i < strlen(link_target); i++) {
4708 if (!isprint((unsigned char)link_target[i]))
4709 link_target[i] = '?';
4714 else if (S_ISDIR(mode))
4716 else if (mode & S_IXUSR)
4719 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4720 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4721 link_target ? " -> ": "", link_target ? link_target : "");
4727 static const struct got_error *
4728 print_tree(const char *path, struct got_object_id *commit_id,
4729 int show_ids, int recurse, const char *root_path,
4730 struct got_repository *repo)
4732 const struct got_error *err = NULL;
4733 struct got_object_id *tree_id = NULL;
4734 struct got_tree_object *tree = NULL;
4737 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4741 err = got_object_open_as_tree(&tree, repo, tree_id);
4744 nentries = got_object_tree_get_nentries(tree);
4745 for (i = 0; i < nentries; i++) {
4746 struct got_tree_entry *te;
4749 if (sigint_received || sigpipe_received)
4752 te = got_object_tree_get_entry(tree, i);
4755 err = got_object_id_str(&id_str,
4756 got_tree_entry_get_id(te));
4759 if (asprintf(&id, "%s ", id_str) == -1) {
4760 err = got_error_from_errno("asprintf");
4766 err = print_entry(te, id, path, root_path, repo);
4771 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4773 if (asprintf(&child_path, "%s%s%s", path,
4774 path[0] == '/' && path[1] == '\0' ? "" : "/",
4775 got_tree_entry_get_name(te)) == -1) {
4776 err = got_error_from_errno("asprintf");
4779 err = print_tree(child_path, commit_id, show_ids, 1,
4788 got_object_tree_close(tree);
4793 static const struct got_error *
4794 cmd_tree(int argc, char *argv[])
4796 const struct got_error *error;
4797 struct got_repository *repo = NULL;
4798 struct got_worktree *worktree = NULL;
4799 const char *path, *refname = NULL;
4800 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4801 struct got_object_id *commit_id = NULL;
4802 char *commit_id_str = NULL;
4803 int show_ids = 0, recurse = 0;
4807 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4812 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4815 commit_id_str = optarg;
4818 repo_path = realpath(optarg, NULL);
4819 if (repo_path == NULL)
4820 return got_error_from_errno2("realpath",
4822 got_path_strip_trailing_slashes(repo_path);
4846 cwd = getcwd(NULL, 0);
4848 error = got_error_from_errno("getcwd");
4851 if (repo_path == NULL) {
4852 error = got_worktree_open(&worktree, cwd);
4853 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4859 strdup(got_worktree_get_repo_path(worktree));
4860 if (repo_path == NULL)
4861 error = got_error_from_errno("strdup");
4865 repo_path = strdup(cwd);
4866 if (repo_path == NULL) {
4867 error = got_error_from_errno("strdup");
4873 error = got_repo_open(&repo, repo_path, NULL);
4877 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4883 char *p, *worktree_subdir = cwd +
4884 strlen(got_worktree_get_root_path(worktree));
4885 if (asprintf(&p, "%s/%s",
4886 got_worktree_get_path_prefix(worktree),
4887 worktree_subdir) == -1) {
4888 error = got_error_from_errno("asprintf");
4891 error = got_repo_map_path(&in_repo_path, repo, p, 0);
4898 if (in_repo_path == NULL) {
4899 error = got_repo_map_path(&in_repo_path, repo, path, 1);
4904 if (commit_id_str == NULL) {
4905 struct got_reference *head_ref;
4907 refname = got_worktree_get_head_ref_name(worktree);
4909 refname = GOT_REF_HEAD;
4910 error = got_ref_open(&head_ref, repo, refname, 0);
4913 error = got_ref_resolve(&commit_id, repo, head_ref);
4914 got_ref_close(head_ref);
4918 error = got_repo_match_object_id(&commit_id, NULL,
4919 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
4924 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
4925 in_repo_path, repo);
4932 got_worktree_close(worktree);
4934 const struct got_error *repo_error;
4935 repo_error = got_repo_close(repo);
4945 fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
4950 static const struct got_error *
4951 print_status(void *arg, unsigned char status, unsigned char staged_status,
4952 const char *path, struct got_object_id *blob_id,
4953 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4954 int dirfd, const char *de_name)
4956 if (status == staged_status && (status == GOT_STATUS_DELETE))
4957 status = GOT_STATUS_NO_CHANGE;
4959 char *status_codes = arg;
4960 size_t ncodes = strlen(status_codes);
4962 for (i = 0; i < ncodes ; i++) {
4963 if (status == status_codes[i] ||
4964 staged_status == status_codes[i])
4970 printf("%c%c %s\n", status, staged_status, path);
4974 static const struct got_error *
4975 cmd_status(int argc, char *argv[])
4977 const struct got_error *error = NULL;
4978 struct got_repository *repo = NULL;
4979 struct got_worktree *worktree = NULL;
4980 char *cwd = NULL, *status_codes = NULL;;
4981 struct got_pathlist_head paths;
4982 struct got_pathlist_entry *pe;
4987 while ((ch = getopt(argc, argv, "s:")) != -1) {
4990 for (i = 0; i < strlen(optarg); i++) {
4991 switch (optarg[i]) {
4992 case GOT_STATUS_MODIFY:
4993 case GOT_STATUS_ADD:
4994 case GOT_STATUS_DELETE:
4995 case GOT_STATUS_CONFLICT:
4996 case GOT_STATUS_MISSING:
4997 case GOT_STATUS_OBSTRUCTED:
4998 case GOT_STATUS_UNVERSIONED:
4999 case GOT_STATUS_MODE_CHANGE:
5000 case GOT_STATUS_NONEXISTENT:
5003 errx(1, "invalid status code '%c'",
5007 status_codes = optarg;
5019 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5023 cwd = getcwd(NULL, 0);
5025 error = got_error_from_errno("getcwd");
5029 error = got_worktree_open(&worktree, cwd);
5031 if (error->code == GOT_ERR_NOT_WORKTREE)
5032 error = wrap_not_worktree_error(error, "status", cwd);
5036 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5041 error = apply_unveil(got_repo_get_path(repo), 1,
5042 got_worktree_get_root_path(worktree));
5046 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5050 error = got_worktree_status(worktree, &paths, repo, print_status,
5051 status_codes, check_cancelled, NULL);
5053 TAILQ_FOREACH(pe, &paths, entry)
5054 free((char *)pe->path);
5055 got_pathlist_free(&paths);
5064 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5070 static const struct got_error *
5071 list_refs(struct got_repository *repo, const char *refname)
5073 static const struct got_error *err = NULL;
5074 struct got_reflist_head refs;
5075 struct got_reflist_entry *re;
5077 SIMPLEQ_INIT(&refs);
5078 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5082 SIMPLEQ_FOREACH(re, &refs, entry) {
5084 refstr = got_ref_to_str(re->ref);
5086 return got_error_from_errno("got_ref_to_str");
5087 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5091 got_ref_list_free(&refs);
5095 static const struct got_error *
5096 delete_ref(struct got_repository *repo, const char *refname)
5098 const struct got_error *err = NULL;
5099 struct got_reference *ref;
5101 err = got_ref_open(&ref, repo, refname, 0);
5105 err = got_ref_delete(ref, repo);
5110 static const struct got_error *
5111 add_ref(struct got_repository *repo, const char *refname, const char *target)
5113 const struct got_error *err = NULL;
5114 struct got_object_id *id;
5115 struct got_reference *ref = NULL;
5118 * Don't let the user create a reference name with a leading '-'.
5119 * While technically a valid reference name, this case is usually
5120 * an unintended typo.
5122 if (refname[0] == '-')
5123 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5125 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5128 struct got_reference *target_ref;
5130 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5132 err = got_ref_open(&target_ref, repo, target, 0);
5135 err = got_ref_resolve(&id, repo, target_ref);
5136 got_ref_close(target_ref);
5141 err = got_ref_alloc(&ref, refname, id);
5145 err = got_ref_write(ref, repo);
5153 static const struct got_error *
5154 add_symref(struct got_repository *repo, const char *refname, const char *target)
5156 const struct got_error *err = NULL;
5157 struct got_reference *ref = NULL;
5158 struct got_reference *target_ref = NULL;
5161 * Don't let the user create a reference name with a leading '-'.
5162 * While technically a valid reference name, this case is usually
5163 * an unintended typo.
5165 if (refname[0] == '-')
5166 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5168 err = got_ref_open(&target_ref, repo, target, 0);
5172 err = got_ref_alloc_symref(&ref, refname, target_ref);
5176 err = got_ref_write(ref, repo);
5179 got_ref_close(target_ref);
5185 static const struct got_error *
5186 cmd_ref(int argc, char *argv[])
5188 const struct got_error *error = NULL;
5189 struct got_repository *repo = NULL;
5190 struct got_worktree *worktree = NULL;
5191 char *cwd = NULL, *repo_path = NULL;
5192 int ch, do_list = 0, do_delete = 0;
5193 const char *obj_arg = NULL, *symref_target= NULL;
5194 char *refname = NULL;
5196 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5205 repo_path = realpath(optarg, NULL);
5206 if (repo_path == NULL)
5207 return got_error_from_errno2("realpath",
5209 got_path_strip_trailing_slashes(repo_path);
5215 symref_target = optarg;
5223 if (obj_arg && do_list)
5224 errx(1, "-c and -l options are mutually exclusive");
5225 if (obj_arg && do_delete)
5226 errx(1, "-c and -d options are mutually exclusive");
5227 if (obj_arg && symref_target)
5228 errx(1, "-c and -s options are mutually exclusive");
5229 if (symref_target && do_delete)
5230 errx(1, "-s and -d options are mutually exclusive");
5231 if (symref_target && do_list)
5232 errx(1, "-s and -l options are mutually exclusive");
5233 if (do_delete && do_list)
5234 errx(1, "-d and -l options are mutually exclusive");
5240 if (argc != 0 && argc != 1)
5243 refname = strdup(argv[0]);
5244 if (refname == NULL) {
5245 error = got_error_from_errno("strdup");
5252 refname = strdup(argv[0]);
5253 if (refname == NULL) {
5254 error = got_error_from_errno("strdup");
5260 got_path_strip_trailing_slashes(refname);
5264 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5268 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5269 "sendfd unveil", NULL) == -1)
5273 cwd = getcwd(NULL, 0);
5275 error = got_error_from_errno("getcwd");
5279 if (repo_path == NULL) {
5280 error = got_worktree_open(&worktree, cwd);
5281 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5287 strdup(got_worktree_get_repo_path(worktree));
5288 if (repo_path == NULL)
5289 error = got_error_from_errno("strdup");
5293 repo_path = strdup(cwd);
5294 if (repo_path == NULL) {
5295 error = got_error_from_errno("strdup");
5301 error = got_repo_open(&repo, repo_path, NULL);
5305 error = apply_unveil(got_repo_get_path(repo), do_list,
5306 worktree ? got_worktree_get_root_path(worktree) : NULL);
5311 error = list_refs(repo, refname);
5313 error = delete_ref(repo, refname);
5314 else if (symref_target)
5315 error = add_symref(repo, refname, symref_target);
5317 if (obj_arg == NULL)
5319 error = add_ref(repo, refname, obj_arg);
5324 got_repo_close(repo);
5326 got_worktree_close(worktree);
5336 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5337 "[name]\n", getprogname());
5341 static const struct got_error *
5342 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5343 struct got_reference *ref)
5345 const struct got_error *err = NULL;
5346 const char *refname, *marker = " ";
5349 refname = got_ref_get_name(ref);
5350 if (worktree && strcmp(refname,
5351 got_worktree_get_head_ref_name(worktree)) == 0) {
5352 struct got_object_id *id = NULL;
5354 err = got_ref_resolve(&id, repo, ref);
5357 if (got_object_id_cmp(id,
5358 got_worktree_get_base_commit_id(worktree)) == 0)
5365 if (strncmp(refname, "refs/heads/", 11) == 0)
5367 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5370 refstr = got_ref_to_str(ref);
5372 return got_error_from_errno("got_ref_to_str");
5374 printf("%s%s: %s\n", marker, refname, refstr);
5379 static const struct got_error *
5380 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5382 const char *refname;
5384 if (worktree == NULL)
5385 return got_error(GOT_ERR_NOT_WORKTREE);
5387 refname = got_worktree_get_head_ref_name(worktree);
5389 if (strncmp(refname, "refs/heads/", 11) == 0)
5391 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5394 printf("%s\n", refname);
5399 static const struct got_error *
5400 list_branches(struct got_repository *repo, struct got_worktree *worktree)
5402 static const struct got_error *err = NULL;
5403 struct got_reflist_head refs;
5404 struct got_reflist_entry *re;
5405 struct got_reference *temp_ref = NULL;
5406 int rebase_in_progress, histedit_in_progress;
5408 SIMPLEQ_INIT(&refs);
5411 err = got_worktree_rebase_in_progress(&rebase_in_progress,
5416 err = got_worktree_histedit_in_progress(&histedit_in_progress,
5421 if (rebase_in_progress || histedit_in_progress) {
5422 err = got_ref_open(&temp_ref, repo,
5423 got_worktree_get_head_ref_name(worktree), 0);
5426 list_branch(repo, worktree, temp_ref);
5427 got_ref_close(temp_ref);
5431 err = got_ref_list(&refs, repo, "refs/heads",
5432 got_ref_cmp_by_name, NULL);
5436 SIMPLEQ_FOREACH(re, &refs, entry)
5437 list_branch(repo, worktree, re->ref);
5439 got_ref_list_free(&refs);
5443 static const struct got_error *
5444 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5445 const char *branch_name)
5447 const struct got_error *err = NULL;
5448 struct got_reference *ref = NULL;
5451 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5452 return got_error_from_errno("asprintf");
5454 err = got_ref_open(&ref, repo, refname, 0);
5459 strcmp(got_worktree_get_head_ref_name(worktree),
5460 got_ref_get_name(ref)) == 0) {
5461 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5462 "will not delete this work tree's current branch");
5466 err = got_ref_delete(ref, repo);
5474 static const struct got_error *
5475 add_branch(struct got_repository *repo, const char *branch_name,
5476 struct got_object_id *base_commit_id)
5478 const struct got_error *err = NULL;
5479 struct got_reference *ref = NULL;
5480 char *base_refname = NULL, *refname = NULL;
5483 * Don't let the user create a branch name with a leading '-'.
5484 * While technically a valid reference name, this case is usually
5485 * an unintended typo.
5487 if (branch_name[0] == '-')
5488 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5490 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5491 err = got_error_from_errno("asprintf");
5495 err = got_ref_open(&ref, repo, refname, 0);
5497 err = got_error(GOT_ERR_BRANCH_EXISTS);
5499 } else if (err->code != GOT_ERR_NOT_REF)
5502 err = got_ref_alloc(&ref, refname, base_commit_id);
5506 err = got_ref_write(ref, repo);
5515 static const struct got_error *
5516 cmd_branch(int argc, char *argv[])
5518 const struct got_error *error = NULL;
5519 struct got_repository *repo = NULL;
5520 struct got_worktree *worktree = NULL;
5521 char *cwd = NULL, *repo_path = NULL;
5522 int ch, do_list = 0, do_show = 0, do_update = 1;
5523 const char *delref = NULL, *commit_id_arg = NULL;
5524 struct got_reference *ref = NULL;
5525 struct got_pathlist_head paths;
5526 struct got_pathlist_entry *pe;
5527 struct got_object_id *commit_id = NULL;
5528 char *commit_id_str = NULL;
5532 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5535 commit_id_arg = optarg;
5541 repo_path = realpath(optarg, NULL);
5542 if (repo_path == NULL)
5543 return got_error_from_errno2("realpath",
5545 got_path_strip_trailing_slashes(repo_path);
5559 if (do_list && delref)
5560 errx(1, "-l and -d options are mutually exclusive");
5565 if (!do_list && !delref && argc == 0)
5568 if ((do_list || delref || do_show) && commit_id_arg != NULL)
5569 errx(1, "-c option can only be used when creating a branch");
5571 if (do_list || delref) {
5574 } else if (!do_show && argc != 1)
5578 if (do_list || do_show) {
5579 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5583 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5584 "sendfd unveil", NULL) == -1)
5588 cwd = getcwd(NULL, 0);
5590 error = got_error_from_errno("getcwd");
5594 if (repo_path == NULL) {
5595 error = got_worktree_open(&worktree, cwd);
5596 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5602 strdup(got_worktree_get_repo_path(worktree));
5603 if (repo_path == NULL)
5604 error = got_error_from_errno("strdup");
5608 repo_path = strdup(cwd);
5609 if (repo_path == NULL) {
5610 error = got_error_from_errno("strdup");
5616 error = got_repo_open(&repo, repo_path, NULL);
5620 error = apply_unveil(got_repo_get_path(repo), do_list,
5621 worktree ? got_worktree_get_root_path(worktree) : NULL);
5626 error = show_current_branch(repo, worktree);
5628 error = list_branches(repo, worktree);
5630 error = delete_branch(repo, worktree, delref);
5632 if (commit_id_arg == NULL)
5633 commit_id_arg = worktree ?
5634 got_worktree_get_head_ref_name(worktree) :
5636 error = got_repo_match_object_id(&commit_id, NULL,
5637 commit_id_arg, GOT_OBJ_TYPE_COMMIT, 1, repo);
5640 error = add_branch(repo, argv[0], commit_id);
5643 if (worktree && do_update) {
5644 struct got_update_progress_arg upa;
5645 char *branch_refname = NULL;
5647 error = got_object_id_str(&commit_id_str, commit_id);
5650 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5654 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5656 error = got_error_from_errno("asprintf");
5659 error = got_ref_open(&ref, repo, branch_refname, 0);
5660 free(branch_refname);
5663 error = switch_head_ref(ref, commit_id, worktree,
5667 error = got_worktree_set_base_commit_id(worktree, repo,
5671 memset(&upa, 0, sizeof(upa));
5672 error = got_worktree_checkout_files(worktree, &paths,
5673 repo, update_progress, &upa, check_cancelled,
5677 if (upa.did_something)
5678 printf("Updated to commit %s\n", commit_id_str);
5679 print_update_progress_stats(&upa);
5686 got_repo_close(repo);
5688 got_worktree_close(worktree);
5692 free(commit_id_str);
5693 TAILQ_FOREACH(pe, &paths, entry)
5694 free((char *)pe->path);
5695 got_pathlist_free(&paths);
5704 "usage: %s tag [-c commit] [-r repository] [-l] "
5705 "[-m message] name\n", getprogname());
5710 static const struct got_error *
5711 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5713 const struct got_error *err = NULL;
5714 struct got_reflist_entry *re, *se, *new;
5715 struct got_object_id *re_id, *se_id;
5716 struct got_tag_object *re_tag, *se_tag;
5717 time_t re_time, se_time;
5719 SIMPLEQ_FOREACH(re, tags, entry) {
5720 se = SIMPLEQ_FIRST(sorted);
5722 err = got_reflist_entry_dup(&new, re);
5725 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5728 err = got_ref_resolve(&re_id, repo, re->ref);
5731 err = got_object_open_as_tag(&re_tag, repo, re_id);
5735 re_time = got_object_tag_get_tagger_time(re_tag);
5736 got_object_tag_close(re_tag);
5740 err = got_ref_resolve(&se_id, repo, re->ref);
5743 err = got_object_open_as_tag(&se_tag, repo, se_id);
5747 se_time = got_object_tag_get_tagger_time(se_tag);
5748 got_object_tag_close(se_tag);
5750 if (se_time > re_time) {
5751 err = got_reflist_entry_dup(&new, re);
5754 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5757 se = SIMPLEQ_NEXT(se, entry);
5766 static const struct got_error *
5767 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5769 static const struct got_error *err = NULL;
5770 struct got_reflist_head refs;
5771 struct got_reflist_entry *re;
5773 SIMPLEQ_INIT(&refs);
5775 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5779 SIMPLEQ_FOREACH(re, &refs, entry) {
5780 const char *refname;
5781 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5785 struct got_object_id *id;
5786 struct got_tag_object *tag;
5787 struct got_commit_object *commit = NULL;
5789 refname = got_ref_get_name(re->ref);
5790 if (strncmp(refname, "refs/tags/", 10) != 0)
5793 refstr = got_ref_to_str(re->ref);
5794 if (refstr == NULL) {
5795 err = got_error_from_errno("got_ref_to_str");
5798 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5801 err = got_ref_resolve(&id, repo, re->ref);
5804 err = got_object_open_as_tag(&tag, repo, id);
5806 if (err->code != GOT_ERR_OBJ_TYPE) {
5810 /* "lightweight" tag */
5811 err = got_object_open_as_commit(&commit, repo, id);
5816 tagger = got_object_commit_get_committer(commit);
5818 got_object_commit_get_committer_time(commit);
5819 err = got_object_id_str(&id_str, id);
5825 tagger = got_object_tag_get_tagger(tag);
5826 tagger_time = got_object_tag_get_tagger_time(tag);
5827 err = got_object_id_str(&id_str,
5828 got_object_tag_get_object_id(tag));
5832 printf("from: %s\n", tagger);
5833 datestr = get_datestr(&tagger_time, datebuf);
5835 printf("date: %s UTC\n", datestr);
5837 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
5839 switch (got_object_tag_get_object_type(tag)) {
5840 case GOT_OBJ_TYPE_BLOB:
5841 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
5844 case GOT_OBJ_TYPE_TREE:
5845 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
5848 case GOT_OBJ_TYPE_COMMIT:
5849 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
5852 case GOT_OBJ_TYPE_TAG:
5853 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
5862 err = got_object_commit_get_logmsg(&tagmsg0, commit);
5865 got_object_commit_close(commit);
5867 tagmsg0 = strdup(got_object_tag_get_message(tag));
5868 got_object_tag_close(tag);
5869 if (tagmsg0 == NULL) {
5870 err = got_error_from_errno("strdup");
5877 line = strsep(&tagmsg, "\n");
5879 printf(" %s\n", line);
5884 got_ref_list_free(&refs);
5888 static const struct got_error *
5889 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
5890 const char *tag_name, const char *repo_path)
5892 const struct got_error *err = NULL;
5893 char *template = NULL, *initial_content = NULL;
5894 char *editor = NULL;
5895 int initial_content_len;
5898 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
5899 err = got_error_from_errno("asprintf");
5903 initial_content_len = asprintf(&initial_content,
5904 "\n# tagging commit %s as %s\n",
5905 commit_id_str, tag_name);
5906 if (initial_content_len == -1) {
5907 err = got_error_from_errno("asprintf");
5911 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
5915 if (write(fd, initial_content, initial_content_len) == -1) {
5916 err = got_error_from_errno2("write", *tagmsg_path);
5920 err = get_editor(&editor);
5923 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
5924 initial_content_len);
5926 free(initial_content);
5930 if (fd != -1 && close(fd) == -1 && err == NULL)
5931 err = got_error_from_errno2("close", *tagmsg_path);
5933 /* Editor is done; we can now apply unveil(2) */
5935 err = apply_unveil(repo_path, 0, NULL);
5943 static const struct got_error *
5944 add_tag(struct got_repository *repo, struct got_worktree *worktree,
5945 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
5947 const struct got_error *err = NULL;
5948 struct got_object_id *commit_id = NULL, *tag_id = NULL;
5949 char *label = NULL, *commit_id_str = NULL;
5950 struct got_reference *ref = NULL;
5951 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
5952 char *tagmsg_path = NULL, *tag_id_str = NULL;
5953 int preserve_tagmsg = 0;
5956 * Don't let the user create a tag name with a leading '-'.
5957 * While technically a valid reference name, this case is usually
5958 * an unintended typo.
5960 if (tag_name[0] == '-')
5961 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
5963 err = get_author(&tagger, repo, worktree);
5967 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
5968 GOT_OBJ_TYPE_COMMIT, 1, repo);
5972 err = got_object_id_str(&commit_id_str, commit_id);
5976 if (strncmp("refs/tags/", tag_name, 10) == 0) {
5977 refname = strdup(tag_name);
5978 if (refname == NULL) {
5979 err = got_error_from_errno("strdup");
5983 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
5984 err = got_error_from_errno("asprintf");
5988 err = got_ref_open(&ref, repo, refname, 0);
5990 err = got_error(GOT_ERR_TAG_EXISTS);
5992 } else if (err->code != GOT_ERR_NOT_REF)
5995 if (tagmsg_arg == NULL) {
5996 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
5997 tag_name, got_repo_get_path(repo));
5999 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6000 tagmsg_path != NULL)
6001 preserve_tagmsg = 1;
6006 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6007 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6010 preserve_tagmsg = 1;
6014 err = got_ref_alloc(&ref, refname, tag_id);
6017 preserve_tagmsg = 1;
6021 err = got_ref_write(ref, repo);
6024 preserve_tagmsg = 1;
6028 err = got_object_id_str(&tag_id_str, tag_id);
6031 preserve_tagmsg = 1;
6034 printf("Created tag %s\n", tag_id_str);
6036 if (preserve_tagmsg) {
6037 fprintf(stderr, "%s: tag message preserved in %s\n",
6038 getprogname(), tagmsg_path);
6039 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6040 err = got_error_from_errno2("unlink", tagmsg_path);
6045 free(commit_id_str);
6053 static const struct got_error *
6054 cmd_tag(int argc, char *argv[])
6056 const struct got_error *error = NULL;
6057 struct got_repository *repo = NULL;
6058 struct got_worktree *worktree = NULL;
6059 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6060 char *gitconfig_path = NULL;
6061 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6062 int ch, do_list = 0;
6064 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6067 commit_id_arg = optarg;
6073 repo_path = realpath(optarg, NULL);
6074 if (repo_path == NULL)
6075 return got_error_from_errno2("realpath",
6077 got_path_strip_trailing_slashes(repo_path);
6092 if (commit_id_arg != NULL)
6094 "-c option can only be used when creating a tag");
6096 errx(1, "-l and -m options are mutually exclusive");
6099 } else if (argc != 1)
6106 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6110 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6111 "sendfd unveil", NULL) == -1)
6115 cwd = getcwd(NULL, 0);
6117 error = got_error_from_errno("getcwd");
6121 if (repo_path == NULL) {
6122 error = got_worktree_open(&worktree, cwd);
6123 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6129 strdup(got_worktree_get_repo_path(worktree));
6130 if (repo_path == NULL)
6131 error = got_error_from_errno("strdup");
6135 repo_path = strdup(cwd);
6136 if (repo_path == NULL) {
6137 error = got_error_from_errno("strdup");
6144 error = got_repo_open(&repo, repo_path, NULL);
6147 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6150 error = list_tags(repo, worktree);
6152 error = get_gitconfig_path(&gitconfig_path);
6155 error = got_repo_open(&repo, repo_path, gitconfig_path);
6160 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6165 if (commit_id_arg == NULL) {
6166 struct got_reference *head_ref;
6167 struct got_object_id *commit_id;
6168 error = got_ref_open(&head_ref, repo,
6169 worktree ? got_worktree_get_head_ref_name(worktree)
6173 error = got_ref_resolve(&commit_id, repo, head_ref);
6174 got_ref_close(head_ref);
6177 error = got_object_id_str(&commit_id_str, commit_id);
6183 error = add_tag(repo, worktree, tag_name,
6184 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6188 got_repo_close(repo);
6190 got_worktree_close(worktree);
6193 free(gitconfig_path);
6194 free(commit_id_str);
6201 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6206 static const struct got_error *
6207 add_progress(void *arg, unsigned char status, const char *path)
6209 while (path[0] == '/')
6211 printf("%c %s\n", status, path);
6215 static const struct got_error *
6216 cmd_add(int argc, char *argv[])
6218 const struct got_error *error = NULL;
6219 struct got_repository *repo = NULL;
6220 struct got_worktree *worktree = NULL;
6222 struct got_pathlist_head paths;
6223 struct got_pathlist_entry *pe;
6224 int ch, can_recurse = 0, no_ignores = 0;
6228 while ((ch = getopt(argc, argv, "IR")) != -1) {
6246 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6253 cwd = getcwd(NULL, 0);
6255 error = got_error_from_errno("getcwd");
6259 error = got_worktree_open(&worktree, cwd);
6261 if (error->code == GOT_ERR_NOT_WORKTREE)
6262 error = wrap_not_worktree_error(error, "add", cwd);
6266 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6271 error = apply_unveil(got_repo_get_path(repo), 1,
6272 got_worktree_get_root_path(worktree));
6276 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6280 if (!can_recurse && no_ignores) {
6281 error = got_error_msg(GOT_ERR_BAD_PATH,
6282 "disregarding ignores requires -R option");
6290 TAILQ_FOREACH(pe, &paths, entry) {
6291 if (asprintf(&ondisk_path, "%s/%s",
6292 got_worktree_get_root_path(worktree),
6294 error = got_error_from_errno("asprintf");
6297 if (lstat(ondisk_path, &sb) == -1) {
6298 if (errno == ENOENT) {
6302 error = got_error_from_errno2("lstat",
6308 if (S_ISDIR(sb.st_mode)) {
6309 error = got_error_msg(GOT_ERR_BAD_PATH,
6310 "adding directories requires -R option");
6316 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6317 NULL, repo, no_ignores);
6320 got_repo_close(repo);
6322 got_worktree_close(worktree);
6323 TAILQ_FOREACH(pe, &paths, entry)
6324 free((char *)pe->path);
6325 got_pathlist_free(&paths);
6333 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6334 "path ...\n", getprogname());
6338 static const struct got_error *
6339 print_remove_status(void *arg, unsigned char status,
6340 unsigned char staged_status, const char *path)
6342 while (path[0] == '/')
6344 if (status == GOT_STATUS_NONEXISTENT)
6346 if (status == staged_status && (status == GOT_STATUS_DELETE))
6347 status = GOT_STATUS_NO_CHANGE;
6348 printf("%c%c %s\n", status, staged_status, path);
6352 static const struct got_error *
6353 cmd_remove(int argc, char *argv[])
6355 const struct got_error *error = NULL;
6356 struct got_worktree *worktree = NULL;
6357 struct got_repository *repo = NULL;
6358 const char *status_codes = NULL;
6360 struct got_pathlist_head paths;
6361 struct got_pathlist_entry *pe;
6362 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6366 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6369 delete_local_mods = 1;
6378 for (i = 0; i < strlen(optarg); i++) {
6379 switch (optarg[i]) {
6380 case GOT_STATUS_MODIFY:
6381 delete_local_mods = 1;
6383 case GOT_STATUS_MISSING:
6386 errx(1, "invalid status code '%c'",
6390 status_codes = optarg;
6402 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6409 cwd = getcwd(NULL, 0);
6411 error = got_error_from_errno("getcwd");
6414 error = got_worktree_open(&worktree, cwd);
6416 if (error->code == GOT_ERR_NOT_WORKTREE)
6417 error = wrap_not_worktree_error(error, "remove", cwd);
6421 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6426 error = apply_unveil(got_repo_get_path(repo), 1,
6427 got_worktree_get_root_path(worktree));
6431 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6438 TAILQ_FOREACH(pe, &paths, entry) {
6439 if (asprintf(&ondisk_path, "%s/%s",
6440 got_worktree_get_root_path(worktree),
6442 error = got_error_from_errno("asprintf");
6445 if (lstat(ondisk_path, &sb) == -1) {
6446 if (errno == ENOENT) {
6450 error = got_error_from_errno2("lstat",
6456 if (S_ISDIR(sb.st_mode)) {
6457 error = got_error_msg(GOT_ERR_BAD_PATH,
6458 "removing directories requires -R option");
6464 error = got_worktree_schedule_delete(worktree, &paths,
6465 delete_local_mods, status_codes, print_remove_status, NULL,
6466 repo, keep_on_disk);
6469 got_repo_close(repo);
6471 got_worktree_close(worktree);
6472 TAILQ_FOREACH(pe, &paths, entry)
6473 free((char *)pe->path);
6474 got_pathlist_free(&paths);
6482 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6483 "path ...\n", getprogname());
6487 static const struct got_error *
6488 revert_progress(void *arg, unsigned char status, const char *path)
6490 if (status == GOT_STATUS_UNVERSIONED)
6493 while (path[0] == '/')
6495 printf("%c %s\n", status, path);
6499 struct choose_patch_arg {
6500 FILE *patch_script_file;
6504 static const struct got_error *
6505 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6506 int nchanges, const char *action)
6509 size_t linesize = 0;
6513 case GOT_STATUS_ADD:
6514 printf("A %s\n%s this addition? [y/n] ", path, action);
6516 case GOT_STATUS_DELETE:
6517 printf("D %s\n%s this deletion? [y/n] ", path, action);
6519 case GOT_STATUS_MODIFY:
6520 if (fseek(patch_file, 0L, SEEK_SET) == -1)
6521 return got_error_from_errno("fseek");
6522 printf(GOT_COMMIT_SEP_STR);
6523 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6525 if (ferror(patch_file))
6526 return got_error_from_errno("getline");
6527 printf(GOT_COMMIT_SEP_STR);
6528 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6529 path, n, nchanges, action);
6532 return got_error_path(path, GOT_ERR_FILE_STATUS);
6538 static const struct got_error *
6539 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6540 FILE *patch_file, int n, int nchanges)
6542 const struct got_error *err = NULL;
6544 size_t linesize = 0;
6547 struct choose_patch_arg *a = arg;
6549 *choice = GOT_PATCH_CHOICE_NONE;
6551 if (a->patch_script_file) {
6553 err = show_change(status, path, patch_file, n, nchanges,
6557 linelen = getline(&line, &linesize, a->patch_script_file);
6558 if (linelen == -1) {
6559 if (ferror(a->patch_script_file))
6560 return got_error_from_errno("getline");
6563 nl = strchr(line, '\n');
6566 if (strcmp(line, "y") == 0) {
6567 *choice = GOT_PATCH_CHOICE_YES;
6569 } else if (strcmp(line, "n") == 0) {
6570 *choice = GOT_PATCH_CHOICE_NO;
6572 } else if (strcmp(line, "q") == 0 &&
6573 status == GOT_STATUS_MODIFY) {
6574 *choice = GOT_PATCH_CHOICE_QUIT;
6577 printf("invalid response '%s'\n", line);
6582 while (resp != 'y' && resp != 'n' && resp != 'q') {
6583 err = show_change(status, path, patch_file, n, nchanges,
6590 if (status == GOT_STATUS_MODIFY) {
6591 if (resp != 'y' && resp != 'n' && resp != 'q') {
6592 printf("invalid response '%c'\n", resp);
6595 } else if (resp != 'y' && resp != 'n') {
6596 printf("invalid response '%c'\n", resp);
6602 *choice = GOT_PATCH_CHOICE_YES;
6603 else if (resp == 'n')
6604 *choice = GOT_PATCH_CHOICE_NO;
6605 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6606 *choice = GOT_PATCH_CHOICE_QUIT;
6612 static const struct got_error *
6613 cmd_revert(int argc, char *argv[])
6615 const struct got_error *error = NULL;
6616 struct got_worktree *worktree = NULL;
6617 struct got_repository *repo = NULL;
6618 char *cwd = NULL, *path = NULL;
6619 struct got_pathlist_head paths;
6620 struct got_pathlist_entry *pe;
6621 int ch, can_recurse = 0, pflag = 0;
6622 FILE *patch_script_file = NULL;
6623 const char *patch_script_path = NULL;
6624 struct choose_patch_arg cpa;
6628 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6634 patch_script_path = optarg;
6649 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6650 "unveil", NULL) == -1)
6655 if (patch_script_path && !pflag)
6656 errx(1, "-F option can only be used together with -p option");
6658 cwd = getcwd(NULL, 0);
6660 error = got_error_from_errno("getcwd");
6663 error = got_worktree_open(&worktree, cwd);
6665 if (error->code == GOT_ERR_NOT_WORKTREE)
6666 error = wrap_not_worktree_error(error, "revert", cwd);
6670 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6675 if (patch_script_path) {
6676 patch_script_file = fopen(patch_script_path, "r");
6677 if (patch_script_file == NULL) {
6678 error = got_error_from_errno2("fopen",
6683 error = apply_unveil(got_repo_get_path(repo), 1,
6684 got_worktree_get_root_path(worktree));
6688 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6695 TAILQ_FOREACH(pe, &paths, entry) {
6696 if (asprintf(&ondisk_path, "%s/%s",
6697 got_worktree_get_root_path(worktree),
6699 error = got_error_from_errno("asprintf");
6702 if (lstat(ondisk_path, &sb) == -1) {
6703 if (errno == ENOENT) {
6707 error = got_error_from_errno2("lstat",
6713 if (S_ISDIR(sb.st_mode)) {
6714 error = got_error_msg(GOT_ERR_BAD_PATH,
6715 "reverting directories requires -R option");
6721 cpa.patch_script_file = patch_script_file;
6722 cpa.action = "revert";
6723 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6724 pflag ? choose_patch : NULL, &cpa, repo);
6726 if (patch_script_file && fclose(patch_script_file) == EOF &&
6728 error = got_error_from_errno2("fclose", patch_script_path);
6730 got_repo_close(repo);
6732 got_worktree_close(worktree);
6741 fprintf(stderr, "usage: %s commit [-m msg] [-S] [path ...]\n",
6746 struct collect_commit_logmsg_arg {
6747 const char *cmdline_log;
6749 const char *worktree_path;
6750 const char *branch_name;
6751 const char *repo_path;
6756 static const struct got_error *
6757 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
6760 char *initial_content = NULL;
6761 struct got_pathlist_entry *pe;
6762 const struct got_error *err = NULL;
6763 char *template = NULL;
6764 struct collect_commit_logmsg_arg *a = arg;
6765 int initial_content_len;
6769 /* if a message was specified on the command line, just use it */
6770 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
6771 len = strlen(a->cmdline_log) + 1;
6772 *logmsg = malloc(len + 1);
6773 if (*logmsg == NULL)
6774 return got_error_from_errno("malloc");
6775 strlcpy(*logmsg, a->cmdline_log, len);
6779 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
6780 return got_error_from_errno("asprintf");
6782 initial_content_len = asprintf(&initial_content,
6783 "\n# changes to be committed on branch %s:\n",
6785 if (initial_content_len == -1)
6786 return got_error_from_errno("asprintf");
6788 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
6792 if (write(fd, initial_content, initial_content_len) == -1) {
6793 err = got_error_from_errno2("write", a->logmsg_path);
6797 TAILQ_FOREACH(pe, commitable_paths, entry) {
6798 struct got_commitable *ct = pe->data;
6799 dprintf(fd, "# %c %s\n",
6800 got_commitable_get_status(ct),
6801 got_commitable_get_path(ct));
6804 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
6805 initial_content_len);
6807 free(initial_content);
6810 if (fd != -1 && close(fd) == -1 && err == NULL)
6811 err = got_error_from_errno2("close", a->logmsg_path);
6813 /* Editor is done; we can now apply unveil(2) */
6815 err = apply_unveil(a->repo_path, 0, a->worktree_path);
6823 static const struct got_error *
6824 cmd_commit(int argc, char *argv[])
6826 const struct got_error *error = NULL;
6827 struct got_worktree *worktree = NULL;
6828 struct got_repository *repo = NULL;
6829 char *cwd = NULL, *id_str = NULL;
6830 struct got_object_id *id = NULL;
6831 const char *logmsg = NULL;
6832 struct collect_commit_logmsg_arg cl_arg;
6833 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
6834 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
6835 int allow_bad_symlinks = 0;
6836 struct got_pathlist_head paths;
6839 cl_arg.logmsg_path = NULL;
6841 while ((ch = getopt(argc, argv, "m:S")) != -1) {
6847 allow_bad_symlinks = 1;
6859 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6860 "unveil", NULL) == -1)
6863 cwd = getcwd(NULL, 0);
6865 error = got_error_from_errno("getcwd");
6868 error = got_worktree_open(&worktree, cwd);
6870 if (error->code == GOT_ERR_NOT_WORKTREE)
6871 error = wrap_not_worktree_error(error, "commit", cwd);
6875 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
6878 if (rebase_in_progress) {
6879 error = got_error(GOT_ERR_REBASING);
6883 error = got_worktree_histedit_in_progress(&histedit_in_progress,
6888 error = get_gitconfig_path(&gitconfig_path);
6891 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6896 error = get_author(&author, repo, worktree);
6901 * unveil(2) traverses exec(2); if an editor is used we have
6902 * to apply unveil after the log message has been written.
6904 if (logmsg == NULL || strlen(logmsg) == 0)
6905 error = get_editor(&editor);
6907 error = apply_unveil(got_repo_get_path(repo), 0,
6908 got_worktree_get_root_path(worktree));
6912 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6916 cl_arg.editor = editor;
6917 cl_arg.cmdline_log = logmsg;
6918 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
6919 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
6920 if (!histedit_in_progress) {
6921 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
6922 error = got_error(GOT_ERR_COMMIT_BRANCH);
6925 cl_arg.branch_name += 11;
6927 cl_arg.repo_path = got_repo_get_path(repo);
6928 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
6929 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
6930 print_status, NULL, repo);
6932 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6933 cl_arg.logmsg_path != NULL)
6934 preserve_logmsg = 1;
6938 error = got_object_id_str(&id_str, id);
6941 printf("Created commit %s\n", id_str);
6943 if (preserve_logmsg) {
6944 fprintf(stderr, "%s: log message preserved in %s\n",
6945 getprogname(), cl_arg.logmsg_path);
6946 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
6948 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
6949 free(cl_arg.logmsg_path);
6951 got_repo_close(repo);
6953 got_worktree_close(worktree);
6956 free(gitconfig_path);
6963 usage_cherrypick(void)
6965 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
6969 static const struct got_error *
6970 cmd_cherrypick(int argc, char *argv[])
6972 const struct got_error *error = NULL;
6973 struct got_worktree *worktree = NULL;
6974 struct got_repository *repo = NULL;
6975 char *cwd = NULL, *commit_id_str = NULL;
6976 struct got_object_id *commit_id = NULL;
6977 struct got_commit_object *commit = NULL;
6978 struct got_object_qid *pid;
6979 struct got_reference *head_ref = NULL;
6981 struct got_update_progress_arg upa;
6983 while ((ch = getopt(argc, argv, "")) != -1) {
6995 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6996 "unveil", NULL) == -1)
7002 cwd = getcwd(NULL, 0);
7004 error = got_error_from_errno("getcwd");
7007 error = got_worktree_open(&worktree, cwd);
7009 if (error->code == GOT_ERR_NOT_WORKTREE)
7010 error = wrap_not_worktree_error(error, "cherrypick",
7015 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7020 error = apply_unveil(got_repo_get_path(repo), 0,
7021 got_worktree_get_root_path(worktree));
7025 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7026 GOT_OBJ_TYPE_COMMIT, repo);
7027 if (error != NULL) {
7028 struct got_reference *ref;
7029 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7031 error = got_ref_open(&ref, repo, argv[0], 0);
7034 error = got_ref_resolve(&commit_id, repo, ref);
7039 error = got_object_id_str(&commit_id_str, commit_id);
7043 error = got_ref_open(&head_ref, repo,
7044 got_worktree_get_head_ref_name(worktree), 0);
7048 error = check_same_branch(commit_id, head_ref, NULL, repo);
7050 if (error->code != GOT_ERR_ANCESTRY)
7054 error = got_error(GOT_ERR_SAME_BRANCH);
7058 error = got_object_open_as_commit(&commit, repo, commit_id);
7061 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7062 memset(&upa, 0, sizeof(upa));
7063 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7064 commit_id, repo, update_progress, &upa, check_cancelled,
7069 if (upa.did_something)
7070 printf("Merged commit %s\n", commit_id_str);
7071 print_update_progress_stats(&upa);
7074 got_object_commit_close(commit);
7075 free(commit_id_str);
7077 got_ref_close(head_ref);
7079 got_worktree_close(worktree);
7081 got_repo_close(repo);
7088 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7092 static const struct got_error *
7093 cmd_backout(int argc, char *argv[])
7095 const struct got_error *error = NULL;
7096 struct got_worktree *worktree = NULL;
7097 struct got_repository *repo = NULL;
7098 char *cwd = NULL, *commit_id_str = NULL;
7099 struct got_object_id *commit_id = NULL;
7100 struct got_commit_object *commit = NULL;
7101 struct got_object_qid *pid;
7102 struct got_reference *head_ref = NULL;
7104 struct got_update_progress_arg upa;
7106 while ((ch = getopt(argc, argv, "")) != -1) {
7118 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7119 "unveil", NULL) == -1)
7125 cwd = getcwd(NULL, 0);
7127 error = got_error_from_errno("getcwd");
7130 error = got_worktree_open(&worktree, cwd);
7132 if (error->code == GOT_ERR_NOT_WORKTREE)
7133 error = wrap_not_worktree_error(error, "backout", cwd);
7137 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7142 error = apply_unveil(got_repo_get_path(repo), 0,
7143 got_worktree_get_root_path(worktree));
7147 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7148 GOT_OBJ_TYPE_COMMIT, repo);
7149 if (error != NULL) {
7150 struct got_reference *ref;
7151 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7153 error = got_ref_open(&ref, repo, argv[0], 0);
7156 error = got_ref_resolve(&commit_id, repo, ref);
7161 error = got_object_id_str(&commit_id_str, commit_id);
7165 error = got_ref_open(&head_ref, repo,
7166 got_worktree_get_head_ref_name(worktree), 0);
7170 error = check_same_branch(commit_id, head_ref, NULL, repo);
7174 error = got_object_open_as_commit(&commit, repo, commit_id);
7177 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7179 error = got_error(GOT_ERR_ROOT_COMMIT);
7183 memset(&upa, 0, sizeof(upa));
7184 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7185 update_progress, &upa, check_cancelled, NULL);
7189 if (upa.did_something)
7190 printf("Backed out commit %s\n", commit_id_str);
7191 print_update_progress_stats(&upa);
7194 got_object_commit_close(commit);
7195 free(commit_id_str);
7197 got_ref_close(head_ref);
7199 got_worktree_close(worktree);
7201 got_repo_close(repo);
7208 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7214 trim_logmsg(char *logmsg, int limit)
7219 len = strlen(logmsg);
7223 nl = strchr(logmsg, '\n');
7228 static const struct got_error *
7229 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7231 const struct got_error *err;
7232 char *logmsg0 = NULL;
7235 err = got_object_commit_get_logmsg(&logmsg0, commit);
7240 while (isspace((unsigned char)s[0]))
7243 *logmsg = strdup(s);
7244 if (*logmsg == NULL) {
7245 err = got_error_from_errno("strdup");
7249 trim_logmsg(*logmsg, limit);
7255 static const struct got_error *
7256 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7258 const struct got_error *err;
7259 struct got_commit_object *commit = NULL;
7260 char *id_str = NULL, *logmsg = NULL;
7262 err = got_object_open_as_commit(&commit, repo, id);
7266 err = got_object_id_str(&id_str, id);
7272 err = get_short_logmsg(&logmsg, 42, commit);
7276 printf("%s -> merge conflict: %s\n", id_str, logmsg);
7279 got_object_commit_close(commit);
7284 static const struct got_error *
7285 show_rebase_progress(struct got_commit_object *commit,
7286 struct got_object_id *old_id, struct got_object_id *new_id)
7288 const struct got_error *err;
7289 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7291 err = got_object_id_str(&old_id_str, old_id);
7296 err = got_object_id_str(&new_id_str, new_id);
7301 old_id_str[12] = '\0';
7303 new_id_str[12] = '\0';
7305 err = get_short_logmsg(&logmsg, 42, commit);
7309 printf("%s -> %s: %s\n", old_id_str,
7310 new_id_str ? new_id_str : "no-op change", logmsg);
7318 static const struct got_error *
7319 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7320 struct got_reference *branch, struct got_reference *new_base_branch,
7321 struct got_reference *tmp_branch, struct got_repository *repo)
7323 printf("Switching work tree to %s\n", got_ref_get_name(branch));
7324 return got_worktree_rebase_complete(worktree, fileindex,
7325 new_base_branch, tmp_branch, branch, repo);
7328 static const struct got_error *
7329 rebase_commit(struct got_pathlist_head *merged_paths,
7330 struct got_worktree *worktree, struct got_fileindex *fileindex,
7331 struct got_reference *tmp_branch,
7332 struct got_object_id *commit_id, struct got_repository *repo)
7334 const struct got_error *error;
7335 struct got_commit_object *commit;
7336 struct got_object_id *new_commit_id;
7338 error = got_object_open_as_commit(&commit, repo, commit_id);
7342 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7343 worktree, fileindex, tmp_branch, commit, commit_id, repo);
7345 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7347 error = show_rebase_progress(commit, commit_id, NULL);
7349 error = show_rebase_progress(commit, commit_id, new_commit_id);
7350 free(new_commit_id);
7353 got_object_commit_close(commit);
7357 struct check_path_prefix_arg {
7358 const char *path_prefix;
7363 static const struct got_error *
7364 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7365 struct got_blob_object *blob2, struct got_object_id *id1,
7366 struct got_object_id *id2, const char *path1, const char *path2,
7367 mode_t mode1, mode_t mode2, struct got_repository *repo)
7369 struct check_path_prefix_arg *a = arg;
7371 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7372 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7373 return got_error(a->errcode);
7378 static const struct got_error *
7379 check_path_prefix(struct got_object_id *parent_id,
7380 struct got_object_id *commit_id, const char *path_prefix,
7381 int errcode, struct got_repository *repo)
7383 const struct got_error *err;
7384 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7385 struct got_commit_object *commit = NULL, *parent_commit = NULL;
7386 struct check_path_prefix_arg cpp_arg;
7388 if (got_path_is_root_dir(path_prefix))
7391 err = got_object_open_as_commit(&commit, repo, commit_id);
7395 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7399 err = got_object_open_as_tree(&tree1, repo,
7400 got_object_commit_get_tree_id(parent_commit));
7404 err = got_object_open_as_tree(&tree2, repo,
7405 got_object_commit_get_tree_id(commit));
7409 cpp_arg.path_prefix = path_prefix;
7410 while (cpp_arg.path_prefix[0] == '/')
7411 cpp_arg.path_prefix++;
7412 cpp_arg.len = strlen(cpp_arg.path_prefix);
7413 cpp_arg.errcode = errcode;
7414 err = got_diff_tree(tree1, tree2, "", "", repo,
7415 check_path_prefix_in_diff, &cpp_arg, 0);
7418 got_object_tree_close(tree1);
7420 got_object_tree_close(tree2);
7422 got_object_commit_close(commit);
7424 got_object_commit_close(parent_commit);
7428 static const struct got_error *
7429 collect_commits(struct got_object_id_queue *commits,
7430 struct got_object_id *initial_commit_id,
7431 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7432 const char *path_prefix, int path_prefix_errcode,
7433 struct got_repository *repo)
7435 const struct got_error *err = NULL;
7436 struct got_commit_graph *graph = NULL;
7437 struct got_object_id *parent_id = NULL;
7438 struct got_object_qid *qid;
7439 struct got_object_id *commit_id = initial_commit_id;
7441 err = got_commit_graph_open(&graph, "/", 1);
7445 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7446 check_cancelled, NULL);
7449 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7450 err = got_commit_graph_iter_next(&parent_id, graph, repo,
7451 check_cancelled, NULL);
7453 if (err->code == GOT_ERR_ITER_COMPLETED) {
7454 err = got_error_msg(GOT_ERR_ANCESTRY,
7455 "ran out of commits to rebase before "
7456 "youngest common ancestor commit has "
7461 err = check_path_prefix(parent_id, commit_id,
7462 path_prefix, path_prefix_errcode, repo);
7466 err = got_object_qid_alloc(&qid, commit_id);
7469 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7470 commit_id = parent_id;
7474 got_commit_graph_close(graph);
7478 static const struct got_error *
7479 cmd_rebase(int argc, char *argv[])
7481 const struct got_error *error = NULL;
7482 struct got_worktree *worktree = NULL;
7483 struct got_repository *repo = NULL;
7484 struct got_fileindex *fileindex = NULL;
7486 struct got_reference *branch = NULL;
7487 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7488 struct got_object_id *commit_id = NULL, *parent_id = NULL;
7489 struct got_object_id *resume_commit_id = NULL;
7490 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7491 struct got_commit_object *commit = NULL;
7492 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7493 int histedit_in_progress = 0;
7494 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7495 struct got_object_id_queue commits;
7496 struct got_pathlist_head merged_paths;
7497 const struct got_object_id_queue *parent_ids;
7498 struct got_object_qid *qid, *pid;
7500 SIMPLEQ_INIT(&commits);
7501 TAILQ_INIT(&merged_paths);
7503 while ((ch = getopt(argc, argv, "ac")) != -1) {
7509 continue_rebase = 1;
7521 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7522 "unveil", NULL) == -1)
7525 if (abort_rebase && continue_rebase)
7527 else if (abort_rebase || continue_rebase) {
7530 } else if (argc != 1)
7533 cwd = getcwd(NULL, 0);
7535 error = got_error_from_errno("getcwd");
7538 error = got_worktree_open(&worktree, cwd);
7540 if (error->code == GOT_ERR_NOT_WORKTREE)
7541 error = wrap_not_worktree_error(error, "rebase", cwd);
7545 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7550 error = apply_unveil(got_repo_get_path(repo), 0,
7551 got_worktree_get_root_path(worktree));
7555 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7559 if (histedit_in_progress) {
7560 error = got_error(GOT_ERR_HISTEDIT_BUSY);
7564 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7569 struct got_update_progress_arg upa;
7570 if (!rebase_in_progress) {
7571 error = got_error(GOT_ERR_NOT_REBASING);
7574 error = got_worktree_rebase_continue(&resume_commit_id,
7575 &new_base_branch, &tmp_branch, &branch, &fileindex,
7579 printf("Switching work tree to %s\n",
7580 got_ref_get_symref_target(new_base_branch));
7581 memset(&upa, 0, sizeof(upa));
7582 error = got_worktree_rebase_abort(worktree, fileindex, repo,
7583 new_base_branch, update_progress, &upa);
7586 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7587 print_update_progress_stats(&upa);
7588 goto done; /* nothing else to do */
7591 if (continue_rebase) {
7592 if (!rebase_in_progress) {
7593 error = got_error(GOT_ERR_NOT_REBASING);
7596 error = got_worktree_rebase_continue(&resume_commit_id,
7597 &new_base_branch, &tmp_branch, &branch, &fileindex,
7602 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7603 resume_commit_id, repo);
7607 yca_id = got_object_id_dup(resume_commit_id);
7608 if (yca_id == NULL) {
7609 error = got_error_from_errno("got_object_id_dup");
7613 error = got_ref_open(&branch, repo, argv[0], 0);
7618 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7622 if (!continue_rebase) {
7623 struct got_object_id *base_commit_id;
7625 base_commit_id = got_worktree_get_base_commit_id(worktree);
7626 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7627 base_commit_id, branch_head_commit_id, repo,
7628 check_cancelled, NULL);
7631 if (yca_id == NULL) {
7632 error = got_error_msg(GOT_ERR_ANCESTRY,
7633 "specified branch shares no common ancestry "
7634 "with work tree's branch");
7638 error = check_same_branch(base_commit_id, branch, yca_id, repo);
7640 if (error->code != GOT_ERR_ANCESTRY)
7644 error = got_error_msg(GOT_ERR_SAME_BRANCH,
7645 "specified branch resolves to a commit which "
7646 "is already contained in work tree's branch");
7649 error = got_worktree_rebase_prepare(&new_base_branch,
7650 &tmp_branch, &fileindex, worktree, branch, repo);
7655 commit_id = branch_head_commit_id;
7656 error = got_object_open_as_commit(&commit, repo, commit_id);
7660 parent_ids = got_object_commit_get_parent_ids(commit);
7661 pid = SIMPLEQ_FIRST(parent_ids);
7663 if (!continue_rebase) {
7664 struct got_update_progress_arg upa;
7665 memset(&upa, 0, sizeof(upa));
7666 error = got_worktree_rebase_abort(worktree, fileindex,
7667 repo, new_base_branch, update_progress, &upa);
7670 printf("Rebase of %s aborted\n",
7671 got_ref_get_name(branch));
7672 print_update_progress_stats(&upa);
7675 error = got_error(GOT_ERR_EMPTY_REBASE);
7678 error = collect_commits(&commits, commit_id, pid->id,
7679 yca_id, got_worktree_get_path_prefix(worktree),
7680 GOT_ERR_REBASE_PATH, repo);
7681 got_object_commit_close(commit);
7686 if (SIMPLEQ_EMPTY(&commits)) {
7687 if (continue_rebase) {
7688 error = rebase_complete(worktree, fileindex,
7689 branch, new_base_branch, tmp_branch, repo);
7692 /* Fast-forward the reference of the branch. */
7693 struct got_object_id *new_head_commit_id;
7695 error = got_ref_resolve(&new_head_commit_id, repo,
7699 error = got_object_id_str(&id_str, new_head_commit_id);
7700 printf("Forwarding %s to commit %s\n",
7701 got_ref_get_name(branch), id_str);
7703 error = got_ref_change_ref(branch,
7704 new_head_commit_id);
7711 SIMPLEQ_FOREACH(qid, &commits, entry) {
7712 struct got_update_progress_arg upa;
7714 commit_id = qid->id;
7715 parent_id = pid ? pid->id : yca_id;
7718 memset(&upa, 0, sizeof(upa));
7719 error = got_worktree_rebase_merge_files(&merged_paths,
7720 worktree, fileindex, parent_id, commit_id, repo,
7721 update_progress, &upa, check_cancelled, NULL);
7725 print_update_progress_stats(&upa);
7726 if (upa.conflicts > 0)
7727 rebase_status = GOT_STATUS_CONFLICT;
7729 if (rebase_status == GOT_STATUS_CONFLICT) {
7730 error = show_rebase_merge_conflict(qid->id, repo);
7733 got_worktree_rebase_pathlist_free(&merged_paths);
7737 error = rebase_commit(&merged_paths, worktree, fileindex,
7738 tmp_branch, commit_id, repo);
7739 got_worktree_rebase_pathlist_free(&merged_paths);
7744 if (rebase_status == GOT_STATUS_CONFLICT) {
7745 error = got_worktree_rebase_postpone(worktree, fileindex);
7748 error = got_error_msg(GOT_ERR_CONFLICTS,
7749 "conflicts must be resolved before rebasing can continue");
7751 error = rebase_complete(worktree, fileindex, branch,
7752 new_base_branch, tmp_branch, repo);
7754 got_object_id_queue_free(&commits);
7755 free(branch_head_commit_id);
7756 free(resume_commit_id);
7759 got_object_commit_close(commit);
7761 got_ref_close(branch);
7762 if (new_base_branch)
7763 got_ref_close(new_base_branch);
7765 got_ref_close(tmp_branch);
7767 got_worktree_close(worktree);
7769 got_repo_close(repo);
7774 usage_histedit(void)
7776 fprintf(stderr, "usage: %s histedit [-a] [-c] [-F histedit-script] [-m]\n",
7781 #define GOT_HISTEDIT_PICK 'p'
7782 #define GOT_HISTEDIT_EDIT 'e'
7783 #define GOT_HISTEDIT_FOLD 'f'
7784 #define GOT_HISTEDIT_DROP 'd'
7785 #define GOT_HISTEDIT_MESG 'm'
7787 static struct got_histedit_cmd {
7791 } got_histedit_cmds[] = {
7792 { GOT_HISTEDIT_PICK, "pick", "use commit" },
7793 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
7794 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
7796 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
7797 { GOT_HISTEDIT_MESG, "mesg",
7798 "single-line log message for commit above (open editor if empty)" },
7801 struct got_histedit_list_entry {
7802 TAILQ_ENTRY(got_histedit_list_entry) entry;
7803 struct got_object_id *commit_id;
7804 const struct got_histedit_cmd *cmd;
7807 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
7809 static const struct got_error *
7810 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
7811 FILE *f, struct got_repository *repo)
7813 const struct got_error *err = NULL;
7814 char *logmsg = NULL, *id_str = NULL;
7815 struct got_commit_object *commit = NULL;
7818 err = got_object_open_as_commit(&commit, repo, commit_id);
7822 err = get_short_logmsg(&logmsg, 34, commit);
7826 err = got_object_id_str(&id_str, commit_id);
7830 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
7832 err = got_ferror(f, GOT_ERR_IO);
7835 got_object_commit_close(commit);
7841 static const struct got_error *
7842 histedit_write_commit_list(struct got_object_id_queue *commits,
7843 FILE *f, int edit_logmsg_only, struct got_repository *repo)
7845 const struct got_error *err = NULL;
7846 struct got_object_qid *qid;
7848 if (SIMPLEQ_EMPTY(commits))
7849 return got_error(GOT_ERR_EMPTY_HISTEDIT);
7851 SIMPLEQ_FOREACH(qid, commits, entry) {
7852 err = histedit_write_commit(qid->id, got_histedit_cmds[0].name,
7856 if (edit_logmsg_only) {
7857 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
7859 err = got_ferror(f, GOT_ERR_IO);
7868 static const struct got_error *
7869 write_cmd_list(FILE *f, const char *branch_name,
7870 struct got_object_id_queue *commits)
7872 const struct got_error *err = NULL;
7875 struct got_object_qid *qid;
7877 qid = SIMPLEQ_FIRST(commits);
7878 err = got_object_id_str(&id_str, qid->id);
7883 "# Editing the history of branch '%s' starting at\n"
7885 "# Commits will be processed in order from top to "
7886 "bottom of this file.\n", branch_name, id_str);
7888 err = got_ferror(f, GOT_ERR_IO);
7892 n = fprintf(f, "# Available histedit commands:\n");
7894 err = got_ferror(f, GOT_ERR_IO);
7898 for (i = 0; i < nitems(got_histedit_cmds); i++) {
7899 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
7900 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
7903 err = got_ferror(f, GOT_ERR_IO);
7912 static const struct got_error *
7913 histedit_syntax_error(int lineno)
7915 static char msg[42];
7918 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
7920 if (ret == -1 || ret >= sizeof(msg))
7921 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
7923 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
7926 static const struct got_error *
7927 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
7928 char *logmsg, struct got_repository *repo)
7930 const struct got_error *err;
7931 struct got_commit_object *folded_commit = NULL;
7932 char *id_str, *folded_logmsg = NULL;
7934 err = got_object_id_str(&id_str, hle->commit_id);
7938 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
7942 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
7945 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
7946 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
7947 folded_logmsg) == -1) {
7948 err = got_error_from_errno("asprintf");
7952 got_object_commit_close(folded_commit);
7954 free(folded_logmsg);
7958 static struct got_histedit_list_entry *
7959 get_folded_commits(struct got_histedit_list_entry *hle)
7961 struct got_histedit_list_entry *prev, *folded = NULL;
7963 prev = TAILQ_PREV(hle, got_histedit_list, entry);
7964 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
7965 prev->cmd->code == GOT_HISTEDIT_DROP)) {
7966 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
7968 prev = TAILQ_PREV(prev, got_histedit_list, entry);
7974 static const struct got_error *
7975 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
7976 struct got_repository *repo)
7978 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
7979 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
7980 const struct got_error *err = NULL;
7981 struct got_commit_object *commit = NULL;
7984 struct got_histedit_list_entry *folded = NULL;
7986 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
7990 folded = get_folded_commits(hle);
7992 while (folded != hle) {
7993 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
7994 folded = TAILQ_NEXT(folded, entry);
7997 err = append_folded_commit_msg(&new_msg, folded,
8003 folded = TAILQ_NEXT(folded, entry);
8007 err = got_object_id_str(&id_str, hle->commit_id);
8010 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8013 logmsg_len = asprintf(&new_msg,
8014 "%s\n# original log message of commit %s: %s",
8015 logmsg ? logmsg : "", id_str, orig_logmsg);
8016 if (logmsg_len == -1) {
8017 err = got_error_from_errno("asprintf");
8023 err = got_object_id_str(&id_str, hle->commit_id);
8027 err = got_opentemp_named_fd(&logmsg_path, &fd,
8028 GOT_TMPDIR_STR "/got-logmsg");
8032 write(fd, logmsg, logmsg_len);
8035 err = get_editor(&editor);
8039 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8042 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8044 err = got_object_commit_get_logmsg(&hle->logmsg, commit);
8047 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8048 err = got_error_from_errno2("unlink", logmsg_path);
8054 got_object_commit_close(commit);
8058 static const struct got_error *
8059 histedit_parse_list(struct got_histedit_list *histedit_cmds,
8060 FILE *f, struct got_repository *repo)
8062 const struct got_error *err = NULL;
8063 char *line = NULL, *p, *end;
8067 const struct got_histedit_cmd *cmd;
8068 struct got_object_id *commit_id = NULL;
8069 struct got_histedit_list_entry *hle = NULL;
8072 len = getline(&line, &size, f);
8074 const struct got_error *getline_err;
8077 getline_err = got_error_from_errno("getline");
8078 err = got_ferror(f, getline_err->code);
8083 while (isspace((unsigned char)p[0]))
8085 if (p[0] == '#' || p[0] == '\0') {
8091 for (i = 0; i < nitems(got_histedit_cmds); i++) {
8092 cmd = &got_histedit_cmds[i];
8093 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8094 isspace((unsigned char)p[strlen(cmd->name)])) {
8095 p += strlen(cmd->name);
8098 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8103 if (i == nitems(got_histedit_cmds)) {
8104 err = histedit_syntax_error(lineno);
8107 while (isspace((unsigned char)p[0]))
8109 if (cmd->code == GOT_HISTEDIT_MESG) {
8110 if (hle == NULL || hle->logmsg != NULL) {
8111 err = got_error(GOT_ERR_HISTEDIT_CMD);
8115 err = histedit_edit_logmsg(hle, repo);
8119 hle->logmsg = strdup(p);
8120 if (hle->logmsg == NULL) {
8121 err = got_error_from_errno("strdup");
8130 while (end[0] && !isspace((unsigned char)end[0]))
8134 err = got_object_resolve_id_str(&commit_id, repo, p);
8136 /* override error code */
8137 err = histedit_syntax_error(lineno);
8141 hle = malloc(sizeof(*hle));
8143 err = got_error_from_errno("malloc");
8147 hle->commit_id = commit_id;
8152 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8160 static const struct got_error *
8161 histedit_check_script(struct got_histedit_list *histedit_cmds,
8162 struct got_object_id_queue *commits, struct got_repository *repo)
8164 const struct got_error *err = NULL;
8165 struct got_object_qid *qid;
8166 struct got_histedit_list_entry *hle;
8167 static char msg[92];
8170 if (TAILQ_EMPTY(histedit_cmds))
8171 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8172 "histedit script contains no commands");
8173 if (SIMPLEQ_EMPTY(commits))
8174 return got_error(GOT_ERR_EMPTY_HISTEDIT);
8176 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8177 struct got_histedit_list_entry *hle2;
8178 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8181 if (got_object_id_cmp(hle->commit_id,
8182 hle2->commit_id) != 0)
8184 err = got_object_id_str(&id_str, hle->commit_id);
8187 snprintf(msg, sizeof(msg), "commit %s is listed "
8188 "more than once in histedit script", id_str);
8190 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8194 SIMPLEQ_FOREACH(qid, commits, entry) {
8195 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8196 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8200 err = got_object_id_str(&id_str, qid->id);
8203 snprintf(msg, sizeof(msg),
8204 "commit %s missing from histedit script", id_str);
8206 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8210 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8211 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8212 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8213 "last commit in histedit script cannot be folded");
8218 static const struct got_error *
8219 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8220 const char *path, struct got_object_id_queue *commits,
8221 struct got_repository *repo)
8223 const struct got_error *err = NULL;
8227 err = get_editor(&editor);
8231 if (spawn_editor(editor, path) == -1) {
8232 err = got_error_from_errno("failed spawning editor");
8236 f = fopen(path, "r");
8238 err = got_error_from_errno("fopen");
8241 err = histedit_parse_list(histedit_cmds, f, repo);
8245 err = histedit_check_script(histedit_cmds, commits, repo);
8247 if (f && fclose(f) != 0 && err == NULL)
8248 err = got_error_from_errno("fclose");
8253 static const struct got_error *
8254 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8255 struct got_object_id_queue *, const char *, const char *,
8256 struct got_repository *);
8258 static const struct got_error *
8259 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8260 struct got_object_id_queue *commits, const char *branch_name,
8261 int edit_logmsg_only, struct got_repository *repo)
8263 const struct got_error *err;
8267 err = got_opentemp_named(&path, &f, "got-histedit");
8271 err = write_cmd_list(f, branch_name, commits);
8275 err = histedit_write_commit_list(commits, f, edit_logmsg_only, repo);
8279 if (edit_logmsg_only) {
8281 err = histedit_parse_list(histedit_cmds, f, repo);
8283 if (fclose(f) != 0) {
8284 err = got_error_from_errno("fclose");
8288 err = histedit_run_editor(histedit_cmds, path, commits, repo);
8290 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8291 err->code != GOT_ERR_HISTEDIT_CMD)
8293 err = histedit_edit_list_retry(histedit_cmds, err,
8294 commits, path, branch_name, repo);
8298 if (f && fclose(f) != 0 && err == NULL)
8299 err = got_error_from_errno("fclose");
8300 if (path && unlink(path) != 0 && err == NULL)
8301 err = got_error_from_errno2("unlink", path);
8306 static const struct got_error *
8307 histedit_save_list(struct got_histedit_list *histedit_cmds,
8308 struct got_worktree *worktree, struct got_repository *repo)
8310 const struct got_error *err = NULL;
8313 struct got_histedit_list_entry *hle;
8314 struct got_commit_object *commit = NULL;
8316 err = got_worktree_get_histedit_script_path(&path, worktree);
8320 f = fopen(path, "w");
8322 err = got_error_from_errno2("fopen", path);
8325 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8326 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8332 int n = fprintf(f, "%c %s\n",
8333 GOT_HISTEDIT_MESG, hle->logmsg);
8335 err = got_ferror(f, GOT_ERR_IO);
8341 if (f && fclose(f) != 0 && err == NULL)
8342 err = got_error_from_errno("fclose");
8345 got_object_commit_close(commit);
8350 histedit_free_list(struct got_histedit_list *histedit_cmds)
8352 struct got_histedit_list_entry *hle;
8354 while ((hle = TAILQ_FIRST(histedit_cmds))) {
8355 TAILQ_REMOVE(histedit_cmds, hle, entry);
8360 static const struct got_error *
8361 histedit_load_list(struct got_histedit_list *histedit_cmds,
8362 const char *path, struct got_repository *repo)
8364 const struct got_error *err = NULL;
8367 f = fopen(path, "r");
8369 err = got_error_from_errno2("fopen", path);
8373 err = histedit_parse_list(histedit_cmds, f, repo);
8375 if (f && fclose(f) != 0 && err == NULL)
8376 err = got_error_from_errno("fclose");
8380 static const struct got_error *
8381 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8382 const struct got_error *edit_err, struct got_object_id_queue *commits,
8383 const char *path, const char *branch_name, struct got_repository *repo)
8385 const struct got_error *err = NULL, *prev_err = edit_err;
8388 while (resp != 'c' && resp != 'r' && resp != 'a') {
8389 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8390 "or (a)bort: ", getprogname(), prev_err->msg);
8395 histedit_free_list(histedit_cmds);
8396 err = histedit_run_editor(histedit_cmds, path, commits,
8399 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8400 err->code != GOT_ERR_HISTEDIT_CMD)
8407 } else if (resp == 'r') {
8408 histedit_free_list(histedit_cmds);
8409 err = histedit_edit_script(histedit_cmds,
8410 commits, branch_name, 0, repo);
8412 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8413 err->code != GOT_ERR_HISTEDIT_CMD)
8420 } else if (resp == 'a') {
8421 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8424 printf("invalid response '%c'\n", resp);
8430 static const struct got_error *
8431 histedit_complete(struct got_worktree *worktree,
8432 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8433 struct got_reference *branch, struct got_repository *repo)
8435 printf("Switching work tree to %s\n",
8436 got_ref_get_symref_target(branch));
8437 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8441 static const struct got_error *
8442 show_histedit_progress(struct got_commit_object *commit,
8443 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8445 const struct got_error *err;
8446 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8448 err = got_object_id_str(&old_id_str, hle->commit_id);
8453 err = got_object_id_str(&new_id_str, new_id);
8458 old_id_str[12] = '\0';
8460 new_id_str[12] = '\0';
8463 logmsg = strdup(hle->logmsg);
8464 if (logmsg == NULL) {
8465 err = got_error_from_errno("strdup");
8468 trim_logmsg(logmsg, 42);
8470 err = get_short_logmsg(&logmsg, 42, commit);
8475 switch (hle->cmd->code) {
8476 case GOT_HISTEDIT_PICK:
8477 case GOT_HISTEDIT_EDIT:
8478 printf("%s -> %s: %s\n", old_id_str,
8479 new_id_str ? new_id_str : "no-op change", logmsg);
8481 case GOT_HISTEDIT_DROP:
8482 case GOT_HISTEDIT_FOLD:
8483 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8495 static const struct got_error *
8496 histedit_commit(struct got_pathlist_head *merged_paths,
8497 struct got_worktree *worktree, struct got_fileindex *fileindex,
8498 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8499 struct got_repository *repo)
8501 const struct got_error *err;
8502 struct got_commit_object *commit;
8503 struct got_object_id *new_commit_id;
8505 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8506 && hle->logmsg == NULL) {
8507 err = histedit_edit_logmsg(hle, repo);
8512 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8516 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8517 worktree, fileindex, tmp_branch, commit, hle->commit_id,
8520 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8522 err = show_histedit_progress(commit, hle, NULL);
8524 err = show_histedit_progress(commit, hle, new_commit_id);
8525 free(new_commit_id);
8528 got_object_commit_close(commit);
8532 static const struct got_error *
8533 histedit_skip_commit(struct got_histedit_list_entry *hle,
8534 struct got_worktree *worktree, struct got_repository *repo)
8536 const struct got_error *error;
8537 struct got_commit_object *commit;
8539 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8544 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8548 error = show_histedit_progress(commit, hle, NULL);
8549 got_object_commit_close(commit);
8553 static const struct got_error *
8554 check_local_changes(void *arg, unsigned char status,
8555 unsigned char staged_status, const char *path,
8556 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8557 struct got_object_id *commit_id, int dirfd, const char *de_name)
8559 int *have_local_changes = arg;
8562 case GOT_STATUS_ADD:
8563 case GOT_STATUS_DELETE:
8564 case GOT_STATUS_MODIFY:
8565 case GOT_STATUS_CONFLICT:
8566 *have_local_changes = 1;
8567 return got_error(GOT_ERR_CANCELLED);
8572 switch (staged_status) {
8573 case GOT_STATUS_ADD:
8574 case GOT_STATUS_DELETE:
8575 case GOT_STATUS_MODIFY:
8576 *have_local_changes = 1;
8577 return got_error(GOT_ERR_CANCELLED);
8585 static const struct got_error *
8586 cmd_histedit(int argc, char *argv[])
8588 const struct got_error *error = NULL;
8589 struct got_worktree *worktree = NULL;
8590 struct got_fileindex *fileindex = NULL;
8591 struct got_repository *repo = NULL;
8593 struct got_reference *branch = NULL;
8594 struct got_reference *tmp_branch = NULL;
8595 struct got_object_id *resume_commit_id = NULL;
8596 struct got_object_id *base_commit_id = NULL;
8597 struct got_object_id *head_commit_id = NULL;
8598 struct got_commit_object *commit = NULL;
8599 int ch, rebase_in_progress = 0;
8600 struct got_update_progress_arg upa;
8601 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8602 int edit_logmsg_only = 0;
8603 const char *edit_script_path = NULL;
8604 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8605 struct got_object_id_queue commits;
8606 struct got_pathlist_head merged_paths;
8607 const struct got_object_id_queue *parent_ids;
8608 struct got_object_qid *pid;
8609 struct got_histedit_list histedit_cmds;
8610 struct got_histedit_list_entry *hle;
8612 SIMPLEQ_INIT(&commits);
8613 TAILQ_INIT(&histedit_cmds);
8614 TAILQ_INIT(&merged_paths);
8615 memset(&upa, 0, sizeof(upa));
8617 while ((ch = getopt(argc, argv, "acF:m")) != -1) {
8626 edit_script_path = optarg;
8629 edit_logmsg_only = 1;
8641 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8642 "unveil", NULL) == -1)
8645 if (abort_edit && continue_edit)
8646 errx(1, "histedit's -a and -c options are mutually exclusive");
8647 if (edit_script_path && edit_logmsg_only)
8648 errx(1, "histedit's -F and -m options are mutually exclusive");
8649 if (abort_edit && edit_logmsg_only)
8650 errx(1, "histedit's -a and -m options are mutually exclusive");
8651 if (continue_edit && edit_logmsg_only)
8652 errx(1, "histedit's -c and -m options are mutually exclusive");
8657 * This command cannot apply unveil(2) in all cases because the
8658 * user may choose to run an editor to edit the histedit script
8659 * and to edit individual commit log messages.
8660 * unveil(2) traverses exec(2); if an editor is used we have to
8661 * apply unveil after edit script and log messages have been written.
8662 * XXX TODO: Make use of unveil(2) where possible.
8665 cwd = getcwd(NULL, 0);
8667 error = got_error_from_errno("getcwd");
8670 error = got_worktree_open(&worktree, cwd);
8672 if (error->code == GOT_ERR_NOT_WORKTREE)
8673 error = wrap_not_worktree_error(error, "histedit", cwd);
8677 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8682 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8685 if (rebase_in_progress) {
8686 error = got_error(GOT_ERR_REBASING);
8690 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8694 if (edit_in_progress && edit_logmsg_only) {
8695 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8696 "histedit operation is in progress in this "
8697 "work tree and must be continued or aborted "
8698 "before the -m option can be used");
8702 if (edit_in_progress && abort_edit) {
8703 error = got_worktree_histedit_continue(&resume_commit_id,
8704 &tmp_branch, &branch, &base_commit_id, &fileindex,
8708 printf("Switching work tree to %s\n",
8709 got_ref_get_symref_target(branch));
8710 error = got_worktree_histedit_abort(worktree, fileindex, repo,
8711 branch, base_commit_id, update_progress, &upa);
8714 printf("Histedit of %s aborted\n",
8715 got_ref_get_symref_target(branch));
8716 print_update_progress_stats(&upa);
8717 goto done; /* nothing else to do */
8718 } else if (abort_edit) {
8719 error = got_error(GOT_ERR_NOT_HISTEDIT);
8723 if (continue_edit) {
8726 if (!edit_in_progress) {
8727 error = got_error(GOT_ERR_NOT_HISTEDIT);
8731 error = got_worktree_get_histedit_script_path(&path, worktree);
8735 error = histedit_load_list(&histedit_cmds, path, repo);
8740 error = got_worktree_histedit_continue(&resume_commit_id,
8741 &tmp_branch, &branch, &base_commit_id, &fileindex,
8746 error = got_ref_resolve(&head_commit_id, repo, branch);
8750 error = got_object_open_as_commit(&commit, repo,
8754 parent_ids = got_object_commit_get_parent_ids(commit);
8755 pid = SIMPLEQ_FIRST(parent_ids);
8757 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8760 error = collect_commits(&commits, head_commit_id, pid->id,
8761 base_commit_id, got_worktree_get_path_prefix(worktree),
8762 GOT_ERR_HISTEDIT_PATH, repo);
8763 got_object_commit_close(commit);
8768 if (edit_in_progress) {
8769 error = got_error(GOT_ERR_HISTEDIT_BUSY);
8773 error = got_ref_open(&branch, repo,
8774 got_worktree_get_head_ref_name(worktree), 0);
8778 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
8779 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
8780 "will not edit commit history of a branch outside "
8781 "the \"refs/heads/\" reference namespace");
8785 error = got_ref_resolve(&head_commit_id, repo, branch);
8786 got_ref_close(branch);
8791 error = got_object_open_as_commit(&commit, repo,
8795 parent_ids = got_object_commit_get_parent_ids(commit);
8796 pid = SIMPLEQ_FIRST(parent_ids);
8798 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8801 error = collect_commits(&commits, head_commit_id, pid->id,
8802 got_worktree_get_base_commit_id(worktree),
8803 got_worktree_get_path_prefix(worktree),
8804 GOT_ERR_HISTEDIT_PATH, repo);
8805 got_object_commit_close(commit);
8810 if (SIMPLEQ_EMPTY(&commits)) {
8811 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
8815 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
8816 &base_commit_id, &fileindex, worktree, repo);
8820 if (edit_script_path) {
8821 error = histedit_load_list(&histedit_cmds,
8822 edit_script_path, repo);
8824 got_worktree_histedit_abort(worktree, fileindex,
8825 repo, branch, base_commit_id,
8826 update_progress, &upa);
8827 print_update_progress_stats(&upa);
8831 const char *branch_name;
8832 branch_name = got_ref_get_symref_target(branch);
8833 if (strncmp(branch_name, "refs/heads/", 11) == 0)
8835 error = histedit_edit_script(&histedit_cmds, &commits,
8836 branch_name, edit_logmsg_only, repo);
8838 got_worktree_histedit_abort(worktree, fileindex,
8839 repo, branch, base_commit_id,
8840 update_progress, &upa);
8841 print_update_progress_stats(&upa);
8847 error = histedit_save_list(&histedit_cmds, worktree,
8850 got_worktree_histedit_abort(worktree, fileindex,
8851 repo, branch, base_commit_id,
8852 update_progress, &upa);
8853 print_update_progress_stats(&upa);
8859 error = histedit_check_script(&histedit_cmds, &commits, repo);
8863 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
8864 if (resume_commit_id) {
8865 if (got_object_id_cmp(hle->commit_id,
8866 resume_commit_id) != 0)
8869 resume_commit_id = NULL;
8870 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
8871 hle->cmd->code == GOT_HISTEDIT_FOLD) {
8872 error = histedit_skip_commit(hle, worktree,
8877 struct got_pathlist_head paths;
8878 int have_changes = 0;
8881 error = got_pathlist_append(&paths, "", NULL);
8884 error = got_worktree_status(worktree, &paths,
8885 repo, check_local_changes, &have_changes,
8886 check_cancelled, NULL);
8887 got_pathlist_free(&paths);
8889 if (error->code != GOT_ERR_CANCELLED)
8891 if (sigint_received || sigpipe_received)
8895 error = histedit_commit(NULL, worktree,
8896 fileindex, tmp_branch, hle, repo);
8900 error = got_object_open_as_commit(
8901 &commit, repo, hle->commit_id);
8904 error = show_histedit_progress(commit,
8906 got_object_commit_close(commit);
8915 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
8916 error = histedit_skip_commit(hle, worktree, repo);
8922 error = got_object_open_as_commit(&commit, repo,
8926 parent_ids = got_object_commit_get_parent_ids(commit);
8927 pid = SIMPLEQ_FIRST(parent_ids);
8929 error = got_worktree_histedit_merge_files(&merged_paths,
8930 worktree, fileindex, pid->id, hle->commit_id, repo,
8931 update_progress, &upa, check_cancelled, NULL);
8934 got_object_commit_close(commit);
8937 print_update_progress_stats(&upa);
8938 if (upa.conflicts > 0)
8939 rebase_status = GOT_STATUS_CONFLICT;
8941 if (rebase_status == GOT_STATUS_CONFLICT) {
8942 error = show_rebase_merge_conflict(hle->commit_id,
8946 got_worktree_rebase_pathlist_free(&merged_paths);
8950 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
8952 error = got_object_id_str(&id_str, hle->commit_id);
8955 printf("Stopping histedit for amending commit %s\n",
8958 got_worktree_rebase_pathlist_free(&merged_paths);
8959 error = got_worktree_histedit_postpone(worktree,
8964 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
8965 error = histedit_skip_commit(hle, worktree, repo);
8971 error = histedit_commit(&merged_paths, worktree, fileindex,
8972 tmp_branch, hle, repo);
8973 got_worktree_rebase_pathlist_free(&merged_paths);
8978 if (rebase_status == GOT_STATUS_CONFLICT) {
8979 error = got_worktree_histedit_postpone(worktree, fileindex);
8982 error = got_error_msg(GOT_ERR_CONFLICTS,
8983 "conflicts must be resolved before histedit can continue");
8985 error = histedit_complete(worktree, fileindex, tmp_branch,
8988 got_object_id_queue_free(&commits);
8989 histedit_free_list(&histedit_cmds);
8990 free(head_commit_id);
8991 free(base_commit_id);
8992 free(resume_commit_id);
8994 got_object_commit_close(commit);
8996 got_ref_close(branch);
8998 got_ref_close(tmp_branch);
9000 got_worktree_close(worktree);
9002 got_repo_close(repo);
9007 usage_integrate(void)
9009 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9013 static const struct got_error *
9014 cmd_integrate(int argc, char *argv[])
9016 const struct got_error *error = NULL;
9017 struct got_repository *repo = NULL;
9018 struct got_worktree *worktree = NULL;
9019 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9020 const char *branch_arg = NULL;
9021 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9022 struct got_fileindex *fileindex = NULL;
9023 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9025 struct got_update_progress_arg upa;
9027 while ((ch = getopt(argc, argv, "")) != -1) {
9040 branch_arg = argv[0];
9042 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9043 "unveil", NULL) == -1)
9046 cwd = getcwd(NULL, 0);
9048 error = got_error_from_errno("getcwd");
9052 error = got_worktree_open(&worktree, cwd);
9054 if (error->code == GOT_ERR_NOT_WORKTREE)
9055 error = wrap_not_worktree_error(error, "integrate",
9060 error = check_rebase_or_histedit_in_progress(worktree);
9064 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9069 error = apply_unveil(got_repo_get_path(repo), 0,
9070 got_worktree_get_root_path(worktree));
9074 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9075 error = got_error_from_errno("asprintf");
9079 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9080 &base_branch_ref, worktree, refname, repo);
9084 refname = strdup(got_ref_get_name(branch_ref));
9085 if (refname == NULL) {
9086 error = got_error_from_errno("strdup");
9087 got_worktree_integrate_abort(worktree, fileindex, repo,
9088 branch_ref, base_branch_ref);
9091 base_refname = strdup(got_ref_get_name(base_branch_ref));
9092 if (base_refname == NULL) {
9093 error = got_error_from_errno("strdup");
9094 got_worktree_integrate_abort(worktree, fileindex, repo,
9095 branch_ref, base_branch_ref);
9099 error = got_ref_resolve(&commit_id, repo, branch_ref);
9103 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9107 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9108 error = got_error_msg(GOT_ERR_SAME_BRANCH,
9109 "specified branch has already been integrated");
9110 got_worktree_integrate_abort(worktree, fileindex, repo,
9111 branch_ref, base_branch_ref);
9115 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9117 if (error->code == GOT_ERR_ANCESTRY)
9118 error = got_error(GOT_ERR_REBASE_REQUIRED);
9119 got_worktree_integrate_abort(worktree, fileindex, repo,
9120 branch_ref, base_branch_ref);
9124 memset(&upa, 0, sizeof(upa));
9125 error = got_worktree_integrate_continue(worktree, fileindex, repo,
9126 branch_ref, base_branch_ref, update_progress, &upa,
9127 check_cancelled, NULL);
9131 printf("Integrated %s into %s\n", refname, base_refname);
9132 print_update_progress_stats(&upa);
9135 got_repo_close(repo);
9137 got_worktree_close(worktree);
9139 free(base_commit_id);
9149 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9150 "[-S] [file-path ...]\n",
9155 static const struct got_error *
9156 print_stage(void *arg, unsigned char status, unsigned char staged_status,
9157 const char *path, struct got_object_id *blob_id,
9158 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9159 int dirfd, const char *de_name)
9161 const struct got_error *err = NULL;
9162 char *id_str = NULL;
9164 if (staged_status != GOT_STATUS_ADD &&
9165 staged_status != GOT_STATUS_MODIFY &&
9166 staged_status != GOT_STATUS_DELETE)
9169 if (staged_status == GOT_STATUS_ADD ||
9170 staged_status == GOT_STATUS_MODIFY)
9171 err = got_object_id_str(&id_str, staged_blob_id);
9173 err = got_object_id_str(&id_str, blob_id);
9177 printf("%s %c %s\n", id_str, staged_status, path);
9182 static const struct got_error *
9183 cmd_stage(int argc, char *argv[])
9185 const struct got_error *error = NULL;
9186 struct got_repository *repo = NULL;
9187 struct got_worktree *worktree = NULL;
9189 struct got_pathlist_head paths;
9190 struct got_pathlist_entry *pe;
9191 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9192 FILE *patch_script_file = NULL;
9193 const char *patch_script_path = NULL;
9194 struct choose_patch_arg cpa;
9198 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9207 patch_script_path = optarg;
9210 allow_bad_symlinks = 1;
9222 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9223 "unveil", NULL) == -1)
9226 if (list_stage && (pflag || patch_script_path))
9227 errx(1, "-l option cannot be used with other options");
9228 if (patch_script_path && !pflag)
9229 errx(1, "-F option can only be used together with -p option");
9231 cwd = getcwd(NULL, 0);
9233 error = got_error_from_errno("getcwd");
9237 error = got_worktree_open(&worktree, cwd);
9239 if (error->code == GOT_ERR_NOT_WORKTREE)
9240 error = wrap_not_worktree_error(error, "stage", cwd);
9244 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9249 if (patch_script_path) {
9250 patch_script_file = fopen(patch_script_path, "r");
9251 if (patch_script_file == NULL) {
9252 error = got_error_from_errno2("fopen",
9257 error = apply_unveil(got_repo_get_path(repo), 0,
9258 got_worktree_get_root_path(worktree));
9262 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9267 error = got_worktree_status(worktree, &paths, repo,
9268 print_stage, NULL, check_cancelled, NULL);
9270 cpa.patch_script_file = patch_script_file;
9271 cpa.action = "stage";
9272 error = got_worktree_stage(worktree, &paths,
9273 pflag ? NULL : print_status, NULL,
9274 pflag ? choose_patch : NULL, &cpa,
9275 allow_bad_symlinks, repo);
9278 if (patch_script_file && fclose(patch_script_file) == EOF &&
9280 error = got_error_from_errno2("fclose", patch_script_path);
9282 got_repo_close(repo);
9284 got_worktree_close(worktree);
9285 TAILQ_FOREACH(pe, &paths, entry)
9286 free((char *)pe->path);
9287 got_pathlist_free(&paths);
9295 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9296 "[file-path ...]\n",
9302 static const struct got_error *
9303 cmd_unstage(int argc, char *argv[])
9305 const struct got_error *error = NULL;
9306 struct got_repository *repo = NULL;
9307 struct got_worktree *worktree = NULL;
9309 struct got_pathlist_head paths;
9310 struct got_pathlist_entry *pe;
9312 struct got_update_progress_arg upa;
9313 FILE *patch_script_file = NULL;
9314 const char *patch_script_path = NULL;
9315 struct choose_patch_arg cpa;
9319 while ((ch = getopt(argc, argv, "pF:")) != -1) {
9325 patch_script_path = optarg;
9337 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9338 "unveil", NULL) == -1)
9341 if (patch_script_path && !pflag)
9342 errx(1, "-F option can only be used together with -p option");
9344 cwd = getcwd(NULL, 0);
9346 error = got_error_from_errno("getcwd");
9350 error = got_worktree_open(&worktree, cwd);
9352 if (error->code == GOT_ERR_NOT_WORKTREE)
9353 error = wrap_not_worktree_error(error, "unstage", cwd);
9357 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9362 if (patch_script_path) {
9363 patch_script_file = fopen(patch_script_path, "r");
9364 if (patch_script_file == NULL) {
9365 error = got_error_from_errno2("fopen",
9371 error = apply_unveil(got_repo_get_path(repo), 0,
9372 got_worktree_get_root_path(worktree));
9376 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9380 cpa.patch_script_file = patch_script_file;
9381 cpa.action = "unstage";
9382 memset(&upa, 0, sizeof(upa));
9383 error = got_worktree_unstage(worktree, &paths, update_progress,
9384 &upa, pflag ? choose_patch : NULL, &cpa, repo);
9386 print_update_progress_stats(&upa);
9388 if (patch_script_file && fclose(patch_script_file) == EOF &&
9390 error = got_error_from_errno2("fclose", patch_script_path);
9392 got_repo_close(repo);
9394 got_worktree_close(worktree);
9395 TAILQ_FOREACH(pe, &paths, entry)
9396 free((char *)pe->path);
9397 got_pathlist_free(&paths);
9405 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9406 "arg1 [arg2 ...]\n", getprogname());
9410 static const struct got_error *
9411 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9413 const struct got_error *err;
9414 struct got_blob_object *blob;
9416 err = got_object_open_as_blob(&blob, repo, id, 8192);
9420 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9421 got_object_blob_close(blob);
9425 static const struct got_error *
9426 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9428 const struct got_error *err;
9429 struct got_tree_object *tree;
9432 err = got_object_open_as_tree(&tree, repo, id);
9436 nentries = got_object_tree_get_nentries(tree);
9437 for (i = 0; i < nentries; i++) {
9438 struct got_tree_entry *te;
9440 if (sigint_received || sigpipe_received)
9442 te = got_object_tree_get_entry(tree, i);
9443 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9446 fprintf(outfile, "%s %.7o %s\n", id_str,
9447 got_tree_entry_get_mode(te),
9448 got_tree_entry_get_name(te));
9452 got_object_tree_close(tree);
9456 static const struct got_error *
9457 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9459 const struct got_error *err;
9460 struct got_commit_object *commit;
9461 const struct got_object_id_queue *parent_ids;
9462 struct got_object_qid *pid;
9463 char *id_str = NULL;
9464 const char *logmsg = NULL;
9466 err = got_object_open_as_commit(&commit, repo, id);
9470 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9474 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9475 parent_ids = got_object_commit_get_parent_ids(commit);
9476 fprintf(outfile, "numparents %d\n",
9477 got_object_commit_get_nparents(commit));
9478 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9480 err = got_object_id_str(&pid_str, pid->id);
9483 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9486 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9487 got_object_commit_get_author(commit),
9488 (long long)got_object_commit_get_author_time(commit));
9490 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9491 got_object_commit_get_author(commit),
9492 (long long)got_object_commit_get_committer_time(commit));
9494 logmsg = got_object_commit_get_logmsg_raw(commit);
9495 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9496 fprintf(outfile, "%s", logmsg);
9499 got_object_commit_close(commit);
9503 static const struct got_error *
9504 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9506 const struct got_error *err;
9507 struct got_tag_object *tag;
9508 char *id_str = NULL;
9509 const char *tagmsg = NULL;
9511 err = got_object_open_as_tag(&tag, repo, id);
9515 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9519 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9521 switch (got_object_tag_get_object_type(tag)) {
9522 case GOT_OBJ_TYPE_BLOB:
9523 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9524 GOT_OBJ_LABEL_BLOB);
9526 case GOT_OBJ_TYPE_TREE:
9527 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9528 GOT_OBJ_LABEL_TREE);
9530 case GOT_OBJ_TYPE_COMMIT:
9531 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9532 GOT_OBJ_LABEL_COMMIT);
9534 case GOT_OBJ_TYPE_TAG:
9535 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9542 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9543 got_object_tag_get_name(tag));
9545 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9546 got_object_tag_get_tagger(tag),
9547 (long long)got_object_tag_get_tagger_time(tag));
9549 tagmsg = got_object_tag_get_message(tag);
9550 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9551 fprintf(outfile, "%s", tagmsg);
9554 got_object_tag_close(tag);
9558 static const struct got_error *
9559 cmd_cat(int argc, char *argv[])
9561 const struct got_error *error;
9562 struct got_repository *repo = NULL;
9563 struct got_worktree *worktree = NULL;
9564 char *cwd = NULL, *repo_path = NULL, *label = NULL;
9565 const char *commit_id_str = NULL;
9566 struct got_object_id *id = NULL, *commit_id = NULL;
9567 int ch, obj_type, i, force_path = 0;
9570 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9575 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9578 commit_id_str = optarg;
9581 repo_path = realpath(optarg, NULL);
9582 if (repo_path == NULL)
9583 return got_error_from_errno2("realpath",
9585 got_path_strip_trailing_slashes(repo_path);
9599 cwd = getcwd(NULL, 0);
9601 error = got_error_from_errno("getcwd");
9604 error = got_worktree_open(&worktree, cwd);
9605 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9608 if (repo_path == NULL) {
9610 got_worktree_get_repo_path(worktree));
9611 if (repo_path == NULL) {
9612 error = got_error_from_errno("strdup");
9618 if (repo_path == NULL) {
9619 repo_path = getcwd(NULL, 0);
9620 if (repo_path == NULL)
9621 return got_error_from_errno("getcwd");
9624 error = got_repo_open(&repo, repo_path, NULL);
9629 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9633 if (commit_id_str == NULL)
9634 commit_id_str = GOT_REF_HEAD;
9635 error = got_repo_match_object_id(&commit_id, NULL,
9636 commit_id_str, GOT_OBJ_TYPE_COMMIT, 1, repo);
9640 for (i = 0; i < argc; i++) {
9642 error = got_object_id_by_path(&id, repo, commit_id,
9647 error = got_repo_match_object_id(&id, &label, argv[i],
9648 GOT_OBJ_TYPE_ANY, 0, repo);
9650 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9651 error->code != GOT_ERR_NOT_REF)
9653 error = got_object_id_by_path(&id, repo,
9654 commit_id, argv[i]);
9660 error = got_object_get_type(&obj_type, repo, id);
9665 case GOT_OBJ_TYPE_BLOB:
9666 error = cat_blob(id, repo, stdout);
9668 case GOT_OBJ_TYPE_TREE:
9669 error = cat_tree(id, repo, stdout);
9671 case GOT_OBJ_TYPE_COMMIT:
9672 error = cat_commit(id, repo, stdout);
9674 case GOT_OBJ_TYPE_TAG:
9675 error = cat_tag(id, repo, stdout);
9678 error = got_error(GOT_ERR_OBJ_TYPE);
9693 got_worktree_close(worktree);
9695 const struct got_error *repo_error;
9696 repo_error = got_repo_close(repo);
9706 fprintf(stderr, "usage: %s info [path ...]\n",
9711 static const struct got_error *
9712 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
9713 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9714 struct got_object_id *commit_id)
9716 const struct got_error *err = NULL;
9717 char *id_str = NULL;
9719 struct tm mytm, *tm;
9720 struct got_pathlist_head *paths = arg;
9721 struct got_pathlist_entry *pe;
9724 * Clear error indication from any of the path arguments which
9725 * would cause this file index entry to be displayed.
9727 TAILQ_FOREACH(pe, paths, entry) {
9728 if (got_path_cmp(path, pe->path, strlen(path),
9729 pe->path_len) == 0 ||
9730 got_path_is_child(path, pe->path, pe->path_len))
9731 pe->data = NULL; /* no error */
9734 printf(GOT_COMMIT_SEP_STR);
9736 printf("symlink: %s\n", path);
9737 else if (S_ISREG(mode)) {
9738 printf("file: %s\n", path);
9739 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
9740 } else if (S_ISDIR(mode))
9741 printf("directory: %s\n", path);
9743 printf("something: %s\n", path);
9745 tm = localtime_r(&mtime, &mytm);
9748 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
9749 return got_error(GOT_ERR_NO_SPACE);
9750 printf("timestamp: %s\n", datebuf);
9753 err = got_object_id_str(&id_str, blob_id);
9756 printf("based on blob: %s\n", id_str);
9760 if (staged_blob_id) {
9761 err = got_object_id_str(&id_str, staged_blob_id);
9764 printf("based on staged blob: %s\n", id_str);
9769 err = got_object_id_str(&id_str, commit_id);
9772 printf("based on commit: %s\n", id_str);
9779 static const struct got_error *
9780 cmd_info(int argc, char *argv[])
9782 const struct got_error *error = NULL;
9783 struct got_worktree *worktree = NULL;
9784 char *cwd = NULL, *id_str = NULL;
9785 struct got_pathlist_head paths;
9786 struct got_pathlist_entry *pe;
9787 char *uuidstr = NULL;
9788 int ch, show_files = 0;
9792 while ((ch = getopt(argc, argv, "")) != -1) {
9804 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
9808 cwd = getcwd(NULL, 0);
9810 error = got_error_from_errno("getcwd");
9814 error = got_worktree_open(&worktree, cwd);
9816 if (error->code == GOT_ERR_NOT_WORKTREE)
9817 error = wrap_not_worktree_error(error, "status", cwd);
9821 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
9826 error = get_worktree_paths_from_argv(&paths, argc, argv,
9833 error = got_object_id_str(&id_str,
9834 got_worktree_get_base_commit_id(worktree));
9838 error = got_worktree_get_uuid(&uuidstr, worktree);
9842 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
9843 printf("work tree base commit: %s\n", id_str);
9844 printf("work tree path prefix: %s\n",
9845 got_worktree_get_path_prefix(worktree));
9846 printf("work tree branch reference: %s\n",
9847 got_worktree_get_head_ref_name(worktree));
9848 printf("work tree UUID: %s\n", uuidstr);
9849 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
9852 struct got_pathlist_entry *pe;
9853 TAILQ_FOREACH(pe, &paths, entry) {
9854 if (pe->path_len == 0)
9857 * Assume this path will fail. This will be corrected
9858 * in print_path_info() in case the path does suceeed.
9860 pe->data = (void *)got_error_path(pe->path,
9863 error = got_worktree_path_info(worktree, &paths,
9864 print_path_info, &paths, check_cancelled, NULL);
9867 TAILQ_FOREACH(pe, &paths, entry) {
9868 if (pe->data != NULL) {
9869 error = pe->data; /* bad path */
9875 TAILQ_FOREACH(pe, &paths, entry)
9876 free((char *)pe->path);
9877 got_pathlist_free(&paths);