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>
21 #include <sys/types.h>
45 #include "got_version.h"
46 #include "got_error.h"
47 #include "got_object.h"
48 #include "got_reference.h"
49 #include "got_repository.h"
51 #include "got_cancel.h"
52 #include "got_worktree.h"
54 #include "got_commit_graph.h"
55 #include "got_fetch.h"
57 #include "got_blame.h"
58 #include "got_privsep.h"
59 #include "got_opentemp.h"
60 #include "got_gotconfig.h"
62 #include "got_patch.h"
65 #include "got_keyword.h"
68 #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
71 static volatile sig_atomic_t sigint_received;
72 static volatile sig_atomic_t sigpipe_received;
75 catch_sigint(int signo)
81 catch_sigpipe(int signo)
89 const struct got_error *(*cmd_main)(int, char *[]);
90 void (*cmd_usage)(void);
91 const char *cmd_alias;
94 __dead static void usage(int, int);
95 __dead static void usage_import(void);
96 __dead static void usage_clone(void);
97 __dead static void usage_fetch(void);
98 __dead static void usage_checkout(void);
99 __dead static void usage_update(void);
100 __dead static void usage_log(void);
101 __dead static void usage_diff(void);
102 __dead static void usage_blame(void);
103 __dead static void usage_tree(void);
104 __dead static void usage_status(void);
105 __dead static void usage_ref(void);
106 __dead static void usage_branch(void);
107 __dead static void usage_tag(void);
108 __dead static void usage_add(void);
109 __dead static void usage_remove(void);
110 __dead static void usage_patch(void);
111 __dead static void usage_revert(void);
112 __dead static void usage_commit(void);
113 __dead static void usage_send(void);
114 __dead static void usage_cherrypick(void);
115 __dead static void usage_backout(void);
116 __dead static void usage_rebase(void);
117 __dead static void usage_histedit(void);
118 __dead static void usage_integrate(void);
119 __dead static void usage_merge(void);
120 __dead static void usage_stage(void);
121 __dead static void usage_unstage(void);
122 __dead static void usage_cat(void);
123 __dead static void usage_info(void);
125 static const struct got_error* cmd_import(int, char *[]);
126 static const struct got_error* cmd_clone(int, char *[]);
127 static const struct got_error* cmd_fetch(int, char *[]);
128 static const struct got_error* cmd_checkout(int, char *[]);
129 static const struct got_error* cmd_update(int, char *[]);
130 static const struct got_error* cmd_log(int, char *[]);
131 static const struct got_error* cmd_diff(int, char *[]);
132 static const struct got_error* cmd_blame(int, char *[]);
133 static const struct got_error* cmd_tree(int, char *[]);
134 static const struct got_error* cmd_status(int, char *[]);
135 static const struct got_error* cmd_ref(int, char *[]);
136 static const struct got_error* cmd_branch(int, char *[]);
137 static const struct got_error* cmd_tag(int, char *[]);
138 static const struct got_error* cmd_add(int, char *[]);
139 static const struct got_error* cmd_remove(int, char *[]);
140 static const struct got_error* cmd_patch(int, char *[]);
141 static const struct got_error* cmd_revert(int, char *[]);
142 static const struct got_error* cmd_commit(int, char *[]);
143 static const struct got_error* cmd_send(int, char *[]);
144 static const struct got_error* cmd_cherrypick(int, char *[]);
145 static const struct got_error* cmd_backout(int, char *[]);
146 static const struct got_error* cmd_rebase(int, char *[]);
147 static const struct got_error* cmd_histedit(int, char *[]);
148 static const struct got_error* cmd_integrate(int, char *[]);
149 static const struct got_error* cmd_merge(int, char *[]);
150 static const struct got_error* cmd_stage(int, char *[]);
151 static const struct got_error* cmd_unstage(int, char *[]);
152 static const struct got_error* cmd_cat(int, char *[]);
153 static const struct got_error* cmd_info(int, char *[]);
155 static const struct got_cmd got_commands[] = {
156 { "import", cmd_import, usage_import, "im" },
157 { "clone", cmd_clone, usage_clone, "cl" },
158 { "fetch", cmd_fetch, usage_fetch, "fe" },
159 { "checkout", cmd_checkout, usage_checkout, "co" },
160 { "update", cmd_update, usage_update, "up" },
161 { "log", cmd_log, usage_log, "" },
162 { "diff", cmd_diff, usage_diff, "di" },
163 { "blame", cmd_blame, usage_blame, "bl" },
164 { "tree", cmd_tree, usage_tree, "tr" },
165 { "status", cmd_status, usage_status, "st" },
166 { "ref", cmd_ref, usage_ref, "" },
167 { "branch", cmd_branch, usage_branch, "br" },
168 { "tag", cmd_tag, usage_tag, "" },
169 { "add", cmd_add, usage_add, "" },
170 { "remove", cmd_remove, usage_remove, "rm" },
171 { "patch", cmd_patch, usage_patch, "pa" },
172 { "revert", cmd_revert, usage_revert, "rv" },
173 { "commit", cmd_commit, usage_commit, "ci" },
174 { "send", cmd_send, usage_send, "se" },
175 { "cherrypick", cmd_cherrypick, usage_cherrypick, "cy" },
176 { "backout", cmd_backout, usage_backout, "bo" },
177 { "rebase", cmd_rebase, usage_rebase, "rb" },
178 { "histedit", cmd_histedit, usage_histedit, "he" },
179 { "integrate", cmd_integrate, usage_integrate,"ig" },
180 { "merge", cmd_merge, usage_merge, "mg" },
181 { "stage", cmd_stage, usage_stage, "sg" },
182 { "unstage", cmd_unstage, usage_unstage, "ug" },
183 { "cat", cmd_cat, usage_cat, "" },
184 { "info", cmd_info, usage_info, "" },
188 list_commands(FILE *fp)
192 fprintf(fp, "commands:");
193 for (i = 0; i < nitems(got_commands); i++) {
194 const struct got_cmd *cmd = &got_commands[i];
195 fprintf(fp, " %s", cmd->cmd_name);
201 option_conflict(char a, char b)
203 errx(1, "-%c and -%c options are mutually exclusive", a, b);
207 main(int argc, char *argv[])
209 const struct got_cmd *cmd;
212 int hflag = 0, Vflag = 0;
213 static const struct option longopts[] = {
214 { "version", no_argument, NULL, 'V' },
218 setlocale(LC_CTYPE, "");
220 while ((ch = getopt_long(argc, argv, "+hV", longopts, NULL)) != -1) {
240 got_version_print_str();
245 usage(hflag, hflag ? 0 : 1);
247 signal(SIGINT, catch_sigint);
248 signal(SIGPIPE, catch_sigpipe);
250 for (i = 0; i < nitems(got_commands); i++) {
251 const struct got_error *error;
253 cmd = &got_commands[i];
255 if (strcmp(cmd->cmd_name, argv[0]) != 0 &&
256 strcmp(cmd->cmd_alias, argv[0]) != 0)
262 error = cmd->cmd_main(argc, argv);
263 if (error && error->code != GOT_ERR_CANCELLED &&
264 error->code != GOT_ERR_PRIVSEP_EXIT &&
265 !(sigpipe_received &&
266 error->code == GOT_ERR_ERRNO && errno == EPIPE) &&
268 error->code == GOT_ERR_ERRNO && errno == EINTR)) {
270 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
277 fprintf(stderr, "%s: unknown command '%s'\n", getprogname(), argv[0]);
278 list_commands(stderr);
283 usage(int hflag, int status)
285 FILE *fp = (status == 0) ? stdout : stderr;
287 fprintf(fp, "usage: %s [-hV] command [arg ...]\n",
294 static const struct got_error *
295 get_editor(char **abspath)
297 const struct got_error *err = NULL;
302 editor = getenv("VISUAL");
304 editor = getenv("EDITOR");
307 err = got_path_find_prog(abspath, editor);
312 if (*abspath == NULL) {
313 *abspath = strdup("/usr/bin/vi");
314 if (*abspath == NULL)
315 return got_error_from_errno("strdup");
321 static const struct got_error *
322 apply_unveil(const char *repo_path, int repo_read_only,
323 const char *worktree_path)
325 const struct got_error *err;
328 if (unveil("gmon.out", "rwc") != 0)
329 return got_error_from_errno2("unveil", "gmon.out");
331 if (repo_path && unveil(repo_path, repo_read_only ? "r" : "rwc") != 0)
332 return got_error_from_errno2("unveil", repo_path);
334 if (worktree_path && unveil(worktree_path, "rwc") != 0)
335 return got_error_from_errno2("unveil", worktree_path);
337 if (unveil(GOT_TMPDIR_STR, "rwc") != 0)
338 return got_error_from_errno2("unveil", GOT_TMPDIR_STR);
340 err = got_privsep_unveil_exec_helpers();
344 if (unveil(NULL, NULL) != 0)
345 return got_error_from_errno("unveil");
353 fprintf(stderr, "usage: %s import [-b branch] [-I pattern] [-m message] "
354 "[-r repository-path] directory\n", getprogname());
359 spawn_editor(const char *editor, const char *file)
362 sig_t sighup, sigint, sigquit;
365 sighup = signal(SIGHUP, SIG_IGN);
366 sigint = signal(SIGINT, SIG_IGN);
367 sigquit = signal(SIGQUIT, SIG_IGN);
369 switch (pid = fork()) {
373 execl(editor, editor, file, (char *)NULL);
377 while (waitpid(pid, &st, 0) == -1)
382 (void)signal(SIGHUP, sighup);
383 (void)signal(SIGINT, sigint);
384 (void)signal(SIGQUIT, sigquit);
386 if (!WIFEXITED(st)) {
391 return WEXITSTATUS(st);
394 static const struct got_error *
395 read_logmsg(char **logmsg, size_t *len, FILE *fp, size_t filesize)
397 const struct got_error *err = NULL;
404 if (fseeko(fp, 0L, SEEK_SET) == -1)
405 return got_error_from_errno("fseeko");
407 *logmsg = malloc(filesize + 1);
409 return got_error_from_errno("malloc");
412 while (getline(&line, &linesize, fp) != -1) {
413 if (line[0] == '#' || (*len == 0 && line[0] == '\n'))
414 continue; /* remove comments and leading empty lines */
415 *len = strlcat(*logmsg, line, filesize + 1);
416 if (*len >= filesize + 1) {
417 err = got_error(GOT_ERR_NO_SPACE);
422 err = got_ferror(fp, GOT_ERR_IO);
426 while (*len > 0 && (*logmsg)[*len - 1] == '\n') {
427 (*logmsg)[*len - 1] = '\0';
440 static const struct got_error *
441 edit_logmsg(char **logmsg, const char *editor, const char *logmsg_path,
442 const char *initial_content, size_t initial_content_len,
443 int require_modification)
445 const struct got_error *err = NULL;
452 if (stat(logmsg_path, &st) == -1)
453 return got_error_from_errno2("stat", logmsg_path);
455 if (spawn_editor(editor, logmsg_path) == -1)
456 return got_error_from_errno("failed spawning editor");
458 if (require_modification) {
459 struct timespec timeout;
463 nanosleep(&timeout, NULL);
466 if (stat(logmsg_path, &st2) == -1)
467 return got_error_from_errno2("stat", logmsg_path);
469 if (require_modification && st.st_size == st2.st_size &&
470 timespeccmp(&st.st_mtim, &st2.st_mtim, ==))
471 return got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
472 "no changes made to commit message, aborting");
474 fp = fopen(logmsg_path, "re");
476 err = got_error_from_errno("fopen");
480 /* strip comments and leading/trailing newlines */
481 err = read_logmsg(logmsg, &logmsg_len, fp, st2.st_size);
484 if (logmsg_len == 0) {
485 err = got_error_msg(GOT_ERR_COMMIT_MSG_EMPTY,
486 "commit message cannot be empty, aborting");
490 if (fp && fclose(fp) == EOF && err == NULL)
491 err = got_error_from_errno("fclose");
499 static const struct got_error *
500 collect_import_msg(char **logmsg, char **logmsg_path, const char *editor,
501 const char *path_dir, const char *branch_name)
503 char *initial_content = NULL;
504 const struct got_error *err = NULL;
505 int initial_content_len;
508 initial_content_len = asprintf(&initial_content,
509 "\n# %s to be imported to branch %s\n", path_dir,
511 if (initial_content_len == -1)
512 return got_error_from_errno("asprintf");
514 err = got_opentemp_named_fd(logmsg_path, &fd,
515 GOT_TMPDIR_STR "/got-importmsg", "");
519 if (write(fd, initial_content, initial_content_len) == -1) {
520 err = got_error_from_errno2("write", *logmsg_path);
523 if (close(fd) == -1) {
524 err = got_error_from_errno2("close", *logmsg_path);
529 err = edit_logmsg(logmsg, editor, *logmsg_path, initial_content,
530 initial_content_len, 1);
532 if (fd != -1 && close(fd) == -1 && err == NULL)
533 err = got_error_from_errno2("close", *logmsg_path);
534 free(initial_content);
542 static const struct got_error *
543 import_progress(void *arg, const char *path)
545 printf("A %s\n", path);
549 static const struct got_error *
550 valid_author(const char *author)
552 const char *email = author;
555 * Git' expects the author (or committer) to be in the form
556 * "name <email>", which are mostly free form (see the
557 * "committer" description in git-fast-import(1)). We're only
558 * doing this to avoid git's object parser breaking on commits
562 while (*author && *author != '\n' && *author != '<' && *author != '>')
564 if (author != email && *author == '<' && *(author - 1) != ' ')
565 return got_error_fmt(GOT_ERR_COMMIT_BAD_AUTHOR, "%s: space "
566 "between author name and email required", email);
567 if (*author++ != '<')
568 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
569 while (*author && *author != '\n' && *author != '<' && *author != '>')
571 if (strcmp(author, ">") != 0)
572 return got_error_fmt(GOT_ERR_COMMIT_NO_EMAIL, "%s", email);
576 static const struct got_error *
577 get_author(char **author, struct got_repository *repo,
578 struct got_worktree *worktree)
580 const struct got_error *err = NULL;
581 const char *got_author = NULL, *name, *email;
582 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
587 worktree_conf = got_worktree_get_gotconfig(worktree);
588 repo_conf = got_repo_get_gotconfig(repo);
591 * Priority of potential author information sources, from most
592 * significant to least significant:
593 * 1) work tree's .got/got.conf file
594 * 2) repository's got.conf file
595 * 3) repository's git config file
596 * 4) environment variables
597 * 5) global git config files (in user's home directory or /etc)
601 got_author = got_gotconfig_get_author(worktree_conf);
602 if (got_author == NULL)
603 got_author = got_gotconfig_get_author(repo_conf);
604 if (got_author == NULL) {
605 name = got_repo_get_gitconfig_author_name(repo);
606 email = got_repo_get_gitconfig_author_email(repo);
608 if (asprintf(author, "%s <%s>", name, email) == -1)
609 return got_error_from_errno("asprintf");
613 got_author = getenv("GOT_AUTHOR");
614 if (got_author == NULL) {
615 name = got_repo_get_global_gitconfig_author_name(repo);
616 email = got_repo_get_global_gitconfig_author_email(
619 if (asprintf(author, "%s <%s>", name, email)
621 return got_error_from_errno("asprintf");
624 /* TODO: Look up user in password database? */
625 return got_error(GOT_ERR_COMMIT_NO_AUTHOR);
629 *author = strdup(got_author);
631 return got_error_from_errno("strdup");
633 err = valid_author(*author);
641 static const struct got_error *
642 get_allowed_signers(char **allowed_signers, struct got_repository *repo,
643 struct got_worktree *worktree)
645 const char *got_allowed_signers = NULL;
646 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
648 *allowed_signers = NULL;
651 worktree_conf = got_worktree_get_gotconfig(worktree);
652 repo_conf = got_repo_get_gotconfig(repo);
655 * Priority of potential author information sources, from most
656 * significant to least significant:
657 * 1) work tree's .got/got.conf file
658 * 2) repository's got.conf file
662 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
664 if (got_allowed_signers == NULL)
665 got_allowed_signers = got_gotconfig_get_allowed_signers_file(
668 if (got_allowed_signers) {
669 *allowed_signers = strdup(got_allowed_signers);
670 if (*allowed_signers == NULL)
671 return got_error_from_errno("strdup");
676 static const struct got_error *
677 get_revoked_signers(char **revoked_signers, struct got_repository *repo,
678 struct got_worktree *worktree)
680 const char *got_revoked_signers = NULL;
681 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
683 *revoked_signers = NULL;
686 worktree_conf = got_worktree_get_gotconfig(worktree);
687 repo_conf = got_repo_get_gotconfig(repo);
690 * Priority of potential author information sources, from most
691 * significant to least significant:
692 * 1) work tree's .got/got.conf file
693 * 2) repository's got.conf file
697 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
699 if (got_revoked_signers == NULL)
700 got_revoked_signers = got_gotconfig_get_revoked_signers_file(
703 if (got_revoked_signers) {
704 *revoked_signers = strdup(got_revoked_signers);
705 if (*revoked_signers == NULL)
706 return got_error_from_errno("strdup");
712 get_signer_id(struct got_repository *repo, struct got_worktree *worktree)
714 const char *got_signer_id = NULL;
715 const struct got_gotconfig *worktree_conf = NULL, *repo_conf = NULL;
718 worktree_conf = got_worktree_get_gotconfig(worktree);
719 repo_conf = got_repo_get_gotconfig(repo);
722 * Priority of potential author information sources, from most
723 * significant to least significant:
724 * 1) work tree's .got/got.conf file
725 * 2) repository's got.conf file
729 got_signer_id = got_gotconfig_get_signer_id(worktree_conf);
730 if (got_signer_id == NULL)
731 got_signer_id = got_gotconfig_get_signer_id(repo_conf);
733 return got_signer_id;
736 static const struct got_error *
737 get_gitconfig_path(char **gitconfig_path)
739 const char *homedir = getenv("HOME");
741 *gitconfig_path = NULL;
743 if (asprintf(gitconfig_path, "%s/.gitconfig", homedir) == -1)
744 return got_error_from_errno("asprintf");
750 static const struct got_error *
751 cmd_import(int argc, char *argv[])
753 const struct got_error *error = NULL;
754 char *path_dir = NULL, *repo_path = NULL, *logmsg = NULL;
755 char *gitconfig_path = NULL, *editor = NULL, *author = NULL;
756 const char *branch_name = NULL;
757 char *id_str = NULL, *logmsg_path = NULL;
758 char refname[PATH_MAX] = "refs/heads/";
759 struct got_repository *repo = NULL;
760 struct got_reference *branch_ref = NULL, *head_ref = NULL;
761 struct got_object_id *new_commit_id = NULL;
763 struct got_pathlist_head ignores;
764 struct got_pathlist_entry *pe;
765 int preserve_logmsg = 0;
766 int *pack_fds = NULL;
768 TAILQ_INIT(&ignores);
771 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
777 while ((ch = getopt(argc, argv, "b:I:m:r:")) != -1) {
780 branch_name = optarg;
783 if (optarg[0] == '\0')
785 error = got_pathlist_insert(&pe, &ignores, optarg,
791 logmsg = strdup(optarg);
792 if (logmsg == NULL) {
793 error = got_error_from_errno("strdup");
798 repo_path = realpath(optarg, NULL);
799 if (repo_path == NULL) {
800 error = got_error_from_errno2("realpath",
817 if (repo_path == NULL) {
818 repo_path = getcwd(NULL, 0);
819 if (repo_path == NULL)
820 return got_error_from_errno("getcwd");
822 got_path_strip_trailing_slashes(repo_path);
823 error = get_gitconfig_path(&gitconfig_path);
826 error = got_repo_pack_fds_open(&pack_fds);
829 error = got_repo_open(&repo, repo_path, gitconfig_path, pack_fds);
833 error = get_author(&author, repo, NULL);
838 * Don't let the user create a branch name with a leading '-'.
839 * While technically a valid reference name, this case is usually
840 * an unintended typo.
842 if (branch_name && branch_name[0] == '-')
843 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
845 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
846 if (error && error->code != GOT_ERR_NOT_REF)
850 n = strlcat(refname, branch_name, sizeof(refname));
851 else if (head_ref && got_ref_is_symbolic(head_ref))
852 n = strlcpy(refname, got_ref_get_symref_target(head_ref),
855 n = strlcat(refname, "main", sizeof(refname));
856 if (n >= sizeof(refname)) {
857 error = got_error(GOT_ERR_NO_SPACE);
861 error = got_ref_open(&branch_ref, repo, refname, 0);
863 if (error->code != GOT_ERR_NOT_REF)
866 error = got_error_msg(GOT_ERR_BRANCH_EXISTS,
867 "import target branch already exists");
871 path_dir = realpath(argv[0], NULL);
872 if (path_dir == NULL) {
873 error = got_error_from_errno2("realpath", argv[0]);
876 got_path_strip_trailing_slashes(path_dir);
879 * unveil(2) traverses exec(2); if an editor is used we have
880 * to apply unveil after the log message has been written.
882 if (logmsg == NULL || *logmsg == '\0') {
883 error = get_editor(&editor);
887 error = collect_import_msg(&logmsg, &logmsg_path, editor,
890 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
897 if (unveil(path_dir, "r") != 0) {
898 error = got_error_from_errno2("unveil", path_dir);
904 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
911 error = got_repo_import(&new_commit_id, path_dir, logmsg,
912 author, &ignores, repo, import_progress, NULL);
919 error = got_ref_alloc(&branch_ref, refname, new_commit_id);
926 error = got_ref_write(branch_ref, repo);
933 error = got_object_id_str(&id_str, new_commit_id);
940 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
942 if (error->code != GOT_ERR_NOT_REF) {
948 error = got_ref_alloc_symref(&head_ref, GOT_REF_HEAD,
956 error = got_ref_write(head_ref, repo);
964 printf("Created branch %s with commit %s\n",
965 got_ref_get_name(branch_ref), id_str);
968 const struct got_error *pack_err =
969 got_repo_pack_fds_close(pack_fds);
974 const struct got_error *close_err = got_repo_close(repo);
978 if (preserve_logmsg) {
979 fprintf(stderr, "%s: log message preserved in %s\n",
980 getprogname(), logmsg_path);
981 } else if (logmsg_path && unlink(logmsg_path) == -1 && error == NULL)
982 error = got_error_from_errno2("unlink", logmsg_path);
990 free(gitconfig_path);
992 got_ref_close(branch_ref);
994 got_ref_close(head_ref);
1001 fprintf(stderr, "usage: %s clone [-almqv] [-b branch] [-R reference] "
1002 "repository-URL [directory]\n", getprogname());
1006 struct got_fetch_progress_arg {
1007 char last_scaled_size[FMT_SCALED_STRSIZE];
1009 int last_p_resolved;
1012 struct got_repository *repo;
1015 int configs_created;
1017 struct got_pathlist_head *symrefs;
1018 struct got_pathlist_head *wanted_branches;
1019 struct got_pathlist_head *wanted_refs;
1023 const char *remote_repo_path;
1024 const char *git_url;
1025 int fetch_all_branches;
1026 int mirror_references;
1030 /* XXX forward declaration */
1031 static const struct got_error *
1032 create_config_files(const char *proto, const char *host, const char *port,
1033 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1034 int mirror_references, struct got_pathlist_head *symrefs,
1035 struct got_pathlist_head *wanted_branches,
1036 struct got_pathlist_head *wanted_refs, struct got_repository *repo);
1038 static const struct got_error *
1039 fetch_progress(void *arg, const char *message, off_t packfile_size,
1040 int nobj_total, int nobj_indexed, int nobj_loose, int nobj_resolved)
1042 const struct got_error *err = NULL;
1043 struct got_fetch_progress_arg *a = arg;
1044 char scaled_size[FMT_SCALED_STRSIZE];
1045 int p_indexed, p_resolved;
1046 int print_size = 0, print_indexed = 0, print_resolved = 0;
1049 * In order to allow a failed clone to be resumed with 'got fetch'
1050 * we try to create configuration files as soon as possible.
1051 * Once the server has sent information about its default branch
1052 * we have all required information.
1054 if (a->create_configs && !a->configs_created &&
1055 !TAILQ_EMPTY(a->config_info.symrefs)) {
1056 err = create_config_files(a->config_info.proto,
1057 a->config_info.host, a->config_info.port,
1058 a->config_info.remote_repo_path,
1059 a->config_info.git_url,
1060 a->config_info.fetch_all_branches,
1061 a->config_info.mirror_references,
1062 a->config_info.symrefs,
1063 a->config_info.wanted_branches,
1064 a->config_info.wanted_refs, a->repo);
1067 a->configs_created = 1;
1070 if (a->verbosity < 0)
1073 if (message && message[0] != '\0') {
1074 printf("\rserver: %s", message);
1079 if (packfile_size > 0 || nobj_indexed > 0) {
1080 if (fmt_scaled(packfile_size, scaled_size) == 0 &&
1081 (a->last_scaled_size[0] == '\0' ||
1082 strcmp(scaled_size, a->last_scaled_size)) != 0) {
1084 if (strlcpy(a->last_scaled_size, scaled_size,
1085 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
1086 return got_error(GOT_ERR_NO_SPACE);
1088 if (nobj_indexed > 0) {
1089 p_indexed = (nobj_indexed * 100) / nobj_total;
1090 if (p_indexed != a->last_p_indexed) {
1091 a->last_p_indexed = p_indexed;
1096 if (nobj_resolved > 0) {
1097 p_resolved = (nobj_resolved * 100) /
1098 (nobj_total - nobj_loose);
1099 if (p_resolved != a->last_p_resolved) {
1100 a->last_p_resolved = p_resolved;
1108 if (print_size || print_indexed || print_resolved)
1111 printf("%*s fetched", FMT_SCALED_STRSIZE - 2, scaled_size);
1113 printf("; indexing %d%%", p_indexed);
1115 printf("; resolving deltas %d%%", p_resolved);
1116 if (print_size || print_indexed || print_resolved)
1122 static const struct got_error *
1123 create_symref(const char *refname, struct got_reference *target_ref,
1124 int verbosity, struct got_repository *repo)
1126 const struct got_error *err;
1127 struct got_reference *head_symref;
1129 err = got_ref_alloc_symref(&head_symref, refname, target_ref);
1133 err = got_ref_write(head_symref, repo);
1134 if (err == NULL && verbosity > 0) {
1135 printf("Created reference %s: %s\n", GOT_REF_HEAD,
1136 got_ref_get_name(target_ref));
1138 got_ref_close(head_symref);
1142 static const struct got_error *
1143 list_remote_refs(struct got_pathlist_head *symrefs,
1144 struct got_pathlist_head *refs)
1146 const struct got_error *err;
1147 struct got_pathlist_entry *pe;
1149 TAILQ_FOREACH(pe, symrefs, entry) {
1150 const char *refname = pe->path;
1151 const char *targetref = pe->data;
1153 printf("%s: %s\n", refname, targetref);
1156 TAILQ_FOREACH(pe, refs, entry) {
1157 const char *refname = pe->path;
1158 struct got_object_id *id = pe->data;
1161 err = got_object_id_str(&id_str, id);
1164 printf("%s: %s\n", refname, id_str);
1171 static const struct got_error *
1172 create_ref(const char *refname, struct got_object_id *id,
1173 int verbosity, struct got_repository *repo)
1175 const struct got_error *err = NULL;
1176 struct got_reference *ref;
1179 err = got_object_id_str(&id_str, id);
1183 err = got_ref_alloc(&ref, refname, id);
1187 err = got_ref_write(ref, repo);
1190 if (err == NULL && verbosity >= 0)
1191 printf("Created reference %s: %s\n", refname, id_str);
1198 match_wanted_ref(const char *refname, const char *wanted_ref)
1200 if (strncmp(refname, "refs/", 5) != 0)
1205 * Prevent fetching of references that won't make any
1206 * sense outside of the remote repository's context.
1208 if (strncmp(refname, "got/", 4) == 0)
1210 if (strncmp(refname, "remotes/", 8) == 0)
1213 if (strncmp(wanted_ref, "refs/", 5) == 0)
1216 /* Allow prefix match. */
1217 if (got_path_is_child(refname, wanted_ref, strlen(wanted_ref)))
1220 /* Allow exact match. */
1221 return (strcmp(refname, wanted_ref) == 0);
1225 is_wanted_ref(struct got_pathlist_head *wanted_refs, const char *refname)
1227 struct got_pathlist_entry *pe;
1229 TAILQ_FOREACH(pe, wanted_refs, entry) {
1230 if (match_wanted_ref(refname, pe->path))
1237 static const struct got_error *
1238 create_wanted_ref(const char *refname, struct got_object_id *id,
1239 const char *remote_repo_name, int verbosity, struct got_repository *repo)
1241 const struct got_error *err;
1242 char *remote_refname;
1244 if (strncmp("refs/", refname, 5) == 0)
1247 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
1248 remote_repo_name, refname) == -1)
1249 return got_error_from_errno("asprintf");
1251 err = create_ref(remote_refname, id, verbosity, repo);
1252 free(remote_refname);
1256 static const struct got_error *
1257 create_gotconfig(const char *proto, const char *host, const char *port,
1258 const char *remote_repo_path, const char *default_branch,
1259 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1260 struct got_pathlist_head *wanted_refs, int mirror_references,
1261 struct got_repository *repo)
1263 const struct got_error *err = NULL;
1264 char *gotconfig_path = NULL;
1265 char *gotconfig = NULL;
1266 FILE *gotconfig_file = NULL;
1267 const char *branchname = NULL;
1268 char *branches = NULL, *refs = NULL;
1271 if (!fetch_all_branches && !TAILQ_EMPTY(wanted_branches)) {
1272 struct got_pathlist_entry *pe;
1273 TAILQ_FOREACH(pe, wanted_branches, entry) {
1275 branchname = pe->path;
1276 if (strncmp(branchname, "refs/heads/", 11) == 0)
1278 if (asprintf(&s, "%s\"%s\" ",
1279 branches ? branches : "", branchname) == -1) {
1280 err = got_error_from_errno("asprintf");
1286 } else if (!fetch_all_branches && default_branch) {
1287 branchname = default_branch;
1288 if (strncmp(branchname, "refs/heads/", 11) == 0)
1290 if (asprintf(&branches, "\"%s\" ", branchname) == -1) {
1291 err = got_error_from_errno("asprintf");
1295 if (!TAILQ_EMPTY(wanted_refs)) {
1296 struct got_pathlist_entry *pe;
1297 TAILQ_FOREACH(pe, wanted_refs, entry) {
1299 const char *refname = pe->path;
1300 if (strncmp(refname, "refs/", 5) == 0)
1302 if (asprintf(&s, "%s\"%s\" ",
1303 refs ? refs : "", refname) == -1) {
1304 err = got_error_from_errno("asprintf");
1312 /* Create got.conf(5). */
1313 gotconfig_path = got_repo_get_path_gotconfig(repo);
1314 if (gotconfig_path == NULL) {
1315 err = got_error_from_errno("got_repo_get_path_gotconfig");
1318 gotconfig_file = fopen(gotconfig_path, "ae");
1319 if (gotconfig_file == NULL) {
1320 err = got_error_from_errno2("fopen", gotconfig_path);
1323 if (asprintf(&gotconfig,
1328 "\trepository \"%s\"\n"
1334 GOT_FETCH_DEFAULT_REMOTE_NAME, host, proto,
1335 port ? "\tport " : "", port ? port : "", port ? "\n" : "",
1336 remote_repo_path, branches ? "\tbranch { " : "",
1337 branches ? branches : "", branches ? "}\n" : "",
1338 refs ? "\treference { " : "", refs ? refs : "", refs ? "}\n" : "",
1339 mirror_references ? "\tmirror_references yes\n" : "",
1340 fetch_all_branches ? "\tfetch_all_branches yes\n" : "") == -1) {
1341 err = got_error_from_errno("asprintf");
1344 n = fwrite(gotconfig, 1, strlen(gotconfig), gotconfig_file);
1345 if (n != strlen(gotconfig)) {
1346 err = got_ferror(gotconfig_file, GOT_ERR_IO);
1351 if (gotconfig_file && fclose(gotconfig_file) == EOF && err == NULL)
1352 err = got_error_from_errno2("fclose", gotconfig_path);
1353 free(gotconfig_path);
1358 static const struct got_error *
1359 create_gitconfig(const char *git_url, const char *default_branch,
1360 int fetch_all_branches, struct got_pathlist_head *wanted_branches,
1361 struct got_pathlist_head *wanted_refs, int mirror_references,
1362 struct got_repository *repo)
1364 const struct got_error *err = NULL;
1365 char *gitconfig_path = NULL;
1366 char *gitconfig = NULL;
1367 FILE *gitconfig_file = NULL;
1368 char *branches = NULL, *refs = NULL;
1369 const char *branchname;
1372 /* Create a config file Git can understand. */
1373 gitconfig_path = got_repo_get_path_gitconfig(repo);
1374 if (gitconfig_path == NULL) {
1375 err = got_error_from_errno("got_repo_get_path_gitconfig");
1378 gitconfig_file = fopen(gitconfig_path, "ae");
1379 if (gitconfig_file == NULL) {
1380 err = got_error_from_errno2("fopen", gitconfig_path);
1383 if (fetch_all_branches) {
1384 if (mirror_references) {
1385 if (asprintf(&branches,
1386 "\tfetch = refs/heads/*:refs/heads/*\n") == -1) {
1387 err = got_error_from_errno("asprintf");
1390 } else if (asprintf(&branches,
1391 "\tfetch = refs/heads/*:refs/remotes/%s/*\n",
1392 GOT_FETCH_DEFAULT_REMOTE_NAME) == -1) {
1393 err = got_error_from_errno("asprintf");
1396 } else if (!TAILQ_EMPTY(wanted_branches)) {
1397 struct got_pathlist_entry *pe;
1398 TAILQ_FOREACH(pe, wanted_branches, entry) {
1400 branchname = pe->path;
1401 if (strncmp(branchname, "refs/heads/", 11) == 0)
1403 if (mirror_references) {
1405 "%s\tfetch = refs/heads/%s:refs/heads/%s\n",
1406 branches ? branches : "",
1407 branchname, branchname) == -1) {
1408 err = got_error_from_errno("asprintf");
1411 } else if (asprintf(&s,
1412 "%s\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1413 branches ? branches : "",
1414 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1415 branchname) == -1) {
1416 err = got_error_from_errno("asprintf");
1424 * If the server specified a default branch, use just that one.
1425 * Otherwise fall back to fetching all branches on next fetch.
1427 if (default_branch) {
1428 branchname = default_branch;
1429 if (strncmp(branchname, "refs/heads/", 11) == 0)
1432 branchname = "*"; /* fall back to all branches */
1433 if (mirror_references) {
1434 if (asprintf(&branches,
1435 "\tfetch = refs/heads/%s:refs/heads/%s\n",
1436 branchname, branchname) == -1) {
1437 err = got_error_from_errno("asprintf");
1440 } else if (asprintf(&branches,
1441 "\tfetch = refs/heads/%s:refs/remotes/%s/%s\n",
1442 branchname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1443 branchname) == -1) {
1444 err = got_error_from_errno("asprintf");
1448 if (!TAILQ_EMPTY(wanted_refs)) {
1449 struct got_pathlist_entry *pe;
1450 TAILQ_FOREACH(pe, wanted_refs, entry) {
1452 const char *refname = pe->path;
1453 if (strncmp(refname, "refs/", 5) == 0)
1455 if (mirror_references) {
1457 "%s\tfetch = refs/%s:refs/%s\n",
1458 refs ? refs : "", refname, refname) == -1) {
1459 err = got_error_from_errno("asprintf");
1462 } else if (asprintf(&s,
1463 "%s\tfetch = refs/%s:refs/remotes/%s/%s\n",
1465 refname, GOT_FETCH_DEFAULT_REMOTE_NAME,
1467 err = got_error_from_errno("asprintf");
1475 if (asprintf(&gitconfig,
1480 "\tfetch = refs/tags/*:refs/tags/*\n",
1481 GOT_FETCH_DEFAULT_REMOTE_NAME, git_url, branches ? branches : "",
1482 refs ? refs : "") == -1) {
1483 err = got_error_from_errno("asprintf");
1486 n = fwrite(gitconfig, 1, strlen(gitconfig), gitconfig_file);
1487 if (n != strlen(gitconfig)) {
1488 err = got_ferror(gitconfig_file, GOT_ERR_IO);
1492 if (gitconfig_file && fclose(gitconfig_file) == EOF && err == NULL)
1493 err = got_error_from_errno2("fclose", gitconfig_path);
1494 free(gitconfig_path);
1499 static const struct got_error *
1500 create_config_files(const char *proto, const char *host, const char *port,
1501 const char *remote_repo_path, const char *git_url, int fetch_all_branches,
1502 int mirror_references, struct got_pathlist_head *symrefs,
1503 struct got_pathlist_head *wanted_branches,
1504 struct got_pathlist_head *wanted_refs, struct got_repository *repo)
1506 const struct got_error *err = NULL;
1507 const char *default_branch = NULL;
1508 struct got_pathlist_entry *pe;
1511 * If we asked for a set of wanted branches then use the first
1514 if (!TAILQ_EMPTY(wanted_branches)) {
1515 pe = TAILQ_FIRST(wanted_branches);
1516 default_branch = pe->path;
1518 /* First HEAD ref listed by server is the default branch. */
1519 TAILQ_FOREACH(pe, symrefs, entry) {
1520 const char *refname = pe->path;
1521 const char *target = pe->data;
1523 if (strcmp(refname, GOT_REF_HEAD) != 0)
1526 default_branch = target;
1531 /* Create got.conf(5). */
1532 err = create_gotconfig(proto, host, port, remote_repo_path,
1533 default_branch, fetch_all_branches, wanted_branches,
1534 wanted_refs, mirror_references, repo);
1538 /* Create a config file Git can understand. */
1539 return create_gitconfig(git_url, default_branch, fetch_all_branches,
1540 wanted_branches, wanted_refs, mirror_references, repo);
1543 static const struct got_error *
1544 cmd_clone(int argc, char *argv[])
1546 const struct got_error *error = NULL;
1547 const char *uri, *dirname;
1548 char *proto, *host, *port, *repo_name, *server_path;
1549 char *default_destdir = NULL, *id_str = NULL;
1550 const char *repo_path;
1551 struct got_repository *repo = NULL;
1552 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
1553 struct got_pathlist_entry *pe;
1554 struct got_object_id *pack_hash = NULL;
1555 int ch, fetchfd = -1, fetchstatus;
1556 pid_t fetchpid = -1;
1557 struct got_fetch_progress_arg fpa;
1558 char *git_url = NULL;
1559 int verbosity = 0, fetch_all_branches = 0, mirror_references = 0;
1560 int bflag = 0, list_refs_only = 0;
1561 int *pack_fds = NULL;
1564 TAILQ_INIT(&symrefs);
1565 TAILQ_INIT(&wanted_branches);
1566 TAILQ_INIT(&wanted_refs);
1568 while ((ch = getopt(argc, argv, "ab:lmqR:v")) != -1) {
1571 fetch_all_branches = 1;
1574 error = got_pathlist_append(&wanted_branches,
1584 mirror_references = 1;
1590 error = got_pathlist_append(&wanted_refs,
1598 else if (verbosity < 3)
1609 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
1610 option_conflict('a', 'b');
1611 if (list_refs_only) {
1612 if (!TAILQ_EMPTY(&wanted_branches))
1613 option_conflict('l', 'b');
1614 if (fetch_all_branches)
1615 option_conflict('l', 'a');
1616 if (mirror_references)
1617 option_conflict('l', 'm');
1618 if (!TAILQ_EMPTY(&wanted_refs))
1619 option_conflict('l', 'R');
1631 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
1636 if (asprintf(&git_url, "%s://%s%s%s%s%s", proto,
1637 host, port ? ":" : "", port ? port : "",
1638 server_path[0] != '/' ? "/" : "", server_path) == -1) {
1639 error = got_error_from_errno("asprintf");
1643 if (strcmp(proto, "git") == 0) {
1645 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1646 "sendfd dns inet unveil", NULL) == -1)
1649 } else if (strcmp(proto, "git+ssh") == 0 ||
1650 strcmp(proto, "ssh") == 0) {
1652 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
1653 "sendfd unveil", NULL) == -1)
1656 } else if (strcmp(proto, "http") == 0 ||
1657 strcmp(proto, "git+http") == 0) {
1658 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
1661 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
1664 if (dirname == NULL) {
1665 if (asprintf(&default_destdir, "%s.git", repo_name) == -1) {
1666 error = got_error_from_errno("asprintf");
1669 repo_path = default_destdir;
1671 repo_path = dirname;
1673 if (!list_refs_only) {
1674 error = got_path_mkdir(repo_path);
1676 (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
1677 !(error->code == GOT_ERR_ERRNO && errno == EEXIST)))
1679 if (!got_path_dir_is_empty(repo_path)) {
1680 error = got_error_path(repo_path,
1681 GOT_ERR_DIR_NOT_EMPTY);
1686 error = got_dial_apply_unveil(proto);
1690 error = apply_unveil(repo_path, 0, NULL);
1695 printf("Connecting to %s\n", git_url);
1697 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
1698 server_path, verbosity);
1702 if (!list_refs_only) {
1703 error = got_repo_init(repo_path, NULL);
1706 error = got_repo_pack_fds_open(&pack_fds);
1709 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
1714 fpa.last_scaled_size[0] = '\0';
1715 fpa.last_p_indexed = -1;
1716 fpa.last_p_resolved = -1;
1717 fpa.verbosity = verbosity;
1718 fpa.create_configs = 1;
1719 fpa.configs_created = 0;
1721 fpa.config_info.symrefs = &symrefs;
1722 fpa.config_info.wanted_branches = &wanted_branches;
1723 fpa.config_info.wanted_refs = &wanted_refs;
1724 fpa.config_info.proto = proto;
1725 fpa.config_info.host = host;
1726 fpa.config_info.port = port;
1727 fpa.config_info.remote_repo_path = server_path;
1728 fpa.config_info.git_url = git_url;
1729 fpa.config_info.fetch_all_branches = fetch_all_branches;
1730 fpa.config_info.mirror_references = mirror_references;
1731 error = got_fetch_pack(&pack_hash, &refs, &symrefs,
1732 GOT_FETCH_DEFAULT_REMOTE_NAME, mirror_references,
1733 fetch_all_branches, &wanted_branches, &wanted_refs,
1734 list_refs_only, verbosity, fetchfd, repo, NULL, NULL, bflag,
1735 fetch_progress, &fpa);
1739 if (list_refs_only) {
1740 error = list_remote_refs(&symrefs, &refs);
1744 if (pack_hash == NULL) {
1745 error = got_error_fmt(GOT_ERR_FETCH_FAILED, "%s",
1746 "server sent an empty pack file");
1749 error = got_object_id_str(&id_str, pack_hash);
1753 printf("\nFetched %s.pack\n", id_str);
1756 /* Set up references provided with the pack file. */
1757 TAILQ_FOREACH(pe, &refs, entry) {
1758 const char *refname = pe->path;
1759 struct got_object_id *id = pe->data;
1760 char *remote_refname;
1762 if (is_wanted_ref(&wanted_refs, refname) &&
1763 !mirror_references) {
1764 error = create_wanted_ref(refname, id,
1765 GOT_FETCH_DEFAULT_REMOTE_NAME,
1766 verbosity - 1, repo);
1772 error = create_ref(refname, id, verbosity - 1, repo);
1776 if (mirror_references)
1779 if (strncmp("refs/heads/", refname, 11) != 0)
1782 if (asprintf(&remote_refname,
1783 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1784 refname + 11) == -1) {
1785 error = got_error_from_errno("asprintf");
1788 error = create_ref(remote_refname, id, verbosity - 1, repo);
1789 free(remote_refname);
1794 /* Set the HEAD reference if the server provided one. */
1795 TAILQ_FOREACH(pe, &symrefs, entry) {
1796 struct got_reference *target_ref;
1797 const char *refname = pe->path;
1798 const char *target = pe->data;
1799 char *remote_refname = NULL, *remote_target = NULL;
1801 if (strcmp(refname, GOT_REF_HEAD) != 0)
1804 error = got_ref_open(&target_ref, repo, target, 0);
1806 if (error->code == GOT_ERR_NOT_REF) {
1813 error = create_symref(refname, target_ref, verbosity, repo);
1814 got_ref_close(target_ref);
1818 if (mirror_references)
1821 if (strncmp("refs/heads/", target, 11) != 0)
1824 if (asprintf(&remote_refname,
1825 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1827 error = got_error_from_errno("asprintf");
1830 if (asprintf(&remote_target,
1831 "refs/remotes/%s/%s", GOT_FETCH_DEFAULT_REMOTE_NAME,
1832 target + 11) == -1) {
1833 error = got_error_from_errno("asprintf");
1834 free(remote_refname);
1837 error = got_ref_open(&target_ref, repo, remote_target, 0);
1839 free(remote_refname);
1840 free(remote_target);
1841 if (error->code == GOT_ERR_NOT_REF) {
1847 error = create_symref(remote_refname, target_ref,
1848 verbosity - 1, repo);
1849 free(remote_refname);
1850 free(remote_target);
1851 got_ref_close(target_ref);
1857 * We failed to set the HEAD reference. If we asked for
1858 * a set of wanted branches use the first of one of those
1859 * which could be fetched instead.
1861 TAILQ_FOREACH(pe, &wanted_branches, entry) {
1862 const char *target = pe->path;
1863 struct got_reference *target_ref;
1865 error = got_ref_open(&target_ref, repo, target, 0);
1867 if (error->code == GOT_ERR_NOT_REF) {
1874 error = create_symref(GOT_REF_HEAD, target_ref,
1876 got_ref_close(target_ref);
1882 if (!fpa.configs_created && pe != NULL) {
1883 error = create_config_files(fpa.config_info.proto,
1884 fpa.config_info.host, fpa.config_info.port,
1885 fpa.config_info.remote_repo_path,
1886 fpa.config_info.git_url,
1887 fpa.config_info.fetch_all_branches,
1888 fpa.config_info.mirror_references,
1889 fpa.config_info.symrefs,
1890 fpa.config_info.wanted_branches,
1891 fpa.config_info.wanted_refs, fpa.repo);
1898 printf("Created %s repository '%s'\n",
1899 mirror_references ? "mirrored" : "cloned", repo_path);
1902 const struct got_error *pack_err =
1903 got_repo_pack_fds_close(pack_fds);
1908 if (kill(fetchpid, SIGTERM) == -1)
1909 error = got_error_from_errno("kill");
1910 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
1911 error = got_error_from_errno("waitpid");
1913 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
1914 error = got_error_from_errno("close");
1916 const struct got_error *close_err = got_repo_close(repo);
1920 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
1921 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
1922 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
1923 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
1930 free(default_destdir);
1935 static const struct got_error *
1936 update_ref(struct got_reference *ref, struct got_object_id *new_id,
1937 int replace_tags, int verbosity, struct got_repository *repo)
1939 const struct got_error *err = NULL;
1940 char *new_id_str = NULL;
1941 struct got_object_id *old_id = NULL;
1943 err = got_object_id_str(&new_id_str, new_id);
1947 if (!replace_tags &&
1948 strncmp(got_ref_get_name(ref), "refs/tags/", 10) == 0) {
1949 err = got_ref_resolve(&old_id, repo, ref);
1952 if (got_object_id_cmp(old_id, new_id) == 0)
1954 if (verbosity >= 0) {
1955 printf("Rejecting update of existing tag %s: %s\n",
1956 got_ref_get_name(ref), new_id_str);
1961 if (got_ref_is_symbolic(ref)) {
1962 if (verbosity >= 0) {
1963 printf("Replacing reference %s: %s\n",
1964 got_ref_get_name(ref),
1965 got_ref_get_symref_target(ref));
1967 err = got_ref_change_symref_to_ref(ref, new_id);
1970 err = got_ref_write(ref, repo);
1974 err = got_ref_resolve(&old_id, repo, ref);
1977 if (got_object_id_cmp(old_id, new_id) == 0)
1980 err = got_ref_change_ref(ref, new_id);
1983 err = got_ref_write(ref, repo);
1989 printf("Updated %s: %s\n", got_ref_get_name(ref),
1997 static const struct got_error *
1998 update_symref(const char *refname, struct got_reference *target_ref,
1999 int verbosity, struct got_repository *repo)
2001 const struct got_error *err = NULL, *unlock_err;
2002 struct got_reference *symref;
2003 int symref_is_locked = 0;
2005 err = got_ref_open(&symref, repo, refname, 1);
2007 if (err->code != GOT_ERR_NOT_REF)
2009 err = got_ref_alloc_symref(&symref, refname, target_ref);
2013 err = got_ref_write(symref, repo);
2018 printf("Created reference %s: %s\n",
2019 got_ref_get_name(symref),
2020 got_ref_get_symref_target(symref));
2022 symref_is_locked = 1;
2024 if (strcmp(got_ref_get_symref_target(symref),
2025 got_ref_get_name(target_ref)) == 0)
2028 err = got_ref_change_symref(symref,
2029 got_ref_get_name(target_ref));
2033 err = got_ref_write(symref, repo);
2038 printf("Updated %s: %s\n", got_ref_get_name(symref),
2039 got_ref_get_symref_target(symref));
2043 if (symref_is_locked) {
2044 unlock_err = got_ref_unlock(symref);
2045 if (unlock_err && err == NULL)
2048 got_ref_close(symref);
2055 fprintf(stderr, "usage: %s fetch [-adlqtvX] [-b branch] "
2056 "[-R reference] [-r repository-path] [remote-repository]\n",
2061 static const struct got_error *
2062 delete_missing_ref(struct got_reference *ref,
2063 int verbosity, struct got_repository *repo)
2065 const struct got_error *err = NULL;
2066 struct got_object_id *id = NULL;
2067 char *id_str = NULL;
2069 if (got_ref_is_symbolic(ref)) {
2070 err = got_ref_delete(ref, repo);
2073 if (verbosity >= 0) {
2074 printf("Deleted %s: %s\n",
2075 got_ref_get_name(ref),
2076 got_ref_get_symref_target(ref));
2079 err = got_ref_resolve(&id, repo, ref);
2082 err = got_object_id_str(&id_str, id);
2086 err = got_ref_delete(ref, repo);
2089 if (verbosity >= 0) {
2090 printf("Deleted %s: %s\n",
2091 got_ref_get_name(ref), id_str);
2100 static const struct got_error *
2101 delete_missing_refs(struct got_pathlist_head *their_refs,
2102 struct got_pathlist_head *their_symrefs,
2103 const struct got_remote_repo *remote,
2104 int verbosity, struct got_repository *repo)
2106 const struct got_error *err = NULL, *unlock_err;
2107 struct got_reflist_head my_refs;
2108 struct got_reflist_entry *re;
2109 struct got_pathlist_entry *pe;
2110 char *remote_namespace = NULL;
2111 char *local_refname = NULL;
2113 TAILQ_INIT(&my_refs);
2115 if (asprintf(&remote_namespace, "refs/remotes/%s/", remote->name)
2117 return got_error_from_errno("asprintf");
2119 err = got_ref_list(&my_refs, repo, NULL, got_ref_cmp_by_name, NULL);
2123 TAILQ_FOREACH(re, &my_refs, entry) {
2124 const char *refname = got_ref_get_name(re->ref);
2125 const char *their_refname;
2127 if (remote->mirror_references) {
2128 their_refname = refname;
2130 if (strncmp(refname, remote_namespace,
2131 strlen(remote_namespace)) == 0) {
2132 if (strcmp(refname + strlen(remote_namespace),
2135 if (asprintf(&local_refname, "refs/heads/%s",
2136 refname + strlen(remote_namespace)) == -1) {
2137 err = got_error_from_errno("asprintf");
2140 } else if (strncmp(refname, "refs/tags/", 10) != 0)
2143 their_refname = local_refname;
2146 TAILQ_FOREACH(pe, their_refs, entry) {
2147 if (strcmp(their_refname, pe->path) == 0)
2153 TAILQ_FOREACH(pe, their_symrefs, entry) {
2154 if (strcmp(their_refname, pe->path) == 0)
2160 err = delete_missing_ref(re->ref, verbosity, repo);
2164 if (local_refname) {
2165 struct got_reference *ref;
2166 err = got_ref_open(&ref, repo, local_refname, 1);
2168 if (err->code != GOT_ERR_NOT_REF)
2170 free(local_refname);
2171 local_refname = NULL;
2174 err = delete_missing_ref(ref, verbosity, repo);
2177 unlock_err = got_ref_unlock(ref);
2179 if (unlock_err && err == NULL) {
2184 free(local_refname);
2185 local_refname = NULL;
2189 got_ref_list_free(&my_refs);
2190 free(remote_namespace);
2191 free(local_refname);
2195 static const struct got_error *
2196 update_wanted_ref(const char *refname, struct got_object_id *id,
2197 const char *remote_repo_name, int verbosity, struct got_repository *repo)
2199 const struct got_error *err, *unlock_err;
2200 char *remote_refname;
2201 struct got_reference *ref;
2203 if (strncmp("refs/", refname, 5) == 0)
2206 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2207 remote_repo_name, refname) == -1)
2208 return got_error_from_errno("asprintf");
2210 err = got_ref_open(&ref, repo, remote_refname, 1);
2212 if (err->code != GOT_ERR_NOT_REF)
2214 err = create_ref(remote_refname, id, verbosity, repo);
2216 err = update_ref(ref, id, 0, verbosity, repo);
2217 unlock_err = got_ref_unlock(ref);
2218 if (unlock_err && err == NULL)
2223 free(remote_refname);
2227 static const struct got_error *
2228 delete_ref(struct got_repository *repo, struct got_reference *ref)
2230 const struct got_error *err = NULL;
2231 struct got_object_id *id = NULL;
2232 char *id_str = NULL;
2235 if (got_ref_is_symbolic(ref)) {
2236 target = got_ref_get_symref_target(ref);
2238 err = got_ref_resolve(&id, repo, ref);
2241 err = got_object_id_str(&id_str, id);
2247 err = got_ref_delete(ref, repo);
2251 printf("Deleted %s: %s\n", got_ref_get_name(ref), target);
2258 static const struct got_error *
2259 delete_refs_for_remote(struct got_repository *repo, const char *remote_name)
2261 const struct got_error *err = NULL;
2262 struct got_reflist_head refs;
2263 struct got_reflist_entry *re;
2268 if (asprintf(&prefix, "refs/remotes/%s", remote_name) == -1) {
2269 err = got_error_from_errno("asprintf");
2272 err = got_ref_list(&refs, repo, prefix, got_ref_cmp_by_name, NULL);
2276 TAILQ_FOREACH(re, &refs, entry)
2277 delete_ref(repo, re->ref);
2279 got_ref_list_free(&refs);
2283 static const struct got_error *
2284 cmd_fetch(int argc, char *argv[])
2286 const struct got_error *error = NULL, *unlock_err;
2287 char *cwd = NULL, *repo_path = NULL;
2288 const char *remote_name;
2289 char *proto = NULL, *host = NULL, *port = NULL;
2290 char *repo_name = NULL, *server_path = NULL;
2291 const struct got_remote_repo *remotes, *remote = NULL;
2293 char *id_str = NULL;
2294 struct got_repository *repo = NULL;
2295 struct got_worktree *worktree = NULL;
2296 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
2297 struct got_pathlist_head refs, symrefs, wanted_branches, wanted_refs;
2298 struct got_pathlist_entry *pe;
2299 struct got_reflist_head remote_refs;
2300 struct got_reflist_entry *re;
2301 struct got_object_id *pack_hash = NULL;
2302 int i, ch, fetchfd = -1, fetchstatus;
2303 pid_t fetchpid = -1;
2304 struct got_fetch_progress_arg fpa;
2305 int verbosity = 0, fetch_all_branches = 0, list_refs_only = 0;
2306 int delete_refs = 0, replace_tags = 0, delete_remote = 0;
2307 int *pack_fds = NULL, have_bflag = 0;
2308 const char *remote_head = NULL, *worktree_branch = NULL;
2311 TAILQ_INIT(&symrefs);
2312 TAILQ_INIT(&remote_refs);
2313 TAILQ_INIT(&wanted_branches);
2314 TAILQ_INIT(&wanted_refs);
2316 while ((ch = getopt(argc, argv, "ab:dlqR:r:tvX")) != -1) {
2319 fetch_all_branches = 1;
2322 error = got_pathlist_append(&wanted_branches,
2338 error = got_pathlist_append(&wanted_refs,
2344 repo_path = realpath(optarg, NULL);
2345 if (repo_path == NULL)
2346 return got_error_from_errno2("realpath",
2348 got_path_strip_trailing_slashes(repo_path);
2356 else if (verbosity < 3)
2370 if (fetch_all_branches && !TAILQ_EMPTY(&wanted_branches))
2371 option_conflict('a', 'b');
2372 if (list_refs_only) {
2373 if (!TAILQ_EMPTY(&wanted_branches))
2374 option_conflict('l', 'b');
2375 if (fetch_all_branches)
2376 option_conflict('l', 'a');
2378 option_conflict('l', 'd');
2380 option_conflict('l', 'X');
2382 if (delete_remote) {
2383 if (fetch_all_branches)
2384 option_conflict('X', 'a');
2385 if (!TAILQ_EMPTY(&wanted_branches))
2386 option_conflict('X', 'b');
2388 option_conflict('X', 'd');
2390 option_conflict('X', 't');
2391 if (!TAILQ_EMPTY(&wanted_refs))
2392 option_conflict('X', 'R');
2397 errx(1, "-X option requires a remote name");
2398 remote_name = GOT_FETCH_DEFAULT_REMOTE_NAME;
2399 } else if (argc == 1)
2400 remote_name = argv[0];
2404 cwd = getcwd(NULL, 0);
2406 error = got_error_from_errno("getcwd");
2410 error = got_repo_pack_fds_open(&pack_fds);
2414 if (repo_path == NULL) {
2415 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
2416 if (error && error->code != GOT_ERR_NOT_WORKTREE)
2422 strdup(got_worktree_get_repo_path(worktree));
2423 if (repo_path == NULL)
2424 error = got_error_from_errno("strdup");
2428 repo_path = strdup(cwd);
2429 if (repo_path == NULL) {
2430 error = got_error_from_errno("strdup");
2436 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
2440 if (delete_remote) {
2441 error = delete_refs_for_remote(repo, remote_name);
2442 goto done; /* nothing else to do */
2446 worktree_conf = got_worktree_get_gotconfig(worktree);
2447 if (worktree_conf) {
2448 got_gotconfig_get_remotes(&nremotes, &remotes,
2450 for (i = 0; i < nremotes; i++) {
2451 if (strcmp(remotes[i].name, remote_name) == 0) {
2452 remote = &remotes[i];
2458 if (remote == NULL) {
2459 repo_conf = got_repo_get_gotconfig(repo);
2461 got_gotconfig_get_remotes(&nremotes, &remotes,
2463 for (i = 0; i < nremotes; i++) {
2464 if (strcmp(remotes[i].name, remote_name) == 0) {
2465 remote = &remotes[i];
2471 if (remote == NULL) {
2472 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
2473 for (i = 0; i < nremotes; i++) {
2474 if (strcmp(remotes[i].name, remote_name) == 0) {
2475 remote = &remotes[i];
2480 if (remote == NULL) {
2481 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
2485 if (TAILQ_EMPTY(&wanted_branches)) {
2486 if (!fetch_all_branches)
2487 fetch_all_branches = remote->fetch_all_branches;
2488 for (i = 0; i < remote->nfetch_branches; i++) {
2489 error = got_pathlist_append(&wanted_branches,
2490 remote->fetch_branches[i], NULL);
2495 if (TAILQ_EMPTY(&wanted_refs)) {
2496 for (i = 0; i < remote->nfetch_refs; i++) {
2497 error = got_pathlist_append(&wanted_refs,
2498 remote->fetch_refs[i], NULL);
2504 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
2505 &repo_name, remote->fetch_url);
2509 if (strcmp(proto, "git") == 0) {
2511 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2512 "sendfd dns inet unveil", NULL) == -1)
2515 } else if (strcmp(proto, "git+ssh") == 0 ||
2516 strcmp(proto, "ssh") == 0) {
2518 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
2519 "sendfd unveil", NULL) == -1)
2522 } else if (strcmp(proto, "http") == 0 ||
2523 strcmp(proto, "git+http") == 0) {
2524 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
2527 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
2531 error = got_dial_apply_unveil(proto);
2535 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
2539 if (verbosity >= 0) {
2540 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
2541 remote->name, proto, host,
2542 port ? ":" : "", port ? port : "",
2543 *server_path == '/' ? "" : "/", server_path);
2546 error = got_fetch_connect(&fetchpid, &fetchfd, proto, host, port,
2547 server_path, verbosity);
2553 * If set, get this remote's HEAD ref target so
2554 * if it has changed on the server we can fetch it.
2556 error = got_ref_list(&remote_refs, repo, "refs/remotes",
2557 got_ref_cmp_by_name, repo);
2561 TAILQ_FOREACH(re, &remote_refs, entry) {
2562 const char *remote_refname, *remote_target;
2563 size_t remote_name_len;
2565 if (!got_ref_is_symbolic(re->ref))
2568 remote_name_len = strlen(remote->name);
2569 remote_refname = got_ref_get_name(re->ref);
2571 /* we only want refs/remotes/$remote->name/HEAD */
2572 if (strncmp(remote_refname + 13, remote->name,
2573 remote_name_len) != 0)
2576 if (strcmp(remote_refname + remote_name_len + 14,
2581 * Take the name itself because we already
2582 * only match with refs/heads/ in fetch_pack().
2584 remote_target = got_ref_get_symref_target(re->ref);
2585 remote_head = remote_target + remote_name_len + 14;
2590 const char *refname;
2592 refname = got_worktree_get_head_ref_name(worktree);
2593 if (strncmp(refname, "refs/heads/", 11) == 0)
2594 worktree_branch = refname;
2598 fpa.last_scaled_size[0] = '\0';
2599 fpa.last_p_indexed = -1;
2600 fpa.last_p_resolved = -1;
2601 fpa.verbosity = verbosity;
2603 fpa.create_configs = 0;
2604 fpa.configs_created = 0;
2605 memset(&fpa.config_info, 0, sizeof(fpa.config_info));
2607 error = got_fetch_pack(&pack_hash, &refs, &symrefs, remote->name,
2608 remote->mirror_references, fetch_all_branches, &wanted_branches,
2609 &wanted_refs, list_refs_only, verbosity, fetchfd, repo,
2610 worktree_branch, remote_head, have_bflag, fetch_progress, &fpa);
2614 if (list_refs_only) {
2615 error = list_remote_refs(&symrefs, &refs);
2619 if (pack_hash == NULL) {
2621 printf("Already up-to-date\n");
2622 } else if (verbosity >= 0) {
2623 error = got_object_id_str(&id_str, pack_hash);
2626 printf("\nFetched %s.pack\n", id_str);
2631 /* Update references provided with the pack file. */
2632 TAILQ_FOREACH(pe, &refs, entry) {
2633 const char *refname = pe->path;
2634 struct got_object_id *id = pe->data;
2635 struct got_reference *ref;
2636 char *remote_refname;
2638 if (is_wanted_ref(&wanted_refs, refname) &&
2639 !remote->mirror_references) {
2640 error = update_wanted_ref(refname, id,
2641 remote->name, verbosity, repo);
2647 if (remote->mirror_references ||
2648 strncmp("refs/tags/", refname, 10) == 0) {
2649 error = got_ref_open(&ref, repo, refname, 1);
2651 if (error->code != GOT_ERR_NOT_REF)
2653 error = create_ref(refname, id, verbosity,
2658 error = update_ref(ref, id, replace_tags,
2660 unlock_err = got_ref_unlock(ref);
2661 if (unlock_err && error == NULL)
2667 } else if (strncmp("refs/heads/", refname, 11) == 0) {
2668 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2669 remote_name, refname + 11) == -1) {
2670 error = got_error_from_errno("asprintf");
2674 error = got_ref_open(&ref, repo, remote_refname, 1);
2676 if (error->code != GOT_ERR_NOT_REF)
2678 error = create_ref(remote_refname, id,
2683 error = update_ref(ref, id, replace_tags,
2685 unlock_err = got_ref_unlock(ref);
2686 if (unlock_err && error == NULL)
2693 /* Also create a local branch if none exists yet. */
2694 error = got_ref_open(&ref, repo, refname, 1);
2696 if (error->code != GOT_ERR_NOT_REF)
2698 error = create_ref(refname, id, verbosity,
2703 unlock_err = got_ref_unlock(ref);
2704 if (unlock_err && error == NULL)
2711 error = delete_missing_refs(&refs, &symrefs, remote,
2717 if (!remote->mirror_references) {
2718 /* Update remote HEAD reference if the server provided one. */
2719 TAILQ_FOREACH(pe, &symrefs, entry) {
2720 struct got_reference *target_ref;
2721 const char *refname = pe->path;
2722 const char *target = pe->data;
2723 char *remote_refname = NULL, *remote_target = NULL;
2725 if (strcmp(refname, GOT_REF_HEAD) != 0)
2728 if (strncmp("refs/heads/", target, 11) != 0)
2731 if (asprintf(&remote_refname, "refs/remotes/%s/%s",
2732 remote->name, refname) == -1) {
2733 error = got_error_from_errno("asprintf");
2736 if (asprintf(&remote_target, "refs/remotes/%s/%s",
2737 remote->name, target + 11) == -1) {
2738 error = got_error_from_errno("asprintf");
2739 free(remote_refname);
2743 error = got_ref_open(&target_ref, repo, remote_target,
2746 free(remote_refname);
2747 free(remote_target);
2748 if (error->code == GOT_ERR_NOT_REF) {
2754 error = update_symref(remote_refname, target_ref,
2756 free(remote_refname);
2757 free(remote_target);
2758 got_ref_close(target_ref);
2765 if (kill(fetchpid, SIGTERM) == -1)
2766 error = got_error_from_errno("kill");
2767 if (waitpid(fetchpid, &fetchstatus, 0) == -1 && error == NULL)
2768 error = got_error_from_errno("waitpid");
2770 if (fetchfd != -1 && close(fetchfd) == -1 && error == NULL)
2771 error = got_error_from_errno("close");
2773 const struct got_error *close_err = got_repo_close(repo);
2778 got_worktree_close(worktree);
2780 const struct got_error *pack_err =
2781 got_repo_pack_fds_close(pack_fds);
2785 got_pathlist_free(&refs, GOT_PATHLIST_FREE_ALL);
2786 got_pathlist_free(&symrefs, GOT_PATHLIST_FREE_ALL);
2787 got_pathlist_free(&wanted_branches, GOT_PATHLIST_FREE_NONE);
2788 got_pathlist_free(&wanted_refs, GOT_PATHLIST_FREE_NONE);
2789 got_ref_list_free(&remote_refs);
2804 usage_checkout(void)
2806 fprintf(stderr, "usage: %s checkout [-Eq] [-b branch] [-c commit] "
2807 "[-p path-prefix] repository-path [work-tree-path]\n",
2813 show_worktree_base_ref_warning(void)
2815 fprintf(stderr, "%s: warning: could not create a reference "
2816 "to the work tree's base commit; the commit could be "
2817 "garbage-collected by Git or 'gotadmin cleanup'; making the "
2818 "repository writable and running 'got update' will prevent this\n",
2822 struct got_checkout_progress_arg {
2823 const char *worktree_path;
2824 int had_base_commit_ref_error;
2828 static const struct got_error *
2829 checkout_progress(void *arg, unsigned char status, const char *path)
2831 struct got_checkout_progress_arg *a = arg;
2833 /* Base commit bump happens silently. */
2834 if (status == GOT_STATUS_BUMP_BASE)
2837 if (status == GOT_STATUS_BASE_REF_ERR) {
2838 a->had_base_commit_ref_error = 1;
2842 while (path[0] == '/')
2845 if (a->verbosity >= 0)
2846 printf("%c %s/%s\n", status, a->worktree_path, path);
2851 static const struct got_error *
2852 check_cancelled(void *arg)
2854 if (sigint_received || sigpipe_received)
2855 return got_error(GOT_ERR_CANCELLED);
2859 static const struct got_error *
2860 check_linear_ancestry(struct got_object_id *commit_id,
2861 struct got_object_id *base_commit_id, int allow_forwards_in_time_only,
2862 struct got_repository *repo)
2864 const struct got_error *err = NULL;
2865 struct got_object_id *yca_id;
2867 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
2868 commit_id, base_commit_id, 1, repo, check_cancelled, NULL);
2873 return got_error(GOT_ERR_ANCESTRY);
2876 * Require a straight line of history between the target commit
2877 * and the work tree's base commit.
2879 * Non-linear situations such as this require a rebase:
2881 * (commit) D F (base_commit)
2889 * 'got update' only handles linear cases:
2890 * Update forwards in time: A (base/yca) - B - C - D (commit)
2891 * Update backwards in time: D (base) - C - B - A (commit/yca)
2893 if (allow_forwards_in_time_only) {
2894 if (got_object_id_cmp(base_commit_id, yca_id) != 0)
2895 return got_error(GOT_ERR_ANCESTRY);
2896 } else if (got_object_id_cmp(commit_id, yca_id) != 0 &&
2897 got_object_id_cmp(base_commit_id, yca_id) != 0)
2898 return got_error(GOT_ERR_ANCESTRY);
2904 static const struct got_error *
2905 check_same_branch(struct got_object_id *commit_id,
2906 struct got_reference *head_ref, struct got_repository *repo)
2908 const struct got_error *err = NULL;
2909 struct got_commit_graph *graph = NULL;
2910 struct got_object_id *head_commit_id = NULL;
2912 err = got_ref_resolve(&head_commit_id, repo, head_ref);
2916 if (got_object_id_cmp(head_commit_id, commit_id) == 0)
2919 err = got_commit_graph_open(&graph, "/", 1);
2923 err = got_commit_graph_iter_start(graph, head_commit_id, repo,
2924 check_cancelled, NULL);
2929 struct got_object_id id;
2931 err = got_commit_graph_iter_next(&id, graph, repo,
2932 check_cancelled, NULL);
2934 if (err->code == GOT_ERR_ITER_COMPLETED)
2935 err = got_error(GOT_ERR_ANCESTRY);
2939 if (got_object_id_cmp(&id, commit_id) == 0)
2944 got_commit_graph_close(graph);
2945 free(head_commit_id);
2949 static const struct got_error *
2950 checkout_ancestry_error(struct got_reference *ref, const char *commit_id_str)
2952 static char msg[512];
2953 const char *branch_name;
2955 if (got_ref_is_symbolic(ref))
2956 branch_name = got_ref_get_symref_target(ref);
2958 branch_name = got_ref_get_name(ref);
2960 if (strncmp("refs/heads/", branch_name, 11) == 0)
2963 snprintf(msg, sizeof(msg),
2964 "target commit is not contained in branch '%s'; "
2965 "the branch to use must be specified with -b; "
2966 "if necessary a new branch can be created for "
2967 "this commit with 'got branch -c %s BRANCH_NAME'",
2968 branch_name, commit_id_str);
2970 return got_error_msg(GOT_ERR_ANCESTRY, msg);
2973 static const struct got_error *
2974 cmd_checkout(int argc, char *argv[])
2976 const struct got_error *error = NULL;
2977 struct got_repository *repo = NULL;
2978 struct got_reference *head_ref = NULL, *ref = NULL;
2979 struct got_worktree *worktree = NULL;
2980 char *repo_path = NULL;
2981 char *worktree_path = NULL;
2982 const char *path_prefix = "";
2983 const char *branch_name = GOT_REF_HEAD, *refname = NULL;
2984 char *commit_id_str = NULL, *keyword_idstr = NULL;
2985 struct got_object_id *commit_id = NULL;
2987 int ch, same_path_prefix, allow_nonempty = 0, verbosity = 0;
2988 struct got_pathlist_head paths;
2989 struct got_checkout_progress_arg cpa;
2990 int *pack_fds = NULL;
2995 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
2996 "unveil", NULL) == -1)
3000 while ((ch = getopt(argc, argv, "b:c:Ep:q")) != -1) {
3003 branch_name = optarg;
3006 commit_id_str = strdup(optarg);
3007 if (commit_id_str == NULL)
3008 return got_error_from_errno("strdup");
3014 path_prefix = optarg;
3029 char *base, *dotgit;
3031 repo_path = realpath(argv[0], NULL);
3032 if (repo_path == NULL)
3033 return got_error_from_errno2("realpath", argv[0]);
3034 cwd = getcwd(NULL, 0);
3036 error = got_error_from_errno("getcwd");
3043 error = got_path_basename(&base, path);
3046 dotgit = strstr(base, ".git");
3049 if (asprintf(&worktree_path, "%s/%s", cwd, base) == -1) {
3050 error = got_error_from_errno("asprintf");
3055 } else if (argc == 2) {
3056 repo_path = realpath(argv[0], NULL);
3057 if (repo_path == NULL) {
3058 error = got_error_from_errno2("realpath", argv[0]);
3061 worktree_path = realpath(argv[1], NULL);
3062 if (worktree_path == NULL) {
3063 if (errno != ENOENT) {
3064 error = got_error_from_errno2("realpath",
3068 worktree_path = strdup(argv[1]);
3069 if (worktree_path == NULL) {
3070 error = got_error_from_errno("strdup");
3077 got_path_strip_trailing_slashes(repo_path);
3078 got_path_strip_trailing_slashes(worktree_path);
3080 error = got_repo_pack_fds_open(&pack_fds);
3084 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
3088 /* Pre-create work tree path for unveil(2) */
3089 error = got_path_mkdir(worktree_path);
3091 if (!(error->code == GOT_ERR_ERRNO && errno == EISDIR) &&
3092 !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3094 if (!allow_nonempty &&
3095 !got_path_dir_is_empty(worktree_path)) {
3096 error = got_error_path(worktree_path,
3097 GOT_ERR_DIR_NOT_EMPTY);
3102 error = apply_unveil(got_repo_get_path(repo), 0, worktree_path);
3106 error = got_ref_open(&head_ref, repo, branch_name, 0);
3110 error = got_worktree_init(worktree_path, head_ref, path_prefix,
3111 GOT_WORKTREE_GOT_DIR, repo);
3112 if (error != NULL && !(error->code == GOT_ERR_ERRNO && errno == EEXIST))
3115 error = got_worktree_open(&worktree, worktree_path,
3116 GOT_WORKTREE_GOT_DIR);
3120 error = got_worktree_match_path_prefix(&same_path_prefix, worktree,
3124 if (!same_path_prefix) {
3125 error = got_error(GOT_ERR_PATH_PREFIX);
3129 if (commit_id_str) {
3130 struct got_reflist_head refs;
3132 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3137 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3141 if (keyword_idstr != NULL) {
3142 free(commit_id_str);
3143 commit_id_str = keyword_idstr;
3146 error = got_repo_match_object_id(&commit_id, NULL,
3147 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3148 got_ref_list_free(&refs);
3151 error = check_linear_ancestry(commit_id,
3152 got_worktree_get_base_commit_id(worktree), 0, repo);
3153 if (error != NULL) {
3154 if (error->code == GOT_ERR_ANCESTRY) {
3155 error = checkout_ancestry_error(
3156 head_ref, commit_id_str);
3160 error = check_same_branch(commit_id, head_ref, repo);
3162 if (error->code == GOT_ERR_ANCESTRY) {
3163 error = checkout_ancestry_error(
3164 head_ref, commit_id_str);
3168 error = got_worktree_set_base_commit_id(worktree, repo,
3172 /* Expand potentially abbreviated commit ID string. */
3173 free(commit_id_str);
3174 error = got_object_id_str(&commit_id_str, commit_id);
3178 commit_id = got_object_id_dup(
3179 got_worktree_get_base_commit_id(worktree));
3180 if (commit_id == NULL) {
3181 error = got_error_from_errno("got_object_id_dup");
3184 error = got_object_id_str(&commit_id_str, commit_id);
3189 error = got_pathlist_append(&paths, "", NULL);
3192 cpa.worktree_path = worktree_path;
3193 cpa.had_base_commit_ref_error = 0;
3194 cpa.verbosity = verbosity;
3195 error = got_worktree_checkout_files(worktree, &paths, repo,
3196 checkout_progress, &cpa, check_cancelled, NULL);
3200 if (got_ref_is_symbolic(head_ref)) {
3201 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
3204 refname = got_ref_get_name(ref);
3206 refname = got_ref_get_name(head_ref);
3207 printf("Checked out %s: %s\n", refname, commit_id_str);
3208 printf("Now shut up and hack\n");
3209 if (cpa.had_base_commit_ref_error)
3210 show_worktree_base_ref_warning();
3213 const struct got_error *pack_err =
3214 got_repo_pack_fds_close(pack_fds);
3219 got_ref_close(head_ref);
3223 const struct got_error *close_err = got_repo_close(repo);
3227 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
3228 free(commit_id_str);
3231 free(worktree_path);
3236 struct got_update_progress_arg {
3248 print_update_progress_stats(struct got_update_progress_arg *upa)
3250 if (!upa->did_something)
3253 if (upa->conflicts > 0)
3254 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3255 if (upa->obstructed > 0)
3256 printf("File paths obstructed by a non-regular file: %d\n",
3258 if (upa->not_updated > 0)
3259 printf("Files not updated because of existing merge "
3260 "conflicts: %d\n", upa->not_updated);
3264 * The meaning of some status codes differs between merge-style operations and
3265 * update operations. For example, the ! status code means "file was missing"
3266 * if changes were merged into the work tree, and "missing file was restored"
3267 * if the work tree was updated. This function should be used by any operation
3268 * which merges changes into the work tree without updating the work tree.
3271 print_merge_progress_stats(struct got_update_progress_arg *upa)
3273 if (!upa->did_something)
3276 if (upa->conflicts > 0)
3277 printf("Files with new merge conflicts: %d\n", upa->conflicts);
3278 if (upa->obstructed > 0)
3279 printf("File paths obstructed by a non-regular file: %d\n",
3281 if (upa->missing > 0)
3282 printf("Files which had incoming changes but could not be "
3283 "found in the work tree: %d\n", upa->missing);
3284 if (upa->not_deleted > 0)
3285 printf("Files not deleted due to differences in deleted "
3286 "content: %d\n", upa->not_deleted);
3287 if (upa->unversioned > 0)
3288 printf("Files not merged because an unversioned file was "
3289 "found in the work tree: %d\n", upa->unversioned);
3295 fprintf(stderr, "usage: %s update [-q] [-b branch] [-c commit] "
3296 "[path ...]\n", getprogname());
3300 static const struct got_error *
3301 update_progress(void *arg, unsigned char status, const char *path)
3303 struct got_update_progress_arg *upa = arg;
3305 if (status == GOT_STATUS_EXISTS ||
3306 status == GOT_STATUS_BASE_REF_ERR)
3309 upa->did_something = 1;
3311 /* Base commit bump happens silently. */
3312 if (status == GOT_STATUS_BUMP_BASE)
3315 if (status == GOT_STATUS_CONFLICT)
3317 if (status == GOT_STATUS_OBSTRUCTED)
3319 if (status == GOT_STATUS_CANNOT_UPDATE)
3321 if (status == GOT_STATUS_MISSING)
3323 if (status == GOT_STATUS_CANNOT_DELETE)
3325 if (status == GOT_STATUS_UNVERSIONED)
3328 while (path[0] == '/')
3330 if (upa->verbosity >= 0)
3331 printf("%c %s\n", status, path);
3336 static const struct got_error *
3337 switch_head_ref(struct got_reference *head_ref,
3338 struct got_object_id *commit_id, struct got_worktree *worktree,
3339 struct got_repository *repo)
3341 const struct got_error *err = NULL;
3343 int ref_has_moved = 0;
3345 /* Trivial case: switching between two different references. */
3346 if (strcmp(got_ref_get_name(head_ref),
3347 got_worktree_get_head_ref_name(worktree)) != 0) {
3348 printf("Switching work tree from %s to %s\n",
3349 got_worktree_get_head_ref_name(worktree),
3350 got_ref_get_name(head_ref));
3351 return got_worktree_set_head_ref(worktree, head_ref);
3354 err = check_linear_ancestry(commit_id,
3355 got_worktree_get_base_commit_id(worktree), 0, repo);
3357 if (err->code != GOT_ERR_ANCESTRY)
3364 /* Switching to a rebased branch with the same reference name. */
3365 err = got_object_id_str(&base_id_str,
3366 got_worktree_get_base_commit_id(worktree));
3369 printf("Reference %s now points at a different branch\n",
3370 got_worktree_get_head_ref_name(worktree));
3371 printf("Switching work tree from %s to %s\n", base_id_str,
3372 got_worktree_get_head_ref_name(worktree));
3376 static const struct got_error *
3377 check_rebase_or_histedit_in_progress(struct got_worktree *worktree)
3379 const struct got_error *err;
3382 err = got_worktree_rebase_in_progress(&in_progress, worktree);
3386 return got_error(GOT_ERR_REBASING);
3388 err = got_worktree_histedit_in_progress(&in_progress, worktree);
3392 return got_error(GOT_ERR_HISTEDIT_BUSY);
3397 static const struct got_error *
3398 check_merge_in_progress(struct got_worktree *worktree,
3399 struct got_repository *repo)
3401 const struct got_error *err;
3404 err = got_worktree_merge_in_progress(&in_progress, worktree, repo);
3408 return got_error(GOT_ERR_MERGE_BUSY);
3413 static const struct got_error *
3414 get_worktree_paths_from_argv(struct got_pathlist_head *paths, int argc,
3415 char *argv[], struct got_worktree *worktree)
3417 const struct got_error *err = NULL;
3419 struct got_pathlist_entry *new;
3425 return got_error_from_errno("strdup");
3426 return got_pathlist_append(paths, path, NULL);
3429 for (i = 0; i < argc; i++) {
3430 err = got_worktree_resolve_path(&path, worktree, argv[i]);
3433 err = got_pathlist_insert(&new, paths, path, NULL);
3434 if (err || new == NULL /* duplicate */) {
3444 static const struct got_error *
3445 wrap_not_worktree_error(const struct got_error *orig_err,
3446 const char *cmdname, const char *path)
3448 const struct got_error *err;
3449 struct got_repository *repo;
3450 static char msg[512];
3451 int *pack_fds = NULL;
3453 err = got_repo_pack_fds_open(&pack_fds);
3457 err = got_repo_open(&repo, path, NULL, pack_fds);
3461 snprintf(msg, sizeof(msg),
3462 "'got %s' needs a work tree in addition to a git repository\n"
3463 "Work trees can be checked out from this Git repository with "
3465 "The got(1) manual page contains more information.", cmdname);
3466 err = got_error_msg(GOT_ERR_NOT_WORKTREE, msg);
3468 const struct got_error *close_err = got_repo_close(repo);
3473 const struct got_error *pack_err =
3474 got_repo_pack_fds_close(pack_fds);
3481 static const struct got_error *
3482 cmd_update(int argc, char *argv[])
3484 const struct got_error *error = NULL;
3485 struct got_repository *repo = NULL;
3486 struct got_worktree *worktree = NULL;
3487 char *worktree_path = NULL;
3488 struct got_object_id *commit_id = NULL;
3489 char *commit_id_str = NULL;
3490 const char *branch_name = NULL;
3491 struct got_reference *head_ref = NULL;
3492 struct got_pathlist_head paths;
3493 struct got_pathlist_entry *pe;
3494 int ch, verbosity = 0;
3495 struct got_update_progress_arg upa;
3496 int *pack_fds = NULL;
3501 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
3502 "unveil", NULL) == -1)
3506 while ((ch = getopt(argc, argv, "b:c:q")) != -1) {
3509 branch_name = optarg;
3512 commit_id_str = strdup(optarg);
3513 if (commit_id_str == NULL)
3514 return got_error_from_errno("strdup");
3528 worktree_path = getcwd(NULL, 0);
3529 if (worktree_path == NULL) {
3530 error = got_error_from_errno("getcwd");
3534 error = got_repo_pack_fds_open(&pack_fds);
3538 error = got_worktree_open(&worktree, worktree_path,
3539 GOT_WORKTREE_GOT_DIR);
3541 if (error->code == GOT_ERR_NOT_WORKTREE)
3542 error = wrap_not_worktree_error(error, "update",
3547 error = check_rebase_or_histedit_in_progress(worktree);
3551 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
3556 error = apply_unveil(got_repo_get_path(repo), 0,
3557 got_worktree_get_root_path(worktree));
3561 error = check_merge_in_progress(worktree, repo);
3565 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
3569 error = got_ref_open(&head_ref, repo, branch_name ? branch_name :
3570 got_worktree_get_head_ref_name(worktree), 0);
3573 if (commit_id_str == NULL) {
3574 error = got_ref_resolve(&commit_id, repo, head_ref);
3577 error = got_object_id_str(&commit_id_str, commit_id);
3581 struct got_reflist_head refs;
3582 char *keyword_idstr = NULL;
3586 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
3591 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
3595 if (keyword_idstr != NULL) {
3596 free(commit_id_str);
3597 commit_id_str = keyword_idstr;
3600 error = got_repo_match_object_id(&commit_id, NULL,
3601 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
3602 got_ref_list_free(&refs);
3603 free(commit_id_str);
3604 commit_id_str = NULL;
3607 error = got_object_id_str(&commit_id_str, commit_id);
3613 struct got_object_id *head_commit_id;
3614 TAILQ_FOREACH(pe, &paths, entry) {
3615 if (pe->path_len == 0)
3617 error = got_error_msg(GOT_ERR_BAD_PATH,
3618 "switching between branches requires that "
3619 "the entire work tree gets updated");
3622 error = got_ref_resolve(&head_commit_id, repo, head_ref);
3625 error = check_linear_ancestry(commit_id, head_commit_id, 0,
3627 free(head_commit_id);
3630 error = check_same_branch(commit_id, head_ref, repo);
3633 error = switch_head_ref(head_ref, commit_id, worktree, repo);
3637 error = check_linear_ancestry(commit_id,
3638 got_worktree_get_base_commit_id(worktree), 0, repo);
3639 if (error != NULL) {
3640 if (error->code == GOT_ERR_ANCESTRY)
3641 error = got_error(GOT_ERR_BRANCH_MOVED);
3644 error = check_same_branch(commit_id, head_ref, repo);
3649 if (got_object_id_cmp(got_worktree_get_base_commit_id(worktree),
3651 error = got_worktree_set_base_commit_id(worktree, repo,
3657 memset(&upa, 0, sizeof(upa));
3658 upa.verbosity = verbosity;
3659 error = got_worktree_checkout_files(worktree, &paths, repo,
3660 update_progress, &upa, check_cancelled, NULL);
3664 if (upa.did_something) {
3665 printf("Updated to %s: %s\n",
3666 got_worktree_get_head_ref_name(worktree), commit_id_str);
3668 printf("Already up-to-date\n");
3670 print_update_progress_stats(&upa);
3673 const struct got_error *pack_err =
3674 got_repo_pack_fds_close(pack_fds);
3679 const struct got_error *close_err = got_repo_close(repo);
3683 if (head_ref != NULL)
3684 got_ref_close(head_ref);
3685 free(worktree_path);
3686 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
3688 free(commit_id_str);
3692 static const struct got_error *
3693 diff_blobs(struct got_object_id *blob_id1, struct got_object_id *blob_id2,
3694 const char *path, int diff_context, int ignore_whitespace,
3695 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3696 struct got_repository *repo, FILE *outfile)
3698 const struct got_error *err = NULL;
3699 struct got_blob_object *blob1 = NULL, *blob2 = NULL;
3700 FILE *f1 = NULL, *f2 = NULL;
3701 int fd1 = -1, fd2 = -1;
3703 fd1 = got_opentempfd();
3705 return got_error_from_errno("got_opentempfd");
3706 fd2 = got_opentempfd();
3708 err = got_error_from_errno("got_opentempfd");
3713 err = got_object_open_as_blob(&blob1, repo, blob_id1, 8192,
3719 err = got_object_open_as_blob(&blob2, repo, blob_id2, 8192, fd2);
3723 f1 = got_opentemp();
3725 err = got_error_from_errno("got_opentemp");
3728 f2 = got_opentemp();
3730 err = got_error_from_errno("got_opentemp");
3734 while (path[0] == '/')
3736 err = got_diff_blob(NULL, NULL, blob1, blob2, f1, f2, path, path,
3737 GOT_DIFF_ALGORITHM_PATIENCE, diff_context, ignore_whitespace,
3738 force_text_diff, dsa, outfile);
3740 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3741 err = got_error_from_errno("close");
3743 got_object_blob_close(blob1);
3744 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3745 err = got_error_from_errno("close");
3747 got_object_blob_close(blob2);
3748 if (f1 && fclose(f1) == EOF && err == NULL)
3749 err = got_error_from_errno("fclose");
3750 if (f2 && fclose(f2) == EOF && err == NULL)
3751 err = got_error_from_errno("fclose");
3755 static const struct got_error *
3756 diff_trees(struct got_object_id *tree_id1, struct got_object_id *tree_id2,
3757 const char *path, int diff_context, int ignore_whitespace,
3758 int force_text_diff, struct got_diffstat_cb_arg *dsa,
3759 struct got_repository *repo, FILE *outfile)
3761 const struct got_error *err = NULL;
3762 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3763 struct got_diff_blob_output_unidiff_arg arg;
3764 FILE *f1 = NULL, *f2 = NULL;
3765 int fd1 = -1, fd2 = -1;
3768 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3771 fd1 = got_opentempfd();
3773 err = got_error_from_errno("got_opentempfd");
3778 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3782 f1 = got_opentemp();
3784 err = got_error_from_errno("got_opentemp");
3788 f2 = got_opentemp();
3790 err = got_error_from_errno("got_opentemp");
3793 fd2 = got_opentempfd();
3795 err = got_error_from_errno("got_opentempfd");
3798 arg.diff_context = diff_context;
3799 arg.ignore_whitespace = ignore_whitespace;
3800 arg.force_text_diff = force_text_diff;
3802 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
3803 arg.outfile = outfile;
3806 while (path[0] == '/')
3808 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, path, path, repo,
3809 got_diff_blob_output_unidiff, &arg, 1);
3812 got_object_tree_close(tree1);
3814 got_object_tree_close(tree2);
3815 if (f1 && fclose(f1) == EOF && err == NULL)
3816 err = got_error_from_errno("fclose");
3817 if (f2 && fclose(f2) == EOF && err == NULL)
3818 err = got_error_from_errno("fclose");
3819 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3820 err = got_error_from_errno("close");
3821 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3822 err = got_error_from_errno("close");
3826 static const struct got_error *
3827 get_changed_paths(struct got_pathlist_head *paths,
3828 struct got_commit_object *commit, struct got_repository *repo,
3829 struct got_diffstat_cb_arg *dsa)
3831 const struct got_error *err = NULL;
3832 struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3833 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3834 struct got_object_qid *qid;
3835 got_diff_blob_cb cb = got_diff_tree_collect_changed_paths;
3836 FILE *f1 = NULL, *f2 = NULL;
3837 int fd1 = -1, fd2 = -1;
3840 cb = got_diff_tree_compute_diffstat;
3842 f1 = got_opentemp();
3844 err = got_error_from_errno("got_opentemp");
3847 f2 = got_opentemp();
3849 err = got_error_from_errno("got_opentemp");
3852 fd1 = got_opentempfd();
3854 err = got_error_from_errno("got_opentempfd");
3857 fd2 = got_opentempfd();
3859 err = got_error_from_errno("got_opentempfd");
3864 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3866 struct got_commit_object *pcommit;
3867 err = got_object_open_as_commit(&pcommit, repo,
3872 tree_id1 = got_object_id_dup(
3873 got_object_commit_get_tree_id(pcommit));
3874 if (tree_id1 == NULL) {
3875 got_object_commit_close(pcommit);
3876 return got_error_from_errno("got_object_id_dup");
3878 got_object_commit_close(pcommit);
3883 err = got_object_open_as_tree(&tree1, repo, tree_id1);
3888 tree_id2 = got_object_commit_get_tree_id(commit);
3889 err = got_object_open_as_tree(&tree2, repo, tree_id2);
3893 err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3894 cb, dsa ? (void *)dsa : paths, dsa ? 1 : 0);
3897 got_object_tree_close(tree1);
3899 got_object_tree_close(tree2);
3900 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3901 err = got_error_from_errno("close");
3902 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3903 err = got_error_from_errno("close");
3904 if (f1 && fclose(f1) == EOF && err == NULL)
3905 err = got_error_from_errno("fclose");
3906 if (f2 && fclose(f2) == EOF && err == NULL)
3907 err = got_error_from_errno("fclose");
3912 static const struct got_error *
3913 print_patch(struct got_commit_object *commit, struct got_object_id *id,
3914 const char *path, int diff_context, struct got_diffstat_cb_arg *dsa,
3915 struct got_repository *repo, FILE *outfile)
3917 const struct got_error *err = NULL;
3918 struct got_commit_object *pcommit = NULL;
3919 char *id_str1 = NULL, *id_str2 = NULL;
3920 struct got_object_id *obj_id1 = NULL, *obj_id2 = NULL;
3921 struct got_object_qid *qid;
3923 qid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
3925 err = got_object_open_as_commit(&pcommit, repo,
3929 err = got_object_id_str(&id_str1, &qid->id);
3934 err = got_object_id_str(&id_str2, id);
3938 if (path && path[0] != '\0') {
3940 err = got_object_id_by_path(&obj_id2, repo, commit, path);
3944 err = got_object_id_by_path(&obj_id1, repo,
3947 if (err->code != GOT_ERR_NO_TREE_ENTRY) {
3953 err = got_object_get_type(&obj_type, repo, obj_id2);
3959 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3960 fprintf(outfile, "commit - %s\n",
3961 id_str1 ? id_str1 : "/dev/null");
3962 fprintf(outfile, "commit + %s\n", id_str2);
3964 case GOT_OBJ_TYPE_BLOB:
3965 err = diff_blobs(obj_id1, obj_id2, path, diff_context,
3966 0, 0, dsa, repo, outfile);
3968 case GOT_OBJ_TYPE_TREE:
3969 err = diff_trees(obj_id1, obj_id2, path, diff_context,
3970 0, 0, dsa, repo, outfile);
3973 err = got_error(GOT_ERR_OBJ_TYPE);
3979 obj_id2 = got_object_commit_get_tree_id(commit);
3981 obj_id1 = got_object_commit_get_tree_id(pcommit);
3983 "diff %s %s\n", id_str1 ? id_str1 : "/dev/null", id_str2);
3984 fprintf(outfile, "commit - %s\n",
3985 id_str1 ? id_str1 : "/dev/null");
3986 fprintf(outfile, "commit + %s\n", id_str2);
3987 err = diff_trees(obj_id1, obj_id2, "", diff_context, 0, 0,
3988 dsa, repo, outfile);
3994 got_object_commit_close(pcommit);
3999 get_datestr(time_t *time, char *datebuf)
4001 struct tm mytm, *tm;
4004 tm = gmtime_r(time, &mytm);
4007 s = asctime_r(tm, datebuf);
4010 p = strchr(s, '\n');
4016 static const struct got_error *
4017 match_commit(int *have_match, struct got_object_id *id,
4018 struct got_commit_object *commit, regex_t *regex)
4020 const struct got_error *err = NULL;
4021 regmatch_t regmatch;
4022 char *id_str = NULL, *logmsg = NULL;
4026 err = got_object_id_str(&id_str, id);
4030 err = got_object_commit_get_logmsg(&logmsg, commit);
4034 if (regexec(regex, got_object_commit_get_author(commit), 1,
4035 ®match, 0) == 0 ||
4036 regexec(regex, got_object_commit_get_committer(commit), 1,
4037 ®match, 0) == 0 ||
4038 regexec(regex, id_str, 1, ®match, 0) == 0 ||
4039 regexec(regex, logmsg, 1, ®match, 0) == 0)
4048 match_changed_paths(int *have_match, struct got_pathlist_head *changed_paths,
4051 regmatch_t regmatch;
4052 struct got_pathlist_entry *pe;
4056 TAILQ_FOREACH(pe, changed_paths, entry) {
4057 if (regexec(regex, pe->path, 1, ®match, 0) == 0) {
4064 static const struct got_error *
4065 match_patch(int *have_match, struct got_commit_object *commit,
4066 struct got_object_id *id, const char *path, int diff_context,
4067 struct got_repository *repo, regex_t *regex, FILE *f)
4069 const struct got_error *err = NULL;
4071 size_t linesize = 0;
4072 regmatch_t regmatch;
4076 err = got_opentemp_truncate(f);
4080 err = print_patch(commit, id, path, diff_context, NULL, repo, f);
4084 if (fseeko(f, 0L, SEEK_SET) == -1) {
4085 err = got_error_from_errno("fseeko");
4089 while (getline(&line, &linesize, f) != -1) {
4090 if (regexec(regex, line, 1, ®match, 0) == 0) {
4100 #define GOT_COMMIT_SEP_STR "-----------------------------------------------\n"
4102 static const struct got_error*
4103 build_refs_str(char **refs_str, struct got_reflist_head *refs,
4104 struct got_object_id *id, struct got_repository *repo,
4107 static const struct got_error *err = NULL;
4108 struct got_reflist_entry *re;
4114 TAILQ_FOREACH(re, refs, entry) {
4115 struct got_tag_object *tag = NULL;
4116 struct got_object_id *ref_id;
4119 name = got_ref_get_name(re->ref);
4120 if (strcmp(name, GOT_REF_HEAD) == 0)
4122 if (strncmp(name, "refs/", 5) == 0)
4124 if (strncmp(name, "got/", 4) == 0)
4126 if (strncmp(name, "heads/", 6) == 0)
4128 if (strncmp(name, "remotes/", 8) == 0) {
4132 s = strstr(name, "/" GOT_REF_HEAD);
4133 if (s != NULL && strcmp(s, "/" GOT_REF_HEAD) == 0)
4136 err = got_ref_resolve(&ref_id, repo, re->ref);
4139 if (strncmp(name, "tags/", 5) == 0) {
4140 err = got_object_open_as_tag(&tag, repo, ref_id);
4142 if (err->code != GOT_ERR_OBJ_TYPE) {
4146 /* Ref points at something other than a tag. */
4151 cmp = got_object_id_cmp(tag ?
4152 got_object_tag_get_object_id(tag) : ref_id, id);
4155 got_object_tag_close(tag);
4159 if (asprintf(refs_str, "%s%s%s", s ? s : "",
4160 s ? ", " : "", name) == -1) {
4161 err = got_error_from_errno("asprintf");
4172 static const struct got_error *
4173 print_commit_oneline(struct got_commit_object *commit, struct got_object_id *id,
4174 struct got_repository *repo, struct got_reflist_object_id_map *refs_idmap)
4176 const struct got_error *err = NULL;
4177 char *ref_str = NULL, *id_str = NULL, *logmsg0 = NULL;
4178 char *comma, *s, *nl;
4179 struct got_reflist_head *refs;
4180 char datebuf[12]; /* YYYY-MM-DD + SPACE + NUL */
4182 time_t committer_time;
4184 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4186 err = build_refs_str(&ref_str, refs, id, repo, 1);
4190 /* Display the first matching ref only. */
4191 if (ref_str && (comma = strchr(ref_str, ',')) != NULL)
4195 if (ref_str == NULL) {
4196 err = got_object_id_str(&id_str, id);
4201 committer_time = got_object_commit_get_committer_time(commit);
4202 if (gmtime_r(&committer_time, &tm) == NULL) {
4203 err = got_error_from_errno("gmtime_r");
4206 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d ", &tm) == 0) {
4207 err = got_error(GOT_ERR_NO_SPACE);
4211 err = got_object_commit_get_logmsg(&logmsg0, commit);
4216 while (isspace((unsigned char)s[0]))
4219 nl = strchr(s, '\n');
4225 printf("%s%-7s %s\n", datebuf, ref_str, s);
4227 printf("%s%.7s %s\n", datebuf, id_str, s);
4229 if (fflush(stdout) != 0 && err == NULL)
4230 err = got_error_from_errno("fflush");
4238 static const struct got_error *
4239 print_diffstat(struct got_diffstat_cb_arg *dsa, const char *header)
4241 struct got_pathlist_entry *pe;
4244 printf("%s\n", header);
4246 TAILQ_FOREACH(pe, dsa->paths, entry) {
4247 struct got_diff_changed_path *cp = pe->data;
4248 int pad = dsa->max_path_len - pe->path_len + 1;
4250 printf(" %c %s%*c | %*d+ %*d-\n", cp->status, pe->path, pad,
4251 ' ', dsa->add_cols + 1, cp->add, dsa->rm_cols + 1, cp->rm);
4253 printf("\n%d file%s changed, %d insertion%s(+), %d deletion%s(-)\n\n",
4254 dsa->nfiles, dsa->nfiles > 1 ? "s" : "", dsa->ins,
4255 dsa->ins != 1 ? "s" : "", dsa->del, dsa->del != 1 ? "s" : "");
4257 if (fflush(stdout) != 0)
4258 return got_error_from_errno("fflush");
4263 static const struct got_error *
4269 if (fseeko(f, 0L, SEEK_SET) == -1)
4270 return got_error_from_errno("fseek");
4273 r = fread(buf, 1, sizeof(buf), f);
4276 return got_error_from_errno("fread");
4280 if (fwrite(buf, 1, r, stdout) != r)
4281 return got_ferror(stdout, GOT_ERR_IO);
4287 static const struct got_error *
4288 print_commit(struct got_commit_object *commit, struct got_object_id *id,
4289 struct got_repository *repo, const char *path,
4290 struct got_pathlist_head *changed_paths,
4291 struct got_diffstat_cb_arg *diffstat, int show_patch, int diff_context,
4292 struct got_reflist_object_id_map *refs_idmap, const char *custom_refs_str,
4295 const struct got_error *err = NULL;
4297 char *id_str, *datestr, *logmsg0, *logmsg, *line;
4299 time_t committer_time;
4300 const char *author, *committer;
4301 char *refs_str = NULL;
4303 err = got_object_id_str(&id_str, id);
4307 if (custom_refs_str == NULL) {
4308 struct got_reflist_head *refs;
4309 refs = got_reflist_object_id_map_lookup(refs_idmap, id);
4311 err = build_refs_str(&refs_str, refs, id, repo, 0);
4317 printf(GOT_COMMIT_SEP_STR);
4318 if (custom_refs_str)
4319 printf("%s %s (%s)\n", prefix ? prefix : "commit", id_str,
4322 printf("%s %s%s%s%s\n", prefix ? prefix : "commit", id_str,
4323 refs_str ? " (" : "", refs_str ? refs_str : "",
4324 refs_str ? ")" : "");
4329 printf("from: %s\n", got_object_commit_get_author(commit));
4330 author = got_object_commit_get_author(commit);
4331 committer = got_object_commit_get_committer(commit);
4332 if (strcmp(author, committer) != 0)
4333 printf("via: %s\n", committer);
4334 committer_time = got_object_commit_get_committer_time(commit);
4335 datestr = get_datestr(&committer_time, datebuf);
4337 printf("date: %s UTC\n", datestr);
4338 if (got_object_commit_get_nparents(commit) > 1) {
4339 const struct got_object_id_queue *parent_ids;
4340 struct got_object_qid *qid;
4342 parent_ids = got_object_commit_get_parent_ids(commit);
4343 STAILQ_FOREACH(qid, parent_ids, entry) {
4344 err = got_object_id_str(&id_str, &qid->id);
4347 printf("parent %d: %s\n", n++, id_str);
4353 err = got_object_commit_get_logmsg(&logmsg0, commit);
4359 line = strsep(&logmsg, "\n");
4361 printf(" %s\n", line);
4365 if (changed_paths && diffstat == NULL) {
4366 struct got_pathlist_entry *pe;
4368 TAILQ_FOREACH(pe, changed_paths, entry) {
4369 struct got_diff_changed_path *cp = pe->data;
4371 printf(" %c %s\n", cp->status, pe->path);
4379 err = got_error_from_errno("got_opentemp");
4384 err = print_patch(commit, id, path, diff_context, diffstat,
4385 repo, diffstat == NULL ? stdout : f);
4390 err = print_diffstat(diffstat, NULL);
4402 if (fflush(stdout) != 0 && err == NULL)
4403 err = got_error_from_errno("fflush");
4405 if (f && fclose(f) == EOF && err == NULL)
4406 err = got_error_from_errno("fclose");
4412 static const struct got_error *
4413 print_commits(struct got_object_id *root_id, struct got_object_id *end_id,
4414 struct got_repository *repo, const char *path, int show_changed_paths,
4415 int show_diffstat, int show_patch, const char *search_pattern,
4416 int diff_context, int limit, int log_branches, int reverse_display_order,
4417 struct got_reflist_object_id_map *refs_idmap, int one_line,
4420 const struct got_error *err;
4421 struct got_commit_graph *graph;
4424 struct got_object_id_queue reversed_commits;
4425 struct got_object_qid *qid;
4426 struct got_commit_object *commit;
4427 struct got_pathlist_head changed_paths;
4429 STAILQ_INIT(&reversed_commits);
4430 TAILQ_INIT(&changed_paths);
4432 if (search_pattern && regcomp(®ex, search_pattern,
4433 REG_EXTENDED | REG_NOSUB | REG_NEWLINE))
4434 return got_error_msg(GOT_ERR_REGEX, search_pattern);
4436 err = got_commit_graph_open(&graph, path, !log_branches);
4439 err = got_commit_graph_iter_start(graph, root_id, repo,
4440 check_cancelled, NULL);
4444 struct got_object_id id;
4445 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4446 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4448 if (sigint_received || sigpipe_received)
4451 err = got_commit_graph_iter_next(&id, graph, repo,
4452 check_cancelled, NULL);
4454 if (err->code == GOT_ERR_ITER_COMPLETED)
4459 err = got_object_open_as_commit(&commit, repo, &id);
4463 if (((show_changed_paths && !show_diffstat) ||
4464 (show_diffstat && !show_patch))
4465 && !reverse_display_order) {
4466 err = get_changed_paths(&changed_paths, commit, repo,
4467 show_diffstat ? &dsa : NULL);
4472 if (search_pattern) {
4473 err = match_commit(&have_match, &id, commit, ®ex);
4475 got_object_commit_close(commit);
4478 if (have_match == 0 && show_changed_paths)
4479 match_changed_paths(&have_match,
4480 &changed_paths, ®ex);
4481 if (have_match == 0 && show_patch) {
4482 err = match_patch(&have_match, commit, &id,
4483 path, diff_context, repo, ®ex, tmpfile);
4487 if (have_match == 0) {
4488 got_object_commit_close(commit);
4489 got_pathlist_free(&changed_paths,
4490 GOT_PATHLIST_FREE_ALL);
4495 if (reverse_display_order) {
4496 err = got_object_qid_alloc(&qid, &id);
4499 STAILQ_INSERT_HEAD(&reversed_commits, qid, entry);
4500 got_object_commit_close(commit);
4503 err = print_commit_oneline(commit, &id,
4506 err = print_commit(commit, &id, repo, path,
4507 (show_changed_paths || show_diffstat) ?
4508 &changed_paths : NULL,
4509 show_diffstat ? &dsa : NULL, show_patch,
4510 diff_context, refs_idmap, NULL, NULL);
4511 got_object_commit_close(commit);
4515 if ((limit && --limit == 0) ||
4516 (end_id && got_object_id_cmp(&id, end_id) == 0))
4519 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4521 if (reverse_display_order) {
4522 STAILQ_FOREACH(qid, &reversed_commits, entry) {
4523 struct got_diffstat_cb_arg dsa = { 0, 0, 0, 0, 0, 0,
4524 &changed_paths, 0, 0, GOT_DIFF_ALGORITHM_PATIENCE };
4526 err = got_object_open_as_commit(&commit, repo,
4530 if ((show_changed_paths && !show_diffstat) ||
4531 (show_diffstat && !show_patch)) {
4532 err = get_changed_paths(&changed_paths, commit,
4533 repo, show_diffstat ? &dsa : NULL);
4538 err = print_commit_oneline(commit, &qid->id,
4541 err = print_commit(commit, &qid->id, repo, path,
4542 (show_changed_paths || show_diffstat) ?
4543 &changed_paths : NULL,
4544 show_diffstat ? &dsa : NULL, show_patch,
4545 diff_context, refs_idmap, NULL, NULL);
4546 got_object_commit_close(commit);
4549 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4553 while (!STAILQ_EMPTY(&reversed_commits)) {
4554 qid = STAILQ_FIRST(&reversed_commits);
4555 STAILQ_REMOVE_HEAD(&reversed_commits, entry);
4556 got_object_qid_free(qid);
4558 got_pathlist_free(&changed_paths, GOT_PATHLIST_FREE_ALL);
4561 got_commit_graph_close(graph);
4568 fprintf(stderr, "usage: %s log [-bdPpRs] [-C number] [-c commit] "
4569 "[-l N] [-r repository-path] [-S search-pattern] [-x commit] "
4570 "[path]\n", getprogname());
4575 get_default_log_limit(void)
4577 const char *got_default_log_limit;
4581 got_default_log_limit = getenv("GOT_LOG_DEFAULT_LIMIT");
4582 if (got_default_log_limit == NULL)
4584 n = strtonum(got_default_log_limit, 0, INT_MAX, &errstr);
4590 static const struct got_error *
4591 cmd_log(int argc, char *argv[])
4593 const struct got_error *error;
4594 struct got_repository *repo = NULL;
4595 struct got_worktree *worktree = NULL;
4596 struct got_object_id *start_id = NULL, *end_id = NULL;
4597 char *repo_path = NULL, *path = NULL, *cwd = NULL, *in_repo_path = NULL;
4598 char *keyword_idstr = NULL;
4599 const char *start_commit = NULL, *end_commit = NULL;
4600 const char *search_pattern = NULL;
4601 int diff_context = -1, ch;
4602 int show_changed_paths = 0, show_patch = 0, limit = 0, log_branches = 0;
4603 int show_diffstat = 0, reverse_display_order = 0, one_line = 0;
4605 struct got_reflist_head refs;
4606 struct got_reflist_object_id_map *refs_idmap = NULL;
4607 FILE *tmpfile = NULL;
4608 int *pack_fds = NULL;
4613 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
4619 limit = get_default_log_limit();
4621 while ((ch = getopt(argc, argv, "bC:c:dl:PpRr:S:sx:")) != -1) {
4627 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
4630 errx(1, "number of context lines is %s: %s",
4634 start_commit = optarg;
4640 limit = strtonum(optarg, 0, INT_MAX, &errstr);
4642 errx(1, "number of commits is %s: %s",
4646 show_changed_paths = 1;
4652 reverse_display_order = 1;
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);
4662 search_pattern = optarg;
4668 end_commit = optarg;
4679 if (diff_context == -1)
4681 else if (!show_patch)
4682 errx(1, "-C requires -p");
4684 if (one_line && (show_patch || show_changed_paths || show_diffstat))
4685 errx(1, "cannot use -s with -d, -p or -P");
4687 cwd = getcwd(NULL, 0);
4689 error = got_error_from_errno("getcwd");
4693 error = got_repo_pack_fds_open(&pack_fds);
4697 if (repo_path == NULL) {
4698 error = got_worktree_open(&worktree, cwd,
4699 GOT_WORKTREE_GOT_DIR);
4700 if (error && error->code != GOT_ERR_NOT_WORKTREE)
4707 error = got_worktree_resolve_path(&path, worktree,
4712 path = strdup(argv[0]);
4714 error = got_error_from_errno("strdup");
4718 } else if (argc != 0)
4721 if (repo_path == NULL) {
4722 repo_path = worktree ?
4723 strdup(got_worktree_get_repo_path(worktree)) : strdup(cwd);
4725 if (repo_path == NULL) {
4726 error = got_error_from_errno("strdup");
4730 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
4734 error = apply_unveil(got_repo_get_path(repo), 1,
4735 worktree ? got_worktree_get_root_path(worktree) : NULL);
4739 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
4743 error = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
4747 if (start_commit == NULL) {
4748 struct got_reference *head_ref;
4749 struct got_commit_object *commit = NULL;
4750 error = got_ref_open(&head_ref, repo,
4751 worktree ? got_worktree_get_head_ref_name(worktree)
4755 error = got_ref_resolve(&start_id, repo, head_ref);
4756 got_ref_close(head_ref);
4759 error = got_object_open_as_commit(&commit, repo,
4763 got_object_commit_close(commit);
4765 error = got_keyword_to_idstr(&keyword_idstr, start_commit,
4769 if (keyword_idstr != NULL)
4770 start_commit = keyword_idstr;
4772 error = got_repo_match_object_id(&start_id, NULL,
4773 start_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4777 if (end_commit != NULL) {
4778 error = got_keyword_to_idstr(&keyword_idstr, end_commit,
4782 if (keyword_idstr != NULL)
4783 end_commit = keyword_idstr;
4785 error = got_repo_match_object_id(&end_id, NULL,
4786 end_commit, GOT_OBJ_TYPE_COMMIT, &refs, repo);
4793 * If a path was specified on the command line it was resolved
4794 * to a path in the work tree above. Prepend the work tree's
4795 * path prefix to obtain the corresponding in-repository path.
4799 prefix = got_worktree_get_path_prefix(worktree);
4800 if (asprintf(&in_repo_path, "%s%s%s", prefix,
4801 (path[0] != '\0') ? "/" : "", path) == -1) {
4802 error = got_error_from_errno("asprintf");
4807 error = got_repo_map_path(&in_repo_path, repo,
4813 path = in_repo_path;
4817 /* Release work tree lock. */
4818 got_worktree_close(worktree);
4822 if (search_pattern && show_patch) {
4823 tmpfile = got_opentemp();
4824 if (tmpfile == NULL) {
4825 error = got_error_from_errno("got_opentemp");
4830 error = print_commits(start_id, end_id, repo, path ? path : "",
4831 show_changed_paths, show_diffstat, show_patch, search_pattern,
4832 diff_context, limit, log_branches, reverse_display_order,
4833 refs_idmap, one_line, tmpfile);
4840 free(keyword_idstr);
4842 got_worktree_close(worktree);
4844 const struct got_error *close_err = got_repo_close(repo);
4849 const struct got_error *pack_err =
4850 got_repo_pack_fds_close(pack_fds);
4855 got_reflist_object_id_map_free(refs_idmap);
4856 if (tmpfile && fclose(tmpfile) == EOF && error == NULL)
4857 error = got_error_from_errno("fclose");
4858 got_ref_list_free(&refs);
4865 fprintf(stderr, "usage: %s diff [-adPsw] [-C number] [-c commit] "
4866 "[-r repository-path] [object1 object2 | path ...]\n",
4871 struct print_diff_arg {
4872 struct got_repository *repo;
4873 struct got_worktree *worktree;
4874 struct got_diffstat_cb_arg *diffstat;
4879 enum got_diff_algorithm diff_algo;
4880 int ignore_whitespace;
4881 int force_text_diff;
4888 * Create a file which contains the target path of a symlink so we can feed
4889 * it as content to the diff engine.
4891 static const struct got_error *
4892 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4893 const char *abspath)
4895 const struct got_error *err = NULL;
4896 char target_path[PATH_MAX];
4897 ssize_t target_len, outlen;
4902 target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4903 if (target_len == -1)
4904 return got_error_from_errno2("readlinkat", abspath);
4906 target_len = readlink(abspath, target_path, PATH_MAX);
4907 if (target_len == -1)
4908 return got_error_from_errno2("readlink", abspath);
4911 *fd = got_opentempfd();
4913 return got_error_from_errno("got_opentempfd");
4915 outlen = write(*fd, target_path, target_len);
4917 err = got_error_from_errno("got_opentempfd");
4921 if (lseek(*fd, 0, SEEK_SET) == -1) {
4922 err = got_error_from_errno2("lseek", abspath);
4933 static const struct got_error *
4934 print_diff(void *arg, unsigned char status, unsigned char staged_status,
4935 const char *path, struct got_object_id *blob_id,
4936 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4937 int dirfd, const char *de_name)
4939 struct print_diff_arg *a = arg;
4940 const struct got_error *err = NULL;
4941 struct got_blob_object *blob1 = NULL;
4942 int fd = -1, fd1 = -1, fd2 = -1;
4944 char *abspath = NULL, *label1 = NULL;
4949 memset(&sb, 0, sizeof(sb));
4951 if (a->diff_staged) {
4952 if (staged_status != GOT_STATUS_MODIFY &&
4953 staged_status != GOT_STATUS_ADD &&
4954 staged_status != GOT_STATUS_DELETE)
4957 if (staged_status == GOT_STATUS_DELETE)
4959 if (status == GOT_STATUS_NONEXISTENT)
4960 return got_error_set_errno(ENOENT, path);
4961 if (status != GOT_STATUS_MODIFY &&
4962 status != GOT_STATUS_ADD &&
4963 status != GOT_STATUS_DELETE &&
4964 status != GOT_STATUS_CONFLICT)
4968 err = got_opentemp_truncate(a->f1);
4970 return got_error_from_errno("got_opentemp_truncate");
4971 err = got_opentemp_truncate(a->f2);
4973 return got_error_from_errno("got_opentemp_truncate");
4975 if (!a->header_shown) {
4976 if (fprintf(a->outfile, "diff %s%s\n",
4977 a->diff_staged ? "-s " : "",
4978 got_worktree_get_root_path(a->worktree)) < 0) {
4979 err = got_error_from_errno("fprintf");
4982 if (fprintf(a->outfile, "commit - %s\n", a->id_str) < 0) {
4983 err = got_error_from_errno("fprintf");
4986 if (fprintf(a->outfile, "path + %s%s\n",
4987 got_worktree_get_root_path(a->worktree),
4988 a->diff_staged ? " (staged changes)" : "") < 0) {
4989 err = got_error_from_errno("fprintf");
4992 a->header_shown = 1;
4995 if (a->diff_staged) {
4996 const char *label1 = NULL, *label2 = NULL;
4997 switch (staged_status) {
4998 case GOT_STATUS_MODIFY:
5002 case GOT_STATUS_ADD:
5005 case GOT_STATUS_DELETE:
5009 return got_error(GOT_ERR_FILE_STATUS);
5011 fd1 = got_opentempfd();
5013 err = got_error_from_errno("got_opentempfd");
5016 fd2 = got_opentempfd();
5018 err = got_error_from_errno("got_opentempfd");
5021 err = got_diff_objects_as_blobs(NULL, NULL, a->f1, a->f2,
5022 fd1, fd2, blob_id, staged_blob_id, label1, label2,
5023 a->diff_algo, a->diff_context, a->ignore_whitespace,
5024 a->force_text_diff, a->diffstat, a->repo, a->outfile);
5028 fd1 = got_opentempfd();
5030 err = got_error_from_errno("got_opentempfd");
5034 if (staged_status == GOT_STATUS_ADD ||
5035 staged_status == GOT_STATUS_MODIFY) {
5037 err = got_object_open_as_blob(&blob1, a->repo, staged_blob_id,
5041 err = got_object_id_str(&id_str, staged_blob_id);
5044 if (asprintf(&label1, "%s (staged)", id_str) == -1) {
5045 err = got_error_from_errno("asprintf");
5050 } else if (status != GOT_STATUS_ADD) {
5051 err = got_object_open_as_blob(&blob1, a->repo, blob_id, 8192,
5057 if (status != GOT_STATUS_DELETE) {
5058 if (asprintf(&abspath, "%s/%s",
5059 got_worktree_get_root_path(a->worktree), path) == -1) {
5060 err = got_error_from_errno("asprintf");
5065 fd = openat(dirfd, de_name,
5066 O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5068 if (!got_err_open_nofollow_on_symlink()) {
5069 err = got_error_from_errno2("openat",
5073 err = get_symlink_target_file(&fd, dirfd,
5079 fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5081 if (!got_err_open_nofollow_on_symlink()) {
5082 err = got_error_from_errno2("open",
5086 err = get_symlink_target_file(&fd, dirfd,
5092 if (fstatat(fd, abspath, &sb, AT_SYMLINK_NOFOLLOW) == -1) {
5093 err = got_error_from_errno2("fstatat", abspath);
5096 f2 = fdopen(fd, "r");
5098 err = got_error_from_errno2("fdopen", abspath);
5106 err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5112 err = got_diff_blob_file(blob1, a->f1, size1, label1, f2 ? f2 : a->f2,
5113 f2_exists, &sb, path, GOT_DIFF_ALGORITHM_PATIENCE, a->diff_context,
5114 a->ignore_whitespace, a->force_text_diff, a->diffstat, a->outfile);
5116 if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5117 err = got_error_from_errno("close");
5118 if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5119 err = got_error_from_errno("close");
5121 got_object_blob_close(blob1);
5122 if (fd != -1 && close(fd) == -1 && err == NULL)
5123 err = got_error_from_errno("close");
5124 if (f2 && fclose(f2) == EOF && err == NULL)
5125 err = got_error_from_errno("fclose");
5130 static const struct got_error *
5131 cmd_diff(int argc, char *argv[])
5133 const struct got_error *error;
5134 struct got_repository *repo = NULL;
5135 struct got_worktree *worktree = NULL;
5136 char *cwd = NULL, *repo_path = NULL;
5137 const char *commit_args[2] = { NULL, NULL };
5138 int ncommit_args = 0;
5139 struct got_object_id *ids[2] = { NULL, NULL };
5140 char *labels[2] = { NULL, NULL };
5141 int type1 = GOT_OBJ_TYPE_ANY, type2 = GOT_OBJ_TYPE_ANY;
5142 int diff_context = 3, diff_staged = 0, ignore_whitespace = 0, ch, i;
5143 int force_text_diff = 0, force_path = 0, rflag = 0, show_diffstat = 0;
5145 struct got_reflist_head refs;
5146 struct got_pathlist_head diffstat_paths, paths;
5147 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
5148 int fd1 = -1, fd2 = -1;
5149 int *pack_fds = NULL;
5150 struct got_diffstat_cb_arg dsa;
5152 memset(&dsa, 0, sizeof(dsa));
5156 TAILQ_INIT(&diffstat_paths);
5159 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5164 while ((ch = getopt(argc, argv, "aC:c:dPr:sw")) != -1) {
5167 force_text_diff = 1;
5170 diff_context = strtonum(optarg, 0, GOT_DIFF_MAX_CONTEXT,
5173 errx(1, "number of context lines is %s: %s",
5177 if (ncommit_args >= 2)
5178 errx(1, "too many -c options used");
5179 commit_args[ncommit_args++] = optarg;
5188 repo_path = realpath(optarg, NULL);
5189 if (repo_path == NULL)
5190 return got_error_from_errno2("realpath",
5192 got_path_strip_trailing_slashes(repo_path);
5199 ignore_whitespace = 1;
5210 cwd = getcwd(NULL, 0);
5212 error = got_error_from_errno("getcwd");
5216 error = got_repo_pack_fds_open(&pack_fds);
5220 if (repo_path == NULL) {
5221 error = got_worktree_open(&worktree, cwd,
5222 GOT_WORKTREE_GOT_DIR);
5223 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5229 strdup(got_worktree_get_repo_path(worktree));
5230 if (repo_path == NULL) {
5231 error = got_error_from_errno("strdup");
5235 repo_path = strdup(cwd);
5236 if (repo_path == NULL) {
5237 error = got_error_from_errno("strdup");
5243 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5248 if (show_diffstat) {
5249 dsa.paths = &diffstat_paths;
5250 dsa.force_text = force_text_diff;
5251 dsa.ignore_ws = ignore_whitespace;
5252 dsa.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5255 if (rflag || worktree == NULL || ncommit_args > 0) {
5257 error = got_error_msg(GOT_ERR_NOT_IMPL,
5258 "-P option can only be used when diffing "
5263 error = got_error_msg(GOT_ERR_NOT_IMPL,
5264 "-s option can only be used when diffing "
5270 error = apply_unveil(got_repo_get_path(repo), 1,
5271 worktree ? got_worktree_get_root_path(worktree) : NULL);
5275 if ((!force_path && argc == 2) || ncommit_args > 0) {
5276 int obj_type = (ncommit_args > 0 ?
5277 GOT_OBJ_TYPE_COMMIT : GOT_OBJ_TYPE_ANY);
5278 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5282 for (i = 0; i < (ncommit_args > 0 ? ncommit_args : argc); i++) {
5284 char *keyword_idstr = NULL;
5286 if (ncommit_args > 0)
5287 arg = commit_args[i];
5291 error = got_keyword_to_idstr(&keyword_idstr, arg,
5295 if (keyword_idstr != NULL)
5296 arg = keyword_idstr;
5298 error = got_repo_match_object_id(&ids[i], &labels[i],
5299 arg, obj_type, &refs, repo);
5300 free(keyword_idstr);
5302 if (error->code != GOT_ERR_NOT_REF &&
5303 error->code != GOT_ERR_NO_OBJ)
5305 if (ncommit_args > 0)
5313 f1 = got_opentemp();
5315 error = got_error_from_errno("got_opentemp");
5319 f2 = got_opentemp();
5321 error = got_error_from_errno("got_opentemp");
5325 outfile = got_opentemp();
5326 if (outfile == NULL) {
5327 error = got_error_from_errno("got_opentemp");
5331 if (ncommit_args == 0 && (ids[0] == NULL || ids[1] == NULL)) {
5332 struct print_diff_arg arg;
5335 if (worktree == NULL) {
5336 if (argc == 2 && ids[0] == NULL) {
5337 error = got_error_path(argv[0], GOT_ERR_NO_OBJ);
5339 } else if (argc == 2 && ids[1] == NULL) {
5340 error = got_error_path(argv[1], GOT_ERR_NO_OBJ);
5342 } else if (argc > 0) {
5343 error = got_error_fmt(GOT_ERR_NOT_WORKTREE,
5344 "%s", "specified paths cannot be resolved");
5347 error = got_error(GOT_ERR_NOT_WORKTREE);
5352 error = get_worktree_paths_from_argv(&paths, argc, argv,
5357 error = got_object_id_str(&id_str,
5358 got_worktree_get_base_commit_id(worktree));
5362 arg.worktree = worktree;
5363 arg.diff_algo = GOT_DIFF_ALGORITHM_PATIENCE;
5364 arg.diff_context = diff_context;
5365 arg.id_str = id_str;
5366 arg.header_shown = 0;
5367 arg.diff_staged = diff_staged;
5368 arg.ignore_whitespace = ignore_whitespace;
5369 arg.force_text_diff = force_text_diff;
5370 arg.diffstat = show_diffstat ? &dsa : NULL;
5373 arg.outfile = outfile;
5375 error = got_worktree_status(worktree, &paths, repo, 0,
5376 print_diff, &arg, check_cancelled, NULL);
5381 if (show_diffstat && dsa.nfiles > 0) {
5384 if (asprintf(&header, "diffstat %s%s",
5385 diff_staged ? "-s " : "",
5386 got_worktree_get_root_path(worktree)) == -1) {
5387 error = got_error_from_errno("asprintf");
5391 error = print_diffstat(&dsa, header);
5397 error = printfile(outfile);
5401 if (ncommit_args == 1) {
5402 struct got_commit_object *commit;
5403 error = got_object_open_as_commit(&commit, repo, ids[0]);
5407 labels[1] = labels[0];
5409 if (got_object_commit_get_nparents(commit) > 0) {
5410 const struct got_object_id_queue *pids;
5411 struct got_object_qid *pid;
5412 pids = got_object_commit_get_parent_ids(commit);
5413 pid = STAILQ_FIRST(pids);
5414 ids[0] = got_object_id_dup(&pid->id);
5415 if (ids[0] == NULL) {
5416 error = got_error_from_errno(
5417 "got_object_id_dup");
5418 got_object_commit_close(commit);
5421 error = got_object_id_str(&labels[0], ids[0]);
5423 got_object_commit_close(commit);
5428 labels[0] = strdup("/dev/null");
5429 if (labels[0] == NULL) {
5430 error = got_error_from_errno("strdup");
5431 got_object_commit_close(commit);
5436 got_object_commit_close(commit);
5439 if (ncommit_args == 0 && argc > 2) {
5440 error = got_error_msg(GOT_ERR_BAD_PATH,
5441 "path arguments cannot be used when diffing two objects");
5446 error = got_object_get_type(&type1, repo, ids[0]);
5451 error = got_object_get_type(&type2, repo, ids[1]);
5454 if (type1 != GOT_OBJ_TYPE_ANY && type1 != type2) {
5455 error = got_error(GOT_ERR_OBJ_TYPE);
5458 if (type1 == GOT_OBJ_TYPE_BLOB && argc > 2) {
5459 error = got_error_msg(GOT_ERR_OBJ_TYPE,
5460 "path arguments cannot be used when diffing blobs");
5464 for (i = 0; ncommit_args > 0 && i < argc; i++) {
5466 struct got_pathlist_entry *new;
5470 error = got_worktree_resolve_path(&p, worktree,
5474 prefix = got_worktree_get_path_prefix(worktree);
5475 while (prefix[0] == '/')
5477 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5478 (p[0] != '\0' && prefix[0] != '\0') ? "/" : "",
5480 error = got_error_from_errno("asprintf");
5486 char *mapped_path, *s;
5487 error = got_repo_map_path(&mapped_path, repo, argv[i]);
5493 in_repo_path = strdup(s);
5494 if (in_repo_path == NULL) {
5495 error = got_error_from_errno("asprintf");
5502 error = got_pathlist_insert(&new, &paths, in_repo_path, NULL);
5503 if (error || new == NULL /* duplicate */)
5510 /* Release work tree lock. */
5511 got_worktree_close(worktree);
5515 fd1 = got_opentempfd();
5517 error = got_error_from_errno("got_opentempfd");
5521 fd2 = got_opentempfd();
5523 error = got_error_from_errno("got_opentempfd");
5527 switch (type1 == GOT_OBJ_TYPE_ANY ? type2 : type1) {
5528 case GOT_OBJ_TYPE_BLOB:
5529 error = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5530 fd1, fd2, ids[0], ids[1], NULL, NULL,
5531 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5532 ignore_whitespace, force_text_diff,
5533 show_diffstat ? &dsa : NULL, repo, outfile);
5535 case GOT_OBJ_TYPE_TREE:
5536 error = got_diff_objects_as_trees(NULL, NULL, f1, f2, fd1, fd2,
5537 ids[0], ids[1], &paths, "", "",
5538 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5539 ignore_whitespace, force_text_diff,
5540 show_diffstat ? &dsa : NULL, repo, outfile);
5542 case GOT_OBJ_TYPE_COMMIT:
5543 fprintf(outfile, "diff %s %s\n", labels[0], labels[1]);
5544 error = got_diff_objects_as_commits(NULL, NULL, f1, f2,
5545 fd1, fd2, ids[0], ids[1], &paths,
5546 GOT_DIFF_ALGORITHM_PATIENCE, diff_context,
5547 ignore_whitespace, force_text_diff,
5548 show_diffstat ? &dsa : NULL, repo, outfile);
5551 error = got_error(GOT_ERR_OBJ_TYPE);
5556 if (show_diffstat && dsa.nfiles > 0) {
5557 char *header = NULL;
5559 if (asprintf(&header, "diffstat %s %s",
5560 labels[0], labels[1]) == -1) {
5561 error = got_error_from_errno("asprintf");
5565 error = print_diffstat(&dsa, header);
5571 error = printfile(outfile);
5579 got_worktree_close(worktree);
5581 const struct got_error *close_err = got_repo_close(repo);
5586 const struct got_error *pack_err =
5587 got_repo_pack_fds_close(pack_fds);
5591 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
5592 got_pathlist_free(&diffstat_paths, GOT_PATHLIST_FREE_ALL);
5593 got_ref_list_free(&refs);
5594 if (outfile && fclose(outfile) == EOF && error == NULL)
5595 error = got_error_from_errno("fclose");
5596 if (f1 && fclose(f1) == EOF && error == NULL)
5597 error = got_error_from_errno("fclose");
5598 if (f2 && fclose(f2) == EOF && error == NULL)
5599 error = got_error_from_errno("fclose");
5600 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5601 error = got_error_from_errno("close");
5602 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5603 error = got_error_from_errno("close");
5611 "usage: %s blame [-c commit] [-r repository-path] path\n",
5620 char datebuf[11]; /* YYYY-MM-DD + NUL */
5623 struct blame_cb_args {
5624 struct blame_line *lines;
5628 off_t *line_offsets;
5630 struct got_repository *repo;
5633 static const struct got_error *
5634 blame_cb(void *arg, int nlines, int lineno,
5635 struct got_commit_object *commit, struct got_object_id *id)
5637 const struct got_error *err = NULL;
5638 struct blame_cb_args *a = arg;
5639 struct blame_line *bline;
5641 size_t linesize = 0;
5644 time_t committer_time;
5646 if (nlines != a->nlines ||
5647 (lineno != -1 && lineno < 1) || lineno > a->nlines)
5648 return got_error(GOT_ERR_RANGE);
5650 if (sigint_received)
5651 return got_error(GOT_ERR_ITER_COMPLETED);
5654 return NULL; /* no change in this commit */
5656 /* Annotate this line. */
5657 bline = &a->lines[lineno - 1];
5658 if (bline->annotated)
5660 err = got_object_id_str(&bline->id_str, id);
5664 bline->committer = strdup(got_object_commit_get_committer(commit));
5665 if (bline->committer == NULL) {
5666 err = got_error_from_errno("strdup");
5670 committer_time = got_object_commit_get_committer_time(commit);
5671 if (gmtime_r(&committer_time, &tm) == NULL)
5672 return got_error_from_errno("gmtime_r");
5673 if (strftime(bline->datebuf, sizeof(bline->datebuf), "%G-%m-%d",
5675 err = got_error(GOT_ERR_NO_SPACE);
5678 bline->annotated = 1;
5680 /* Print lines annotated so far. */
5681 bline = &a->lines[a->lineno_cur - 1];
5682 if (!bline->annotated)
5685 offset = a->line_offsets[a->lineno_cur - 1];
5686 if (fseeko(a->f, offset, SEEK_SET) == -1) {
5687 err = got_error_from_errno("fseeko");
5691 while (a->lineno_cur <= a->nlines && bline->annotated) {
5692 char *smallerthan, *at, *nl, *committer;
5695 if (getline(&line, &linesize, a->f) == -1) {
5697 err = got_error_from_errno("getline");
5701 committer = bline->committer;
5702 smallerthan = strchr(committer, '<');
5703 if (smallerthan && smallerthan[1] != '\0')
5704 committer = smallerthan + 1;
5705 at = strchr(committer, '@');
5708 len = strlen(committer);
5710 committer[8] = '\0';
5712 nl = strchr(line, '\n');
5715 printf("%.*d) %.8s %s %-8s %s\n", a->nlines_prec, a->lineno_cur,
5716 bline->id_str, bline->datebuf, committer, line);
5719 bline = &a->lines[a->lineno_cur - 1];
5726 static const struct got_error *
5727 cmd_blame(int argc, char *argv[])
5729 const struct got_error *error;
5730 struct got_repository *repo = NULL;
5731 struct got_worktree *worktree = NULL;
5732 char *path, *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
5733 char *link_target = NULL;
5734 struct got_object_id *obj_id = NULL;
5735 struct got_object_id *commit_id = NULL;
5736 struct got_commit_object *commit = NULL;
5737 struct got_blob_object *blob = NULL;
5738 char *commit_id_str = NULL, *keyword_idstr = NULL;
5739 struct blame_cb_args bca;
5740 int ch, obj_type, i, fd1 = -1, fd2 = -1, fd3 = -1;
5742 int *pack_fds = NULL;
5743 FILE *f1 = NULL, *f2 = NULL;
5745 fd1 = got_opentempfd();
5747 return got_error_from_errno("got_opentempfd");
5749 memset(&bca, 0, sizeof(bca));
5752 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
5757 while ((ch = getopt(argc, argv, "c:r:")) != -1) {
5760 commit_id_str = optarg;
5763 repo_path = realpath(optarg, NULL);
5764 if (repo_path == NULL)
5765 return got_error_from_errno2("realpath",
5767 got_path_strip_trailing_slashes(repo_path);
5783 cwd = getcwd(NULL, 0);
5785 error = got_error_from_errno("getcwd");
5789 error = got_repo_pack_fds_open(&pack_fds);
5793 if (repo_path == NULL) {
5794 error = got_worktree_open(&worktree, cwd,
5795 GOT_WORKTREE_GOT_DIR);
5796 if (error && error->code != GOT_ERR_NOT_WORKTREE)
5802 strdup(got_worktree_get_repo_path(worktree));
5803 if (repo_path == NULL) {
5804 error = got_error_from_errno("strdup");
5809 repo_path = strdup(cwd);
5810 if (repo_path == NULL) {
5811 error = got_error_from_errno("strdup");
5817 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
5822 const char *prefix = got_worktree_get_path_prefix(worktree);
5825 error = got_worktree_resolve_path(&p, worktree, path);
5828 if (asprintf(&in_repo_path, "%s%s%s", prefix,
5829 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
5831 error = got_error_from_errno("asprintf");
5836 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5838 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
5841 error = got_repo_map_path(&in_repo_path, repo, path);
5846 if (commit_id_str == NULL) {
5847 struct got_reference *head_ref;
5848 error = got_ref_open(&head_ref, repo, worktree ?
5849 got_worktree_get_head_ref_name(worktree) : GOT_REF_HEAD, 0);
5852 error = got_ref_resolve(&commit_id, repo, head_ref);
5853 got_ref_close(head_ref);
5857 struct got_reflist_head refs;
5860 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
5865 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
5869 if (keyword_idstr != NULL)
5870 commit_id_str = keyword_idstr;
5872 error = got_repo_match_object_id(&commit_id, NULL,
5873 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
5874 got_ref_list_free(&refs);
5880 /* Release work tree lock. */
5881 got_worktree_close(worktree);
5885 error = got_object_open_as_commit(&commit, repo, commit_id);
5889 error = got_object_resolve_symlinks(&link_target, in_repo_path,
5894 error = got_object_id_by_path(&obj_id, repo, commit,
5895 link_target ? link_target : in_repo_path);
5899 error = got_object_get_type(&obj_type, repo, obj_id);
5903 if (obj_type != GOT_OBJ_TYPE_BLOB) {
5904 error = got_error_path(link_target ? link_target : in_repo_path,
5909 error = got_object_open_as_blob(&blob, repo, obj_id, 8192, fd1);
5912 bca.f = got_opentemp();
5913 if (bca.f == NULL) {
5914 error = got_error_from_errno("got_opentemp");
5917 error = got_object_blob_dump_to_file(&filesize, &bca.nlines,
5918 &bca.line_offsets, bca.f, blob);
5919 if (error || bca.nlines == 0)
5922 /* Don't include \n at EOF in the blame line count. */
5923 if (bca.line_offsets[bca.nlines - 1] == filesize)
5926 bca.lines = calloc(bca.nlines, sizeof(*bca.lines));
5927 if (bca.lines == NULL) {
5928 error = got_error_from_errno("calloc");
5932 bca.nlines_prec = 0;
5940 fd2 = got_opentempfd();
5942 error = got_error_from_errno("got_opentempfd");
5945 fd3 = got_opentempfd();
5947 error = got_error_from_errno("got_opentempfd");
5950 f1 = got_opentemp();
5952 error = got_error_from_errno("got_opentemp");
5955 f2 = got_opentemp();
5957 error = got_error_from_errno("got_opentemp");
5960 error = got_blame(link_target ? link_target : in_repo_path, commit_id,
5961 repo, GOT_DIFF_ALGORITHM_PATIENCE, blame_cb, &bca,
5962 check_cancelled, NULL, fd2, fd3, f1, f2);
5964 free(keyword_idstr);
5972 got_object_commit_close(commit);
5974 if (fd1 != -1 && close(fd1) == -1 && error == NULL)
5975 error = got_error_from_errno("close");
5976 if (fd2 != -1 && close(fd2) == -1 && error == NULL)
5977 error = got_error_from_errno("close");
5978 if (fd3 != -1 && close(fd3) == -1 && error == NULL)
5979 error = got_error_from_errno("close");
5980 if (f1 && fclose(f1) == EOF && error == NULL)
5981 error = got_error_from_errno("fclose");
5982 if (f2 && fclose(f2) == EOF && error == NULL)
5983 error = got_error_from_errno("fclose");
5986 got_object_blob_close(blob);
5988 got_worktree_close(worktree);
5990 const struct got_error *close_err = got_repo_close(repo);
5995 const struct got_error *pack_err =
5996 got_repo_pack_fds_close(pack_fds);
6001 for (i = 0; i < bca.nlines; i++) {
6002 struct blame_line *bline = &bca.lines[i];
6003 free(bline->id_str);
6004 free(bline->committer);
6008 free(bca.line_offsets);
6009 if (bca.f && fclose(bca.f) == EOF && error == NULL)
6010 error = got_error_from_errno("fclose");
6017 fprintf(stderr, "usage: %s tree [-iR] [-c commit] [-r repository-path] "
6018 "[path]\n", getprogname());
6022 static const struct got_error *
6023 print_entry(struct got_tree_entry *te, const char *id, const char *path,
6024 const char *root_path, struct got_repository *repo)
6026 const struct got_error *err = NULL;
6027 int is_root_path = (strcmp(path, root_path) == 0);
6028 const char *modestr = "";
6029 mode_t mode = got_tree_entry_get_mode(te);
6030 char *link_target = NULL;
6032 path += strlen(root_path);
6033 while (path[0] == '/')
6036 if (got_object_tree_entry_is_submodule(te))
6038 else if (S_ISLNK(mode)) {
6041 err = got_tree_entry_get_symlink_target(&link_target, te, repo);
6044 for (i = 0; link_target[i] != '\0'; i++) {
6045 if (!isprint((unsigned char)link_target[i]))
6046 link_target[i] = '?';
6051 else if (S_ISDIR(mode))
6053 else if (mode & S_IXUSR)
6056 printf("%s%s%s%s%s%s%s\n", id ? id : "", path,
6057 is_root_path ? "" : "/", got_tree_entry_get_name(te), modestr,
6058 link_target ? " -> ": "", link_target ? link_target : "");
6064 static const struct got_error *
6065 print_tree(const char *path, struct got_commit_object *commit,
6066 int show_ids, int recurse, const char *root_path,
6067 struct got_repository *repo)
6069 const struct got_error *err = NULL;
6070 struct got_object_id *tree_id = NULL;
6071 struct got_tree_object *tree = NULL;
6074 err = got_object_id_by_path(&tree_id, repo, commit, path);
6078 err = got_object_open_as_tree(&tree, repo, tree_id);
6081 nentries = got_object_tree_get_nentries(tree);
6082 for (i = 0; i < nentries; i++) {
6083 struct got_tree_entry *te;
6086 if (sigint_received || sigpipe_received)
6089 te = got_object_tree_get_entry(tree, i);
6092 err = got_object_id_str(&id_str,
6093 got_tree_entry_get_id(te));
6096 if (asprintf(&id, "%s ", id_str) == -1) {
6097 err = got_error_from_errno("asprintf");
6103 err = print_entry(te, id, path, root_path, repo);
6108 if (recurse && S_ISDIR(got_tree_entry_get_mode(te))) {
6110 if (asprintf(&child_path, "%s%s%s", path,
6111 path[0] == '/' && path[1] == '\0' ? "" : "/",
6112 got_tree_entry_get_name(te)) == -1) {
6113 err = got_error_from_errno("asprintf");
6116 err = print_tree(child_path, commit, show_ids, 1,
6125 got_object_tree_close(tree);
6130 static const struct got_error *
6131 cmd_tree(int argc, char *argv[])
6133 const struct got_error *error;
6134 struct got_repository *repo = NULL;
6135 struct got_worktree *worktree = NULL;
6136 const char *path, *refname = NULL;
6137 char *cwd = NULL, *repo_path = NULL, *in_repo_path = NULL;
6138 struct got_object_id *commit_id = NULL;
6139 struct got_commit_object *commit = NULL;
6140 char *commit_id_str = NULL, *keyword_idstr = NULL;
6141 int show_ids = 0, recurse = 0;
6143 int *pack_fds = NULL;
6146 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6151 while ((ch = getopt(argc, argv, "c:iRr:")) != -1) {
6154 commit_id_str = optarg;
6163 repo_path = realpath(optarg, NULL);
6164 if (repo_path == NULL)
6165 return got_error_from_errno2("realpath",
6167 got_path_strip_trailing_slashes(repo_path);
6185 cwd = getcwd(NULL, 0);
6187 error = got_error_from_errno("getcwd");
6191 error = got_repo_pack_fds_open(&pack_fds);
6195 if (repo_path == NULL) {
6196 error = got_worktree_open(&worktree, cwd,
6197 GOT_WORKTREE_GOT_DIR);
6198 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6204 strdup(got_worktree_get_repo_path(worktree));
6205 if (repo_path == NULL)
6206 error = got_error_from_errno("strdup");
6210 repo_path = strdup(cwd);
6211 if (repo_path == NULL) {
6212 error = got_error_from_errno("strdup");
6218 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6223 const char *prefix = got_worktree_get_path_prefix(worktree);
6226 if (path == NULL || got_path_is_root_dir(path))
6228 error = got_worktree_resolve_path(&p, worktree, path);
6231 if (asprintf(&in_repo_path, "%s%s%s", prefix,
6232 (p[0] != '\0' && !got_path_is_root_dir(prefix)) ? "/" : "",
6234 error = got_error_from_errno("asprintf");
6239 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6243 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
6248 error = got_repo_map_path(&in_repo_path, repo, path);
6253 if (commit_id_str == NULL) {
6254 struct got_reference *head_ref;
6256 refname = got_worktree_get_head_ref_name(worktree);
6258 refname = GOT_REF_HEAD;
6259 error = got_ref_open(&head_ref, repo, refname, 0);
6262 error = got_ref_resolve(&commit_id, repo, head_ref);
6263 got_ref_close(head_ref);
6267 struct got_reflist_head refs;
6270 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
6275 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
6279 if (keyword_idstr != NULL)
6280 commit_id_str = keyword_idstr;
6282 error = got_repo_match_object_id(&commit_id, NULL,
6283 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
6284 got_ref_list_free(&refs);
6290 /* Release work tree lock. */
6291 got_worktree_close(worktree);
6295 error = got_object_open_as_commit(&commit, repo, commit_id);
6299 error = print_tree(in_repo_path, commit, show_ids, recurse,
6300 in_repo_path, repo);
6302 free(keyword_idstr);
6308 got_object_commit_close(commit);
6310 got_worktree_close(worktree);
6312 const struct got_error *close_err = got_repo_close(repo);
6317 const struct got_error *pack_err =
6318 got_repo_pack_fds_close(pack_fds);
6328 fprintf(stderr, "usage: %s status [-I] [-S status-codes] "
6329 "[-s status-codes] [path ...]\n", getprogname());
6333 struct got_status_arg {
6338 static const struct got_error *
6339 print_status(void *arg, unsigned char status, unsigned char staged_status,
6340 const char *path, struct got_object_id *blob_id,
6341 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6342 int dirfd, const char *de_name)
6344 struct got_status_arg *st = arg;
6346 if (status == staged_status && (status == GOT_STATUS_DELETE))
6347 status = GOT_STATUS_NO_CHANGE;
6348 if (st != NULL && st->status_codes) {
6349 size_t ncodes = strlen(st->status_codes);
6352 for (i = 0; i < ncodes ; i++) {
6354 if (status == st->status_codes[i] ||
6355 staged_status == st->status_codes[i]) {
6360 if (status == st->status_codes[i] ||
6361 staged_status == st->status_codes[i])
6366 if (st->suppress && j == 0)
6373 printf("%c%c %s\n", status, staged_status, path);
6377 static const struct got_error *
6378 cmd_status(int argc, char *argv[])
6380 const struct got_error *error = NULL;
6381 struct got_repository *repo = NULL;
6382 struct got_worktree *worktree = NULL;
6383 struct got_status_arg st;
6385 struct got_pathlist_head paths;
6386 int ch, i, no_ignores = 0;
6387 int *pack_fds = NULL;
6391 memset(&st, 0, sizeof(st));
6392 st.status_codes = NULL;
6396 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
6401 while ((ch = getopt(argc, argv, "IS:s:")) != -1) {
6407 if (st.status_codes != NULL && st.suppress == 0)
6408 option_conflict('S', 's');
6412 for (i = 0; optarg[i] != '\0'; i++) {
6413 switch (optarg[i]) {
6414 case GOT_STATUS_MODIFY:
6415 case GOT_STATUS_ADD:
6416 case GOT_STATUS_DELETE:
6417 case GOT_STATUS_CONFLICT:
6418 case GOT_STATUS_MISSING:
6419 case GOT_STATUS_OBSTRUCTED:
6420 case GOT_STATUS_UNVERSIONED:
6421 case GOT_STATUS_MODE_CHANGE:
6422 case GOT_STATUS_NONEXISTENT:
6425 errx(1, "invalid status code '%c'",
6429 if (ch == 's' && st.suppress)
6430 option_conflict('s', 'S');
6431 st.status_codes = optarg;
6442 cwd = getcwd(NULL, 0);
6444 error = got_error_from_errno("getcwd");
6448 error = got_repo_pack_fds_open(&pack_fds);
6452 error = got_worktree_open(&worktree, cwd,
6453 GOT_WORKTREE_GOT_DIR);
6455 if (error->code == GOT_ERR_NOT_WORKTREE)
6456 error = wrap_not_worktree_error(error, "status", cwd);
6460 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
6465 error = apply_unveil(got_repo_get_path(repo), 1,
6466 got_worktree_get_root_path(worktree));
6470 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
6474 error = got_worktree_status(worktree, &paths, repo, no_ignores,
6475 print_status, &st, check_cancelled, NULL);
6478 const struct got_error *pack_err =
6479 got_repo_pack_fds_close(pack_fds);
6484 const struct got_error *close_err = got_repo_close(repo);
6489 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
6497 fprintf(stderr, "usage: %s ref [-dlt] [-c object] [-r repository-path] "
6498 "[-s reference] [name]\n", getprogname());
6502 static const struct got_error *
6503 list_refs(struct got_repository *repo, const char *refname, int sort_by_time)
6505 static const struct got_error *err = NULL;
6506 struct got_reflist_head refs;
6507 struct got_reflist_entry *re;
6510 err = got_ref_list(&refs, repo, refname, sort_by_time ?
6511 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6516 TAILQ_FOREACH(re, &refs, entry) {
6518 refstr = got_ref_to_str(re->ref);
6519 if (refstr == NULL) {
6520 err = got_error_from_errno("got_ref_to_str");
6523 printf("%s: %s\n", got_ref_get_name(re->ref), refstr);
6527 got_ref_list_free(&refs);
6531 static const struct got_error *
6532 delete_ref_by_name(struct got_repository *repo, const char *refname)
6534 const struct got_error *err;
6535 struct got_reference *ref;
6537 err = got_ref_open(&ref, repo, refname, 0);
6541 err = delete_ref(repo, ref);
6546 static const struct got_error *
6547 add_ref(struct got_repository *repo, const char *refname, const char *target)
6549 const struct got_error *err = NULL;
6550 struct got_object_id *id = NULL;
6551 struct got_reference *ref = NULL;
6552 struct got_reflist_head refs;
6555 * Don't let the user create a reference name with a leading '-'.
6556 * While technically a valid reference name, this case is usually
6557 * an unintended typo.
6559 if (refname[0] == '-')
6560 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6563 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
6566 err = got_repo_match_object_id(&id, NULL, target, GOT_OBJ_TYPE_ANY,
6568 got_ref_list_free(&refs);
6572 err = got_ref_alloc(&ref, refname, id);
6576 err = got_ref_write(ref, repo);
6584 static const struct got_error *
6585 add_symref(struct got_repository *repo, const char *refname, const char *target)
6587 const struct got_error *err = NULL;
6588 struct got_reference *ref = NULL;
6589 struct got_reference *target_ref = NULL;
6592 * Don't let the user create a reference name with a leading '-'.
6593 * While technically a valid reference name, this case is usually
6594 * an unintended typo.
6596 if (refname[0] == '-')
6597 return got_error_path(refname, GOT_ERR_REF_NAME_MINUS);
6599 err = got_ref_open(&target_ref, repo, target, 0);
6603 err = got_ref_alloc_symref(&ref, refname, target_ref);
6607 err = got_ref_write(ref, repo);
6610 got_ref_close(target_ref);
6616 static const struct got_error *
6617 cmd_ref(int argc, char *argv[])
6619 const struct got_error *error = NULL;
6620 struct got_repository *repo = NULL;
6621 struct got_worktree *worktree = NULL;
6622 char *cwd = NULL, *repo_path = NULL;
6623 int ch, do_list = 0, do_delete = 0, sort_by_time = 0;
6624 const char *obj_arg = NULL, *symref_target= NULL;
6625 char *refname = NULL, *keyword_idstr = NULL;
6626 int *pack_fds = NULL;
6629 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
6630 "sendfd unveil", NULL) == -1)
6634 while ((ch = getopt(argc, argv, "c:dlr:s:t")) != -1) {
6646 repo_path = realpath(optarg, NULL);
6647 if (repo_path == NULL)
6648 return got_error_from_errno2("realpath",
6650 got_path_strip_trailing_slashes(repo_path);
6653 symref_target = optarg;
6664 if (obj_arg && do_list)
6665 option_conflict('c', 'l');
6666 if (obj_arg && do_delete)
6667 option_conflict('c', 'd');
6668 if (obj_arg && symref_target)
6669 option_conflict('c', 's');
6670 if (symref_target && do_delete)
6671 option_conflict('s', 'd');
6672 if (symref_target && do_list)
6673 option_conflict('s', 'l');
6674 if (do_delete && do_list)
6675 option_conflict('d', 'l');
6676 if (sort_by_time && !do_list)
6677 errx(1, "-t option requires -l option");
6683 if (argc != 0 && argc != 1)
6686 refname = strdup(argv[0]);
6687 if (refname == NULL) {
6688 error = got_error_from_errno("strdup");
6695 refname = strdup(argv[0]);
6696 if (refname == NULL) {
6697 error = got_error_from_errno("strdup");
6703 got_path_strip_trailing_slashes(refname);
6705 cwd = getcwd(NULL, 0);
6707 error = got_error_from_errno("getcwd");
6711 error = got_repo_pack_fds_open(&pack_fds);
6715 if (repo_path == NULL) {
6716 error = got_worktree_open(&worktree, cwd,
6717 GOT_WORKTREE_GOT_DIR);
6718 if (error && error->code != GOT_ERR_NOT_WORKTREE)
6724 strdup(got_worktree_get_repo_path(worktree));
6725 if (repo_path == NULL)
6726 error = got_error_from_errno("strdup");
6730 repo_path = strdup(cwd);
6731 if (repo_path == NULL) {
6732 error = got_error_from_errno("strdup");
6738 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
6744 /* Remove "cpath" promise. */
6745 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
6751 error = apply_unveil(got_repo_get_path(repo), do_list,
6752 worktree ? got_worktree_get_root_path(worktree) : NULL);
6757 error = list_refs(repo, refname, sort_by_time);
6759 error = delete_ref_by_name(repo, refname);
6760 else if (symref_target)
6761 error = add_symref(repo, refname, symref_target);
6763 if (obj_arg == NULL)
6766 error = got_keyword_to_idstr(&keyword_idstr, obj_arg,
6770 if (keyword_idstr != NULL)
6771 obj_arg = keyword_idstr;
6773 error = add_ref(repo, refname, obj_arg);
6778 const struct got_error *close_err = got_repo_close(repo);
6783 got_worktree_close(worktree);
6785 const struct got_error *pack_err =
6786 got_repo_pack_fds_close(pack_fds);
6792 free(keyword_idstr);
6799 fprintf(stderr, "usage: %s branch [-lnt] [-c commit] [-d name] "
6800 "[-r repository-path] [name]\n", getprogname());
6804 static const struct got_error *
6805 list_branch(struct got_repository *repo, struct got_worktree *worktree,
6806 struct got_reference *ref)
6808 const struct got_error *err = NULL;
6809 const char *refname;
6813 refname = got_ref_get_name(ref);
6814 if (worktree && strcmp(refname,
6815 got_worktree_get_head_ref_name(worktree)) == 0) {
6816 err = got_worktree_get_state(&marker, repo, worktree,
6817 check_cancelled, NULL);
6822 if (strncmp(refname, "refs/heads/", 11) == 0)
6824 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6826 if (strncmp(refname, "refs/remotes/", 13) == 0)
6829 refstr = got_ref_to_str(ref);
6831 return got_error_from_errno("got_ref_to_str");
6833 printf("%c %s: %s\n", marker, refname, refstr);
6838 static const struct got_error *
6839 show_current_branch(struct got_repository *repo, struct got_worktree *worktree)
6841 const char *refname;
6843 if (worktree == NULL)
6844 return got_error(GOT_ERR_NOT_WORKTREE);
6846 refname = got_worktree_get_head_ref_name(worktree);
6848 if (strncmp(refname, "refs/heads/", 11) == 0)
6850 if (strncmp(refname, "refs/got/worktree/", 18) == 0)
6853 printf("%s\n", refname);
6858 static const struct got_error *
6859 list_branches(struct got_repository *repo, struct got_worktree *worktree,
6862 static const struct got_error *err = NULL;
6863 struct got_reflist_head refs;
6864 struct got_reflist_entry *re;
6865 struct got_reference *temp_ref = NULL;
6866 int rebase_in_progress, histedit_in_progress;
6871 err = got_worktree_rebase_in_progress(&rebase_in_progress,
6876 err = got_worktree_histedit_in_progress(&histedit_in_progress,
6881 if (rebase_in_progress || histedit_in_progress) {
6882 err = got_ref_open(&temp_ref, repo,
6883 got_worktree_get_head_ref_name(worktree), 0);
6886 list_branch(repo, worktree, temp_ref);
6887 got_ref_close(temp_ref);
6891 err = got_ref_list(&refs, repo, "refs/heads", sort_by_time ?
6892 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6897 TAILQ_FOREACH(re, &refs, entry)
6898 list_branch(repo, worktree, re->ref);
6900 got_ref_list_free(&refs);
6902 err = got_ref_list(&refs, repo, "refs/remotes", sort_by_time ?
6903 got_ref_cmp_by_commit_timestamp_descending : got_ref_cmp_by_name,
6908 TAILQ_FOREACH(re, &refs, entry)
6909 list_branch(repo, worktree, re->ref);
6911 got_ref_list_free(&refs);
6916 static const struct got_error *
6917 delete_branch(struct got_repository *repo, struct got_worktree *worktree,
6918 const char *branch_name)
6920 const struct got_error *err = NULL;
6921 struct got_reference *ref = NULL;
6922 char *refname, *remote_refname = NULL;
6924 if (strncmp(branch_name, "refs/", 5) == 0)
6926 if (strncmp(branch_name, "heads/", 6) == 0)
6928 else if (strncmp(branch_name, "remotes/", 8) == 0)
6931 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1)
6932 return got_error_from_errno("asprintf");
6934 if (asprintf(&remote_refname, "refs/remotes/%s",
6935 branch_name) == -1) {
6936 err = got_error_from_errno("asprintf");
6940 err = got_ref_open(&ref, repo, refname, 0);
6942 const struct got_error *err2;
6943 if (err->code != GOT_ERR_NOT_REF)
6946 * Keep 'err' intact such that if neither branch exists
6947 * we report "refs/heads" rather than "refs/remotes" in
6948 * our error message.
6950 err2 = got_ref_open(&ref, repo, remote_refname, 0);
6957 strcmp(got_worktree_get_head_ref_name(worktree),
6958 got_ref_get_name(ref)) == 0) {
6959 err = got_error_msg(GOT_ERR_SAME_BRANCH,
6960 "will not delete this work tree's current branch");
6964 err = delete_ref(repo, ref);
6969 free(remote_refname);
6973 static const struct got_error *
6974 add_branch(struct got_repository *repo, const char *branch_name,
6975 struct got_object_id *base_commit_id)
6977 const struct got_error *err = NULL;
6978 struct got_reference *ref = NULL;
6979 char *refname = NULL;
6982 * Don't let the user create a branch name with a leading '-'.
6983 * While technically a valid reference name, this case is usually
6984 * an unintended typo.
6986 if (branch_name[0] == '-')
6987 return got_error_path(branch_name, GOT_ERR_REF_NAME_MINUS);
6989 if (strncmp(branch_name, "refs/heads/", 11) == 0)
6992 if (asprintf(&refname, "refs/heads/%s", branch_name) == -1) {
6993 err = got_error_from_errno("asprintf");
6997 err = got_ref_open(&ref, repo, refname, 0);
6999 err = got_error(GOT_ERR_BRANCH_EXISTS);
7001 } else if (err->code != GOT_ERR_NOT_REF)
7004 err = got_ref_alloc(&ref, refname, base_commit_id);
7008 err = got_ref_write(ref, repo);
7016 static const struct got_error *
7017 cmd_branch(int argc, char *argv[])
7019 const struct got_error *error = NULL;
7020 struct got_repository *repo = NULL;
7021 struct got_worktree *worktree = NULL;
7022 char *cwd = NULL, *repo_path = NULL;
7023 int ch, do_list = 0, do_show = 0, do_update = 1, sort_by_time = 0;
7024 const char *delref = NULL, *commit_id_arg = NULL;
7025 struct got_reference *ref = NULL;
7026 struct got_pathlist_head paths;
7027 struct got_object_id *commit_id = NULL;
7028 char *commit_id_str = NULL, *keyword_idstr = NULL;;
7029 int *pack_fds = NULL;
7034 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7035 "sendfd unveil", NULL) == -1)
7039 while ((ch = getopt(argc, argv, "c:d:lnr:t")) != -1) {
7042 commit_id_arg = optarg;
7054 repo_path = realpath(optarg, NULL);
7055 if (repo_path == NULL)
7056 return got_error_from_errno2("realpath",
7058 got_path_strip_trailing_slashes(repo_path);
7069 if (do_list && delref)
7070 option_conflict('l', 'd');
7071 if (sort_by_time && !do_list)
7072 errx(1, "-t option requires -l option");
7077 if (!do_list && !delref && argc == 0)
7080 if ((do_list || delref || do_show) && commit_id_arg != NULL)
7081 errx(1, "-c option can only be used when creating a branch");
7083 if (do_list || delref) {
7086 } else if (!do_show && argc != 1)
7089 cwd = getcwd(NULL, 0);
7091 error = got_error_from_errno("getcwd");
7095 error = got_repo_pack_fds_open(&pack_fds);
7099 if (repo_path == NULL) {
7100 error = got_worktree_open(&worktree, cwd,
7101 GOT_WORKTREE_GOT_DIR);
7102 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7108 strdup(got_worktree_get_repo_path(worktree));
7109 if (repo_path == NULL)
7110 error = got_error_from_errno("strdup");
7114 repo_path = strdup(cwd);
7115 if (repo_path == NULL) {
7116 error = got_error_from_errno("strdup");
7122 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7127 if (do_list || do_show) {
7128 /* Remove "cpath" promise. */
7129 if (pledge("stdio rpath wpath flock proc exec sendfd unveil",
7135 error = apply_unveil(got_repo_get_path(repo), do_list,
7136 worktree ? got_worktree_get_root_path(worktree) : NULL);
7141 error = show_current_branch(repo, worktree);
7143 error = list_branches(repo, worktree, sort_by_time);
7145 error = delete_branch(repo, worktree, delref);
7147 struct got_reflist_head refs;
7149 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name,
7153 if (commit_id_arg == NULL)
7154 commit_id_arg = worktree ?
7155 got_worktree_get_head_ref_name(worktree) :
7158 error = got_keyword_to_idstr(&keyword_idstr,
7159 commit_id_arg, repo, worktree);
7162 if (keyword_idstr != NULL)
7163 commit_id_arg = keyword_idstr;
7165 error = got_repo_match_object_id(&commit_id, NULL,
7166 commit_id_arg, GOT_OBJ_TYPE_COMMIT, &refs, repo);
7167 got_ref_list_free(&refs);
7170 error = add_branch(repo, argv[0], commit_id);
7173 if (worktree && do_update) {
7174 struct got_update_progress_arg upa;
7175 char *branch_refname = NULL;
7177 error = got_object_id_str(&commit_id_str, commit_id);
7180 error = get_worktree_paths_from_argv(&paths, 0, NULL,
7184 if (asprintf(&branch_refname, "refs/heads/%s", argv[0])
7186 error = got_error_from_errno("asprintf");
7189 error = got_ref_open(&ref, repo, branch_refname, 0);
7190 free(branch_refname);
7193 error = switch_head_ref(ref, commit_id, worktree,
7197 error = got_worktree_set_base_commit_id(worktree, repo,
7201 memset(&upa, 0, sizeof(upa));
7202 error = got_worktree_checkout_files(worktree, &paths,
7203 repo, update_progress, &upa, check_cancelled,
7207 if (upa.did_something) {
7208 printf("Updated to %s: %s\n",
7209 got_worktree_get_head_ref_name(worktree),
7212 print_update_progress_stats(&upa);
7216 free(keyword_idstr);
7220 const struct got_error *close_err = got_repo_close(repo);
7225 got_worktree_close(worktree);
7227 const struct got_error *pack_err =
7228 got_repo_pack_fds_close(pack_fds);
7235 free(commit_id_str);
7236 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
7244 fprintf(stderr, "usage: %s tag [-lVv] [-c commit] [-m message] "
7245 "[-r repository-path] [-s signer-id] name\n", getprogname());
7250 static const struct got_error *
7251 sort_tags(struct got_reflist_head *sorted, struct got_reflist_head *tags)
7253 const struct got_error *err = NULL;
7254 struct got_reflist_entry *re, *se, *new;
7255 struct got_object_id *re_id, *se_id;
7256 struct got_tag_object *re_tag, *se_tag;
7257 time_t re_time, se_time;
7259 STAILQ_FOREACH(re, tags, entry) {
7260 se = STAILQ_FIRST(sorted);
7262 err = got_reflist_entry_dup(&new, re);
7265 STAILQ_INSERT_HEAD(sorted, new, entry);
7268 err = got_ref_resolve(&re_id, repo, re->ref);
7271 err = got_object_open_as_tag(&re_tag, repo, re_id);
7275 re_time = got_object_tag_get_tagger_time(re_tag);
7276 got_object_tag_close(re_tag);
7280 err = got_ref_resolve(&se_id, repo, re->ref);
7283 err = got_object_open_as_tag(&se_tag, repo, se_id);
7287 se_time = got_object_tag_get_tagger_time(se_tag);
7288 got_object_tag_close(se_tag);
7290 if (se_time > re_time) {
7291 err = got_reflist_entry_dup(&new, re);
7294 STAILQ_INSERT_AFTER(sorted, se, new, entry);
7297 se = STAILQ_NEXT(se, entry);
7306 static const struct got_error *
7307 get_tag_refname(char **refname, const char *tag_name)
7309 const struct got_error *err;
7311 if (strncmp("refs/tags/", tag_name, 10) == 0) {
7312 *refname = strdup(tag_name);
7313 if (*refname == NULL)
7314 return got_error_from_errno("strdup");
7315 } else if (asprintf(refname, "refs/tags/%s", tag_name) == -1) {
7316 err = got_error_from_errno("asprintf");
7324 static const struct got_error *
7325 list_tags(struct got_repository *repo, const char *tag_name, int verify_tags,
7326 const char *allowed_signers, const char *revoked_signers, int verbosity)
7328 static const struct got_error *err = NULL;
7329 struct got_reflist_head refs;
7330 struct got_reflist_entry *re;
7331 char *wanted_refname = NULL;
7336 err = got_ref_list(&refs, repo, "refs/tags", got_ref_cmp_tags, repo);
7341 struct got_reference *ref;
7342 err = get_tag_refname(&wanted_refname, tag_name);
7345 /* Wanted tag reference should exist. */
7346 err = got_ref_open(&ref, repo, wanted_refname, 0);
7352 TAILQ_FOREACH(re, &refs, entry) {
7353 const char *refname;
7354 char *refstr, *tagmsg0, *tagmsg, *line, *id_str, *datestr;
7356 const char *tagger, *ssh_sig = NULL;
7357 char *sig_msg = NULL;
7359 struct got_object_id *id;
7360 struct got_tag_object *tag;
7361 struct got_commit_object *commit = NULL;
7363 refname = got_ref_get_name(re->ref);
7364 if (strncmp(refname, "refs/tags/", 10) != 0 ||
7365 (wanted_refname && strcmp(refname, wanted_refname) != 0))
7368 refstr = got_ref_to_str(re->ref);
7369 if (refstr == NULL) {
7370 err = got_error_from_errno("got_ref_to_str");
7374 err = got_ref_resolve(&id, repo, re->ref);
7377 err = got_object_open_as_tag(&tag, repo, id);
7379 if (err->code != GOT_ERR_OBJ_TYPE) {
7383 /* "lightweight" tag */
7384 err = got_object_open_as_commit(&commit, repo, id);
7389 tagger = got_object_commit_get_committer(commit);
7391 got_object_commit_get_committer_time(commit);
7392 err = got_object_id_str(&id_str, id);
7398 tagger = got_object_tag_get_tagger(tag);
7399 tagger_time = got_object_tag_get_tagger_time(tag);
7400 err = got_object_id_str(&id_str,
7401 got_object_tag_get_object_id(tag));
7406 if (tag && verify_tags) {
7407 ssh_sig = got_sigs_get_tagmsg_ssh_signature(
7408 got_object_tag_get_message(tag));
7409 if (ssh_sig && allowed_signers == NULL) {
7410 err = got_error_msg(
7411 GOT_ERR_VERIFY_TAG_SIGNATURE,
7412 "SSH signature verification requires "
7413 "setting allowed_signers in "
7419 printf("%stag %s %s\n", GOT_COMMIT_SEP_STR, refname, refstr);
7421 printf("from: %s\n", tagger);
7422 datestr = get_datestr(&tagger_time, datebuf);
7424 printf("date: %s UTC\n", datestr);
7426 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT, id_str);
7428 switch (got_object_tag_get_object_type(tag)) {
7429 case GOT_OBJ_TYPE_BLOB:
7430 printf("object: %s %s\n", GOT_OBJ_LABEL_BLOB,
7433 case GOT_OBJ_TYPE_TREE:
7434 printf("object: %s %s\n", GOT_OBJ_LABEL_TREE,
7437 case GOT_OBJ_TYPE_COMMIT:
7438 printf("object: %s %s\n", GOT_OBJ_LABEL_COMMIT,
7441 case GOT_OBJ_TYPE_TAG:
7442 printf("object: %s %s\n", GOT_OBJ_LABEL_TAG,
7452 err = got_sigs_verify_tag_ssh(&sig_msg, tag, ssh_sig,
7453 allowed_signers, revoked_signers, verbosity);
7454 if (err && err->code == GOT_ERR_BAD_TAG_SIGNATURE)
7458 printf("signature: %s", sig_msg);
7464 err = got_object_commit_get_logmsg(&tagmsg0, commit);
7467 got_object_commit_close(commit);
7469 tagmsg0 = strdup(got_object_tag_get_message(tag));
7470 got_object_tag_close(tag);
7471 if (tagmsg0 == NULL) {
7472 err = got_error_from_errno("strdup");
7479 line = strsep(&tagmsg, "\n");
7481 printf(" %s\n", line);
7486 got_ref_list_free(&refs);
7487 free(wanted_refname);
7489 if (err == NULL && bad_sigs)
7490 err = got_error(GOT_ERR_BAD_TAG_SIGNATURE);
7494 static const struct got_error *
7495 get_tag_message(char **tagmsg, char **tagmsg_path, const char *commit_id_str,
7496 const char *tag_name, const char *repo_path)
7498 const struct got_error *err = NULL;
7499 char *template = NULL, *initial_content = NULL;
7500 char *editor = NULL;
7501 int initial_content_len;
7504 if (asprintf(&template, GOT_TMPDIR_STR "/got-tagmsg") == -1) {
7505 err = got_error_from_errno("asprintf");
7509 initial_content_len = asprintf(&initial_content,
7510 "\n# tagging commit %s as %s\n",
7511 commit_id_str, tag_name);
7512 if (initial_content_len == -1) {
7513 err = got_error_from_errno("asprintf");
7517 err = got_opentemp_named_fd(tagmsg_path, &fd, template, "");
7521 if (write(fd, initial_content, initial_content_len) == -1) {
7522 err = got_error_from_errno2("write", *tagmsg_path);
7525 if (close(fd) == -1) {
7526 err = got_error_from_errno2("close", *tagmsg_path);
7531 err = get_editor(&editor);
7534 err = edit_logmsg(tagmsg, editor, *tagmsg_path, initial_content,
7535 initial_content_len, 1);
7537 free(initial_content);
7541 if (fd != -1 && close(fd) == -1 && err == NULL)
7542 err = got_error_from_errno2("close", *tagmsg_path);
7551 static const struct got_error *
7552 add_tag(struct got_repository *repo, const char *tagger,
7553 const char *tag_name, const char *commit_arg, const char *tagmsg_arg,
7554 const char *signer_id, int verbosity)
7556 const struct got_error *err = NULL;
7557 struct got_object_id *commit_id = NULL, *tag_id = NULL;
7558 char *label = NULL, *commit_id_str = NULL;
7559 struct got_reference *ref = NULL;
7560 char *refname = NULL, *tagmsg = NULL;
7561 char *tagmsg_path = NULL, *tag_id_str = NULL;
7562 int preserve_tagmsg = 0;
7563 struct got_reflist_head refs;
7568 * Don't let the user create a tag name with a leading '-'.
7569 * While technically a valid reference name, this case is usually
7570 * an unintended typo.
7572 if (tag_name[0] == '-')
7573 return got_error_path(tag_name, GOT_ERR_REF_NAME_MINUS);
7575 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
7579 err = got_repo_match_object_id(&commit_id, &label, commit_arg,
7580 GOT_OBJ_TYPE_COMMIT, &refs, repo);
7584 err = got_object_id_str(&commit_id_str, commit_id);
7588 err = get_tag_refname(&refname, tag_name);
7591 if (strncmp("refs/tags/", tag_name, 10) == 0)
7594 err = got_ref_open(&ref, repo, refname, 0);
7596 err = got_error(GOT_ERR_TAG_EXISTS);
7598 } else if (err->code != GOT_ERR_NOT_REF)
7601 if (tagmsg_arg == NULL) {
7602 err = get_tag_message(&tagmsg, &tagmsg_path, commit_id_str,
7603 tag_name, got_repo_get_path(repo));
7605 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY &&
7606 tagmsg_path != NULL)
7607 preserve_tagmsg = 1;
7610 /* Editor is done; we can now apply unveil(2) */
7611 err = got_sigs_apply_unveil();
7614 err = apply_unveil(got_repo_get_path(repo), 0, NULL);
7619 err = got_object_tag_create(&tag_id, tag_name, commit_id,
7620 tagger, time(NULL), tagmsg ? tagmsg : tagmsg_arg, signer_id, repo,
7624 preserve_tagmsg = 1;
7628 err = got_ref_alloc(&ref, refname, tag_id);
7631 preserve_tagmsg = 1;
7635 err = got_ref_write(ref, repo);
7638 preserve_tagmsg = 1;
7642 err = got_object_id_str(&tag_id_str, tag_id);
7645 preserve_tagmsg = 1;
7648 printf("Created tag %s\n", tag_id_str);
7650 if (preserve_tagmsg) {
7651 fprintf(stderr, "%s: tag message preserved in %s\n",
7652 getprogname(), tagmsg_path);
7653 } else if (tagmsg_path && unlink(tagmsg_path) == -1 && err == NULL)
7654 err = got_error_from_errno2("unlink", tagmsg_path);
7659 free(commit_id_str);
7663 got_ref_list_free(&refs);
7667 static const struct got_error *
7668 cmd_tag(int argc, char *argv[])
7670 const struct got_error *error = NULL;
7671 struct got_repository *repo = NULL;
7672 struct got_worktree *worktree = NULL;
7673 char *cwd = NULL, *repo_path = NULL, *commit_id_str = NULL;
7674 char *gitconfig_path = NULL, *tagger = NULL, *keyword_idstr = NULL;
7675 char *allowed_signers = NULL, *revoked_signers = NULL;
7676 const char *signer_id = NULL;
7677 const char *tag_name = NULL, *commit_id_arg = NULL, *tagmsg = NULL;
7678 int ch, do_list = 0, verify_tags = 0, verbosity = 0;
7679 int *pack_fds = NULL;
7682 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
7683 "sendfd unveil", NULL) == -1)
7687 while ((ch = getopt(argc, argv, "c:lm:r:s:Vv")) != -1) {
7690 commit_id_arg = optarg;
7699 repo_path = realpath(optarg, NULL);
7700 if (repo_path == NULL) {
7701 error = got_error_from_errno2("realpath",
7705 got_path_strip_trailing_slashes(repo_path);
7716 else if (verbosity < 3)
7728 if (do_list || verify_tags) {
7729 if (commit_id_arg != NULL)
7731 "-c option can only be used when creating a tag");
7734 option_conflict('l', 'm');
7736 option_conflict('V', 'm');
7740 option_conflict('l', 's');
7742 option_conflict('V', 's');
7746 } else if (argc != 1)
7752 cwd = getcwd(NULL, 0);
7754 error = got_error_from_errno("getcwd");
7758 error = got_repo_pack_fds_open(&pack_fds);
7762 if (repo_path == NULL) {
7763 error = got_worktree_open(&worktree, cwd,
7764 GOT_WORKTREE_GOT_DIR);
7765 if (error && error->code != GOT_ERR_NOT_WORKTREE)
7771 strdup(got_worktree_get_repo_path(worktree));
7772 if (repo_path == NULL)
7773 error = got_error_from_errno("strdup");
7777 repo_path = strdup(cwd);
7778 if (repo_path == NULL) {
7779 error = got_error_from_errno("strdup");
7785 if (do_list || verify_tags) {
7786 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
7789 error = get_allowed_signers(&allowed_signers, repo, worktree);
7792 error = get_revoked_signers(&revoked_signers, repo, worktree);
7796 /* Release work tree lock. */
7797 got_worktree_close(worktree);
7802 * Remove "cpath" promise unless needed for signature tmpfile
7806 got_sigs_apply_unveil();
7809 if (pledge("stdio rpath wpath flock proc exec sendfd "
7810 "unveil", NULL) == -1)
7814 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
7817 error = list_tags(repo, tag_name, verify_tags, allowed_signers,
7818 revoked_signers, verbosity);
7820 error = get_gitconfig_path(&gitconfig_path);
7823 error = got_repo_open(&repo, repo_path, gitconfig_path,
7828 error = get_author(&tagger, repo, worktree);
7831 if (signer_id == NULL)
7832 signer_id = get_signer_id(repo, worktree);
7836 error = got_sigs_apply_unveil();
7840 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
7845 if (commit_id_arg == NULL) {
7846 struct got_reference *head_ref;
7847 struct got_object_id *commit_id;
7848 error = got_ref_open(&head_ref, repo,
7849 worktree ? got_worktree_get_head_ref_name(worktree)
7853 error = got_ref_resolve(&commit_id, repo, head_ref);
7854 got_ref_close(head_ref);
7857 error = got_object_id_str(&commit_id_str, commit_id);
7862 error = got_keyword_to_idstr(&keyword_idstr,
7863 commit_id_arg, repo, worktree);
7866 commit_id_str = keyword_idstr;
7870 /* Release work tree lock. */
7871 got_worktree_close(worktree);
7875 error = add_tag(repo, tagger, tag_name,
7876 commit_id_str ? commit_id_str : commit_id_arg, tagmsg,
7877 signer_id, verbosity);
7881 const struct got_error *close_err = got_repo_close(repo);
7886 got_worktree_close(worktree);
7888 const struct got_error *pack_err =
7889 got_repo_pack_fds_close(pack_fds);
7895 free(gitconfig_path);
7896 free(commit_id_str);
7898 free(allowed_signers);
7899 free(revoked_signers);
7906 fprintf(stderr, "usage: %s add [-IR] path ...\n", getprogname());
7910 static const struct got_error *
7911 add_progress(void *arg, unsigned char status, const char *path)
7913 while (path[0] == '/')
7915 printf("%c %s\n", status, path);
7919 static const struct got_error *
7920 cmd_add(int argc, char *argv[])
7922 const struct got_error *error = NULL;
7923 struct got_repository *repo = NULL;
7924 struct got_worktree *worktree = NULL;
7926 struct got_pathlist_head paths;
7927 struct got_pathlist_entry *pe;
7928 int ch, can_recurse = 0, no_ignores = 0;
7929 int *pack_fds = NULL;
7934 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
7939 while ((ch = getopt(argc, argv, "IR")) != -1) {
7959 cwd = getcwd(NULL, 0);
7961 error = got_error_from_errno("getcwd");
7965 error = got_repo_pack_fds_open(&pack_fds);
7969 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
7971 if (error->code == GOT_ERR_NOT_WORKTREE)
7972 error = wrap_not_worktree_error(error, "add", cwd);
7976 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
7981 error = apply_unveil(got_repo_get_path(repo), 1,
7982 got_worktree_get_root_path(worktree));
7986 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
7993 TAILQ_FOREACH(pe, &paths, entry) {
7994 if (asprintf(&ondisk_path, "%s/%s",
7995 got_worktree_get_root_path(worktree),
7997 error = got_error_from_errno("asprintf");
8000 if (lstat(ondisk_path, &sb) == -1) {
8001 if (errno == ENOENT) {
8005 error = got_error_from_errno2("lstat",
8011 if (S_ISDIR(sb.st_mode)) {
8012 error = got_error_msg(GOT_ERR_BAD_PATH,
8013 "adding directories requires -R option");
8019 error = got_worktree_schedule_add(worktree, &paths, add_progress,
8020 NULL, repo, no_ignores);
8023 const struct got_error *close_err = got_repo_close(repo);
8028 got_worktree_close(worktree);
8030 const struct got_error *pack_err =
8031 got_repo_pack_fds_close(pack_fds);
8035 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8043 fprintf(stderr, "usage: %s remove [-fkR] [-s status-codes] path ...\n",
8048 static const struct got_error *
8049 print_remove_status(void *arg, unsigned char status,
8050 unsigned char staged_status, const char *path)
8052 while (path[0] == '/')
8054 if (status == GOT_STATUS_NONEXISTENT)
8056 if (status == staged_status && (status == GOT_STATUS_DELETE))
8057 status = GOT_STATUS_NO_CHANGE;
8058 printf("%c%c %s\n", status, staged_status, path);
8062 static const struct got_error *
8063 cmd_remove(int argc, char *argv[])
8065 const struct got_error *error = NULL;
8066 struct got_worktree *worktree = NULL;
8067 struct got_repository *repo = NULL;
8068 const char *status_codes = NULL;
8070 struct got_pathlist_head paths;
8071 struct got_pathlist_entry *pe;
8072 int ch, delete_local_mods = 0, can_recurse = 0, keep_on_disk = 0, i;
8073 int ignore_missing_paths = 0;
8074 int *pack_fds = NULL;
8079 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
8084 while ((ch = getopt(argc, argv, "fkRs:")) != -1) {
8087 delete_local_mods = 1;
8088 ignore_missing_paths = 1;
8097 for (i = 0; optarg[i] != '\0'; i++) {
8098 switch (optarg[i]) {
8099 case GOT_STATUS_MODIFY:
8100 delete_local_mods = 1;
8102 case GOT_STATUS_MISSING:
8103 ignore_missing_paths = 1;
8106 errx(1, "invalid status code '%c'",
8110 status_codes = optarg;
8124 cwd = getcwd(NULL, 0);
8126 error = got_error_from_errno("getcwd");
8130 error = got_repo_pack_fds_open(&pack_fds);
8134 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8136 if (error->code == GOT_ERR_NOT_WORKTREE)
8137 error = wrap_not_worktree_error(error, "remove", cwd);
8141 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8146 error = apply_unveil(got_repo_get_path(repo), 1,
8147 got_worktree_get_root_path(worktree));
8151 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8158 TAILQ_FOREACH(pe, &paths, entry) {
8159 if (asprintf(&ondisk_path, "%s/%s",
8160 got_worktree_get_root_path(worktree),
8162 error = got_error_from_errno("asprintf");
8165 if (lstat(ondisk_path, &sb) == -1) {
8166 if (errno == ENOENT) {
8170 error = got_error_from_errno2("lstat",
8176 if (S_ISDIR(sb.st_mode)) {
8177 error = got_error_msg(GOT_ERR_BAD_PATH,
8178 "removing directories requires -R option");
8184 error = got_worktree_schedule_delete(worktree, &paths,
8185 delete_local_mods, status_codes, print_remove_status, NULL,
8186 repo, keep_on_disk, ignore_missing_paths);
8189 const struct got_error *close_err = got_repo_close(repo);
8194 got_worktree_close(worktree);
8196 const struct got_error *pack_err =
8197 got_repo_pack_fds_close(pack_fds);
8201 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8209 fprintf(stderr, "usage: %s patch [-nR] [-c commit] [-p strip-count] "
8210 "[patchfile]\n", getprogname());
8214 static const struct got_error *
8215 patch_from_stdin(int *patchfd)
8217 const struct got_error *err = NULL;
8220 sig_t sighup, sigint, sigquit;
8222 *patchfd = got_opentempfd();
8224 return got_error_from_errno("got_opentempfd");
8226 sighup = signal(SIGHUP, SIG_DFL);
8227 sigint = signal(SIGINT, SIG_DFL);
8228 sigquit = signal(SIGQUIT, SIG_DFL);
8231 r = read(0, buf, sizeof(buf));
8233 err = got_error_from_errno("read");
8238 if (write(*patchfd, buf, r) == -1) {
8239 err = got_error_from_errno("write");
8244 signal(SIGHUP, sighup);
8245 signal(SIGINT, sigint);
8246 signal(SIGQUIT, sigquit);
8248 if (err == NULL && lseek(*patchfd, 0, SEEK_SET) == -1)
8249 err = got_error_from_errno("lseek");
8259 struct got_patch_progress_arg {
8265 static const struct got_error *
8266 patch_progress(void *arg, const char *old, const char *new,
8267 unsigned char status, const struct got_error *error, int old_from,
8268 int old_lines, int new_from, int new_lines, int offset,
8269 int ws_mangled, const struct got_error *hunk_err)
8271 const char *path = new == NULL ? old : new;
8272 struct got_patch_progress_arg *a = arg;
8274 while (*path == '/')
8277 if (status != GOT_STATUS_NO_CHANGE &&
8278 status != 0 /* per-hunk progress */) {
8279 printf("%c %s\n", status, path);
8280 a->did_something = 1;
8283 if (hunk_err == NULL) {
8284 if (status == GOT_STATUS_CANNOT_UPDATE)
8286 else if (status == GOT_STATUS_CONFLICT)
8291 fprintf(stderr, "%s: %s\n", getprogname(), error->msg);
8293 if (offset != 0 || hunk_err != NULL || ws_mangled) {
8294 printf("@@ -%d,%d +%d,%d @@ ", old_from,
8295 old_lines, new_from, new_lines);
8296 if (hunk_err != NULL)
8297 printf("%s\n", hunk_err->msg);
8298 else if (offset != 0)
8299 printf("applied with offset %d\n", offset);
8301 printf("hunk contains mangled whitespace\n");
8308 print_patch_progress_stats(struct got_patch_progress_arg *ppa)
8310 if (!ppa->did_something)
8313 if (ppa->conflicts > 0)
8314 printf("Files with merge conflicts: %d\n", ppa->conflicts);
8316 if (ppa->rejects > 0) {
8317 printf("Files where patch failed to apply: %d\n",
8322 static const struct got_error *
8323 cmd_patch(int argc, char *argv[])
8325 const struct got_error *error = NULL, *close_error = NULL;
8326 struct got_worktree *worktree = NULL;
8327 struct got_repository *repo = NULL;
8328 struct got_reflist_head refs;
8329 struct got_object_id *commit_id = NULL;
8330 const char *commit_id_str = NULL;
8333 char *cwd = NULL, *keyword_idstr = NULL;
8334 int ch, nop = 0, strip = -1, reverse = 0;
8336 int *pack_fds = NULL;
8337 struct got_patch_progress_arg ppa;
8342 if (pledge("stdio rpath wpath cpath fattr proc exec sendfd flock "
8343 "unveil", NULL) == -1)
8347 while ((ch = getopt(argc, argv, "c:np:R")) != -1) {
8350 commit_id_str = optarg;
8356 strip = strtonum(optarg, 0, INT_MAX, &errstr);
8358 errx(1, "pathname strip count is %s: %s",
8374 error = patch_from_stdin(&patchfd);
8377 } else if (argc == 1) {
8378 patchfd = open(argv[0], O_RDONLY);
8379 if (patchfd == -1) {
8380 error = got_error_from_errno2("open", argv[0]);
8383 if (fstat(patchfd, &sb) == -1) {
8384 error = got_error_from_errno2("fstat", argv[0]);
8387 if (!S_ISREG(sb.st_mode)) {
8388 error = got_error_path(argv[0], GOT_ERR_BAD_FILETYPE);
8394 if ((cwd = getcwd(NULL, 0)) == NULL) {
8395 error = got_error_from_errno("getcwd");
8399 error = got_repo_pack_fds_open(&pack_fds);
8403 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8407 const char *repo_path = got_worktree_get_repo_path(worktree);
8408 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
8412 error = apply_unveil(got_repo_get_path(repo), 0,
8413 got_worktree_get_root_path(worktree));
8417 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
8421 if (commit_id_str != NULL) {
8422 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
8427 error = got_repo_match_object_id(&commit_id, NULL,
8428 keyword_idstr != NULL ? keyword_idstr : commit_id_str,
8429 GOT_OBJ_TYPE_COMMIT, &refs, repo);
8434 memset(&ppa, 0, sizeof(ppa));
8435 error = got_patch(patchfd, worktree, repo, nop, strip, reverse,
8436 commit_id, patch_progress, &ppa, check_cancelled, NULL);
8437 print_patch_progress_stats(&ppa);
8439 got_ref_list_free(&refs);
8440 free(keyword_idstr);
8443 close_error = got_repo_close(repo);
8445 error = close_error;
8447 if (worktree != NULL) {
8448 close_error = got_worktree_close(worktree);
8450 error = close_error;
8453 const struct got_error *pack_err =
8454 got_repo_pack_fds_close(pack_fds);
8465 fprintf(stderr, "usage: %s revert [-pR] [-F response-script] path ...\n",
8470 static const struct got_error *
8471 revert_progress(void *arg, unsigned char status, const char *path)
8473 if (status == GOT_STATUS_UNVERSIONED)
8476 while (path[0] == '/')
8478 printf("%c %s\n", status, path);
8482 struct choose_patch_arg {
8483 FILE *patch_script_file;
8487 static const struct got_error *
8488 show_change(unsigned char status, const char *path, FILE *patch_file, int n,
8489 int nchanges, const char *action)
8491 const struct got_error *err;
8493 size_t linesize = 0;
8497 case GOT_STATUS_ADD:
8498 printf("A %s\n%s this addition? [y/n] ", path, action);
8500 case GOT_STATUS_DELETE:
8501 printf("D %s\n%s this deletion? [y/n] ", path, action);
8503 case GOT_STATUS_MODIFY:
8504 if (fseek(patch_file, 0L, SEEK_SET) == -1)
8505 return got_error_from_errno("fseek");
8506 printf(GOT_COMMIT_SEP_STR);
8507 while ((linelen = getline(&line, &linesize, patch_file)) != -1)
8509 if (linelen == -1 && ferror(patch_file)) {
8510 err = got_error_from_errno("getline");
8515 printf(GOT_COMMIT_SEP_STR);
8516 printf("M %s (change %d of %d)\n%s this change? [y/n/q] ",
8517 path, n, nchanges, action);
8520 return got_error_path(path, GOT_ERR_FILE_STATUS);
8527 static const struct got_error *
8528 choose_patch(int *choice, void *arg, unsigned char status, const char *path,
8529 FILE *patch_file, int n, int nchanges)
8531 const struct got_error *err = NULL;
8533 size_t linesize = 0;
8536 struct choose_patch_arg *a = arg;
8538 *choice = GOT_PATCH_CHOICE_NONE;
8540 if (a->patch_script_file) {
8542 err = show_change(status, path, patch_file, n, nchanges,
8546 linelen = getline(&line, &linesize, a->patch_script_file);
8547 if (linelen == -1) {
8548 if (ferror(a->patch_script_file))
8549 return got_error_from_errno("getline");
8552 nl = strchr(line, '\n');
8555 if (strcmp(line, "y") == 0) {
8556 *choice = GOT_PATCH_CHOICE_YES;
8558 } else if (strcmp(line, "n") == 0) {
8559 *choice = GOT_PATCH_CHOICE_NO;
8561 } else if (strcmp(line, "q") == 0 &&
8562 status == GOT_STATUS_MODIFY) {
8563 *choice = GOT_PATCH_CHOICE_QUIT;
8566 printf("invalid response '%s'\n", line);
8571 while (resp != 'y' && resp != 'n' && resp != 'q') {
8572 err = show_change(status, path, patch_file, n, nchanges,
8579 if (status == GOT_STATUS_MODIFY) {
8580 if (resp != 'y' && resp != 'n' && resp != 'q') {
8581 printf("invalid response '%c'\n", resp);
8584 } else if (resp != 'y' && resp != 'n') {
8585 printf("invalid response '%c'\n", resp);
8591 *choice = GOT_PATCH_CHOICE_YES;
8592 else if (resp == 'n')
8593 *choice = GOT_PATCH_CHOICE_NO;
8594 else if (resp == 'q' && status == GOT_STATUS_MODIFY)
8595 *choice = GOT_PATCH_CHOICE_QUIT;
8600 struct wt_commitable_path_arg {
8601 struct got_pathlist_head *commit_paths;
8606 * Shortcut work tree status callback to determine if the set of paths scanned
8607 * has at least one versioned path that is being modified and, if not NULL, is
8608 * in the arg->commit_paths list. Set arg and return GOT_ERR_FILE_MODIFIED as
8609 * soon as a path is passed with a status that satisfies this criteria.
8611 static const struct got_error *
8612 worktree_has_commitable_path(void *arg, unsigned char status,
8613 unsigned char staged_status, const char *path,
8614 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8615 struct got_object_id *commit_id, int dirfd, const char *de_name)
8617 struct wt_commitable_path_arg *a = arg;
8619 if (status == staged_status && (status == GOT_STATUS_DELETE))
8620 status = GOT_STATUS_NO_CHANGE;
8622 if (!(status == GOT_STATUS_NO_CHANGE ||
8623 status == GOT_STATUS_UNVERSIONED) ||
8624 staged_status != GOT_STATUS_NO_CHANGE) {
8625 if (a->commit_paths != NULL) {
8626 struct got_pathlist_entry *pe;
8628 TAILQ_FOREACH(pe, a->commit_paths, entry) {
8629 if (strncmp(path, pe->path,
8630 pe->path_len) == 0) {
8631 *a->has_changes = 1;
8636 *a->has_changes = 1;
8638 if (*a->has_changes)
8639 return got_error(GOT_ERR_FILE_MODIFIED);
8646 * Check that the changeset of the commit identified by id is
8647 * comprised of at least one modified path that is being committed.
8649 static const struct got_error *
8650 commit_path_changed_in_worktree(struct wt_commitable_path_arg *wcpa,
8651 struct got_object_id *id, struct got_worktree *worktree,
8652 struct got_repository *repo)
8654 const struct got_error *err;
8655 struct got_pathlist_head paths;
8656 struct got_commit_object *commit = NULL, *pcommit = NULL;
8657 struct got_tree_object *tree = NULL, *ptree = NULL;
8658 struct got_object_qid *pid;
8662 err = got_object_open_as_commit(&commit, repo, id);
8666 err = got_object_open_as_tree(&tree, repo,
8667 got_object_commit_get_tree_id(commit));
8671 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
8673 err = got_object_open_as_commit(&pcommit, repo, &pid->id);
8677 err = got_object_open_as_tree(&ptree, repo,
8678 got_object_commit_get_tree_id(pcommit));
8683 err = got_diff_tree(ptree, tree, NULL, NULL, -1, -1, "", "", repo,
8684 got_diff_tree_collect_changed_paths, &paths, 0);
8688 err = got_worktree_status(worktree, &paths, repo, 0,
8689 worktree_has_commitable_path, wcpa, check_cancelled, NULL);
8690 if (err && err->code == GOT_ERR_FILE_MODIFIED) {
8692 * At least one changed path in the referenced commit is
8693 * modified in the work tree, that's all we need to know!
8699 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
8701 got_object_commit_close(commit);
8703 got_object_commit_close(pcommit);
8705 got_object_tree_close(tree);
8707 got_object_tree_close(ptree);
8712 * Remove any "logmsg" reference comprised entirely of paths that have
8713 * been reverted in this work tree. If any path in the logmsg ref changeset
8714 * remains in a changed state in the worktree, do not remove the reference.
8716 static const struct got_error *
8717 rm_logmsg_ref(struct got_worktree *worktree, struct got_repository *repo)
8719 const struct got_error *err;
8720 struct got_reflist_head refs;
8721 struct got_reflist_entry *re;
8722 struct got_commit_object *commit = NULL;
8723 struct got_object_id *commit_id = NULL;
8724 struct wt_commitable_path_arg wcpa;
8725 char *uuidstr = NULL;
8729 err = got_worktree_get_uuid(&uuidstr, worktree);
8733 err = got_ref_list(&refs, repo, "refs/got/worktree",
8734 got_ref_cmp_by_name, repo);
8738 TAILQ_FOREACH(re, &refs, entry) {
8739 const char *refname;
8740 int has_changes = 0;
8742 refname = got_ref_get_name(re->ref);
8744 if (!strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
8745 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN))
8746 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
8747 else if (!strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
8748 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN))
8749 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
8753 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
8754 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
8758 err = got_repo_match_object_id(&commit_id, NULL, refname,
8759 GOT_OBJ_TYPE_COMMIT, NULL, repo);
8763 err = got_object_open_as_commit(&commit, repo, commit_id);
8767 wcpa.commit_paths = NULL;
8768 wcpa.has_changes = &has_changes;
8770 err = commit_path_changed_in_worktree(&wcpa, commit_id,
8776 err = got_ref_delete(re->ref, repo);
8781 got_object_commit_close(commit);
8790 got_ref_list_free(&refs);
8792 got_object_commit_close(commit);
8796 static const struct got_error *
8797 cmd_revert(int argc, char *argv[])
8799 const struct got_error *error = NULL;
8800 struct got_worktree *worktree = NULL;
8801 struct got_repository *repo = NULL;
8802 char *cwd = NULL, *path = NULL;
8803 struct got_pathlist_head paths;
8804 struct got_pathlist_entry *pe;
8805 int ch, can_recurse = 0, pflag = 0;
8806 FILE *patch_script_file = NULL;
8807 const char *patch_script_path = NULL;
8808 struct choose_patch_arg cpa;
8809 int *pack_fds = NULL;
8814 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
8815 "unveil", NULL) == -1)
8819 while ((ch = getopt(argc, argv, "F:pR")) != -1) {
8822 patch_script_path = optarg;
8841 if (patch_script_path && !pflag)
8842 errx(1, "-F option can only be used together with -p option");
8844 cwd = getcwd(NULL, 0);
8846 error = got_error_from_errno("getcwd");
8850 error = got_repo_pack_fds_open(&pack_fds);
8854 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
8856 if (error->code == GOT_ERR_NOT_WORKTREE)
8857 error = wrap_not_worktree_error(error, "revert", cwd);
8861 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
8866 if (patch_script_path) {
8867 patch_script_file = fopen(patch_script_path, "re");
8868 if (patch_script_file == NULL) {
8869 error = got_error_from_errno2("fopen",
8876 * XXX "c" perm needed on repo dir to delete merge references.
8878 error = apply_unveil(got_repo_get_path(repo), 0,
8879 got_worktree_get_root_path(worktree));
8883 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
8890 TAILQ_FOREACH(pe, &paths, entry) {
8891 if (asprintf(&ondisk_path, "%s/%s",
8892 got_worktree_get_root_path(worktree),
8894 error = got_error_from_errno("asprintf");
8897 if (lstat(ondisk_path, &sb) == -1) {
8898 if (errno == ENOENT) {
8902 error = got_error_from_errno2("lstat",
8908 if (S_ISDIR(sb.st_mode)) {
8909 error = got_error_msg(GOT_ERR_BAD_PATH,
8910 "reverting directories requires -R option");
8916 cpa.patch_script_file = patch_script_file;
8917 cpa.action = "revert";
8918 error = got_worktree_revert(worktree, &paths, revert_progress, NULL,
8919 pflag ? choose_patch : NULL, &cpa, repo);
8921 error = rm_logmsg_ref(worktree, repo);
8923 if (patch_script_file && fclose(patch_script_file) == EOF &&
8925 error = got_error_from_errno2("fclose", patch_script_path);
8927 const struct got_error *close_err = got_repo_close(repo);
8932 got_worktree_close(worktree);
8934 const struct got_error *pack_err =
8935 got_repo_pack_fds_close(pack_fds);
8939 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
8948 fprintf(stderr, "usage: %s commit [-CNnS] [-A author] [-F path] "
8949 "[-m message] [path ...]\n", getprogname());
8953 struct collect_commit_logmsg_arg {
8954 const char *cmdline_log;
8955 const char *prepared_log;
8956 const char *merged_log;
8957 int non_interactive;
8959 const char *worktree_path;
8960 const char *branch_name;
8961 const char *repo_path;
8966 static const struct got_error *
8967 read_prepared_logmsg(char **logmsg, const char *path)
8969 const struct got_error *err = NULL;
8975 memset(&sb, 0, sizeof(sb));
8977 f = fopen(path, "re");
8979 return got_error_from_errno2("fopen", path);
8981 if (fstat(fileno(f), &sb) == -1) {
8982 err = got_error_from_errno2("fstat", path);
8985 if (sb.st_size == 0) {
8986 err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
8990 *logmsg = malloc(sb.st_size + 1);
8991 if (*logmsg == NULL) {
8992 err = got_error_from_errno("malloc");
8996 r = fread(*logmsg, 1, sb.st_size, f);
8997 if (r != sb.st_size) {
8999 err = got_error_from_errno2("fread", path);
9001 err = got_error(GOT_ERR_IO);
9004 (*logmsg)[sb.st_size] = '\0';
9006 if (fclose(f) == EOF && err == NULL)
9007 err = got_error_from_errno2("fclose", path);
9015 static const struct got_error *
9016 collect_commit_logmsg(struct got_pathlist_head *commitable_paths,
9017 const char *diff_path, char **logmsg, void *arg)
9019 char *initial_content = NULL;
9020 struct got_pathlist_entry *pe;
9021 const struct got_error *err = NULL;
9022 char *template = NULL;
9023 char *prepared_msg = NULL, *merged_msg = NULL;
9024 struct collect_commit_logmsg_arg *a = arg;
9025 int initial_content_len;
9029 /* if a message was specified on the command line, just use it */
9030 if (a->cmdline_log != NULL && *a->cmdline_log != '\0') {
9031 len = strlen(a->cmdline_log) + 1;
9032 *logmsg = malloc(len + 1);
9033 if (*logmsg == NULL)
9034 return got_error_from_errno("malloc");
9035 strlcpy(*logmsg, a->cmdline_log, len);
9037 } else if (a->prepared_log != NULL && a->non_interactive)
9038 return read_prepared_logmsg(logmsg, a->prepared_log);
9040 if (asprintf(&template, "%s/logmsg", a->worktree_path) == -1)
9041 return got_error_from_errno("asprintf");
9043 err = got_opentemp_named_fd(&a->logmsg_path, &fd, template, "");
9047 if (a->prepared_log) {
9048 err = read_prepared_logmsg(&prepared_msg, a->prepared_log);
9051 } else if (a->merged_log) {
9052 err = read_prepared_logmsg(&merged_msg, a->merged_log);
9057 initial_content_len = asprintf(&initial_content,
9058 "%s%s\n# changes to be committed on branch %s:\n",
9059 prepared_msg ? prepared_msg : "",
9060 merged_msg ? merged_msg : "", a->branch_name);
9061 if (initial_content_len == -1) {
9062 err = got_error_from_errno("asprintf");
9066 if (write(fd, initial_content, initial_content_len) == -1) {
9067 err = got_error_from_errno2("write", a->logmsg_path);
9071 TAILQ_FOREACH(pe, commitable_paths, entry) {
9072 struct got_commitable *ct = pe->data;
9073 dprintf(fd, "# %c %s\n",
9074 got_commitable_get_status(ct),
9075 got_commitable_get_path(ct));
9079 dprintf(fd, "# detailed changes can be viewed in %s\n",
9083 if (close(fd) == -1) {
9084 err = got_error_from_errno2("close", a->logmsg_path);
9089 err = edit_logmsg(logmsg, a->editor, a->logmsg_path, initial_content,
9090 initial_content_len, a->prepared_log ? 0 : 1);
9092 free(initial_content);
9097 if (fd != -1 && close(fd) == -1 && err == NULL)
9098 err = got_error_from_errno2("close", a->logmsg_path);
9100 /* Editor is done; we can now apply unveil(2) */
9102 err = apply_unveil(a->repo_path, 0, a->worktree_path);
9110 static const struct got_error *
9111 cat_logmsg(FILE *f, struct got_commit_object *commit, const char *idstr,
9112 const char *type, int has_content)
9114 const struct got_error *err = NULL;
9115 char *logmsg = NULL;
9117 err = got_object_commit_get_logmsg(&logmsg, commit);
9121 if (fprintf(f, "%s# log message of %s commit %s:%s",
9122 has_content ? "\n" : "", type, idstr, logmsg) < 0)
9123 err = got_ferror(f, GOT_ERR_IO);
9130 * Lookup "logmsg" references of backed-out and cherrypicked commits
9131 * belonging to the current work tree. If found, and the worktree has
9132 * at least one modified file that was changed in the referenced commit,
9133 * add its log message to a new temporary file at *logmsg_path.
9134 * Add all refs found to matched_refs to be scheduled for removal on
9135 * successful commit.
9137 static const struct got_error *
9138 lookup_logmsg_ref(char **logmsg_path, struct got_pathlist_head *paths,
9139 struct got_reflist_head *matched_refs, struct got_worktree *worktree,
9140 struct got_repository *repo)
9142 const struct got_error *err;
9143 struct got_commit_object *commit = NULL;
9144 struct got_object_id *id = NULL;
9145 struct got_reflist_head refs;
9146 struct got_reflist_entry *re, *re_match;
9148 char *uuidstr = NULL;
9149 int added_logmsg = 0;
9153 *logmsg_path = NULL;
9155 err = got_worktree_get_uuid(&uuidstr, worktree);
9159 err = got_ref_list(&refs, repo, "refs/got/worktree",
9160 got_ref_cmp_by_name, repo);
9164 TAILQ_FOREACH(re, &refs, entry) {
9165 const char *refname, *type;
9166 struct wt_commitable_path_arg wcpa;
9169 refname = got_ref_get_name(re->ref);
9171 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
9172 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
9173 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
9174 type = "cherrypicked";
9175 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
9176 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
9177 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
9178 type = "backed-out";
9182 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) == 0)
9183 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
9187 err = got_repo_match_object_id(&id, NULL, refname,
9188 GOT_OBJ_TYPE_COMMIT, NULL, repo);
9192 err = got_object_open_as_commit(&commit, repo, id);
9196 wcpa.commit_paths = paths;
9197 wcpa.has_changes = &add_logmsg;
9199 err = commit_path_changed_in_worktree(&wcpa, id,
9206 err = got_opentemp_named(logmsg_path, &f,
9207 "got-commit-logmsg", "");
9211 err = cat_logmsg(f, commit, refname, type,
9218 err = got_reflist_entry_dup(&re_match, re);
9221 TAILQ_INSERT_HEAD(matched_refs, re_match, entry);
9224 got_object_commit_close(commit);
9233 got_ref_list_free(&refs);
9235 got_object_commit_close(commit);
9236 if (f && fclose(f) == EOF && err == NULL)
9237 err = got_error_from_errno("fclose");
9238 if (!added_logmsg) {
9239 if (*logmsg_path && unlink(*logmsg_path) != 0 && err == NULL)
9240 err = got_error_from_errno2("unlink", *logmsg_path);
9241 *logmsg_path = NULL;
9246 static const struct got_error *
9247 cmd_commit(int argc, char *argv[])
9249 const struct got_error *error = NULL;
9250 struct got_worktree *worktree = NULL;
9251 struct got_repository *repo = NULL;
9252 char *cwd = NULL, *id_str = NULL;
9253 struct got_object_id *id = NULL;
9254 const char *logmsg = NULL;
9255 char *prepared_logmsg = NULL, *merged_logmsg = NULL;
9256 struct collect_commit_logmsg_arg cl_arg;
9257 const char *author = NULL;
9258 char *gitconfig_path = NULL, *editor = NULL, *committer = NULL;
9259 int ch, rebase_in_progress, histedit_in_progress, preserve_logmsg = 0;
9260 int allow_bad_symlinks = 0, non_interactive = 0, merge_in_progress = 0;
9261 int show_diff = 1, commit_conflicts = 0;
9262 struct got_pathlist_head paths;
9263 struct got_reflist_head refs;
9264 struct got_reflist_entry *re;
9265 int *pack_fds = NULL;
9269 cl_arg.logmsg_path = NULL;
9272 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
9273 "unveil", NULL) == -1)
9277 while ((ch = getopt(argc, argv, "A:CF:m:NnS")) != -1) {
9281 error = valid_author(author);
9286 commit_conflicts = 1;
9290 option_conflict('F', 'm');
9291 prepared_logmsg = realpath(optarg, NULL);
9292 if (prepared_logmsg == NULL)
9293 return got_error_from_errno2("realpath",
9297 if (prepared_logmsg)
9298 option_conflict('m', 'F');
9302 non_interactive = 1;
9308 allow_bad_symlinks = 1;
9319 cwd = getcwd(NULL, 0);
9321 error = got_error_from_errno("getcwd");
9325 error = got_repo_pack_fds_open(&pack_fds);
9329 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9331 if (error->code == GOT_ERR_NOT_WORKTREE)
9332 error = wrap_not_worktree_error(error, "commit", cwd);
9336 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
9339 if (rebase_in_progress) {
9340 error = got_error(GOT_ERR_REBASING);
9344 error = got_worktree_histedit_in_progress(&histedit_in_progress,
9349 error = get_gitconfig_path(&gitconfig_path);
9352 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
9353 gitconfig_path, pack_fds);
9357 error = got_worktree_merge_in_progress(&merge_in_progress, worktree, repo);
9360 if (merge_in_progress) {
9361 error = got_error(GOT_ERR_MERGE_BUSY);
9365 error = get_author(&committer, repo, worktree);
9373 * unveil(2) traverses exec(2); if an editor is used we have
9374 * to apply unveil after the log message has been written.
9376 if (logmsg == NULL || strlen(logmsg) == 0)
9377 error = get_editor(&editor);
9379 error = apply_unveil(got_repo_get_path(repo), 0,
9380 got_worktree_get_root_path(worktree));
9384 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
9388 if (prepared_logmsg == NULL) {
9389 error = lookup_logmsg_ref(&merged_logmsg,
9390 argc > 0 ? &paths : NULL, &refs, worktree, repo);
9395 cl_arg.editor = editor;
9396 cl_arg.cmdline_log = logmsg;
9397 cl_arg.prepared_log = prepared_logmsg;
9398 cl_arg.merged_log = merged_logmsg;
9399 cl_arg.non_interactive = non_interactive;
9400 cl_arg.worktree_path = got_worktree_get_root_path(worktree);
9401 cl_arg.branch_name = got_worktree_get_head_ref_name(worktree);
9402 if (!histedit_in_progress) {
9403 if (strncmp(cl_arg.branch_name, "refs/heads/", 11) != 0) {
9404 error = got_error(GOT_ERR_COMMIT_BRANCH);
9407 cl_arg.branch_name += 11;
9409 cl_arg.repo_path = got_repo_get_path(repo);
9410 error = got_worktree_commit(&id, worktree, &paths, author, committer,
9411 allow_bad_symlinks, show_diff, commit_conflicts,
9412 collect_commit_logmsg, &cl_arg, print_status, NULL, repo);
9414 if (error->code != GOT_ERR_COMMIT_MSG_EMPTY &&
9415 cl_arg.logmsg_path != NULL)
9416 preserve_logmsg = 1;
9420 error = got_object_id_str(&id_str, id);
9423 printf("Created commit %s\n", id_str);
9425 TAILQ_FOREACH(re, &refs, entry) {
9426 error = got_ref_delete(re->ref, repo);
9432 if (preserve_logmsg) {
9433 fprintf(stderr, "%s: log message preserved in %s\n",
9434 getprogname(), cl_arg.logmsg_path);
9435 } else if (cl_arg.logmsg_path && unlink(cl_arg.logmsg_path) == -1 &&
9437 error = got_error_from_errno2("unlink", cl_arg.logmsg_path);
9438 free(cl_arg.logmsg_path);
9439 if (merged_logmsg && unlink(merged_logmsg) == -1 && error == NULL)
9440 error = got_error_from_errno2("unlink", merged_logmsg);
9441 free(merged_logmsg);
9443 const struct got_error *close_err = got_repo_close(repo);
9448 got_worktree_close(worktree);
9450 const struct got_error *pack_err =
9451 got_repo_pack_fds_close(pack_fds);
9455 got_ref_list_free(&refs);
9456 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
9459 free(gitconfig_path);
9462 free(prepared_logmsg);
9469 fprintf(stderr, "usage: %s send [-afqTv] [-b branch] [-d branch] "
9470 "[-r repository-path] [-t tag] [remote-repository]\n",
9476 print_load_info(int print_colored, int print_found, int print_trees,
9477 int ncolored, int nfound, int ntrees)
9479 if (print_colored) {
9480 printf("%d commit%s colored", ncolored,
9481 ncolored == 1 ? "" : "s");
9484 printf("%s%d object%s found",
9485 ncolored > 0 ? "; " : "",
9486 nfound, nfound == 1 ? "" : "s");
9489 printf("; %d tree%s scanned", ntrees,
9490 ntrees == 1 ? "" : "s");
9494 struct got_send_progress_arg {
9495 char last_scaled_packsize[FMT_SCALED_STRSIZE];
9502 int last_nobj_total;
9506 int printed_something;
9508 struct got_pathlist_head *delete_branches;
9511 static const struct got_error *
9512 send_progress(void *arg, int ncolored, int nfound, int ntrees,
9513 off_t packfile_size, int ncommits, int nobj_total, int nobj_deltify,
9514 int nobj_written, off_t bytes_sent, const char *refname,
9515 const char *errmsg, int success)
9517 struct got_send_progress_arg *a = arg;
9518 char scaled_packsize[FMT_SCALED_STRSIZE];
9519 char scaled_sent[FMT_SCALED_STRSIZE];
9520 int p_deltify = 0, p_written = 0, p_sent = 0;
9521 int print_colored = 0, print_found = 0, print_trees = 0;
9522 int print_searching = 0, print_total = 0;
9523 int print_deltify = 0, print_written = 0, print_sent = 0;
9525 if (a->verbosity < 0)
9529 const char *status = success ? "accepted" : "rejected";
9532 struct got_pathlist_entry *pe;
9533 TAILQ_FOREACH(pe, a->delete_branches, entry) {
9534 const char *branchname = pe->path;
9535 if (got_path_cmp(branchname, refname,
9536 strlen(branchname), strlen(refname)) == 0) {
9538 a->sent_something = 1;
9544 if (a->printed_something)
9546 printf("Server has %s %s", status, refname);
9548 printf(": %s", errmsg);
9549 a->printed_something = 1;
9553 if (a->last_ncolored != ncolored) {
9555 a->last_ncolored = ncolored;
9558 if (a->last_nfound != nfound) {
9561 a->last_nfound = nfound;
9564 if (a->last_ntrees != ntrees) {
9568 a->last_ntrees = ntrees;
9571 if ((print_colored || print_found || print_trees) &&
9574 print_load_info(print_colored, print_found, print_trees,
9575 ncolored, nfound, ntrees);
9576 a->printed_something = 1;
9579 } else if (!a->loading_done) {
9581 print_load_info(1, 1, 1, ncolored, nfound, ntrees);
9583 a->loading_done = 1;
9586 if (fmt_scaled(packfile_size, scaled_packsize) == -1)
9587 return got_error_from_errno("fmt_scaled");
9588 if (fmt_scaled(bytes_sent, scaled_sent) == -1)
9589 return got_error_from_errno("fmt_scaled");
9591 if (a->last_ncommits != ncommits) {
9592 print_searching = 1;
9593 a->last_ncommits = ncommits;
9596 if (a->last_nobj_total != nobj_total) {
9597 print_searching = 1;
9599 a->last_nobj_total = nobj_total;
9602 if (packfile_size > 0 && (a->last_scaled_packsize[0] == '\0' ||
9603 strcmp(scaled_packsize, a->last_scaled_packsize)) != 0) {
9604 if (strlcpy(a->last_scaled_packsize, scaled_packsize,
9605 FMT_SCALED_STRSIZE) >= FMT_SCALED_STRSIZE)
9606 return got_error(GOT_ERR_NO_SPACE);
9609 if (nobj_deltify > 0 || nobj_written > 0) {
9610 if (nobj_deltify > 0) {
9611 p_deltify = (nobj_deltify * 100) / nobj_total;
9612 if (p_deltify != a->last_p_deltify) {
9613 a->last_p_deltify = p_deltify;
9614 print_searching = 1;
9619 if (nobj_written > 0) {
9620 p_written = (nobj_written * 100) / nobj_total;
9621 if (p_written != a->last_p_written) {
9622 a->last_p_written = p_written;
9623 print_searching = 1;
9631 if (bytes_sent > 0) {
9632 p_sent = (bytes_sent * 100) / packfile_size;
9633 if (p_sent != a->last_p_sent) {
9634 a->last_p_sent = p_sent;
9635 print_searching = 1;
9641 a->sent_something = 1;
9644 if (print_searching || print_total || print_deltify || print_written ||
9647 if (print_searching)
9648 printf("packing %d reference%s", ncommits,
9649 ncommits == 1 ? "" : "s");
9651 printf("; %d object%s", nobj_total,
9652 nobj_total == 1 ? "" : "s");
9654 printf("; deltify: %d%%", p_deltify);
9656 printf("; uploading pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9657 scaled_packsize, p_sent);
9658 else if (print_written)
9659 printf("; writing pack: %*s %d%%", FMT_SCALED_STRSIZE - 2,
9660 scaled_packsize, p_written);
9661 if (print_searching || print_total || print_deltify ||
9662 print_written || print_sent) {
9663 a->printed_something = 1;
9669 static const struct got_error *
9670 cmd_send(int argc, char *argv[])
9672 const struct got_error *error = NULL;
9673 char *cwd = NULL, *repo_path = NULL;
9674 const char *remote_name;
9675 char *proto = NULL, *host = NULL, *port = NULL;
9676 char *repo_name = NULL, *server_path = NULL;
9677 const struct got_remote_repo *remotes, *remote = NULL;
9678 int nremotes, nbranches = 0, ndelete_branches = 0;
9679 struct got_repository *repo = NULL;
9680 struct got_worktree *worktree = NULL;
9681 const struct got_gotconfig *repo_conf = NULL, *worktree_conf = NULL;
9682 struct got_pathlist_head branches;
9683 struct got_pathlist_head tags;
9684 struct got_reflist_head all_branches;
9685 struct got_reflist_head all_tags;
9686 struct got_pathlist_head delete_args;
9687 struct got_pathlist_head delete_branches;
9688 struct got_reflist_entry *re;
9689 struct got_pathlist_entry *pe;
9690 int i, ch, sendfd = -1, sendstatus;
9692 struct got_send_progress_arg spa;
9693 int verbosity = 0, overwrite_refs = 0;
9694 int send_all_branches = 0, send_all_tags = 0;
9695 struct got_reference *ref = NULL;
9696 int *pack_fds = NULL;
9698 TAILQ_INIT(&branches);
9700 TAILQ_INIT(&all_branches);
9701 TAILQ_INIT(&all_tags);
9702 TAILQ_INIT(&delete_args);
9703 TAILQ_INIT(&delete_branches);
9705 while ((ch = getopt(argc, argv, "ab:d:fqr:Tt:v")) != -1) {
9708 send_all_branches = 1;
9711 error = got_pathlist_append(&branches, optarg, NULL);
9717 error = got_pathlist_append(&delete_args, optarg, NULL);
9728 repo_path = realpath(optarg, NULL);
9729 if (repo_path == NULL)
9730 return got_error_from_errno2("realpath",
9732 got_path_strip_trailing_slashes(repo_path);
9738 error = got_pathlist_append(&tags, optarg, NULL);
9745 else if (verbosity < 3)
9756 if (send_all_branches && !TAILQ_EMPTY(&branches))
9757 option_conflict('a', 'b');
9758 if (send_all_tags && !TAILQ_EMPTY(&tags))
9759 option_conflict('T', 't');
9763 remote_name = GOT_SEND_DEFAULT_REMOTE_NAME;
9765 remote_name = argv[0];
9769 cwd = getcwd(NULL, 0);
9771 error = got_error_from_errno("getcwd");
9775 error = got_repo_pack_fds_open(&pack_fds);
9779 if (repo_path == NULL) {
9780 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
9781 if (error && error->code != GOT_ERR_NOT_WORKTREE)
9787 strdup(got_worktree_get_repo_path(worktree));
9788 if (repo_path == NULL)
9789 error = got_error_from_errno("strdup");
9793 repo_path = strdup(cwd);
9794 if (repo_path == NULL) {
9795 error = got_error_from_errno("strdup");
9801 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
9806 worktree_conf = got_worktree_get_gotconfig(worktree);
9807 if (worktree_conf) {
9808 got_gotconfig_get_remotes(&nremotes, &remotes,
9810 for (i = 0; i < nremotes; i++) {
9811 if (strcmp(remotes[i].name, remote_name) == 0) {
9812 remote = &remotes[i];
9818 if (remote == NULL) {
9819 repo_conf = got_repo_get_gotconfig(repo);
9821 got_gotconfig_get_remotes(&nremotes, &remotes,
9823 for (i = 0; i < nremotes; i++) {
9824 if (strcmp(remotes[i].name, remote_name) == 0) {
9825 remote = &remotes[i];
9831 if (remote == NULL) {
9832 got_repo_get_gitconfig_remotes(&nremotes, &remotes, repo);
9833 for (i = 0; i < nremotes; i++) {
9834 if (strcmp(remotes[i].name, remote_name) == 0) {
9835 remote = &remotes[i];
9840 if (remote == NULL) {
9841 error = got_error_path(remote_name, GOT_ERR_NO_REMOTE);
9845 error = got_dial_parse_uri(&proto, &host, &port, &server_path,
9846 &repo_name, remote->send_url);
9850 if (strcmp(proto, "git") == 0) {
9852 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9853 "sendfd dns inet unveil", NULL) == -1)
9856 } else if (strcmp(proto, "git+ssh") == 0 ||
9857 strcmp(proto, "ssh") == 0) {
9859 if (pledge("stdio rpath wpath cpath fattr flock proc exec "
9860 "sendfd unveil", NULL) == -1)
9863 } else if (strcmp(proto, "http") == 0 ||
9864 strcmp(proto, "git+http") == 0) {
9865 error = got_error_path(proto, GOT_ERR_NOT_IMPL);
9868 error = got_error_path(proto, GOT_ERR_BAD_PROTO);
9872 error = got_dial_apply_unveil(proto);
9876 error = apply_unveil(got_repo_get_path(repo), 0, NULL);
9880 if (send_all_branches) {
9881 error = got_ref_list(&all_branches, repo, "refs/heads",
9882 got_ref_cmp_by_name, NULL);
9885 TAILQ_FOREACH(re, &all_branches, entry) {
9886 const char *branchname = got_ref_get_name(re->ref);
9887 error = got_pathlist_append(&branches,
9893 } else if (nbranches == 0) {
9894 for (i = 0; i < remote->nsend_branches; i++) {
9895 error = got_pathlist_append(&branches,
9896 remote->send_branches[i], NULL);
9902 if (send_all_tags) {
9903 error = got_ref_list(&all_tags, repo, "refs/tags",
9904 got_ref_cmp_by_name, NULL);
9907 TAILQ_FOREACH(re, &all_tags, entry) {
9908 const char *tagname = got_ref_get_name(re->ref);
9909 error = got_pathlist_append(&tags,
9917 * To prevent accidents only branches in refs/heads/ can be deleted
9918 * with 'got send -d'.
9919 * Deleting anything else requires local repository access or Git.
9921 TAILQ_FOREACH(pe, &delete_args, entry) {
9922 const char *branchname = pe->path;
9924 struct got_pathlist_entry *new;
9925 if (strncmp(branchname, "refs/heads/", 11) == 0) {
9926 s = strdup(branchname);
9928 error = got_error_from_errno("strdup");
9932 if (asprintf(&s, "refs/heads/%s", branchname) == -1) {
9933 error = got_error_from_errno("asprintf");
9937 error = got_pathlist_insert(&new, &delete_branches, s, NULL);
9938 if (error || new == NULL /* duplicate */)
9945 if (nbranches == 0 && ndelete_branches == 0) {
9946 struct got_reference *head_ref;
9948 error = got_ref_open(&head_ref, repo,
9949 got_worktree_get_head_ref_name(worktree), 0);
9951 error = got_ref_open(&head_ref, repo, GOT_REF_HEAD, 0);
9954 if (got_ref_is_symbolic(head_ref)) {
9955 error = got_ref_resolve_symbolic(&ref, repo, head_ref);
9956 got_ref_close(head_ref);
9961 error = got_pathlist_append(&branches, got_ref_get_name(ref),
9968 if (verbosity >= 0) {
9969 printf("Connecting to \"%s\" %s://%s%s%s%s%s\n",
9970 remote->name, proto, host,
9971 port ? ":" : "", port ? port : "",
9972 *server_path == '/' ? "" : "/", server_path);
9975 error = got_send_connect(&sendpid, &sendfd, proto, host, port,
9976 server_path, verbosity);
9980 memset(&spa, 0, sizeof(spa));
9981 spa.last_scaled_packsize[0] = '\0';
9982 spa.last_p_deltify = -1;
9983 spa.last_p_written = -1;
9984 spa.verbosity = verbosity;
9985 spa.delete_branches = &delete_branches;
9986 error = got_send_pack(remote_name, &branches, &tags, &delete_branches,
9987 verbosity, overwrite_refs, sendfd, repo, send_progress, &spa,
9988 check_cancelled, NULL);
9989 if (spa.printed_something)
9993 if (!spa.sent_something && verbosity >= 0)
9994 printf("Already up-to-date\n");
9997 if (kill(sendpid, SIGTERM) == -1)
9998 error = got_error_from_errno("kill");
9999 if (waitpid(sendpid, &sendstatus, 0) == -1 && error == NULL)
10000 error = got_error_from_errno("waitpid");
10002 if (sendfd != -1 && close(sendfd) == -1 && error == NULL)
10003 error = got_error_from_errno("close");
10005 const struct got_error *close_err = got_repo_close(repo);
10010 got_worktree_close(worktree);
10012 const struct got_error *pack_err =
10013 got_repo_pack_fds_close(pack_fds);
10018 got_ref_close(ref);
10019 got_pathlist_free(&branches, GOT_PATHLIST_FREE_NONE);
10020 got_pathlist_free(&tags, GOT_PATHLIST_FREE_NONE);
10021 got_ref_list_free(&all_branches);
10022 got_ref_list_free(&all_tags);
10023 got_pathlist_free(&delete_args, GOT_PATHLIST_FREE_NONE);
10024 got_pathlist_free(&delete_branches, GOT_PATHLIST_FREE_PATH);
10036 * Print and if delete is set delete all ref_prefix references.
10037 * If wanted_ref is not NULL, only print or delete this reference.
10039 static const struct got_error *
10040 process_logmsg_refs(const char *ref_prefix, size_t prefix_len,
10041 const char *wanted_ref, int delete, struct got_worktree *worktree,
10042 struct got_repository *repo)
10044 const struct got_error *err;
10045 struct got_pathlist_head paths;
10046 struct got_reflist_head refs;
10047 struct got_reflist_entry *re;
10048 struct got_reflist_object_id_map *refs_idmap = NULL;
10049 struct got_commit_object *commit = NULL;
10050 struct got_object_id *id = NULL;
10051 const char *header_prefix;
10052 char *uuidstr = NULL;
10056 TAILQ_INIT(&paths);
10058 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, repo);
10062 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
10066 if (worktree != NULL) {
10067 err = got_worktree_get_uuid(&uuidstr, worktree);
10073 if (strncmp(wanted_ref, "refs/heads/", 11) == 0)
10077 if (strcmp(ref_prefix, GOT_WORKTREE_BACKOUT_REF_PREFIX) == 0)
10078 header_prefix = "backout";
10080 header_prefix = "cherrypick";
10082 TAILQ_FOREACH(re, &refs, entry) {
10083 const char *refname, *wt;
10085 refname = got_ref_get_name(re->ref);
10087 err = check_cancelled(NULL);
10091 if (strncmp(refname, ref_prefix, prefix_len) == 0)
10092 refname += prefix_len + 1; /* skip '-' delimiter */
10098 if (worktree == NULL || strncmp(refname, uuidstr,
10099 GOT_WORKTREE_UUID_STRLEN) == 0)
10100 refname += GOT_WORKTREE_UUID_STRLEN + 1; /* skip '-' */
10104 err = got_repo_match_object_id(&id, NULL, refname,
10105 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10109 err = got_object_open_as_commit(&commit, repo, id);
10114 found = strncmp(wanted_ref, refname,
10115 strlen(wanted_ref)) == 0;
10116 if (wanted_ref && !found) {
10117 struct got_reflist_head *ci_refs;
10119 ci_refs = got_reflist_object_id_map_lookup(refs_idmap,
10123 char *refs_str = NULL;
10124 char const *r = NULL;
10126 err = build_refs_str(&refs_str, ci_refs, id,
10133 if (strncmp(r, wanted_ref,
10134 strlen(wanted_ref)) == 0) {
10138 r = strchr(r, ' ');
10146 if (wanted_ref == NULL || found) {
10148 err = got_ref_delete(re->ref, repo);
10151 printf("Deleted: ");
10152 err = print_commit_oneline(commit, id, repo,
10156 * Print paths modified by commit to help
10157 * associate commits with worktree changes.
10159 err = get_changed_paths(&paths, commit,
10164 err = print_commit(commit, id, repo, NULL,
10165 &paths, NULL, 0, 0, refs_idmap, NULL,
10167 got_pathlist_free(&paths,
10168 GOT_PATHLIST_FREE_ALL);
10170 if (worktree == NULL)
10171 printf("work tree: %.*s\n\n",
10172 GOT_WORKTREE_UUID_STRLEN, wt);
10178 got_object_commit_close(commit);
10184 if (wanted_ref != NULL && !found)
10185 err = got_error_fmt(GOT_ERR_NOT_REF, "%s", wanted_ref);
10190 got_ref_list_free(&refs);
10191 got_pathlist_free(&paths, GOT_PATHLIST_FREE_ALL);
10193 got_reflist_object_id_map_free(refs_idmap);
10195 got_object_commit_close(commit);
10200 * Create new temp "logmsg" ref of the backed-out or cherrypicked commit
10201 * identified by id for log messages to prepopulate the editor on commit.
10203 static const struct got_error *
10204 logmsg_ref(struct got_object_id *id, const char *prefix,
10205 struct got_worktree *worktree, struct got_repository *repo)
10207 const struct got_error *err = NULL;
10208 char *idstr, *ref = NULL, *refname = NULL;
10209 int histedit_in_progress;
10210 int rebase_in_progress, merge_in_progress;
10213 * Silenty refuse to create merge reference if any histedit, merge,
10214 * or rebase operation is in progress.
10216 err = got_worktree_histedit_in_progress(&histedit_in_progress,
10220 if (histedit_in_progress)
10223 err = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
10226 if (rebase_in_progress)
10229 err = got_worktree_merge_in_progress(&merge_in_progress, worktree,
10233 if (merge_in_progress)
10236 err = got_object_id_str(&idstr, id);
10240 err = got_worktree_get_logmsg_ref_name(&refname, worktree, prefix);
10244 if (asprintf(&ref, "%s-%s", refname, idstr) == -1) {
10245 err = got_error_from_errno("asprintf");
10249 err = create_ref(ref, got_worktree_get_base_commit_id(worktree),
10259 usage_cherrypick(void)
10261 fprintf(stderr, "usage: %s cherrypick [-lX] [commit-id]\n",
10266 static const struct got_error *
10267 cmd_cherrypick(int argc, char *argv[])
10269 const struct got_error *error = NULL;
10270 struct got_worktree *worktree = NULL;
10271 struct got_repository *repo = NULL;
10272 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10273 struct got_object_id *commit_id = NULL;
10274 struct got_commit_object *commit = NULL;
10275 struct got_object_qid *pid;
10276 int ch, list_refs = 0, remove_refs = 0;
10277 struct got_update_progress_arg upa;
10278 int *pack_fds = NULL;
10281 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10282 "unveil", NULL) == -1)
10286 while ((ch = getopt(argc, argv, "lX")) != -1) {
10295 usage_cherrypick();
10303 if (list_refs || remove_refs) {
10304 if (argc != 0 && argc != 1)
10305 usage_cherrypick();
10306 } else if (argc != 1)
10307 usage_cherrypick();
10308 if (list_refs && remove_refs)
10309 option_conflict('l', 'X');
10311 cwd = getcwd(NULL, 0);
10313 error = got_error_from_errno("getcwd");
10317 error = got_repo_pack_fds_open(&pack_fds);
10321 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10323 if (list_refs || remove_refs) {
10324 if (error->code != GOT_ERR_NOT_WORKTREE)
10327 if (error->code == GOT_ERR_NOT_WORKTREE)
10328 error = wrap_not_worktree_error(error,
10329 "cherrypick", cwd);
10334 error = got_repo_open(&repo,
10335 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10340 error = apply_unveil(got_repo_get_path(repo), 0,
10341 worktree ? got_worktree_get_root_path(worktree) : NULL);
10345 if (list_refs || remove_refs) {
10346 error = process_logmsg_refs(GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
10347 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN,
10348 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10352 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10356 error = got_repo_match_object_id(&commit_id, NULL,
10357 keyword_idstr != NULL ? keyword_idstr : argv[0],
10358 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10361 error = got_object_id_str(&commit_id_str, commit_id);
10365 error = got_object_open_as_commit(&commit, repo, commit_id);
10368 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10369 memset(&upa, 0, sizeof(upa));
10370 error = got_worktree_merge_files(worktree, pid ? &pid->id : NULL,
10371 commit_id, repo, update_progress, &upa, check_cancelled,
10376 if (upa.did_something) {
10377 error = logmsg_ref(commit_id,
10378 GOT_WORKTREE_CHERRYPICK_REF_PREFIX, worktree, repo);
10381 printf("Merged commit %s\n", commit_id_str);
10383 print_merge_progress_stats(&upa);
10386 free(keyword_idstr);
10388 got_object_commit_close(commit);
10389 free(commit_id_str);
10391 got_worktree_close(worktree);
10393 const struct got_error *close_err = got_repo_close(repo);
10398 const struct got_error *pack_err =
10399 got_repo_pack_fds_close(pack_fds);
10408 usage_backout(void)
10410 fprintf(stderr, "usage: %s backout [-lX] [commit-id]\n", getprogname());
10414 static const struct got_error *
10415 cmd_backout(int argc, char *argv[])
10417 const struct got_error *error = NULL;
10418 struct got_worktree *worktree = NULL;
10419 struct got_repository *repo = NULL;
10420 char *cwd = NULL, *commit_id_str = NULL, *keyword_idstr = NULL;
10421 struct got_object_id *commit_id = NULL;
10422 struct got_commit_object *commit = NULL;
10423 struct got_object_qid *pid;
10424 int ch, list_refs = 0, remove_refs = 0;
10425 struct got_update_progress_arg upa;
10426 int *pack_fds = NULL;
10429 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
10430 "unveil", NULL) == -1)
10434 while ((ch = getopt(argc, argv, "lX")) != -1) {
10451 if (list_refs || remove_refs) {
10452 if (argc != 0 && argc != 1)
10454 } else if (argc != 1)
10456 if (list_refs && remove_refs)
10457 option_conflict('l', 'X');
10459 cwd = getcwd(NULL, 0);
10461 error = got_error_from_errno("getcwd");
10465 error = got_repo_pack_fds_open(&pack_fds);
10469 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
10471 if (list_refs || remove_refs) {
10472 if (error->code != GOT_ERR_NOT_WORKTREE)
10475 if (error->code == GOT_ERR_NOT_WORKTREE)
10476 error = wrap_not_worktree_error(error,
10482 error = got_repo_open(&repo,
10483 worktree ? got_worktree_get_repo_path(worktree) : cwd,
10488 error = apply_unveil(got_repo_get_path(repo), 0,
10489 worktree ? got_worktree_get_root_path(worktree) : NULL);
10493 if (list_refs || remove_refs) {
10494 error = process_logmsg_refs(GOT_WORKTREE_BACKOUT_REF_PREFIX,
10495 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN,
10496 argc == 1 ? argv[0] : NULL, remove_refs, worktree, repo);
10500 error = got_keyword_to_idstr(&keyword_idstr, argv[0], repo, worktree);
10504 error = got_repo_match_object_id(&commit_id, NULL,
10505 keyword_idstr != NULL ? keyword_idstr : argv[0],
10506 GOT_OBJ_TYPE_COMMIT, NULL, repo);
10509 error = got_object_id_str(&commit_id_str, commit_id);
10513 error = got_object_open_as_commit(&commit, repo, commit_id);
10516 pid = STAILQ_FIRST(got_object_commit_get_parent_ids(commit));
10518 error = got_error(GOT_ERR_ROOT_COMMIT);
10522 memset(&upa, 0, sizeof(upa));
10523 error = got_worktree_merge_files(worktree, commit_id, &pid->id,
10524 repo, update_progress, &upa, check_cancelled, NULL);
10528 if (upa.did_something) {
10529 error = logmsg_ref(commit_id, GOT_WORKTREE_BACKOUT_REF_PREFIX,
10533 printf("Backed out commit %s\n", commit_id_str);
10535 print_merge_progress_stats(&upa);
10538 free(keyword_idstr);
10540 got_object_commit_close(commit);
10541 free(commit_id_str);
10543 got_worktree_close(worktree);
10545 const struct got_error *close_err = got_repo_close(repo);
10550 const struct got_error *pack_err =
10551 got_repo_pack_fds_close(pack_fds);
10561 fprintf(stderr, "usage: %s rebase [-aCclX] [branch]\n", getprogname());
10566 trim_logmsg(char *logmsg, int limit)
10571 len = strlen(logmsg);
10574 logmsg[len] = '\0';
10575 nl = strchr(logmsg, '\n');
10580 static const struct got_error *
10581 get_short_logmsg(char **logmsg, int limit, struct got_commit_object *commit)
10583 const struct got_error *err;
10584 char *logmsg0 = NULL;
10587 err = got_object_commit_get_logmsg(&logmsg0, commit);
10592 while (isspace((unsigned char)s[0]))
10595 *logmsg = strdup(s);
10596 if (*logmsg == NULL) {
10597 err = got_error_from_errno("strdup");
10601 trim_logmsg(*logmsg, limit);
10607 static const struct got_error *
10608 show_rebase_merge_conflict(struct got_object_id *id,
10609 struct got_repository *repo)
10611 const struct got_error *err;
10612 struct got_commit_object *commit = NULL;
10613 char *id_str = NULL, *logmsg = NULL;
10615 err = got_object_open_as_commit(&commit, repo, id);
10619 err = got_object_id_str(&id_str, id);
10625 err = get_short_logmsg(&logmsg, 42, commit);
10629 printf("%s -> merge conflict: %s\n", id_str, logmsg);
10632 got_object_commit_close(commit);
10637 static const struct got_error *
10638 show_rebase_progress(struct got_commit_object *commit,
10639 struct got_object_id *old_id, struct got_object_id *new_id)
10641 const struct got_error *err;
10642 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
10644 err = got_object_id_str(&old_id_str, old_id);
10649 err = got_object_id_str(&new_id_str, new_id);
10654 old_id_str[12] = '\0';
10656 new_id_str[12] = '\0';
10658 err = get_short_logmsg(&logmsg, 42, commit);
10662 printf("%s -> %s: %s\n", old_id_str,
10663 new_id_str ? new_id_str : "no-op change", logmsg);
10671 static const struct got_error *
10672 rebase_complete(struct got_worktree *worktree, struct got_fileindex *fileindex,
10673 struct got_reference *branch, struct got_reference *tmp_branch,
10674 struct got_repository *repo, int create_backup)
10676 printf("Switching work tree to %s\n", got_ref_get_name(branch));
10677 return got_worktree_rebase_complete(worktree, fileindex,
10678 tmp_branch, branch, repo, create_backup);
10681 static const struct got_error *
10682 rebase_commit(struct got_pathlist_head *merged_paths,
10683 struct got_worktree *worktree, struct got_fileindex *fileindex,
10684 struct got_reference *tmp_branch, const char *committer,
10685 struct got_object_id *commit_id, int allow_conflict,
10686 struct got_repository *repo)
10688 const struct got_error *error;
10689 struct got_commit_object *commit;
10690 struct got_object_id *new_commit_id;
10692 error = got_object_open_as_commit(&commit, repo, commit_id);
10696 error = got_worktree_rebase_commit(&new_commit_id, merged_paths,
10697 worktree, fileindex, tmp_branch, committer, commit, commit_id,
10698 allow_conflict, repo);
10700 if (error->code != GOT_ERR_COMMIT_NO_CHANGES)
10702 error = show_rebase_progress(commit, commit_id, NULL);
10704 error = show_rebase_progress(commit, commit_id, new_commit_id);
10705 free(new_commit_id);
10708 got_object_commit_close(commit);
10712 struct check_path_prefix_arg {
10713 const char *path_prefix;
10718 static const struct got_error *
10719 check_path_prefix_in_diff(void *arg, struct got_blob_object *blob1,
10720 struct got_blob_object *blob2, FILE *f1, FILE *f2,
10721 struct got_object_id *id1, struct got_object_id *id2,
10722 const char *path1, const char *path2,
10723 mode_t mode1, mode_t mode2, struct got_repository *repo)
10725 struct check_path_prefix_arg *a = arg;
10727 if ((path1 && !got_path_is_child(path1, a->path_prefix, a->len)) ||
10728 (path2 && !got_path_is_child(path2, a->path_prefix, a->len)))
10729 return got_error(a->errcode);
10734 static const struct got_error *
10735 check_path_prefix(struct got_object_id *parent_id,
10736 struct got_object_id *commit_id, const char *path_prefix,
10737 int errcode, struct got_repository *repo)
10739 const struct got_error *err;
10740 struct got_tree_object *tree1 = NULL, *tree2 = NULL;
10741 struct got_commit_object *commit = NULL, *parent_commit = NULL;
10742 struct check_path_prefix_arg cpp_arg;
10744 if (got_path_is_root_dir(path_prefix))
10747 err = got_object_open_as_commit(&commit, repo, commit_id);
10751 err = got_object_open_as_commit(&parent_commit, repo, parent_id);
10755 err = got_object_open_as_tree(&tree1, repo,
10756 got_object_commit_get_tree_id(parent_commit));
10760 err = got_object_open_as_tree(&tree2, repo,
10761 got_object_commit_get_tree_id(commit));
10765 cpp_arg.path_prefix = path_prefix;
10766 while (cpp_arg.path_prefix[0] == '/')
10767 cpp_arg.path_prefix++;
10768 cpp_arg.len = strlen(cpp_arg.path_prefix);
10769 cpp_arg.errcode = errcode;
10770 err = got_diff_tree(tree1, tree2, NULL, NULL, -1, -1, "", "", repo,
10771 check_path_prefix_in_diff, &cpp_arg, 0);
10774 got_object_tree_close(tree1);
10776 got_object_tree_close(tree2);
10778 got_object_commit_close(commit);
10780 got_object_commit_close(parent_commit);
10784 static const struct got_error *
10785 collect_commits(struct got_object_id_queue *commits,
10786 struct got_object_id *initial_commit_id,
10787 struct got_object_id *iter_start_id, struct got_object_id *iter_stop_id,
10788 const char *path_prefix, int path_prefix_errcode,
10789 struct got_repository *repo)
10791 const struct got_error *err = NULL;
10792 struct got_commit_graph *graph = NULL;
10793 struct got_object_id parent_id, commit_id;
10794 struct got_object_qid *qid;
10796 err = got_commit_graph_open(&graph, "/", 1);
10800 err = got_commit_graph_iter_start(graph, iter_start_id, repo,
10801 check_cancelled, NULL);
10805 memcpy(&commit_id, initial_commit_id, sizeof(commit_id));
10806 while (got_object_id_cmp(&commit_id, iter_stop_id) != 0) {
10807 err = got_commit_graph_iter_next(&parent_id, graph, repo,
10808 check_cancelled, NULL);
10810 if (err->code == GOT_ERR_ITER_COMPLETED) {
10811 err = got_error_msg(GOT_ERR_ANCESTRY,
10812 "ran out of commits to rebase before "
10813 "youngest common ancestor commit has "
10814 "been reached?!?");
10818 err = check_path_prefix(&parent_id, &commit_id,
10819 path_prefix, path_prefix_errcode, repo);
10823 err = got_object_qid_alloc(&qid, &commit_id);
10826 STAILQ_INSERT_HEAD(commits, qid, entry);
10828 memcpy(&commit_id, &parent_id, sizeof(commit_id));
10832 got_commit_graph_close(graph);
10836 static const struct got_error *
10837 get_commit_brief_str(char **brief_str, struct got_commit_object *commit)
10839 const struct got_error *err = NULL;
10840 time_t committer_time;
10842 char datebuf[11]; /* YYYY-MM-DD + NUL */
10843 char *author0 = NULL, *author, *smallerthan;
10844 char *logmsg0 = NULL, *logmsg, *newline;
10846 committer_time = got_object_commit_get_committer_time(commit);
10847 if (gmtime_r(&committer_time, &tm) == NULL)
10848 return got_error_from_errno("gmtime_r");
10849 if (strftime(datebuf, sizeof(datebuf), "%G-%m-%d", &tm) == 0)
10850 return got_error(GOT_ERR_NO_SPACE);
10852 author0 = strdup(got_object_commit_get_author(commit));
10853 if (author0 == NULL)
10854 return got_error_from_errno("strdup");
10856 smallerthan = strchr(author, '<');
10857 if (smallerthan && smallerthan[1] != '\0')
10858 author = smallerthan + 1;
10859 author[strcspn(author, "@>")] = '\0';
10861 err = got_object_commit_get_logmsg(&logmsg0, commit);
10865 while (*logmsg == '\n')
10867 newline = strchr(logmsg, '\n');
10871 if (asprintf(brief_str, "%s %s %s",
10872 datebuf, author, logmsg) == -1)
10873 err = got_error_from_errno("asprintf");
10880 static const struct got_error *
10881 delete_backup_ref(struct got_reference *ref, struct got_object_id *id,
10882 struct got_repository *repo)
10884 const struct got_error *err;
10887 err = got_object_id_str(&id_str, id);
10891 err = got_ref_delete(ref, repo);
10895 printf("Deleted %s: %s\n", got_ref_get_name(ref), id_str);
10901 static const struct got_error *
10902 print_backup_ref(const char *branch_name, const char *new_id_str,
10903 struct got_object_id *old_commit_id, struct got_commit_object *old_commit,
10904 struct got_reflist_object_id_map *refs_idmap,
10905 struct got_repository *repo)
10907 const struct got_error *err = NULL;
10908 struct got_reflist_head *refs;
10909 char *refs_str = NULL;
10910 struct got_object_id *new_commit_id = NULL;
10911 struct got_commit_object *new_commit = NULL;
10912 char *new_commit_brief_str = NULL;
10913 struct got_object_id *yca_id = NULL;
10914 struct got_commit_object *yca_commit = NULL;
10915 char *yca_id_str = NULL, *yca_brief_str = NULL;
10916 char *custom_refs_str;
10918 if (asprintf(&custom_refs_str, "formerly %s", branch_name) == -1)
10919 return got_error_from_errno("asprintf");
10921 err = print_commit(old_commit, old_commit_id, repo, NULL, NULL, NULL,
10922 0, 0, refs_idmap, custom_refs_str, NULL);
10926 err = got_object_resolve_id_str(&new_commit_id, repo, new_id_str);
10930 refs = got_reflist_object_id_map_lookup(refs_idmap, new_commit_id);
10932 err = build_refs_str(&refs_str, refs, new_commit_id, repo, 0);
10937 err = got_object_open_as_commit(&new_commit, repo, new_commit_id);
10941 err = get_commit_brief_str(&new_commit_brief_str, new_commit);
10945 err = got_commit_graph_find_youngest_common_ancestor(&yca_id,
10946 old_commit_id, new_commit_id, 1, repo, check_cancelled, NULL);
10950 printf("has become commit %s%s%s%s\n %s\n", new_id_str,
10951 refs_str ? " (" : "", refs_str ? refs_str : "",
10952 refs_str ? ")" : "", new_commit_brief_str);
10953 if (yca_id && got_object_id_cmp(yca_id, new_commit_id) != 0 &&
10954 got_object_id_cmp(yca_id, old_commit_id) != 0) {
10958 err = got_object_open_as_commit(&yca_commit, repo, yca_id);
10962 err = get_commit_brief_str(&yca_brief_str, yca_commit);
10966 err = got_object_id_str(&yca_id_str, yca_id);
10970 refs = got_reflist_object_id_map_lookup(refs_idmap, yca_id);
10972 err = build_refs_str(&refs_str, refs, yca_id, repo, 0);
10976 printf("history forked at %s%s%s%s\n %s\n",
10978 refs_str ? " (" : "", refs_str ? refs_str : "",
10979 refs_str ? ")" : "", yca_brief_str);
10982 free(custom_refs_str);
10983 free(new_commit_id);
10987 free(yca_brief_str);
10989 got_object_commit_close(new_commit);
10991 got_object_commit_close(yca_commit);
10996 static const struct got_error *
10997 worktree_has_logmsg_ref(const char *caller, struct got_worktree *worktree,
10998 struct got_repository *repo)
11000 const struct got_error *err;
11001 struct got_reflist_head refs;
11002 struct got_reflist_entry *re;
11003 char *uuidstr = NULL;
11004 static char msg[160];
11008 err = got_worktree_get_uuid(&uuidstr, worktree);
11012 err = got_ref_list(&refs, repo, "refs/got/worktree",
11013 got_ref_cmp_by_name, repo);
11017 TAILQ_FOREACH(re, &refs, entry) {
11018 const char *cmd, *refname, *type;
11020 refname = got_ref_get_name(re->ref);
11022 if (strncmp(refname, GOT_WORKTREE_CHERRYPICK_REF_PREFIX,
11023 GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN) == 0) {
11024 refname += GOT_WORKTREE_CHERRYPICK_REF_PREFIX_LEN + 1;
11025 cmd = "cherrypick";
11026 type = "cherrypicked";
11027 } else if (strncmp(refname, GOT_WORKTREE_BACKOUT_REF_PREFIX,
11028 GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN) == 0) {
11029 refname += GOT_WORKTREE_BACKOUT_REF_PREFIX_LEN + 1;
11031 type = "backed-out";
11035 if (strncmp(refname, uuidstr, GOT_WORKTREE_UUID_STRLEN) != 0)
11038 snprintf(msg, sizeof(msg),
11039 "work tree has references created by %s commits which "
11040 "must be removed with 'got %s -X' before running the %s "
11041 "command", type, cmd, caller);
11042 err = got_error_msg(GOT_ERR_WORKTREE_META, msg);
11048 got_ref_list_free(&refs);
11052 static const struct got_error *
11053 process_backup_refs(const char *backup_ref_prefix,
11054 const char *wanted_branch_name,
11055 int delete, struct got_repository *repo)
11057 const struct got_error *err;
11058 struct got_reflist_head refs, backup_refs;
11059 struct got_reflist_entry *re;
11060 const size_t backup_ref_prefix_len = strlen(backup_ref_prefix);
11061 struct got_object_id *old_commit_id = NULL;
11062 char *branch_name = NULL;
11063 struct got_commit_object *old_commit = NULL;
11064 struct got_reflist_object_id_map *refs_idmap = NULL;
11065 int wanted_branch_found = 0;
11068 TAILQ_INIT(&backup_refs);
11070 err = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
11074 err = got_reflist_object_id_map_create(&refs_idmap, &refs, repo);
11078 if (wanted_branch_name) {
11079 if (strncmp(wanted_branch_name, "refs/heads/", 11) == 0)
11080 wanted_branch_name += 11;
11083 err = got_ref_list(&backup_refs, repo, backup_ref_prefix,
11084 got_ref_cmp_by_commit_timestamp_descending, repo);
11088 TAILQ_FOREACH(re, &backup_refs, entry) {
11089 const char *refname = got_ref_get_name(re->ref);
11092 err = check_cancelled(NULL);
11096 err = got_ref_resolve(&old_commit_id, repo, re->ref);
11100 err = got_object_open_as_commit(&old_commit, repo,
11105 if (strncmp(backup_ref_prefix, refname,
11106 backup_ref_prefix_len) == 0)
11107 refname += backup_ref_prefix_len;
11109 while (refname[0] == '/')
11112 branch_name = strdup(refname);
11113 if (branch_name == NULL) {
11114 err = got_error_from_errno("strdup");
11117 slash = strrchr(branch_name, '/');
11120 refname += strlen(branch_name) + 1;
11123 if (wanted_branch_name == NULL ||
11124 strcmp(wanted_branch_name, branch_name) == 0) {
11125 wanted_branch_found = 1;
11127 err = delete_backup_ref(re->ref,
11128 old_commit_id, repo);
11130 err = print_backup_ref(branch_name, refname,
11131 old_commit_id, old_commit, refs_idmap,
11138 free(old_commit_id);
11139 old_commit_id = NULL;
11141 branch_name = NULL;
11142 got_object_commit_close(old_commit);
11146 if (wanted_branch_name && !wanted_branch_found) {
11147 err = got_error_fmt(GOT_ERR_NOT_REF,
11148 "%s/%s/", backup_ref_prefix, wanted_branch_name);
11152 got_reflist_object_id_map_free(refs_idmap);
11153 got_ref_list_free(&refs);
11154 got_ref_list_free(&backup_refs);
11155 free(old_commit_id);
11158 got_object_commit_close(old_commit);
11162 static const struct got_error *
11163 abort_progress(void *arg, unsigned char status, const char *path)
11166 * Unversioned files should not clutter progress output when
11167 * an operation is aborted.
11169 if (status == GOT_STATUS_UNVERSIONED)
11172 return update_progress(arg, status, path);
11175 static const struct got_error *
11176 cmd_rebase(int argc, char *argv[])
11178 const struct got_error *error = NULL;
11179 struct got_worktree *worktree = NULL;
11180 struct got_repository *repo = NULL;
11181 struct got_fileindex *fileindex = NULL;
11182 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
11183 struct got_reference *branch = NULL;
11184 struct got_reference *new_base_branch = NULL, *tmp_branch = NULL;
11185 struct got_object_id *commit_id = NULL, *parent_id = NULL;
11186 struct got_object_id *resume_commit_id = NULL;
11187 struct got_object_id *branch_head_commit_id = NULL, *yca_id = NULL;
11188 struct got_object_id *head_commit_id = NULL;
11189 struct got_reference *head_ref = NULL;
11190 struct got_commit_object *commit = NULL;
11191 int ch, rebase_in_progress = 0, abort_rebase = 0, continue_rebase = 0;
11192 int histedit_in_progress = 0, merge_in_progress = 0;
11193 int create_backup = 1, list_backups = 0, delete_backups = 0;
11194 int allow_conflict = 0;
11195 struct got_object_id_queue commits;
11196 struct got_pathlist_head merged_paths;
11197 const struct got_object_id_queue *parent_ids;
11198 struct got_object_qid *qid, *pid;
11199 struct got_update_progress_arg upa;
11200 int *pack_fds = NULL;
11202 STAILQ_INIT(&commits);
11203 TAILQ_INIT(&merged_paths);
11204 memset(&upa, 0, sizeof(upa));
11207 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
11208 "unveil", NULL) == -1)
11212 while ((ch = getopt(argc, argv, "aCclX")) != -1) {
11218 allow_conflict = 1;
11221 continue_rebase = 1;
11227 delete_backups = 1;
11238 if (list_backups) {
11240 option_conflict('l', 'a');
11241 if (allow_conflict)
11242 option_conflict('l', 'C');
11243 if (continue_rebase)
11244 option_conflict('l', 'c');
11245 if (delete_backups)
11246 option_conflict('l', 'X');
11247 if (argc != 0 && argc != 1)
11249 } else if (delete_backups) {
11251 option_conflict('X', 'a');
11252 if (allow_conflict)
11253 option_conflict('X', 'C');
11254 if (continue_rebase)
11255 option_conflict('X', 'c');
11257 option_conflict('l', 'X');
11258 if (argc != 0 && argc != 1)
11260 } else if (allow_conflict) {
11262 option_conflict('C', 'a');
11263 if (!continue_rebase)
11264 errx(1, "-C option requires -c");
11266 if (abort_rebase && continue_rebase)
11268 else if (abort_rebase || continue_rebase) {
11271 } else if (argc != 1)
11275 cwd = getcwd(NULL, 0);
11277 error = got_error_from_errno("getcwd");
11281 error = got_repo_pack_fds_open(&pack_fds);
11285 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
11287 if (list_backups || delete_backups) {
11288 if (error->code != GOT_ERR_NOT_WORKTREE)
11291 if (error->code == GOT_ERR_NOT_WORKTREE)
11292 error = wrap_not_worktree_error(error,
11298 error = get_gitconfig_path(&gitconfig_path);
11301 error = got_repo_open(&repo,
11302 worktree ? got_worktree_get_repo_path(worktree) : cwd,
11303 gitconfig_path, pack_fds);
11307 if (worktree != NULL && !list_backups && !delete_backups) {
11308 error = worktree_has_logmsg_ref("rebase", worktree, repo);
11313 error = get_author(&committer, repo, worktree);
11314 if (error && error->code != GOT_ERR_COMMIT_NO_AUTHOR)
11317 error = apply_unveil(got_repo_get_path(repo), 0,
11318 worktree ? got_worktree_get_root_path(worktree) : NULL);
11322 if (list_backups || delete_backups) {
11323 error = process_backup_refs(
11324 GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
11325 argc == 1 ? argv[0] : NULL, delete_backups, repo);
11326 goto done; /* nothing else to do */
11329 error = got_worktree_histedit_in_progress(&histedit_in_progress,
11333 if (histedit_in_progress) {
11334 error = got_error(GOT_ERR_HISTEDIT_BUSY);
11338 error = got_worktree_merge_in_progress(&merge_in_progress,
11342 if (merge_in_progress) {
11343 error = got_error(GOT_ERR_MERGE_BUSY);
11347 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
11351 if (abort_rebase) {
11352 if (!rebase_in_progress) {
11353 error = got_error(GOT_ERR_NOT_REBASING);
11356 error = got_worktree_rebase_continue(&resume_commit_id,
11357 &new_base_branch, &tmp_branch, &branch, &fileindex,
11361 printf("Switching work tree to %s\n",
11362 got_ref_get_symref_target(new_base_branch));
11363 error = got_worktree_rebase_abort(worktree, fileindex, repo,
11364 new_base_branch, abort_progress, &upa);
11367 printf("Rebase of %s aborted\n", got_ref_get_name(branch));
11368 print_merge_progress_stats(&upa);
11369 goto done; /* nothing else to do */
11372 if (continue_rebase) {
11373 if (!rebase_in_progress) {
11374 error = got_error(GOT_ERR_NOT_REBASING);
11377 error = got_worktree_rebase_continue(&resume_commit_id,
11378 &new_base_branch, &tmp_branch, &branch, &fileindex,
11383 error = rebase_commit(NULL, worktree, fileindex, tmp_branch,
11384 committer, resume_commit_id, allow_conflict, repo);
11388 yca_id = got_object_id_dup(resume_commit_id);
11389 if (yca_id == NULL) {
11390 error = got_error_from_errno("got_object_id_dup");
11394 error = got_ref_open(&branch, repo, argv[0], 0);
11397 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
11398 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
11399 "will not rebase a branch which lives outside "
11400 "the \"refs/heads/\" reference namespace");
11405 error = got_ref_resolve(&branch_head_commit_id, repo, branch);
11409 if (!continue_rebase) {
11410 struct got_object_id *base_commit_id;
11412 error = got_ref_open(&head_ref, repo,
11413 got_worktree_get_head_ref_name(worktree), 0);
11416 error = got_ref_resolve(&head_commit_id, repo, head_ref);
11419 base_commit_id = got_worktree_get_base_commit_id(worktree);
11420 if (got_object_id_cmp(base_commit_id, head_commit_id) != 0) {
11421 error = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
11425 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
11426 base_commit_id, branch_head_commit_id, 1, repo,
11427 check_cancelled, NULL);
11429 if (error->code == GOT_ERR_ANCESTRY) {
11430 error = got_error_msg(GOT_ERR_ANCESTRY,
11431 "specified branch shares no common "
11432 "ancestry with work tree's branch");
11437 if (got_object_id_cmp(base_commit_id, yca_id) == 0) {
11438 struct got_pathlist_head paths;
11439 printf("%s is already based on %s\n",
11440 got_ref_get_name(branch),
11441 got_worktree_get_head_ref_name(worktree));
11442 error = switch_head_ref(branch, branch_head_commit_id,
11446 error = got_worktree_set_base_commit_id(worktree, repo,
11447 branch_head_commit_id);
11450 TAILQ_INIT(&paths);
11451 error = got_pathlist_append(&paths, "", NULL);
11454 error = got_worktree_checkout_files(worktree,
11455 &paths, repo, update_progress, &upa,
11456 check_cancelled, NULL);
11457 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
11460 if (upa.did_something) {
11462 error = got_object_id_str(&id_str,
11463 branch_head_commit_id);
11466 printf("Updated to %s: %s\n",
11467 got_worktree_get_head_ref_name(worktree),
11471 printf("Already up-to-date\n");
11472 print_update_progress_stats(&upa);
11477 commit_id = branch_head_commit_id;
11478 error = got_object_open_as_commit(&commit, repo, commit_id);
11482 parent_ids = got_object_commit_get_parent_ids(commit);
11483 pid = STAILQ_FIRST(parent_ids);
11485 error = collect_commits(&commits, commit_id, &pid->id,
11486 yca_id, got_worktree_get_path_prefix(worktree),
11487 GOT_ERR_REBASE_PATH, repo);
11492 got_object_commit_close(commit);
11495 if (!continue_rebase) {
11496 error = got_worktree_rebase_prepare(&new_base_branch,
11497 &tmp_branch, &fileindex, worktree, branch, repo);
11502 if (STAILQ_EMPTY(&commits)) {
11503 if (continue_rebase) {
11504 error = rebase_complete(worktree, fileindex,
11505 branch, tmp_branch, repo, create_backup);
11508 /* Fast-forward the reference of the branch. */
11509 struct got_object_id *new_head_commit_id;
11511 error = got_ref_resolve(&new_head_commit_id, repo,
11515 error = got_object_id_str(&id_str, new_head_commit_id);
11518 printf("Forwarding %s to commit %s\n",
11519 got_ref_get_name(branch), id_str);
11521 error = got_ref_change_ref(branch,
11522 new_head_commit_id);
11525 /* No backup needed since objects did not change. */
11531 STAILQ_FOREACH(qid, &commits, entry) {
11533 commit_id = &qid->id;
11534 parent_id = pid ? &pid->id : yca_id;
11537 memset(&upa, 0, sizeof(upa));
11538 error = got_worktree_rebase_merge_files(&merged_paths,
11539 worktree, fileindex, parent_id, commit_id, repo,
11540 update_progress, &upa, check_cancelled, NULL);
11544 print_merge_progress_stats(&upa);
11545 if (upa.conflicts > 0 || upa.missing > 0 ||
11546 upa.not_deleted > 0 || upa.unversioned > 0) {
11547 if (upa.conflicts > 0) {
11548 error = show_rebase_merge_conflict(&qid->id,
11553 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11557 error = rebase_commit(&merged_paths, worktree, fileindex,
11558 tmp_branch, committer, commit_id, 0, repo);
11559 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
11564 if (upa.conflicts > 0 || upa.missing > 0 ||
11565 upa.not_deleted > 0 || upa.unversioned > 0) {
11566 error = got_worktree_rebase_postpone(worktree, fileindex);
11569 if (upa.conflicts > 0 && upa.missing == 0 &&
11570 upa.not_deleted == 0 && upa.unversioned == 0) {
11571 error = got_error_msg(GOT_ERR_CONFLICTS,
11572 "conflicts must be resolved before rebasing "
11574 } else if (upa.conflicts > 0) {
11575 error = got_error_msg(GOT_ERR_CONFLICTS,
11576 "conflicts must be resolved before rebasing "
11577 "can continue; changes destined for some "
11578 "files were not yet merged and should be "
11579 "merged manually if required before the "
11580 "rebase operation is continued");
11582 error = got_error_msg(GOT_ERR_CONFLICTS,
11583 "changes destined for some files were not "
11584 "yet merged and should be merged manually "
11585 "if required before the rebase operation "
11589 error = rebase_complete(worktree, fileindex, branch,
11590 tmp_branch, repo, create_backup);
11594 free(gitconfig_path);
11595 got_object_id_queue_free(&commits);
11596 free(branch_head_commit_id);
11597 free(resume_commit_id);
11598 free(head_commit_id);
11601 got_object_commit_close(commit);
11603 got_ref_close(branch);
11604 if (new_base_branch)
11605 got_ref_close(new_base_branch);
11607 got_ref_close(tmp_branch);
11609 got_ref_close(head_ref);
11611 got_worktree_close(worktree);
11613 const struct got_error *close_err = got_repo_close(repo);
11618 const struct got_error *pack_err =
11619 got_repo_pack_fds_close(pack_fds);
11627 usage_histedit(void)
11629 fprintf(stderr, "usage: %s histedit [-aCcdeflmX] [-F histedit-script] "
11630 "[branch]\n", getprogname());
11634 #define GOT_HISTEDIT_PICK 'p'
11635 #define GOT_HISTEDIT_EDIT 'e'
11636 #define GOT_HISTEDIT_FOLD 'f'
11637 #define GOT_HISTEDIT_DROP 'd'
11638 #define GOT_HISTEDIT_MESG 'm'
11640 static const struct got_histedit_cmd {
11641 unsigned char code;
11644 } got_histedit_cmds[] = {
11645 { GOT_HISTEDIT_PICK, "pick", "use commit" },
11646 { GOT_HISTEDIT_EDIT, "edit", "use commit but stop for amending" },
11647 { GOT_HISTEDIT_FOLD, "fold", "combine with next commit that will "
11649 { GOT_HISTEDIT_DROP, "drop", "remove commit from history" },
11650 { GOT_HISTEDIT_MESG, "mesg",
11651 "single-line log message for commit above (open editor if empty)" },
11654 struct got_histedit_list_entry {
11655 TAILQ_ENTRY(got_histedit_list_entry) entry;
11656 struct got_object_id *commit_id;
11657 const struct got_histedit_cmd *cmd;
11660 TAILQ_HEAD(got_histedit_list, got_histedit_list_entry);
11662 static const struct got_error *
11663 histedit_write_commit(struct got_object_id *commit_id, const char *cmdname,
11664 FILE *f, struct got_repository *repo)
11666 const struct got_error *err = NULL;
11667 char *logmsg = NULL, *id_str = NULL;
11668 struct got_commit_object *commit = NULL;
11671 err = got_object_open_as_commit(&commit, repo, commit_id);
11675 err = get_short_logmsg(&logmsg, 34, commit);
11679 err = got_object_id_str(&id_str, commit_id);
11683 n = fprintf(f, "%s %s %s\n", cmdname, id_str, logmsg);
11685 err = got_ferror(f, GOT_ERR_IO);
11688 got_object_commit_close(commit);
11694 static const struct got_error *
11695 histedit_write_commit_list(struct got_object_id_queue *commits,
11696 FILE *f, int edit_logmsg_only, int fold_only, int drop_only,
11697 int edit_only, struct got_repository *repo)
11699 const struct got_error *err = NULL;
11700 struct got_object_qid *qid;
11701 const char *histedit_cmd = NULL;
11703 if (STAILQ_EMPTY(commits))
11704 return got_error(GOT_ERR_EMPTY_HISTEDIT);
11706 STAILQ_FOREACH(qid, commits, entry) {
11707 histedit_cmd = got_histedit_cmds[0].name;
11709 histedit_cmd = "drop";
11710 else if (edit_only)
11711 histedit_cmd = "edit";
11712 else if (fold_only && STAILQ_NEXT(qid, entry) != NULL)
11713 histedit_cmd = "fold";
11714 err = histedit_write_commit(&qid->id, histedit_cmd, f, repo);
11717 if (edit_logmsg_only) {
11718 int n = fprintf(f, "%c\n", GOT_HISTEDIT_MESG);
11720 err = got_ferror(f, GOT_ERR_IO);
11729 static const struct got_error *
11730 write_cmd_list(FILE *f, const char *branch_name,
11731 struct got_object_id_queue *commits)
11733 const struct got_error *err = NULL;
11737 struct got_object_qid *qid;
11739 qid = STAILQ_FIRST(commits);
11740 err = got_object_id_str(&id_str, &qid->id);
11745 "# Editing the history of branch '%s' starting at\n"
11747 "# Commits will be processed in order from top to "
11748 "bottom of this file.\n", branch_name, id_str);
11750 err = got_ferror(f, GOT_ERR_IO);
11754 n = fprintf(f, "# Available histedit commands:\n");
11756 err = got_ferror(f, GOT_ERR_IO);
11760 for (i = 0; i < nitems(got_histedit_cmds); i++) {
11761 const struct got_histedit_cmd *cmd = &got_histedit_cmds[i];
11762 n = fprintf(f, "# %s (%c): %s\n", cmd->name, cmd->code,
11765 err = got_ferror(f, GOT_ERR_IO);
11774 static const struct got_error *
11775 histedit_syntax_error(int lineno)
11777 static char msg[42];
11780 ret = snprintf(msg, sizeof(msg), "histedit syntax error on line %d",
11782 if (ret < 0 || (size_t)ret >= sizeof(msg))
11783 return got_error(GOT_ERR_HISTEDIT_SYNTAX);
11785 return got_error_msg(GOT_ERR_HISTEDIT_SYNTAX, msg);
11788 static const struct got_error *
11789 append_folded_commit_msg(char **new_msg, struct got_histedit_list_entry *hle,
11790 char *logmsg, struct got_repository *repo)
11792 const struct got_error *err;
11793 struct got_commit_object *folded_commit = NULL;
11794 char *id_str, *folded_logmsg = NULL;
11796 err = got_object_id_str(&id_str, hle->commit_id);
11800 err = got_object_open_as_commit(&folded_commit, repo, hle->commit_id);
11804 err = got_object_commit_get_logmsg(&folded_logmsg, folded_commit);
11807 if (asprintf(new_msg, "%s%s# log message of folded commit %s: %s",
11808 logmsg ? logmsg : "", logmsg ? "\n" : "", id_str,
11809 folded_logmsg) == -1) {
11810 err = got_error_from_errno("asprintf");
11814 got_object_commit_close(folded_commit);
11816 free(folded_logmsg);
11820 static struct got_histedit_list_entry *
11821 get_folded_commits(struct got_histedit_list_entry *hle)
11823 struct got_histedit_list_entry *prev, *folded = NULL;
11825 prev = TAILQ_PREV(hle, got_histedit_list, entry);
11826 while (prev && (prev->cmd->code == GOT_HISTEDIT_FOLD ||
11827 prev->cmd->code == GOT_HISTEDIT_DROP)) {
11828 if (prev->cmd->code == GOT_HISTEDIT_FOLD)
11830 prev = TAILQ_PREV(prev, got_histedit_list, entry);
11836 static const struct got_error *
11837 histedit_edit_logmsg(struct got_histedit_list_entry *hle,
11838 struct got_repository *repo)
11840 char *logmsg_path = NULL, *id_str = NULL, *orig_logmsg = NULL;
11841 char *logmsg = NULL, *new_msg = NULL, *editor = NULL;
11842 const struct got_error *err = NULL;
11843 struct got_commit_object *commit = NULL;
11846 struct got_histedit_list_entry *folded = NULL;
11848 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
11852 folded = get_folded_commits(hle);
11854 while (folded != hle) {
11855 if (folded->cmd->code == GOT_HISTEDIT_DROP) {
11856 folded = TAILQ_NEXT(folded, entry);
11859 err = append_folded_commit_msg(&new_msg, folded,
11865 folded = TAILQ_NEXT(folded, entry);
11869 err = got_object_id_str(&id_str, hle->commit_id);
11872 err = got_object_commit_get_logmsg(&orig_logmsg, commit);
11875 logmsg_len = asprintf(&new_msg,
11876 "%s\n# original log message of commit %s: %s",
11877 logmsg ? logmsg : "", id_str, orig_logmsg);
11878 if (logmsg_len == -1) {
11879 err = got_error_from_errno("asprintf");
11885 err = got_object_id_str(&id_str, hle->commit_id);
11889 err = got_opentemp_named_fd(&logmsg_path, &fd,
11890 GOT_TMPDIR_STR "/got-logmsg", "");
11894 if (write(fd, logmsg, logmsg_len) == -1) {
11895 err = got_error_from_errno2("write", logmsg_path);
11898 if (close(fd) == -1) {
11899 err = got_error_from_errno2("close", logmsg_path);
11904 err = get_editor(&editor);
11908 err = edit_logmsg(&hle->logmsg, editor, logmsg_path, logmsg,
11911 if (err->code != GOT_ERR_COMMIT_MSG_EMPTY)
11914 hle->logmsg = strdup(new_msg);
11915 if (hle->logmsg == NULL)
11916 err = got_error_from_errno("strdup");
11919 if (fd != -1 && close(fd) == -1 && err == NULL)
11920 err = got_error_from_errno2("close", logmsg_path);
11921 if (logmsg_path && unlink(logmsg_path) != 0 && err == NULL)
11922 err = got_error_from_errno2("unlink", logmsg_path);
11928 got_object_commit_close(commit);
11932 static const struct got_error *
11933 histedit_parse_list(struct got_histedit_list *histedit_cmds,
11934 FILE *f, struct got_repository *repo)
11936 const struct got_error *err = NULL;
11937 char *line = NULL, *p, *end;
11938 size_t i, linesize = 0;
11940 int lineno = 0, lastcmd = -1;
11941 const struct got_histedit_cmd *cmd;
11942 struct got_object_id *commit_id = NULL;
11943 struct got_histedit_list_entry *hle = NULL;
11946 linelen = getline(&line, &linesize, f);
11947 if (linelen == -1) {
11948 const struct got_error *getline_err;
11951 getline_err = got_error_from_errno("getline");
11952 err = got_ferror(f, getline_err->code);
11957 while (isspace((unsigned char)p[0]))
11959 if (p[0] == '#' || p[0] == '\0')
11962 for (i = 0; i < nitems(got_histedit_cmds); i++) {
11963 cmd = &got_histedit_cmds[i];
11964 if (strncmp(cmd->name, p, strlen(cmd->name)) == 0 &&
11965 isspace((unsigned char)p[strlen(cmd->name)])) {
11966 p += strlen(cmd->name);
11969 if (p[0] == cmd->code && isspace((unsigned char)p[1])) {
11974 if (i == nitems(got_histedit_cmds)) {
11975 err = histedit_syntax_error(lineno);
11978 while (isspace((unsigned char)p[0]))
11980 if (cmd->code == GOT_HISTEDIT_MESG) {
11981 if (lastcmd != GOT_HISTEDIT_PICK &&
11982 lastcmd != GOT_HISTEDIT_EDIT) {
11983 err = got_error(GOT_ERR_HISTEDIT_CMD);
11986 if (p[0] == '\0') {
11987 err = histedit_edit_logmsg(hle, repo);
11991 hle->logmsg = strdup(p);
11992 if (hle->logmsg == NULL) {
11993 err = got_error_from_errno("strdup");
11997 lastcmd = cmd->code;
12001 while (end[0] && !isspace((unsigned char)end[0]))
12005 err = got_object_resolve_id_str(&commit_id, repo, p);
12007 /* override error code */
12008 err = histedit_syntax_error(lineno);
12012 hle = malloc(sizeof(*hle));
12014 err = got_error_from_errno("malloc");
12018 hle->commit_id = commit_id;
12019 hle->logmsg = NULL;
12021 TAILQ_INSERT_TAIL(histedit_cmds, hle, entry);
12022 lastcmd = cmd->code;
12030 static const struct got_error *
12031 histedit_check_script(struct got_histedit_list *histedit_cmds,
12032 struct got_object_id_queue *commits, struct got_repository *repo)
12034 const struct got_error *err = NULL;
12035 struct got_object_qid *qid;
12036 struct got_histedit_list_entry *hle;
12037 static char msg[92];
12040 if (TAILQ_EMPTY(histedit_cmds))
12041 return got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12042 "histedit script contains no commands");
12043 if (STAILQ_EMPTY(commits))
12044 return got_error(GOT_ERR_EMPTY_HISTEDIT);
12046 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12047 struct got_histedit_list_entry *hle2;
12048 TAILQ_FOREACH(hle2, histedit_cmds, entry) {
12051 if (got_object_id_cmp(hle->commit_id,
12052 hle2->commit_id) != 0)
12054 err = got_object_id_str(&id_str, hle->commit_id);
12057 snprintf(msg, sizeof(msg), "commit %s is listed "
12058 "more than once in histedit script", id_str);
12060 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12064 STAILQ_FOREACH(qid, commits, entry) {
12065 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12066 if (got_object_id_cmp(&qid->id, hle->commit_id) == 0)
12070 err = got_object_id_str(&id_str, &qid->id);
12073 snprintf(msg, sizeof(msg),
12074 "commit %s missing from histedit script", id_str);
12076 return got_error_msg(GOT_ERR_HISTEDIT_CMD, msg);
12080 hle = TAILQ_LAST(histedit_cmds, got_histedit_list);
12081 if (hle && hle->cmd->code == GOT_HISTEDIT_FOLD)
12082 return got_error_msg(GOT_ERR_HISTEDIT_CMD,
12083 "last commit in histedit script cannot be folded");
12088 static const struct got_error *
12089 histedit_run_editor(struct got_histedit_list *histedit_cmds,
12090 const char *path, struct got_object_id_queue *commits,
12091 struct got_repository *repo)
12093 const struct got_error *err = NULL;
12094 struct stat st, st2;
12095 struct timespec timeout;
12099 err = get_editor(&editor);
12103 if (stat(path, &st) == -1) {
12104 err = got_error_from_errno2("stat", path);
12108 if (spawn_editor(editor, path) == -1) {
12109 err = got_error_from_errno("failed spawning editor");
12113 timeout.tv_sec = 0;
12114 timeout.tv_nsec = 1;
12115 nanosleep(&timeout, NULL);
12117 if (stat(path, &st2) == -1) {
12118 err = got_error_from_errno2("stat", path);
12122 if (st.st_size == st2.st_size &&
12123 timespeccmp(&st.st_mtim, &st2.st_mtim, ==)) {
12124 err = got_error_msg(GOT_ERR_EMPTY_HISTEDIT,
12125 "no changes made to histedit script, aborting");
12129 f = fopen(path, "re");
12131 err = got_error_from_errno("fopen");
12134 err = histedit_parse_list(histedit_cmds, f, repo);
12138 err = histedit_check_script(histedit_cmds, commits, repo);
12140 if (f && fclose(f) == EOF && err == NULL)
12141 err = got_error_from_errno("fclose");
12146 static const struct got_error *
12147 histedit_edit_list_retry(struct got_histedit_list *, const struct got_error *,
12148 struct got_object_id_queue *, const char *, const char *,
12149 struct got_repository *);
12151 static const struct got_error *
12152 histedit_edit_script(struct got_histedit_list *histedit_cmds,
12153 struct got_object_id_queue *commits, const char *branch_name,
12154 int edit_logmsg_only, int fold_only, int drop_only, int edit_only,
12155 struct got_repository *repo)
12157 const struct got_error *err;
12161 err = got_opentemp_named(&path, &f, "got-histedit", "");
12165 err = write_cmd_list(f, branch_name, commits);
12169 err = histedit_write_commit_list(commits, f, edit_logmsg_only,
12170 fold_only, drop_only, edit_only, repo);
12174 if (drop_only || edit_logmsg_only || fold_only || edit_only) {
12176 err = histedit_parse_list(histedit_cmds, f, repo);
12178 if (fclose(f) == EOF) {
12179 err = got_error_from_errno("fclose");
12183 err = histedit_run_editor(histedit_cmds, path, commits, repo);
12185 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12186 err->code != GOT_ERR_HISTEDIT_CMD)
12188 err = histedit_edit_list_retry(histedit_cmds, err,
12189 commits, path, branch_name, repo);
12193 if (f && fclose(f) == EOF && err == NULL)
12194 err = got_error_from_errno("fclose");
12195 if (path && unlink(path) != 0 && err == NULL)
12196 err = got_error_from_errno2("unlink", path);
12201 static const struct got_error *
12202 histedit_save_list(struct got_histedit_list *histedit_cmds,
12203 struct got_worktree *worktree, struct got_repository *repo)
12205 const struct got_error *err = NULL;
12208 struct got_histedit_list_entry *hle;
12210 err = got_worktree_get_histedit_script_path(&path, worktree);
12214 f = fopen(path, "we");
12216 err = got_error_from_errno2("fopen", path);
12219 TAILQ_FOREACH(hle, histedit_cmds, entry) {
12220 err = histedit_write_commit(hle->commit_id, hle->cmd->name, f,
12226 int n = fprintf(f, "%c %s\n",
12227 GOT_HISTEDIT_MESG, hle->logmsg);
12229 err = got_ferror(f, GOT_ERR_IO);
12235 if (f && fclose(f) == EOF && err == NULL)
12236 err = got_error_from_errno("fclose");
12242 histedit_free_list(struct got_histedit_list *histedit_cmds)
12244 struct got_histedit_list_entry *hle;
12246 while ((hle = TAILQ_FIRST(histedit_cmds))) {
12247 TAILQ_REMOVE(histedit_cmds, hle, entry);
12252 static const struct got_error *
12253 histedit_load_list(struct got_histedit_list *histedit_cmds,
12254 const char *path, struct got_repository *repo)
12256 const struct got_error *err = NULL;
12259 f = fopen(path, "re");
12261 err = got_error_from_errno2("fopen", path);
12265 err = histedit_parse_list(histedit_cmds, f, repo);
12267 if (f && fclose(f) == EOF && err == NULL)
12268 err = got_error_from_errno("fclose");
12272 static const struct got_error *
12273 histedit_edit_list_retry(struct got_histedit_list *histedit_cmds,
12274 const struct got_error *edit_err, struct got_object_id_queue *commits,
12275 const char *path, const char *branch_name, struct got_repository *repo)
12277 const struct got_error *err = NULL, *prev_err = edit_err;
12280 while (resp != 'c' && resp != 'r' && resp != 'a') {
12281 printf("%s: %s\n(c)ontinue editing, (r)estart editing, "
12282 "or (a)bort: ", getprogname(), prev_err->msg);
12287 histedit_free_list(histedit_cmds);
12288 err = histedit_run_editor(histedit_cmds, path, commits,
12291 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12292 err->code != GOT_ERR_HISTEDIT_CMD)
12299 } else if (resp == 'r') {
12300 histedit_free_list(histedit_cmds);
12301 err = histedit_edit_script(histedit_cmds,
12302 commits, branch_name, 0, 0, 0, 0, repo);
12304 if (err->code != GOT_ERR_HISTEDIT_SYNTAX &&
12305 err->code != GOT_ERR_HISTEDIT_CMD)
12312 } else if (resp == 'a') {
12313 err = got_error(GOT_ERR_HISTEDIT_CANCEL);
12316 printf("invalid response '%c'\n", resp);
12322 static const struct got_error *
12323 histedit_complete(struct got_worktree *worktree,
12324 struct got_fileindex *fileindex, struct got_reference *tmp_branch,
12325 struct got_reference *branch, struct got_repository *repo)
12327 printf("Switching work tree to %s\n",
12328 got_ref_get_symref_target(branch));
12329 return got_worktree_histedit_complete(worktree, fileindex, tmp_branch,
12333 static const struct got_error *
12334 show_histedit_progress(struct got_commit_object *commit,
12335 struct got_histedit_list_entry *hle, struct got_object_id *new_id)
12337 const struct got_error *err;
12338 char *old_id_str = NULL, *new_id_str = NULL, *logmsg = NULL;
12340 err = got_object_id_str(&old_id_str, hle->commit_id);
12345 err = got_object_id_str(&new_id_str, new_id);
12350 old_id_str[12] = '\0';
12352 new_id_str[12] = '\0';
12355 logmsg = strdup(hle->logmsg);
12356 if (logmsg == NULL) {
12357 err = got_error_from_errno("strdup");
12360 trim_logmsg(logmsg, 42);
12362 err = get_short_logmsg(&logmsg, 42, commit);
12367 switch (hle->cmd->code) {
12368 case GOT_HISTEDIT_PICK:
12369 case GOT_HISTEDIT_EDIT:
12370 printf("%s -> %s: %s\n", old_id_str,
12371 new_id_str ? new_id_str : "no-op change", logmsg);
12373 case GOT_HISTEDIT_DROP:
12374 case GOT_HISTEDIT_FOLD:
12375 printf("%s -> %s commit: %s\n", old_id_str, hle->cmd->name,
12387 static const struct got_error *
12388 histedit_commit(struct got_pathlist_head *merged_paths,
12389 struct got_worktree *worktree, struct got_fileindex *fileindex,
12390 struct got_reference *tmp_branch, struct got_histedit_list_entry *hle,
12391 const char *committer, int allow_conflict, struct got_repository *repo)
12393 const struct got_error *err;
12394 struct got_commit_object *commit;
12395 struct got_object_id *new_commit_id;
12397 if ((hle->cmd->code == GOT_HISTEDIT_EDIT || get_folded_commits(hle))
12398 && hle->logmsg == NULL) {
12399 err = histedit_edit_logmsg(hle, repo);
12404 err = got_object_open_as_commit(&commit, repo, hle->commit_id);
12408 err = got_worktree_histedit_commit(&new_commit_id, merged_paths,
12409 worktree, fileindex, tmp_branch, committer, commit, hle->commit_id,
12410 hle->logmsg, allow_conflict, repo);
12412 if (err->code != GOT_ERR_COMMIT_NO_CHANGES)
12414 err = show_histedit_progress(commit, hle, NULL);
12416 err = show_histedit_progress(commit, hle, new_commit_id);
12417 free(new_commit_id);
12420 got_object_commit_close(commit);
12424 static const struct got_error *
12425 histedit_skip_commit(struct got_histedit_list_entry *hle,
12426 struct got_worktree *worktree, struct got_repository *repo)
12428 const struct got_error *error;
12429 struct got_commit_object *commit;
12431 error = got_worktree_histedit_skip_commit(worktree, hle->commit_id,
12436 error = got_object_open_as_commit(&commit, repo, hle->commit_id);
12440 error = show_histedit_progress(commit, hle, NULL);
12441 got_object_commit_close(commit);
12445 static const struct got_error *
12446 check_local_changes(void *arg, unsigned char status,
12447 unsigned char staged_status, const char *path,
12448 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
12449 struct got_object_id *commit_id, int dirfd, const char *de_name)
12451 int *have_local_changes = arg;
12454 case GOT_STATUS_ADD:
12455 case GOT_STATUS_DELETE:
12456 case GOT_STATUS_MODIFY:
12457 case GOT_STATUS_CONFLICT:
12458 *have_local_changes = 1;
12459 return got_error(GOT_ERR_CANCELLED);
12464 switch (staged_status) {
12465 case GOT_STATUS_ADD:
12466 case GOT_STATUS_DELETE:
12467 case GOT_STATUS_MODIFY:
12468 *have_local_changes = 1;
12469 return got_error(GOT_ERR_CANCELLED);
12477 static const struct got_error *
12478 cmd_histedit(int argc, char *argv[])
12480 const struct got_error *error = NULL;
12481 struct got_worktree *worktree = NULL;
12482 struct got_fileindex *fileindex = NULL;
12483 struct got_repository *repo = NULL;
12484 char *cwd = NULL, *committer = NULL, *gitconfig_path = NULL;
12485 struct got_reference *branch = NULL;
12486 struct got_reference *tmp_branch = NULL;
12487 struct got_object_id *resume_commit_id = NULL;
12488 struct got_object_id *base_commit_id = NULL;
12489 struct got_object_id *head_commit_id = NULL;
12490 struct got_commit_object *commit = NULL;
12491 int ch, rebase_in_progress = 0, merge_in_progress = 0;
12492 struct got_update_progress_arg upa;
12493 int edit_in_progress = 0, abort_edit = 0, continue_edit = 0;
12494 int drop_only = 0, edit_logmsg_only = 0, fold_only = 0, edit_only = 0;
12495 int allow_conflict = 0, list_backups = 0, delete_backups = 0;
12496 const char *edit_script_path = NULL;
12497 struct got_object_id_queue commits;
12498 struct got_pathlist_head merged_paths;
12499 const struct got_object_id_queue *parent_ids;
12500 struct got_object_qid *pid;
12501 struct got_histedit_list histedit_cmds;
12502 struct got_histedit_list_entry *hle;
12503 int *pack_fds = NULL;
12505 STAILQ_INIT(&commits);
12506 TAILQ_INIT(&histedit_cmds);
12507 TAILQ_INIT(&merged_paths);
12508 memset(&upa, 0, sizeof(upa));
12511 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
12512 "unveil", NULL) == -1)
12516 while ((ch = getopt(argc, argv, "aCcdeF:flmX")) != -1) {
12522 allow_conflict = 1;
12534 edit_script_path = optarg;
12543 edit_logmsg_only = 1;
12546 delete_backups = 1;
12557 if (abort_edit && allow_conflict)
12558 option_conflict('a', 'C');
12559 if (abort_edit && continue_edit)
12560 option_conflict('a', 'c');
12561 if (edit_script_path && allow_conflict)
12562 option_conflict('F', 'C');
12563 if (edit_script_path && edit_logmsg_only)
12564 option_conflict('F', 'm');
12565 if (abort_edit && edit_logmsg_only)
12566 option_conflict('a', 'm');
12567 if (edit_logmsg_only && allow_conflict)
12568 option_conflict('m', 'C');
12569 if (continue_edit && edit_logmsg_only)
12570 option_conflict('c', 'm');
12571 if (abort_edit && fold_only)
12572 option_conflict('a', 'f');
12573 if (fold_only && allow_conflict)
12574 option_conflict('f', 'C');
12575 if (continue_edit && fold_only)
12576 option_conflict('c', 'f');
12577 if (fold_only && edit_logmsg_only)
12578 option_conflict('f', 'm');
12579 if (edit_script_path && fold_only)
12580 option_conflict('F', 'f');
12581 if (abort_edit && edit_only)
12582 option_conflict('a', 'e');
12583 if (continue_edit && edit_only)
12584 option_conflict('c', 'e');
12585 if (edit_only && edit_logmsg_only)
12586 option_conflict('e', 'm');
12587 if (edit_script_path && edit_only)
12588 option_conflict('F', 'e');
12589 if (fold_only && edit_only)
12590 option_conflict('f', 'e');
12591 if (drop_only && abort_edit)
12592 option_conflict('d', 'a');
12593 if (drop_only && allow_conflict)
12594 option_conflict('d', 'C');
12595 if (drop_only && continue_edit)
12596 option_conflict('d', 'c');
12597 if (drop_only && edit_logmsg_only)
12598 option_conflict('d', 'm');
12599 if (drop_only && edit_only)
12600 option_conflict('d', 'e');
12601 if (drop_only && edit_script_path)
12602 option_conflict('d', 'F');
12603 if (drop_only && fold_only)
12604 option_conflict('d', 'f');
12605 if (list_backups) {
12607 option_conflict('l', 'a');
12608 if (allow_conflict)
12609 option_conflict('l', 'C');
12611 option_conflict('l', 'c');
12612 if (edit_script_path)
12613 option_conflict('l', 'F');
12614 if (edit_logmsg_only)
12615 option_conflict('l', 'm');
12617 option_conflict('l', 'd');
12619 option_conflict('l', 'f');
12621 option_conflict('l', 'e');
12622 if (delete_backups)
12623 option_conflict('l', 'X');
12624 if (argc != 0 && argc != 1)
12626 } else if (delete_backups) {
12628 option_conflict('X', 'a');
12629 if (allow_conflict)
12630 option_conflict('X', 'C');
12632 option_conflict('X', 'c');
12634 option_conflict('X', 'd');
12635 if (edit_script_path)
12636 option_conflict('X', 'F');
12637 if (edit_logmsg_only)
12638 option_conflict('X', 'm');
12640 option_conflict('X', 'f');
12642 option_conflict('X', 'e');
12644 option_conflict('X', 'l');
12645 if (argc != 0 && argc != 1)
12647 } else if (allow_conflict && !continue_edit)
12648 errx(1, "-C option requires -c");
12649 else if (argc != 0)
12653 * This command cannot apply unveil(2) in all cases because the
12654 * user may choose to run an editor to edit the histedit script
12655 * and to edit individual commit log messages.
12656 * unveil(2) traverses exec(2); if an editor is used we have to
12657 * apply unveil after edit script and log messages have been written.
12658 * XXX TODO: Make use of unveil(2) where possible.
12661 cwd = getcwd(NULL, 0);
12663 error = got_error_from_errno("getcwd");
12667 error = got_repo_pack_fds_open(&pack_fds);
12671 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
12673 if (list_backups || delete_backups) {
12674 if (error->code != GOT_ERR_NOT_WORKTREE)
12677 if (error->code == GOT_ERR_NOT_WORKTREE)
12678 error = wrap_not_worktree_error(error,
12684 if (list_backups || delete_backups) {
12685 error = got_repo_open(&repo,
12686 worktree ? got_worktree_get_repo_path(worktree) : cwd,
12690 error = apply_unveil(got_repo_get_path(repo), 0,
12691 worktree ? got_worktree_get_root_path(worktree) : NULL);
12694 error = process_backup_refs(
12695 GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
12696 argc == 1 ? argv[0] : NULL, delete_backups, repo);
12697 goto done; /* nothing else to do */
12700 error = get_gitconfig_path(&gitconfig_path);
12703 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
12704 gitconfig_path, pack_fds);
12708 if (worktree != NULL && !list_backups && !delete_backups) {
12709 error = worktree_has_logmsg_ref("histedit", worktree, repo);
12714 error = got_worktree_rebase_in_progress(&rebase_in_progress, worktree);
12717 if (rebase_in_progress) {
12718 error = got_error(GOT_ERR_REBASING);
12722 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
12726 if (merge_in_progress) {
12727 error = got_error(GOT_ERR_MERGE_BUSY);
12731 error = got_worktree_histedit_in_progress(&edit_in_progress, worktree);
12735 if (edit_in_progress && edit_logmsg_only) {
12736 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12737 "histedit operation is in progress in this "
12738 "work tree and must be continued or aborted "
12739 "before the -m option can be used");
12742 if (edit_in_progress && drop_only) {
12743 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12744 "histedit operation is in progress in this "
12745 "work tree and must be continued or aborted "
12746 "before the -d option can be used");
12749 if (edit_in_progress && fold_only) {
12750 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12751 "histedit operation is in progress in this "
12752 "work tree and must be continued or aborted "
12753 "before the -f option can be used");
12756 if (edit_in_progress && edit_only) {
12757 error = got_error_msg(GOT_ERR_HISTEDIT_BUSY,
12758 "histedit operation is in progress in this "
12759 "work tree and must be continued or aborted "
12760 "before the -e option can be used");
12764 if (edit_in_progress && abort_edit) {
12765 error = got_worktree_histedit_continue(&resume_commit_id,
12766 &tmp_branch, &branch, &base_commit_id, &fileindex,
12770 printf("Switching work tree to %s\n",
12771 got_ref_get_symref_target(branch));
12772 error = got_worktree_histedit_abort(worktree, fileindex, repo,
12773 branch, base_commit_id, abort_progress, &upa);
12776 printf("Histedit of %s aborted\n",
12777 got_ref_get_symref_target(branch));
12778 print_merge_progress_stats(&upa);
12779 goto done; /* nothing else to do */
12780 } else if (abort_edit) {
12781 error = got_error(GOT_ERR_NOT_HISTEDIT);
12785 error = get_author(&committer, repo, worktree);
12789 if (continue_edit) {
12792 if (!edit_in_progress) {
12793 error = got_error(GOT_ERR_NOT_HISTEDIT);
12797 error = got_worktree_get_histedit_script_path(&path, worktree);
12801 error = histedit_load_list(&histedit_cmds, path, repo);
12806 error = got_worktree_histedit_continue(&resume_commit_id,
12807 &tmp_branch, &branch, &base_commit_id, &fileindex,
12812 error = got_ref_resolve(&head_commit_id, repo, branch);
12816 error = got_object_open_as_commit(&commit, repo,
12820 parent_ids = got_object_commit_get_parent_ids(commit);
12821 pid = STAILQ_FIRST(parent_ids);
12823 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12826 error = collect_commits(&commits, head_commit_id, &pid->id,
12827 base_commit_id, got_worktree_get_path_prefix(worktree),
12828 GOT_ERR_HISTEDIT_PATH, repo);
12829 got_object_commit_close(commit);
12834 if (edit_in_progress) {
12835 error = got_error(GOT_ERR_HISTEDIT_BUSY);
12839 error = got_ref_open(&branch, repo,
12840 got_worktree_get_head_ref_name(worktree), 0);
12844 if (strncmp(got_ref_get_name(branch), "refs/heads/", 11) != 0) {
12845 error = got_error_msg(GOT_ERR_COMMIT_BRANCH,
12846 "will not edit commit history of a branch outside "
12847 "the \"refs/heads/\" reference namespace");
12851 error = got_ref_resolve(&head_commit_id, repo, branch);
12852 got_ref_close(branch);
12857 error = got_object_open_as_commit(&commit, repo,
12861 parent_ids = got_object_commit_get_parent_ids(commit);
12862 pid = STAILQ_FIRST(parent_ids);
12864 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12867 error = collect_commits(&commits, head_commit_id, &pid->id,
12868 got_worktree_get_base_commit_id(worktree),
12869 got_worktree_get_path_prefix(worktree),
12870 GOT_ERR_HISTEDIT_PATH, repo);
12871 got_object_commit_close(commit);
12876 if (STAILQ_EMPTY(&commits)) {
12877 error = got_error(GOT_ERR_EMPTY_HISTEDIT);
12881 error = got_worktree_histedit_prepare(&tmp_branch, &branch,
12882 &base_commit_id, &fileindex, worktree, repo);
12886 if (edit_script_path) {
12887 error = histedit_load_list(&histedit_cmds,
12888 edit_script_path, repo);
12890 got_worktree_histedit_abort(worktree, fileindex,
12891 repo, branch, base_commit_id,
12892 abort_progress, &upa);
12893 print_merge_progress_stats(&upa);
12897 const char *branch_name;
12898 branch_name = got_ref_get_symref_target(branch);
12899 if (strncmp(branch_name, "refs/heads/", 11) == 0)
12901 error = histedit_edit_script(&histedit_cmds, &commits,
12902 branch_name, edit_logmsg_only, fold_only,
12903 drop_only, edit_only, repo);
12905 got_worktree_histedit_abort(worktree, fileindex,
12906 repo, branch, base_commit_id,
12907 abort_progress, &upa);
12908 print_merge_progress_stats(&upa);
12914 error = histedit_save_list(&histedit_cmds, worktree,
12917 got_worktree_histedit_abort(worktree, fileindex,
12918 repo, branch, base_commit_id,
12919 abort_progress, &upa);
12920 print_merge_progress_stats(&upa);
12926 error = histedit_check_script(&histedit_cmds, &commits, repo);
12930 TAILQ_FOREACH(hle, &histedit_cmds, entry) {
12931 if (resume_commit_id) {
12932 if (got_object_id_cmp(hle->commit_id,
12933 resume_commit_id) != 0)
12936 resume_commit_id = NULL;
12937 if (hle->cmd->code == GOT_HISTEDIT_DROP ||
12938 hle->cmd->code == GOT_HISTEDIT_FOLD) {
12939 error = histedit_skip_commit(hle, worktree,
12944 struct got_pathlist_head paths;
12945 int have_changes = 0;
12947 TAILQ_INIT(&paths);
12948 error = got_pathlist_append(&paths, "", NULL);
12951 error = got_worktree_status(worktree, &paths,
12952 repo, 0, check_local_changes, &have_changes,
12953 check_cancelled, NULL);
12954 got_pathlist_free(&paths,
12955 GOT_PATHLIST_FREE_NONE);
12957 if (error->code != GOT_ERR_CANCELLED)
12959 if (sigint_received || sigpipe_received)
12962 if (have_changes) {
12963 error = histedit_commit(NULL, worktree,
12964 fileindex, tmp_branch, hle,
12965 committer, allow_conflict, repo);
12969 error = got_object_open_as_commit(
12970 &commit, repo, hle->commit_id);
12973 error = show_histedit_progress(commit,
12975 got_object_commit_close(commit);
12984 if (hle->cmd->code == GOT_HISTEDIT_DROP) {
12985 error = histedit_skip_commit(hle, worktree, repo);
12991 error = got_object_open_as_commit(&commit, repo,
12995 parent_ids = got_object_commit_get_parent_ids(commit);
12996 pid = STAILQ_FIRST(parent_ids);
12998 error = got_worktree_histedit_merge_files(&merged_paths,
12999 worktree, fileindex, &pid->id, hle->commit_id, repo,
13000 update_progress, &upa, check_cancelled, NULL);
13003 got_object_commit_close(commit);
13006 print_merge_progress_stats(&upa);
13007 if (upa.conflicts > 0 || upa.missing > 0 ||
13008 upa.not_deleted > 0 || upa.unversioned > 0) {
13009 if (upa.conflicts > 0) {
13010 error = show_rebase_merge_conflict(
13011 hle->commit_id, repo);
13015 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13019 if (hle->cmd->code == GOT_HISTEDIT_EDIT) {
13021 error = got_object_id_str(&id_str, hle->commit_id);
13024 printf("Stopping histedit for amending commit %s\n",
13027 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13028 error = got_worktree_histedit_postpone(worktree,
13033 if (hle->cmd->code == GOT_HISTEDIT_FOLD) {
13034 error = histedit_skip_commit(hle, worktree, repo);
13040 error = histedit_commit(&merged_paths, worktree, fileindex,
13041 tmp_branch, hle, committer, allow_conflict, repo);
13042 got_pathlist_free(&merged_paths, GOT_PATHLIST_FREE_PATH);
13047 if (upa.conflicts > 0 || upa.missing > 0 ||
13048 upa.not_deleted > 0 || upa.unversioned > 0) {
13049 error = got_worktree_histedit_postpone(worktree, fileindex);
13052 if (upa.conflicts > 0 && upa.missing == 0 &&
13053 upa.not_deleted == 0 && upa.unversioned == 0) {
13054 error = got_error_msg(GOT_ERR_CONFLICTS,
13055 "conflicts must be resolved before histedit "
13057 } else if (upa.conflicts > 0) {
13058 error = got_error_msg(GOT_ERR_CONFLICTS,
13059 "conflicts must be resolved before histedit "
13060 "can continue; changes destined for some "
13061 "files were not yet merged and should be "
13062 "merged manually if required before the "
13063 "histedit operation is continued");
13065 error = got_error_msg(GOT_ERR_CONFLICTS,
13066 "changes destined for some files were not "
13067 "yet merged and should be merged manually "
13068 "if required before the histedit operation "
13072 error = histedit_complete(worktree, fileindex, tmp_branch,
13077 free(gitconfig_path);
13078 got_object_id_queue_free(&commits);
13079 histedit_free_list(&histedit_cmds);
13080 free(head_commit_id);
13081 free(base_commit_id);
13082 free(resume_commit_id);
13084 got_object_commit_close(commit);
13086 got_ref_close(branch);
13088 got_ref_close(tmp_branch);
13090 got_worktree_close(worktree);
13092 const struct got_error *close_err = got_repo_close(repo);
13097 const struct got_error *pack_err =
13098 got_repo_pack_fds_close(pack_fds);
13106 usage_integrate(void)
13108 fprintf(stderr, "usage: %s integrate branch\n", getprogname());
13112 static const struct got_error *
13113 cmd_integrate(int argc, char *argv[])
13115 const struct got_error *error = NULL;
13116 struct got_repository *repo = NULL;
13117 struct got_worktree *worktree = NULL;
13118 char *cwd = NULL, *refname = NULL, *base_refname = NULL;
13119 const char *branch_arg = NULL;
13120 struct got_reference *branch_ref = NULL, *base_branch_ref = NULL;
13121 struct got_fileindex *fileindex = NULL;
13122 struct got_object_id *commit_id = NULL, *base_commit_id = NULL;
13124 struct got_update_progress_arg upa;
13125 int *pack_fds = NULL;
13128 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13129 "unveil", NULL) == -1)
13133 while ((ch = getopt(argc, argv, "")) != -1) {
13146 branch_arg = argv[0];
13148 cwd = getcwd(NULL, 0);
13150 error = got_error_from_errno("getcwd");
13154 error = got_repo_pack_fds_open(&pack_fds);
13158 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13160 if (error->code == GOT_ERR_NOT_WORKTREE)
13161 error = wrap_not_worktree_error(error, "integrate",
13166 error = check_rebase_or_histedit_in_progress(worktree);
13170 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13175 error = apply_unveil(got_repo_get_path(repo), 0,
13176 got_worktree_get_root_path(worktree));
13180 error = check_merge_in_progress(worktree, repo);
13184 if (asprintf(&refname, "refs/heads/%s", branch_arg) == -1) {
13185 error = got_error_from_errno("asprintf");
13189 error = got_worktree_integrate_prepare(&fileindex, &branch_ref,
13190 &base_branch_ref, worktree, refname, repo);
13194 refname = strdup(got_ref_get_name(branch_ref));
13195 if (refname == NULL) {
13196 error = got_error_from_errno("strdup");
13197 got_worktree_integrate_abort(worktree, fileindex, repo,
13198 branch_ref, base_branch_ref);
13201 base_refname = strdup(got_ref_get_name(base_branch_ref));
13202 if (base_refname == NULL) {
13203 error = got_error_from_errno("strdup");
13204 got_worktree_integrate_abort(worktree, fileindex, repo,
13205 branch_ref, base_branch_ref);
13208 if (strncmp(base_refname, "refs/heads/", 11) != 0) {
13209 error = got_error(GOT_ERR_INTEGRATE_BRANCH);
13210 got_worktree_integrate_abort(worktree, fileindex, repo,
13211 branch_ref, base_branch_ref);
13215 error = got_ref_resolve(&commit_id, repo, branch_ref);
13219 error = got_ref_resolve(&base_commit_id, repo, base_branch_ref);
13223 if (got_object_id_cmp(commit_id, base_commit_id) == 0) {
13224 error = got_error_msg(GOT_ERR_SAME_BRANCH,
13225 "specified branch has already been integrated");
13226 got_worktree_integrate_abort(worktree, fileindex, repo,
13227 branch_ref, base_branch_ref);
13231 error = check_linear_ancestry(commit_id, base_commit_id, 1, repo);
13233 if (error->code == GOT_ERR_ANCESTRY)
13234 error = got_error(GOT_ERR_REBASE_REQUIRED);
13235 got_worktree_integrate_abort(worktree, fileindex, repo,
13236 branch_ref, base_branch_ref);
13240 memset(&upa, 0, sizeof(upa));
13241 error = got_worktree_integrate_continue(worktree, fileindex, repo,
13242 branch_ref, base_branch_ref, update_progress, &upa,
13243 check_cancelled, NULL);
13247 printf("Integrated %s into %s\n", refname, base_refname);
13248 print_update_progress_stats(&upa);
13251 const struct got_error *close_err = got_repo_close(repo);
13256 got_worktree_close(worktree);
13258 const struct got_error *pack_err =
13259 got_repo_pack_fds_close(pack_fds);
13264 free(base_commit_id);
13267 free(base_refname);
13274 fprintf(stderr, "usage: %s merge [-aCcn] [branch]\n", getprogname());
13278 static const struct got_error *
13279 cmd_merge(int argc, char *argv[])
13281 const struct got_error *error = NULL;
13282 struct got_worktree *worktree = NULL;
13283 struct got_repository *repo = NULL;
13284 struct got_fileindex *fileindex = NULL;
13285 char *cwd = NULL, *id_str = NULL, *author = NULL;
13286 char *gitconfig_path = NULL;
13287 struct got_reference *branch = NULL, *wt_branch = NULL;
13288 struct got_object_id *branch_tip = NULL, *yca_id = NULL;
13289 struct got_object_id *wt_branch_tip = NULL;
13290 int ch, merge_in_progress = 0, abort_merge = 0, continue_merge = 0;
13291 int allow_conflict = 0, prefer_fast_forward = 1, interrupt_merge = 0;
13292 struct got_update_progress_arg upa;
13293 struct got_object_id *merge_commit_id = NULL;
13294 char *branch_name = NULL;
13295 int *pack_fds = NULL;
13297 memset(&upa, 0, sizeof(upa));
13300 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13301 "unveil", NULL) == -1)
13305 while ((ch = getopt(argc, argv, "aCcMn")) != -1) {
13311 allow_conflict = 1;
13314 continue_merge = 1;
13317 prefer_fast_forward = 0;
13320 interrupt_merge = 1;
13332 if (continue_merge)
13333 option_conflict('a', 'c');
13334 if (!prefer_fast_forward)
13335 option_conflict('a', 'M');
13336 if (interrupt_merge)
13337 option_conflict('a', 'n');
13338 } else if (continue_merge) {
13339 if (!prefer_fast_forward)
13340 option_conflict('c', 'M');
13341 if (interrupt_merge)
13342 option_conflict('c', 'n');
13344 if (allow_conflict) {
13345 if (!continue_merge)
13346 errx(1, "-C option requires -c");
13348 if (abort_merge || continue_merge) {
13351 } else if (argc != 1)
13354 cwd = getcwd(NULL, 0);
13356 error = got_error_from_errno("getcwd");
13360 error = got_repo_pack_fds_open(&pack_fds);
13364 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13366 if (error->code == GOT_ERR_NOT_WORKTREE)
13367 error = wrap_not_worktree_error(error,
13372 error = get_gitconfig_path(&gitconfig_path);
13375 error = got_repo_open(&repo,
13376 worktree ? got_worktree_get_repo_path(worktree) : cwd,
13377 gitconfig_path, pack_fds);
13381 if (worktree != NULL) {
13382 error = worktree_has_logmsg_ref("merge", worktree, repo);
13387 error = apply_unveil(got_repo_get_path(repo), 0,
13388 worktree ? got_worktree_get_root_path(worktree) : NULL);
13392 error = check_rebase_or_histedit_in_progress(worktree);
13396 error = got_worktree_merge_in_progress(&merge_in_progress, worktree,
13401 if (merge_in_progress && !(abort_merge || continue_merge)) {
13402 error = got_error(GOT_ERR_MERGE_BUSY);
13406 if (!merge_in_progress && (abort_merge || continue_merge)) {
13407 error = got_error(GOT_ERR_NOT_MERGING);
13412 error = got_worktree_merge_continue(&branch_name,
13413 &branch_tip, &fileindex, worktree, repo);
13416 error = got_worktree_merge_abort(worktree, fileindex, repo,
13417 abort_progress, &upa);
13420 printf("Merge of %s aborted\n", branch_name);
13421 goto done; /* nothing else to do */
13424 if (strncmp(got_worktree_get_head_ref_name(worktree),
13425 "refs/heads/", 11) != 0) {
13426 error = got_error_fmt(GOT_ERR_COMMIT_BRANCH,
13427 "work tree's current branch %s is outside the "
13428 "\"refs/heads/\" reference namespace; "
13429 "update -b required",
13430 got_worktree_get_head_ref_name(worktree));
13434 error = get_author(&author, repo, worktree);
13438 error = got_ref_open(&wt_branch, repo,
13439 got_worktree_get_head_ref_name(worktree), 0);
13442 error = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
13446 if (continue_merge) {
13447 struct got_object_id *base_commit_id;
13448 base_commit_id = got_worktree_get_base_commit_id(worktree);
13449 if (got_object_id_cmp(wt_branch_tip, base_commit_id) != 0) {
13450 error = got_error(GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
13453 error = got_worktree_merge_continue(&branch_name,
13454 &branch_tip, &fileindex, worktree, repo);
13458 error = got_ref_open(&branch, repo, argv[0], 0);
13461 branch_name = strdup(got_ref_get_name(branch));
13462 if (branch_name == NULL) {
13463 error = got_error_from_errno("strdup");
13466 error = got_ref_resolve(&branch_tip, repo, branch);
13471 error = got_commit_graph_find_youngest_common_ancestor(&yca_id,
13472 wt_branch_tip, branch_tip, 0, repo,
13473 check_cancelled, NULL);
13474 if (error && error->code != GOT_ERR_ANCESTRY)
13477 if (!continue_merge) {
13478 error = check_path_prefix(wt_branch_tip, branch_tip,
13479 got_worktree_get_path_prefix(worktree),
13480 GOT_ERR_MERGE_PATH, repo);
13483 error = got_worktree_merge_prepare(&fileindex, worktree, repo);
13486 if (prefer_fast_forward && yca_id &&
13487 got_object_id_cmp(wt_branch_tip, yca_id) == 0) {
13488 struct got_pathlist_head paths;
13489 if (interrupt_merge) {
13490 error = got_error_fmt(GOT_ERR_BAD_OPTION,
13491 "there are no changes to merge since %s "
13492 "is already based on %s; merge cannot be "
13493 "interrupted for amending; -n",
13494 branch_name, got_ref_get_name(wt_branch));
13497 printf("Forwarding %s to %s\n",
13498 got_ref_get_name(wt_branch), branch_name);
13499 error = got_ref_change_ref(wt_branch, branch_tip);
13502 error = got_ref_write(wt_branch, repo);
13505 error = got_worktree_set_base_commit_id(worktree, repo,
13509 TAILQ_INIT(&paths);
13510 error = got_pathlist_append(&paths, "", NULL);
13513 error = got_worktree_checkout_files(worktree,
13514 &paths, repo, update_progress, &upa,
13515 check_cancelled, NULL);
13516 got_pathlist_free(&paths, GOT_PATHLIST_FREE_NONE);
13519 if (upa.did_something) {
13521 error = got_object_id_str(&id_str, branch_tip);
13524 printf("Updated to commit %s\n", id_str);
13527 printf("Already up-to-date\n");
13528 print_update_progress_stats(&upa);
13531 error = got_worktree_merge_write_refs(worktree, branch, repo);
13535 error = got_worktree_merge_branch(worktree, fileindex,
13536 yca_id, branch_tip, repo, update_progress, &upa,
13537 check_cancelled, NULL);
13540 print_merge_progress_stats(&upa);
13541 if (!upa.did_something) {
13542 error = got_worktree_merge_abort(worktree, fileindex,
13543 repo, abort_progress, &upa);
13546 printf("Already up-to-date\n");
13551 if (interrupt_merge) {
13552 error = got_worktree_merge_postpone(worktree, fileindex);
13555 printf("Merge of %s interrupted on request\n", branch_name);
13556 } else if (upa.conflicts > 0 || upa.missing > 0 ||
13557 upa.not_deleted > 0 || upa.unversioned > 0) {
13558 error = got_worktree_merge_postpone(worktree, fileindex);
13561 if (upa.conflicts > 0 && upa.missing == 0 &&
13562 upa.not_deleted == 0 && upa.unversioned == 0) {
13563 error = got_error_msg(GOT_ERR_CONFLICTS,
13564 "conflicts must be resolved before merging "
13566 } else if (upa.conflicts > 0) {
13567 error = got_error_msg(GOT_ERR_CONFLICTS,
13568 "conflicts must be resolved before merging "
13569 "can continue; changes destined for some "
13570 "files were not yet merged and "
13571 "should be merged manually if required before the "
13572 "merge operation is continued");
13574 error = got_error_msg(GOT_ERR_CONFLICTS,
13575 "changes destined for some "
13576 "files were not yet merged and should be "
13577 "merged manually if required before the "
13578 "merge operation is continued");
13582 error = got_worktree_merge_commit(&merge_commit_id, worktree,
13583 fileindex, author, NULL, 1, branch_tip, branch_name,
13584 allow_conflict, repo, continue_merge ? print_status : NULL,
13588 error = got_worktree_merge_complete(worktree, fileindex, repo);
13591 error = got_object_id_str(&id_str, merge_commit_id);
13594 printf("Merged %s into %s: %s\n", branch_name,
13595 got_worktree_get_head_ref_name(worktree),
13600 free(gitconfig_path);
13602 free(merge_commit_id);
13608 got_ref_close(branch);
13610 got_ref_close(wt_branch);
13612 got_worktree_close(worktree);
13614 const struct got_error *close_err = got_repo_close(repo);
13619 const struct got_error *pack_err =
13620 got_repo_pack_fds_close(pack_fds);
13630 fprintf(stderr, "usage: %s stage [-lpS] [-F response-script] "
13631 "[path ...]\n", getprogname());
13635 static const struct got_error *
13636 print_stage(void *arg, unsigned char status, unsigned char staged_status,
13637 const char *path, struct got_object_id *blob_id,
13638 struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
13639 int dirfd, const char *de_name)
13641 const struct got_error *err = NULL;
13642 char *id_str = NULL;
13644 if (staged_status != GOT_STATUS_ADD &&
13645 staged_status != GOT_STATUS_MODIFY &&
13646 staged_status != GOT_STATUS_DELETE)
13649 if (staged_status == GOT_STATUS_ADD ||
13650 staged_status == GOT_STATUS_MODIFY)
13651 err = got_object_id_str(&id_str, staged_blob_id);
13653 err = got_object_id_str(&id_str, blob_id);
13657 printf("%s %c %s\n", id_str, staged_status, path);
13662 static const struct got_error *
13663 cmd_stage(int argc, char *argv[])
13665 const struct got_error *error = NULL;
13666 struct got_repository *repo = NULL;
13667 struct got_worktree *worktree = NULL;
13669 struct got_pathlist_head paths;
13670 int ch, list_stage = 0, pflag = 0, allow_bad_symlinks = 0;
13671 FILE *patch_script_file = NULL;
13672 const char *patch_script_path = NULL;
13673 struct choose_patch_arg cpa;
13674 int *pack_fds = NULL;
13676 TAILQ_INIT(&paths);
13679 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13680 "unveil", NULL) == -1)
13684 while ((ch = getopt(argc, argv, "F:lpS")) != -1) {
13687 patch_script_path = optarg;
13696 allow_bad_symlinks = 1;
13707 if (list_stage && (pflag || patch_script_path))
13708 errx(1, "-l option cannot be used with other options");
13709 if (patch_script_path && !pflag)
13710 errx(1, "-F option can only be used together with -p option");
13712 cwd = getcwd(NULL, 0);
13714 error = got_error_from_errno("getcwd");
13718 error = got_repo_pack_fds_open(&pack_fds);
13722 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13724 if (error->code == GOT_ERR_NOT_WORKTREE)
13725 error = wrap_not_worktree_error(error, "stage", cwd);
13729 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13734 if (patch_script_path) {
13735 patch_script_file = fopen(patch_script_path, "re");
13736 if (patch_script_file == NULL) {
13737 error = got_error_from_errno2("fopen",
13738 patch_script_path);
13742 error = apply_unveil(got_repo_get_path(repo), 0,
13743 got_worktree_get_root_path(worktree));
13747 error = check_merge_in_progress(worktree, repo);
13751 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13756 error = got_worktree_status(worktree, &paths, repo, 0,
13757 print_stage, NULL, check_cancelled, NULL);
13759 cpa.patch_script_file = patch_script_file;
13760 cpa.action = "stage";
13761 error = got_worktree_stage(worktree, &paths,
13762 pflag ? NULL : print_status, NULL,
13763 pflag ? choose_patch : NULL, &cpa,
13764 allow_bad_symlinks, repo);
13767 if (patch_script_file && fclose(patch_script_file) == EOF &&
13769 error = got_error_from_errno2("fclose", patch_script_path);
13771 const struct got_error *close_err = got_repo_close(repo);
13776 got_worktree_close(worktree);
13778 const struct got_error *pack_err =
13779 got_repo_pack_fds_close(pack_fds);
13783 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13789 usage_unstage(void)
13791 fprintf(stderr, "usage: %s unstage [-p] [-F response-script] "
13792 "[path ...]\n", getprogname());
13797 static const struct got_error *
13798 cmd_unstage(int argc, char *argv[])
13800 const struct got_error *error = NULL;
13801 struct got_repository *repo = NULL;
13802 struct got_worktree *worktree = NULL;
13804 struct got_pathlist_head paths;
13806 struct got_update_progress_arg upa;
13807 FILE *patch_script_file = NULL;
13808 const char *patch_script_path = NULL;
13809 struct choose_patch_arg cpa;
13810 int *pack_fds = NULL;
13812 TAILQ_INIT(&paths);
13815 if (pledge("stdio rpath wpath cpath fattr flock proc exec sendfd "
13816 "unveil", NULL) == -1)
13820 while ((ch = getopt(argc, argv, "F:p")) != -1) {
13823 patch_script_path = optarg;
13837 if (patch_script_path && !pflag)
13838 errx(1, "-F option can only be used together with -p option");
13840 cwd = getcwd(NULL, 0);
13842 error = got_error_from_errno("getcwd");
13846 error = got_repo_pack_fds_open(&pack_fds);
13850 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
13852 if (error->code == GOT_ERR_NOT_WORKTREE)
13853 error = wrap_not_worktree_error(error, "unstage", cwd);
13857 error = got_repo_open(&repo, got_worktree_get_repo_path(worktree),
13862 if (patch_script_path) {
13863 patch_script_file = fopen(patch_script_path, "re");
13864 if (patch_script_file == NULL) {
13865 error = got_error_from_errno2("fopen",
13866 patch_script_path);
13871 error = apply_unveil(got_repo_get_path(repo), 0,
13872 got_worktree_get_root_path(worktree));
13876 error = get_worktree_paths_from_argv(&paths, argc, argv, worktree);
13880 cpa.patch_script_file = patch_script_file;
13881 cpa.action = "unstage";
13882 memset(&upa, 0, sizeof(upa));
13883 error = got_worktree_unstage(worktree, &paths, update_progress,
13884 &upa, pflag ? choose_patch : NULL, &cpa, repo);
13886 print_merge_progress_stats(&upa);
13888 if (patch_script_file && fclose(patch_script_file) == EOF &&
13890 error = got_error_from_errno2("fclose", patch_script_path);
13892 const struct got_error *close_err = got_repo_close(repo);
13897 got_worktree_close(worktree);
13899 const struct got_error *pack_err =
13900 got_repo_pack_fds_close(pack_fds);
13904 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);
13912 fprintf(stderr, "usage: %s cat [-P] [-c commit] [-r repository-path] "
13913 "arg ...\n", getprogname());
13917 static const struct got_error *
13918 cat_blob(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13920 const struct got_error *err;
13921 struct got_blob_object *blob;
13924 fd = got_opentempfd();
13926 return got_error_from_errno("got_opentempfd");
13928 err = got_object_open_as_blob(&blob, repo, id, 8192, fd);
13932 err = got_object_blob_dump_to_file(NULL, NULL, NULL, outfile, blob);
13934 if (fd != -1 && close(fd) == -1 && err == NULL)
13935 err = got_error_from_errno("close");
13937 got_object_blob_close(blob);
13941 static const struct got_error *
13942 cat_tree(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13944 const struct got_error *err;
13945 struct got_tree_object *tree;
13948 err = got_object_open_as_tree(&tree, repo, id);
13952 nentries = got_object_tree_get_nentries(tree);
13953 for (i = 0; i < nentries; i++) {
13954 struct got_tree_entry *te;
13956 if (sigint_received || sigpipe_received)
13958 te = got_object_tree_get_entry(tree, i);
13959 err = got_object_id_str(&id_str, got_tree_entry_get_id(te));
13962 fprintf(outfile, "%s %.7o %s\n", id_str,
13963 got_tree_entry_get_mode(te),
13964 got_tree_entry_get_name(te));
13968 got_object_tree_close(tree);
13972 static const struct got_error *
13973 cat_commit(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
13975 const struct got_error *err;
13976 struct got_commit_object *commit;
13977 const struct got_object_id_queue *parent_ids;
13978 struct got_object_qid *pid;
13979 char *id_str = NULL;
13980 const char *logmsg = NULL;
13983 err = got_object_open_as_commit(&commit, repo, id);
13987 err = got_object_id_str(&id_str, got_object_commit_get_tree_id(commit));
13991 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_TREE, id_str);
13992 parent_ids = got_object_commit_get_parent_ids(commit);
13993 fprintf(outfile, "numparents %d\n",
13994 got_object_commit_get_nparents(commit));
13995 STAILQ_FOREACH(pid, parent_ids, entry) {
13997 err = got_object_id_str(&pid_str, &pid->id);
14000 fprintf(outfile, "%s%s\n", GOT_COMMIT_LABEL_PARENT, pid_str);
14003 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14004 got_object_commit_get_author_gmtoff(commit));
14005 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_AUTHOR,
14006 got_object_commit_get_author(commit),
14007 (long long)got_object_commit_get_author_time(commit),
14010 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14011 got_object_commit_get_committer_gmtoff(commit));
14012 fprintf(outfile, "%s%s %lld %s\n", GOT_COMMIT_LABEL_COMMITTER,
14013 got_object_commit_get_committer(commit),
14014 (long long)got_object_commit_get_committer_time(commit),
14017 logmsg = got_object_commit_get_logmsg_raw(commit);
14018 fprintf(outfile, "messagelen %zd\n", strlen(logmsg));
14019 fprintf(outfile, "%s", logmsg);
14022 got_object_commit_close(commit);
14026 static const struct got_error *
14027 cat_tag(struct got_object_id *id, struct got_repository *repo, FILE *outfile)
14029 const struct got_error *err;
14030 struct got_tag_object *tag;
14031 char *id_str = NULL;
14032 const char *tagmsg = NULL;
14035 err = got_object_open_as_tag(&tag, repo, id);
14039 err = got_object_id_str(&id_str, got_object_tag_get_object_id(tag));
14043 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_OBJECT, id_str);
14045 switch (got_object_tag_get_object_type(tag)) {
14046 case GOT_OBJ_TYPE_BLOB:
14047 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14048 GOT_OBJ_LABEL_BLOB);
14050 case GOT_OBJ_TYPE_TREE:
14051 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14052 GOT_OBJ_LABEL_TREE);
14054 case GOT_OBJ_TYPE_COMMIT:
14055 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14056 GOT_OBJ_LABEL_COMMIT);
14058 case GOT_OBJ_TYPE_TAG:
14059 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TYPE,
14060 GOT_OBJ_LABEL_TAG);
14066 fprintf(outfile, "%s%s\n", GOT_TAG_LABEL_TAG,
14067 got_object_tag_get_name(tag));
14069 got_date_format_gmtoff(gmtoff, sizeof(gmtoff),
14070 got_object_tag_get_tagger_gmtoff(tag));
14071 fprintf(outfile, "%s%s %lld %s\n", GOT_TAG_LABEL_TAGGER,
14072 got_object_tag_get_tagger(tag),
14073 (long long)got_object_tag_get_tagger_time(tag),
14076 tagmsg = got_object_tag_get_message(tag);
14077 fprintf(outfile, "messagelen %zd\n", strlen(tagmsg));
14078 fprintf(outfile, "%s", tagmsg);
14081 got_object_tag_close(tag);
14085 static const struct got_error *
14086 cmd_cat(int argc, char *argv[])
14088 const struct got_error *error;
14089 struct got_repository *repo = NULL;
14090 struct got_worktree *worktree = NULL;
14091 char *cwd = NULL, *repo_path = NULL, *label = NULL;
14092 char *keyword_idstr = NULL;
14093 const char *commit_id_str = NULL;
14094 struct got_object_id *id = NULL, *commit_id = NULL;
14095 struct got_commit_object *commit = NULL;
14096 int ch, obj_type, i, force_path = 0;
14097 struct got_reflist_head refs;
14098 int *pack_fds = NULL;
14103 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14108 while ((ch = getopt(argc, argv, "c:Pr:")) != -1) {
14111 commit_id_str = optarg;
14117 repo_path = realpath(optarg, NULL);
14118 if (repo_path == NULL)
14119 return got_error_from_errno2("realpath",
14121 got_path_strip_trailing_slashes(repo_path);
14132 cwd = getcwd(NULL, 0);
14134 error = got_error_from_errno("getcwd");
14138 error = got_repo_pack_fds_open(&pack_fds);
14142 if (repo_path == NULL) {
14143 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14144 if (error && error->code != GOT_ERR_NOT_WORKTREE)
14147 repo_path = strdup(
14148 got_worktree_get_repo_path(worktree));
14149 if (repo_path == NULL) {
14150 error = got_error_from_errno("strdup");
14154 if (commit_id_str == NULL) {
14155 /* Release work tree lock. */
14156 got_worktree_close(worktree);
14162 if (repo_path == NULL) {
14163 repo_path = strdup(cwd);
14164 if (repo_path == NULL)
14165 return got_error_from_errno("strdup");
14168 error = got_repo_open(&repo, repo_path, NULL, pack_fds);
14173 error = apply_unveil(got_repo_get_path(repo), 1, NULL);
14177 error = got_ref_list(&refs, repo, NULL, got_ref_cmp_by_name, NULL);
14181 if (commit_id_str != NULL) {
14182 error = got_keyword_to_idstr(&keyword_idstr, commit_id_str,
14186 if (keyword_idstr != NULL)
14187 commit_id_str = keyword_idstr;
14188 if (worktree != NULL) {
14189 got_worktree_close(worktree);
14193 commit_id_str = GOT_REF_HEAD;
14194 error = got_repo_match_object_id(&commit_id, NULL,
14195 commit_id_str, GOT_OBJ_TYPE_COMMIT, &refs, repo);
14199 error = got_object_open_as_commit(&commit, repo, commit_id);
14203 for (i = 0; i < argc; i++) {
14205 error = got_object_id_by_path(&id, repo, commit,
14210 error = got_repo_match_object_id(&id, &label, argv[i],
14211 GOT_OBJ_TYPE_ANY, NULL /* do not resolve tags */,
14214 if (error->code != GOT_ERR_BAD_OBJ_ID_STR &&
14215 error->code != GOT_ERR_NOT_REF)
14217 error = got_object_id_by_path(&id, repo,
14224 error = got_object_get_type(&obj_type, repo, id);
14228 switch (obj_type) {
14229 case GOT_OBJ_TYPE_BLOB:
14230 error = cat_blob(id, repo, stdout);
14232 case GOT_OBJ_TYPE_TREE:
14233 error = cat_tree(id, repo, stdout);
14235 case GOT_OBJ_TYPE_COMMIT:
14236 error = cat_commit(id, repo, stdout);
14238 case GOT_OBJ_TYPE_TAG:
14239 error = cat_tag(id, repo, stdout);
14242 error = got_error(GOT_ERR_OBJ_TYPE);
14256 free(keyword_idstr);
14258 got_object_commit_close(commit);
14260 got_worktree_close(worktree);
14262 const struct got_error *close_err = got_repo_close(repo);
14267 const struct got_error *pack_err =
14268 got_repo_pack_fds_close(pack_fds);
14273 got_ref_list_free(&refs);
14280 fprintf(stderr, "usage: %s info [path ...]\n",
14285 static const struct got_error *
14286 print_path_info(void *arg, const char *path, mode_t mode, time_t mtime,
14287 struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
14288 struct got_object_id *commit_id)
14290 const struct got_error *err = NULL;
14291 char *id_str = NULL;
14293 struct tm mytm, *tm;
14294 struct got_pathlist_head *paths = arg;
14295 struct got_pathlist_entry *pe;
14298 * Clear error indication from any of the path arguments which
14299 * would cause this file index entry to be displayed.
14301 TAILQ_FOREACH(pe, paths, entry) {
14302 if (got_path_cmp(path, pe->path, strlen(path),
14303 pe->path_len) == 0 ||
14304 got_path_is_child(path, pe->path, pe->path_len))
14305 pe->data = NULL; /* no error */
14308 printf(GOT_COMMIT_SEP_STR);
14310 printf("symlink: %s\n", path);
14311 else if (S_ISREG(mode)) {
14312 printf("file: %s\n", path);
14313 printf("mode: %o\n", mode & (S_IRWXU | S_IRWXG | S_IRWXO));
14314 } else if (S_ISDIR(mode))
14315 printf("directory: %s\n", path);
14317 printf("something: %s\n", path);
14319 tm = localtime_r(&mtime, &mytm);
14322 if (strftime(datebuf, sizeof(datebuf), "%c %Z", tm) == 0)
14323 return got_error(GOT_ERR_NO_SPACE);
14324 printf("timestamp: %s\n", datebuf);
14327 err = got_object_id_str(&id_str, blob_id);
14330 printf("based on blob: %s\n", id_str);
14334 if (staged_blob_id) {
14335 err = got_object_id_str(&id_str, staged_blob_id);
14338 printf("based on staged blob: %s\n", id_str);
14343 err = got_object_id_str(&id_str, commit_id);
14346 printf("based on commit: %s\n", id_str);
14353 static const struct got_error *
14354 cmd_info(int argc, char *argv[])
14356 const struct got_error *error = NULL;
14357 struct got_worktree *worktree = NULL;
14358 char *cwd = NULL, *id_str = NULL;
14359 struct got_pathlist_head paths;
14360 char *uuidstr = NULL;
14361 int ch, show_files = 0;
14363 TAILQ_INIT(&paths);
14366 if (pledge("stdio rpath wpath cpath flock proc exec sendfd unveil",
14371 while ((ch = getopt(argc, argv, "")) != -1) {
14382 cwd = getcwd(NULL, 0);
14384 error = got_error_from_errno("getcwd");
14388 error = got_worktree_open(&worktree, cwd, GOT_WORKTREE_GOT_DIR);
14390 if (error->code == GOT_ERR_NOT_WORKTREE)
14391 error = wrap_not_worktree_error(error, "info", cwd);
14396 /* Remove "wpath cpath proc exec sendfd" promises. */
14397 if (pledge("stdio rpath flock unveil", NULL) == -1)
14400 error = apply_unveil(NULL, 0, got_worktree_get_root_path(worktree));
14405 error = get_worktree_paths_from_argv(&paths, argc, argv,
14412 error = got_object_id_str(&id_str,
14413 got_worktree_get_base_commit_id(worktree));
14417 error = got_worktree_get_uuid(&uuidstr, worktree);
14421 printf("work tree: %s\n", got_worktree_get_root_path(worktree));
14422 printf("work tree base commit: %s\n", id_str);
14423 printf("work tree path prefix: %s\n",
14424 got_worktree_get_path_prefix(worktree));
14425 printf("work tree branch reference: %s\n",
14426 got_worktree_get_head_ref_name(worktree));
14427 printf("work tree UUID: %s\n", uuidstr);
14428 printf("repository: %s\n", got_worktree_get_repo_path(worktree));
14431 struct got_pathlist_entry *pe;
14432 TAILQ_FOREACH(pe, &paths, entry) {
14433 if (pe->path_len == 0)
14436 * Assume this path will fail. This will be corrected
14437 * in print_path_info() in case the path does suceeed.
14439 pe->data = (void *)got_error(GOT_ERR_BAD_PATH);
14441 error = got_worktree_path_info(worktree, &paths,
14442 print_path_info, &paths, check_cancelled, NULL);
14445 TAILQ_FOREACH(pe, &paths, entry) {
14446 if (pe->data != NULL) {
14447 const struct got_error *perr;
14450 error = got_error_fmt(perr->code, "%s",
14458 got_worktree_close(worktree);
14459 got_pathlist_free(&paths, GOT_PATHLIST_FREE_PATH);