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,
3605 const char *custom_refs_str)
3607 const struct got_error *err = NULL;
3608 char *id_str, *datestr, *logmsg0, *logmsg, *line;
3610 time_t committer_time;
3611 const char *author, *committer;
3612 char *refs_str = NULL;
3614 err = got_object_id_str(&id_str, id);
3618 if (custom_refs_str == NULL) {
3619 struct got_reflist_head *refs;
3620 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
3622 err = build_refs_str(&refs_str, refs, id, repo);
3628 printf(GOT_COMMIT_SEP_STR);
3629 if (custom_refs_str)
3630 printf("commit %s (%s)\n", id_str, custom_refs_str);
3632 printf("commit %s%s%s%s\n", id_str, refs_str ? " (" : "",
3633 refs_str ? refs_str : "", refs_str ? ")" : "");
3638 printf("from: %s\n", got_object_commit_get_author(commit));
3639 committer_time = got_object_commit_get_committer_time(commit);
3640 datestr = get_datestr(&committer_time, datebuf);
3642 printf("date: %s UTC\n", datestr);
3643 author = got_object_commit_get_author(commit);
3644 committer = got_object_commit_get_committer(commit);
3645 if (strcmp(author, committer) != 0)
3646 printf("via: %s\n", committer);
3647 if (got_object_commit_get_nparents(commit) > 1) {
3648 const struct got_object_id_queue *parent_ids;
3649 struct got_object_qid *qid;
3651 parent_ids = got_object_commit_get_parent_ids(commit);
3652 SIMPLEQ_FOREACH(qid, parent_ids, entry) {
3653 err = got_object_id_str(&id_str, qid->id);
3656 printf("parent %d: %s\n", n++, id_str);
3662 err = got_object_commit_get_logmsg(&logmsg0, commit);
3668 line = strsep(&logmsg, "\n");
3670 printf(" %s\n", line);
3674 if (changed_paths) {
3675 struct got_pathlist_entry *pe;
3676 TAILQ_FOREACH(pe, changed_paths, entry) {
3677 struct got_diff_changed_path *cp = pe->data;
3678 printf(" %c %s\n", cp->status, pe->path);
3683 err = print_patch(commit, id, path, diff_context, repo);
3688 if (fflush(stdout) != 0 && err == NULL)
3689 err = got_error_from_errno("fflush");
3696 static const struct got_error *
3697 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
3698 struct got_repository *repo, const char *path, int show_changed_paths,
3699 int show_patch, const char *search_pattern, int diff_context, int limit,
3700 int log_branches, int reverse_display_order,
3701 struct got_reflist_object_id_map *refs_idmap)
3703 const struct got_error *err;
3704 struct got_commit_graph *graph;
3707 struct got_object_id_queue reversed_commits;
3708 struct got_object_qid *qid;
3709 struct got_commit_object *commit;
3710 struct got_pathlist_head changed_paths;
3711 struct got_pathlist_entry *pe;
3713 SIMPLEQ_INIT(&reversed_commits);
3714 TAILQ_INIT(&changed_paths);
3716 if (search_pattern && regcomp(®ex, search_pattern,
3717 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
3718 return got_error_msg(GOT_ERR_REGEX, search_pattern);
3720 err = got_commit_graph_open(&graph, path, !log_branches);
3723 err = got_commit_graph_iter_start(graph, root_id, repo,
3724 check_cancelled, NULL);
3728 struct got_object_id *id;
3730 if (sigint_received || sigpipe_received)
3733 err = got_commit_graph_iter_next(&id, graph, repo,
3734 check_cancelled, NULL);
3736 if (err->code == GOT_ERR_ITER_COMPLETED)
3743 err = got_object_open_as_commit(&commit, repo, id);
3747 if (show_changed_paths && !reverse_display_order) {
3748 err = get_changed_paths(&changed_paths, commit, repo);
3753 if (search_pattern) {
3754 err = match_logmsg(&have_match, id, commit, ®ex);
3756 got_object_commit_close(commit);
3759 if (have_match == 0 && show_changed_paths)
3760 match_changed_paths(&have_match,
3761 &changed_paths, ®ex);
3762 if (have_match == 0) {
3763 got_object_commit_close(commit);
3764 TAILQ_FOREACH(pe, &changed_paths, entry) {
3765 free((char *)pe->path);
3768 got_pathlist_free(&changed_paths);
3773 if (reverse_display_order) {
3774 err = got_object_qid_alloc(&qid, id);
3777 SIMPLEQ_INSERT_HEAD(&reversed_commits, qid, entry);
3778 got_object_commit_close(commit);
3780 err = print_commit(commit, id, repo, path,
3781 show_changed_paths ? &changed_paths : NULL,
3782 show_patch, diff_context, refs_idmap, NULL);
3783 got_object_commit_close(commit);
3787 if ((limit && --limit == 0) ||
3788 (end_id && got_object_id_cmp(id, end_id) == 0))
3791 TAILQ_FOREACH(pe, &changed_paths, entry) {
3792 free((char *)pe->path);
3795 got_pathlist_free(&changed_paths);
3797 if (reverse_display_order) {
3798 SIMPLEQ_FOREACH(qid, &reversed_commits, entry) {
3799 err = got_object_open_as_commit(&commit, repo, qid->id);
3802 if (show_changed_paths) {
3803 err = get_changed_paths(&changed_paths,
3808 err = print_commit(commit, qid->id, repo, path,
3809 show_changed_paths ? &changed_paths : NULL,
3810 show_patch, diff_context, refs_idmap, NULL);
3811 got_object_commit_close(commit);
3814 TAILQ_FOREACH(pe, &changed_paths, entry) {
3815 free((char *)pe->path);
3818 got_pathlist_free(&changed_paths);
3822 while (!SIMPLEQ_EMPTY(&reversed_commits)) {
3823 qid = SIMPLEQ_FIRST(&reversed_commits);
3824 SIMPLEQ_REMOVE_HEAD(&reversed_commits, entry);
3825 got_object_qid_free(qid);
3827 TAILQ_FOREACH(pe, &changed_paths, entry) {
3828 free((char *)pe->path);
3831 got_pathlist_free(&changed_paths);
3834 got_commit_graph_close(graph);
3841 fprintf(stderr, "usage: %s log [-b] [-c commit] [-C number] [ -l N ] "
3842 "[-p] [-P] [-x commit] [-s search-pattern] [-r repository-path] "
3843 "[-R] [path]\n", getprogname());
3848 get_default_log_limit(void)
3850 const char *got_default_log_limit;
3854 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
3855 if (got_default_log_limit == NULL)
3857 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
3863 static const struct got_error *
3864 cmd_log(int argc, char *argv[])
3866 const struct got_error *error;
3867 struct got_repository *repo = NULL;
3868 struct got_worktree *worktree = NULL;
3869 struct got_object_id *start_id = NULL, *end_id = NULL;
3870 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
3871 const char *start_commit = NULL, *end_commit = NULL;
3872 const char *search_pattern = NULL;
3873 int diff_context = -1, ch;
3874 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
3875 int reverse_display_order = 0;
3877 struct got_reflist_head refs;
3878 struct got_reflist_object_id_map *refs_idmap = NULL;
3883 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
3889 limit = get_default_log_limit();
3891 while ((ch = getopt(argc, argv, "bpPc:C:l:r:Rs:x:")) != -1) {
3897 show_changed_paths = 1;
3900 start_commit = optarg;
3903 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
3906 err(1, "-C option %s", errstr);
3909 limit = strtonum(optarg, 0, INT_MAX, &errstr);
3911 err(1, "-l option %s", errstr);
3917 repo_path = realpath(optarg, NULL);
3918 if (repo_path == NULL)
3919 return got_error_from_errno2("realpath",
3921 got_path_strip_trailing_slashes(repo_path);
3924 reverse_display_order = 1;
3927 search_pattern = optarg;
3930 end_commit = optarg;
3941 if (diff_context == -1)
3943 else if (!show_patch)
3944 errx(1, "-C requires -p");
3946 cwd = getcwd(NULL, 0);
3948 error = got_error_from_errno("getcwd");
3952 if (repo_path == NULL) {
3953 error = got_worktree_open(&worktree, cwd);
3954 if (error && error->code != GOT_ERR_NOT_WORKTREE)
3961 error = got_worktree_resolve_path(&path, worktree,
3966 path = strdup(argv[0]);
3968 error = got_error_from_errno("strdup");
3972 } else if (argc != 0)
3975 if (repo_path == NULL) {
3976 repo_path = worktree ?
3977 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
3979 if (repo_path == NULL) {
3980 error = got_error_from_errno("strdup");
3984 error = got_repo_open(&repo, repo_path, NULL);
3988 error = apply_unveil(got_repo_get_path(repo), 1,
3989 worktree ? got_worktree_get_root_path(worktree) : NULL);
3993 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
3997 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4001 if (start_commit == NULL) {
4002 struct got_reference *head_ref;
4003 struct got_commit_object *commit = NULL;
4004 error = got_ref_open(&head_ref, repo,
4005 worktree ? got_worktree_get_head_ref_name(worktree)
4009 error = got_ref_resolve(&start_id, repo, head_ref);
4010 got_ref_close(head_ref);
4013 error = got_object_open_as_commit(&commit, repo,
4017 got_object_commit_close(commit);
4019 error = got_repo_match_object_id(&start_id, NULL,
4020 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4024 if (end_commit != NULL) {
4025 error = got_repo_match_object_id(&end_id, NULL,
4026 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4033 * If a path was specified on the command line it was resolved
4034 * to a path in the work tree above. Prepend the work tree's
4035 * path prefix to obtain the corresponding in-repository path.
4039 prefix = got_worktree_get_path_prefix(worktree);
4040 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4041 (path[0] != '\0') ? "/" : "", path) == -1) {
4042 error = got_error_from_errno("asprintf");
4047 error = got_repo_map_path(&in_repo_path, repo,
4053 path = in_repo_path;
4056 error = print_commits(start_id, end_id, repo, path ? path : "",
4057 show_changed_paths, show_patch, search_pattern, diff_context,
4058 limit, log_branches, reverse_display_order, refs_idmap);
4064 got_worktree_close(worktree);
4066 const struct got_error *repo_error;
4067 repo_error = got_repo_close(repo);
4072 got_reflist_object_id_map_free(refs_idmap);
4073 got_ref_list_free(&refs);
4080 fprintf(stderr, "usage: %s diff [-a] [-C number] [-r repository-path] "
4081 "[-s] [-w] [object1 object2 | path]\n", getprogname());
4085 struct print_diff_arg {
4086 struct got_repository *repo;
4087 struct got_worktree *worktree;
4092 int ignore_whitespace;
4093 int force_text_diff;
4097 * Create a file which contains the target path of a symlink so we can feed
4098 * it as content to the diff engine.
4100 static const struct got_error *
4101 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4102 const char *abspath)
4104 const struct got_error *err = NULL;
4105 char target_path[PATH_MAX];
4106 ssize_t target_len, outlen;
4111 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4112 if (target_len == -1)
4113 return got_error_from_errno2("readlinkat", abspath);
4115 target_len = readlink(abspath, target_path, PATH_MAX);
4116 if (target_len == -1)
4117 return got_error_from_errno2("readlink", abspath);
4120 *fd = got_opentempfd();
4122 return got_error_from_errno("got_opentempfd");
4124 outlen = write(*fd, target_path, target_len);
4126 err = got_error_from_errno("got_opentempfd");
4130 if (lseek(*fd, 0, SEEK_SET) == -1) {
4131 err = got_error_from_errno2("lseek", abspath);
4142 static const struct got_error *
4143 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4144 const char *path, struct got_object_id *blob_id,
4145 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4146 int dirfd, const char *de_name)
4148 struct print_diff_arg *a = arg;
4149 const struct got_error *err = NULL;
4150 struct got_blob_object *blob1 = NULL;
4153 char *abspath = NULL, *label1 = NULL;
4156 if (a->diff_staged) {
4157 if (staged_status != GOT_STATUS_MODIFY &&
4158 staged_status != GOT_STATUS_ADD &&
4159 staged_status != GOT_STATUS_DELETE)
4162 if (staged_status == GOT_STATUS_DELETE)
4164 if (status == GOT_STATUS_NONEXISTENT)
4165 return got_error_set_errno(ENOENT, path);
4166 if (status != GOT_STATUS_MODIFY &&
4167 status != GOT_STATUS_ADD &&
4168 status != GOT_STATUS_DELETE &&
4169 status != GOT_STATUS_CONFLICT)
4173 if (!a->header_shown) {
4174 printf("diff %s %s%s\n", a->id_str,
4175 got_worktree_get_root_path(a->worktree),
4176 a->diff_staged ? " (staged changes)" : "");
4177 a->header_shown = 1;
4180 if (a->diff_staged) {
4181 const char *label1 = NULL, *label2 = NULL;
4182 switch (staged_status) {
4183 case GOT_STATUS_MODIFY:
4187 case GOT_STATUS_ADD:
4190 case GOT_STATUS_DELETE:
4194 return got_error(GOT_ERR_FILE_STATUS);
4196 return got_diff_objects_as_blobs(NULL, NULL, blob_id,
4197 staged_blob_id, label1, label2, a->diff_context,
4198 a->ignore_whitespace, a->force_text_diff, a->repo, stdout);
4201 if (staged_status == GOT_STATUS_ADD ||
4202 staged_status == GOT_STATUS_MODIFY) {
4204 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
4208 err = got_object_id_str(&id_str, staged_blob_id);
4211 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
4212 err = got_error_from_errno("asprintf");
4217 } else if (status != GOT_STATUS_ADD) {
4218 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192);
4223 if (status != GOT_STATUS_DELETE) {
4224 if (asprintf(&abspath, "%s/%s",
4225 got_worktree_get_root_path(a->worktree), path) == -1) {
4226 err = got_error_from_errno("asprintf");
4231 fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW);
4233 if (errno != ELOOP) {
4234 err = got_error_from_errno2("openat",
4238 err = get_symlink_target_file(&fd, dirfd,
4244 fd = open(abspath, O_RDONLY | O_NOFOLLOW);
4246 if (errno != ELOOP) {
4247 err = got_error_from_errno2("open",
4251 err = get_symlink_target_file(&fd, dirfd,
4257 if (fstat(fd, &sb) == -1) {
4258 err = got_error_from_errno2("fstat", abspath);
4261 f2 = fdopen(fd, "r");
4263 err = got_error_from_errno2("fdopen", abspath);
4270 err = got_diff_blob_file(blob1, label1, f2, sb.st_size, path,
4271 a->diff_context, a->ignore_whitespace, a->force_text_diff, stdout);
4274 got_object_blob_close(blob1);
4275 if (f2 && fclose(f2) == EOF && err == NULL)
4276 err = got_error_from_errno("fclose");
4277 if (fd != -1 && close(fd) == -1 && err == NULL)
4278 err = got_error_from_errno("close");
4283 static const struct got_error *
4284 cmd_diff(int argc, char *argv[])
4286 const struct got_error *error;
4287 struct got_repository *repo = NULL;
4288 struct got_worktree *worktree = NULL;
4289 char *cwd = NULL, *repo_path = NULL;
4290 struct got_object_id *id1 = NULL, *id2 = NULL;
4291 const char *id_str1 = NULL, *id_str2 = NULL;
4292 char *label1 = NULL, *label2 = NULL;
4294 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch;
4295 int force_text_diff = 0;
4298 struct got_reflist_head refs;
4303 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4308 while ((ch = getopt(argc, argv, "aC:r:sw")) != -1) {
4311 force_text_diff = 1;
4314 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4317 err(1, "-C option %s", errstr);
4320 repo_path = realpath(optarg, NULL);
4321 if (repo_path == NULL)
4322 return got_error_from_errno2("realpath",
4324 got_path_strip_trailing_slashes(repo_path);
4330 ignore_whitespace = 1;
4341 cwd = getcwd(NULL, 0);
4343 error = got_error_from_errno("getcwd");
4349 "-r option can't be used when diffing a work tree");
4350 error = got_worktree_open(&worktree, cwd);
4352 if (error->code == GOT_ERR_NOT_WORKTREE)
4353 error = wrap_not_worktree_error(error, "diff",
4357 repo_path = strdup(got_worktree_get_repo_path(worktree));
4358 if (repo_path == NULL) {
4359 error = got_error_from_errno("strdup");
4363 error = got_worktree_resolve_path(&path, worktree,
4370 error = got_error_from_errno("strdup");
4374 } else if (argc == 2) {
4376 errx(1, "-s option can't be used when diffing "
4377 "objects in repository");
4380 if (repo_path == NULL) {
4381 error = got_worktree_open(&worktree, cwd);
4382 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4384 repo_path = strdup(worktree ?
4385 got_worktree_get_repo_path(worktree) : cwd);
4386 if (repo_path == NULL) {
4387 error = got_error_from_errno("strdup");
4394 error = got_repo_open(&repo, repo_path, NULL);
4399 error = apply_unveil(got_repo_get_path(repo), 1,
4400 worktree ? got_worktree_get_root_path(worktree) : NULL);
4405 struct print_diff_arg arg;
4406 struct got_pathlist_head paths;
4411 error = got_object_id_str(&id_str,
4412 got_worktree_get_base_commit_id(worktree));
4416 arg.worktree = worktree;
4417 arg.diff_context = diff_context;
4418 arg.id_str = id_str;
4419 arg.header_shown = 0;
4420 arg.diff_staged = diff_staged;
4421 arg.ignore_whitespace = ignore_whitespace;
4422 arg.force_text_diff = force_text_diff;
4424 error = got_pathlist_append(&paths, path, NULL);
4428 error = got_worktree_status(worktree, &paths, repo, print_diff,
4429 &arg, check_cancelled, NULL);
4431 got_pathlist_free(&paths);
4435 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4439 error = got_repo_match_object_id(&id1, &label1, id_str1,
4440 GOT_OBJ_TYPE_ANY, &refs, repo);
4444 error = got_repo_match_object_id(&id2, &label2, id_str2,
4445 GOT_OBJ_TYPE_ANY, &refs, repo);
4449 error = got_object_get_type(&type1, repo, id1);
4453 error = got_object_get_type(&type2, repo, id2);
4457 if (type1 != type2) {
4458 error = got_error(GOT_ERR_OBJ_TYPE);
4463 case GOT_OBJ_TYPE_BLOB:
4464 error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
4465 NULL, NULL, diff_context, ignore_whitespace,
4466 force_text_diff, repo, stdout);
4468 case GOT_OBJ_TYPE_TREE:
4469 error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
4470 "", "", diff_context, ignore_whitespace, force_text_diff,
4473 case GOT_OBJ_TYPE_COMMIT:
4474 printf("diff %s %s\n", label1, label2);
4475 error = got_diff_objects_as_commits(NULL, NULL, id1, id2,
4476 diff_context, ignore_whitespace, force_text_diff, repo,
4480 error = got_error(GOT_ERR_OBJ_TYPE);
4489 got_worktree_close(worktree);
4491 const struct got_error *repo_error;
4492 repo_error = got_repo_close(repo);
4496 got_ref_list_free(&refs);
4504 "usage: %s blame [-c commit] [-r repository-path] path\n",
4513 char datebuf[11]; /* YYYY-MM-DD + NUL */
4516 struct blame_cb_args {
4517 struct blame_line *lines;
4521 off_t *line_offsets;
4523 struct got_repository *repo;
4526 static const struct got_error *
4527 blame_cb(void *arg, int nlines, int lineno, struct got_object_id *id)
4529 const struct got_error *err = NULL;
4530 struct blame_cb_args *a = arg;
4531 struct blame_line *bline;
4533 size_t linesize = 0;
4534 struct got_commit_object *commit = NULL;
4537 time_t committer_time;
4539 if (nlines != a->nlines ||
4540 (lineno != -1 && lineno < 1) || lineno > a->nlines)
4541 return got_error(GOT_ERR_RANGE);
4543 if (sigint_received)
4544 return got_error(GOT_ERR_ITER_COMPLETED);
4547 return NULL; /* no change in this commit */
4549 /* Annotate this line. */
4550 bline = &a->lines[lineno - 1];
4551 if (bline->annotated)
4553 err = got_object_id_str(&bline->id_str, id);
4557 err = got_object_open_as_commit(&commit, a->repo, id);
4561 bline->committer = strdup(got_object_commit_get_committer(commit));
4562 if (bline->committer == NULL) {
4563 err = got_error_from_errno("strdup");
4567 committer_time = got_object_commit_get_committer_time(commit);
4568 if (localtime_r(&committer_time, &tm) == NULL)
4569 return got_error_from_errno("localtime_r");
4570 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
4572 err = got_error(GOT_ERR_NO_SPACE);
4575 bline->annotated = 1;
4577 /* Print lines annotated so far. */
4578 bline = &a->lines[a->lineno_cur - 1];
4579 if (!bline->annotated)
4582 offset = a->line_offsets[a->lineno_cur - 1];
4583 if (fseeko(a->f, offset, SEEK_SET) == -1) {
4584 err = got_error_from_errno("fseeko");
4588 while (bline->annotated) {
4589 char *smallerthan, *at, *nl, *committer;
4592 if (getline(&line, &linesize, a->f) == -1) {
4594 err = got_error_from_errno("getline");
4598 committer = bline->committer;
4599 smallerthan = strchr(committer, '<');
4600 if (smallerthan && smallerthan[1] != '\0')
4601 committer = smallerthan + 1;
4602 at = strchr(committer, '@');
4605 len = strlen(committer);
4607 committer[8] = '\0';
4609 nl = strchr(line, '\n');
4612 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
4613 bline->id_str, bline->datebuf, committer, line);
4616 bline = &a->lines[a->lineno_cur - 1];
4620 got_object_commit_close(commit);
4625 static const struct got_error *
4626 cmd_blame(int argc, char *argv[])
4628 const struct got_error *error;
4629 struct got_repository *repo = NULL;
4630 struct got_worktree *worktree = NULL;
4631 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4632 char *link_target = NULL;
4633 struct got_object_id *obj_id = NULL;
4634 struct got_object_id *commit_id = NULL;
4635 struct got_blob_object *blob = NULL;
4636 char *commit_id_str = NULL;
4637 struct blame_cb_args bca;
4638 int ch, obj_type, i;
4641 memset(&bca, 0, sizeof(bca));
4644 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4649 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
4652 commit_id_str = optarg;
4655 repo_path = realpath(optarg, NULL);
4656 if (repo_path == NULL)
4657 return got_error_from_errno2("realpath",
4659 got_path_strip_trailing_slashes(repo_path);
4675 cwd = getcwd(NULL, 0);
4677 error = got_error_from_errno("getcwd");
4680 if (repo_path == NULL) {
4681 error = got_worktree_open(&worktree, cwd);
4682 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4688 strdup(got_worktree_get_repo_path(worktree));
4689 if (repo_path == NULL) {
4690 error = got_error_from_errno("strdup");
4695 repo_path = strdup(cwd);
4696 if (repo_path == NULL) {
4697 error = got_error_from_errno("strdup");
4703 error = got_repo_open(&repo, repo_path, NULL);
4708 const char *prefix = got_worktree_get_path_prefix(worktree);
4711 error = got_worktree_resolve_path(&p, worktree, path);
4714 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4715 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
4717 error = got_error_from_errno("asprintf");
4722 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4724 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
4727 error = got_repo_map_path(&in_repo_path, repo, path);
4732 if (commit_id_str == NULL) {
4733 struct got_reference *head_ref;
4734 error = got_ref_open(&head_ref, repo, worktree ?
4735 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
4738 error = got_ref_resolve(&commit_id, repo, head_ref);
4739 got_ref_close(head_ref);
4743 struct got_reflist_head refs;
4745 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
4749 error = got_repo_match_object_id(&commit_id, NULL,
4750 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4751 got_ref_list_free(&refs);
4756 error = got_object_resolve_symlinks(&link_target, in_repo_path,
4761 error = got_object_id_by_path(&obj_id, repo, commit_id,
4762 link_target ? link_target : in_repo_path);
4766 error = got_object_get_type(&obj_type, repo, obj_id);
4770 if (obj_type != GOT_OBJ_TYPE_BLOB) {
4771 error = got_error_path(link_target ? link_target : in_repo_path,
4776 error = got_object_open_as_blob(&blob, repo, obj_id, 8192);
4779 bca.f = got_opentemp();
4780 if (bca.f == NULL) {
4781 error = got_error_from_errno("got_opentemp");
4784 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
4785 &bca.line_offsets, bca.f, blob);
4786 if (error || bca.nlines == 0)
4789 /* Don't include \n at EOF in the blame line count. */
4790 if (bca.line_offsets[bca.nlines - 1] == filesize)
4793 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
4794 if (bca.lines == NULL) {
4795 error = got_error_from_errno("calloc");
4799 bca.nlines_prec = 0;
4807 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
4808 repo, blame_cb, &bca, check_cancelled, NULL);
4817 got_object_blob_close(blob);
4819 got_worktree_close(worktree);
4821 const struct got_error *repo_error;
4822 repo_error = got_repo_close(repo);
4827 for (i = 0; i < bca.nlines; i++) {
4828 struct blame_line *bline = &bca.lines[i];
4829 free(bline->id_str);
4830 free(bline->committer);
4834 free(bca.line_offsets);
4835 if (bca.f && fclose(bca.f) == EOF && error == NULL)
4836 error = got_error_from_errno("fclose");
4844 "usage: %s tree [-c commit] [-r repository-path] [-iR] [path]\n",
4849 static const struct got_error *
4850 print_entry(struct got_tree_entry *te, const char *id, const char *path,
4851 const char *root_path, struct got_repository *repo)
4853 const struct got_error *err = NULL;
4854 int is_root_path = (strcmp(path, root_path) == 0);
4855 const char *modestr = "";
4856 mode_t mode = got_tree_entry_get_mode(te);
4857 char *link_target = NULL;
4859 path += strlen(root_path);
4860 while (path[0] == '/')
4863 if (got_object_tree_entry_is_submodule(te))
4865 else if (S_ISLNK(mode)) {
4868 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
4871 for (i = 0; i < strlen(link_target); i++) {
4872 if (!isprint((unsigned char)link_target[i]))
4873 link_target[i] = '?';
4878 else if (S_ISDIR(mode))
4880 else if (mode & S_IXUSR)
4883 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
4884 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
4885 link_target ? " -> ": "", link_target ? link_target : "");
4891 static const struct got_error *
4892 print_tree(const char *path, struct got_object_id *commit_id,
4893 int show_ids, int recurse, const char *root_path,
4894 struct got_repository *repo)
4896 const struct got_error *err = NULL;
4897 struct got_object_id *tree_id = NULL;
4898 struct got_tree_object *tree = NULL;
4901 err = got_object_id_by_path(&tree_id, repo, commit_id, path);
4905 err = got_object_open_as_tree(&tree, repo, tree_id);
4908 nentries = got_object_tree_get_nentries(tree);
4909 for (i = 0; i < nentries; i++) {
4910 struct got_tree_entry *te;
4913 if (sigint_received || sigpipe_received)
4916 te = got_object_tree_get_entry(tree, i);
4919 err = got_object_id_str(&id_str,
4920 got_tree_entry_get_id(te));
4923 if (asprintf(&id, "%s ", id_str) == -1) {
4924 err = got_error_from_errno("asprintf");
4930 err = print_entry(te, id, path, root_path, repo);
4935 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
4937 if (asprintf(&child_path, "%s%s%s", path,
4938 path[0] == '/' && path[1] == '\0' ? "" : "/",
4939 got_tree_entry_get_name(te)) == -1) {
4940 err = got_error_from_errno("asprintf");
4943 err = print_tree(child_path, commit_id, show_ids, 1,
4952 got_object_tree_close(tree);
4957 static const struct got_error *
4958 cmd_tree(int argc, char *argv[])
4960 const struct got_error *error;
4961 struct got_repository *repo = NULL;
4962 struct got_worktree *worktree = NULL;
4963 const char *path, *refname = NULL;
4964 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
4965 struct got_object_id *commit_id = NULL;
4966 char *commit_id_str = NULL;
4967 int show_ids = 0, recurse = 0;
4971 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4976 while ((ch = getopt(argc, argv, "c:r:iR")) != -1) {
4979 commit_id_str = optarg;
4982 repo_path = realpath(optarg, NULL);
4983 if (repo_path == NULL)
4984 return got_error_from_errno2("realpath",
4986 got_path_strip_trailing_slashes(repo_path);
5010 cwd = getcwd(NULL, 0);
5012 error = got_error_from_errno("getcwd");
5015 if (repo_path == NULL) {
5016 error = got_worktree_open(&worktree, cwd);
5017 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5023 strdup(got_worktree_get_repo_path(worktree));
5024 if (repo_path == NULL)
5025 error = got_error_from_errno("strdup");
5029 repo_path = strdup(cwd);
5030 if (repo_path == NULL) {
5031 error = got_error_from_errno("strdup");
5037 error = got_repo_open(&repo, repo_path, NULL);
5042 const char *prefix = got_worktree_get_path_prefix(worktree);
5047 error = got_worktree_resolve_path(&p, worktree, path);
5050 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5051 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5053 error = got_error_from_errno("asprintf");
5058 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5062 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5067 error = got_repo_map_path(&in_repo_path, repo, path);
5072 if (commit_id_str == NULL) {
5073 struct got_reference *head_ref;
5075 refname = got_worktree_get_head_ref_name(worktree);
5077 refname = GOT_REF_HEAD;
5078 error = got_ref_open(&head_ref, repo, refname, 0);
5081 error = got_ref_resolve(&commit_id, repo, head_ref);
5082 got_ref_close(head_ref);
5086 struct got_reflist_head refs;
5088 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5092 error = got_repo_match_object_id(&commit_id, NULL,
5093 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5094 got_ref_list_free(&refs);
5099 error = print_tree(in_repo_path, commit_id, show_ids, recurse,
5100 in_repo_path, repo);
5107 got_worktree_close(worktree);
5109 const struct got_error *repo_error;
5110 repo_error = got_repo_close(repo);
5120 fprintf(stderr, "usage: %s status [-s status-codes ] [path ...]\n",
5125 static const struct got_error *
5126 print_status(void *arg, unsigned char status, unsigned char staged_status,
5127 const char *path, struct got_object_id *blob_id,
5128 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
5129 int dirfd, const char *de_name)
5131 if (status == staged_status && (status == GOT_STATUS_DELETE))
5132 status = GOT_STATUS_NO_CHANGE;
5134 char *status_codes = arg;
5135 size_t ncodes = strlen(status_codes);
5137 for (i = 0; i < ncodes ; i++) {
5138 if (status == status_codes[i] ||
5139 staged_status == status_codes[i])
5145 printf("%c%c %s\n", status, staged_status, path);
5149 static const struct got_error *
5150 cmd_status(int argc, char *argv[])
5152 const struct got_error *error = NULL;
5153 struct got_repository *repo = NULL;
5154 struct got_worktree *worktree = NULL;
5155 char *cwd = NULL, *status_codes = NULL;;
5156 struct got_pathlist_head paths;
5157 struct got_pathlist_entry *pe;
5162 while ((ch = getopt(argc, argv, "s:")) != -1) {
5165 for (i = 0; i < strlen(optarg); i++) {
5166 switch (optarg[i]) {
5167 case GOT_STATUS_MODIFY:
5168 case GOT_STATUS_ADD:
5169 case GOT_STATUS_DELETE:
5170 case GOT_STATUS_CONFLICT:
5171 case GOT_STATUS_MISSING:
5172 case GOT_STATUS_OBSTRUCTED:
5173 case GOT_STATUS_UNVERSIONED:
5174 case GOT_STATUS_MODE_CHANGE:
5175 case GOT_STATUS_NONEXISTENT:
5178 errx(1, "invalid status code '%c'",
5182 status_codes = optarg;
5194 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5198 cwd = getcwd(NULL, 0);
5200 error = got_error_from_errno("getcwd");
5204 error = got_worktree_open(&worktree, cwd);
5206 if (error->code == GOT_ERR_NOT_WORKTREE)
5207 error = wrap_not_worktree_error(error, "status", cwd);
5211 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
5216 error = apply_unveil(got_repo_get_path(repo), 1,
5217 got_worktree_get_root_path(worktree));
5221 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
5225 error = got_worktree_status(worktree, &paths, repo, print_status,
5226 status_codes, check_cancelled, NULL);
5228 TAILQ_FOREACH(pe, &paths, entry)
5229 free((char *)pe->path);
5230 got_pathlist_free(&paths);
5239 "usage: %s ref [-r repository] [-l] [-c object] [-s reference] "
5245 static const struct got_error *
5246 list_refs(struct got_repository *repo, const char *refname)
5248 static const struct got_error *err = NULL;
5249 struct got_reflist_head refs;
5250 struct got_reflist_entry *re;
5253 err = got_ref_list(&refs, repo, refname, got_ref_cmp_by_name, NULL);
5257 TAILQ_FOREACH(re, &refs, entry) {
5259 refstr = got_ref_to_str(re->ref);
5261 return got_error_from_errno("got_ref_to_str");
5262 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
5266 got_ref_list_free(&refs);
5270 static const struct got_error *
5271 delete_ref(struct got_repository *repo, const char *refname)
5273 const struct got_error *err = NULL;
5274 struct got_reference *ref;
5276 err = got_ref_open(&ref, repo, refname, 0);
5280 err = got_ref_delete(ref, repo);
5285 static const struct got_error *
5286 add_ref(struct got_repository *repo, const char *refname, const char *target)
5288 const struct got_error *err = NULL;
5289 struct got_object_id *id;
5290 struct got_reference *ref = NULL;
5293 * Don't let the user create a reference name with a leading '-'.
5294 * While technically a valid reference name, this case is usually
5295 * an unintended typo.
5297 if (refname[0] == '-')
5298 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5300 err = got_repo_match_object_id_prefix(&id, target, GOT_OBJ_TYPE_ANY,
5303 struct got_reference *target_ref;
5305 if (err->code != GOT_ERR_BAD_OBJ_ID_STR)
5307 err = got_ref_open(&target_ref, repo, target, 0);
5310 err = got_ref_resolve(&id, repo, target_ref);
5311 got_ref_close(target_ref);
5316 err = got_ref_alloc(&ref, refname, id);
5320 err = got_ref_write(ref, repo);
5328 static const struct got_error *
5329 add_symref(struct got_repository *repo, const char *refname, const char *target)
5331 const struct got_error *err = NULL;
5332 struct got_reference *ref = NULL;
5333 struct got_reference *target_ref = NULL;
5336 * Don't let the user create a reference name with a leading '-'.
5337 * While technically a valid reference name, this case is usually
5338 * an unintended typo.
5340 if (refname[0] == '-')
5341 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
5343 err = got_ref_open(&target_ref, repo, target, 0);
5347 err = got_ref_alloc_symref(&ref, refname, target_ref);
5351 err = got_ref_write(ref, repo);
5354 got_ref_close(target_ref);
5360 static const struct got_error *
5361 cmd_ref(int argc, char *argv[])
5363 const struct got_error *error = NULL;
5364 struct got_repository *repo = NULL;
5365 struct got_worktree *worktree = NULL;
5366 char *cwd = NULL, *repo_path = NULL;
5367 int ch, do_list = 0, do_delete = 0;
5368 const char *obj_arg = NULL, *symref_target= NULL;
5369 char *refname = NULL;
5371 while ((ch = getopt(argc, argv, "c:dr:ls:")) != -1) {
5380 repo_path = realpath(optarg, NULL);
5381 if (repo_path == NULL)
5382 return got_error_from_errno2("realpath",
5384 got_path_strip_trailing_slashes(repo_path);
5390 symref_target = optarg;
5398 if (obj_arg && do_list)
5399 option_conflict('c', 'l');
5400 if (obj_arg && do_delete)
5401 option_conflict('c', 'd');
5402 if (obj_arg && symref_target)
5403 option_conflict('c', 's');
5404 if (symref_target && do_delete)
5405 option_conflict('s', 'd');
5406 if (symref_target && do_list)
5407 option_conflict('s', 'l');
5408 if (do_delete && do_list)
5409 option_conflict('d', 'l');
5415 if (argc != 0 && argc != 1)
5418 refname = strdup(argv[0]);
5419 if (refname == NULL) {
5420 error = got_error_from_errno("strdup");
5427 refname = strdup(argv[0]);
5428 if (refname == NULL) {
5429 error = got_error_from_errno("strdup");
5435 got_path_strip_trailing_slashes(refname);
5439 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5443 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5444 "sendfd unveil", NULL) == -1)
5448 cwd = getcwd(NULL, 0);
5450 error = got_error_from_errno("getcwd");
5454 if (repo_path == NULL) {
5455 error = got_worktree_open(&worktree, cwd);
5456 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5462 strdup(got_worktree_get_repo_path(worktree));
5463 if (repo_path == NULL)
5464 error = got_error_from_errno("strdup");
5468 repo_path = strdup(cwd);
5469 if (repo_path == NULL) {
5470 error = got_error_from_errno("strdup");
5476 error = got_repo_open(&repo, repo_path, NULL);
5480 error = apply_unveil(got_repo_get_path(repo), do_list,
5481 worktree ? got_worktree_get_root_path(worktree) : NULL);
5486 error = list_refs(repo, refname);
5488 error = delete_ref(repo, refname);
5489 else if (symref_target)
5490 error = add_symref(repo, refname, symref_target);
5492 if (obj_arg == NULL)
5494 error = add_ref(repo, refname, obj_arg);
5499 got_repo_close(repo);
5501 got_worktree_close(worktree);
5511 "usage: %s branch [-c commit] [-d] [-r repository] [-l] [-n] "
5512 "[name]\n", getprogname());
5516 static const struct got_error *
5517 list_branch(struct got_repository *repo, struct got_worktree *worktree,
5518 struct got_reference *ref)
5520 const struct got_error *err = NULL;
5521 const char *refname, *marker = " ";
5524 refname = got_ref_get_name(ref);
5525 if (worktree && strcmp(refname,
5526 got_worktree_get_head_ref_name(worktree)) == 0) {
5527 struct got_object_id *id = NULL;
5529 err = got_ref_resolve(&id, repo, ref);
5532 if (got_object_id_cmp(id,
5533 got_worktree_get_base_commit_id(worktree)) == 0)
5540 if (strncmp(refname, "refs/heads/", 11) == 0)
5542 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
5544 if (strncmp(refname, "refs/remotes/", 13) == 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);
5618 err = got_ref_list(&refs, repo, "refs/remotes",
5619 got_ref_cmp_by_name, NULL);
5623 TAILQ_FOREACH(re, &refs, entry)
5624 list_branch(repo, worktree, re->ref);
5626 got_ref_list_free(&refs);
5631 static const struct got_error *
5632 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
5633 const char *branch_name)
5635 const struct got_error *err = NULL;
5636 struct got_reference *ref = NULL;
5639 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
5640 return got_error_from_errno("asprintf");
5642 err = got_ref_open(&ref, repo, refname, 0);
5647 strcmp(got_worktree_get_head_ref_name(worktree),
5648 got_ref_get_name(ref)) == 0) {
5649 err = got_error_msg(GOT_ERR_SAME_BRANCH,
5650 "will not delete this work tree's current branch");
5654 err = got_ref_delete(ref, repo);
5662 static const struct got_error *
5663 add_branch(struct got_repository *repo, const char *branch_name,
5664 struct got_object_id *base_commit_id)
5666 const struct got_error *err = NULL;
5667 struct got_reference *ref = NULL;
5668 char *base_refname = NULL, *refname = NULL;
5671 * Don't let the user create a branch name with a leading '-'.
5672 * While technically a valid reference name, this case is usually
5673 * an unintended typo.
5675 if (branch_name[0] == '-')
5676 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
5678 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
5679 err = got_error_from_errno("asprintf");
5683 err = got_ref_open(&ref, repo, refname, 0);
5685 err = got_error(GOT_ERR_BRANCH_EXISTS);
5687 } else if (err->code != GOT_ERR_NOT_REF)
5690 err = got_ref_alloc(&ref, refname, base_commit_id);
5694 err = got_ref_write(ref, repo);
5703 static const struct got_error *
5704 cmd_branch(int argc, char *argv[])
5706 const struct got_error *error = NULL;
5707 struct got_repository *repo = NULL;
5708 struct got_worktree *worktree = NULL;
5709 char *cwd = NULL, *repo_path = NULL;
5710 int ch, do_list = 0, do_show = 0, do_update = 1;
5711 const char *delref = NULL, *commit_id_arg = NULL;
5712 struct got_reference *ref = NULL;
5713 struct got_pathlist_head paths;
5714 struct got_pathlist_entry *pe;
5715 struct got_object_id *commit_id = NULL;
5716 char *commit_id_str = NULL;
5720 while ((ch = getopt(argc, argv, "c:d:r:ln")) != -1) {
5723 commit_id_arg = optarg;
5729 repo_path = realpath(optarg, NULL);
5730 if (repo_path == NULL)
5731 return got_error_from_errno2("realpath",
5733 got_path_strip_trailing_slashes(repo_path);
5747 if (do_list && delref)
5748 option_conflict('l', 'd');
5753 if (!do_list && !delref && argc == 0)
5756 if ((do_list || delref || do_show) && commit_id_arg != NULL)
5757 errx(1, "-c option can only be used when creating a branch");
5759 if (do_list || delref) {
5762 } else if (!do_show && argc != 1)
5766 if (do_list || do_show) {
5767 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
5771 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
5772 "sendfd unveil", NULL) == -1)
5776 cwd = getcwd(NULL, 0);
5778 error = got_error_from_errno("getcwd");
5782 if (repo_path == NULL) {
5783 error = got_worktree_open(&worktree, cwd);
5784 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5790 strdup(got_worktree_get_repo_path(worktree));
5791 if (repo_path == NULL)
5792 error = got_error_from_errno("strdup");
5796 repo_path = strdup(cwd);
5797 if (repo_path == NULL) {
5798 error = got_error_from_errno("strdup");
5804 error = got_repo_open(&repo, repo_path, NULL);
5808 error = apply_unveil(got_repo_get_path(repo), do_list,
5809 worktree ? got_worktree_get_root_path(worktree) : NULL);
5814 error = show_current_branch(repo, worktree);
5816 error = list_branches(repo, worktree);
5818 error = delete_branch(repo, worktree, delref);
5820 struct got_reflist_head refs;
5822 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5826 if (commit_id_arg == NULL)
5827 commit_id_arg = worktree ?
5828 got_worktree_get_head_ref_name(worktree) :
5830 error = got_repo_match_object_id(&commit_id, NULL,
5831 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5832 got_ref_list_free(&refs);
5835 error = add_branch(repo, argv[0], commit_id);
5838 if (worktree && do_update) {
5839 struct got_update_progress_arg upa;
5840 char *branch_refname = NULL;
5842 error = got_object_id_str(&commit_id_str, commit_id);
5845 error = get_worktree_paths_from_argv(&paths, 0, NULL,
5849 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
5851 error = got_error_from_errno("asprintf");
5854 error = got_ref_open(&ref, repo, branch_refname, 0);
5855 free(branch_refname);
5858 error = switch_head_ref(ref, commit_id, worktree,
5862 error = got_worktree_set_base_commit_id(worktree, repo,
5866 memset(&upa, 0, sizeof(upa));
5867 error = got_worktree_checkout_files(worktree, &paths,
5868 repo, update_progress, &upa, check_cancelled,
5872 if (upa.did_something)
5873 printf("Updated to commit %s\n", commit_id_str);
5874 print_update_progress_stats(&upa);
5881 got_repo_close(repo);
5883 got_worktree_close(worktree);
5887 free(commit_id_str);
5888 TAILQ_FOREACH(pe, &paths, entry)
5889 free((char *)pe->path);
5890 got_pathlist_free(&paths);
5899 "usage: %s tag [-c commit] [-r repository] [-l] "
5900 "[-m message] name\n", getprogname());
5905 static const struct got_error *
5906 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
5908 const struct got_error *err = NULL;
5909 struct got_reflist_entry *re, *se, *new;
5910 struct got_object_id *re_id, *se_id;
5911 struct got_tag_object *re_tag, *se_tag;
5912 time_t re_time, se_time;
5914 SIMPLEQ_FOREACH(re, tags, entry) {
5915 se = SIMPLEQ_FIRST(sorted);
5917 err = got_reflist_entry_dup(&new, re);
5920 SIMPLEQ_INSERT_HEAD(sorted, new, entry);
5923 err = got_ref_resolve(&re_id, repo, re->ref);
5926 err = got_object_open_as_tag(&re_tag, repo, re_id);
5930 re_time = got_object_tag_get_tagger_time(re_tag);
5931 got_object_tag_close(re_tag);
5935 err = got_ref_resolve(&se_id, repo, re->ref);
5938 err = got_object_open_as_tag(&se_tag, repo, se_id);
5942 se_time = got_object_tag_get_tagger_time(se_tag);
5943 got_object_tag_close(se_tag);
5945 if (se_time > re_time) {
5946 err = got_reflist_entry_dup(&new, re);
5949 SIMPLEQ_INSERT_AFTER(sorted, se, new, entry);
5952 se = SIMPLEQ_NEXT(se, entry);
5961 static const struct got_error *
5962 list_tags(struct got_repository *repo, struct got_worktree *worktree)
5964 static const struct got_error *err = NULL;
5965 struct got_reflist_head refs;
5966 struct got_reflist_entry *re;
5970 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
5974 TAILQ_FOREACH(re, &refs, entry) {
5975 const char *refname;
5976 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
5980 struct got_object_id *id;
5981 struct got_tag_object *tag;
5982 struct got_commit_object *commit = NULL;
5984 refname = got_ref_get_name(re->ref);
5985 if (strncmp(refname, "refs/tags/", 10) != 0)
5988 refstr = got_ref_to_str(re->ref);
5989 if (refstr == NULL) {
5990 err = got_error_from_errno("got_ref_to_str");
5993 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
5996 err = got_ref_resolve(&id, repo, re->ref);
5999 err = got_object_open_as_tag(&tag, repo, id);
6001 if (err->code != GOT_ERR_OBJ_TYPE) {
6005 /* "lightweight" tag */
6006 err = got_object_open_as_commit(&commit, repo, id);
6011 tagger = got_object_commit_get_committer(commit);
6013 got_object_commit_get_committer_time(commit);
6014 err = got_object_id_str(&id_str, id);
6020 tagger = got_object_tag_get_tagger(tag);
6021 tagger_time = got_object_tag_get_tagger_time(tag);
6022 err = got_object_id_str(&id_str,
6023 got_object_tag_get_object_id(tag));
6027 printf("from: %s\n", tagger);
6028 datestr = get_datestr(&tagger_time, datebuf);
6030 printf("date: %s UTC\n", datestr);
6032 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
6034 switch (got_object_tag_get_object_type(tag)) {
6035 case GOT_OBJ_TYPE_BLOB:
6036 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
6039 case GOT_OBJ_TYPE_TREE:
6040 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
6043 case GOT_OBJ_TYPE_COMMIT:
6044 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
6047 case GOT_OBJ_TYPE_TAG:
6048 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
6057 err = got_object_commit_get_logmsg(&tagmsg0, commit);
6060 got_object_commit_close(commit);
6062 tagmsg0 = strdup(got_object_tag_get_message(tag));
6063 got_object_tag_close(tag);
6064 if (tagmsg0 == NULL) {
6065 err = got_error_from_errno("strdup");
6072 line = strsep(&tagmsg, "\n");
6074 printf(" %s\n", line);
6079 got_ref_list_free(&refs);
6083 static const struct got_error *
6084 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
6085 const char *tag_name, const char *repo_path)
6087 const struct got_error *err = NULL;
6088 char *template = NULL, *initial_content = NULL;
6089 char *editor = NULL;
6090 int initial_content_len;
6093 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
6094 err = got_error_from_errno("asprintf");
6098 initial_content_len = asprintf(&initial_content,
6099 "\n# tagging commit %s as %s\n",
6100 commit_id_str, tag_name);
6101 if (initial_content_len == -1) {
6102 err = got_error_from_errno("asprintf");
6106 err = got_opentemp_named_fd(tagmsg_path, &fd, template);
6110 if (write(fd, initial_content, initial_content_len) == -1) {
6111 err = got_error_from_errno2("write", *tagmsg_path);
6115 err = get_editor(&editor);
6118 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
6119 initial_content_len, 1);
6121 free(initial_content);
6125 if (fd != -1 && close(fd) == -1 && err == NULL)
6126 err = got_error_from_errno2("close", *tagmsg_path);
6128 /* Editor is done; we can now apply unveil(2) */
6130 err = apply_unveil(repo_path, 0, NULL);
6138 static const struct got_error *
6139 add_tag(struct got_repository *repo, struct got_worktree *worktree,
6140 const char *tag_name, const char *commit_arg, const char *tagmsg_arg)
6142 const struct got_error *err = NULL;
6143 struct got_object_id *commit_id = NULL, *tag_id = NULL;
6144 char *label = NULL, *commit_id_str = NULL;
6145 struct got_reference *ref = NULL;
6146 char *refname = NULL, *tagmsg = NULL, *tagger = NULL;
6147 char *tagmsg_path = NULL, *tag_id_str = NULL;
6148 int preserve_tagmsg = 0;
6149 struct got_reflist_head refs;
6154 * Don't let the user create a tag name with a leading '-'.
6155 * While technically a valid reference name, this case is usually
6156 * an unintended typo.
6158 if (tag_name[0] == '-')
6159 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
6161 err = get_author(&tagger, repo, worktree);
6165 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6169 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
6170 GOT_OBJ_TYPE_COMMIT, &refs, repo);
6174 err = got_object_id_str(&commit_id_str, commit_id);
6178 if (strncmp("refs/tags/", tag_name, 10) == 0) {
6179 refname = strdup(tag_name);
6180 if (refname == NULL) {
6181 err = got_error_from_errno("strdup");
6185 } else if (asprintf(&refname, "refs/tags/%s", tag_name) == -1) {
6186 err = got_error_from_errno("asprintf");
6190 err = got_ref_open(&ref, repo, refname, 0);
6192 err = got_error(GOT_ERR_TAG_EXISTS);
6194 } else if (err->code != GOT_ERR_NOT_REF)
6197 if (tagmsg_arg == NULL) {
6198 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
6199 tag_name, got_repo_get_path(repo));
6201 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
6202 tagmsg_path != NULL)
6203 preserve_tagmsg = 1;
6208 err = got_object_tag_create(&tag_id, tag_name, commit_id,
6209 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, repo);
6212 preserve_tagmsg = 1;
6216 err = got_ref_alloc(&ref, refname, tag_id);
6219 preserve_tagmsg = 1;
6223 err = got_ref_write(ref, repo);
6226 preserve_tagmsg = 1;
6230 err = got_object_id_str(&tag_id_str, tag_id);
6233 preserve_tagmsg = 1;
6236 printf("Created tag %s\n", tag_id_str);
6238 if (preserve_tagmsg) {
6239 fprintf(stderr, "%s: tag message preserved in %s\n",
6240 getprogname(), tagmsg_path);
6241 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
6242 err = got_error_from_errno2("unlink", tagmsg_path);
6247 free(commit_id_str);
6252 got_ref_list_free(&refs);
6256 static const struct got_error *
6257 cmd_tag(int argc, char *argv[])
6259 const struct got_error *error = NULL;
6260 struct got_repository *repo = NULL;
6261 struct got_worktree *worktree = NULL;
6262 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
6263 char *gitconfig_path = NULL;
6264 const char *tag_name, *commit_id_arg = NULL, *tagmsg = NULL;
6265 int ch, do_list = 0;
6267 while ((ch = getopt(argc, argv, "c:m:r:l")) != -1) {
6270 commit_id_arg = optarg;
6276 repo_path = realpath(optarg, NULL);
6277 if (repo_path == NULL)
6278 return got_error_from_errno2("realpath",
6280 got_path_strip_trailing_slashes(repo_path);
6295 if (commit_id_arg != NULL)
6297 "-c option can only be used when creating a tag");
6299 option_conflict('l', 'm');
6302 } else if (argc != 1)
6309 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6313 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6314 "sendfd unveil", NULL) == -1)
6318 cwd = getcwd(NULL, 0);
6320 error = got_error_from_errno("getcwd");
6324 if (repo_path == NULL) {
6325 error = got_worktree_open(&worktree, cwd);
6326 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6332 strdup(got_worktree_get_repo_path(worktree));
6333 if (repo_path == NULL)
6334 error = got_error_from_errno("strdup");
6338 repo_path = strdup(cwd);
6339 if (repo_path == NULL) {
6340 error = got_error_from_errno("strdup");
6347 error = got_repo_open(&repo, repo_path, NULL);
6350 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6353 error = list_tags(repo, worktree);
6355 error = get_gitconfig_path(&gitconfig_path);
6358 error = got_repo_open(&repo, repo_path, gitconfig_path);
6363 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
6368 if (commit_id_arg == NULL) {
6369 struct got_reference *head_ref;
6370 struct got_object_id *commit_id;
6371 error = got_ref_open(&head_ref, repo,
6372 worktree ? got_worktree_get_head_ref_name(worktree)
6376 error = got_ref_resolve(&commit_id, repo, head_ref);
6377 got_ref_close(head_ref);
6380 error = got_object_id_str(&commit_id_str, commit_id);
6386 error = add_tag(repo, worktree, tag_name,
6387 commit_id_str ? commit_id_str : commit_id_arg, tagmsg);
6391 got_repo_close(repo);
6393 got_worktree_close(worktree);
6396 free(gitconfig_path);
6397 free(commit_id_str);
6404 fprintf(stderr, "usage: %s add [-R] [-I] path ...\n",
6409 static const struct got_error *
6410 add_progress(void *arg, unsigned char status, const char *path)
6412 while (path[0] == '/')
6414 printf("%c %s\n", status, path);
6418 static const struct got_error *
6419 cmd_add(int argc, char *argv[])
6421 const struct got_error *error = NULL;
6422 struct got_repository *repo = NULL;
6423 struct got_worktree *worktree = NULL;
6425 struct got_pathlist_head paths;
6426 struct got_pathlist_entry *pe;
6427 int ch, can_recurse = 0, no_ignores = 0;
6431 while ((ch = getopt(argc, argv, "IR")) != -1) {
6449 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6456 cwd = getcwd(NULL, 0);
6458 error = got_error_from_errno("getcwd");
6462 error = got_worktree_open(&worktree, cwd);
6464 if (error->code == GOT_ERR_NOT_WORKTREE)
6465 error = wrap_not_worktree_error(error, "add", cwd);
6469 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6474 error = apply_unveil(got_repo_get_path(repo), 1,
6475 got_worktree_get_root_path(worktree));
6479 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6483 if (!can_recurse && no_ignores) {
6484 error = got_error_msg(GOT_ERR_BAD_PATH,
6485 "disregarding ignores requires -R option");
6493 TAILQ_FOREACH(pe, &paths, entry) {
6494 if (asprintf(&ondisk_path, "%s/%s",
6495 got_worktree_get_root_path(worktree),
6497 error = got_error_from_errno("asprintf");
6500 if (lstat(ondisk_path, &sb) == -1) {
6501 if (errno == ENOENT) {
6505 error = got_error_from_errno2("lstat",
6511 if (S_ISDIR(sb.st_mode)) {
6512 error = got_error_msg(GOT_ERR_BAD_PATH,
6513 "adding directories requires -R option");
6519 error = got_worktree_schedule_add(worktree, &paths, add_progress,
6520 NULL, repo, no_ignores);
6523 got_repo_close(repo);
6525 got_worktree_close(worktree);
6526 TAILQ_FOREACH(pe, &paths, entry)
6527 free((char *)pe->path);
6528 got_pathlist_free(&paths);
6536 fprintf(stderr, "usage: %s remove [-f] [-k] [-R] [-s status-codes] "
6537 "path ...\n", getprogname());
6541 static const struct got_error *
6542 print_remove_status(void *arg, unsigned char status,
6543 unsigned char staged_status, const char *path)
6545 while (path[0] == '/')
6547 if (status == GOT_STATUS_NONEXISTENT)
6549 if (status == staged_status && (status == GOT_STATUS_DELETE))
6550 status = GOT_STATUS_NO_CHANGE;
6551 printf("%c%c %s\n", status, staged_status, path);
6555 static const struct got_error *
6556 cmd_remove(int argc, char *argv[])
6558 const struct got_error *error = NULL;
6559 struct got_worktree *worktree = NULL;
6560 struct got_repository *repo = NULL;
6561 const char *status_codes = NULL;
6563 struct got_pathlist_head paths;
6564 struct got_pathlist_entry *pe;
6565 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
6569 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
6572 delete_local_mods = 1;
6581 for (i = 0; i < strlen(optarg); i++) {
6582 switch (optarg[i]) {
6583 case GOT_STATUS_MODIFY:
6584 delete_local_mods = 1;
6586 case GOT_STATUS_MISSING:
6589 errx(1, "invalid status code '%c'",
6593 status_codes = optarg;
6605 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6612 cwd = getcwd(NULL, 0);
6614 error = got_error_from_errno("getcwd");
6617 error = got_worktree_open(&worktree, cwd);
6619 if (error->code == GOT_ERR_NOT_WORKTREE)
6620 error = wrap_not_worktree_error(error, "remove", cwd);
6624 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6629 error = apply_unveil(got_repo_get_path(repo), 1,
6630 got_worktree_get_root_path(worktree));
6634 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6641 TAILQ_FOREACH(pe, &paths, entry) {
6642 if (asprintf(&ondisk_path, "%s/%s",
6643 got_worktree_get_root_path(worktree),
6645 error = got_error_from_errno("asprintf");
6648 if (lstat(ondisk_path, &sb) == -1) {
6649 if (errno == ENOENT) {
6653 error = got_error_from_errno2("lstat",
6659 if (S_ISDIR(sb.st_mode)) {
6660 error = got_error_msg(GOT_ERR_BAD_PATH,
6661 "removing directories requires -R option");
6667 error = got_worktree_schedule_delete(worktree, &paths,
6668 delete_local_mods, status_codes, print_remove_status, NULL,
6669 repo, keep_on_disk);
6672 got_repo_close(repo);
6674 got_worktree_close(worktree);
6675 TAILQ_FOREACH(pe, &paths, entry)
6676 free((char *)pe->path);
6677 got_pathlist_free(&paths);
6685 fprintf(stderr, "usage: %s revert [-p] [-F response-script] [-R] "
6686 "path ...\n", getprogname());
6690 static const struct got_error *
6691 revert_progress(void *arg, unsigned char status, const char *path)
6693 if (status == GOT_STATUS_UNVERSIONED)
6696 while (path[0] == '/')
6698 printf("%c %s\n", status, path);
6702 struct choose_patch_arg {
6703 FILE *patch_script_file;
6707 static const struct got_error *
6708 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
6709 int nchanges, const char *action)
6712 size_t linesize = 0;
6716 case GOT_STATUS_ADD:
6717 printf("A %s\n%s this addition? [y/n] ", path, action);
6719 case GOT_STATUS_DELETE:
6720 printf("D %s\n%s this deletion? [y/n] ", path, action);
6722 case GOT_STATUS_MODIFY:
6723 if (fseek(patch_file, 0L, SEEK_SET) == -1)
6724 return got_error_from_errno("fseek");
6725 printf(GOT_COMMIT_SEP_STR);
6726 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
6728 if (ferror(patch_file))
6729 return got_error_from_errno("getline");
6730 printf(GOT_COMMIT_SEP_STR);
6731 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
6732 path, n, nchanges, action);
6735 return got_error_path(path, GOT_ERR_FILE_STATUS);
6741 static const struct got_error *
6742 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
6743 FILE *patch_file, int n, int nchanges)
6745 const struct got_error *err = NULL;
6747 size_t linesize = 0;
6750 struct choose_patch_arg *a = arg;
6752 *choice = GOT_PATCH_CHOICE_NONE;
6754 if (a->patch_script_file) {
6756 err = show_change(status, path, patch_file, n, nchanges,
6760 linelen = getline(&line, &linesize, a->patch_script_file);
6761 if (linelen == -1) {
6762 if (ferror(a->patch_script_file))
6763 return got_error_from_errno("getline");
6766 nl = strchr(line, '\n');
6769 if (strcmp(line, "y") == 0) {
6770 *choice = GOT_PATCH_CHOICE_YES;
6772 } else if (strcmp(line, "n") == 0) {
6773 *choice = GOT_PATCH_CHOICE_NO;
6775 } else if (strcmp(line, "q") == 0 &&
6776 status == GOT_STATUS_MODIFY) {
6777 *choice = GOT_PATCH_CHOICE_QUIT;
6780 printf("invalid response '%s'\n", line);
6785 while (resp != 'y' && resp != 'n' && resp != 'q') {
6786 err = show_change(status, path, patch_file, n, nchanges,
6793 if (status == GOT_STATUS_MODIFY) {
6794 if (resp != 'y' && resp != 'n' && resp != 'q') {
6795 printf("invalid response '%c'\n", resp);
6798 } else if (resp != 'y' && resp != 'n') {
6799 printf("invalid response '%c'\n", resp);
6805 *choice = GOT_PATCH_CHOICE_YES;
6806 else if (resp == 'n')
6807 *choice = GOT_PATCH_CHOICE_NO;
6808 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
6809 *choice = GOT_PATCH_CHOICE_QUIT;
6815 static const struct got_error *
6816 cmd_revert(int argc, char *argv[])
6818 const struct got_error *error = NULL;
6819 struct got_worktree *worktree = NULL;
6820 struct got_repository *repo = NULL;
6821 char *cwd = NULL, *path = NULL;
6822 struct got_pathlist_head paths;
6823 struct got_pathlist_entry *pe;
6824 int ch, can_recurse = 0, pflag = 0;
6825 FILE *patch_script_file = NULL;
6826 const char *patch_script_path = NULL;
6827 struct choose_patch_arg cpa;
6831 while ((ch = getopt(argc, argv, "pF:R")) != -1) {
6837 patch_script_path = optarg;
6852 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
6853 "unveil", NULL) == -1)
6858 if (patch_script_path && !pflag)
6859 errx(1, "-F option can only be used together with -p option");
6861 cwd = getcwd(NULL, 0);
6863 error = got_error_from_errno("getcwd");
6866 error = got_worktree_open(&worktree, cwd);
6868 if (error->code == GOT_ERR_NOT_WORKTREE)
6869 error = wrap_not_worktree_error(error, "revert", cwd);
6873 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6878 if (patch_script_path) {
6879 patch_script_file = fopen(patch_script_path, "r");
6880 if (patch_script_file == NULL) {
6881 error = got_error_from_errno2("fopen",
6886 error = apply_unveil(got_repo_get_path(repo), 1,
6887 got_worktree_get_root_path(worktree));
6891 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6898 TAILQ_FOREACH(pe, &paths, entry) {
6899 if (asprintf(&ondisk_path, "%s/%s",
6900 got_worktree_get_root_path(worktree),
6902 error = got_error_from_errno("asprintf");
6905 if (lstat(ondisk_path, &sb) == -1) {
6906 if (errno == ENOENT) {
6910 error = got_error_from_errno2("lstat",
6916 if (S_ISDIR(sb.st_mode)) {
6917 error = got_error_msg(GOT_ERR_BAD_PATH,
6918 "reverting directories requires -R option");
6924 cpa.patch_script_file = patch_script_file;
6925 cpa.action = "revert";
6926 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
6927 pflag ? choose_patch : NULL, &cpa, repo);
6929 if (patch_script_file && fclose(patch_script_file) == EOF &&
6931 error = got_error_from_errno2("fclose", patch_script_path);
6933 got_repo_close(repo);
6935 got_worktree_close(worktree);
6944 fprintf(stderr, "usage: %s commit [-F path] [-m msg] [-N] [-S] "
6945 "[path ...]\n", getprogname());
6949 struct collect_commit_logmsg_arg {
6950 const char *cmdline_log;
6951 const char *prepared_log;
6952 int non_interactive;
6954 const char *worktree_path;
6955 const char *branch_name;
6956 const char *repo_path;
6961 static const struct got_error *
6962 read_prepared_logmsg(char **logmsg, const char *path)
6964 const struct got_error *err = NULL;
6970 memset(&sb, 0, sizeof(sb));
6972 f = fopen(path, "r");
6974 return got_error_from_errno2("fopen", path);
6976 if (fstat(fileno(f), &sb) == -1) {
6977 err = got_error_from_errno2("fstat", path);
6980 if (sb.st_size == 0) {
6981 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
6985 *logmsg = malloc(sb.st_size + 1);
6986 if (*logmsg == NULL) {
6987 err = got_error_from_errno("malloc");
6991 r = fread(*logmsg, 1, sb.st_size, f);
6992 if (r != sb.st_size) {
6994 err = got_error_from_errno2("fread", path);
6996 err = got_error(GOT_ERR_IO);
6999 (*logmsg)[sb.st_size] = '\0';
7001 if (fclose(f) == EOF && err == NULL)
7002 err = got_error_from_errno2("fclose", path);
7011 static const struct got_error *
7012 collect_commit_logmsg(struct got_pathlist_head *commitable_paths, char **logmsg,
7015 char *initial_content = NULL;
7016 struct got_pathlist_entry *pe;
7017 const struct got_error *err = NULL;
7018 char *template = NULL;
7019 struct collect_commit_logmsg_arg *a = arg;
7020 int initial_content_len;
7024 /* if a message was specified on the command line, just use it */
7025 if (a->cmdline_log != NULL && strlen(a->cmdline_log) != 0) {
7026 len = strlen(a->cmdline_log) + 1;
7027 *logmsg = malloc(len + 1);
7028 if (*logmsg == NULL)
7029 return got_error_from_errno("malloc");
7030 strlcpy(*logmsg, a->cmdline_log, len);
7032 } else if (a->prepared_log != NULL && a->non_interactive)
7033 return read_prepared_logmsg(logmsg, a->prepared_log);
7035 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
7036 return got_error_from_errno("asprintf");
7038 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template);
7042 if (a->prepared_log) {
7044 err = read_prepared_logmsg(&msg, a->prepared_log);
7047 if (write(fd, msg, strlen(msg)) == -1) {
7048 err = got_error_from_errno2("write", a->logmsg_path);
7055 initial_content_len = asprintf(&initial_content,
7056 "\n# changes to be committed on branch %s:\n",
7058 if (initial_content_len == -1) {
7059 err = got_error_from_errno("asprintf");
7063 if (write(fd, initial_content, initial_content_len) == -1) {
7064 err = got_error_from_errno2("write", a->logmsg_path);
7068 TAILQ_FOREACH(pe, commitable_paths, entry) {
7069 struct got_commitable *ct = pe->data;
7070 dprintf(fd, "# %c %s\n",
7071 got_commitable_get_status(ct),
7072 got_commitable_get_path(ct));
7075 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
7076 initial_content_len, a->prepared_log ? 0 : 1);
7078 free(initial_content);
7081 if (fd != -1 && close(fd) == -1 && err == NULL)
7082 err = got_error_from_errno2("close", a->logmsg_path);
7084 /* Editor is done; we can now apply unveil(2) */
7086 err = apply_unveil(a->repo_path, 0, a->worktree_path);
7094 static const struct got_error *
7095 cmd_commit(int argc, char *argv[])
7097 const struct got_error *error = NULL;
7098 struct got_worktree *worktree = NULL;
7099 struct got_repository *repo = NULL;
7100 char *cwd = NULL, *id_str = NULL;
7101 struct got_object_id *id = NULL;
7102 const char *logmsg = NULL;
7103 char *prepared_logmsg = NULL;
7104 struct collect_commit_logmsg_arg cl_arg;
7105 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
7106 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
7107 int allow_bad_symlinks = 0, non_interactive = 0;
7108 struct got_pathlist_head paths;
7111 cl_arg.logmsg_path = NULL;
7113 while ((ch = getopt(argc, argv, "F:m:NS")) != -1) {
7117 option_conflict('F', 'm');
7118 prepared_logmsg = realpath(optarg, NULL);
7119 if (prepared_logmsg == NULL)
7120 return got_error_from_errno2("realpath",
7124 if (prepared_logmsg)
7125 option_conflict('m', 'F');
7129 non_interactive = 1;
7132 allow_bad_symlinks = 1;
7144 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7145 "unveil", NULL) == -1)
7148 cwd = getcwd(NULL, 0);
7150 error = got_error_from_errno("getcwd");
7153 error = got_worktree_open(&worktree, cwd);
7155 if (error->code == GOT_ERR_NOT_WORKTREE)
7156 error = wrap_not_worktree_error(error, "commit", cwd);
7160 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
7163 if (rebase_in_progress) {
7164 error = got_error(GOT_ERR_REBASING);
7168 error = got_worktree_histedit_in_progress(&histedit_in_progress,
7173 error = get_gitconfig_path(&gitconfig_path);
7176 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7181 error = get_author(&author, repo, worktree);
7186 * unveil(2) traverses exec(2); if an editor is used we have
7187 * to apply unveil after the log message has been written.
7189 if (logmsg == NULL || strlen(logmsg) == 0)
7190 error = get_editor(&editor);
7192 error = apply_unveil(got_repo_get_path(repo), 0,
7193 got_worktree_get_root_path(worktree));
7197 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7201 cl_arg.editor = editor;
7202 cl_arg.cmdline_log = logmsg;
7203 cl_arg.prepared_log = prepared_logmsg;
7204 cl_arg.non_interactive = non_interactive;
7205 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
7206 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
7207 if (!histedit_in_progress) {
7208 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
7209 error = got_error(GOT_ERR_COMMIT_BRANCH);
7212 cl_arg.branch_name += 11;
7214 cl_arg.repo_path = got_repo_get_path(repo);
7215 error = got_worktree_commit(&id, worktree, &paths, author, NULL,
7216 allow_bad_symlinks, collect_commit_logmsg, &cl_arg,
7217 print_status, NULL, repo);
7219 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7220 cl_arg.logmsg_path != NULL)
7221 preserve_logmsg = 1;
7225 error = got_object_id_str(&id_str, id);
7228 printf("Created commit %s\n", id_str);
7230 if (preserve_logmsg) {
7231 fprintf(stderr, "%s: log message preserved in %s\n",
7232 getprogname(), cl_arg.logmsg_path);
7233 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
7235 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
7236 free(cl_arg.logmsg_path);
7238 got_repo_close(repo);
7240 got_worktree_close(worktree);
7243 free(gitconfig_path);
7246 free(prepared_logmsg);
7251 usage_cherrypick(void)
7253 fprintf(stderr, "usage: %s cherrypick commit-id\n", getprogname());
7257 static const struct got_error *
7258 cmd_cherrypick(int argc, char *argv[])
7260 const struct got_error *error = NULL;
7261 struct got_worktree *worktree = NULL;
7262 struct got_repository *repo = NULL;
7263 char *cwd = NULL, *commit_id_str = NULL;
7264 struct got_object_id *commit_id = NULL;
7265 struct got_commit_object *commit = NULL;
7266 struct got_object_qid *pid;
7267 struct got_reference *head_ref = NULL;
7269 struct got_update_progress_arg upa;
7271 while ((ch = getopt(argc, argv, "")) != -1) {
7283 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7284 "unveil", NULL) == -1)
7290 cwd = getcwd(NULL, 0);
7292 error = got_error_from_errno("getcwd");
7295 error = got_worktree_open(&worktree, cwd);
7297 if (error->code == GOT_ERR_NOT_WORKTREE)
7298 error = wrap_not_worktree_error(error, "cherrypick",
7303 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7308 error = apply_unveil(got_repo_get_path(repo), 0,
7309 got_worktree_get_root_path(worktree));
7313 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7314 GOT_OBJ_TYPE_COMMIT, repo);
7315 if (error != NULL) {
7316 struct got_reference *ref;
7317 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7319 error = got_ref_open(&ref, repo, argv[0], 0);
7322 error = got_ref_resolve(&commit_id, repo, ref);
7327 error = got_object_id_str(&commit_id_str, commit_id);
7331 error = got_ref_open(&head_ref, repo,
7332 got_worktree_get_head_ref_name(worktree), 0);
7336 error = check_same_branch(commit_id, head_ref, NULL, repo);
7338 if (error->code != GOT_ERR_ANCESTRY)
7342 error = got_error(GOT_ERR_SAME_BRANCH);
7346 error = got_object_open_as_commit(&commit, repo, commit_id);
7349 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7350 memset(&upa, 0, sizeof(upa));
7351 error = got_worktree_merge_files(worktree, pid ? pid->id : NULL,
7352 commit_id, repo, update_progress, &upa, check_cancelled,
7357 if (upa.did_something)
7358 printf("Merged commit %s\n", commit_id_str);
7359 print_update_progress_stats(&upa);
7362 got_object_commit_close(commit);
7363 free(commit_id_str);
7365 got_ref_close(head_ref);
7367 got_worktree_close(worktree);
7369 got_repo_close(repo);
7376 fprintf(stderr, "usage: %s backout commit-id\n", getprogname());
7380 static const struct got_error *
7381 cmd_backout(int argc, char *argv[])
7383 const struct got_error *error = NULL;
7384 struct got_worktree *worktree = NULL;
7385 struct got_repository *repo = NULL;
7386 char *cwd = NULL, *commit_id_str = NULL;
7387 struct got_object_id *commit_id = NULL;
7388 struct got_commit_object *commit = NULL;
7389 struct got_object_qid *pid;
7390 struct got_reference *head_ref = NULL;
7392 struct got_update_progress_arg upa;
7394 while ((ch = getopt(argc, argv, "")) != -1) {
7406 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
7407 "unveil", NULL) == -1)
7413 cwd = getcwd(NULL, 0);
7415 error = got_error_from_errno("getcwd");
7418 error = got_worktree_open(&worktree, cwd);
7420 if (error->code == GOT_ERR_NOT_WORKTREE)
7421 error = wrap_not_worktree_error(error, "backout", cwd);
7425 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7430 error = apply_unveil(got_repo_get_path(repo), 0,
7431 got_worktree_get_root_path(worktree));
7435 error = got_repo_match_object_id_prefix(&commit_id, argv[0],
7436 GOT_OBJ_TYPE_COMMIT, repo);
7437 if (error != NULL) {
7438 struct got_reference *ref;
7439 if (error->code != GOT_ERR_BAD_OBJ_ID_STR)
7441 error = got_ref_open(&ref, repo, argv[0], 0);
7444 error = got_ref_resolve(&commit_id, repo, ref);
7449 error = got_object_id_str(&commit_id_str, commit_id);
7453 error = got_ref_open(&head_ref, repo,
7454 got_worktree_get_head_ref_name(worktree), 0);
7458 error = check_same_branch(commit_id, head_ref, NULL, repo);
7462 error = got_object_open_as_commit(&commit, repo, commit_id);
7465 pid = SIMPLEQ_FIRST(got_object_commit_get_parent_ids(commit));
7467 error = got_error(GOT_ERR_ROOT_COMMIT);
7471 memset(&upa, 0, sizeof(upa));
7472 error = got_worktree_merge_files(worktree, commit_id, pid->id, repo,
7473 update_progress, &upa, check_cancelled, NULL);
7477 if (upa.did_something)
7478 printf("Backed out commit %s\n", commit_id_str);
7479 print_update_progress_stats(&upa);
7482 got_object_commit_close(commit);
7483 free(commit_id_str);
7485 got_ref_close(head_ref);
7487 got_worktree_close(worktree);
7489 got_repo_close(repo);
7496 fprintf(stderr, "usage: %s rebase [-a] [-c] [-l] [branch]\n",
7502 trim_logmsg(char *logmsg, int limit)
7507 len = strlen(logmsg);
7511 nl = strchr(logmsg, '\n');
7516 static const struct got_error *
7517 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
7519 const struct got_error *err;
7520 char *logmsg0 = NULL;
7523 err = got_object_commit_get_logmsg(&logmsg0, commit);
7528 while (isspace((unsigned char)s[0]))
7531 *logmsg = strdup(s);
7532 if (*logmsg == NULL) {
7533 err = got_error_from_errno("strdup");
7537 trim_logmsg(*logmsg, limit);
7543 static const struct got_error *
7544 show_rebase_merge_conflict(struct got_object_id *id, struct got_repository *repo)
7546 const struct got_error *err;
7547 struct got_commit_object *commit = NULL;
7548 char *id_str = NULL, *logmsg = NULL;
7550 err = got_object_open_as_commit(&commit, repo, id);
7554 err = got_object_id_str(&id_str, id);
7560 err = get_short_logmsg(&logmsg, 42, commit);
7564 printf("%s -> merge conflict: %s\n", id_str, logmsg);
7567 got_object_commit_close(commit);
7572 static const struct got_error *
7573 show_rebase_progress(struct got_commit_object *commit,
7574 struct got_object_id *old_id, struct got_object_id *new_id)
7576 const struct got_error *err;
7577 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
7579 err = got_object_id_str(&old_id_str, old_id);
7584 err = got_object_id_str(&new_id_str, new_id);
7589 old_id_str[12] = '\0';
7591 new_id_str[12] = '\0';
7593 err = get_short_logmsg(&logmsg, 42, commit);
7597 printf("%s -> %s: %s\n", old_id_str,
7598 new_id_str ? new_id_str : "no-op change", logmsg);
7606 static const struct got_error *
7607 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
7608 struct got_reference *branch, struct got_reference *new_base_branch,
7609 struct got_reference *tmp_branch, struct got_repository *repo,
7612 printf("Switching work tree to %s\n", got_ref_get_name(branch));
7613 return got_worktree_rebase_complete(worktree, fileindex,
7614 new_base_branch, tmp_branch, branch, repo, create_backup);
7617 static const struct got_error *
7618 rebase_commit(struct got_pathlist_head *merged_paths,
7619 struct got_worktree *worktree, struct got_fileindex *fileindex,
7620 struct got_reference *tmp_branch,
7621 struct got_object_id *commit_id, struct got_repository *repo)
7623 const struct got_error *error;
7624 struct got_commit_object *commit;
7625 struct got_object_id *new_commit_id;
7627 error = got_object_open_as_commit(&commit, repo, commit_id);
7631 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
7632 worktree, fileindex, tmp_branch, commit, commit_id, repo);
7634 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
7636 error = show_rebase_progress(commit, commit_id, NULL);
7638 error = show_rebase_progress(commit, commit_id, new_commit_id);
7639 free(new_commit_id);
7642 got_object_commit_close(commit);
7646 struct check_path_prefix_arg {
7647 const char *path_prefix;
7652 static const struct got_error *
7653 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
7654 struct got_blob_object *blob2, struct got_object_id *id1,
7655 struct got_object_id *id2, const char *path1, const char *path2,
7656 mode_t mode1, mode_t mode2, struct got_repository *repo)
7658 struct check_path_prefix_arg *a = arg;
7660 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
7661 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
7662 return got_error(a->errcode);
7667 static const struct got_error *
7668 check_path_prefix(struct got_object_id *parent_id,
7669 struct got_object_id *commit_id, const char *path_prefix,
7670 int errcode, struct got_repository *repo)
7672 const struct got_error *err;
7673 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
7674 struct got_commit_object *commit = NULL, *parent_commit = NULL;
7675 struct check_path_prefix_arg cpp_arg;
7677 if (got_path_is_root_dir(path_prefix))
7680 err = got_object_open_as_commit(&commit, repo, commit_id);
7684 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
7688 err = got_object_open_as_tree(&tree1, repo,
7689 got_object_commit_get_tree_id(parent_commit));
7693 err = got_object_open_as_tree(&tree2, repo,
7694 got_object_commit_get_tree_id(commit));
7698 cpp_arg.path_prefix = path_prefix;
7699 while (cpp_arg.path_prefix[0] == '/')
7700 cpp_arg.path_prefix++;
7701 cpp_arg.len = strlen(cpp_arg.path_prefix);
7702 cpp_arg.errcode = errcode;
7703 err = got_diff_tree(tree1, tree2, "", "", repo,
7704 check_path_prefix_in_diff, &cpp_arg, 0);
7707 got_object_tree_close(tree1);
7709 got_object_tree_close(tree2);
7711 got_object_commit_close(commit);
7713 got_object_commit_close(parent_commit);
7717 static const struct got_error *
7718 collect_commits(struct got_object_id_queue *commits,
7719 struct got_object_id *initial_commit_id,
7720 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
7721 const char *path_prefix, int path_prefix_errcode,
7722 struct got_repository *repo)
7724 const struct got_error *err = NULL;
7725 struct got_commit_graph *graph = NULL;
7726 struct got_object_id *parent_id = NULL;
7727 struct got_object_qid *qid;
7728 struct got_object_id *commit_id = initial_commit_id;
7730 err = got_commit_graph_open(&graph, "/", 1);
7734 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
7735 check_cancelled, NULL);
7738 while (got_object_id_cmp(commit_id, iter_stop_id) != 0) {
7739 err = got_commit_graph_iter_next(&parent_id, graph, repo,
7740 check_cancelled, NULL);
7742 if (err->code == GOT_ERR_ITER_COMPLETED) {
7743 err = got_error_msg(GOT_ERR_ANCESTRY,
7744 "ran out of commits to rebase before "
7745 "youngest common ancestor commit has "
7750 err = check_path_prefix(parent_id, commit_id,
7751 path_prefix, path_prefix_errcode, repo);
7755 err = got_object_qid_alloc(&qid, commit_id);
7758 SIMPLEQ_INSERT_HEAD(commits, qid, entry);
7759 commit_id = parent_id;
7763 got_commit_graph_close(graph);
7767 static const struct got_error *
7768 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
7770 const struct got_error *err = NULL;
7771 time_t committer_time;
7773 char datebuf[11]; /* YYYY-MM-DD + NUL */
7774 char *author0 = NULL, *author, *smallerthan;
7775 char *logmsg0 = NULL, *logmsg, *newline;
7777 committer_time = got_object_commit_get_committer_time(commit);
7778 if (localtime_r(&committer_time, &tm) == NULL)
7779 return got_error_from_errno("localtime_r");
7780 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
7781 return got_error(GOT_ERR_NO_SPACE);
7783 author0 = strdup(got_object_commit_get_author(commit));
7784 if (author0 == NULL)
7785 return got_error_from_errno("strdup");
7787 smallerthan = strchr(author, '<');
7788 if (smallerthan && smallerthan[1] != '\0')
7789 author = smallerthan + 1;
7790 author[strcspn(author, "@>")] = '\0';
7792 err = got_object_commit_get_logmsg(&logmsg0, commit);
7796 while (*logmsg == '\n')
7798 newline = strchr(logmsg, '\n');
7802 if (asprintf(brief_str, "%s %s %s",
7803 datebuf, author, logmsg) == -1)
7804 err = got_error_from_errno("asprintf");
7811 static const struct got_error *
7812 print_backup_ref(const char *branch_name, const char *new_id_str,
7813 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
7814 struct got_reflist_object_id_map *refs_idmap,
7815 struct got_repository *repo)
7817 const struct got_error *err = NULL;
7818 struct got_reflist_head *refs;
7819 char *refs_str = NULL;
7820 struct got_object_id *new_commit_id = NULL;
7821 struct got_commit_object *new_commit = NULL;
7822 char *new_commit_brief_str = NULL;
7823 struct got_object_id *yca_id = NULL;
7824 struct got_commit_object *yca_commit = NULL;
7825 char *yca_id_str = NULL, *yca_brief_str = NULL;
7826 char *custom_refs_str;
7828 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
7829 return got_error_from_errno("asprintf");
7831 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL,
7832 0, 0, refs_idmap, custom_refs_str);
7836 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
7840 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
7842 err = build_refs_str(&refs_str, refs, new_commit_id, repo);
7847 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
7851 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
7855 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
7856 old_commit_id, new_commit_id, repo, check_cancelled, NULL);
7860 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
7861 refs_str ? " (" : "", refs_str ? refs_str : "",
7862 refs_str ? ")" : "", new_commit_brief_str);
7863 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
7864 got_object_id_cmp(yca_id, old_commit_id) != 0) {
7868 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
7872 err = get_commit_brief_str(&yca_brief_str, yca_commit);
7876 err = got_object_id_str(&yca_id_str, yca_id);
7880 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
7882 err = build_refs_str(&refs_str, refs, yca_id, repo);
7886 printf("history forked at %s%s%s%s\n %s\n",
7888 refs_str ? " (" : "", refs_str ? refs_str : "",
7889 refs_str ? ")" : "", yca_brief_str);
7892 free(custom_refs_str);
7893 free(new_commit_id);
7897 free(yca_brief_str);
7899 got_object_commit_close(new_commit);
7901 got_object_commit_close(yca_commit);
7906 static const struct got_error *
7907 list_backup_refs(const char *backup_ref_prefix, const char *wanted_branch_name,
7908 struct got_repository *repo)
7910 const struct got_error *err;
7911 struct got_reflist_head refs, backup_refs;
7912 struct got_reflist_entry *re;
7913 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
7914 struct got_object_id *old_commit_id = NULL;
7915 char *branch_name = NULL;
7916 struct got_commit_object *old_commit = NULL;
7917 struct got_reflist_object_id_map *refs_idmap = NULL;
7918 int wanted_branch_found = 0;
7921 TAILQ_INIT(&backup_refs);
7923 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7927 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
7931 if (wanted_branch_name) {
7932 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
7933 wanted_branch_name += 11;
7936 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
7937 got_ref_cmp_by_commit_timestamp_descending, repo);
7941 TAILQ_FOREACH(re, &backup_refs, entry) {
7942 const char *refname = got_ref_get_name(re->ref);
7945 err = got_ref_resolve(&old_commit_id, repo, re->ref);
7949 err = got_object_open_as_commit(&old_commit, repo,
7954 if (strncmp(backup_ref_prefix, refname,
7955 backup_ref_prefix_len) == 0)
7956 refname += backup_ref_prefix_len;
7958 while (refname[0] == '/')
7961 branch_name = strdup(refname);
7962 if (branch_name == NULL) {
7963 err = got_error_from_errno("strdup");
7966 slash = strrchr(branch_name, '/');
7969 refname += strlen(branch_name) + 1;
7972 if (wanted_branch_name == NULL ||
7973 strcmp(wanted_branch_name, branch_name) == 0) {
7974 wanted_branch_found = 1;
7975 err = print_backup_ref(branch_name, refname,
7976 old_commit_id, old_commit, refs_idmap, repo);
7981 free(old_commit_id);
7982 old_commit_id = NULL;
7985 got_object_commit_close(old_commit);
7989 if (wanted_branch_name && !wanted_branch_found) {
7990 err = got_error_fmt(GOT_ERR_NOT_REF,
7991 "%s/%s/", backup_ref_prefix, wanted_branch_name);
7995 got_reflist_object_id_map_free(refs_idmap);
7996 got_ref_list_free(&refs);
7997 got_ref_list_free(&backup_refs);
7998 free(old_commit_id);
8001 got_object_commit_close(old_commit);
8005 static const struct got_error *
8006 cmd_rebase(int argc, char *argv[])
8008 const struct got_error *error = NULL;
8009 struct got_worktree *worktree = NULL;
8010 struct got_repository *repo = NULL;
8011 struct got_fileindex *fileindex = NULL;
8013 struct got_reference *branch = NULL;
8014 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
8015 struct got_object_id *commit_id = NULL, *parent_id = NULL;
8016 struct got_object_id *resume_commit_id = NULL;
8017 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
8018 struct got_commit_object *commit = NULL;
8019 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
8020 int histedit_in_progress = 0, create_backup = 1, list_backups = 0;
8021 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
8022 struct got_object_id_queue commits;
8023 struct got_pathlist_head merged_paths;
8024 const struct got_object_id_queue *parent_ids;
8025 struct got_object_qid *qid, *pid;
8027 SIMPLEQ_INIT(&commits);
8028 TAILQ_INIT(&merged_paths);
8030 while ((ch = getopt(argc, argv, "acl")) != -1) {
8036 continue_rebase = 1;
8051 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8052 "unveil", NULL) == -1)
8057 option_conflict('l', 'a');
8058 if (continue_rebase)
8059 option_conflict('l', 'c');
8060 if (argc != 0 && argc != 1)
8063 if (abort_rebase && continue_rebase)
8065 else if (abort_rebase || continue_rebase) {
8068 } else if (argc != 1)
8072 cwd = getcwd(NULL, 0);
8074 error = got_error_from_errno("getcwd");
8077 error = got_worktree_open(&worktree, cwd);
8080 if (error->code != GOT_ERR_NOT_WORKTREE)
8083 if (error->code == GOT_ERR_NOT_WORKTREE)
8084 error = wrap_not_worktree_error(error,
8090 error = got_repo_open(&repo,
8091 worktree ? got_worktree_get_repo_path(worktree) : cwd, NULL);
8095 error = apply_unveil(got_repo_get_path(repo), 0,
8096 worktree ? got_worktree_get_root_path(worktree) : NULL);
8101 error = list_backup_refs(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
8102 argc == 1 ? argv[0] : NULL, repo);
8103 goto done; /* nothing else to do */
8106 error = got_worktree_histedit_in_progress(&histedit_in_progress,
8110 if (histedit_in_progress) {
8111 error = got_error(GOT_ERR_HISTEDIT_BUSY);
8115 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
8120 struct got_update_progress_arg upa;
8121 if (!rebase_in_progress) {
8122 error = got_error(GOT_ERR_NOT_REBASING);
8125 error = got_worktree_rebase_continue(&resume_commit_id,
8126 &new_base_branch, &tmp_branch, &branch, &fileindex,
8130 printf("Switching work tree to %s\n",
8131 got_ref_get_symref_target(new_base_branch));
8132 memset(&upa, 0, sizeof(upa));
8133 error = got_worktree_rebase_abort(worktree, fileindex, repo,
8134 new_base_branch, update_progress, &upa);
8137 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
8138 print_update_progress_stats(&upa);
8139 goto done; /* nothing else to do */
8142 if (continue_rebase) {
8143 if (!rebase_in_progress) {
8144 error = got_error(GOT_ERR_NOT_REBASING);
8147 error = got_worktree_rebase_continue(&resume_commit_id,
8148 &new_base_branch, &tmp_branch, &branch, &fileindex,
8153 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
8154 resume_commit_id, repo);
8158 yca_id = got_object_id_dup(resume_commit_id);
8159 if (yca_id == NULL) {
8160 error = got_error_from_errno("got_object_id_dup");
8164 error = got_ref_open(&branch, repo, argv[0], 0);
8169 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
8173 if (!continue_rebase) {
8174 struct got_object_id *base_commit_id;
8176 base_commit_id = got_worktree_get_base_commit_id(worktree);
8177 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
8178 base_commit_id, branch_head_commit_id, repo,
8179 check_cancelled, NULL);
8182 if (yca_id == NULL) {
8183 error = got_error_msg(GOT_ERR_ANCESTRY,
8184 "specified branch shares no common ancestry "
8185 "with work tree's branch");
8189 error = check_same_branch(base_commit_id, branch, yca_id, repo);
8191 if (error->code != GOT_ERR_ANCESTRY)
8195 static char msg[128];
8196 snprintf(msg, sizeof(msg),
8197 "%s is already based on %s",
8198 got_ref_get_name(branch),
8199 got_worktree_get_head_ref_name(worktree));
8200 error = got_error_msg(GOT_ERR_SAME_BRANCH, msg);
8203 error = got_worktree_rebase_prepare(&new_base_branch,
8204 &tmp_branch, &fileindex, worktree, branch, repo);
8209 commit_id = branch_head_commit_id;
8210 error = got_object_open_as_commit(&commit, repo, commit_id);
8214 parent_ids = got_object_commit_get_parent_ids(commit);
8215 pid = SIMPLEQ_FIRST(parent_ids);
8217 if (!continue_rebase) {
8218 struct got_update_progress_arg upa;
8219 memset(&upa, 0, sizeof(upa));
8220 error = got_worktree_rebase_abort(worktree, fileindex,
8221 repo, new_base_branch, update_progress, &upa);
8224 printf("Rebase of %s aborted\n",
8225 got_ref_get_name(branch));
8226 print_update_progress_stats(&upa);
8229 error = got_error(GOT_ERR_EMPTY_REBASE);
8232 error = collect_commits(&commits, commit_id, pid->id,
8233 yca_id, got_worktree_get_path_prefix(worktree),
8234 GOT_ERR_REBASE_PATH, repo);
8235 got_object_commit_close(commit);
8240 if (SIMPLEQ_EMPTY(&commits)) {
8241 if (continue_rebase) {
8242 error = rebase_complete(worktree, fileindex,
8243 branch, new_base_branch, tmp_branch, repo,
8247 /* Fast-forward the reference of the branch. */
8248 struct got_object_id *new_head_commit_id;
8250 error = got_ref_resolve(&new_head_commit_id, repo,
8254 error = got_object_id_str(&id_str, new_head_commit_id);
8255 printf("Forwarding %s to commit %s\n",
8256 got_ref_get_name(branch), id_str);
8258 error = got_ref_change_ref(branch,
8259 new_head_commit_id);
8262 /* No backup needed since objects did not change. */
8268 SIMPLEQ_FOREACH(qid, &commits, entry) {
8269 struct got_update_progress_arg upa;
8271 commit_id = qid->id;
8272 parent_id = pid ? pid->id : yca_id;
8275 memset(&upa, 0, sizeof(upa));
8276 error = got_worktree_rebase_merge_files(&merged_paths,
8277 worktree, fileindex, parent_id, commit_id, repo,
8278 update_progress, &upa, check_cancelled, NULL);
8282 print_update_progress_stats(&upa);
8283 if (upa.conflicts > 0)
8284 rebase_status = GOT_STATUS_CONFLICT;
8286 if (rebase_status == GOT_STATUS_CONFLICT) {
8287 error = show_rebase_merge_conflict(qid->id, repo);
8290 got_worktree_rebase_pathlist_free(&merged_paths);
8294 error = rebase_commit(&merged_paths, worktree, fileindex,
8295 tmp_branch, commit_id, repo);
8296 got_worktree_rebase_pathlist_free(&merged_paths);
8301 if (rebase_status == GOT_STATUS_CONFLICT) {
8302 error = got_worktree_rebase_postpone(worktree, fileindex);
8305 error = got_error_msg(GOT_ERR_CONFLICTS,
8306 "conflicts must be resolved before rebasing can continue");
8308 error = rebase_complete(worktree, fileindex, branch,
8309 new_base_branch, tmp_branch, repo, create_backup);
8311 got_object_id_queue_free(&commits);
8312 free(branch_head_commit_id);
8313 free(resume_commit_id);
8316 got_object_commit_close(commit);
8318 got_ref_close(branch);
8319 if (new_base_branch)
8320 got_ref_close(new_base_branch);
8322 got_ref_close(tmp_branch);
8324 got_worktree_close(worktree);
8326 got_repo_close(repo);
8331 usage_histedit(void)
8333 fprintf(stderr, "usage: %s histedit [-a] [-c] [-f] "
8334 "[-F histedit-script] [-m] [-l] [branch]\n", getprogname());
8338 #define GOT_HISTEDIT_PICK 'p'
8339 #define GOT_HISTEDIT_EDIT 'e'
8340 #define GOT_HISTEDIT_FOLD 'f'
8341 #define GOT_HISTEDIT_DROP 'd'
8342 #define GOT_HISTEDIT_MESG 'm'
8344 static struct got_histedit_cmd {
8348 } got_histedit_cmds[] = {
8349 { GOT_HISTEDIT_PICK, "pick", "use commit" },
8350 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
8351 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
8353 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
8354 { GOT_HISTEDIT_MESG, "mesg",
8355 "single-line log message for commit above (open editor if empty)" },
8358 struct got_histedit_list_entry {
8359 TAILQ_ENTRY(got_histedit_list_entry) entry;
8360 struct got_object_id *commit_id;
8361 const struct got_histedit_cmd *cmd;
8364 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
8366 static const struct got_error *
8367 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
8368 FILE *f, struct got_repository *repo)
8370 const struct got_error *err = NULL;
8371 char *logmsg = NULL, *id_str = NULL;
8372 struct got_commit_object *commit = NULL;
8375 err = got_object_open_as_commit(&commit, repo, commit_id);
8379 err = get_short_logmsg(&logmsg, 34, commit);
8383 err = got_object_id_str(&id_str, commit_id);
8387 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
8389 err = got_ferror(f, GOT_ERR_IO);
8392 got_object_commit_close(commit);
8398 static const struct got_error *
8399 histedit_write_commit_list(struct got_object_id_queue *commits,
8400 FILE *f, int edit_logmsg_only, int fold_only, struct got_repository *repo)
8402 const struct got_error *err = NULL;
8403 struct got_object_qid *qid;
8404 const char *histedit_cmd = NULL;
8406 if (SIMPLEQ_EMPTY(commits))
8407 return got_error(GOT_ERR_EMPTY_HISTEDIT);
8409 SIMPLEQ_FOREACH(qid, commits, entry) {
8410 histedit_cmd = got_histedit_cmds[0].name;
8411 if (fold_only && SIMPLEQ_NEXT(qid, entry) != NULL)
8412 histedit_cmd = "fold";
8413 err = histedit_write_commit(qid->id, histedit_cmd, f, repo);
8416 if (edit_logmsg_only) {
8417 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
8419 err = got_ferror(f, GOT_ERR_IO);
8428 static const struct got_error *
8429 write_cmd_list(FILE *f, const char *branch_name,
8430 struct got_object_id_queue *commits)
8432 const struct got_error *err = NULL;
8436 struct got_object_qid *qid;
8438 qid = SIMPLEQ_FIRST(commits);
8439 err = got_object_id_str(&id_str, qid->id);
8444 "# Editing the history of branch '%s' starting at\n"
8446 "# Commits will be processed in order from top to "
8447 "bottom of this file.\n", branch_name, id_str);
8449 err = got_ferror(f, GOT_ERR_IO);
8453 n = fprintf(f, "# Available histedit commands:\n");
8455 err = got_ferror(f, GOT_ERR_IO);
8459 for (i = 0; i < nitems(got_histedit_cmds); i++) {
8460 struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
8461 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
8464 err = got_ferror(f, GOT_ERR_IO);
8473 static const struct got_error *
8474 histedit_syntax_error(int lineno)
8476 static char msg[42];
8479 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
8481 if (ret == -1 || ret >= sizeof(msg))
8482 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
8484 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
8487 static const struct got_error *
8488 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
8489 char *logmsg, struct got_repository *repo)
8491 const struct got_error *err;
8492 struct got_commit_object *folded_commit = NULL;
8493 char *id_str, *folded_logmsg = NULL;
8495 err = got_object_id_str(&id_str, hle->commit_id);
8499 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
8503 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
8506 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
8507 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
8508 folded_logmsg) == -1) {
8509 err = got_error_from_errno("asprintf");
8513 got_object_commit_close(folded_commit);
8515 free(folded_logmsg);
8519 static struct got_histedit_list_entry *
8520 get_folded_commits(struct got_histedit_list_entry *hle)
8522 struct got_histedit_list_entry *prev, *folded = NULL;
8524 prev = TAILQ_PREV(hle, got_histedit_list, entry);
8525 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
8526 prev->cmd->code == GOT_HISTEDIT_DROP)) {
8527 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
8529 prev = TAILQ_PREV(prev, got_histedit_list, entry);
8535 static const struct got_error *
8536 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
8537 struct got_repository *repo)
8539 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
8540 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
8541 const struct got_error *err = NULL;
8542 struct got_commit_object *commit = NULL;
8545 struct got_histedit_list_entry *folded = NULL;
8547 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
8551 folded = get_folded_commits(hle);
8553 while (folded != hle) {
8554 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
8555 folded = TAILQ_NEXT(folded, entry);
8558 err = append_folded_commit_msg(&new_msg, folded,
8564 folded = TAILQ_NEXT(folded, entry);
8568 err = got_object_id_str(&id_str, hle->commit_id);
8571 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
8574 logmsg_len = asprintf(&new_msg,
8575 "%s\n# original log message of commit %s: %s",
8576 logmsg ? logmsg : "", id_str, orig_logmsg);
8577 if (logmsg_len == -1) {
8578 err = got_error_from_errno("asprintf");
8584 err = got_object_id_str(&id_str, hle->commit_id);
8588 err = got_opentemp_named_fd(&logmsg_path, &fd,
8589 GOT_TMPDIR_STR "/got-logmsg");
8593 write(fd, logmsg, logmsg_len);
8596 err = get_editor(&editor);
8600 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
8603 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
8606 hle->logmsg = strdup(new_msg);
8607 if (hle->logmsg == NULL)
8608 err = got_error_from_errno("strdup");
8611 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
8612 err = got_error_from_errno2("unlink", logmsg_path);
8618 got_object_commit_close(commit);
8622 static const struct got_error *
8623 histedit_parse_list(struct got_histedit_list *histedit_cmds,
8624 FILE *f, struct got_repository *repo)
8626 const struct got_error *err = NULL;
8627 char *line = NULL, *p, *end;
8631 const struct got_histedit_cmd *cmd;
8632 struct got_object_id *commit_id = NULL;
8633 struct got_histedit_list_entry *hle = NULL;
8636 len = getline(&line, &size, f);
8638 const struct got_error *getline_err;
8641 getline_err = got_error_from_errno("getline");
8642 err = got_ferror(f, getline_err->code);
8647 while (isspace((unsigned char)p[0]))
8649 if (p[0] == '#' || p[0] == '\0') {
8655 for (i = 0; i < nitems(got_histedit_cmds); i++) {
8656 cmd = &got_histedit_cmds[i];
8657 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
8658 isspace((unsigned char)p[strlen(cmd->name)])) {
8659 p += strlen(cmd->name);
8662 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
8667 if (i == nitems(got_histedit_cmds)) {
8668 err = histedit_syntax_error(lineno);
8671 while (isspace((unsigned char)p[0]))
8673 if (cmd->code == GOT_HISTEDIT_MESG) {
8674 if (hle == NULL || hle->logmsg != NULL) {
8675 err = got_error(GOT_ERR_HISTEDIT_CMD);
8679 err = histedit_edit_logmsg(hle, repo);
8683 hle->logmsg = strdup(p);
8684 if (hle->logmsg == NULL) {
8685 err = got_error_from_errno("strdup");
8694 while (end[0] && !isspace((unsigned char)end[0]))
8698 err = got_object_resolve_id_str(&commit_id, repo, p);
8700 /* override error code */
8701 err = histedit_syntax_error(lineno);
8705 hle = malloc(sizeof(*hle));
8707 err = got_error_from_errno("malloc");
8711 hle->commit_id = commit_id;
8716 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
8724 static const struct got_error *
8725 histedit_check_script(struct got_histedit_list *histedit_cmds,
8726 struct got_object_id_queue *commits, struct got_repository *repo)
8728 const struct got_error *err = NULL;
8729 struct got_object_qid *qid;
8730 struct got_histedit_list_entry *hle;
8731 static char msg[92];
8734 if (TAILQ_EMPTY(histedit_cmds))
8735 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
8736 "histedit script contains no commands");
8737 if (SIMPLEQ_EMPTY(commits))
8738 return got_error(GOT_ERR_EMPTY_HISTEDIT);
8740 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8741 struct got_histedit_list_entry *hle2;
8742 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
8745 if (got_object_id_cmp(hle->commit_id,
8746 hle2->commit_id) != 0)
8748 err = got_object_id_str(&id_str, hle->commit_id);
8751 snprintf(msg, sizeof(msg), "commit %s is listed "
8752 "more than once in histedit script", id_str);
8754 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8758 SIMPLEQ_FOREACH(qid, commits, entry) {
8759 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8760 if (got_object_id_cmp(qid->id, hle->commit_id) == 0)
8764 err = got_object_id_str(&id_str, qid->id);
8767 snprintf(msg, sizeof(msg),
8768 "commit %s missing from histedit script", id_str);
8770 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
8774 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
8775 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
8776 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
8777 "last commit in histedit script cannot be folded");
8782 static const struct got_error *
8783 histedit_run_editor(struct got_histedit_list *histedit_cmds,
8784 const char *path, struct got_object_id_queue *commits,
8785 struct got_repository *repo)
8787 const struct got_error *err = NULL;
8791 err = get_editor(&editor);
8795 if (spawn_editor(editor, path) == -1) {
8796 err = got_error_from_errno("failed spawning editor");
8800 f = fopen(path, "r");
8802 err = got_error_from_errno("fopen");
8805 err = histedit_parse_list(histedit_cmds, f, repo);
8809 err = histedit_check_script(histedit_cmds, commits, repo);
8811 if (f && fclose(f) == EOF && err == NULL)
8812 err = got_error_from_errno("fclose");
8817 static const struct got_error *
8818 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
8819 struct got_object_id_queue *, const char *, const char *,
8820 struct got_repository *);
8822 static const struct got_error *
8823 histedit_edit_script(struct got_histedit_list *histedit_cmds,
8824 struct got_object_id_queue *commits, const char *branch_name,
8825 int edit_logmsg_only, int fold_only, struct got_repository *repo)
8827 const struct got_error *err;
8831 err = got_opentemp_named(&path, &f, "got-histedit");
8835 err = write_cmd_list(f, branch_name, commits);
8839 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
8844 if (edit_logmsg_only || fold_only) {
8846 err = histedit_parse_list(histedit_cmds, f, repo);
8848 if (fclose(f) == EOF) {
8849 err = got_error_from_errno("fclose");
8853 err = histedit_run_editor(histedit_cmds, path, commits, repo);
8855 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8856 err->code != GOT_ERR_HISTEDIT_CMD)
8858 err = histedit_edit_list_retry(histedit_cmds, err,
8859 commits, path, branch_name, repo);
8863 if (f && fclose(f) == EOF && err == NULL)
8864 err = got_error_from_errno("fclose");
8865 if (path && unlink(path) != 0 && err == NULL)
8866 err = got_error_from_errno2("unlink", path);
8871 static const struct got_error *
8872 histedit_save_list(struct got_histedit_list *histedit_cmds,
8873 struct got_worktree *worktree, struct got_repository *repo)
8875 const struct got_error *err = NULL;
8878 struct got_histedit_list_entry *hle;
8879 struct got_commit_object *commit = NULL;
8881 err = got_worktree_get_histedit_script_path(&path, worktree);
8885 f = fopen(path, "w");
8887 err = got_error_from_errno2("fopen", path);
8890 TAILQ_FOREACH(hle, histedit_cmds, entry) {
8891 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
8897 int n = fprintf(f, "%c %s\n",
8898 GOT_HISTEDIT_MESG, hle->logmsg);
8900 err = got_ferror(f, GOT_ERR_IO);
8906 if (f && fclose(f) == EOF && err == NULL)
8907 err = got_error_from_errno("fclose");
8910 got_object_commit_close(commit);
8915 histedit_free_list(struct got_histedit_list *histedit_cmds)
8917 struct got_histedit_list_entry *hle;
8919 while ((hle = TAILQ_FIRST(histedit_cmds))) {
8920 TAILQ_REMOVE(histedit_cmds, hle, entry);
8925 static const struct got_error *
8926 histedit_load_list(struct got_histedit_list *histedit_cmds,
8927 const char *path, struct got_repository *repo)
8929 const struct got_error *err = NULL;
8932 f = fopen(path, "r");
8934 err = got_error_from_errno2("fopen", path);
8938 err = histedit_parse_list(histedit_cmds, f, repo);
8940 if (f && fclose(f) == EOF && err == NULL)
8941 err = got_error_from_errno("fclose");
8945 static const struct got_error *
8946 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
8947 const struct got_error *edit_err, struct got_object_id_queue *commits,
8948 const char *path, const char *branch_name, struct got_repository *repo)
8950 const struct got_error *err = NULL, *prev_err = edit_err;
8953 while (resp != 'c' && resp != 'r' && resp != 'a') {
8954 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
8955 "or (a)bort: ", getprogname(), prev_err->msg);
8960 histedit_free_list(histedit_cmds);
8961 err = histedit_run_editor(histedit_cmds, path, commits,
8964 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8965 err->code != GOT_ERR_HISTEDIT_CMD)
8972 } else if (resp == 'r') {
8973 histedit_free_list(histedit_cmds);
8974 err = histedit_edit_script(histedit_cmds,
8975 commits, branch_name, 0, 0, repo);
8977 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
8978 err->code != GOT_ERR_HISTEDIT_CMD)
8985 } else if (resp == 'a') {
8986 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
8989 printf("invalid response '%c'\n", resp);
8995 static const struct got_error *
8996 histedit_complete(struct got_worktree *worktree,
8997 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
8998 struct got_reference *branch, struct got_repository *repo)
9000 printf("Switching work tree to %s\n",
9001 got_ref_get_symref_target(branch));
9002 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
9006 static const struct got_error *
9007 show_histedit_progress(struct got_commit_object *commit,
9008 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
9010 const struct got_error *err;
9011 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
9013 err = got_object_id_str(&old_id_str, hle->commit_id);
9018 err = got_object_id_str(&new_id_str, new_id);
9023 old_id_str[12] = '\0';
9025 new_id_str[12] = '\0';
9028 logmsg = strdup(hle->logmsg);
9029 if (logmsg == NULL) {
9030 err = got_error_from_errno("strdup");
9033 trim_logmsg(logmsg, 42);
9035 err = get_short_logmsg(&logmsg, 42, commit);
9040 switch (hle->cmd->code) {
9041 case GOT_HISTEDIT_PICK:
9042 case GOT_HISTEDIT_EDIT:
9043 printf("%s -> %s: %s\n", old_id_str,
9044 new_id_str ? new_id_str : "no-op change", logmsg);
9046 case GOT_HISTEDIT_DROP:
9047 case GOT_HISTEDIT_FOLD:
9048 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
9060 static const struct got_error *
9061 histedit_commit(struct got_pathlist_head *merged_paths,
9062 struct got_worktree *worktree, struct got_fileindex *fileindex,
9063 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
9064 struct got_repository *repo)
9066 const struct got_error *err;
9067 struct got_commit_object *commit;
9068 struct got_object_id *new_commit_id;
9070 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
9071 && hle->logmsg == NULL) {
9072 err = histedit_edit_logmsg(hle, repo);
9077 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
9081 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
9082 worktree, fileindex, tmp_branch, commit, hle->commit_id,
9085 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
9087 err = show_histedit_progress(commit, hle, NULL);
9089 err = show_histedit_progress(commit, hle, new_commit_id);
9090 free(new_commit_id);
9093 got_object_commit_close(commit);
9097 static const struct got_error *
9098 histedit_skip_commit(struct got_histedit_list_entry *hle,
9099 struct got_worktree *worktree, struct got_repository *repo)
9101 const struct got_error *error;
9102 struct got_commit_object *commit;
9104 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
9109 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
9113 error = show_histedit_progress(commit, hle, NULL);
9114 got_object_commit_close(commit);
9118 static const struct got_error *
9119 check_local_changes(void *arg, unsigned char status,
9120 unsigned char staged_status, const char *path,
9121 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
9122 struct got_object_id *commit_id, int dirfd, const char *de_name)
9124 int *have_local_changes = arg;
9127 case GOT_STATUS_ADD:
9128 case GOT_STATUS_DELETE:
9129 case GOT_STATUS_MODIFY:
9130 case GOT_STATUS_CONFLICT:
9131 *have_local_changes = 1;
9132 return got_error(GOT_ERR_CANCELLED);
9137 switch (staged_status) {
9138 case GOT_STATUS_ADD:
9139 case GOT_STATUS_DELETE:
9140 case GOT_STATUS_MODIFY:
9141 *have_local_changes = 1;
9142 return got_error(GOT_ERR_CANCELLED);
9150 static const struct got_error *
9151 cmd_histedit(int argc, char *argv[])
9153 const struct got_error *error = NULL;
9154 struct got_worktree *worktree = NULL;
9155 struct got_fileindex *fileindex = NULL;
9156 struct got_repository *repo = NULL;
9158 struct got_reference *branch = NULL;
9159 struct got_reference *tmp_branch = NULL;
9160 struct got_object_id *resume_commit_id = NULL;
9161 struct got_object_id *base_commit_id = NULL;
9162 struct got_object_id *head_commit_id = NULL;
9163 struct got_commit_object *commit = NULL;
9164 int ch, rebase_in_progress = 0;
9165 struct got_update_progress_arg upa;
9166 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
9167 int edit_logmsg_only = 0, fold_only = 0;
9168 int list_backups = 0;
9169 const char *edit_script_path = NULL;
9170 unsigned char rebase_status = GOT_STATUS_NO_CHANGE;
9171 struct got_object_id_queue commits;
9172 struct got_pathlist_head merged_paths;
9173 const struct got_object_id_queue *parent_ids;
9174 struct got_object_qid *pid;
9175 struct got_histedit_list histedit_cmds;
9176 struct got_histedit_list_entry *hle;
9178 SIMPLEQ_INIT(&commits);
9179 TAILQ_INIT(&histedit_cmds);
9180 TAILQ_INIT(&merged_paths);
9181 memset(&upa, 0, sizeof(upa));
9183 while ((ch = getopt(argc, argv, "acfF:ml")) != -1) {
9195 edit_script_path = optarg;
9198 edit_logmsg_only = 1;
9213 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9214 "unveil", NULL) == -1)
9217 if (abort_edit && continue_edit)
9218 option_conflict('a', 'c');
9219 if (edit_script_path && edit_logmsg_only)
9220 option_conflict('F', 'm');
9221 if (abort_edit && edit_logmsg_only)
9222 option_conflict('a', 'm');
9223 if (continue_edit && edit_logmsg_only)
9224 option_conflict('c', 'm');
9225 if (abort_edit && fold_only)
9226 option_conflict('a', 'f');
9227 if (continue_edit && fold_only)
9228 option_conflict('c', 'f');
9229 if (fold_only && edit_logmsg_only)
9230 option_conflict('f', 'm');
9231 if (edit_script_path && fold_only)
9232 option_conflict('F', 'f');
9235 option_conflict('l', 'a');
9237 option_conflict('l', 'c');
9238 if (edit_script_path)
9239 option_conflict('l', 'F');
9240 if (edit_logmsg_only)
9241 option_conflict('l', 'm');
9243 option_conflict('l', 'f');
9244 if (argc != 0 && argc != 1)
9246 } else if (argc != 0)
9250 * This command cannot apply unveil(2) in all cases because the
9251 * user may choose to run an editor to edit the histedit script
9252 * and to edit individual commit log messages.
9253 * unveil(2) traverses exec(2); if an editor is used we have to
9254 * apply unveil after edit script and log messages have been written.
9255 * XXX TODO: Make use of unveil(2) where possible.
9258 cwd = getcwd(NULL, 0);
9260 error = got_error_from_errno("getcwd");
9263 error = got_worktree_open(&worktree, cwd);
9266 if (error->code != GOT_ERR_NOT_WORKTREE)
9269 if (error->code == GOT_ERR_NOT_WORKTREE)
9270 error = wrap_not_worktree_error(error,
9277 error = got_repo_open(&repo,
9278 worktree ? got_worktree_get_repo_path(worktree) : cwd,
9282 error = apply_unveil(got_repo_get_path(repo), 0,
9283 worktree ? got_worktree_get_root_path(worktree) : NULL);
9286 error = list_backup_refs(
9287 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
9288 argc == 1 ? argv[0] : NULL, repo);
9289 goto done; /* nothing else to do */
9292 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9297 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9300 if (rebase_in_progress) {
9301 error = got_error(GOT_ERR_REBASING);
9305 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
9309 if (edit_in_progress && edit_logmsg_only) {
9310 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9311 "histedit operation is in progress in this "
9312 "work tree and must be continued or aborted "
9313 "before the -m option can be used");
9316 if (edit_in_progress && fold_only) {
9317 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
9318 "histedit operation is in progress in this "
9319 "work tree and must be continued or aborted "
9320 "before the -f option can be used");
9324 if (edit_in_progress && abort_edit) {
9325 error = got_worktree_histedit_continue(&resume_commit_id,
9326 &tmp_branch, &branch, &base_commit_id, &fileindex,
9330 printf("Switching work tree to %s\n",
9331 got_ref_get_symref_target(branch));
9332 error = got_worktree_histedit_abort(worktree, fileindex, repo,
9333 branch, base_commit_id, update_progress, &upa);
9336 printf("Histedit of %s aborted\n",
9337 got_ref_get_symref_target(branch));
9338 print_update_progress_stats(&upa);
9339 goto done; /* nothing else to do */
9340 } else if (abort_edit) {
9341 error = got_error(GOT_ERR_NOT_HISTEDIT);
9345 if (continue_edit) {
9348 if (!edit_in_progress) {
9349 error = got_error(GOT_ERR_NOT_HISTEDIT);
9353 error = got_worktree_get_histedit_script_path(&path, worktree);
9357 error = histedit_load_list(&histedit_cmds, path, repo);
9362 error = got_worktree_histedit_continue(&resume_commit_id,
9363 &tmp_branch, &branch, &base_commit_id, &fileindex,
9368 error = got_ref_resolve(&head_commit_id, repo, branch);
9372 error = got_object_open_as_commit(&commit, repo,
9376 parent_ids = got_object_commit_get_parent_ids(commit);
9377 pid = SIMPLEQ_FIRST(parent_ids);
9379 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9382 error = collect_commits(&commits, head_commit_id, pid->id,
9383 base_commit_id, got_worktree_get_path_prefix(worktree),
9384 GOT_ERR_HISTEDIT_PATH, repo);
9385 got_object_commit_close(commit);
9390 if (edit_in_progress) {
9391 error = got_error(GOT_ERR_HISTEDIT_BUSY);
9395 error = got_ref_open(&branch, repo,
9396 got_worktree_get_head_ref_name(worktree), 0);
9400 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
9401 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
9402 "will not edit commit history of a branch outside "
9403 "the \"refs/heads/\" reference namespace");
9407 error = got_ref_resolve(&head_commit_id, repo, branch);
9408 got_ref_close(branch);
9413 error = got_object_open_as_commit(&commit, repo,
9417 parent_ids = got_object_commit_get_parent_ids(commit);
9418 pid = SIMPLEQ_FIRST(parent_ids);
9420 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9423 error = collect_commits(&commits, head_commit_id, pid->id,
9424 got_worktree_get_base_commit_id(worktree),
9425 got_worktree_get_path_prefix(worktree),
9426 GOT_ERR_HISTEDIT_PATH, repo);
9427 got_object_commit_close(commit);
9432 if (SIMPLEQ_EMPTY(&commits)) {
9433 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
9437 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
9438 &base_commit_id, &fileindex, worktree, repo);
9442 if (edit_script_path) {
9443 error = histedit_load_list(&histedit_cmds,
9444 edit_script_path, repo);
9446 got_worktree_histedit_abort(worktree, fileindex,
9447 repo, branch, base_commit_id,
9448 update_progress, &upa);
9449 print_update_progress_stats(&upa);
9453 const char *branch_name;
9454 branch_name = got_ref_get_symref_target(branch);
9455 if (strncmp(branch_name, "refs/heads/", 11) == 0)
9457 error = histedit_edit_script(&histedit_cmds, &commits,
9458 branch_name, edit_logmsg_only, fold_only, repo);
9460 got_worktree_histedit_abort(worktree, fileindex,
9461 repo, branch, base_commit_id,
9462 update_progress, &upa);
9463 print_update_progress_stats(&upa);
9469 error = histedit_save_list(&histedit_cmds, worktree,
9472 got_worktree_histedit_abort(worktree, fileindex,
9473 repo, branch, base_commit_id,
9474 update_progress, &upa);
9475 print_update_progress_stats(&upa);
9481 error = histedit_check_script(&histedit_cmds, &commits, repo);
9485 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
9486 if (resume_commit_id) {
9487 if (got_object_id_cmp(hle->commit_id,
9488 resume_commit_id) != 0)
9491 resume_commit_id = NULL;
9492 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
9493 hle->cmd->code == GOT_HISTEDIT_FOLD) {
9494 error = histedit_skip_commit(hle, worktree,
9499 struct got_pathlist_head paths;
9500 int have_changes = 0;
9503 error = got_pathlist_append(&paths, "", NULL);
9506 error = got_worktree_status(worktree, &paths,
9507 repo, check_local_changes, &have_changes,
9508 check_cancelled, NULL);
9509 got_pathlist_free(&paths);
9511 if (error->code != GOT_ERR_CANCELLED)
9513 if (sigint_received || sigpipe_received)
9517 error = histedit_commit(NULL, worktree,
9518 fileindex, tmp_branch, hle, repo);
9522 error = got_object_open_as_commit(
9523 &commit, repo, hle->commit_id);
9526 error = show_histedit_progress(commit,
9528 got_object_commit_close(commit);
9537 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
9538 error = histedit_skip_commit(hle, worktree, repo);
9544 error = got_object_open_as_commit(&commit, repo,
9548 parent_ids = got_object_commit_get_parent_ids(commit);
9549 pid = SIMPLEQ_FIRST(parent_ids);
9551 error = got_worktree_histedit_merge_files(&merged_paths,
9552 worktree, fileindex, pid->id, hle->commit_id, repo,
9553 update_progress, &upa, check_cancelled, NULL);
9556 got_object_commit_close(commit);
9559 print_update_progress_stats(&upa);
9560 if (upa.conflicts > 0)
9561 rebase_status = GOT_STATUS_CONFLICT;
9563 if (rebase_status == GOT_STATUS_CONFLICT) {
9564 error = show_rebase_merge_conflict(hle->commit_id,
9568 got_worktree_rebase_pathlist_free(&merged_paths);
9572 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
9574 error = got_object_id_str(&id_str, hle->commit_id);
9577 printf("Stopping histedit for amending commit %s\n",
9580 got_worktree_rebase_pathlist_free(&merged_paths);
9581 error = got_worktree_histedit_postpone(worktree,
9586 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
9587 error = histedit_skip_commit(hle, worktree, repo);
9593 error = histedit_commit(&merged_paths, worktree, fileindex,
9594 tmp_branch, hle, repo);
9595 got_worktree_rebase_pathlist_free(&merged_paths);
9600 if (rebase_status == GOT_STATUS_CONFLICT) {
9601 error = got_worktree_histedit_postpone(worktree, fileindex);
9604 error = got_error_msg(GOT_ERR_CONFLICTS,
9605 "conflicts must be resolved before histedit can continue");
9607 error = histedit_complete(worktree, fileindex, tmp_branch,
9610 got_object_id_queue_free(&commits);
9611 histedit_free_list(&histedit_cmds);
9612 free(head_commit_id);
9613 free(base_commit_id);
9614 free(resume_commit_id);
9616 got_object_commit_close(commit);
9618 got_ref_close(branch);
9620 got_ref_close(tmp_branch);
9622 got_worktree_close(worktree);
9624 got_repo_close(repo);
9629 usage_integrate(void)
9631 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
9635 static const struct got_error *
9636 cmd_integrate(int argc, char *argv[])
9638 const struct got_error *error = NULL;
9639 struct got_repository *repo = NULL;
9640 struct got_worktree *worktree = NULL;
9641 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
9642 const char *branch_arg = NULL;
9643 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
9644 struct got_fileindex *fileindex = NULL;
9645 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
9647 struct got_update_progress_arg upa;
9649 while ((ch = getopt(argc, argv, "")) != -1) {
9662 branch_arg = argv[0];
9664 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9665 "unveil", NULL) == -1)
9668 cwd = getcwd(NULL, 0);
9670 error = got_error_from_errno("getcwd");
9674 error = got_worktree_open(&worktree, cwd);
9676 if (error->code == GOT_ERR_NOT_WORKTREE)
9677 error = wrap_not_worktree_error(error, "integrate",
9682 error = check_rebase_or_histedit_in_progress(worktree);
9686 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9691 error = apply_unveil(got_repo_get_path(repo), 0,
9692 got_worktree_get_root_path(worktree));
9696 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
9697 error = got_error_from_errno("asprintf");
9701 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
9702 &base_branch_ref, worktree, refname, repo);
9706 refname = strdup(got_ref_get_name(branch_ref));
9707 if (refname == NULL) {
9708 error = got_error_from_errno("strdup");
9709 got_worktree_integrate_abort(worktree, fileindex, repo,
9710 branch_ref, base_branch_ref);
9713 base_refname = strdup(got_ref_get_name(base_branch_ref));
9714 if (base_refname == NULL) {
9715 error = got_error_from_errno("strdup");
9716 got_worktree_integrate_abort(worktree, fileindex, repo,
9717 branch_ref, base_branch_ref);
9721 error = got_ref_resolve(&commit_id, repo, branch_ref);
9725 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
9729 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
9730 error = got_error_msg(GOT_ERR_SAME_BRANCH,
9731 "specified branch has already been integrated");
9732 got_worktree_integrate_abort(worktree, fileindex, repo,
9733 branch_ref, base_branch_ref);
9737 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
9739 if (error->code == GOT_ERR_ANCESTRY)
9740 error = got_error(GOT_ERR_REBASE_REQUIRED);
9741 got_worktree_integrate_abort(worktree, fileindex, repo,
9742 branch_ref, base_branch_ref);
9746 memset(&upa, 0, sizeof(upa));
9747 error = got_worktree_integrate_continue(worktree, fileindex, repo,
9748 branch_ref, base_branch_ref, update_progress, &upa,
9749 check_cancelled, NULL);
9753 printf("Integrated %s into %s\n", refname, base_refname);
9754 print_update_progress_stats(&upa);
9757 got_repo_close(repo);
9759 got_worktree_close(worktree);
9761 free(base_commit_id);
9771 fprintf(stderr, "usage: %s stage [-l] | [-p] [-F response-script] "
9772 "[-S] [file-path ...]\n",
9777 static const struct got_error *
9778 print_stage(void *arg, unsigned char status, unsigned char staged_status,
9779 const char *path, struct got_object_id *blob_id,
9780 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
9781 int dirfd, const char *de_name)
9783 const struct got_error *err = NULL;
9784 char *id_str = NULL;
9786 if (staged_status != GOT_STATUS_ADD &&
9787 staged_status != GOT_STATUS_MODIFY &&
9788 staged_status != GOT_STATUS_DELETE)
9791 if (staged_status == GOT_STATUS_ADD ||
9792 staged_status == GOT_STATUS_MODIFY)
9793 err = got_object_id_str(&id_str, staged_blob_id);
9795 err = got_object_id_str(&id_str, blob_id);
9799 printf("%s %c %s\n", id_str, staged_status, path);
9804 static const struct got_error *
9805 cmd_stage(int argc, char *argv[])
9807 const struct got_error *error = NULL;
9808 struct got_repository *repo = NULL;
9809 struct got_worktree *worktree = NULL;
9811 struct got_pathlist_head paths;
9812 struct got_pathlist_entry *pe;
9813 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
9814 FILE *patch_script_file = NULL;
9815 const char *patch_script_path = NULL;
9816 struct choose_patch_arg cpa;
9820 while ((ch = getopt(argc, argv, "lpF:S")) != -1) {
9829 patch_script_path = optarg;
9832 allow_bad_symlinks = 1;
9844 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9845 "unveil", NULL) == -1)
9848 if (list_stage && (pflag || patch_script_path))
9849 errx(1, "-l option cannot be used with other options");
9850 if (patch_script_path && !pflag)
9851 errx(1, "-F option can only be used together with -p option");
9853 cwd = getcwd(NULL, 0);
9855 error = got_error_from_errno("getcwd");
9859 error = got_worktree_open(&worktree, cwd);
9861 if (error->code == GOT_ERR_NOT_WORKTREE)
9862 error = wrap_not_worktree_error(error, "stage", cwd);
9866 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9871 if (patch_script_path) {
9872 patch_script_file = fopen(patch_script_path, "r");
9873 if (patch_script_file == NULL) {
9874 error = got_error_from_errno2("fopen",
9879 error = apply_unveil(got_repo_get_path(repo), 0,
9880 got_worktree_get_root_path(worktree));
9884 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9889 error = got_worktree_status(worktree, &paths, repo,
9890 print_stage, NULL, check_cancelled, NULL);
9892 cpa.patch_script_file = patch_script_file;
9893 cpa.action = "stage";
9894 error = got_worktree_stage(worktree, &paths,
9895 pflag ? NULL : print_status, NULL,
9896 pflag ? choose_patch : NULL, &cpa,
9897 allow_bad_symlinks, repo);
9900 if (patch_script_file && fclose(patch_script_file) == EOF &&
9902 error = got_error_from_errno2("fclose", patch_script_path);
9904 got_repo_close(repo);
9906 got_worktree_close(worktree);
9907 TAILQ_FOREACH(pe, &paths, entry)
9908 free((char *)pe->path);
9909 got_pathlist_free(&paths);
9917 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
9918 "[file-path ...]\n",
9924 static const struct got_error *
9925 cmd_unstage(int argc, char *argv[])
9927 const struct got_error *error = NULL;
9928 struct got_repository *repo = NULL;
9929 struct got_worktree *worktree = NULL;
9931 struct got_pathlist_head paths;
9932 struct got_pathlist_entry *pe;
9934 struct got_update_progress_arg upa;
9935 FILE *patch_script_file = NULL;
9936 const char *patch_script_path = NULL;
9937 struct choose_patch_arg cpa;
9941 while ((ch = getopt(argc, argv, "pF:")) != -1) {
9947 patch_script_path = optarg;
9959 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9960 "unveil", NULL) == -1)
9963 if (patch_script_path && !pflag)
9964 errx(1, "-F option can only be used together with -p option");
9966 cwd = getcwd(NULL, 0);
9968 error = got_error_from_errno("getcwd");
9972 error = got_worktree_open(&worktree, cwd);
9974 if (error->code == GOT_ERR_NOT_WORKTREE)
9975 error = wrap_not_worktree_error(error, "unstage", cwd);
9979 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9984 if (patch_script_path) {
9985 patch_script_file = fopen(patch_script_path, "r");
9986 if (patch_script_file == NULL) {
9987 error = got_error_from_errno2("fopen",
9993 error = apply_unveil(got_repo_get_path(repo), 0,
9994 got_worktree_get_root_path(worktree));
9998 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
10002 cpa.patch_script_file = patch_script_file;
10003 cpa.action = "unstage";
10004 memset(&upa, 0, sizeof(upa));
10005 error = got_worktree_unstage(worktree, &paths, update_progress,
10006 &upa, pflag ? choose_patch : NULL, &cpa, repo);
10008 print_update_progress_stats(&upa);
10010 if (patch_script_file && fclose(patch_script_file) == EOF &&
10012 error = got_error_from_errno2("fclose", patch_script_path);
10014 got_repo_close(repo);
10016 got_worktree_close(worktree);
10017 TAILQ_FOREACH(pe, &paths, entry)
10018 free((char *)pe->path);
10019 got_pathlist_free(&paths);
10027 fprintf(stderr, "usage: %s cat [-r repository ] [ -c commit ] [ -P ] "
10028 "arg1 [arg2 ...]\n", getprogname());
10032 static const struct got_error *
10033 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10035 const struct got_error *err;
10036 struct got_blob_object *blob;
10038 err = got_object_open_as_blob(&blob, repo, id, 8192);
10042 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
10043 got_object_blob_close(blob);
10047 static const struct got_error *
10048 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10050 const struct got_error *err;
10051 struct got_tree_object *tree;
10054 err = got_object_open_as_tree(&tree, repo, id);
10058 nentries = got_object_tree_get_nentries(tree);
10059 for (i = 0; i < nentries; i++) {
10060 struct got_tree_entry *te;
10062 if (sigint_received || sigpipe_received)
10064 te = got_object_tree_get_entry(tree, i);
10065 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
10068 fprintf(outfile, "%s %.7o %s\n", id_str,
10069 got_tree_entry_get_mode(te),
10070 got_tree_entry_get_name(te));
10074 got_object_tree_close(tree);
10078 static const struct got_error *
10079 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10081 const struct got_error *err;
10082 struct got_commit_object *commit;
10083 const struct got_object_id_queue *parent_ids;
10084 struct got_object_qid *pid;
10085 char *id_str = NULL;
10086 const char *logmsg = NULL;
10088 err = got_object_open_as_commit(&commit, repo, id);
10092 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
10096 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
10097 parent_ids = got_object_commit_get_parent_ids(commit);
10098 fprintf(outfile, "numparents %d\n",
10099 got_object_commit_get_nparents(commit));
10100 SIMPLEQ_FOREACH(pid, parent_ids, entry) {
10102 err = got_object_id_str(&pid_str, pid->id);
10105 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
10108 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_AUTHOR,
10109 got_object_commit_get_author(commit),
10110 (long long)got_object_commit_get_author_time(commit));
10112 fprintf(outfile, "%s%s %lld +0000\n", GOT_COMMIT_LABEL_COMMITTER,
10113 got_object_commit_get_author(commit),
10114 (long long)got_object_commit_get_committer_time(commit));
10116 logmsg = got_object_commit_get_logmsg_raw(commit);
10117 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
10118 fprintf(outfile, "%s", logmsg);
10121 got_object_commit_close(commit);
10125 static const struct got_error *
10126 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
10128 const struct got_error *err;
10129 struct got_tag_object *tag;
10130 char *id_str = NULL;
10131 const char *tagmsg = NULL;
10133 err = got_object_open_as_tag(&tag, repo, id);
10137 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
10141 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
10143 switch (got_object_tag_get_object_type(tag)) {
10144 case GOT_OBJ_TYPE_BLOB:
10145 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10146 GOT_OBJ_LABEL_BLOB);
10148 case GOT_OBJ_TYPE_TREE:
10149 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10150 GOT_OBJ_LABEL_TREE);
10152 case GOT_OBJ_TYPE_COMMIT:
10153 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10154 GOT_OBJ_LABEL_COMMIT);
10156 case GOT_OBJ_TYPE_TAG:
10157 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
10158 GOT_OBJ_LABEL_TAG);
10164 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
10165 got_object_tag_get_name(tag));
10167 fprintf(outfile, "%s%s %lld +0000\n", GOT_TAG_LABEL_TAGGER,
10168 got_object_tag_get_tagger(tag),
10169 (long long)got_object_tag_get_tagger_time(tag));
10171 tagmsg = got_object_tag_get_message(tag);
10172 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
10173 fprintf(outfile, "%s", tagmsg);
10176 got_object_tag_close(tag);
10180 static const struct got_error *
10181 cmd_cat(int argc, char *argv[])
10183 const struct got_error *error;
10184 struct got_repository *repo = NULL;
10185 struct got_worktree *worktree = NULL;
10186 char *cwd = NULL, *repo_path = NULL, *label = NULL;
10187 const char *commit_id_str = NULL;
10188 struct got_object_id *id = NULL, *commit_id = NULL;
10189 int ch, obj_type, i, force_path = 0;
10190 struct got_reflist_head refs;
10195 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
10200 while ((ch = getopt(argc, argv, "c:r:P")) != -1) {
10203 commit_id_str = optarg;
10206 repo_path = realpath(optarg, NULL);
10207 if (repo_path == NULL)
10208 return got_error_from_errno2("realpath",
10210 got_path_strip_trailing_slashes(repo_path);
10224 cwd = getcwd(NULL, 0);
10226 error = got_error_from_errno("getcwd");
10229 error = got_worktree_open(&worktree, cwd);
10230 if (error && error->code != GOT_ERR_NOT_WORKTREE)
10233 if (repo_path == NULL) {
10234 repo_path = strdup(
10235 got_worktree_get_repo_path(worktree));
10236 if (repo_path == NULL) {
10237 error = got_error_from_errno("strdup");
10243 if (repo_path == NULL) {
10244 repo_path = getcwd(NULL, 0);
10245 if (repo_path == NULL)
10246 return got_error_from_errno("getcwd");
10249 error = got_repo_open(&repo, repo_path, NULL);
10254 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
10258 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
10262 if (commit_id_str == NULL)
10263 commit_id_str = GOT_REF_HEAD;
10264 error = got_repo_match_object_id(&commit_id, NULL,
10265 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
10269 for (i = 0; i < argc; i++) {
10271 error = got_object_id_by_path(&id, repo, commit_id,
10276 error = got_repo_match_object_id(&id, &label, argv[i],
10277 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
10280 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
10281 error->code != GOT_ERR_NOT_REF)
10283 error = got_object_id_by_path(&id, repo,
10284 commit_id, argv[i]);
10290 error = got_object_get_type(&obj_type, repo, id);
10294 switch (obj_type) {
10295 case GOT_OBJ_TYPE_BLOB:
10296 error = cat_blob(id, repo, stdout);
10298 case GOT_OBJ_TYPE_TREE:
10299 error = cat_tree(id, repo, stdout);
10301 case GOT_OBJ_TYPE_COMMIT:
10302 error = cat_commit(id, repo, stdout);
10304 case GOT_OBJ_TYPE_TAG:
10305 error = cat_tag(id, repo, stdout);
10308 error = got_error(GOT_ERR_OBJ_TYPE);
10323 got_worktree_close(worktree);
10325 const struct got_error *repo_error;
10326 repo_error = got_repo_close(repo);
10328 error = repo_error;
10330 got_ref_list_free(&refs);
10337 fprintf(stderr, "usage: %s info [path ...]\n",
10342 static const struct got_error *
10343 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
10344 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
10345 struct got_object_id *commit_id)
10347 const struct got_error *err = NULL;
10348 char *id_str = NULL;
10350 struct tm mytm, *tm;
10351 struct got_pathlist_head *paths = arg;
10352 struct got_pathlist_entry *pe;
10355 * Clear error indication from any of the path arguments which
10356 * would cause this file index entry to be displayed.
10358 TAILQ_FOREACH(pe, paths, entry) {
10359 if (got_path_cmp(path, pe->path, strlen(path),
10360 pe->path_len) == 0 ||
10361 got_path_is_child(path, pe->path, pe->path_len))
10362 pe->data = NULL; /* no error */
10365 printf(GOT_COMMIT_SEP_STR);
10367 printf("symlink: %s\n", path);
10368 else if (S_ISREG(mode)) {
10369 printf("file: %s\n", path);
10370 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
10371 } else if (S_ISDIR(mode))
10372 printf("directory: %s\n", path);
10374 printf("something: %s\n", path);
10376 tm = localtime_r(&mtime, &mytm);
10379 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
10380 return got_error(GOT_ERR_NO_SPACE);
10381 printf("timestamp: %s\n", datebuf);
10384 err = got_object_id_str(&id_str, blob_id);
10387 printf("based on blob: %s\n", id_str);
10391 if (staged_blob_id) {
10392 err = got_object_id_str(&id_str, staged_blob_id);
10395 printf("based on staged blob: %s\n", id_str);
10400 err = got_object_id_str(&id_str, commit_id);
10403 printf("based on commit: %s\n", id_str);
10410 static const struct got_error *
10411 cmd_info(int argc, char *argv[])
10413 const struct got_error *error = NULL;
10414 struct got_worktree *worktree = NULL;
10415 char *cwd = NULL, *id_str = NULL;
10416 struct got_pathlist_head paths;
10417 struct got_pathlist_entry *pe;
10418 char *uuidstr = NULL;
10419 int ch, show_files = 0;
10421 TAILQ_INIT(&paths);
10423 while ((ch = getopt(argc, argv, "")) != -1) {
10435 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
10439 cwd = getcwd(NULL, 0);
10441 error = got_error_from_errno("getcwd");
10445 error = got_worktree_open(&worktree, cwd);
10447 if (error->code == GOT_ERR_NOT_WORKTREE)
10448 error = wrap_not_worktree_error(error, "info", cwd);
10452 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
10457 error = get_worktree_paths_from_argv(&paths, argc, argv,
10464 error = got_object_id_str(&id_str,
10465 got_worktree_get_base_commit_id(worktree));
10469 error = got_worktree_get_uuid(&uuidstr, worktree);
10473 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
10474 printf("work tree base commit: %s\n", id_str);
10475 printf("work tree path prefix: %s\n",
10476 got_worktree_get_path_prefix(worktree));
10477 printf("work tree branch reference: %s\n",
10478 got_worktree_get_head_ref_name(worktree));
10479 printf("work tree UUID: %s\n", uuidstr);
10480 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
10483 struct got_pathlist_entry *pe;
10484 TAILQ_FOREACH(pe, &paths, entry) {
10485 if (pe->path_len == 0)
10488 * Assume this path will fail. This will be corrected
10489 * in print_path_info() in case the path does suceeed.
10491 pe->data = (void *)got_error_path(pe->path,
10494 error = got_worktree_path_info(worktree, &paths,
10495 print_path_info, &paths, check_cancelled, NULL);
10498 TAILQ_FOREACH(pe, &paths, entry) {
10499 if (pe->data != NULL) {
10500 error = pe->data; /* bad path */
10506 TAILQ_FOREACH(pe, &paths, entry)
10507 free((char *)pe->path);
10508 got_pathlist_free(&paths);