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 option_conflict(char a, char b)
189 errx(1, "-%c and -%c options are mutually exclusive", a, b);
193 main(int argc, char *argv[])
198 int hflag = 0, Vflag = 0;
199 static struct option longopts[] = {
200 { "version", no_argument, NULL, 'V' },
204 setlocale(LC_CTYPE, "");
206 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
226 got_version_print_str();
231 usage(hflag, hflag ? 0 : 1);
233 signal(SIGINT, catch_sigint);
234 signal(SIGPIPE, catch_sigpipe);
236 for (i = 0; i < nitems(got_commands); i++) {
237 const struct got_error *error;
239 cmd = &got_commands[i];
241 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
242 strcmp(cmd->cmd_alias, argv[0]) != 0)
246 got_commands[i].cmd_usage();
248 error = got_commands[i].cmd_main(argc, argv);
249 if (error && error->code != GOT_ERR_CANCELLED &&
250 error->code != GOT_ERR_PRIVSEP_EXIT &&
251 !(sigpipe_received &&
252 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
254 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
255 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
262 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
263 list_commands(stderr);
268 usage(int hflag, int status)
270 FILE *fp = (status == 0) ? stdout : stderr;
272 fprintf(fp, "usage: %s [-h] [-V | --version] command [arg ...]\n",
279 static const struct got_error *
280 get_editor(char **abspath)
282 const struct got_error *err = NULL;
287 editor = getenv("VISUAL");
289 editor = getenv("EDITOR");
292 err = got_path_find_prog(abspath, editor);
297 if (*abspath == NULL) {
298 *abspath = strdup("/bin/ed");
299 if (*abspath == NULL)
300 return got_error_from_errno("strdup");
306 static const struct got_error *
307 apply_unveil(const char *repo_path, int repo_read_only,
308 const char *worktree_path)
310 const struct got_error *err;
313 if (unveil("gmon.out", "rwc") != 0)
314 return got_error_from_errno2("unveil", "gmon.out");
316 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
317 return got_error_from_errno2("unveil", repo_path);
319 if (worktree_path && unveil(worktree_path, "rwc") != 0)
320 return got_error_from_errno2("unveil", worktree_path);
322 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
323 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
325 err = got_privsep_unveil_exec_helpers();
329 if (unveil(NULL, NULL) != 0)
330 return got_error_from_errno("unveil");
338 fprintf(stderr, "usage: %s init repository-path\n", getprogname());
342 static const struct got_error *
343 cmd_init(int argc, char *argv[])
345 const struct got_error *error = NULL;
346 char *repo_path = NULL;
349 while ((ch = getopt(argc, argv, "")) != -1) {
361 if (pledge("stdio rpath wpath cpath unveil", NULL) == -1)
367 repo_path = strdup(argv[0]);
368 if (repo_path == NULL)
369 return got_error_from_errno("strdup");
371 got_path_strip_trailing_slashes(repo_path);
373 error = got_path_mkdir(repo_path);
375 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
378 error = apply_unveil(repo_path, 0, NULL);
382 error = got_repo_init(repo_path);
391 fprintf(stderr, "usage: %s import [-b branch] [-m message] "
392 "[-r repository-path] [-I pattern] path\n", getprogname());
397 spawn_editor(const char *editor, const char *file)
400 sig_t sighup, sigint, sigquit;
403 sighup = signal(SIGHUP, SIG_IGN);
404 sigint = signal(SIGINT, SIG_IGN);
405 sigquit = signal(SIGQUIT, SIG_IGN);
407 switch (pid = fork()) {
411 execl(editor, editor, file, (char *)NULL);
415 while (waitpid(pid, &st, 0) == -1)
420 (void)signal(SIGHUP, sighup);
421 (void)signal(SIGINT, sigint);
422 (void)signal(SIGQUIT, sigquit);
424 if (!WIFEXITED(st)) {
429 return WEXITSTATUS(st);
432 static const struct got_error *
433 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
434 const char *initial_content, size_t initial_content_len,
435 int require_modification)
437 const struct got_error *err = NULL;
443 size_t len, logmsg_len;
444 char *initial_content_stripped = NULL, *buf = NULL, *s;
448 if (stat(logmsg_path, &st) == -1)
449 return got_error_from_errno2("stat", logmsg_path);
451 if (spawn_editor(editor, logmsg_path) == -1)
452 return got_error_from_errno("failed spawning editor");
454 if (stat(logmsg_path, &st2) == -1)
455 return got_error_from_errno("stat");
457 if (require_modification &&
458 st.st_mtime == st2.st_mtime && st.st_size == st2.st_size)
459 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
460 "no changes made to commit message, aborting");
463 * Set up a stripped version of the initial content without comments
464 * and blank lines. We need this in order to check if the message
465 * has in fact been edited.
467 initial_content_stripped = malloc(initial_content_len + 1);
468 if (initial_content_stripped == NULL)
469 return got_error_from_errno("malloc");
470 initial_content_stripped[0] = '\0';
472 buf = strdup(initial_content);
474 err = got_error_from_errno("strdup");
479 while ((line = strsep(&s, "\n")) != NULL) {
480 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
481 continue; /* remove comments and leading empty lines */
482 len = strlcat(initial_content_stripped, line,
483 initial_content_len + 1);
484 if (len >= initial_content_len + 1) {
485 err = got_error(GOT_ERR_NO_SPACE);
489 while (len > 0 && initial_content_stripped[len - 1] == '\n') {
490 initial_content_stripped[len - 1] = '\0';
494 logmsg_len = st2.st_size;
495 *logmsg = malloc(logmsg_len + 1);
497 return got_error_from_errno("malloc");
500 fp = fopen(logmsg_path, "r");
502 err = got_error_from_errno("fopen");
507 while ((linelen = getline(&line, &linesize, fp)) != -1) {
508 if ((line[0] == '#' || (len == 0 && line[0] == '\n')))
509 continue; /* remove comments and leading empty lines */
510 len = strlcat(*logmsg, line, logmsg_len + 1);
511 if (len >= logmsg_len + 1) {
512 err = got_error(GOT_ERR_NO_SPACE);
518 err = got_ferror(fp, GOT_ERR_IO);
521 while (len > 0 && (*logmsg)[len - 1] == '\n') {
522 (*logmsg)[len - 1] = '\0';
527 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
528 "commit message cannot be empty, aborting");
531 if (require_modification &&
532 strcmp(*logmsg, initial_content_stripped) == 0)
533 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
534 "no changes made to commit message, aborting");
536 free(initial_content_stripped);
538 if (fp && fclose(fp) == EOF && err == NULL)
539 err = got_error_from_errno("fclose");
547 static const struct got_error *
548 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
549 const char *path_dir, const char *branch_name)
551 char *initial_content = NULL;
552 const struct got_error *err = NULL;
553 int initial_content_len;
556 initial_content_len = asprintf(&initial_content,
557 "\n# %s to be imported to branch %s\n", path_dir,
559 if (initial_content_len == -1)
560 return got_error_from_errno("asprintf");
562 err = got_opentemp_named_fd(logmsg_path, &fd,
563 GOT_TMPDIR_STR "/got-importmsg");
567 if (write(fd, initial_content, initial_content_len) == -1) {
568 err = got_error_from_errno2("write", *logmsg_path);
572 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
573 initial_content_len, 1);
575 if (fd != -1 && close(fd) == -1 && err == NULL)
576 err = got_error_from_errno2("close", *logmsg_path);
577 free(initial_content);
585 static const struct got_error *
586 import_progress(void *arg, const char *path)
588 printf("A %s\n", path);
592 static const struct got_error *
593 get_author(char **author, struct got_repository *repo,
594 struct got_worktree *worktree)
596 const struct got_error *err = NULL;
597 const char *got_author = NULL, *name, *email;
598 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
603 worktree_conf = got_worktree_get_gotconfig(worktree);
604 repo_conf = got_repo_get_gotconfig(repo);
607 * Priority of potential author information sources, from most
608 * significant to least significant:
609 * 1) work tree's .got/got.conf file
610 * 2) repository's got.conf file
611 * 3) repository's git config file
612 * 4) environment variables
613 * 5) global git config files (in user's home directory or /etc)
617 got_author = got_gotconfig_get_author(worktree_conf);
618 if (got_author == NULL)
619 got_author = got_gotconfig_get_author(repo_conf);
620 if (got_author == NULL) {
621 name = got_repo_get_gitconfig_author_name(repo);
622 email = got_repo_get_gitconfig_author_email(repo);
624 if (asprintf(author, "%s <%s>", name, email) == -1)
625 return got_error_from_errno("asprintf");
629 got_author = getenv("GOT_AUTHOR");
630 if (got_author == NULL) {
631 name = got_repo_get_global_gitconfig_author_name(repo);
632 email = got_repo_get_global_gitconfig_author_email(
635 if (asprintf(author, "%s <%s>", name, email)
637 return got_error_from_errno("asprintf");
640 /* TODO: Look up user in password database? */
641 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
645 *author = strdup(got_author);
647 return got_error_from_errno("strdup");
650 * Really dumb email address check; we're only doing this to
651 * avoid git's object parser breaking on commits we create.
653 while (*got_author && *got_author != '<')
655 if (*got_author != '<') {
656 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
659 while (*got_author && *got_author != '@')
661 if (*got_author != '@') {
662 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
665 while (*got_author && *got_author != '>')
667 if (*got_author != '>')
668 err = got_error(GOT_ERR_COMMIT_NO_EMAIL);
677 static const struct got_error *
678 get_gitconfig_path(char **gitconfig_path)
680 const char *homedir = getenv("HOME");
682 *gitconfig_path = NULL;
684 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
685 return got_error_from_errno("asprintf");
691 static const struct got_error *
692 cmd_import(int argc, char *argv[])
694 const struct got_error *error = NULL;
695 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
696 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
697 const char *branch_name = "main";
698 char *refname = NULL, *id_str = NULL, *logmsg_path = NULL;
699 struct got_repository *repo = NULL;
700 struct got_reference *branch_ref = NULL, *head_ref = NULL;
701 struct got_object_id *new_commit_id = NULL;
703 struct got_pathlist_head ignores;
704 struct got_pathlist_entry *pe;
705 int preserve_logmsg = 0;
707 TAILQ_INIT(&ignores);
709 while ((ch = getopt(argc, argv, "b:m:r:I:")) != -1) {
712 branch_name = optarg;
715 logmsg = strdup(optarg);
716 if (logmsg == NULL) {
717 error = got_error_from_errno("strdup");
722 repo_path = realpath(optarg, NULL);
723 if (repo_path == NULL) {
724 error = got_error_from_errno2("realpath",
730 if (optarg[0] == '\0')
732 error = got_pathlist_insert(&pe, &ignores, optarg,
747 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
755 if (repo_path == NULL) {
756 repo_path = getcwd(NULL, 0);
757 if (repo_path == NULL)
758 return got_error_from_errno("getcwd");
760 got_path_strip_trailing_slashes(repo_path);
761 error = get_gitconfig_path(&gitconfig_path);
764 error = got_repo_open(&repo, repo_path, gitconfig_path);
768 error = get_author(&author, repo, NULL);
773 * Don't let the user create a branch name with a leading '-'.
774 * While technically a valid reference name, this case is usually
775 * an unintended typo.
777 if (branch_name[0] == '-')
778 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
780 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
781 error = got_error_from_errno("asprintf");
785 error = got_ref_open(&branch_ref, repo, refname, 0);
787 if (error->code != GOT_ERR_NOT_REF)
790 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
791 "import target branch already exists");
795 path_dir = realpath(argv[0], NULL);
796 if (path_dir == NULL) {
797 error = got_error_from_errno2("realpath", argv[0]);
800 got_path_strip_trailing_slashes(path_dir);
803 * unveil(2) traverses exec(2); if an editor is used we have
804 * to apply unveil after the log message has been written.
806 if (logmsg == NULL || strlen(logmsg) == 0) {
807 error = get_editor(&editor);
811 error = collect_import_msg(&logmsg, &logmsg_path, editor,
814 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
821 if (unveil(path_dir, "r") != 0) {
822 error = got_error_from_errno2("unveil", path_dir);
828 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
835 error = got_repo_import(&new_commit_id, path_dir, logmsg,
836 author, &ignores, repo, import_progress, NULL);
843 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
850 error = got_ref_write(branch_ref, repo);
857 error = got_object_id_str(&id_str, new_commit_id);
864 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
866 if (error->code != GOT_ERR_NOT_REF) {
872 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
880 error = got_ref_write(head_ref, repo);
888 printf("Created branch %s with commit %s\n",
889 got_ref_get_name(branch_ref), id_str);
891 if (preserve_logmsg) {
892 fprintf(stderr, "%s: log message preserved in %s\n",
893 getprogname(), logmsg_path);
894 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
895 error = got_error_from_errno2("unlink", logmsg_path);
904 free(gitconfig_path);
906 got_ref_close(branch_ref);
908 got_ref_close(head_ref);
915 fprintf(stderr, "usage: %s clone [-a] [-b branch] [-l] [-m] [-q] [-v] "
916 "[-R reference] repository-url [directory]\n", getprogname());
920 struct got_fetch_progress_arg {
921 char last_scaled_size[FMT_SCALED_STRSIZE];
926 struct got_repository *repo;
931 struct got_pathlist_head *symrefs;
932 struct got_pathlist_head *wanted_branches;
933 struct got_pathlist_head *wanted_refs;
937 const char *remote_repo_path;
939 int fetch_all_branches;
940 int mirror_references;
944 /* XXX forward declaration */
945 static const struct got_error *
946 create_config_files(const char *proto, const char *host, const char *port,
947 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
948 int mirror_references, struct got_pathlist_head *symrefs,
949 struct got_pathlist_head *wanted_branches,
950 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
952 static const struct got_error *
953 fetch_progress(void *arg, const char *message, off_t packfile_size,
954 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
956 const struct got_error *err = NULL;
957 struct got_fetch_progress_arg *a = arg;
958 char scaled_size[FMT_SCALED_STRSIZE];
959 int p_indexed, p_resolved;
960 int print_size = 0, print_indexed = 0, print_resolved = 0;
963 * In order to allow a failed clone to be resumed with 'got fetch'
964 * we try to create configuration files as soon as possible.
965 * Once the server has sent information about its default branch
966 * we have all required information.
968 if (a->create_configs && !a->configs_created &&
969 !TAILQ_EMPTY(a->config_info.symrefs)) {
970 err = create_config_files(a->config_info.proto,
971 a->config_info.host, a->config_info.port,
972 a->config_info.remote_repo_path,
973 a->config_info.git_url,
974 a->config_info.fetch_all_branches,
975 a->config_info.mirror_references,
976 a->config_info.symrefs,
977 a->config_info.wanted_branches,
978 a->config_info.wanted_refs, a->repo);
981 a->configs_created = 1;
984 if (a->verbosity < 0)
987 if (message && message[0] != '\0') {
988 printf("\rserver: %s", message);
993 if (packfile_size > 0 || nobj_indexed > 0) {
994 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
995 (a->last_scaled_size[0] == '\0' ||
996 strcmp(scaled_size, a->last_scaled_size)) != 0) {
998 if (strlcpy(a->last_scaled_size, scaled_size,
999 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1000 return got_error(GOT_ERR_NO_SPACE);
1002 if (nobj_indexed > 0) {
1003 p_indexed = (nobj_indexed * 100) / nobj_total;
1004 if (p_indexed != a->last_p_indexed) {
1005 a->last_p_indexed = p_indexed;
1010 if (nobj_resolved > 0) {
1011 p_resolved = (nobj_resolved * 100) /
1012 (nobj_total - nobj_loose);
1013 if (p_resolved != a->last_p_resolved) {
1014 a->last_p_resolved = p_resolved;
1022 if (print_size || print_indexed || print_resolved)
1025 printf("%*s fetched", FMT_SCALED_STRSIZE, scaled_size);
1027 printf("; indexing %d%%", p_indexed);
1029 printf("; resolving deltas %d%%", p_resolved);
1030 if (print_size || print_indexed || print_resolved)
1036 static const struct got_error *
1037 create_symref(const char *refname, struct got_reference *target_ref,
1038 int verbosity, struct got_repository *repo)
1040 const struct got_error *err;
1041 struct got_reference *head_symref;
1043 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1047 err = got_ref_write(head_symref, repo);
1048 if (err == NULL && verbosity > 0) {
1049 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1050 got_ref_get_name(target_ref));
1052 got_ref_close(head_symref);
1056 static const struct got_error *
1057 list_remote_refs(struct got_pathlist_head *symrefs,
1058 struct got_pathlist_head *refs)
1060 const struct got_error *err;
1061 struct got_pathlist_entry *pe;
1063 TAILQ_FOREACH(pe, symrefs, entry) {
1064 const char *refname = pe->path;
1065 const char *targetref = pe->data;
1067 printf("%s: %s\n", refname, targetref);
1070 TAILQ_FOREACH(pe, refs, entry) {
1071 const char *refname = pe->path;
1072 struct got_object_id *id = pe->data;
1075 err = got_object_id_str(&id_str, id);
1078 printf("%s: %s\n", refname, id_str);
1085 static const struct got_error *
1086 create_ref(const char *refname, struct got_object_id *id,
1087 int verbosity, struct got_repository *repo)
1089 const struct got_error *err = NULL;
1090 struct got_reference *ref;
1093 err = got_object_id_str(&id_str, id);
1097 err = got_ref_alloc(&ref, refname, id);
1101 err = got_ref_write(ref, repo);
1104 if (err == NULL && verbosity >= 0)
1105 printf("Created reference %s: %s\n", refname, id_str);
1112 match_wanted_ref(const char *refname, const char *wanted_ref)
1114 if (strncmp(refname, "refs/", 5) != 0)
1119 * Prevent fetching of references that won't make any
1120 * sense outside of the remote repository's context.
1122 if (strncmp(refname, "got/", 4) == 0)
1124 if (strncmp(refname, "remotes/", 8) == 0)
1127 if (strncmp(wanted_ref, "refs/", 5) == 0)
1130 /* Allow prefix match. */
1131 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1134 /* Allow exact match. */
1135 return (strcmp(refname, wanted_ref) == 0);
1139 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1141 struct got_pathlist_entry *pe;
1143 TAILQ_FOREACH(pe, wanted_refs, entry) {
1144 if (match_wanted_ref(refname, pe->path))
1151 static const struct got_error *
1152 create_wanted_ref(const char *refname, struct got_object_id *id,
1153 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1155 const struct got_error *err;
1156 char *remote_refname;
1158 if (strncmp("refs/", refname, 5) == 0)
1161 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1162 remote_repo_name, refname) == -1)
1163 return got_error_from_errno("asprintf");
1165 err = create_ref(remote_refname, id, verbosity, repo);
1166 free(remote_refname);
1170 static const struct got_error *
1171 create_gotconfig(const char *proto, const char *host, const char *port,
1172 const char *remote_repo_path, const char *default_branch,
1173 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1174 struct got_pathlist_head *wanted_refs, int mirror_references,
1175 struct got_repository *repo)
1177 const struct got_error *err = NULL;
1178 char *gotconfig_path = NULL;
1179 char *gotconfig = NULL;
1180 FILE *gotconfig_file = NULL;
1181 const char *branchname = NULL;
1182 char *branches = NULL, *refs = NULL;
1185 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1186 struct got_pathlist_entry *pe;
1187 TAILQ_FOREACH(pe, wanted_branches, entry) {
1189 branchname = pe->path;
1190 if (strncmp(branchname, "refs/heads/", 11) == 0)
1192 if (asprintf(&s, "%s\"%s\" ",
1193 branches ? branches : "", branchname) == -1) {
1194 err = got_error_from_errno("asprintf");
1200 } else if (!fetch_all_branches && default_branch) {
1201 branchname = default_branch;
1202 if (strncmp(branchname, "refs/heads/", 11) == 0)
1204 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1205 err = got_error_from_errno("asprintf");
1209 if (!TAILQ_EMPTY(wanted_refs)) {
1210 struct got_pathlist_entry *pe;
1211 TAILQ_FOREACH(pe, wanted_refs, entry) {
1213 const char *refname = pe->path;
1214 if (strncmp(refname, "refs/", 5) == 0)
1216 if (asprintf(&s, "%s\"%s\" ",
1217 refs ? refs : "", refname) == -1) {
1218 err = got_error_from_errno("asprintf");
1226 /* Create got.conf(5). */
1227 gotconfig_path = got_repo_get_path_gotconfig(repo);
1228 if (gotconfig_path == NULL) {
1229 err = got_error_from_errno("got_repo_get_path_gotconfig");
1232 gotconfig_file = fopen(gotconfig_path, "a");
1233 if (gotconfig_file == NULL) {
1234 err = got_error_from_errno2("fopen", gotconfig_path);
1237 if (asprintf(&gotconfig,
1242 "\trepository \"%s\"\n"
1248 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1249 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1250 remote_repo_path, branches ? "\tbranch { " : "",
1251 branches ? branches : "", branches ? "}\n" : "",
1252 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1253 mirror_references ? "\tmirror-references yes\n" : "",
1254 fetch_all_branches ? "\tfetch-all-branches yes\n" : "") == -1) {
1255 err = got_error_from_errno("asprintf");
1258 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1259 if (n != strlen(gotconfig)) {
1260 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1265 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1266 err = got_error_from_errno2("fclose", gotconfig_path);
1267 free(gotconfig_path);
1272 static const struct got_error *
1273 create_gitconfig(const char *git_url, const char *default_branch,
1274 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1275 struct got_pathlist_head *wanted_refs, int mirror_references,
1276 struct got_repository *repo)
1278 const struct got_error *err = NULL;
1279 char *gitconfig_path = NULL;
1280 char *gitconfig = NULL;
1281 FILE *gitconfig_file = NULL;
1282 char *branches = NULL, *refs = NULL;
1283 const char *branchname;
1286 /* Create a config file Git can understand. */
1287 gitconfig_path = got_repo_get_path_gitconfig(repo);
1288 if (gitconfig_path == NULL) {
1289 err = got_error_from_errno("got_repo_get_path_gitconfig");
1292 gitconfig_file = fopen(gitconfig_path, "a");
1293 if (gitconfig_file == NULL) {
1294 err = got_error_from_errno2("fopen", gitconfig_path);
1297 if (fetch_all_branches) {
1298 if (mirror_references) {
1299 if (asprintf(&branches,
1300 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1301 err = got_error_from_errno("asprintf");
1304 } else if (asprintf(&branches,
1305 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1306 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1307 err = got_error_from_errno("asprintf");
1310 } else if (!TAILQ_EMPTY(wanted_branches)) {
1311 struct got_pathlist_entry *pe;
1312 TAILQ_FOREACH(pe, wanted_branches, entry) {
1314 branchname = pe->path;
1315 if (strncmp(branchname, "refs/heads/", 11) == 0)
1317 if (mirror_references) {
1319 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1320 branches ? branches : "",
1321 branchname, branchname) == -1) {
1322 err = got_error_from_errno("asprintf");
1325 } else if (asprintf(&s,
1326 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1327 branches ? branches : "",
1328 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1329 branchname) == -1) {
1330 err = got_error_from_errno("asprintf");
1338 * If the server specified a default branch, use just that one.
1339 * Otherwise fall back to fetching all branches on next fetch.
1341 if (default_branch) {
1342 branchname = default_branch;
1343 if (strncmp(branchname, "refs/heads/", 11) == 0)
1346 branchname = "*"; /* fall back to all branches */
1347 if (mirror_references) {
1348 if (asprintf(&branches,
1349 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1350 branchname, branchname) == -1) {
1351 err = got_error_from_errno("asprintf");
1354 } else if (asprintf(&branches,
1355 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1356 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1357 branchname) == -1) {
1358 err = got_error_from_errno("asprintf");
1362 if (!TAILQ_EMPTY(wanted_refs)) {
1363 struct got_pathlist_entry *pe;
1364 TAILQ_FOREACH(pe, wanted_refs, entry) {
1366 const char *refname = pe->path;
1367 if (strncmp(refname, "refs/", 5) == 0)
1369 if (mirror_references) {
1371 "%s\tfetch = refs/%s:refs/%s\n",
1372 refs ? refs : "", refname, refname) == -1) {
1373 err = got_error_from_errno("asprintf");
1376 } else if (asprintf(&s,
1377 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1379 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1381 err = got_error_from_errno("asprintf");
1389 if (asprintf(&gitconfig,
1394 "\tfetch = refs/tags/*:refs/tags/*\n",
1395 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1396 refs ? refs : "") == -1) {
1397 err = got_error_from_errno("asprintf");
1400 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1401 if (n != strlen(gitconfig)) {
1402 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1406 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1407 err = got_error_from_errno2("fclose", gitconfig_path);
1408 free(gitconfig_path);
1413 static const struct got_error *
1414 create_config_files(const char *proto, const char *host, const char *port,
1415 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1416 int mirror_references, struct got_pathlist_head *symrefs,
1417 struct got_pathlist_head *wanted_branches,
1418 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1420 const struct got_error *err = NULL;
1421 const char *default_branch = NULL;
1422 struct got_pathlist_entry *pe;
1425 * If we asked for a set of wanted branches then use the first
1428 if (!TAILQ_EMPTY(wanted_branches)) {
1429 pe = TAILQ_FIRST(wanted_branches);
1430 default_branch = pe->path;
1432 /* First HEAD ref listed by server is the default branch. */
1433 TAILQ_FOREACH(pe, symrefs, entry) {
1434 const char *refname = pe->path;
1435 const char *target = pe->data;
1437 if (strcmp(refname, GOT_REF_HEAD) != 0)
1440 default_branch = target;
1445 /* Create got.conf(5). */
1446 err = create_gotconfig(proto, host, port, remote_repo_path,
1447 default_branch, fetch_all_branches, wanted_branches,
1448 wanted_refs, mirror_references, repo);
1452 /* Create a config file Git can understand. */
1453 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1454 wanted_branches, wanted_refs, mirror_references, repo);
1457 static const struct got_error *
1458 cmd_clone(int argc, char *argv[])
1460 const struct got_error *error = NULL;
1461 const char *uri, *dirname;
1462 char *proto, *host, *port, *repo_name, *server_path;
1463 char *default_destdir = NULL, *id_str = NULL;
1464 const char *repo_path;
1465 struct got_repository *repo = NULL;
1466 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1467 struct got_pathlist_entry *pe;
1468 struct got_object_id *pack_hash = NULL;
1469 int ch, fetchfd = -1, fetchstatus;
1470 pid_t fetchpid = -1;
1471 struct got_fetch_progress_arg fpa;
1472 char *git_url = NULL;
1473 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1474 int list_refs_only = 0;
1477 TAILQ_INIT(&symrefs);
1478 TAILQ_INIT(&wanted_branches);
1479 TAILQ_INIT(&wanted_refs);
1481 while ((ch = getopt(argc, argv, "ab:lmvqR:")) != -1) {
1484 fetch_all_branches = 1;
1487 error = got_pathlist_append(&wanted_branches,
1496 mirror_references = 1;
1501 else if (verbosity < 3)
1508 error = got_pathlist_append(&wanted_refs,
1521 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1522 option_conflict('a', 'b');
1523 if (list_refs_only) {
1524 if (!TAILQ_EMPTY(&wanted_branches))
1525 option_conflict('l', 'b');
1526 if (fetch_all_branches)
1527 option_conflict('l', 'a');
1528 if (mirror_references)
1529 option_conflict('l', 'm');
1530 if (!TAILQ_EMPTY(&wanted_refs))
1531 option_conflict('l', 'R');
1543 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
1548 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1549 host, port ? ":" : "", port ? port : "",
1550 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1551 error = got_error_from_errno("asprintf");
1555 if (strcmp(proto, "git") == 0) {
1557 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1558 "sendfd dns inet unveil", NULL) == -1)
1561 } else if (strcmp(proto, "git+ssh") == 0 ||
1562 strcmp(proto, "ssh") == 0) {
1564 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1565 "sendfd unveil", NULL) == -1)
1568 } else if (strcmp(proto, "http") == 0 ||
1569 strcmp(proto, "git+http") == 0) {
1570 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1573 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1576 if (dirname == NULL) {
1577 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1578 error = got_error_from_errno("asprintf");
1581 repo_path = default_destdir;
1583 repo_path = dirname;
1585 if (!list_refs_only) {
1586 error = got_path_mkdir(repo_path);
1588 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1589 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1591 if (!got_path_dir_is_empty(repo_path)) {
1592 error = got_error_path(repo_path,
1593 GOT_ERR_DIR_NOT_EMPTY);
1598 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
1599 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
1600 error = got_error_from_errno2("unveil",
1601 GOT_FETCH_PATH_SSH);
1605 error = apply_unveil(repo_path, 0, NULL);
1610 printf("Connecting to %s%s%s\n", host,
1611 port ? ":" : "", port ? port : "");
1613 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1614 server_path, verbosity);
1618 if (!list_refs_only) {
1619 error = got_repo_init(repo_path);
1622 error = got_repo_open(&repo, repo_path, NULL);
1627 fpa.last_scaled_size[0] = '\0';
1628 fpa.last_p_indexed = -1;
1629 fpa.last_p_resolved = -1;
1630 fpa.verbosity = verbosity;
1631 fpa.create_configs = 1;
1632 fpa.configs_created = 0;
1634 fpa.config_info.symrefs = &symrefs;
1635 fpa.config_info.wanted_branches = &wanted_branches;
1636 fpa.config_info.wanted_refs = &wanted_refs;
1637 fpa.config_info.proto = proto;
1638 fpa.config_info.host = host;
1639 fpa.config_info.port = port;
1640 fpa.config_info.remote_repo_path = server_path;
1641 fpa.config_info.git_url = git_url;
1642 fpa.config_info.fetch_all_branches = fetch_all_branches;
1643 fpa.config_info.mirror_references = mirror_references;
1644 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1645 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1646 fetch_all_branches, &wanted_branches, &wanted_refs,
1647 list_refs_only, verbosity, fetchfd, repo,
1648 fetch_progress, &fpa);
1652 if (list_refs_only) {
1653 error = list_remote_refs(&symrefs, &refs);
1657 error = got_object_id_str(&id_str, pack_hash);
1661 printf("\nFetched %s.pack\n", id_str);
1664 /* Set up references provided with the pack file. */
1665 TAILQ_FOREACH(pe, &refs, entry) {
1666 const char *refname = pe->path;
1667 struct got_object_id *id = pe->data;
1668 char *remote_refname;
1670 if (is_wanted_ref(&wanted_refs, refname) &&
1671 !mirror_references) {
1672 error = create_wanted_ref(refname, id,
1673 GOT_FETCH_DEFAULT_REMOTE_NAME,
1674 verbosity - 1, repo);
1680 error = create_ref(refname, id, verbosity - 1, repo);
1684 if (mirror_references)
1687 if (strncmp("refs/heads/", refname, 11) != 0)
1690 if (asprintf(&remote_refname,
1691 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1692 refname + 11) == -1) {
1693 error = got_error_from_errno("asprintf");
1696 error = create_ref(remote_refname, id, verbosity - 1, repo);
1697 free(remote_refname);
1702 /* Set the HEAD reference if the server provided one. */
1703 TAILQ_FOREACH(pe, &symrefs, entry) {
1704 struct got_reference *target_ref;
1705 const char *refname = pe->path;
1706 const char *target = pe->data;
1707 char *remote_refname = NULL, *remote_target = NULL;
1709 if (strcmp(refname, GOT_REF_HEAD) != 0)
1712 error = got_ref_open(&target_ref, repo, target, 0);
1714 if (error->code == GOT_ERR_NOT_REF) {
1721 error = create_symref(refname, target_ref, verbosity, repo);
1722 got_ref_close(target_ref);
1726 if (mirror_references)
1729 if (strncmp("refs/heads/", target, 11) != 0)
1732 if (asprintf(&remote_refname,
1733 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1735 error = got_error_from_errno("asprintf");
1738 if (asprintf(&remote_target,
1739 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1740 target + 11) == -1) {
1741 error = got_error_from_errno("asprintf");
1742 free(remote_refname);
1745 error = got_ref_open(&target_ref, repo, remote_target, 0);
1747 free(remote_refname);
1748 free(remote_target);
1749 if (error->code == GOT_ERR_NOT_REF) {
1755 error = create_symref(remote_refname, target_ref,
1756 verbosity - 1, repo);
1757 free(remote_refname);
1758 free(remote_target);
1759 got_ref_close(target_ref);
1765 * We failed to set the HEAD reference. If we asked for
1766 * a set of wanted branches use the first of one of those
1767 * which could be fetched instead.
1769 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1770 const char *target = pe->path;
1771 struct got_reference *target_ref;
1773 error = got_ref_open(&target_ref, repo, target, 0);
1775 if (error->code == GOT_ERR_NOT_REF) {
1782 error = create_symref(GOT_REF_HEAD, target_ref,
1784 got_ref_close(target_ref);
1792 printf("Created %s repository '%s'\n",
1793 mirror_references ? "mirrored" : "cloned", repo_path);
1796 if (kill(fetchpid, SIGTERM) == -1)
1797 error = got_error_from_errno("kill");
1798 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1799 error = got_error_from_errno("waitpid");
1801 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1802 error = got_error_from_errno("close");
1804 got_repo_close(repo);
1805 TAILQ_FOREACH(pe, &refs, entry) {
1806 free((void *)pe->path);
1809 got_pathlist_free(&refs);
1810 TAILQ_FOREACH(pe, &symrefs, entry) {
1811 free((void *)pe->path);
1814 got_pathlist_free(&symrefs);
1815 got_pathlist_free(&wanted_branches);
1816 got_pathlist_free(&wanted_refs);
1823 free(default_destdir);
1828 static const struct got_error *
1829 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1830 int replace_tags, int verbosity, struct got_repository *repo)
1832 const struct got_error *err = NULL;
1833 char *new_id_str = NULL;
1834 struct got_object_id *old_id = NULL;
1836 err = got_object_id_str(&new_id_str, new_id);
1840 if (!replace_tags &&
1841 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1842 err = got_ref_resolve(&old_id, repo, ref);
1845 if (got_object_id_cmp(old_id, new_id) == 0)
1847 if (verbosity >= 0) {
1848 printf("Rejecting update of existing tag %s: %s\n",
1849 got_ref_get_name(ref), new_id_str);
1854 if (got_ref_is_symbolic(ref)) {
1855 if (verbosity >= 0) {
1856 printf("Replacing reference %s: %s\n",
1857 got_ref_get_name(ref),
1858 got_ref_get_symref_target(ref));
1860 err = got_ref_change_symref_to_ref(ref, new_id);
1863 err = got_ref_write(ref, repo);
1867 err = got_ref_resolve(&old_id, repo, ref);
1870 if (got_object_id_cmp(old_id, new_id) == 0)
1873 err = got_ref_change_ref(ref, new_id);
1876 err = got_ref_write(ref, repo);
1882 printf("Updated %s: %s\n", got_ref_get_name(ref),
1890 static const struct got_error *
1891 update_symref(const char *refname, struct got_reference *target_ref,
1892 int verbosity, struct got_repository *repo)
1894 const struct got_error *err = NULL, *unlock_err;
1895 struct got_reference *symref;
1896 int symref_is_locked = 0;
1898 err = got_ref_open(&symref, repo, refname, 1);
1900 if (err->code != GOT_ERR_NOT_REF)
1902 err = got_ref_alloc_symref(&symref, refname, target_ref);
1906 err = got_ref_write(symref, repo);
1911 printf("Created reference %s: %s\n",
1912 got_ref_get_name(symref),
1913 got_ref_get_symref_target(symref));
1915 symref_is_locked = 1;
1917 if (strcmp(got_ref_get_symref_target(symref),
1918 got_ref_get_name(target_ref)) == 0)
1921 err = got_ref_change_symref(symref,
1922 got_ref_get_name(target_ref));
1926 err = got_ref_write(symref, repo);
1931 printf("Updated %s: %s\n", got_ref_get_name(symref),
1932 got_ref_get_symref_target(symref));
1936 if (symref_is_locked) {
1937 unlock_err = got_ref_unlock(symref);
1938 if (unlock_err && err == NULL)
1941 got_ref_close(symref);
1948 fprintf(stderr, "usage: %s fetch [-a] [-b branch] [-d] [-l] "
1949 "[-r repository-path] [-t] [-q] [-v] [-R reference] "
1950 "[remote-repository-name]\n",
1955 static const struct got_error *
1956 delete_missing_ref(struct got_reference *ref,
1957 int verbosity, struct got_repository *repo)
1959 const struct got_error *err = NULL;
1960 struct got_object_id *id = NULL;
1961 char *id_str = NULL;
1963 if (got_ref_is_symbolic(ref)) {
1964 err = got_ref_delete(ref, repo);
1967 if (verbosity >= 0) {
1968 printf("Deleted reference %s: %s\n",
1969 got_ref_get_name(ref),
1970 got_ref_get_symref_target(ref));
1973 err = got_ref_resolve(&id, repo, ref);
1976 err = got_object_id_str(&id_str, id);
1980 err = got_ref_delete(ref, repo);
1983 if (verbosity >= 0) {
1984 printf("Deleted reference %s: %s\n",
1985 got_ref_get_name(ref), id_str);
1994 static const struct got_error *
1995 delete_missing_refs(struct got_pathlist_head *their_refs,
1996 struct got_pathlist_head *their_symrefs,
1997 const struct got_remote_repo *remote,
1998 int verbosity, struct got_repository *repo)
2000 const struct got_error *err = NULL, *unlock_err;
2001 struct got_reflist_head my_refs;
2002 struct got_reflist_entry *re;
2003 struct got_pathlist_entry *pe;
2004 char *remote_namespace = NULL;
2005 char *local_refname = NULL;
2007 TAILQ_INIT(&my_refs);
2009 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2011 return got_error_from_errno("asprintf");
2013 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2017 TAILQ_FOREACH(re, &my_refs, entry) {
2018 const char *refname = got_ref_get_name(re->ref);
2020 if (!remote->mirror_references) {
2021 if (strncmp(refname, remote_namespace,
2022 strlen(remote_namespace)) == 0) {
2023 if (strcmp(refname + strlen(remote_namespace),
2026 if (asprintf(&local_refname, "refs/heads/%s",
2027 refname + strlen(remote_namespace)) == -1) {
2028 err = got_error_from_errno("asprintf");
2031 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2035 TAILQ_FOREACH(pe, their_refs, entry) {
2036 if (strcmp(local_refname, pe->path) == 0)
2042 TAILQ_FOREACH(pe, their_symrefs, entry) {
2043 if (strcmp(local_refname, pe->path) == 0)
2049 err = delete_missing_ref(re->ref, verbosity, repo);
2053 if (local_refname) {
2054 struct got_reference *ref;
2055 err = got_ref_open(&ref, repo, local_refname, 1);
2057 if (err->code != GOT_ERR_NOT_REF)
2059 free(local_refname);
2060 local_refname = NULL;
2063 err = delete_missing_ref(ref, verbosity, repo);
2066 unlock_err = got_ref_unlock(ref);
2068 if (unlock_err && err == NULL) {
2073 free(local_refname);
2074 local_refname = NULL;
2078 free(remote_namespace);
2079 free(local_refname);
2083 static const struct got_error *
2084 update_wanted_ref(const char *refname, struct got_object_id *id,
2085 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2087 const struct got_error *err, *unlock_err;
2088 char *remote_refname;
2089 struct got_reference *ref;
2091 if (strncmp("refs/", refname, 5) == 0)
2094 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2095 remote_repo_name, refname) == -1)
2096 return got_error_from_errno("asprintf");
2098 err = got_ref_open(&ref, repo, remote_refname, 1);
2100 if (err->code != GOT_ERR_NOT_REF)
2102 err = create_ref(remote_refname, id, verbosity, repo);
2104 err = update_ref(ref, id, 0, verbosity, repo);
2105 unlock_err = got_ref_unlock(ref);
2106 if (unlock_err && err == NULL)
2111 free(remote_refname);
2115 static const struct got_error *
2116 cmd_fetch(int argc, char *argv[])
2118 const struct got_error *error = NULL, *unlock_err;
2119 char *cwd = NULL, *repo_path = NULL;
2120 const char *remote_name;
2121 char *proto = NULL, *host = NULL, *port = NULL;
2122 char *repo_name = NULL, *server_path = NULL;
2123 const struct got_remote_repo *remotes, *remote = NULL;
2125 char *id_str = NULL;
2126 struct got_repository *repo = NULL;
2127 struct got_worktree *worktree = NULL;
2128 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2129 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2130 struct got_pathlist_entry *pe;
2131 struct got_object_id *pack_hash = NULL;
2132 int i, ch, fetchfd = -1, fetchstatus;
2133 pid_t fetchpid = -1;
2134 struct got_fetch_progress_arg fpa;
2135 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2136 int delete_refs = 0, replace_tags = 0;
2139 TAILQ_INIT(&symrefs);
2140 TAILQ_INIT(&wanted_branches);
2141 TAILQ_INIT(&wanted_refs);
2143 while ((ch = getopt(argc, argv, "ab:dlr:tvqR:")) != -1) {
2146 fetch_all_branches = 1;
2149 error = got_pathlist_append(&wanted_branches,
2161 repo_path = realpath(optarg, NULL);
2162 if (repo_path == NULL)
2163 return got_error_from_errno2("realpath",
2165 got_path_strip_trailing_slashes(repo_path);
2173 else if (verbosity < 3)
2180 error = got_pathlist_append(&wanted_refs,
2193 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2194 option_conflict('a', 'b');
2195 if (list_refs_only) {
2196 if (!TAILQ_EMPTY(&wanted_branches))
2197 option_conflict('l', 'b');
2198 if (fetch_all_branches)
2199 option_conflict('l', 'a');
2201 option_conflict('l', 'd');
2205 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2207 remote_name = argv[0];
2211 cwd = getcwd(NULL, 0);
2213 error = got_error_from_errno("getcwd");
2217 if (repo_path == NULL) {
2218 error = got_worktree_open(&worktree, cwd);
2219 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2225 strdup(got_worktree_get_repo_path(worktree));
2226 if (repo_path == NULL)
2227 error = got_error_from_errno("strdup");
2231 repo_path = strdup(cwd);
2232 if (repo_path == NULL) {
2233 error = got_error_from_errno("strdup");
2239 error = got_repo_open(&repo, repo_path, NULL);
2244 worktree_conf = got_worktree_get_gotconfig(worktree);
2245 if (worktree_conf) {
2246 got_gotconfig_get_remotes(&nremotes, &remotes,
2248 for (i = 0; i < nremotes; i++) {
2249 if (strcmp(remotes[i].name, remote_name) == 0) {
2250 remote = &remotes[i];
2256 if (remote == NULL) {
2257 repo_conf = got_repo_get_gotconfig(repo);
2259 got_gotconfig_get_remotes(&nremotes, &remotes,
2261 for (i = 0; i < nremotes; i++) {
2262 if (strcmp(remotes[i].name, remote_name) == 0) {
2263 remote = &remotes[i];
2269 if (remote == NULL) {
2270 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2271 for (i = 0; i < nremotes; i++) {
2272 if (strcmp(remotes[i].name, remote_name) == 0) {
2273 remote = &remotes[i];
2278 if (remote == NULL) {
2279 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2283 if (TAILQ_EMPTY(&wanted_branches)) {
2284 if (!fetch_all_branches)
2285 fetch_all_branches = remote->fetch_all_branches;
2286 for (i = 0; i < remote->nbranches; i++) {
2287 got_pathlist_append(&wanted_branches,
2288 remote->branches[i], NULL);
2291 if (TAILQ_EMPTY(&wanted_refs)) {
2292 for (i = 0; i < remote->nrefs; i++) {
2293 got_pathlist_append(&wanted_refs,
2294 remote->refs[i], NULL);
2298 error = got_fetch_parse_uri(&proto, &host, &port, &server_path,
2299 &repo_name, remote->url);
2303 if (strcmp(proto, "git") == 0) {
2305 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2306 "sendfd dns inet unveil", NULL) == -1)
2309 } else if (strcmp(proto, "git+ssh") == 0 ||
2310 strcmp(proto, "ssh") == 0) {
2312 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2313 "sendfd unveil", NULL) == -1)
2316 } else if (strcmp(proto, "http") == 0 ||
2317 strcmp(proto, "git+http") == 0) {
2318 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2321 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2325 if (strcmp(proto, "git+ssh") == 0 || strcmp(proto, "ssh") == 0) {
2326 if (unveil(GOT_FETCH_PATH_SSH, "x") != 0) {
2327 error = got_error_from_errno2("unveil",
2328 GOT_FETCH_PATH_SSH);
2332 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2337 printf("Connecting to \"%s\" %s%s%s\n", remote->name, host,
2338 port ? ":" : "", port ? port : "");
2340 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2341 server_path, verbosity);
2345 fpa.last_scaled_size[0] = '\0';
2346 fpa.last_p_indexed = -1;
2347 fpa.last_p_resolved = -1;
2348 fpa.verbosity = verbosity;
2350 fpa.create_configs = 0;
2351 fpa.configs_created = 0;
2352 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2353 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2354 remote->mirror_references, fetch_all_branches, &wanted_branches,
2355 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2356 fetch_progress, &fpa);
2360 if (list_refs_only) {
2361 error = list_remote_refs(&symrefs, &refs);
2365 if (pack_hash == NULL) {
2367 printf("Already up-to-date\n");
2368 } else if (verbosity >= 0) {
2369 error = got_object_id_str(&id_str, pack_hash);
2372 printf("\nFetched %s.pack\n", id_str);
2377 /* Update references provided with the pack file. */
2378 TAILQ_FOREACH(pe, &refs, entry) {
2379 const char *refname = pe->path;
2380 struct got_object_id *id = pe->data;
2381 struct got_reference *ref;
2382 char *remote_refname;
2384 if (is_wanted_ref(&wanted_refs, refname) &&
2385 !remote->mirror_references) {
2386 error = update_wanted_ref(refname, id,
2387 remote->name, verbosity, repo);
2393 if (remote->mirror_references ||
2394 strncmp("refs/tags/", refname, 10) == 0) {
2395 error = got_ref_open(&ref, repo, refname, 1);
2397 if (error->code != GOT_ERR_NOT_REF)
2399 error = create_ref(refname, id, verbosity,
2404 error = update_ref(ref, id, replace_tags,
2406 unlock_err = got_ref_unlock(ref);
2407 if (unlock_err && error == NULL)
2413 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2414 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2415 remote_name, refname + 11) == -1) {
2416 error = got_error_from_errno("asprintf");
2420 error = got_ref_open(&ref, repo, remote_refname, 1);
2422 if (error->code != GOT_ERR_NOT_REF)
2424 error = create_ref(remote_refname, id,
2429 error = update_ref(ref, id, replace_tags,
2431 unlock_err = got_ref_unlock(ref);
2432 if (unlock_err && error == NULL)
2439 /* Also create a local branch if none exists yet. */
2440 error = got_ref_open(&ref, repo, refname, 1);
2442 if (error->code != GOT_ERR_NOT_REF)
2444 error = create_ref(refname, id, verbosity,
2449 unlock_err = got_ref_unlock(ref);
2450 if (unlock_err && error == NULL)
2457 error = delete_missing_refs(&refs, &symrefs, remote,
2463 if (!remote->mirror_references) {
2464 /* Update remote HEAD reference if the server provided one. */
2465 TAILQ_FOREACH(pe, &symrefs, entry) {
2466 struct got_reference *target_ref;
2467 const char *refname = pe->path;
2468 const char *target = pe->data;
2469 char *remote_refname = NULL, *remote_target = NULL;
2471 if (strcmp(refname, GOT_REF_HEAD) != 0)
2474 if (strncmp("refs/heads/", target, 11) != 0)
2477 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2478 remote->name, refname) == -1) {
2479 error = got_error_from_errno("asprintf");
2482 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2483 remote->name, target + 11) == -1) {
2484 error = got_error_from_errno("asprintf");
2485 free(remote_refname);
2489 error = got_ref_open(&target_ref, repo, remote_target,
2492 free(remote_refname);
2493 free(remote_target);
2494 if (error->code == GOT_ERR_NOT_REF) {
2500 error = update_symref(remote_refname, target_ref,
2502 free(remote_refname);
2503 free(remote_target);
2504 got_ref_close(target_ref);
2511 if (kill(fetchpid, SIGTERM) == -1)
2512 error = got_error_from_errno("kill");
2513 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2514 error = got_error_from_errno("waitpid");
2516 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2517 error = got_error_from_errno("close");
2519 got_repo_close(repo);
2521 got_worktree_close(worktree);
2522 TAILQ_FOREACH(pe, &refs, entry) {
2523 free((void *)pe->path);
2526 got_pathlist_free(&refs);
2527 TAILQ_FOREACH(pe, &symrefs, entry) {
2528 free((void *)pe->path);
2531 got_pathlist_free(&symrefs);
2532 got_pathlist_free(&wanted_branches);
2533 got_pathlist_free(&wanted_refs);
2548 usage_checkout(void)
2550 fprintf(stderr, "usage: %s checkout [-E] [-b branch] [-c commit] "
2551 "[-p prefix] repository-path [worktree-path]\n", getprogname());
2556 show_worktree_base_ref_warning(void)
2558 fprintf(stderr, "%s: warning: could not create a reference "
2559 "to the work tree's base commit; the commit could be "
2560 "garbage-collected by Git; making the repository "
2561 "writable and running 'got update' will prevent this\n",
2565 struct got_checkout_progress_arg {
2566 const char *worktree_path;
2567 int had_base_commit_ref_error;
2570 static const struct got_error *
2571 checkout_progress(void *arg, unsigned char status, const char *path)
2573 struct got_checkout_progress_arg *a = arg;
2575 /* Base commit bump happens silently. */
2576 if (status == GOT_STATUS_BUMP_BASE)
2579 if (status == GOT_STATUS_BASE_REF_ERR) {
2580 a->had_base_commit_ref_error = 1;
2584 while (path[0] == '/')
2587 printf("%c %s/%s\n", status, a->worktree_path, path);
2591 static const struct got_error *
2592 check_cancelled(void *arg)
2594 if (sigint_received || sigpipe_received)
2595 return got_error(GOT_ERR_CANCELLED);
2599 static const struct got_error *
2600 check_linear_ancestry(struct got_object_id *commit_id,
2601 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2602 struct got_repository *repo)
2604 const struct got_error *err = NULL;
2605 struct got_object_id *yca_id;
2607 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2608 commit_id, base_commit_id, repo, check_cancelled, NULL);
2613 return got_error(GOT_ERR_ANCESTRY);
2616 * Require a straight line of history between the target commit
2617 * and the work tree's base commit.
2619 * Non-linear situations such as this require a rebase:
2621 * (commit) D F (base_commit)
2629 * 'got update' only handles linear cases:
2630 * Update forwards in time: A (base/yca) - B - C - D (commit)
2631 * Update backwards in time: D (base) - C - B - A (commit/yca)
2633 if (allow_forwards_in_time_only) {
2634 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2635 return got_error(GOT_ERR_ANCESTRY);
2636 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2637 got_object_id_cmp(base_commit_id, yca_id) != 0)
2638 return got_error(GOT_ERR_ANCESTRY);
2644 static const struct got_error *
2645 check_same_branch(struct got_object_id *commit_id,
2646 struct got_reference *head_ref, struct got_object_id *yca_id,
2647 struct got_repository *repo)
2649 const struct got_error *err = NULL;
2650 struct got_commit_graph *graph = NULL;
2651 struct got_object_id *head_commit_id = NULL;
2652 int is_same_branch = 0;
2654 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2658 if (got_object_id_cmp(head_commit_id, commit_id) == 0) {
2662 if (yca_id && got_object_id_cmp(commit_id, yca_id) == 0) {
2667 err = got_commit_graph_open(&graph, "/", 1);
2671 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2672 check_cancelled, NULL);
2677 struct got_object_id *id;
2678 err = got_commit_graph_iter_next(&id, graph, repo,
2679 check_cancelled, NULL);
2681 if (err->code == GOT_ERR_ITER_COMPLETED)
2687 if (yca_id && got_object_id_cmp(id, yca_id) == 0)
2689 if (got_object_id_cmp(id, commit_id) == 0) {
2697 got_commit_graph_close(graph);
2698 free(head_commit_id);
2699 if (!err && !is_same_branch)
2700 err = got_error(GOT_ERR_ANCESTRY);
2704 static const struct got_error *
2705 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2707 static char msg[512];
2708 const char *branch_name;
2710 if (got_ref_is_symbolic(ref))
2711 branch_name = got_ref_get_symref_target(ref);
2713 branch_name = got_ref_get_name(ref);
2715 if (strncmp("refs/heads/", branch_name, 11) == 0)
2718 snprintf(msg, sizeof(msg),
2719 "target commit is not contained in branch '%s'; "
2720 "the branch to use must be specified with -b; "
2721 "if necessary a new branch can be created for "
2722 "this commit with 'got branch -c %s BRANCH_NAME'",
2723 branch_name, commit_id_str);
2725 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2728 static const struct got_error *
2729 cmd_checkout(int argc, char *argv[])
2731 const struct got_error *error = NULL;
2732 struct got_repository *repo = NULL;
2733 struct got_reference *head_ref = NULL;
2734 struct got_worktree *worktree = NULL;
2735 char *repo_path = NULL;
2736 char *worktree_path = NULL;
2737 const char *path_prefix = "";
2738 const char *branch_name = GOT_REF_HEAD;
2739 char *commit_id_str = NULL;
2741 int ch, same_path_prefix, allow_nonempty = 0;
2742 struct got_pathlist_head paths;
2743 struct got_checkout_progress_arg cpa;
2747 while ((ch = getopt(argc, argv, "b:c:Ep:")) != -1) {
2750 branch_name = optarg;
2753 commit_id_str = strdup(optarg);
2754 if (commit_id_str == NULL)
2755 return got_error_from_errno("strdup");
2761 path_prefix = optarg;
2773 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2774 "unveil", NULL) == -1)
2778 char *base, *dotgit;
2780 repo_path = realpath(argv[0], NULL);
2781 if (repo_path == NULL)
2782 return got_error_from_errno2("realpath", argv[0]);
2783 cwd = getcwd(NULL, 0);
2785 error = got_error_from_errno("getcwd");
2792 error = got_path_basename(&base, path);
2795 dotgit = strstr(base, ".git");
2798 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
2799 error = got_error_from_errno("asprintf");
2804 } else if (argc == 2) {
2805 repo_path = realpath(argv[0], NULL);
2806 if (repo_path == NULL) {
2807 error = got_error_from_errno2("realpath", argv[0]);
2810 worktree_path = realpath(argv[1], NULL);
2811 if (worktree_path == NULL) {
2812 if (errno != ENOENT) {
2813 error = got_error_from_errno2("realpath",
2817 worktree_path = strdup(argv[1]);
2818 if (worktree_path == NULL) {
2819 error = got_error_from_errno("strdup");
2826 got_path_strip_trailing_slashes(repo_path);
2827 got_path_strip_trailing_slashes(worktree_path);
2829 error = got_repo_open(&repo, repo_path, NULL);
2833 /* Pre-create work tree path for unveil(2) */
2834 error = got_path_mkdir(worktree_path);
2836 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
2837 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2839 if (!allow_nonempty &&
2840 !got_path_dir_is_empty(worktree_path)) {
2841 error = got_error_path(worktree_path,
2842 GOT_ERR_DIR_NOT_EMPTY);
2847 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
2851 error = got_ref_open(&head_ref, repo, branch_name, 0);
2855 error = got_worktree_init(worktree_path, head_ref, path_prefix, repo);
2856 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
2859 error = got_worktree_open(&worktree, worktree_path);
2863 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
2867 if (!same_path_prefix) {
2868 error = got_error(GOT_ERR_PATH_PREFIX);
2872 if (commit_id_str) {
2873 struct got_object_id *commit_id;
2874 struct got_reflist_head refs;
2876 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
2880 error = got_repo_match_object_id(&commit_id, NULL,
2881 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
2882 got_ref_list_free(&refs);
2885 error = check_linear_ancestry(commit_id,
2886 got_worktree_get_base_commit_id(worktree), 0, repo);
2887 if (error != NULL) {
2889 if (error->code == GOT_ERR_ANCESTRY) {
2890 error = checkout_ancestry_error(
2891 head_ref, commit_id_str);
2895 error = check_same_branch(commit_id, head_ref, NULL, repo);
2897 if (error->code == GOT_ERR_ANCESTRY) {
2898 error = checkout_ancestry_error(
2899 head_ref, commit_id_str);
2903 error = got_worktree_set_base_commit_id(worktree, repo,
2910 error = got_pathlist_append(&paths, "", NULL);
2913 cpa.worktree_path = worktree_path;
2914 cpa.had_base_commit_ref_error = 0;
2915 error = got_worktree_checkout_files(worktree, &paths, repo,
2916 checkout_progress, &cpa, check_cancelled, NULL);
2920 printf("Now shut up and hack\n");
2921 if (cpa.had_base_commit_ref_error)
2922 show_worktree_base_ref_warning();
2924 got_pathlist_free(&paths);
2925 free(commit_id_str);
2927 free(worktree_path);
2932 struct got_update_progress_arg {
2940 print_update_progress_stats(struct got_update_progress_arg *upa)
2942 if (!upa->did_something)
2945 if (upa->conflicts > 0)
2946 printf("Files with new merge conflicts: %d\n", upa->conflicts);
2947 if (upa->obstructed > 0)
2948 printf("File paths obstructed by a non-regular file: %d\n",
2950 if (upa->not_updated > 0)
2951 printf("Files not updated because of existing merge "
2952 "conflicts: %d\n", upa->not_updated);
2958 fprintf(stderr, "usage: %s update [-b branch] [-c commit] [path ...]\n",
2963 static const struct got_error *
2964 update_progress(void *arg, unsigned char status, const char *path)
2966 struct got_update_progress_arg *upa = arg;
2968 if (status == GOT_STATUS_EXISTS ||
2969 status == GOT_STATUS_BASE_REF_ERR)
2972 upa->did_something = 1;
2974 /* Base commit bump happens silently. */
2975 if (status == GOT_STATUS_BUMP_BASE)
2978 if (status == GOT_STATUS_CONFLICT)
2980 if (status == GOT_STATUS_OBSTRUCTED)
2982 if (status == GOT_STATUS_CANNOT_UPDATE)
2985 while (path[0] == '/')
2987 printf("%c %s\n", status, path);
2991 static const struct got_error *
2992 switch_head_ref(struct got_reference *head_ref,
2993 struct got_object_id *commit_id, struct got_worktree *worktree,
2994 struct got_repository *repo)
2996 const struct got_error *err = NULL;
2998 int ref_has_moved = 0;
3000 /* Trivial case: switching between two different references. */
3001 if (strcmp(got_ref_get_name(head_ref),
3002 got_worktree_get_head_ref_name(worktree)) != 0) {
3003 printf("Switching work tree from %s to %s\n",
3004 got_worktree_get_head_ref_name(worktree),
3005 got_ref_get_name(head_ref));
3006 return got_worktree_set_head_ref(worktree, head_ref);
3009 err = check_linear_ancestry(commit_id,
3010 got_worktree_get_base_commit_id(worktree), 0, repo);
3012 if (err->code != GOT_ERR_ANCESTRY)
3019 /* Switching to a rebased branch with the same reference name. */
3020 err = got_object_id_str(&base_id_str,
3021 got_worktree_get_base_commit_id(worktree));
3024 printf("Reference %s now points at a different branch\n",
3025 got_worktree_get_head_ref_name(worktree));
3026 printf("Switching work tree from %s to %s\n", base_id_str,
3027 got_worktree_get_head_ref_name(worktree));
3031 static const struct got_error *
3032 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3034 const struct got_error *err;
3037 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3041 return got_error(GOT_ERR_REBASING);
3043 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3047 return got_error(GOT_ERR_HISTEDIT_BUSY);
3052 static const struct got_error *
3053 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3054 char *argv[], struct got_worktree *worktree)
3056 const struct got_error *err = NULL;
3063 return got_error_from_errno("strdup");
3064 return got_pathlist_append(paths, path, NULL);
3067 for (i = 0; i < argc; i++) {
3068 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3071 err = got_pathlist_append(paths, path, NULL);
3081 static const struct got_error *
3082 wrap_not_worktree_error(const struct got_error *orig_err,
3083 const char *cmdname, const char *path)
3085 const struct got_error *err;
3086 struct got_repository *repo;
3087 static char msg[512];
3089 err = got_repo_open(&repo, path, NULL);
3093 snprintf(msg, sizeof(msg),
3094 "'got %s' needs a work tree in addition to a git repository\n"
3095 "Work trees can be checked out from this Git repository with "
3097 "The got(1) manual page contains more information.", cmdname);
3098 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3099 got_repo_close(repo);
3103 static const struct got_error *
3104 cmd_update(int argc, char *argv[])
3106 const struct got_error *error = NULL;
3107 struct got_repository *repo = NULL;
3108 struct got_worktree *worktree = NULL;
3109 char *worktree_path = NULL;
3110 struct got_object_id *commit_id = NULL;
3111 char *commit_id_str = NULL;
3112 const char *branch_name = NULL;
3113 struct got_reference *head_ref = NULL;
3114 struct got_pathlist_head paths;
3115 struct got_pathlist_entry *pe;
3117 struct got_update_progress_arg upa;
3121 while ((ch = getopt(argc, argv, "b:c:")) != -1) {
3124 branch_name = optarg;
3127 commit_id_str = strdup(optarg);
3128 if (commit_id_str == NULL)
3129 return got_error_from_errno("strdup");
3141 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3142 "unveil", NULL) == -1)
3145 worktree_path = getcwd(NULL, 0);
3146 if (worktree_path == NULL) {
3147 error = got_error_from_errno("getcwd");
3150 error = got_worktree_open(&worktree, worktree_path);
3152 if (error->code == GOT_ERR_NOT_WORKTREE)
3153 error = wrap_not_worktree_error(error, "update",
3158 error = check_rebase_or_histedit_in_progress(worktree);
3162 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3167 error = apply_unveil(got_repo_get_path(repo), 0,
3168 got_worktree_get_root_path(worktree));
3172 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3176 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3177 got_worktree_get_head_ref_name(worktree), 0);
3180 if (commit_id_str == NULL) {
3181 error = got_ref_resolve(&commit_id, repo, head_ref);
3184 error = got_object_id_str(&commit_id_str, commit_id);
3188 struct got_reflist_head refs;
3190 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3194 error = got_repo_match_object_id(&commit_id, NULL,
3195 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3196 got_ref_list_free(&refs);
3197 free(commit_id_str);
3198 commit_id_str = NULL;
3201 error = got_object_id_str(&commit_id_str, commit_id);
3207 struct got_object_id *head_commit_id;
3208 TAILQ_FOREACH(pe, &paths, entry) {
3209 if (pe->path_len == 0)
3211 error = got_error_msg(GOT_ERR_BAD_PATH,
3212 "switching between branches requires that "
3213 "the entire work tree gets updated");
3216 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3219 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3221 free(head_commit_id);
3224 error = check_same_branch(commit_id, head_ref, NULL, repo);
3227 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3231 error = check_linear_ancestry(commit_id,
3232 got_worktree_get_base_commit_id(worktree), 0, repo);
3233 if (error != NULL) {
3234 if (error->code == GOT_ERR_ANCESTRY)
3235 error = got_error(GOT_ERR_BRANCH_MOVED);
3238 error = check_same_branch(commit_id, head_ref, NULL, repo);
3243 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3245 error = got_worktree_set_base_commit_id(worktree, repo,
3251 memset(&upa, 0, sizeof(upa));
3252 error = got_worktree_checkout_files(worktree, &paths, repo,
3253 update_progress, &upa, check_cancelled, NULL);
3257 if (upa.did_something)
3258 printf("Updated to commit %s\n", commit_id_str);
3260 printf("Already up-to-date\n");
3261 print_update_progress_stats(&upa);
3263 free(worktree_path);
3264 TAILQ_FOREACH(pe, &paths, entry)
3265 free((char *)pe->path);
3266 got_pathlist_free(&paths);
3268 free(commit_id_str);
3272 static const struct got_error *
3273 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3274 const char *path, int diff_context, int ignore_whitespace,
3275 int force_text_diff, struct got_repository *repo)
3277 const struct got_error *err = NULL;
3278 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3281 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192);
3286 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192);
3290 while (path[0] == '/')
3292 err = got_diff_blob(NULL, NULL, blob1, blob2, path, path,
3293 diff_context, ignore_whitespace, force_text_diff, stdout);
3296 got_object_blob_close(blob1);
3297 got_object_blob_close(blob2);
3301 static const struct got_error *
3302 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3303 const char *path, int diff_context, int ignore_whitespace,
3304 int force_text_diff, struct got_repository *repo)
3306 const struct got_error *err = NULL;
3307 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3308 struct got_diff_blob_output_unidiff_arg arg;
3311 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3316 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3320 arg.diff_context = diff_context;
3321 arg.ignore_whitespace = ignore_whitespace;
3322 arg.force_text_diff = force_text_diff;
3323 arg.outfile = stdout;
3324 arg.line_offsets = NULL;
3326 while (path[0] == '/')
3328 err = got_diff_tree(tree1, tree2, path, path, repo,
3329 got_diff_blob_output_unidiff, &arg, 1);
3332 got_object_tree_close(tree1);
3334 got_object_tree_close(tree2);
3338 static const struct got_error *
3339 get_changed_paths(struct got_pathlist_head *paths,
3340 struct got_commit_object *commit, struct got_repository *repo)
3342 const struct got_error *err = NULL;
3343 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3344 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3345 struct got_object_qid *qid;
3347 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3349 struct got_commit_object *pcommit;
3350 err = got_object_open_as_commit(&pcommit, repo,
3355 tree_id1 = got_object_commit_get_tree_id(pcommit);
3356 got_object_commit_close(pcommit);
3361 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3366 tree_id2 = got_object_commit_get_tree_id(commit);
3367 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3371 err = got_diff_tree(tree1, tree2, "", "", repo,
3372 got_diff_tree_collect_changed_paths, paths, 0);
3375 got_object_tree_close(tree1);
3377 got_object_tree_close(tree2);
3381 static const struct got_error *
3382 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3383 const char *path, int diff_context, struct got_repository *repo)
3385 const struct got_error *err = NULL;
3386 struct got_commit_object *pcommit = NULL;
3387 char *id_str1 = NULL, *id_str2 = NULL;
3388 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3389 struct got_object_qid *qid;
3391 qid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
3393 err = got_object_open_as_commit(&pcommit, repo,
3399 if (path && path[0] != '\0') {
3401 err = got_object_id_by_path(&obj_id2, repo, id, path);
3404 err = got_object_id_str(&id_str2, obj_id2);
3410 err = got_object_id_by_path(&obj_id1, repo,
3413 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3418 err = got_object_id_str(&id_str1, obj_id1);
3425 err = got_object_get_type(&obj_type, repo, obj_id2);
3430 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3432 case GOT_OBJ_TYPE_BLOB:
3433 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3436 case GOT_OBJ_TYPE_TREE:
3437 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3441 err = got_error(GOT_ERR_OBJ_TYPE);
3447 obj_id2 = got_object_commit_get_tree_id(commit);
3448 err = got_object_id_str(&id_str2, obj_id2);
3452 obj_id1 = got_object_commit_get_tree_id(pcommit);
3453 err = got_object_id_str(&id_str1, obj_id1);
3457 printf("diff %s %s\n", id_str1 ? id_str1 : "/dev/null",
3459 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3466 got_object_commit_close(pcommit);
3471 get_datestr(time_t *time, char *datebuf)
3473 struct tm mytm, *tm;
3476 tm = gmtime_r(time, &mytm);
3479 s = asctime_r(tm, datebuf);
3482 p = strchr(s, '\n');
3488 static const struct got_error *
3489 match_logmsg(int *have_match, struct got_object_id *id,
3490 struct got_commit_object *commit, regex_t *regex)
3492 const struct got_error *err = NULL;
3493 regmatch_t regmatch;
3494 char *id_str = NULL, *logmsg = NULL;
3498 err = got_object_id_str(&id_str, id);
3502 err = got_object_commit_get_logmsg(&logmsg, commit);
3506 if (regexec(regex, logmsg, 1, ®match, 0) == 0)
3515 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
3518 regmatch_t regmatch;
3519 struct got_pathlist_entry *pe;
3523 TAILQ_FOREACH(pe, changed_paths, entry) {
3524 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
3531 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
3533 static const struct got_error*
3534 build_refs_str(char **refs_str, struct got_reflist_head *refs,
3535 struct got_object_id *id, struct got_repository *repo)
3537 static const struct got_error *err = NULL;
3538 struct got_reflist_entry *re;
3544 TAILQ_FOREACH(re, refs, entry) {
3545 struct got_tag_object *tag = NULL;
3546 struct got_object_id *ref_id;
3549 name = got_ref_get_name(re->ref);
3550 if (strcmp(name, GOT_REF_HEAD) == 0)
3552 if (strncmp(name, "refs/", 5) == 0)
3554 if (strncmp(name, "got/", 4) == 0)
3556 if (strncmp(name, "heads/", 6) == 0)
3558 if (strncmp(name, "remotes/", 8) == 0) {
3560 s = strstr(name, "/" GOT_REF_HEAD);
3561 if (s != NULL && s[strlen(s)] == '\0')
3564 err = got_ref_resolve(&ref_id, repo, re->ref);
3567 if (strncmp(name, "tags/", 5) == 0) {
3568 err = got_object_open_as_tag(&tag, repo, ref_id);
3570 if (err->code != GOT_ERR_OBJ_TYPE) {
3574 /* Ref points at something other than a tag. */
3579 cmp = got_object_id_cmp(tag ?
3580 got_object_tag_get_object_id(tag) : ref_id, id);
3583 got_object_tag_close(tag);
3587 if (asprintf(refs_str, "%s%s%s", s ? s : "",
3588 s ? ", " : "", name) == -1) {
3589 err = got_error_from_errno("asprintf");
3600 static const struct got_error *
3601 print_commit(struct got_commit_object *commit, struct got_object_id *id,
3602 struct got_repository *repo, const char *path,
3603 struct got_pathlist_head *changed_paths, int show_patch,
3604 int diff_context, struct got_reflist_object_id_map *refs_idmap)
3606 const struct got_error *err = NULL;
3607 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3609 time_t committer_time;
3610 const char *author, *committer;
3611 char *refs_str = NULL;
3612 struct got_reflist_head *refs;
3614 err = got_object_id_str(&id_str, id);
3618 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3620 err = build_refs_str(&refs_str, refs, id, repo);
3625 printf(GOT_COMMIT_SEP_STR);
3626 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3627 refs_str ? refs_str : "", refs_str ? ")" : "");
3632 printf("from: %s\n", got_object_commit_get_author(commit));
3633 committer_time = got_object_commit_get_committer_time(commit);
3634 datestr = get_datestr(&committer_time, datebuf);
3636 printf("date: %s UTC\n", datestr);
3637 author = got_object_commit_get_author(commit);
3638 committer = got_object_commit_get_committer(commit);
3639 if (strcmp(author, committer) != 0)
3640 printf("via: %s\n", committer);
3641 if (got_object_commit_get_nparents(commit) > 1) {
3642 const struct got_object_id_queue *parent_ids;
3643 struct got_object_qid *qid;
3645 parent_ids = got_object_commit_get_parent_ids(commit);
3646 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3647 err = got_object_id_str(&id_str, qid->id);
3650 printf("parent %d: %s\n", n++, id_str);
3656 err = got_object_commit_get_logmsg(&logmsg0, commit);
3662 line = strsep(&logmsg, "\n");
3664 printf(" %s\n", line);
3668 if (changed_paths) {
3669 struct got_pathlist_entry *pe;
3670 TAILQ_FOREACH(pe, changed_paths, entry) {
3671 struct got_diff_changed_path *cp = pe->data;
3672 printf(" %c %s\n", cp->status, pe->path);
3677 err = print_patch(commit, id, path, diff_context, repo);
3682 if (fflush(stdout) != 0 && err == NULL)
3683 err = got_error_from_errno("fflush");
3690 static const struct got_error *
3691 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3692 struct got_repository *repo, const char *path, int show_changed_paths,
3693 int show_patch, const char *search_pattern, int diff_context, int limit,
3694 int log_branches, int reverse_display_order,
3695 struct got_reflist_object_id_map *refs_idmap)
3697 const struct got_error *err;
3698 struct got_commit_graph *graph;
3701 struct got_object_id_queue reversed_commits;
3702 struct got_object_qid *qid;
3703 struct got_commit_object *commit;
3704 struct got_pathlist_head changed_paths;
3705 struct got_pathlist_entry *pe;
3707 SIMPLEQ_INIT(&reversed_commits);
3708 TAILQ_INIT(&changed_paths);
3710 if (search_pattern && regcomp(®ex, search_pattern,
3711 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3712 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3714 err = got_commit_graph_open(&graph, path, !log_branches);
3717 err = got_commit_graph_iter_start(graph, root_id, repo,
3718 check_cancelled, NULL);
3722 struct got_object_id *id;
3724 if (sigint_received || sigpipe_received)
3727 err = got_commit_graph_iter_next(&id, graph, repo,
3728 check_cancelled, NULL);
3730 if (err->code == GOT_ERR_ITER_COMPLETED)
3737 err = got_object_open_as_commit(&commit, repo, id);
3741 if (show_changed_paths && !reverse_display_order) {
3742 err = get_changed_paths(&changed_paths, commit, repo);
3747 if (search_pattern) {
3748 err = match_logmsg(&have_match, id, commit, ®ex);
3750 got_object_commit_close(commit);
3753 if (have_match == 0 && show_changed_paths)
3754 match_changed_paths(&have_match,
3755 &changed_paths, ®ex);
3756 if (have_match == 0) {
3757 got_object_commit_close(commit);
3758 TAILQ_FOREACH(pe, &changed_paths, entry) {
3759 free((char *)pe->path);
3762 got_pathlist_free(&changed_paths);
3767 if (reverse_display_order) {
3768 err = got_object_qid_alloc(&qid, id);
3771 SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3772 got_object_commit_close(commit);
3774 err = print_commit(commit, id, repo, path,
3775 show_changed_paths ? &changed_paths : NULL,
3776 show_patch, diff_context, refs_idmap);
3777 got_object_commit_close(commit);
3781 if ((limit && --limit == 0) ||
3782 (end_id && got_object_id_cmp(id, end_id) == 0))
3785 TAILQ_FOREACH(pe, &changed_paths, entry) {
3786 free((char *)pe->path);
3789 got_pathlist_free(&changed_paths);
3791 if (reverse_display_order) {
3792 SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3793 err = got_object_open_as_commit(&commit, repo, qid->id);
3796 if (show_changed_paths) {
3797 err = get_changed_paths(&changed_paths,
3802 err = print_commit(commit, qid->id, repo, path,
3803 show_changed_paths ? &changed_paths : NULL,
3804 show_patch, diff_context, refs_idmap);
3805 got_object_commit_close(commit);
3808 TAILQ_FOREACH(pe, &changed_paths, entry) {
3809 free((char *)pe->path);
3812 got_pathlist_free(&changed_paths);
3816 while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3817 qid = SIMPLEQ_FIRST(&reversed_commits);
3818 SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3819 got_object_qid_free(qid);
3821 TAILQ_FOREACH(pe, &changed_paths, entry) {
3822 free((char *)pe->path);
3825 got_pathlist_free(&changed_paths);
3828 got_commit_graph_close(graph);
3835 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3836 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3837 "[-R] [path]\n", getprogname());
3842 get_default_log_limit(void)
3844 const char *got_default_log_limit;
3848 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3849 if (got_default_log_limit == NULL)
3851 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3857 static const struct got_error *
3858 cmd_log(int argc, char *argv[])
3860 const struct got_error *error;
3861 struct got_repository *repo = NULL;
3862 struct got_worktree *worktree = NULL;
3863 struct got_object_id *start_id = NULL, *end_id = NULL;
3864 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3865 const char *start_commit = NULL, *end_commit = NULL;
3866 const char *search_pattern = NULL;
3867 int diff_context = -1, ch;
3868 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3869 int reverse_display_order = 0;
3871 struct got_reflist_head refs;
3872 struct got_reflist_object_id_map *refs_idmap = NULL;
3877 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3883 limit = get_default_log_limit();
3885 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3891 show_changed_paths = 1;
3894 start_commit = optarg;
3897 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3900 err(1, "-C option %s", errstr);
3903 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3905 err(1, "-l option %s", errstr);
3911 repo_path = realpath(optarg, NULL);
3912 if (repo_path == NULL)
3913 return got_error_from_errno2("realpath",
3915 got_path_strip_trailing_slashes(repo_path);
3918 reverse_display_order = 1;
3921 search_pattern = optarg;
3924 end_commit = optarg;
3935 if (diff_context == -1)
3937 else if (!show_patch)
3938 errx(1, "-C requires -p");
3940 cwd = getcwd(NULL, 0);
3942 error = got_error_from_errno("getcwd");
3946 if (repo_path == NULL) {
3947 error = got_worktree_open(&worktree, cwd);
3948 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3955 error = got_worktree_resolve_path(&path, worktree,
3960 path = strdup(argv[0]);
3962 error = got_error_from_errno("strdup");
3966 } else if (argc != 0)
3969 if (repo_path == NULL) {
3970 repo_path = worktree ?
3971 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3973 if (repo_path == NULL) {
3974 error = got_error_from_errno("strdup");
3978 error = got_repo_open(&repo, repo_path, NULL);
3982 error = apply_unveil(got_repo_get_path(repo), 1,
3983 worktree ? got_worktree_get_root_path(worktree) : NULL);
3987 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3991 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
3995 if (start_commit == NULL) {
3996 struct got_reference *head_ref;
3997 struct got_commit_object *commit = NULL;
3998 error = got_ref_open(&head_ref, repo,
3999 worktree ? got_worktree_get_head_ref_name(worktree)
4003 error = got_ref_resolve(&start_id, repo, head_ref);
4004 got_ref_close(head_ref);
4007 error = got_object_open_as_commit(&commit, repo,
4011 got_object_commit_close(commit);
4013 error = got_repo_match_object_id(&start_id, NULL,
4014 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4018 if (end_commit != NULL) {
4019 error = got_repo_match_object_id(&end_id, NULL,
4020 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4027 * If a path was specified on the command line it was resolved
4028 * to a path in the work tree above. Prepend the work tree's
4029 * path prefix to obtain the corresponding in-repository path.
4033 prefix = got_worktree_get_path_prefix(worktree);
4034 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4035 (path[0] != '\0') ? "/" : "", path) == -1) {
4036 error = got_error_from_errno("asprintf");
4041 error = got_repo_map_path(&in_repo_path, repo,
4047 path = in_repo_path;
4050 error = print_commits(start_id, end_id, repo, path ? path : "",
4051 show_changed_paths, show_patch, search_pattern, diff_context,
4052 limit, log_branches, reverse_display_order, refs_idmap);
4058 got_worktree_close(worktree);
4060 const struct got_error *repo_error;
4061 repo_error = got_repo_close(repo);
4066 got_reflist_object_id_map_free(refs_idmap);
4067 got_ref_list_free(&refs);
4074 fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
4075 "[-s] [-w] [object1 object2 | path]\n", getprogname());
4079 struct print_diff_arg {
4080 struct got_repository *repo;
4081 struct got_worktree *worktree;
4086 int ignore_whitespace;
4087 int force_text_diff;
4091 * Create a file which contains the target path of a symlink so we can feed
4092 * it as content to the diff engine.
4094 static const struct got_error *
4095 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4096 const char *abspath)
4098 const struct got_error *err = NULL;
4099 char target_path[PATH_MAX];
4100 ssize_t target_len, outlen;
4105 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4106 if (target_len == -1)
4107 return got_error_from_errno2("readlinkat", abspath);
4109 target_len = readlink(abspath, target_path, PATH_MAX);
4110 if (target_len == -1)
4111 return got_error_from_errno2("readlink", abspath);
4114 *fd = got_opentempfd();
4116 return got_error_from_errno("got_opentempfd");
4118 outlen = write(*fd, target_path, target_len);
4120 err = got_error_from_errno("got_opentempfd");
4124 if (lseek(*fd, 0, SEEK_SET) == -1) {
4125 err = got_error_from_errno2("lseek", abspath);
4136 static const struct got_error *
4137 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4138 const char *path, struct got_object_id *blob_id,
4139 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4140 int dirfd, const char *de_name)
4142 struct print_diff_arg *a = arg;
4143 const struct got_error *err = NULL;
4144 struct got_blob_object *blob1 = NULL;
4147 char *abspath = NULL, *label1 = NULL;
4150 if (a->diff_staged) {
4151 if (staged_status != GOT_STATUS_MODIFY &&
4152 staged_status != GOT_STATUS_ADD &&
4153 staged_status != GOT_STATUS_DELETE)
4156 if (staged_status == GOT_STATUS_DELETE)
4158 if (status == GOT_STATUS_NONEXISTENT)
4159 return got_error_set_errno(ENOENT, path);
4160 if (status != GOT_STATUS_MODIFY &&
4161 status != GOT_STATUS_ADD &&
4162 status != GOT_STATUS_DELETE &&
4163 status != GOT_STATUS_CONFLICT)
4167 if (!a->header_shown) {
4168 printf("diff %s %s%s\n", a->id_str,
4169 got_worktree_get_root_path(a->worktree),
4170 a->diff_staged ? " (staged changes)" : "");
4171 a->header_shown = 1;
4174 if (a->diff_staged) {
4175 const char *label1 = NULL, *label2 = NULL;
4176 switch (staged_status) {
4177 case GOT_STATUS_MODIFY:
4181 case GOT_STATUS_ADD:
4184 case GOT_STATUS_DELETE:
4188 return got_error(GOT_ERR_FILE_STATUS);
4190 return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4191 staged_blob_id, label1, label2, a->diff_context,
4192 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4195 if (staged_status == GOT_STATUS_ADD ||
4196 staged_status == GOT_STATUS_MODIFY) {
4198 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4202 err = got_object_id_str(&id_str, staged_blob_id);
4205 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4206 err = got_error_from_errno("asprintf");
4211 } else if (status != GOT_STATUS_ADD) {
4212 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4217 if (status != GOT_STATUS_DELETE) {
4218 if (asprintf(&abspath, "%s/%s",
4219 got_worktree_get_root_path(a->worktree), path) == -1) {
4220 err = got_error_from_errno("asprintf");
4225 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4227 if (errno != ELOOP) {
4228 err = got_error_from_errno2("openat",
4232 err = get_symlink_target_file(&fd, dirfd,
4238 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4240 if (errno != ELOOP) {
4241 err = got_error_from_errno2("open",
4245 err = get_symlink_target_file(&fd, dirfd,
4251 if (fstat(fd, &sb) == -1) {
4252 err = got_error_from_errno2("fstat", abspath);
4255 f2 = fdopen(fd, "r");
4257 err = got_error_from_errno2("fdopen", abspath);
4264 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4265 a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4268 got_object_blob_close(blob1);
4269 if (f2 && fclose(f2) == EOF && err == NULL)
4270 err = got_error_from_errno("fclose");
4271 if (fd != -1 && close(fd) == -1 && err == NULL)
4272 err = got_error_from_errno("close");
4277 static const struct got_error *
4278 cmd_diff(int argc, char *argv[])
4280 const struct got_error *error;
4281 struct got_repository *repo = NULL;
4282 struct got_worktree *worktree = NULL;
4283 char *cwd = NULL, *repo_path = NULL;
4284 struct got_object_id *id1 = NULL, *id2 = NULL;
4285 const char *id_str1 = NULL, *id_str2 = NULL;
4286 char *label1 = NULL, *label2 = NULL;
4288 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4289 int force_text_diff = 0;
4292 struct got_reflist_head refs;
4297 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4302 while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4305 force_text_diff = 1;
4308 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4311 err(1, "-C option %s", errstr);
4314 repo_path = realpath(optarg, NULL);
4315 if (repo_path == NULL)
4316 return got_error_from_errno2("realpath",
4318 got_path_strip_trailing_slashes(repo_path);
4324 ignore_whitespace = 1;
4335 cwd = getcwd(NULL, 0);
4337 error = got_error_from_errno("getcwd");
4343 "-r option can't be used when diffing a work tree");
4344 error = got_worktree_open(&worktree, cwd);
4346 if (error->code == GOT_ERR_NOT_WORKTREE)
4347 error = wrap_not_worktree_error(error, "diff",
4351 repo_path = strdup(got_worktree_get_repo_path(worktree));
4352 if (repo_path == NULL) {
4353 error = got_error_from_errno("strdup");
4357 error = got_worktree_resolve_path(&path, worktree,
4364 error = got_error_from_errno("strdup");
4368 } else if (argc == 2) {
4370 errx(1, "-s option can't be used when diffing "
4371 "objects in repository");
4374 if (repo_path == NULL) {
4375 error = got_worktree_open(&worktree, cwd);
4376 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4380 got_worktree_get_repo_path(worktree));
4381 if (repo_path == NULL) {
4382 error = got_error_from_errno("strdup");
4386 repo_path = strdup(cwd);
4387 if (repo_path == NULL) {
4388 error = got_error_from_errno("strdup");
4396 error = got_repo_open(&repo, repo_path, NULL);
4401 error = apply_unveil(got_repo_get_path(repo), 1,
4402 worktree ? got_worktree_get_root_path(worktree) : NULL);
4407 struct print_diff_arg arg;
4408 struct got_pathlist_head paths;
4413 error = got_object_id_str(&id_str,
4414 got_worktree_get_base_commit_id(worktree));
4418 arg.worktree = worktree;
4419 arg.diff_context = diff_context;
4420 arg.id_str = id_str;
4421 arg.header_shown = 0;
4422 arg.diff_staged = diff_staged;
4423 arg.ignore_whitespace = ignore_whitespace;
4424 arg.force_text_diff = force_text_diff;
4426 error = got_pathlist_append(&paths, path, NULL);
4430 error = got_worktree_status(worktree, &paths, repo, print_diff,
4431 &arg, check_cancelled, NULL);
4433 got_pathlist_free(&paths);
4437 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4441 error = got_repo_match_object_id(&id1, &label1, id_str1,
4442 GOT_OBJ_TYPE_ANY, &refs, repo);
4446 error = got_repo_match_object_id(&id2, &label2, id_str2,
4447 GOT_OBJ_TYPE_ANY, &refs, repo);
4451 error = got_object_get_type(&type1, repo, id1);
4455 error = got_object_get_type(&type2, repo, id2);
4459 if (type1 != type2) {
4460 error = got_error(GOT_ERR_OBJ_TYPE);
4465 case GOT_OBJ_TYPE_BLOB:
4466 error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4467 NULL, NULL, diff_context, ignore_whitespace,
4468 force_text_diff, repo, stdout);
4470 case GOT_OBJ_TYPE_TREE:
4471 error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4472 "", "", diff_context, ignore_whitespace, force_text_diff,
4475 case GOT_OBJ_TYPE_COMMIT:
4476 printf("diff %s %s\n", label1, label2);
4477 error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4478 diff_context, ignore_whitespace, force_text_diff, repo,
4482 error = got_error(GOT_ERR_OBJ_TYPE);
4491 got_worktree_close(worktree);
4493 const struct got_error *repo_error;
4494 repo_error = got_repo_close(repo);
4498 got_ref_list_free(&refs);
4506 "usage: %s blame [-c commit] [-r repository-path] path\n",
4515 char datebuf[11]; /* YYYY-MM-DD + NUL */
4518 struct blame_cb_args {
4519 struct blame_line *lines;
4523 off_t *line_offsets;
4525 struct got_repository *repo;
4528 static const struct got_error *
4529 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4531 const struct got_error *err = NULL;
4532 struct blame_cb_args *a = arg;
4533 struct blame_line *bline;
4535 size_t linesize = 0;
4536 struct got_commit_object *commit = NULL;
4539 time_t committer_time;
4541 if (nlines != a->nlines ||
4542 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4543 return got_error(GOT_ERR_RANGE);
4545 if (sigint_received)
4546 return got_error(GOT_ERR_ITER_COMPLETED);
4549 return NULL; /* no change in this commit */
4551 /* Annotate this line. */
4552 bline = &a->lines[lineno - 1];
4553 if (bline->annotated)
4555 err = got_object_id_str(&bline->id_str, id);
4559 err = got_object_open_as_commit(&commit, a->repo, id);
4563 bline->committer = strdup(got_object_commit_get_committer(commit));
4564 if (bline->committer == NULL) {
4565 err = got_error_from_errno("strdup");
4569 committer_time = got_object_commit_get_committer_time(commit);
4570 if (localtime_r(&committer_time, &tm) == NULL)
4571 return got_error_from_errno("localtime_r");
4572 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4573 &tm) >= sizeof(bline->datebuf)) {
4574 err = got_error(GOT_ERR_NO_SPACE);
4577 bline->annotated = 1;
4579 /* Print lines annotated so far. */
4580 bline = &a->lines[a->lineno_cur - 1];
4581 if (!bline->annotated)
4584 offset = a->line_offsets[a->lineno_cur - 1];
4585 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4586 err = got_error_from_errno("fseeko");
4590 while (bline->annotated) {
4591 char *smallerthan, *at, *nl, *committer;
4594 if (getline(&line, &linesize, a->f) == -1) {
4596 err = got_error_from_errno("getline");
4600 committer = bline->committer;
4601 smallerthan = strchr(committer, '<');
4602 if (smallerthan && smallerthan[1] != '\0')
4603 committer = smallerthan + 1;
4604 at = strchr(committer, '@');
4607 len = strlen(committer);
4609 committer[8] = '\0';
4611 nl = strchr(line, '\n');
4614 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4615 bline->id_str, bline->datebuf, committer, line);
4618 bline = &a->lines[a->lineno_cur - 1];
4622 got_object_commit_close(commit);
4627 static const struct got_error *
4628 cmd_blame(int argc, char *argv[])
4630 const struct got_error *error;
4631 struct got_repository *repo = NULL;
4632 struct got_worktree *worktree = NULL;
4633 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4634 char *link_target = NULL;
4635 struct got_object_id *obj_id = NULL;
4636 struct got_object_id *commit_id = NULL;
4637 struct got_blob_object *blob = NULL;
4638 char *commit_id_str = NULL;
4639 struct blame_cb_args bca;
4640 int ch, obj_type, i;
4643 memset(&bca, 0, sizeof(bca));
4646 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4651 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4654 commit_id_str = optarg;
4657 repo_path = realpath(optarg, NULL);
4658 if (repo_path == NULL)
4659 return got_error_from_errno2("realpath",
4661 got_path_strip_trailing_slashes(repo_path);
4677 cwd = getcwd(NULL, 0);
4679 error = got_error_from_errno("getcwd");
4682 if (repo_path == NULL) {
4683 error = got_worktree_open(&worktree, cwd);
4684 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4690 strdup(got_worktree_get_repo_path(worktree));
4691 if (repo_path == NULL) {
4692 error = got_error_from_errno("strdup");
4697 repo_path = strdup(cwd);
4698 if (repo_path == NULL) {
4699 error = got_error_from_errno("strdup");
4705 error = got_repo_open(&repo, repo_path, NULL);
4710 const char *prefix = got_worktree_get_path_prefix(worktree);
4713 error = got_worktree_resolve_path(&p, worktree, path);
4716 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4717 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4719 error = got_error_from_errno("asprintf");
4724 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4726 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4729 error = got_repo_map_path(&in_repo_path, repo, path);
4734 if (commit_id_str == NULL) {
4735 struct got_reference *head_ref;
4736 error = got_ref_open(&head_ref, repo, worktree ?
4737 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4740 error = got_ref_resolve(&commit_id, repo, head_ref);
4741 got_ref_close(head_ref);
4745 struct got_reflist_head refs;
4747 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4751 error = got_repo_match_object_id(&commit_id, NULL,
4752 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4753 got_ref_list_free(&refs);
4758 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4763 error = got_object_id_by_path(&obj_id, repo, commit_id,
4764 link_target ? link_target : in_repo_path);
4768 error = got_object_get_type(&obj_type, repo, obj_id);
4772 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4773 error = got_error_path(link_target ? link_target : in_repo_path,
4778 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4781 bca.f = got_opentemp();
4782 if (bca.f == NULL) {
4783 error = got_error_from_errno("got_opentemp");
4786 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4787 &bca.line_offsets, bca.f, blob);
4788 if (error || bca.nlines == 0)
4791 /* Don't include \n at EOF in the blame line count. */
4792 if (bca.line_offsets[bca.nlines - 1] == filesize)
4795 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4796 if (bca.lines == NULL) {
4797 error = got_error_from_errno("calloc");
4801 bca.nlines_prec = 0;
4809 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4810 repo, blame_cb, &bca, check_cancelled, NULL);
4819 got_object_blob_close(blob);
4821 got_worktree_close(worktree);
4823 const struct got_error *repo_error;
4824 repo_error = got_repo_close(repo);
4829 for (i = 0; i < bca.nlines; i++) {
4830 struct blame_line *bline = &bca.lines[i];
4831 free(bline->id_str);
4832 free(bline->committer);
4836 free(bca.line_offsets);
4837 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4838 error = got_error_from_errno("fclose");
4846 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4851 static const struct got_error *
4852 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4853 const char *root_path, struct got_repository *repo)
4855 const struct got_error *err = NULL;
4856 int is_root_path = (strcmp(path, root_path) == 0);
4857 const char *modestr = "";
4858 mode_t mode = got_tree_entry_get_mode(te);
4859 char *link_target = NULL;
4861 path += strlen(root_path);
4862 while (path[0] == '/')
4865 if (got_object_tree_entry_is_submodule(te))
4867 else if (S_ISLNK(mode)) {
4870 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4873 for (i = 0; i < strlen(link_target); i++) {
4874 if (!isprint((unsigned char)link_target[i]))
4875 link_target[i] = '?';
4880 else if (S_ISDIR(mode))
4882 else if (mode & S_IXUSR)
4885 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4886 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4887 link_target ? " -> ": "", link_target ? link_target : "");
4893 static const struct got_error *
4894 print_tree(const char *path, struct got_object_id *commit_id,
4895 int show_ids, int recurse, const char *root_path,
4896 struct got_repository *repo)
4898 const struct got_error *err = NULL;
4899 struct got_object_id *tree_id = NULL;
4900 struct got_tree_object *tree = NULL;
4903 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4907 err = got_object_open_as_tree(&tree, repo, tree_id);
4910 nentries = got_object_tree_get_nentries(tree);
4911 for (i = 0; i < nentries; i++) {
4912 struct got_tree_entry *te;
4915 if (sigint_received || sigpipe_received)
4918 te = got_object_tree_get_entry(tree, i);
4921 err = got_object_id_str(&id_str,
4922 got_tree_entry_get_id(te));
4925 if (asprintf(&id, "%s ", id_str) == -1) {
4926 err = got_error_from_errno("asprintf");
4932 err = print_entry(te, id, path, root_path, repo);
4937 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4939 if (asprintf(&child_path, "%s%s%s", path,
4940 path[0] == '/' && path[1] == '\0' ? "" : "/",
4941 got_tree_entry_get_name(te)) == -1) {
4942 err = got_error_from_errno("asprintf");
4945 err = print_tree(child_path, commit_id, show_ids, 1,
4954 got_object_tree_close(tree);
4959 static const struct got_error *
4960 cmd_tree(int argc, char *argv[])
4962 const struct got_error *error;
4963 struct got_repository *repo = NULL;
4964 struct got_worktree *worktree = NULL;
4965 const char *path, *refname = NULL;
4966 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4967 struct got_object_id *commit_id = NULL;
4968 char *commit_id_str = NULL;
4969 int show_ids = 0, recurse = 0;
4973 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4978 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4981 commit_id_str = optarg;
4984 repo_path = realpath(optarg, NULL);
4985 if (repo_path == NULL)
4986 return got_error_from_errno2("realpath",
4988 got_path_strip_trailing_slashes(repo_path);
5012 cwd = getcwd(NULL, 0);
5014 error = got_error_from_errno("getcwd");
5017 if (repo_path == NULL) {
5018 error = got_worktree_open(&worktree, cwd);
5019 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5025 strdup(got_worktree_get_repo_path(worktree));
5026 if (repo_path == NULL)
5027 error = got_error_from_errno("strdup");
5031 repo_path = strdup(cwd);
5032 if (repo_path == NULL) {
5033 error = got_error_from_errno("strdup");
5039 error = got_repo_open(&repo, repo_path, NULL);
5044 const char *prefix = got_worktree_get_path_prefix(worktree);
5049 error = got_worktree_resolve_path(&p, worktree, path);
5052 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5053 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5055 error = got_error_from_errno("asprintf");
5060 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5064 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5069 error = got_repo_map_path(&in_repo_path, repo, path);
5074 if (commit_id_str == NULL) {
5075 struct got_reference *head_ref;
5077 refname = got_worktree_get_head_ref_name(worktree);
5079 refname = GOT_REF_HEAD;
5080 error = got_ref_open(&head_ref, repo, refname, 0);
5083 error = got_ref_resolve(&commit_id, repo, head_ref);
5084 got_ref_close(head_ref);
5088 struct got_reflist_head refs;
5090 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5094 error = got_repo_match_object_id(&commit_id, NULL,
5095 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5096 got_ref_list_free(&refs);
5101 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5102 in_repo_path, repo);
5109 got_worktree_close(worktree);
5111 const struct got_error *repo_error;
5112 repo_error = got_repo_close(repo);
5122 fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
5127 static const struct got_error *
5128 print_status(void *arg, unsigned char status, unsigned char staged_status,
5129 const char *path, struct got_object_id *blob_id,
5130 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5131 int dirfd, const char *de_name)
5133 if (status == staged_status && (status == GOT_STATUS_DELETE))
5134 status = GOT_STATUS_NO_CHANGE;
5136 char *status_codes = arg;
5137 size_t ncodes = strlen(status_codes);
5139 for (i = 0; i < ncodes ; i++) {
5140 if (status == status_codes[i] ||
5141 staged_status == status_codes[i])
5147 printf("%c%c %s\n", status, staged_status, path);
5151 static const struct got_error *
5152 cmd_status(int argc, char *argv[])
5154 const struct got_error *error = NULL;
5155 struct got_repository *repo = NULL;
5156 struct got_worktree *worktree = NULL;
5157 char *cwd = NULL, *status_codes = NULL;;
5158 struct got_pathlist_head paths;
5159 struct got_pathlist_entry *pe;
5164 while ((ch = getopt(argc, argv, "s:")) != -1) {
5167 for (i = 0; i < strlen(optarg); i++) {
5168 switch (optarg[i]) {
5169 case GOT_STATUS_MODIFY:
5170 case GOT_STATUS_ADD:
5171 case GOT_STATUS_DELETE:
5172 case GOT_STATUS_CONFLICT:
5173 case GOT_STATUS_MISSING:
5174 case GOT_STATUS_OBSTRUCTED:
5175 case GOT_STATUS_UNVERSIONED:
5176 case GOT_STATUS_MODE_CHANGE:
5177 case GOT_STATUS_NONEXISTENT:
5180 errx(1, "invalid status code '%c'",
5184 status_codes = optarg;
5196 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5200 cwd = getcwd(NULL, 0);
5202 error = got_error_from_errno("getcwd");
5206 error = got_worktree_open(&worktree, cwd);
5208 if (error->code == GOT_ERR_NOT_WORKTREE)
5209 error = wrap_not_worktree_error(error, "status", cwd);
5213 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5218 error = apply_unveil(got_repo_get_path(repo), 1,
5219 got_worktree_get_root_path(worktree));
5223 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5227 error = got_worktree_status(worktree, &paths, repo, print_status,
5228 status_codes, check_cancelled, NULL);
5230 TAILQ_FOREACH(pe, &paths, entry)
5231 free((char *)pe->path);
5232 got_pathlist_free(&paths);
5241 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5247 static const struct got_error *
5248 list_refs(struct got_repository *repo, const char *refname)
5250 static const struct got_error *err = NULL;
5251 struct got_reflist_head refs;
5252 struct got_reflist_entry *re;
5255 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5259 TAILQ_FOREACH(re, &refs, entry) {
5261 refstr = got_ref_to_str(re->ref);
5263 return got_error_from_errno("got_ref_to_str");
5264 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5268 got_ref_list_free(&refs);
5272 static const struct got_error *
5273 delete_ref(struct got_repository *repo, const char *refname)
5275 const struct got_error *err = NULL;
5276 struct got_reference *ref;
5278 err = got_ref_open(&ref, repo, refname, 0);
5282 err = got_ref_delete(ref, repo);
5287 static const struct got_error *
5288 add_ref(struct got_repository *repo, const char *refname, const char *target)
5290 const struct got_error *err = NULL;
5291 struct got_object_id *id;
5292 struct got_reference *ref = NULL;
5295 * Don't let the user create a reference name with a leading '-'.
5296 * While technically a valid reference name, this case is usually
5297 * an unintended typo.
5299 if (refname[0] == '-')
5300 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5302 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5305 struct got_reference *target_ref;
5307 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5309 err = got_ref_open(&target_ref, repo, target, 0);
5312 err = got_ref_resolve(&id, repo, target_ref);
5313 got_ref_close(target_ref);
5318 err = got_ref_alloc(&ref, refname, id);
5322 err = got_ref_write(ref, repo);
5330 static const struct got_error *
5331 add_symref(struct got_repository *repo, const char *refname, const char *target)
5333 const struct got_error *err = NULL;
5334 struct got_reference *ref = NULL;
5335 struct got_reference *target_ref = NULL;
5338 * Don't let the user create a reference name with a leading '-'.
5339 * While technically a valid reference name, this case is usually
5340 * an unintended typo.
5342 if (refname[0] == '-')
5343 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5345 err = got_ref_open(&target_ref, repo, target, 0);
5349 err = got_ref_alloc_symref(&ref, refname, target_ref);
5353 err = got_ref_write(ref, repo);
5356 got_ref_close(target_ref);
5362 static const struct got_error *
5363 cmd_ref(int argc, char *argv[])
5365 const struct got_error *error = NULL;
5366 struct got_repository *repo = NULL;
5367 struct got_worktree *worktree = NULL;
5368 char *cwd = NULL, *repo_path = NULL;
5369 int ch, do_list = 0, do_delete = 0;
5370 const char *obj_arg = NULL, *symref_target= NULL;
5371 char *refname = NULL;
5373 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5382 repo_path = realpath(optarg, NULL);
5383 if (repo_path == NULL)
5384 return got_error_from_errno2("realpath",
5386 got_path_strip_trailing_slashes(repo_path);
5392 symref_target = optarg;
5400 if (obj_arg && do_list)
5401 option_conflict('c', 'l');
5402 if (obj_arg && do_delete)
5403 option_conflict('c', 'd');
5404 if (obj_arg && symref_target)
5405 option_conflict('c', 's');
5406 if (symref_target && do_delete)
5407 option_conflict('s', 'd');
5408 if (symref_target && do_list)
5409 option_conflict('s', 'l');
5410 if (do_delete && do_list)
5411 option_conflict('d', 'l');
5417 if (argc != 0 && argc != 1)
5420 refname = strdup(argv[0]);
5421 if (refname == NULL) {
5422 error = got_error_from_errno("strdup");
5429 refname = strdup(argv[0]);
5430 if (refname == NULL) {
5431 error = got_error_from_errno("strdup");
5437 got_path_strip_trailing_slashes(refname);
5441 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5445 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5446 "sendfd unveil", NULL) == -1)
5450 cwd = getcwd(NULL, 0);
5452 error = got_error_from_errno("getcwd");
5456 if (repo_path == NULL) {
5457 error = got_worktree_open(&worktree, cwd);
5458 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5464 strdup(got_worktree_get_repo_path(worktree));
5465 if (repo_path == NULL)
5466 error = got_error_from_errno("strdup");
5470 repo_path = strdup(cwd);
5471 if (repo_path == NULL) {
5472 error = got_error_from_errno("strdup");
5478 error = got_repo_open(&repo, repo_path, NULL);
5482 error = apply_unveil(got_repo_get_path(repo), do_list,
5483 worktree ? got_worktree_get_root_path(worktree) : NULL);
5488 error = list_refs(repo, refname);
5490 error = delete_ref(repo, refname);
5491 else if (symref_target)
5492 error = add_symref(repo, refname, symref_target);
5494 if (obj_arg == NULL)
5496 error = add_ref(repo, refname, obj_arg);
5501 got_repo_close(repo);
5503 got_worktree_close(worktree);
5513 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5514 "[name]\n", getprogname());
5518 static const struct got_error *
5519 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5520 struct got_reference *ref)
5522 const struct got_error *err = NULL;
5523 const char *refname, *marker = " ";
5526 refname = got_ref_get_name(ref);
5527 if (worktree && strcmp(refname,
5528 got_worktree_get_head_ref_name(worktree)) == 0) {
5529 struct got_object_id *id = NULL;
5531 err = got_ref_resolve(&id, repo, ref);
5534 if (got_object_id_cmp(id,
5535 got_worktree_get_base_commit_id(worktree)) == 0)
5542 if (strncmp(refname, "refs/heads/", 11) == 0)
5544 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5547 refstr = got_ref_to_str(ref);
5549 return got_error_from_errno("got_ref_to_str");
5551 printf("%s%s: %s\n", marker, refname, refstr);
5556 static const struct got_error *
5557 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
5559 const char *refname;
5561 if (worktree == NULL)
5562 return got_error(GOT_ERR_NOT_WORKTREE);
5564 refname = got_worktree_get_head_ref_name(worktree);
5566 if (strncmp(refname, "refs/heads/", 11) == 0)
5568 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5571 printf("%s\n", refname);
5576 static const struct got_error *
5577 list_branches(struct got_repository *repo, struct got_worktree *worktree)
5579 static const struct got_error *err = NULL;
5580 struct got_reflist_head refs;
5581 struct got_reflist_entry *re;
5582 struct got_reference *temp_ref = NULL;
5583 int rebase_in_progress, histedit_in_progress;
5588 err = got_worktree_rebase_in_progress(&rebase_in_progress,
5593 err = got_worktree_histedit_in_progress(&histedit_in_progress,
5598 if (rebase_in_progress || histedit_in_progress) {
5599 err = got_ref_open(&temp_ref, repo,
5600 got_worktree_get_head_ref_name(worktree), 0);
5603 list_branch(repo, worktree, temp_ref);
5604 got_ref_close(temp_ref);
5608 err = got_ref_list(&refs, repo, "refs/heads",
5609 got_ref_cmp_by_name, NULL);
5613 TAILQ_FOREACH(re, &refs, entry)
5614 list_branch(repo, worktree, re->ref);
5616 got_ref_list_free(&refs);
5620 static const struct got_error *
5621 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5622 const char *branch_name)
5624 const struct got_error *err = NULL;
5625 struct got_reference *ref = NULL;
5628 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5629 return got_error_from_errno("asprintf");
5631 err = got_ref_open(&ref, repo, refname, 0);
5636 strcmp(got_worktree_get_head_ref_name(worktree),
5637 got_ref_get_name(ref)) == 0) {
5638 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5639 "will not delete this work tree's current branch");
5643 err = got_ref_delete(ref, repo);
5651 static const struct got_error *
5652 add_branch(struct got_repository *repo, const char *branch_name,
5653 struct got_object_id *base_commit_id)
5655 const struct got_error *err = NULL;
5656 struct got_reference *ref = NULL;
5657 char *base_refname = NULL, *refname = NULL;
5660 * Don't let the user create a branch name with a leading '-'.
5661 * While technically a valid reference name, this case is usually
5662 * an unintended typo.
5664 if (branch_name[0] == '-')
5665 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5667 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5668 err = got_error_from_errno("asprintf");
5672 err = got_ref_open(&ref, repo, refname, 0);
5674 err = got_error(GOT_ERR_BRANCH_EXISTS);
5676 } else if (err->code != GOT_ERR_NOT_REF)
5679 err = got_ref_alloc(&ref, refname, base_commit_id);
5683 err = got_ref_write(ref, repo);
5692 static const struct got_error *
5693 cmd_branch(int argc, char *argv[])
5695 const struct got_error *error = NULL;
5696 struct got_repository *repo = NULL;
5697 struct got_worktree *worktree = NULL;
5698 char *cwd = NULL, *repo_path = NULL;
5699 int ch, do_list = 0, do_show = 0, do_update = 1;
5700 const char *delref = NULL, *commit_id_arg = NULL;
5701 struct got_reference *ref = NULL;
5702 struct got_pathlist_head paths;
5703 struct got_pathlist_entry *pe;
5704 struct got_object_id *commit_id = NULL;
5705 char *commit_id_str = NULL;
5709 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5712 commit_id_arg = optarg;
5718 repo_path = realpath(optarg, NULL);
5719 if (repo_path == NULL)
5720 return got_error_from_errno2("realpath",
5722 got_path_strip_trailing_slashes(repo_path);
5736 if (do_list && delref)
5737 option_conflict('l', 'd');
5742 if (!do_list && !delref && argc == 0)
5745 if ((do_list || delref || do_show) && commit_id_arg != NULL)
5746 errx(1, "-c option can only be used when creating a branch");
5748 if (do_list || delref) {
5751 } else if (!do_show && argc != 1)
5755 if (do_list || do_show) {
5756 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5760 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5761 "sendfd unveil", NULL) == -1)
5765 cwd = getcwd(NULL, 0);
5767 error = got_error_from_errno("getcwd");
5771 if (repo_path == NULL) {
5772 error = got_worktree_open(&worktree, cwd);
5773 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5779 strdup(got_worktree_get_repo_path(worktree));
5780 if (repo_path == NULL)
5781 error = got_error_from_errno("strdup");
5785 repo_path = strdup(cwd);
5786 if (repo_path == NULL) {
5787 error = got_error_from_errno("strdup");
5793 error = got_repo_open(&repo, repo_path, NULL);
5797 error = apply_unveil(got_repo_get_path(repo), do_list,
5798 worktree ? got_worktree_get_root_path(worktree) : NULL);
5803 error = show_current_branch(repo, worktree);
5805 error = list_branches(repo, worktree);
5807 error = delete_branch(repo, worktree, delref);
5809 struct got_reflist_head refs;
5811 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5815 if (commit_id_arg == NULL)
5816 commit_id_arg = worktree ?
5817 got_worktree_get_head_ref_name(worktree) :
5819 error = got_repo_match_object_id(&commit_id, NULL,
5820 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5821 got_ref_list_free(&refs);
5824 error = add_branch(repo, argv[0], commit_id);
5827 if (worktree && do_update) {
5828 struct got_update_progress_arg upa;
5829 char *branch_refname = NULL;
5831 error = got_object_id_str(&commit_id_str, commit_id);
5834 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5838 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5840 error = got_error_from_errno("asprintf");
5843 error = got_ref_open(&ref, repo, branch_refname, 0);
5844 free(branch_refname);
5847 error = switch_head_ref(ref, commit_id, worktree,
5851 error = got_worktree_set_base_commit_id(worktree, repo,
5855 memset(&upa, 0, sizeof(upa));
5856 error = got_worktree_checkout_files(worktree, &paths,
5857 repo, update_progress, &upa, check_cancelled,
5861 if (upa.did_something)
5862 printf("Updated to commit %s\n", commit_id_str);
5863 print_update_progress_stats(&upa);
5870 got_repo_close(repo);
5872 got_worktree_close(worktree);
5876 free(commit_id_str);
5877 TAILQ_FOREACH(pe, &paths, entry)
5878 free((char *)pe->path);
5879 got_pathlist_free(&paths);
5888 "usage: %s tag [-c commit] [-r repository] [-l] "
5889 "[-m message] name\n", getprogname());
5894 static const struct got_error *
5895 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5897 const struct got_error *err = NULL;
5898 struct got_reflist_entry *re, *se, *new;
5899 struct got_object_id *re_id, *se_id;
5900 struct got_tag_object *re_tag, *se_tag;
5901 time_t re_time, se_time;
5903 SIMPLEQ_FOREACH(re, tags, entry) {
5904 se = SIMPLEQ_FIRST(sorted);
5906 err = got_reflist_entry_dup(&new, re);
5909 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5912 err = got_ref_resolve(&re_id, repo, re->ref);
5915 err = got_object_open_as_tag(&re_tag, repo, re_id);
5919 re_time = got_object_tag_get_tagger_time(re_tag);
5920 got_object_tag_close(re_tag);
5924 err = got_ref_resolve(&se_id, repo, re->ref);
5927 err = got_object_open_as_tag(&se_tag, repo, se_id);
5931 se_time = got_object_tag_get_tagger_time(se_tag);
5932 got_object_tag_close(se_tag);
5934 if (se_time > re_time) {
5935 err = got_reflist_entry_dup(&new, re);
5938 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5941 se = SIMPLEQ_NEXT(se, entry);
5950 static const struct got_error *
5951 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5953 static const struct got_error *err = NULL;
5954 struct got_reflist_head refs;
5955 struct got_reflist_entry *re;
5959 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5963 TAILQ_FOREACH(re, &refs, entry) {
5964 const char *refname;
5965 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5969 struct got_object_id *id;
5970 struct got_tag_object *tag;
5971 struct got_commit_object *commit = NULL;
5973 refname = got_ref_get_name(re->ref);
5974 if (strncmp(refname, "refs/tags/", 10) != 0)
5977 refstr = got_ref_to_str(re->ref);
5978 if (refstr == NULL) {
5979 err = got_error_from_errno("got_ref_to_str");
5982 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5985 err = got_ref_resolve(&id, repo, re->ref);
5988 err = got_object_open_as_tag(&tag, repo, id);
5990 if (err->code != GOT_ERR_OBJ_TYPE) {
5994 /* "lightweight" tag */
5995 err = got_object_open_as_commit(&commit, repo, id);
6000 tagger = got_object_commit_get_committer(commit);
6002 got_object_commit_get_committer_time(commit);
6003 err = got_object_id_str(&id_str, id);
6009 tagger = got_object_tag_get_tagger(tag);
6010 tagger_time = got_object_tag_get_tagger_time(tag);
6011 err = got_object_id_str(&id_str,
6012 got_object_tag_get_object_id(tag));
6016 printf("from: %s\n", tagger);
6017 datestr = get_datestr(&tagger_time, datebuf);
6019 printf("date: %s UTC\n", datestr);
6021 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6023 switch (got_object_tag_get_object_type(tag)) {
6024 case GOT_OBJ_TYPE_BLOB:
6025 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6028 case GOT_OBJ_TYPE_TREE:
6029 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6032 case GOT_OBJ_TYPE_COMMIT:
6033 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6036 case GOT_OBJ_TYPE_TAG:
6037 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6046 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6049 got_object_commit_close(commit);
6051 tagmsg0 = strdup(got_object_tag_get_message(tag));
6052 got_object_tag_close(tag);
6053 if (tagmsg0 == NULL) {
6054 err = got_error_from_errno("strdup");
6061 line = strsep(&tagmsg, "\n");
6063 printf(" %s\n", line);
6068 got_ref_list_free(&refs);
6072 static const struct got_error *
6073 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6074 const char *tag_name, const char *repo_path)
6076 const struct got_error *err = NULL;
6077 char *template = NULL, *initial_content = NULL;
6078 char *editor = NULL;
6079 int initial_content_len;
6082 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6083 err = got_error_from_errno("asprintf");
6087 initial_content_len = asprintf(&initial_content,
6088 "\n# tagging commit %s as %s\n",
6089 commit_id_str, tag_name);
6090 if (initial_content_len == -1) {
6091 err = got_error_from_errno("asprintf");
6095 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6099 if (write(fd, initial_content, initial_content_len) == -1) {
6100 err = got_error_from_errno2("write", *tagmsg_path);
6104 err = get_editor(&editor);
6107 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6108 initial_content_len, 1);
6110 free(initial_content);
6114 if (fd != -1 && close(fd) == -1 && err == NULL)
6115 err = got_error_from_errno2("close", *tagmsg_path);
6117 /* Editor is done; we can now apply unveil(2) */
6119 err = apply_unveil(repo_path, 0, NULL);
6127 static const struct got_error *
6128 add_tag(struct got_repository *repo, struct got_worktree *worktree,
6129 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6131 const struct got_error *err = NULL;
6132 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6133 char *label = NULL, *commit_id_str = NULL;
6134 struct got_reference *ref = NULL;
6135 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6136 char *tagmsg_path = NULL, *tag_id_str = NULL;
6137 int preserve_tagmsg = 0;
6138 struct got_reflist_head refs;
6143 * Don't let the user create a tag name with a leading '-'.
6144 * While technically a valid reference name, this case is usually
6145 * an unintended typo.
6147 if (tag_name[0] == '-')
6148 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6150 err = get_author(&tagger, repo, worktree);
6154 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6158 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6159 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6163 err = got_object_id_str(&commit_id_str, commit_id);
6167 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6168 refname = strdup(tag_name);
6169 if (refname == NULL) {
6170 err = got_error_from_errno("strdup");
6174 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6175 err = got_error_from_errno("asprintf");
6179 err = got_ref_open(&ref, repo, refname, 0);
6181 err = got_error(GOT_ERR_TAG_EXISTS);
6183 } else if (err->code != GOT_ERR_NOT_REF)
6186 if (tagmsg_arg == NULL) {
6187 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6188 tag_name, got_repo_get_path(repo));
6190 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6191 tagmsg_path != NULL)
6192 preserve_tagmsg = 1;
6197 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6198 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6201 preserve_tagmsg = 1;
6205 err = got_ref_alloc(&ref, refname, tag_id);
6208 preserve_tagmsg = 1;
6212 err = got_ref_write(ref, repo);
6215 preserve_tagmsg = 1;
6219 err = got_object_id_str(&tag_id_str, tag_id);
6222 preserve_tagmsg = 1;
6225 printf("Created tag %s\n", tag_id_str);
6227 if (preserve_tagmsg) {
6228 fprintf(stderr, "%s: tag message preserved in %s\n",
6229 getprogname(), tagmsg_path);
6230 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6231 err = got_error_from_errno2("unlink", tagmsg_path);
6236 free(commit_id_str);
6241 got_ref_list_free(&refs);
6245 static const struct got_error *
6246 cmd_tag(int argc, char *argv[])
6248 const struct got_error *error = NULL;
6249 struct got_repository *repo = NULL;
6250 struct got_worktree *worktree = NULL;
6251 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6252 char *gitconfig_path = NULL;
6253 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6254 int ch, do_list = 0;
6256 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6259 commit_id_arg = optarg;
6265 repo_path = realpath(optarg, NULL);
6266 if (repo_path == NULL)
6267 return got_error_from_errno2("realpath",
6269 got_path_strip_trailing_slashes(repo_path);
6284 if (commit_id_arg != NULL)
6286 "-c option can only be used when creating a tag");
6288 option_conflict('l', 'm');
6291 } else if (argc != 1)
6298 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6302 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6303 "sendfd unveil", NULL) == -1)
6307 cwd = getcwd(NULL, 0);
6309 error = got_error_from_errno("getcwd");
6313 if (repo_path == NULL) {
6314 error = got_worktree_open(&worktree, cwd);
6315 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6321 strdup(got_worktree_get_repo_path(worktree));
6322 if (repo_path == NULL)
6323 error = got_error_from_errno("strdup");
6327 repo_path = strdup(cwd);
6328 if (repo_path == NULL) {
6329 error = got_error_from_errno("strdup");
6336 error = got_repo_open(&repo, repo_path, NULL);
6339 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6342 error = list_tags(repo, worktree);
6344 error = get_gitconfig_path(&gitconfig_path);
6347 error = got_repo_open(&repo, repo_path, gitconfig_path);
6352 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6357 if (commit_id_arg == NULL) {
6358 struct got_reference *head_ref;
6359 struct got_object_id *commit_id;
6360 error = got_ref_open(&head_ref, repo,
6361 worktree ? got_worktree_get_head_ref_name(worktree)
6365 error = got_ref_resolve(&commit_id, repo, head_ref);
6366 got_ref_close(head_ref);
6369 error = got_object_id_str(&commit_id_str, commit_id);
6375 error = add_tag(repo, worktree, tag_name,
6376 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6380 got_repo_close(repo);
6382 got_worktree_close(worktree);
6385 free(gitconfig_path);
6386 free(commit_id_str);
6393 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6398 static const struct got_error *
6399 add_progress(void *arg, unsigned char status, const char *path)
6401 while (path[0] == '/')
6403 printf("%c %s\n", status, path);
6407 static const struct got_error *
6408 cmd_add(int argc, char *argv[])
6410 const struct got_error *error = NULL;
6411 struct got_repository *repo = NULL;
6412 struct got_worktree *worktree = NULL;
6414 struct got_pathlist_head paths;
6415 struct got_pathlist_entry *pe;
6416 int ch, can_recurse = 0, no_ignores = 0;
6420 while ((ch = getopt(argc, argv, "IR")) != -1) {
6438 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6445 cwd = getcwd(NULL, 0);
6447 error = got_error_from_errno("getcwd");
6451 error = got_worktree_open(&worktree, cwd);
6453 if (error->code == GOT_ERR_NOT_WORKTREE)
6454 error = wrap_not_worktree_error(error, "add", cwd);
6458 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6463 error = apply_unveil(got_repo_get_path(repo), 1,
6464 got_worktree_get_root_path(worktree));
6468 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6472 if (!can_recurse && no_ignores) {
6473 error = got_error_msg(GOT_ERR_BAD_PATH,
6474 "disregarding ignores requires -R option");
6482 TAILQ_FOREACH(pe, &paths, entry) {
6483 if (asprintf(&ondisk_path, "%s/%s",
6484 got_worktree_get_root_path(worktree),
6486 error = got_error_from_errno("asprintf");
6489 if (lstat(ondisk_path, &sb) == -1) {
6490 if (errno == ENOENT) {
6494 error = got_error_from_errno2("lstat",
6500 if (S_ISDIR(sb.st_mode)) {
6501 error = got_error_msg(GOT_ERR_BAD_PATH,
6502 "adding directories requires -R option");
6508 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6509 NULL, repo, no_ignores);
6512 got_repo_close(repo);
6514 got_worktree_close(worktree);
6515 TAILQ_FOREACH(pe, &paths, entry)
6516 free((char *)pe->path);
6517 got_pathlist_free(&paths);
6525 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6526 "path ...\n", getprogname());
6530 static const struct got_error *
6531 print_remove_status(void *arg, unsigned char status,
6532 unsigned char staged_status, const char *path)
6534 while (path[0] == '/')
6536 if (status == GOT_STATUS_NONEXISTENT)
6538 if (status == staged_status && (status == GOT_STATUS_DELETE))
6539 status = GOT_STATUS_NO_CHANGE;
6540 printf("%c%c %s\n", status, staged_status, path);
6544 static const struct got_error *
6545 cmd_remove(int argc, char *argv[])
6547 const struct got_error *error = NULL;
6548 struct got_worktree *worktree = NULL;
6549 struct got_repository *repo = NULL;
6550 const char *status_codes = NULL;
6552 struct got_pathlist_head paths;
6553 struct got_pathlist_entry *pe;
6554 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6558 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6561 delete_local_mods = 1;
6570 for (i = 0; i < strlen(optarg); i++) {
6571 switch (optarg[i]) {
6572 case GOT_STATUS_MODIFY:
6573 delete_local_mods = 1;
6575 case GOT_STATUS_MISSING:
6578 errx(1, "invalid status code '%c'",
6582 status_codes = optarg;
6594 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6601 cwd = getcwd(NULL, 0);
6603 error = got_error_from_errno("getcwd");
6606 error = got_worktree_open(&worktree, cwd);
6608 if (error->code == GOT_ERR_NOT_WORKTREE)
6609 error = wrap_not_worktree_error(error, "remove", cwd);
6613 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6618 error = apply_unveil(got_repo_get_path(repo), 1,
6619 got_worktree_get_root_path(worktree));
6623 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6630 TAILQ_FOREACH(pe, &paths, entry) {
6631 if (asprintf(&ondisk_path, "%s/%s",
6632 got_worktree_get_root_path(worktree),
6634 error = got_error_from_errno("asprintf");
6637 if (lstat(ondisk_path, &sb) == -1) {
6638 if (errno == ENOENT) {
6642 error = got_error_from_errno2("lstat",
6648 if (S_ISDIR(sb.st_mode)) {
6649 error = got_error_msg(GOT_ERR_BAD_PATH,
6650 "removing directories requires -R option");
6656 error = got_worktree_schedule_delete(worktree, &paths,
6657 delete_local_mods, status_codes, print_remove_status, NULL,
6658 repo, keep_on_disk);
6661 got_repo_close(repo);
6663 got_worktree_close(worktree);
6664 TAILQ_FOREACH(pe, &paths, entry)
6665 free((char *)pe->path);
6666 got_pathlist_free(&paths);
6674 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6675 "path ...\n", getprogname());
6679 static const struct got_error *
6680 revert_progress(void *arg, unsigned char status, const char *path)
6682 if (status == GOT_STATUS_UNVERSIONED)
6685 while (path[0] == '/')
6687 printf("%c %s\n", status, path);
6691 struct choose_patch_arg {
6692 FILE *patch_script_file;
6696 static const struct got_error *
6697 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6698 int nchanges, const char *action)
6701 size_t linesize = 0;
6705 case GOT_STATUS_ADD:
6706 printf("A %s\n%s this addition? [y/n] ", path, action);
6708 case GOT_STATUS_DELETE:
6709 printf("D %s\n%s this deletion? [y/n] ", path, action);
6711 case GOT_STATUS_MODIFY:
6712 if (fseek(patch_file, 0L, SEEK_SET) == -1)
6713 return got_error_from_errno("fseek");
6714 printf(GOT_COMMIT_SEP_STR);
6715 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6717 if (ferror(patch_file))
6718 return got_error_from_errno("getline");
6719 printf(GOT_COMMIT_SEP_STR);
6720 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6721 path, n, nchanges, action);
6724 return got_error_path(path, GOT_ERR_FILE_STATUS);
6730 static const struct got_error *
6731 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6732 FILE *patch_file, int n, int nchanges)
6734 const struct got_error *err = NULL;
6736 size_t linesize = 0;
6739 struct choose_patch_arg *a = arg;
6741 *choice = GOT_PATCH_CHOICE_NONE;
6743 if (a->patch_script_file) {
6745 err = show_change(status, path, patch_file, n, nchanges,
6749 linelen = getline(&line, &linesize, a->patch_script_file);
6750 if (linelen == -1) {
6751 if (ferror(a->patch_script_file))
6752 return got_error_from_errno("getline");
6755 nl = strchr(line, '\n');
6758 if (strcmp(line, "y") == 0) {
6759 *choice = GOT_PATCH_CHOICE_YES;
6761 } else if (strcmp(line, "n") == 0) {
6762 *choice = GOT_PATCH_CHOICE_NO;
6764 } else if (strcmp(line, "q") == 0 &&
6765 status == GOT_STATUS_MODIFY) {
6766 *choice = GOT_PATCH_CHOICE_QUIT;
6769 printf("invalid response '%s'\n", line);
6774 while (resp != 'y' && resp != 'n' && resp != 'q') {
6775 err = show_change(status, path, patch_file, n, nchanges,
6782 if (status == GOT_STATUS_MODIFY) {
6783 if (resp != 'y' && resp != 'n' && resp != 'q') {
6784 printf("invalid response '%c'\n", resp);
6787 } else if (resp != 'y' && resp != 'n') {
6788 printf("invalid response '%c'\n", resp);
6794 *choice = GOT_PATCH_CHOICE_YES;
6795 else if (resp == 'n')
6796 *choice = GOT_PATCH_CHOICE_NO;
6797 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6798 *choice = GOT_PATCH_CHOICE_QUIT;
6804 static const struct got_error *
6805 cmd_revert(int argc, char *argv[])
6807 const struct got_error *error = NULL;
6808 struct got_worktree *worktree = NULL;
6809 struct got_repository *repo = NULL;
6810 char *cwd = NULL, *path = NULL;
6811 struct got_pathlist_head paths;
6812 struct got_pathlist_entry *pe;
6813 int ch, can_recurse = 0, pflag = 0;
6814 FILE *patch_script_file = NULL;
6815 const char *patch_script_path = NULL;
6816 struct choose_patch_arg cpa;
6820 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6826 patch_script_path = optarg;
6841 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6842 "unveil", NULL) == -1)
6847 if (patch_script_path && !pflag)
6848 errx(1, "-F option can only be used together with -p option");
6850 cwd = getcwd(NULL, 0);
6852 error = got_error_from_errno("getcwd");
6855 error = got_worktree_open(&worktree, cwd);
6857 if (error->code == GOT_ERR_NOT_WORKTREE)
6858 error = wrap_not_worktree_error(error, "revert", cwd);
6862 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6867 if (patch_script_path) {
6868 patch_script_file = fopen(patch_script_path, "r");
6869 if (patch_script_file == NULL) {
6870 error = got_error_from_errno2("fopen",
6875 error = apply_unveil(got_repo_get_path(repo), 1,
6876 got_worktree_get_root_path(worktree));
6880 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6887 TAILQ_FOREACH(pe, &paths, entry) {
6888 if (asprintf(&ondisk_path, "%s/%s",
6889 got_worktree_get_root_path(worktree),
6891 error = got_error_from_errno("asprintf");
6894 if (lstat(ondisk_path, &sb) == -1) {
6895 if (errno == ENOENT) {
6899 error = got_error_from_errno2("lstat",
6905 if (S_ISDIR(sb.st_mode)) {
6906 error = got_error_msg(GOT_ERR_BAD_PATH,
6907 "reverting directories requires -R option");
6913 cpa.patch_script_file = patch_script_file;
6914 cpa.action = "revert";
6915 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6916 pflag ? choose_patch : NULL, &cpa, repo);
6918 if (patch_script_file && fclose(patch_script_file) == EOF &&
6920 error = got_error_from_errno2("fclose", patch_script_path);
6922 got_repo_close(repo);
6924 got_worktree_close(worktree);
6933 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
6934 "[path ...]\n", getprogname());
6938 struct collect_commit_logmsg_arg {
6939 const char *cmdline_log;
6940 const char *prepared_log;
6941 int non_interactive;
6943 const char *worktree_path;
6944 const char *branch_name;
6945 const char *repo_path;
6950 static const struct got_error *
6951 read_prepared_logmsg(char **logmsg, const char *path)
6953 const struct got_error *err = NULL;
6959 memset(&sb, 0, sizeof(sb));
6961 f = fopen(path, "r");
6963 return got_error_from_errno2("fopen", path);
6965 if (fstat(fileno(f), &sb) == -1) {
6966 err = got_error_from_errno2("fstat", path);
6969 if (sb.st_size == 0) {
6970 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6974 *logmsg = malloc(sb.st_size + 1);
6975 if (*logmsg == NULL) {
6976 err = got_error_from_errno("malloc");
6980 r = fread(*logmsg, 1, sb.st_size, f);
6981 if (r != sb.st_size) {
6983 err = got_error_from_errno2("fread", path);
6985 err = got_error(GOT_ERR_IO);
6988 (*logmsg)[sb.st_size] = '\0';
6990 if (fclose(f) == EOF && err == NULL)
6991 err = got_error_from_errno2("fclose", path);
7000 static const struct got_error *
7001 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7004 char *initial_content = NULL;
7005 struct got_pathlist_entry *pe;
7006 const struct got_error *err = NULL;
7007 char *template = NULL;
7008 struct collect_commit_logmsg_arg *a = arg;
7009 int initial_content_len;
7013 /* if a message was specified on the command line, just use it */
7014 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7015 len = strlen(a->cmdline_log) + 1;
7016 *logmsg = malloc(len + 1);
7017 if (*logmsg == NULL)
7018 return got_error_from_errno("malloc");
7019 strlcpy(*logmsg, a->cmdline_log, len);
7021 } else if (a->prepared_log != NULL && a->non_interactive)
7022 return read_prepared_logmsg(logmsg, a->prepared_log);
7024 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7025 return got_error_from_errno("asprintf");
7027 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7031 if (a->prepared_log) {
7033 err = read_prepared_logmsg(&msg, a->prepared_log);
7036 if (write(fd, msg, strlen(msg)) == -1) {
7037 err = got_error_from_errno2("write", a->logmsg_path);
7044 initial_content_len = asprintf(&initial_content,
7045 "\n# changes to be committed on branch %s:\n",
7047 if (initial_content_len == -1) {
7048 err = got_error_from_errno("asprintf");
7052 if (write(fd, initial_content, initial_content_len) == -1) {
7053 err = got_error_from_errno2("write", a->logmsg_path);
7057 TAILQ_FOREACH(pe, commitable_paths, entry) {
7058 struct got_commitable *ct = pe->data;
7059 dprintf(fd, "# %c %s\n",
7060 got_commitable_get_status(ct),
7061 got_commitable_get_path(ct));
7064 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7065 initial_content_len, a->prepared_log ? 0 : 1);
7067 free(initial_content);
7070 if (fd != -1 && close(fd) == -1 && err == NULL)
7071 err = got_error_from_errno2("close", a->logmsg_path);
7073 /* Editor is done; we can now apply unveil(2) */
7075 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7083 static const struct got_error *
7084 cmd_commit(int argc, char *argv[])
7086 const struct got_error *error = NULL;
7087 struct got_worktree *worktree = NULL;
7088 struct got_repository *repo = NULL;
7089 char *cwd = NULL, *id_str = NULL;
7090 struct got_object_id *id = NULL;
7091 const char *logmsg = NULL;
7092 char *prepared_logmsg = NULL;
7093 struct collect_commit_logmsg_arg cl_arg;
7094 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7095 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7096 int allow_bad_symlinks = 0, non_interactive = 0;
7097 struct got_pathlist_head paths;
7100 cl_arg.logmsg_path = NULL;
7102 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7106 option_conflict('F', 'm');
7107 prepared_logmsg = realpath(optarg, NULL);
7108 if (prepared_logmsg == NULL)
7109 return got_error_from_errno2("realpath",
7113 if (prepared_logmsg)
7114 option_conflict('m', 'F');
7118 non_interactive = 1;
7121 allow_bad_symlinks = 1;
7133 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7134 "unveil", NULL) == -1)
7137 cwd = getcwd(NULL, 0);
7139 error = got_error_from_errno("getcwd");
7142 error = got_worktree_open(&worktree, cwd);
7144 if (error->code == GOT_ERR_NOT_WORKTREE)
7145 error = wrap_not_worktree_error(error, "commit", cwd);
7149 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7152 if (rebase_in_progress) {
7153 error = got_error(GOT_ERR_REBASING);
7157 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7162 error = get_gitconfig_path(&gitconfig_path);
7165 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7170 error = get_author(&author, repo, worktree);
7175 * unveil(2) traverses exec(2); if an editor is used we have
7176 * to apply unveil after the log message has been written.
7178 if (logmsg == NULL || strlen(logmsg) == 0)
7179 error = get_editor(&editor);
7181 error = apply_unveil(got_repo_get_path(repo), 0,
7182 got_worktree_get_root_path(worktree));
7186 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7190 cl_arg.editor = editor;
7191 cl_arg.cmdline_log = logmsg;
7192 cl_arg.prepared_log = prepared_logmsg;
7193 cl_arg.non_interactive = non_interactive;
7194 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7195 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7196 if (!histedit_in_progress) {
7197 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7198 error = got_error(GOT_ERR_COMMIT_BRANCH);
7201 cl_arg.branch_name += 11;
7203 cl_arg.repo_path = got_repo_get_path(repo);
7204 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7205 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7206 print_status, NULL, repo);
7208 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7209 cl_arg.logmsg_path != NULL)
7210 preserve_logmsg = 1;
7214 error = got_object_id_str(&id_str, id);
7217 printf("Created commit %s\n", id_str);
7219 if (preserve_logmsg) {
7220 fprintf(stderr, "%s: log message preserved in %s\n",
7221 getprogname(), cl_arg.logmsg_path);
7222 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7224 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7225 free(cl_arg.logmsg_path);
7227 got_repo_close(repo);
7229 got_worktree_close(worktree);
7232 free(gitconfig_path);
7235 free(prepared_logmsg);
7240 usage_cherrypick(void)
7242 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
7246 static const struct got_error *
7247 cmd_cherrypick(int argc, char *argv[])
7249 const struct got_error *error = NULL;
7250 struct got_worktree *worktree = NULL;
7251 struct got_repository *repo = NULL;
7252 char *cwd = NULL, *commit_id_str = NULL;
7253 struct got_object_id *commit_id = NULL;
7254 struct got_commit_object *commit = NULL;
7255 struct got_object_qid *pid;
7256 struct got_reference *head_ref = NULL;
7258 struct got_update_progress_arg upa;
7260 while ((ch = getopt(argc, argv, "")) != -1) {
7272 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7273 "unveil", NULL) == -1)
7279 cwd = getcwd(NULL, 0);
7281 error = got_error_from_errno("getcwd");
7284 error = got_worktree_open(&worktree, cwd);
7286 if (error->code == GOT_ERR_NOT_WORKTREE)
7287 error = wrap_not_worktree_error(error, "cherrypick",
7292 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7297 error = apply_unveil(got_repo_get_path(repo), 0,
7298 got_worktree_get_root_path(worktree));
7302 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7303 GOT_OBJ_TYPE_COMMIT, repo);
7304 if (error != NULL) {
7305 struct got_reference *ref;
7306 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7308 error = got_ref_open(&ref, repo, argv[0], 0);
7311 error = got_ref_resolve(&commit_id, repo, ref);
7316 error = got_object_id_str(&commit_id_str, commit_id);
7320 error = got_ref_open(&head_ref, repo,
7321 got_worktree_get_head_ref_name(worktree), 0);
7325 error = check_same_branch(commit_id, head_ref, NULL, repo);
7327 if (error->code != GOT_ERR_ANCESTRY)
7331 error = got_error(GOT_ERR_SAME_BRANCH);
7335 error = got_object_open_as_commit(&commit, repo, commit_id);
7338 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7339 memset(&upa, 0, sizeof(upa));
7340 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7341 commit_id, repo, update_progress, &upa, check_cancelled,
7346 if (upa.did_something)
7347 printf("Merged commit %s\n", commit_id_str);
7348 print_update_progress_stats(&upa);
7351 got_object_commit_close(commit);
7352 free(commit_id_str);
7354 got_ref_close(head_ref);
7356 got_worktree_close(worktree);
7358 got_repo_close(repo);
7365 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7369 static const struct got_error *
7370 cmd_backout(int argc, char *argv[])
7372 const struct got_error *error = NULL;
7373 struct got_worktree *worktree = NULL;
7374 struct got_repository *repo = NULL;
7375 char *cwd = NULL, *commit_id_str = NULL;
7376 struct got_object_id *commit_id = NULL;
7377 struct got_commit_object *commit = NULL;
7378 struct got_object_qid *pid;
7379 struct got_reference *head_ref = NULL;
7381 struct got_update_progress_arg upa;
7383 while ((ch = getopt(argc, argv, "")) != -1) {
7395 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7396 "unveil", NULL) == -1)
7402 cwd = getcwd(NULL, 0);
7404 error = got_error_from_errno("getcwd");
7407 error = got_worktree_open(&worktree, cwd);
7409 if (error->code == GOT_ERR_NOT_WORKTREE)
7410 error = wrap_not_worktree_error(error, "backout", cwd);
7414 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7419 error = apply_unveil(got_repo_get_path(repo), 0,
7420 got_worktree_get_root_path(worktree));
7424 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7425 GOT_OBJ_TYPE_COMMIT, repo);
7426 if (error != NULL) {
7427 struct got_reference *ref;
7428 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7430 error = got_ref_open(&ref, repo, argv[0], 0);
7433 error = got_ref_resolve(&commit_id, repo, ref);
7438 error = got_object_id_str(&commit_id_str, commit_id);
7442 error = got_ref_open(&head_ref, repo,
7443 got_worktree_get_head_ref_name(worktree), 0);
7447 error = check_same_branch(commit_id, head_ref, NULL, repo);
7451 error = got_object_open_as_commit(&commit, repo, commit_id);
7454 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7456 error = got_error(GOT_ERR_ROOT_COMMIT);
7460 memset(&upa, 0, sizeof(upa));
7461 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7462 update_progress, &upa, check_cancelled, NULL);
7466 if (upa.did_something)
7467 printf("Backed out commit %s\n", commit_id_str);
7468 print_update_progress_stats(&upa);
7471 got_object_commit_close(commit);
7472 free(commit_id_str);
7474 got_ref_close(head_ref);
7476 got_worktree_close(worktree);
7478 got_repo_close(repo);
7485 fprintf(stderr, "usage: %s rebase [-a] | [-c] | branch\n",
7491 trim_logmsg(char *logmsg, int limit)
7496 len = strlen(logmsg);
7500 nl = strchr(logmsg, '\n');
7505 static const struct got_error *
7506 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7508 const struct got_error *err;
7509 char *logmsg0 = NULL;
7512 err = got_object_commit_get_logmsg(&logmsg0, commit);
7517 while (isspace((unsigned char)s[0]))
7520 *logmsg = strdup(s);
7521 if (*logmsg == NULL) {
7522 err = got_error_from_errno("strdup");
7526 trim_logmsg(*logmsg, limit);
7532 static const struct got_error *
7533 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7535 const struct got_error *err;
7536 struct got_commit_object *commit = NULL;
7537 char *id_str = NULL, *logmsg = NULL;
7539 err = got_object_open_as_commit(&commit, repo, id);
7543 err = got_object_id_str(&id_str, id);
7549 err = get_short_logmsg(&logmsg, 42, commit);
7553 printf("%s -> merge conflict: %s\n", id_str, logmsg);
7556 got_object_commit_close(commit);
7561 static const struct got_error *
7562 show_rebase_progress(struct got_commit_object *commit,
7563 struct got_object_id *old_id, struct got_object_id *new_id)
7565 const struct got_error *err;
7566 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7568 err = got_object_id_str(&old_id_str, old_id);
7573 err = got_object_id_str(&new_id_str, new_id);
7578 old_id_str[12] = '\0';
7580 new_id_str[12] = '\0';
7582 err = get_short_logmsg(&logmsg, 42, commit);
7586 printf("%s -> %s: %s\n", old_id_str,
7587 new_id_str ? new_id_str : "no-op change", logmsg);
7595 static const struct got_error *
7596 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7597 struct got_reference *branch, struct got_reference *new_base_branch,
7598 struct got_reference *tmp_branch, struct got_repository *repo)
7600 printf("Switching work tree to %s\n", got_ref_get_name(branch));
7601 return got_worktree_rebase_complete(worktree, fileindex,
7602 new_base_branch, tmp_branch, branch, repo);
7605 static const struct got_error *
7606 rebase_commit(struct got_pathlist_head *merged_paths,
7607 struct got_worktree *worktree, struct got_fileindex *fileindex,
7608 struct got_reference *tmp_branch,
7609 struct got_object_id *commit_id, struct got_repository *repo)
7611 const struct got_error *error;
7612 struct got_commit_object *commit;
7613 struct got_object_id *new_commit_id;
7615 error = got_object_open_as_commit(&commit, repo, commit_id);
7619 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7620 worktree, fileindex, tmp_branch, commit, commit_id, repo);
7622 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7624 error = show_rebase_progress(commit, commit_id, NULL);
7626 error = show_rebase_progress(commit, commit_id, new_commit_id);
7627 free(new_commit_id);
7630 got_object_commit_close(commit);
7634 struct check_path_prefix_arg {
7635 const char *path_prefix;
7640 static const struct got_error *
7641 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7642 struct got_blob_object *blob2, struct got_object_id *id1,
7643 struct got_object_id *id2, const char *path1, const char *path2,
7644 mode_t mode1, mode_t mode2, struct got_repository *repo)
7646 struct check_path_prefix_arg *a = arg;
7648 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7649 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7650 return got_error(a->errcode);
7655 static const struct got_error *
7656 check_path_prefix(struct got_object_id *parent_id,
7657 struct got_object_id *commit_id, const char *path_prefix,
7658 int errcode, struct got_repository *repo)
7660 const struct got_error *err;
7661 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7662 struct got_commit_object *commit = NULL, *parent_commit = NULL;
7663 struct check_path_prefix_arg cpp_arg;
7665 if (got_path_is_root_dir(path_prefix))
7668 err = got_object_open_as_commit(&commit, repo, commit_id);
7672 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7676 err = got_object_open_as_tree(&tree1, repo,
7677 got_object_commit_get_tree_id(parent_commit));
7681 err = got_object_open_as_tree(&tree2, repo,
7682 got_object_commit_get_tree_id(commit));
7686 cpp_arg.path_prefix = path_prefix;
7687 while (cpp_arg.path_prefix[0] == '/')
7688 cpp_arg.path_prefix++;
7689 cpp_arg.len = strlen(cpp_arg.path_prefix);
7690 cpp_arg.errcode = errcode;
7691 err = got_diff_tree(tree1, tree2, "", "", repo,
7692 check_path_prefix_in_diff, &cpp_arg, 0);
7695 got_object_tree_close(tree1);
7697 got_object_tree_close(tree2);
7699 got_object_commit_close(commit);
7701 got_object_commit_close(parent_commit);
7705 static const struct got_error *
7706 collect_commits(struct got_object_id_queue *commits,
7707 struct got_object_id *initial_commit_id,
7708 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7709 const char *path_prefix, int path_prefix_errcode,
7710 struct got_repository *repo)
7712 const struct got_error *err = NULL;
7713 struct got_commit_graph *graph = NULL;
7714 struct got_object_id *parent_id = NULL;
7715 struct got_object_qid *qid;
7716 struct got_object_id *commit_id = initial_commit_id;
7718 err = got_commit_graph_open(&graph, "/", 1);
7722 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7723 check_cancelled, NULL);
7726 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7727 err = got_commit_graph_iter_next(&parent_id, graph, repo,
7728 check_cancelled, NULL);
7730 if (err->code == GOT_ERR_ITER_COMPLETED) {
7731 err = got_error_msg(GOT_ERR_ANCESTRY,
7732 "ran out of commits to rebase before "
7733 "youngest common ancestor commit has "
7738 err = check_path_prefix(parent_id, commit_id,
7739 path_prefix, path_prefix_errcode, repo);
7743 err = got_object_qid_alloc(&qid, commit_id);
7746 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7747 commit_id = parent_id;
7751 got_commit_graph_close(graph);
7755 static const struct got_error *
7756 cmd_rebase(int argc, char *argv[])
7758 const struct got_error *error = NULL;
7759 struct got_worktree *worktree = NULL;
7760 struct got_repository *repo = NULL;
7761 struct got_fileindex *fileindex = NULL;
7763 struct got_reference *branch = NULL;
7764 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
7765 struct got_object_id *commit_id = NULL, *parent_id = NULL;
7766 struct got_object_id *resume_commit_id = NULL;
7767 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
7768 struct got_commit_object *commit = NULL;
7769 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
7770 int histedit_in_progress = 0;
7771 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
7772 struct got_object_id_queue commits;
7773 struct got_pathlist_head merged_paths;
7774 const struct got_object_id_queue *parent_ids;
7775 struct got_object_qid *qid, *pid;
7777 SIMPLEQ_INIT(&commits);
7778 TAILQ_INIT(&merged_paths);
7780 while ((ch = getopt(argc, argv, "ac")) != -1) {
7786 continue_rebase = 1;
7798 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7799 "unveil", NULL) == -1)
7802 if (abort_rebase && continue_rebase)
7804 else if (abort_rebase || continue_rebase) {
7807 } else if (argc != 1)
7810 cwd = getcwd(NULL, 0);
7812 error = got_error_from_errno("getcwd");
7815 error = got_worktree_open(&worktree, cwd);
7817 if (error->code == GOT_ERR_NOT_WORKTREE)
7818 error = wrap_not_worktree_error(error, "rebase", cwd);
7822 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7827 error = apply_unveil(got_repo_get_path(repo), 0,
7828 got_worktree_get_root_path(worktree));
7832 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7836 if (histedit_in_progress) {
7837 error = got_error(GOT_ERR_HISTEDIT_BUSY);
7841 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7846 struct got_update_progress_arg upa;
7847 if (!rebase_in_progress) {
7848 error = got_error(GOT_ERR_NOT_REBASING);
7851 error = got_worktree_rebase_continue(&resume_commit_id,
7852 &new_base_branch, &tmp_branch, &branch, &fileindex,
7856 printf("Switching work tree to %s\n",
7857 got_ref_get_symref_target(new_base_branch));
7858 memset(&upa, 0, sizeof(upa));
7859 error = got_worktree_rebase_abort(worktree, fileindex, repo,
7860 new_base_branch, update_progress, &upa);
7863 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
7864 print_update_progress_stats(&upa);
7865 goto done; /* nothing else to do */
7868 if (continue_rebase) {
7869 if (!rebase_in_progress) {
7870 error = got_error(GOT_ERR_NOT_REBASING);
7873 error = got_worktree_rebase_continue(&resume_commit_id,
7874 &new_base_branch, &tmp_branch, &branch, &fileindex,
7879 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
7880 resume_commit_id, repo);
7884 yca_id = got_object_id_dup(resume_commit_id);
7885 if (yca_id == NULL) {
7886 error = got_error_from_errno("got_object_id_dup");
7890 error = got_ref_open(&branch, repo, argv[0], 0);
7895 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
7899 if (!continue_rebase) {
7900 struct got_object_id *base_commit_id;
7902 base_commit_id = got_worktree_get_base_commit_id(worktree);
7903 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7904 base_commit_id, branch_head_commit_id, repo,
7905 check_cancelled, NULL);
7908 if (yca_id == NULL) {
7909 error = got_error_msg(GOT_ERR_ANCESTRY,
7910 "specified branch shares no common ancestry "
7911 "with work tree's branch");
7915 error = check_same_branch(base_commit_id, branch, yca_id, repo);
7917 if (error->code != GOT_ERR_ANCESTRY)
7921 static char msg[128];
7922 snprintf(msg, sizeof(msg),
7923 "%s is already based on %s",
7924 got_ref_get_name(branch),
7925 got_worktree_get_head_ref_name(worktree));
7926 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
7929 error = got_worktree_rebase_prepare(&new_base_branch,
7930 &tmp_branch, &fileindex, worktree, branch, repo);
7935 commit_id = branch_head_commit_id;
7936 error = got_object_open_as_commit(&commit, repo, commit_id);
7940 parent_ids = got_object_commit_get_parent_ids(commit);
7941 pid = SIMPLEQ_FIRST(parent_ids);
7943 if (!continue_rebase) {
7944 struct got_update_progress_arg upa;
7945 memset(&upa, 0, sizeof(upa));
7946 error = got_worktree_rebase_abort(worktree, fileindex,
7947 repo, new_base_branch, update_progress, &upa);
7950 printf("Rebase of %s aborted\n",
7951 got_ref_get_name(branch));
7952 print_update_progress_stats(&upa);
7955 error = got_error(GOT_ERR_EMPTY_REBASE);
7958 error = collect_commits(&commits, commit_id, pid->id,
7959 yca_id, got_worktree_get_path_prefix(worktree),
7960 GOT_ERR_REBASE_PATH, repo);
7961 got_object_commit_close(commit);
7966 if (SIMPLEQ_EMPTY(&commits)) {
7967 if (continue_rebase) {
7968 error = rebase_complete(worktree, fileindex,
7969 branch, new_base_branch, tmp_branch, repo);
7972 /* Fast-forward the reference of the branch. */
7973 struct got_object_id *new_head_commit_id;
7975 error = got_ref_resolve(&new_head_commit_id, repo,
7979 error = got_object_id_str(&id_str, new_head_commit_id);
7980 printf("Forwarding %s to commit %s\n",
7981 got_ref_get_name(branch), id_str);
7983 error = got_ref_change_ref(branch,
7984 new_head_commit_id);
7991 SIMPLEQ_FOREACH(qid, &commits, entry) {
7992 struct got_update_progress_arg upa;
7994 commit_id = qid->id;
7995 parent_id = pid ? pid->id : yca_id;
7998 memset(&upa, 0, sizeof(upa));
7999 error = got_worktree_rebase_merge_files(&merged_paths,
8000 worktree, fileindex, parent_id, commit_id, repo,
8001 update_progress, &upa, check_cancelled, NULL);
8005 print_update_progress_stats(&upa);
8006 if (upa.conflicts > 0)
8007 rebase_status = GOT_STATUS_CONFLICT;
8009 if (rebase_status == GOT_STATUS_CONFLICT) {
8010 error = show_rebase_merge_conflict(qid->id, repo);
8013 got_worktree_rebase_pathlist_free(&merged_paths);
8017 error = rebase_commit(&merged_paths, worktree, fileindex,
8018 tmp_branch, commit_id, repo);
8019 got_worktree_rebase_pathlist_free(&merged_paths);
8024 if (rebase_status == GOT_STATUS_CONFLICT) {
8025 error = got_worktree_rebase_postpone(worktree, fileindex);
8028 error = got_error_msg(GOT_ERR_CONFLICTS,
8029 "conflicts must be resolved before rebasing can continue");
8031 error = rebase_complete(worktree, fileindex, branch,
8032 new_base_branch, tmp_branch, repo);
8034 got_object_id_queue_free(&commits);
8035 free(branch_head_commit_id);
8036 free(resume_commit_id);
8039 got_object_commit_close(commit);
8041 got_ref_close(branch);
8042 if (new_base_branch)
8043 got_ref_close(new_base_branch);
8045 got_ref_close(tmp_branch);
8047 got_worktree_close(worktree);
8049 got_repo_close(repo);
8054 usage_histedit(void)
8056 fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] [-F histedit-script] [-m]\n",
8061 #define GOT_HISTEDIT_PICK 'p'
8062 #define GOT_HISTEDIT_EDIT 'e'
8063 #define GOT_HISTEDIT_FOLD 'f'
8064 #define GOT_HISTEDIT_DROP 'd'
8065 #define GOT_HISTEDIT_MESG 'm'
8067 static struct got_histedit_cmd {
8071 } got_histedit_cmds[] = {
8072 { GOT_HISTEDIT_PICK, "pick", "use commit" },
8073 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
8074 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
8076 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
8077 { GOT_HISTEDIT_MESG, "mesg",
8078 "single-line log message for commit above (open editor if empty)" },
8081 struct got_histedit_list_entry {
8082 TAILQ_ENTRY(got_histedit_list_entry) entry;
8083 struct got_object_id *commit_id;
8084 const struct got_histedit_cmd *cmd;
8087 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
8089 static const struct got_error *
8090 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
8091 FILE *f, struct got_repository *repo)
8093 const struct got_error *err = NULL;
8094 char *logmsg = NULL, *id_str = NULL;
8095 struct got_commit_object *commit = NULL;
8098 err = got_object_open_as_commit(&commit, repo, commit_id);
8102 err = get_short_logmsg(&logmsg, 34, commit);
8106 err = got_object_id_str(&id_str, commit_id);
8110 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
8112 err = got_ferror(f, GOT_ERR_IO);
8115 got_object_commit_close(commit);
8121 static const struct got_error *
8122 histedit_write_commit_list(struct got_object_id_queue *commits,
8123 FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
8125 const struct got_error *err = NULL;
8126 struct got_object_qid *qid;
8127 const char *histedit_cmd = NULL;
8129 if (SIMPLEQ_EMPTY(commits))
8130 return got_error(GOT_ERR_EMPTY_HISTEDIT);
8132 SIMPLEQ_FOREACH(qid, commits, entry) {
8133 histedit_cmd = got_histedit_cmds[0].name;
8134 if (fold_only && SIMPLEQ_NEXT(qid, entry) != NULL)
8135 histedit_cmd = "fold";
8136 err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
8139 if (edit_logmsg_only) {
8140 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
8142 err = got_ferror(f, GOT_ERR_IO);
8151 static const struct got_error *
8152 write_cmd_list(FILE *f, const char *branch_name,
8153 struct got_object_id_queue *commits)
8155 const struct got_error *err = NULL;
8159 struct got_object_qid *qid;
8161 qid = SIMPLEQ_FIRST(commits);
8162 err = got_object_id_str(&id_str, qid->id);
8167 "# Editing the history of branch '%s' starting at\n"
8169 "# Commits will be processed in order from top to "
8170 "bottom of this file.\n", branch_name, id_str);
8172 err = got_ferror(f, GOT_ERR_IO);
8176 n = fprintf(f, "# Available histedit commands:\n");
8178 err = got_ferror(f, GOT_ERR_IO);
8182 for (i = 0; i < nitems(got_histedit_cmds); i++) {
8183 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
8184 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
8187 err = got_ferror(f, GOT_ERR_IO);
8196 static const struct got_error *
8197 histedit_syntax_error(int lineno)
8199 static char msg[42];
8202 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
8204 if (ret == -1 || ret >= sizeof(msg))
8205 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
8207 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
8210 static const struct got_error *
8211 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
8212 char *logmsg, struct got_repository *repo)
8214 const struct got_error *err;
8215 struct got_commit_object *folded_commit = NULL;
8216 char *id_str, *folded_logmsg = NULL;
8218 err = got_object_id_str(&id_str, hle->commit_id);
8222 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
8226 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
8229 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
8230 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
8231 folded_logmsg) == -1) {
8232 err = got_error_from_errno("asprintf");
8236 got_object_commit_close(folded_commit);
8238 free(folded_logmsg);
8242 static struct got_histedit_list_entry *
8243 get_folded_commits(struct got_histedit_list_entry *hle)
8245 struct got_histedit_list_entry *prev, *folded = NULL;
8247 prev = TAILQ_PREV(hle, got_histedit_list, entry);
8248 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
8249 prev->cmd->code == GOT_HISTEDIT_DROP)) {
8250 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
8252 prev = TAILQ_PREV(prev, got_histedit_list, entry);
8258 static const struct got_error *
8259 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
8260 struct got_repository *repo)
8262 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
8263 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
8264 const struct got_error *err = NULL;
8265 struct got_commit_object *commit = NULL;
8268 struct got_histedit_list_entry *folded = NULL;
8270 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8274 folded = get_folded_commits(hle);
8276 while (folded != hle) {
8277 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
8278 folded = TAILQ_NEXT(folded, entry);
8281 err = append_folded_commit_msg(&new_msg, folded,
8287 folded = TAILQ_NEXT(folded, entry);
8291 err = got_object_id_str(&id_str, hle->commit_id);
8294 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8297 logmsg_len = asprintf(&new_msg,
8298 "%s\n# original log message of commit %s: %s",
8299 logmsg ? logmsg : "", id_str, orig_logmsg);
8300 if (logmsg_len == -1) {
8301 err = got_error_from_errno("asprintf");
8307 err = got_object_id_str(&id_str, hle->commit_id);
8311 err = got_opentemp_named_fd(&logmsg_path, &fd,
8312 GOT_TMPDIR_STR "/got-logmsg");
8316 write(fd, logmsg, logmsg_len);
8319 err = get_editor(&editor);
8323 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8326 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8329 hle->logmsg = strdup(new_msg);
8330 if (hle->logmsg == NULL)
8331 err = got_error_from_errno("strdup");
8334 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8335 err = got_error_from_errno2("unlink", logmsg_path);
8341 got_object_commit_close(commit);
8345 static const struct got_error *
8346 histedit_parse_list(struct got_histedit_list *histedit_cmds,
8347 FILE *f, struct got_repository *repo)
8349 const struct got_error *err = NULL;
8350 char *line = NULL, *p, *end;
8354 const struct got_histedit_cmd *cmd;
8355 struct got_object_id *commit_id = NULL;
8356 struct got_histedit_list_entry *hle = NULL;
8359 len = getline(&line, &size, f);
8361 const struct got_error *getline_err;
8364 getline_err = got_error_from_errno("getline");
8365 err = got_ferror(f, getline_err->code);
8370 while (isspace((unsigned char)p[0]))
8372 if (p[0] == '#' || p[0] == '\0') {
8378 for (i = 0; i < nitems(got_histedit_cmds); i++) {
8379 cmd = &got_histedit_cmds[i];
8380 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8381 isspace((unsigned char)p[strlen(cmd->name)])) {
8382 p += strlen(cmd->name);
8385 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8390 if (i == nitems(got_histedit_cmds)) {
8391 err = histedit_syntax_error(lineno);
8394 while (isspace((unsigned char)p[0]))
8396 if (cmd->code == GOT_HISTEDIT_MESG) {
8397 if (hle == NULL || hle->logmsg != NULL) {
8398 err = got_error(GOT_ERR_HISTEDIT_CMD);
8402 err = histedit_edit_logmsg(hle, repo);
8406 hle->logmsg = strdup(p);
8407 if (hle->logmsg == NULL) {
8408 err = got_error_from_errno("strdup");
8417 while (end[0] && !isspace((unsigned char)end[0]))
8421 err = got_object_resolve_id_str(&commit_id, repo, p);
8423 /* override error code */
8424 err = histedit_syntax_error(lineno);
8428 hle = malloc(sizeof(*hle));
8430 err = got_error_from_errno("malloc");
8434 hle->commit_id = commit_id;
8439 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8447 static const struct got_error *
8448 histedit_check_script(struct got_histedit_list *histedit_cmds,
8449 struct got_object_id_queue *commits, struct got_repository *repo)
8451 const struct got_error *err = NULL;
8452 struct got_object_qid *qid;
8453 struct got_histedit_list_entry *hle;
8454 static char msg[92];
8457 if (TAILQ_EMPTY(histedit_cmds))
8458 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8459 "histedit script contains no commands");
8460 if (SIMPLEQ_EMPTY(commits))
8461 return got_error(GOT_ERR_EMPTY_HISTEDIT);
8463 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8464 struct got_histedit_list_entry *hle2;
8465 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8468 if (got_object_id_cmp(hle->commit_id,
8469 hle2->commit_id) != 0)
8471 err = got_object_id_str(&id_str, hle->commit_id);
8474 snprintf(msg, sizeof(msg), "commit %s is listed "
8475 "more than once in histedit script", id_str);
8477 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8481 SIMPLEQ_FOREACH(qid, commits, entry) {
8482 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8483 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8487 err = got_object_id_str(&id_str, qid->id);
8490 snprintf(msg, sizeof(msg),
8491 "commit %s missing from histedit script", id_str);
8493 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8497 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8498 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8499 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8500 "last commit in histedit script cannot be folded");
8505 static const struct got_error *
8506 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8507 const char *path, struct got_object_id_queue *commits,
8508 struct got_repository *repo)
8510 const struct got_error *err = NULL;
8514 err = get_editor(&editor);
8518 if (spawn_editor(editor, path) == -1) {
8519 err = got_error_from_errno("failed spawning editor");
8523 f = fopen(path, "r");
8525 err = got_error_from_errno("fopen");
8528 err = histedit_parse_list(histedit_cmds, f, repo);
8532 err = histedit_check_script(histedit_cmds, commits, repo);
8534 if (f && fclose(f) == EOF && err == NULL)
8535 err = got_error_from_errno("fclose");
8540 static const struct got_error *
8541 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8542 struct got_object_id_queue *, const char *, const char *,
8543 struct got_repository *);
8545 static const struct got_error *
8546 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8547 struct got_object_id_queue *commits, const char *branch_name,
8548 int edit_logmsg_only, int fold_only, struct got_repository *repo)
8550 const struct got_error *err;
8554 err = got_opentemp_named(&path, &f, "got-histedit");
8558 err = write_cmd_list(f, branch_name, commits);
8562 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8567 if (edit_logmsg_only || fold_only) {
8569 err = histedit_parse_list(histedit_cmds, f, repo);
8571 if (fclose(f) == EOF) {
8572 err = got_error_from_errno("fclose");
8576 err = histedit_run_editor(histedit_cmds, path, commits, repo);
8578 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8579 err->code != GOT_ERR_HISTEDIT_CMD)
8581 err = histedit_edit_list_retry(histedit_cmds, err,
8582 commits, path, branch_name, repo);
8586 if (f && fclose(f) == EOF && err == NULL)
8587 err = got_error_from_errno("fclose");
8588 if (path && unlink(path) != 0 && err == NULL)
8589 err = got_error_from_errno2("unlink", path);
8594 static const struct got_error *
8595 histedit_save_list(struct got_histedit_list *histedit_cmds,
8596 struct got_worktree *worktree, struct got_repository *repo)
8598 const struct got_error *err = NULL;
8601 struct got_histedit_list_entry *hle;
8602 struct got_commit_object *commit = NULL;
8604 err = got_worktree_get_histedit_script_path(&path, worktree);
8608 f = fopen(path, "w");
8610 err = got_error_from_errno2("fopen", path);
8613 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8614 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8620 int n = fprintf(f, "%c %s\n",
8621 GOT_HISTEDIT_MESG, hle->logmsg);
8623 err = got_ferror(f, GOT_ERR_IO);
8629 if (f && fclose(f) == EOF && err == NULL)
8630 err = got_error_from_errno("fclose");
8633 got_object_commit_close(commit);
8638 histedit_free_list(struct got_histedit_list *histedit_cmds)
8640 struct got_histedit_list_entry *hle;
8642 while ((hle = TAILQ_FIRST(histedit_cmds))) {
8643 TAILQ_REMOVE(histedit_cmds, hle, entry);
8648 static const struct got_error *
8649 histedit_load_list(struct got_histedit_list *histedit_cmds,
8650 const char *path, struct got_repository *repo)
8652 const struct got_error *err = NULL;
8655 f = fopen(path, "r");
8657 err = got_error_from_errno2("fopen", path);
8661 err = histedit_parse_list(histedit_cmds, f, repo);
8663 if (f && fclose(f) == EOF && err == NULL)
8664 err = got_error_from_errno("fclose");
8668 static const struct got_error *
8669 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8670 const struct got_error *edit_err, struct got_object_id_queue *commits,
8671 const char *path, const char *branch_name, struct got_repository *repo)
8673 const struct got_error *err = NULL, *prev_err = edit_err;
8676 while (resp != 'c' && resp != 'r' && resp != 'a') {
8677 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8678 "or (a)bort: ", getprogname(), prev_err->msg);
8683 histedit_free_list(histedit_cmds);
8684 err = histedit_run_editor(histedit_cmds, path, commits,
8687 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8688 err->code != GOT_ERR_HISTEDIT_CMD)
8695 } else if (resp == 'r') {
8696 histedit_free_list(histedit_cmds);
8697 err = histedit_edit_script(histedit_cmds,
8698 commits, branch_name, 0, 0, repo);
8700 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8701 err->code != GOT_ERR_HISTEDIT_CMD)
8708 } else if (resp == 'a') {
8709 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8712 printf("invalid response '%c'\n", resp);
8718 static const struct got_error *
8719 histedit_complete(struct got_worktree *worktree,
8720 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8721 struct got_reference *branch, struct got_repository *repo)
8723 printf("Switching work tree to %s\n",
8724 got_ref_get_symref_target(branch));
8725 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
8729 static const struct got_error *
8730 show_histedit_progress(struct got_commit_object *commit,
8731 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
8733 const struct got_error *err;
8734 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
8736 err = got_object_id_str(&old_id_str, hle->commit_id);
8741 err = got_object_id_str(&new_id_str, new_id);
8746 old_id_str[12] = '\0';
8748 new_id_str[12] = '\0';
8751 logmsg = strdup(hle->logmsg);
8752 if (logmsg == NULL) {
8753 err = got_error_from_errno("strdup");
8756 trim_logmsg(logmsg, 42);
8758 err = get_short_logmsg(&logmsg, 42, commit);
8763 switch (hle->cmd->code) {
8764 case GOT_HISTEDIT_PICK:
8765 case GOT_HISTEDIT_EDIT:
8766 printf("%s -> %s: %s\n", old_id_str,
8767 new_id_str ? new_id_str : "no-op change", logmsg);
8769 case GOT_HISTEDIT_DROP:
8770 case GOT_HISTEDIT_FOLD:
8771 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
8783 static const struct got_error *
8784 histedit_commit(struct got_pathlist_head *merged_paths,
8785 struct got_worktree *worktree, struct got_fileindex *fileindex,
8786 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
8787 struct got_repository *repo)
8789 const struct got_error *err;
8790 struct got_commit_object *commit;
8791 struct got_object_id *new_commit_id;
8793 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
8794 && hle->logmsg == NULL) {
8795 err = histedit_edit_logmsg(hle, repo);
8800 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8804 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
8805 worktree, fileindex, tmp_branch, commit, hle->commit_id,
8808 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
8810 err = show_histedit_progress(commit, hle, NULL);
8812 err = show_histedit_progress(commit, hle, new_commit_id);
8813 free(new_commit_id);
8816 got_object_commit_close(commit);
8820 static const struct got_error *
8821 histedit_skip_commit(struct got_histedit_list_entry *hle,
8822 struct got_worktree *worktree, struct got_repository *repo)
8824 const struct got_error *error;
8825 struct got_commit_object *commit;
8827 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
8832 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
8836 error = show_histedit_progress(commit, hle, NULL);
8837 got_object_commit_close(commit);
8841 static const struct got_error *
8842 check_local_changes(void *arg, unsigned char status,
8843 unsigned char staged_status, const char *path,
8844 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8845 struct got_object_id *commit_id, int dirfd, const char *de_name)
8847 int *have_local_changes = arg;
8850 case GOT_STATUS_ADD:
8851 case GOT_STATUS_DELETE:
8852 case GOT_STATUS_MODIFY:
8853 case GOT_STATUS_CONFLICT:
8854 *have_local_changes = 1;
8855 return got_error(GOT_ERR_CANCELLED);
8860 switch (staged_status) {
8861 case GOT_STATUS_ADD:
8862 case GOT_STATUS_DELETE:
8863 case GOT_STATUS_MODIFY:
8864 *have_local_changes = 1;
8865 return got_error(GOT_ERR_CANCELLED);
8873 static const struct got_error *
8874 cmd_histedit(int argc, char *argv[])
8876 const struct got_error *error = NULL;
8877 struct got_worktree *worktree = NULL;
8878 struct got_fileindex *fileindex = NULL;
8879 struct got_repository *repo = NULL;
8881 struct got_reference *branch = NULL;
8882 struct got_reference *tmp_branch = NULL;
8883 struct got_object_id *resume_commit_id = NULL;
8884 struct got_object_id *base_commit_id = NULL;
8885 struct got_object_id *head_commit_id = NULL;
8886 struct got_commit_object *commit = NULL;
8887 int ch, rebase_in_progress = 0;
8888 struct got_update_progress_arg upa;
8889 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
8890 int edit_logmsg_only = 0, fold_only = 0;
8891 const char *edit_script_path = NULL;
8892 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8893 struct got_object_id_queue commits;
8894 struct got_pathlist_head merged_paths;
8895 const struct got_object_id_queue *parent_ids;
8896 struct got_object_qid *pid;
8897 struct got_histedit_list histedit_cmds;
8898 struct got_histedit_list_entry *hle;
8900 SIMPLEQ_INIT(&commits);
8901 TAILQ_INIT(&histedit_cmds);
8902 TAILQ_INIT(&merged_paths);
8903 memset(&upa, 0, sizeof(upa));
8905 while ((ch = getopt(argc, argv, "acfF:m")) != -1) {
8917 edit_script_path = optarg;
8920 edit_logmsg_only = 1;
8932 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8933 "unveil", NULL) == -1)
8936 if (abort_edit && continue_edit)
8937 option_conflict('a', 'c');
8938 if (edit_script_path && edit_logmsg_only)
8939 option_conflict('F', 'm');
8940 if (abort_edit && edit_logmsg_only)
8941 option_conflict('a', 'm');
8942 if (continue_edit && edit_logmsg_only)
8943 option_conflict('c', 'm');
8944 if (abort_edit && fold_only)
8945 option_conflict('a', 'f');
8946 if (continue_edit && fold_only)
8947 option_conflict('c', 'f');
8948 if (fold_only && edit_logmsg_only)
8949 option_conflict('f', 'm');
8950 if (edit_script_path && fold_only)
8951 option_conflict('F', 'f');
8956 * This command cannot apply unveil(2) in all cases because the
8957 * user may choose to run an editor to edit the histedit script
8958 * and to edit individual commit log messages.
8959 * unveil(2) traverses exec(2); if an editor is used we have to
8960 * apply unveil after edit script and log messages have been written.
8961 * XXX TODO: Make use of unveil(2) where possible.
8964 cwd = getcwd(NULL, 0);
8966 error = got_error_from_errno("getcwd");
8969 error = got_worktree_open(&worktree, cwd);
8971 if (error->code == GOT_ERR_NOT_WORKTREE)
8972 error = wrap_not_worktree_error(error, "histedit", cwd);
8976 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8981 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8984 if (rebase_in_progress) {
8985 error = got_error(GOT_ERR_REBASING);
8989 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
8993 if (edit_in_progress && edit_logmsg_only) {
8994 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
8995 "histedit operation is in progress in this "
8996 "work tree and must be continued or aborted "
8997 "before the -m option can be used");
9000 if (edit_in_progress && fold_only) {
9001 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9002 "histedit operation is in progress in this "
9003 "work tree and must be continued or aborted "
9004 "before the -f option can be used");
9008 if (edit_in_progress && abort_edit) {
9009 error = got_worktree_histedit_continue(&resume_commit_id,
9010 &tmp_branch, &branch, &base_commit_id, &fileindex,
9014 printf("Switching work tree to %s\n",
9015 got_ref_get_symref_target(branch));
9016 error = got_worktree_histedit_abort(worktree, fileindex, repo,
9017 branch, base_commit_id, update_progress, &upa);
9020 printf("Histedit of %s aborted\n",
9021 got_ref_get_symref_target(branch));
9022 print_update_progress_stats(&upa);
9023 goto done; /* nothing else to do */
9024 } else if (abort_edit) {
9025 error = got_error(GOT_ERR_NOT_HISTEDIT);
9029 if (continue_edit) {
9032 if (!edit_in_progress) {
9033 error = got_error(GOT_ERR_NOT_HISTEDIT);
9037 error = got_worktree_get_histedit_script_path(&path, worktree);
9041 error = histedit_load_list(&histedit_cmds, path, repo);
9046 error = got_worktree_histedit_continue(&resume_commit_id,
9047 &tmp_branch, &branch, &base_commit_id, &fileindex,
9052 error = got_ref_resolve(&head_commit_id, repo, branch);
9056 error = got_object_open_as_commit(&commit, repo,
9060 parent_ids = got_object_commit_get_parent_ids(commit);
9061 pid = SIMPLEQ_FIRST(parent_ids);
9063 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9066 error = collect_commits(&commits, head_commit_id, pid->id,
9067 base_commit_id, got_worktree_get_path_prefix(worktree),
9068 GOT_ERR_HISTEDIT_PATH, repo);
9069 got_object_commit_close(commit);
9074 if (edit_in_progress) {
9075 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9079 error = got_ref_open(&branch, repo,
9080 got_worktree_get_head_ref_name(worktree), 0);
9084 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
9085 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
9086 "will not edit commit history of a branch outside "
9087 "the \"refs/heads/\" reference namespace");
9091 error = got_ref_resolve(&head_commit_id, repo, branch);
9092 got_ref_close(branch);
9097 error = got_object_open_as_commit(&commit, repo,
9101 parent_ids = got_object_commit_get_parent_ids(commit);
9102 pid = SIMPLEQ_FIRST(parent_ids);
9104 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9107 error = collect_commits(&commits, head_commit_id, pid->id,
9108 got_worktree_get_base_commit_id(worktree),
9109 got_worktree_get_path_prefix(worktree),
9110 GOT_ERR_HISTEDIT_PATH, repo);
9111 got_object_commit_close(commit);
9116 if (SIMPLEQ_EMPTY(&commits)) {
9117 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9121 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
9122 &base_commit_id, &fileindex, worktree, repo);
9126 if (edit_script_path) {
9127 error = histedit_load_list(&histedit_cmds,
9128 edit_script_path, repo);
9130 got_worktree_histedit_abort(worktree, fileindex,
9131 repo, branch, base_commit_id,
9132 update_progress, &upa);
9133 print_update_progress_stats(&upa);
9137 const char *branch_name;
9138 branch_name = got_ref_get_symref_target(branch);
9139 if (strncmp(branch_name, "refs/heads/", 11) == 0)
9141 error = histedit_edit_script(&histedit_cmds, &commits,
9142 branch_name, edit_logmsg_only, fold_only, repo);
9144 got_worktree_histedit_abort(worktree, fileindex,
9145 repo, branch, base_commit_id,
9146 update_progress, &upa);
9147 print_update_progress_stats(&upa);
9153 error = histedit_save_list(&histedit_cmds, worktree,
9156 got_worktree_histedit_abort(worktree, fileindex,
9157 repo, branch, base_commit_id,
9158 update_progress, &upa);
9159 print_update_progress_stats(&upa);
9165 error = histedit_check_script(&histedit_cmds, &commits, repo);
9169 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
9170 if (resume_commit_id) {
9171 if (got_object_id_cmp(hle->commit_id,
9172 resume_commit_id) != 0)
9175 resume_commit_id = NULL;
9176 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
9177 hle->cmd->code == GOT_HISTEDIT_FOLD) {
9178 error = histedit_skip_commit(hle, worktree,
9183 struct got_pathlist_head paths;
9184 int have_changes = 0;
9187 error = got_pathlist_append(&paths, "", NULL);
9190 error = got_worktree_status(worktree, &paths,
9191 repo, check_local_changes, &have_changes,
9192 check_cancelled, NULL);
9193 got_pathlist_free(&paths);
9195 if (error->code != GOT_ERR_CANCELLED)
9197 if (sigint_received || sigpipe_received)
9201 error = histedit_commit(NULL, worktree,
9202 fileindex, tmp_branch, hle, repo);
9206 error = got_object_open_as_commit(
9207 &commit, repo, hle->commit_id);
9210 error = show_histedit_progress(commit,
9212 got_object_commit_close(commit);
9221 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
9222 error = histedit_skip_commit(hle, worktree, repo);
9228 error = got_object_open_as_commit(&commit, repo,
9232 parent_ids = got_object_commit_get_parent_ids(commit);
9233 pid = SIMPLEQ_FIRST(parent_ids);
9235 error = got_worktree_histedit_merge_files(&merged_paths,
9236 worktree, fileindex, pid->id, hle->commit_id, repo,
9237 update_progress, &upa, check_cancelled, NULL);
9240 got_object_commit_close(commit);
9243 print_update_progress_stats(&upa);
9244 if (upa.conflicts > 0)
9245 rebase_status = GOT_STATUS_CONFLICT;
9247 if (rebase_status == GOT_STATUS_CONFLICT) {
9248 error = show_rebase_merge_conflict(hle->commit_id,
9252 got_worktree_rebase_pathlist_free(&merged_paths);
9256 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
9258 error = got_object_id_str(&id_str, hle->commit_id);
9261 printf("Stopping histedit for amending commit %s\n",
9264 got_worktree_rebase_pathlist_free(&merged_paths);
9265 error = got_worktree_histedit_postpone(worktree,
9270 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
9271 error = histedit_skip_commit(hle, worktree, repo);
9277 error = histedit_commit(&merged_paths, worktree, fileindex,
9278 tmp_branch, hle, repo);
9279 got_worktree_rebase_pathlist_free(&merged_paths);
9284 if (rebase_status == GOT_STATUS_CONFLICT) {
9285 error = got_worktree_histedit_postpone(worktree, fileindex);
9288 error = got_error_msg(GOT_ERR_CONFLICTS,
9289 "conflicts must be resolved before histedit can continue");
9291 error = histedit_complete(worktree, fileindex, tmp_branch,
9294 got_object_id_queue_free(&commits);
9295 histedit_free_list(&histedit_cmds);
9296 free(head_commit_id);
9297 free(base_commit_id);
9298 free(resume_commit_id);
9300 got_object_commit_close(commit);
9302 got_ref_close(branch);
9304 got_ref_close(tmp_branch);
9306 got_worktree_close(worktree);
9308 got_repo_close(repo);
9313 usage_integrate(void)
9315 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9319 static const struct got_error *
9320 cmd_integrate(int argc, char *argv[])
9322 const struct got_error *error = NULL;
9323 struct got_repository *repo = NULL;
9324 struct got_worktree *worktree = NULL;
9325 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9326 const char *branch_arg = NULL;
9327 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9328 struct got_fileindex *fileindex = NULL;
9329 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9331 struct got_update_progress_arg upa;
9333 while ((ch = getopt(argc, argv, "")) != -1) {
9346 branch_arg = argv[0];
9348 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9349 "unveil", NULL) == -1)
9352 cwd = getcwd(NULL, 0);
9354 error = got_error_from_errno("getcwd");
9358 error = got_worktree_open(&worktree, cwd);
9360 if (error->code == GOT_ERR_NOT_WORKTREE)
9361 error = wrap_not_worktree_error(error, "integrate",
9366 error = check_rebase_or_histedit_in_progress(worktree);
9370 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9375 error = apply_unveil(got_repo_get_path(repo), 0,
9376 got_worktree_get_root_path(worktree));
9380 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9381 error = got_error_from_errno("asprintf");
9385 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9386 &base_branch_ref, worktree, refname, repo);
9390 refname = strdup(got_ref_get_name(branch_ref));
9391 if (refname == NULL) {
9392 error = got_error_from_errno("strdup");
9393 got_worktree_integrate_abort(worktree, fileindex, repo,
9394 branch_ref, base_branch_ref);
9397 base_refname = strdup(got_ref_get_name(base_branch_ref));
9398 if (base_refname == NULL) {
9399 error = got_error_from_errno("strdup");
9400 got_worktree_integrate_abort(worktree, fileindex, repo,
9401 branch_ref, base_branch_ref);
9405 error = got_ref_resolve(&commit_id, repo, branch_ref);
9409 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9413 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9414 error = got_error_msg(GOT_ERR_SAME_BRANCH,
9415 "specified branch has already been integrated");
9416 got_worktree_integrate_abort(worktree, fileindex, repo,
9417 branch_ref, base_branch_ref);
9421 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9423 if (error->code == GOT_ERR_ANCESTRY)
9424 error = got_error(GOT_ERR_REBASE_REQUIRED);
9425 got_worktree_integrate_abort(worktree, fileindex, repo,
9426 branch_ref, base_branch_ref);
9430 memset(&upa, 0, sizeof(upa));
9431 error = got_worktree_integrate_continue(worktree, fileindex, repo,
9432 branch_ref, base_branch_ref, update_progress, &upa,
9433 check_cancelled, NULL);
9437 printf("Integrated %s into %s\n", refname, base_refname);
9438 print_update_progress_stats(&upa);
9441 got_repo_close(repo);
9443 got_worktree_close(worktree);
9445 free(base_commit_id);
9455 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9456 "[-S] [file-path ...]\n",
9461 static const struct got_error *
9462 print_stage(void *arg, unsigned char status, unsigned char staged_status,
9463 const char *path, struct got_object_id *blob_id,
9464 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9465 int dirfd, const char *de_name)
9467 const struct got_error *err = NULL;
9468 char *id_str = NULL;
9470 if (staged_status != GOT_STATUS_ADD &&
9471 staged_status != GOT_STATUS_MODIFY &&
9472 staged_status != GOT_STATUS_DELETE)
9475 if (staged_status == GOT_STATUS_ADD ||
9476 staged_status == GOT_STATUS_MODIFY)
9477 err = got_object_id_str(&id_str, staged_blob_id);
9479 err = got_object_id_str(&id_str, blob_id);
9483 printf("%s %c %s\n", id_str, staged_status, path);
9488 static const struct got_error *
9489 cmd_stage(int argc, char *argv[])
9491 const struct got_error *error = NULL;
9492 struct got_repository *repo = NULL;
9493 struct got_worktree *worktree = NULL;
9495 struct got_pathlist_head paths;
9496 struct got_pathlist_entry *pe;
9497 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9498 FILE *patch_script_file = NULL;
9499 const char *patch_script_path = NULL;
9500 struct choose_patch_arg cpa;
9504 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9513 patch_script_path = optarg;
9516 allow_bad_symlinks = 1;
9528 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9529 "unveil", NULL) == -1)
9532 if (list_stage && (pflag || patch_script_path))
9533 errx(1, "-l option cannot be used with other options");
9534 if (patch_script_path && !pflag)
9535 errx(1, "-F option can only be used together with -p option");
9537 cwd = getcwd(NULL, 0);
9539 error = got_error_from_errno("getcwd");
9543 error = got_worktree_open(&worktree, cwd);
9545 if (error->code == GOT_ERR_NOT_WORKTREE)
9546 error = wrap_not_worktree_error(error, "stage", cwd);
9550 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9555 if (patch_script_path) {
9556 patch_script_file = fopen(patch_script_path, "r");
9557 if (patch_script_file == NULL) {
9558 error = got_error_from_errno2("fopen",
9563 error = apply_unveil(got_repo_get_path(repo), 0,
9564 got_worktree_get_root_path(worktree));
9568 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9573 error = got_worktree_status(worktree, &paths, repo,
9574 print_stage, NULL, check_cancelled, NULL);
9576 cpa.patch_script_file = patch_script_file;
9577 cpa.action = "stage";
9578 error = got_worktree_stage(worktree, &paths,
9579 pflag ? NULL : print_status, NULL,
9580 pflag ? choose_patch : NULL, &cpa,
9581 allow_bad_symlinks, repo);
9584 if (patch_script_file && fclose(patch_script_file) == EOF &&
9586 error = got_error_from_errno2("fclose", patch_script_path);
9588 got_repo_close(repo);
9590 got_worktree_close(worktree);
9591 TAILQ_FOREACH(pe, &paths, entry)
9592 free((char *)pe->path);
9593 got_pathlist_free(&paths);
9601 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9602 "[file-path ...]\n",
9608 static const struct got_error *
9609 cmd_unstage(int argc, char *argv[])
9611 const struct got_error *error = NULL;
9612 struct got_repository *repo = NULL;
9613 struct got_worktree *worktree = NULL;
9615 struct got_pathlist_head paths;
9616 struct got_pathlist_entry *pe;
9618 struct got_update_progress_arg upa;
9619 FILE *patch_script_file = NULL;
9620 const char *patch_script_path = NULL;
9621 struct choose_patch_arg cpa;
9625 while ((ch = getopt(argc, argv, "pF:")) != -1) {
9631 patch_script_path = optarg;
9643 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9644 "unveil", NULL) == -1)
9647 if (patch_script_path && !pflag)
9648 errx(1, "-F option can only be used together with -p option");
9650 cwd = getcwd(NULL, 0);
9652 error = got_error_from_errno("getcwd");
9656 error = got_worktree_open(&worktree, cwd);
9658 if (error->code == GOT_ERR_NOT_WORKTREE)
9659 error = wrap_not_worktree_error(error, "unstage", cwd);
9663 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9668 if (patch_script_path) {
9669 patch_script_file = fopen(patch_script_path, "r");
9670 if (patch_script_file == NULL) {
9671 error = got_error_from_errno2("fopen",
9677 error = apply_unveil(got_repo_get_path(repo), 0,
9678 got_worktree_get_root_path(worktree));
9682 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9686 cpa.patch_script_file = patch_script_file;
9687 cpa.action = "unstage";
9688 memset(&upa, 0, sizeof(upa));
9689 error = got_worktree_unstage(worktree, &paths, update_progress,
9690 &upa, pflag ? choose_patch : NULL, &cpa, repo);
9692 print_update_progress_stats(&upa);
9694 if (patch_script_file && fclose(patch_script_file) == EOF &&
9696 error = got_error_from_errno2("fclose", patch_script_path);
9698 got_repo_close(repo);
9700 got_worktree_close(worktree);
9701 TAILQ_FOREACH(pe, &paths, entry)
9702 free((char *)pe->path);
9703 got_pathlist_free(&paths);
9711 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
9712 "arg1 [arg2 ...]\n", getprogname());
9716 static const struct got_error *
9717 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9719 const struct got_error *err;
9720 struct got_blob_object *blob;
9722 err = got_object_open_as_blob(&blob, repo, id, 8192);
9726 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
9727 got_object_blob_close(blob);
9731 static const struct got_error *
9732 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9734 const struct got_error *err;
9735 struct got_tree_object *tree;
9738 err = got_object_open_as_tree(&tree, repo, id);
9742 nentries = got_object_tree_get_nentries(tree);
9743 for (i = 0; i < nentries; i++) {
9744 struct got_tree_entry *te;
9746 if (sigint_received || sigpipe_received)
9748 te = got_object_tree_get_entry(tree, i);
9749 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
9752 fprintf(outfile, "%s %.7o %s\n", id_str,
9753 got_tree_entry_get_mode(te),
9754 got_tree_entry_get_name(te));
9758 got_object_tree_close(tree);
9762 static const struct got_error *
9763 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9765 const struct got_error *err;
9766 struct got_commit_object *commit;
9767 const struct got_object_id_queue *parent_ids;
9768 struct got_object_qid *pid;
9769 char *id_str = NULL;
9770 const char *logmsg = NULL;
9772 err = got_object_open_as_commit(&commit, repo, id);
9776 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
9780 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
9781 parent_ids = got_object_commit_get_parent_ids(commit);
9782 fprintf(outfile, "numparents %d\n",
9783 got_object_commit_get_nparents(commit));
9784 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
9786 err = got_object_id_str(&pid_str, pid->id);
9789 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
9792 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
9793 got_object_commit_get_author(commit),
9794 (long long)got_object_commit_get_author_time(commit));
9796 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
9797 got_object_commit_get_author(commit),
9798 (long long)got_object_commit_get_committer_time(commit));
9800 logmsg = got_object_commit_get_logmsg_raw(commit);
9801 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
9802 fprintf(outfile, "%s", logmsg);
9805 got_object_commit_close(commit);
9809 static const struct got_error *
9810 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
9812 const struct got_error *err;
9813 struct got_tag_object *tag;
9814 char *id_str = NULL;
9815 const char *tagmsg = NULL;
9817 err = got_object_open_as_tag(&tag, repo, id);
9821 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
9825 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
9827 switch (got_object_tag_get_object_type(tag)) {
9828 case GOT_OBJ_TYPE_BLOB:
9829 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9830 GOT_OBJ_LABEL_BLOB);
9832 case GOT_OBJ_TYPE_TREE:
9833 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9834 GOT_OBJ_LABEL_TREE);
9836 case GOT_OBJ_TYPE_COMMIT:
9837 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9838 GOT_OBJ_LABEL_COMMIT);
9840 case GOT_OBJ_TYPE_TAG:
9841 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
9848 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
9849 got_object_tag_get_name(tag));
9851 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
9852 got_object_tag_get_tagger(tag),
9853 (long long)got_object_tag_get_tagger_time(tag));
9855 tagmsg = got_object_tag_get_message(tag);
9856 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
9857 fprintf(outfile, "%s", tagmsg);
9860 got_object_tag_close(tag);
9864 static const struct got_error *
9865 cmd_cat(int argc, char *argv[])
9867 const struct got_error *error;
9868 struct got_repository *repo = NULL;
9869 struct got_worktree *worktree = NULL;
9870 char *cwd = NULL, *repo_path = NULL, *label = NULL;
9871 const char *commit_id_str = NULL;
9872 struct got_object_id *id = NULL, *commit_id = NULL;
9873 int ch, obj_type, i, force_path = 0;
9874 struct got_reflist_head refs;
9879 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
9884 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
9887 commit_id_str = optarg;
9890 repo_path = realpath(optarg, NULL);
9891 if (repo_path == NULL)
9892 return got_error_from_errno2("realpath",
9894 got_path_strip_trailing_slashes(repo_path);
9908 cwd = getcwd(NULL, 0);
9910 error = got_error_from_errno("getcwd");
9913 error = got_worktree_open(&worktree, cwd);
9914 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9917 if (repo_path == NULL) {
9919 got_worktree_get_repo_path(worktree));
9920 if (repo_path == NULL) {
9921 error = got_error_from_errno("strdup");
9927 if (repo_path == NULL) {
9928 repo_path = getcwd(NULL, 0);
9929 if (repo_path == NULL)
9930 return got_error_from_errno("getcwd");
9933 error = got_repo_open(&repo, repo_path, NULL);
9938 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
9942 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
9946 if (commit_id_str == NULL)
9947 commit_id_str = GOT_REF_HEAD;
9948 error = got_repo_match_object_id(&commit_id, NULL,
9949 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
9953 for (i = 0; i < argc; i++) {
9955 error = got_object_id_by_path(&id, repo, commit_id,
9960 error = got_repo_match_object_id(&id, &label, argv[i],
9961 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
9964 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
9965 error->code != GOT_ERR_NOT_REF)
9967 error = got_object_id_by_path(&id, repo,
9968 commit_id, argv[i]);
9974 error = got_object_get_type(&obj_type, repo, id);
9979 case GOT_OBJ_TYPE_BLOB:
9980 error = cat_blob(id, repo, stdout);
9982 case GOT_OBJ_TYPE_TREE:
9983 error = cat_tree(id, repo, stdout);
9985 case GOT_OBJ_TYPE_COMMIT:
9986 error = cat_commit(id, repo, stdout);
9988 case GOT_OBJ_TYPE_TAG:
9989 error = cat_tag(id, repo, stdout);
9992 error = got_error(GOT_ERR_OBJ_TYPE);
10007 got_worktree_close(worktree);
10009 const struct got_error *repo_error;
10010 repo_error = got_repo_close(repo);
10012 error = repo_error;
10014 got_ref_list_free(&refs);
10021 fprintf(stderr, "usage: %s info [path ...]\n",
10026 static const struct got_error *
10027 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
10028 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10029 struct got_object_id *commit_id)
10031 const struct got_error *err = NULL;
10032 char *id_str = NULL;
10034 struct tm mytm, *tm;
10035 struct got_pathlist_head *paths = arg;
10036 struct got_pathlist_entry *pe;
10039 * Clear error indication from any of the path arguments which
10040 * would cause this file index entry to be displayed.
10042 TAILQ_FOREACH(pe, paths, entry) {
10043 if (got_path_cmp(path, pe->path, strlen(path),
10044 pe->path_len) == 0 ||
10045 got_path_is_child(path, pe->path, pe->path_len))
10046 pe->data = NULL; /* no error */
10049 printf(GOT_COMMIT_SEP_STR);
10051 printf("symlink: %s\n", path);
10052 else if (S_ISREG(mode)) {
10053 printf("file: %s\n", path);
10054 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
10055 } else if (S_ISDIR(mode))
10056 printf("directory: %s\n", path);
10058 printf("something: %s\n", path);
10060 tm = localtime_r(&mtime, &mytm);
10063 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) >= sizeof(datebuf))
10064 return got_error(GOT_ERR_NO_SPACE);
10065 printf("timestamp: %s\n", datebuf);
10068 err = got_object_id_str(&id_str, blob_id);
10071 printf("based on blob: %s\n", id_str);
10075 if (staged_blob_id) {
10076 err = got_object_id_str(&id_str, staged_blob_id);
10079 printf("based on staged blob: %s\n", id_str);
10084 err = got_object_id_str(&id_str, commit_id);
10087 printf("based on commit: %s\n", id_str);
10094 static const struct got_error *
10095 cmd_info(int argc, char *argv[])
10097 const struct got_error *error = NULL;
10098 struct got_worktree *worktree = NULL;
10099 char *cwd = NULL, *id_str = NULL;
10100 struct got_pathlist_head paths;
10101 struct got_pathlist_entry *pe;
10102 char *uuidstr = NULL;
10103 int ch, show_files = 0;
10105 TAILQ_INIT(&paths);
10107 while ((ch = getopt(argc, argv, "")) != -1) {
10119 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
10123 cwd = getcwd(NULL, 0);
10125 error = got_error_from_errno("getcwd");
10129 error = got_worktree_open(&worktree, cwd);
10131 if (error->code == GOT_ERR_NOT_WORKTREE)
10132 error = wrap_not_worktree_error(error, "info", cwd);
10136 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
10141 error = get_worktree_paths_from_argv(&paths, argc, argv,
10148 error = got_object_id_str(&id_str,
10149 got_worktree_get_base_commit_id(worktree));
10153 error = got_worktree_get_uuid(&uuidstr, worktree);
10157 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
10158 printf("work tree base commit: %s\n", id_str);
10159 printf("work tree path prefix: %s\n",
10160 got_worktree_get_path_prefix(worktree));
10161 printf("work tree branch reference: %s\n",
10162 got_worktree_get_head_ref_name(worktree));
10163 printf("work tree UUID: %s\n", uuidstr);
10164 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
10167 struct got_pathlist_entry *pe;
10168 TAILQ_FOREACH(pe, &paths, entry) {
10169 if (pe->path_len == 0)
10172 * Assume this path will fail. This will be corrected
10173 * in print_path_info() in case the path does suceeed.
10175 pe->data = (void *)got_error_path(pe->path,
10178 error = got_worktree_path_info(worktree, &paths,
10179 print_path_info, &paths, check_cancelled, NULL);
10182 TAILQ_FOREACH(pe, &paths, entry) {
10183 if (pe->data != NULL) {
10184 error = pe->data; /* bad path */
10190 TAILQ_FOREACH(pe, &paths, entry)
10191 free((char *)pe->path);
10192 got_pathlist_free(&paths);